Fixed Translation Strings.

author janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>

Mon, 18 Dec 2006 07:40:54 +0000 (07:40 +0000)

committer janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>

Mon, 18 Dec 2006 07:40:54 +0000 (07:40 +0000)
author janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 18 Dec 2006 07:40:54 +0000 (07:40 +0000)
committer janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 18 Dec 2006 07:40:54 +0000 (07:40 +0000)
diff --git a/ihtml/themes/default/copyPasteDialog.tpl b/ihtml/themes/default/copyPasteDialog.tpl

index 28159d5f371d66642b0f90c60b8aed61bf2638fe..5e574c03b22a40dbaa5ee19ea66cfa36eb78542b 100644 (file)
--- a/ihtml/themes/default/copyPasteDialog.tpl
+++ b/ihtml/themes/default/copyPasteDialog.tpl
@@ -6,7 +6,7 @@
  {if $Complete == false}
         {t}Some values need to be unique in the complete directory while some combinations make no sense. GOsa shows the relevant attributes. Please maintain the values below to fullfill the policies.{/t}
         <br>
-{t}Remeber that some properties like taken snapshots will not be copied!{/t}&nbsp;
+{t}Remember that some properties like taken snapshots will not be copied!{/t}&nbsp;
  {t}Or if you copy or cut an entry within GOsa and delete the source object, you may get errors while pasting this object again!{/t}
  
         <p class='seperator'>&nbsp;</p>
diff --git a/locale/de/LC_MESSAGES/messages.mo b/locale/de/LC_MESSAGES/messages.mo

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

index 8a5215b1295443226d404d1cf3ed3cbffc9de82e..eb9b2af520594a87e5de6ea0d7f947f13bb02b56 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1,14 +1,12 @@
  # translation of messages.po to Español
  # Alejandro Escanero Blanco <aescanero@chaosdimension.org>, 2003, 2006.
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/admin/systems/class_terminalService.inc:452
-#: plugins/admin/systems/class_terminalService.inc:453
-#: include/class_plugin.inc:115 include/class_plugin.inc:116
+#: plugins/personal/generic/class_user.inc:1360 include/class_plugin.inc:115
+#: include/class_plugin.inc:116
  msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-17 12:33+0100\n"
+"POT-Creation-Date: 2006-12-18 11:18+0100\n"
  "PO-Revision-Date: 2006-06-10 19:06GMT\n"
  "Last-Translator: Alejandro Escanero Blanco <aescanero@chaosdimension.org>\n"
  "Language-Team: Español\n"
@@ -17,7 +15,24 @@ msgstr ""
  "Content-Transfer-Encoding: 8bit\n"
  "X-Generator: KBabel 1.11.2\n"
  
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1373
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1011
+#: plugins/personal/password/class_password.inc:16
+#: plugins/personal/posix/class_posixAccount.inc:1313
+#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/connectivity/class_phpgwAccount.inc:147
+#: plugins/personal/connectivity/class_kolabAccount.inc:451
+#: plugins/personal/connectivity/class_webdavAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:223
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:954
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#: plugins/personal/connectivity/class_intranetAccount.inc:180
+#: plugins/personal/connectivity/class_pptpAccount.inc:163
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/personal/environment/class_environment.inc:1274
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#: plugins/personal/netatalk/class_netatalk.inc:359
  msgid "My account"
  msgstr "Mi cuenta"
  
@@ -25,8 +40,8 @@ msgstr "Mi cuenta"
  msgid "Administration"
  msgstr "Administradores"
  
-#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:788
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
  msgid "Addons"
  msgstr "Agregados"
  
@@ -38,28 +53,28 @@ msgstr "Agregados"
  #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
  #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
  #: plugins/personal/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1368
+#: plugins/personal/generic/class_user.inc:1367
  #: plugins/gofax/blocklists/generic.tpl:1
  #: plugins/gofax/faxaccount/generic.tpl:6
  #: plugins/gofax/faxaccount/paste_generic.tpl:4
  #: plugins/admin/groups/mail.tpl:7
-#: plugins/admin/groups/class_groupGeneric.inc:884
-#: plugins/admin/applications/class_applicationGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:531
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#: plugins/admin/applications/class_applicationGeneric.inc:523
+#: plugins/admin/departments/class_departmentGeneric.inc:575
  #: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/class_servGeneric.inc:334
-#: plugins/admin/systems/class_workstationGeneric.inc:504
+#: plugins/admin/systems/class_servGeneric.inc:347
+#: plugins/admin/systems/class_workstationGeneric.inc:526
  #: plugins/admin/systems/servkolab.tpl:6 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/class_printGeneric.inc:854
-#: plugins/admin/systems/class_componentGeneric.inc:257
-#: plugins/admin/systems/class_phoneGeneric.inc:425
+#: plugins/admin/systems/class_printGeneric.inc:858
+#: plugins/admin/systems/class_componentGeneric.inc:259
+#: plugins/admin/systems/class_phoneGeneric.inc:430
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
  #: plugins/admin/systems/servdnseditzone.tpl:1
  #: plugins/admin/systems/goMailServer.tpl:1
  #: plugins/admin/systems/goImapServer.tpl:1
  #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:709
+#: plugins/admin/ogroups/class_ogroup.inc:692
  #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
  #: plugins/admin/fai/faiPartitionTable.tpl:4
  #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
@@ -70,9 +85,9 @@ msgstr "Agregados"
  #: plugins/admin/fai/faiHookEntry.tpl:5
  #: plugins/admin/fai/faiTemplateEntry.tpl:3
  #: plugins/admin/mimetypes/generic.tpl:4
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:671
  #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_gofonMacro.inc:486
  #: plugins/generic/references/class_reference.inc:20
  msgid "Generic"
  msgstr "Genérico"
@@ -84,30 +99,30 @@ msgstr "Unix"
  #: contrib/gosa.conf:82 contrib/gosa.conf:98
  #: plugins/personal/environment/class_environment.inc:12
  #: plugins/personal/environment/class_environment.inc:1269
-#: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/groups/class_divListGroup.inc:188
+#: plugins/admin/users/class_divListUsers.inc:177
  msgid "Environment"
  msgstr "Entorno"
  
  #: contrib/gosa.conf:83 contrib/gosa.conf:100
  #: plugins/personal/mail/class_mailAccount.inc:22
  #: plugins/personal/mail/class_mailAccount.inc:1006
-#: plugins/admin/groups/class_groupMail.inc:1066
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:191
-#: plugins/admin/ogroups/tabs_ogroups.inc:76
+#: plugins/admin/groups/class_groupMail.inc:1073
+#: plugins/admin/groups/class_divListGroup.inc:180
+#: plugins/admin/users/class_divListUsers.inc:179
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
  #: plugins/admin/ogroups/tabs_ogroups.inc:184
  #: plugins/admin/ogroups/paste_mail.tpl:4
  #: plugins/admin/ogroups/class_mailogroup.inc:167
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/admin/ogroups/class_divListOGroup.inc:171
  #: plugins/generic/references/class_reference.inc:24
  msgid "Mail"
  msgstr "Correo Electrónico"
  
  #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
  #: plugins/personal/samba/class_sambaAccount.inc:1041
-#: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/groups/class_divListGroup.inc:182
+#: plugins/admin/users/class_divListUsers.inc:185
  #: plugins/generic/references/class_reference.inc:26
  #: plugins/generic/references/class_reference.inc:28
  msgid "Samba"
@@ -115,7 +130,7 @@ msgstr "Samba"
  
  #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
  #: plugins/personal/netatalk/class_netatalk.inc:355
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:187
  msgid "Netatalk"
  msgstr ""
  
@@ -126,15 +141,14 @@ msgstr "Conectividad"
  
  #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
  #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:581
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:586
  #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:807
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
  #: plugins/gofax/faxaccount/paste_generic.tpl:8
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:183
  #: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/class_departmentGeneric.inc:550
+#: plugins/admin/departments/class_departmentGeneric.inc:594
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Fax"
@@ -147,12 +161,12 @@ msgstr "Fax"
  #: plugins/addons/addressbook/address_edit.tpl:221
  #: plugins/addons/addressbook/address_info.tpl:67
  #: plugins/addons/addressbook/address_info.tpl:163
-#: plugins/admin/groups/class_divListGroup.inc:178
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/groups/class_divListGroup.inc:186
+#: plugins/admin/users/class_divListUsers.inc:181
  #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:818
+#: plugins/admin/systems/class_systemManagement.inc:1003
  #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/ogroups/class_ogroupManagement.inc:351
  #: plugins/admin/ogroups/class_phonequeue.inc:718
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1231
@@ -172,9 +186,9 @@ msgstr ""
  msgid "Applications"
  msgstr "Aplicaciones"
  
-#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:92
  #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:240
+#: plugins/admin/systems/class_servRepository.inc:254
  #: plugins/admin/ogroups/phonequeue.tpl:43
  #: plugins/gofon/conference/generic.tpl:121
  msgid "Options"
@@ -188,21 +202,21 @@ msgstr "Parámetro"
  
  #: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
  #: plugins/admin/systems/class_terminalStartup.inc:442
-#: plugins/admin/systems/class_workstationStartup.inc:1109
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: plugins/admin/systems/class_workstationStartup.inc:1154
+#: plugins/admin/ogroups/tabs_ogroups.inc:96
  msgid "Startup"
  msgstr "Inicio"
  
  #: contrib/gosa.conf:120 contrib/gosa.conf:136
-#: plugins/admin/ogroups/tabs_ogroups.inc:103
+#: plugins/admin/ogroups/tabs_ogroups.inc:99
  msgid "Devices"
  msgstr "Servicios"
  
  #: contrib/gosa.conf:121 contrib/gosa.conf:137
  #: plugins/personal/environment/environment.tpl:235
-#: plugins/admin/systems/class_systemManagement.inc:827
-#: plugins/admin/systems/class_printGeneric.inc:860
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/systems/class_systemManagement.inc:1012
+#: plugins/admin/systems/class_printGeneric.inc:864
+#: plugins/admin/ogroups/class_ogroupManagement.inc:354
  #: plugins/generic/references/class_reference.inc:52
  msgid "Printer"
  msgstr "Impresora"
@@ -221,16 +235,16 @@ msgstr "Impresora"
  #: plugins/admin/fai/faiPackageEntry.tpl:22
  #: plugins/gofon/macro/headpage.tpl:20
  #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:64
+#: ihtml/themes/default/MultiSelectWindow.tpl:27
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
  msgid "Information"
  msgstr "Información"
  
  #: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:385
  #: plugins/admin/systems/class_goFaxServer.inc:85
  #: plugins/admin/systems/class_servKolab.inc:375
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:366
  #: plugins/admin/systems/class_goGlpiServer.inc:84
  #: plugins/admin/systems/class_goCupsServer.inc:64
  #: plugins/admin/systems/class_goTerminalServer.inc:118
@@ -249,7 +263,6 @@ msgid "Services"
  msgstr "Servicios"
  
  #: contrib/gosa.conf:129 contrib/gosa.conf:139
-#: plugins/admin/fai/class_faiSummaryTab.inc:546
  msgid "FAI summary"
  msgstr ""
  
@@ -276,7 +289,7 @@ msgstr "Exportar en XLS"
  #: plugins/addons/ldapmanager/contentcsv.tpl:112
  #: plugins/addons/ldapmanager/contentimport.tpl:50
  #: plugins/addons/notifications/contents.tpl:52
-#: plugins/admin/applications/generic.tpl:132
+#: plugins/admin/applications/generic.tpl:135
  msgid "Import"
  msgstr "Importar"
  
@@ -289,33 +302,32 @@ msgid "Partitions"
  msgstr "Paticiones"
  
  #: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:518
+#: plugins/admin/applications/generic.tpl:130
+#: plugins/admin/fai/class_faiScript.inc:529
  #: plugins/admin/fai/faiScriptEntry.tpl:56
  #: plugins/admin/fai/faiHookEntry.tpl:56
  msgid "Script"
  msgstr "Script"
  
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:45
  msgid "Hooks"
  msgstr ""
  
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:46
  msgid "Variables"
  msgstr "Variables"
  
-#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:47
  msgid "Templates"
  msgstr "Plantillas"
  
  #: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
-#: plugins/admin/fai/class_faiSummaryTab.inc:47
+#: plugins/admin/fai/class_faiSummaryTab.inc:50
  msgid "Profiles"
  msgstr "Perfiles"
  
-#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:103
  #: plugins/admin/acl/class_divListACL.inc:49
-#: plugins/admin/fai/class_faiSummaryTab.inc:545
  msgid "Summary"
  msgstr ""
  
@@ -370,7 +382,7 @@ msgstr "Seleccione dirección para añadir"
  #: plugins/personal/environment/hotplugDialog.tpl:24
  #: plugins/personal/environment/selectPrinterDialog.tpl:24
  #: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:62
+#: plugins/addons/addressbook/contents.tpl:65
  #: plugins/addons/godfs/contents.tpl:31
  #: plugins/admin/groups/mail_locals.tpl:22
  #: plugins/admin/groups/group_objects.tpl:20
@@ -386,8 +398,8 @@ msgstr "Seleccione dirección para añadir"
  #: plugins/admin/fai/faiPackageEntry.tpl:32
  #: plugins/gofon/macro/headpage.tpl:29
  #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:75
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:78
  msgid "Filters"
  msgstr "Filtros"
  
@@ -402,7 +414,7 @@ msgstr "Seleccione para ver los departamentos"
  #: plugins/personal/samba/samba3_workstations.tpl:27
  #: plugins/personal/environment/selectPrinterDialog.tpl:34
  #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:84
+#: plugins/addons/addressbook/contents.tpl:87
  #: plugins/admin/groups/mail_locals.tpl:33
  #: plugins/admin/groups/group_objects.tpl:40
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
@@ -453,22 +465,22 @@ msgstr "Nombre de usuario de las direcciones mostradas"
  #: plugins/admin/groups/mail.tpl:135 plugins/admin/groups/mail_locals.tpl:66
  #: plugins/admin/groups/generic.tpl:137
  #: plugins/admin/groups/application.tpl:39
-#: plugins/admin/groups/class_groupMail.inc:591
+#: plugins/admin/groups/class_groupMail.inc:598
  #: plugins/admin/groups/group_objects.tpl:55
  #: plugins/admin/groups/paste_mail.tpl:30
  #: plugins/admin/groups/paste_mail.tpl:41
  #: plugins/admin/systems/terminal.tpl:117
+#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/workstation.tpl:94
  #: plugins/admin/systems/glpiPrinter.tpl:115
  #: plugins/admin/systems/glpiPrinter.tpl:149
  #: plugins/admin/systems/servdns.tpl:6 plugins/admin/systems/glpi.tpl:125
-#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/phonesettings.tpl:207
  #: plugins/admin/systems/phonesettings.tpl:230
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:124
-#: plugins/admin/systems/workstationStartup.tpl:150
-#: plugins/admin/systems/workstationStartup.tpl:179
+#: plugins/admin/systems/workstationStartup.tpl:127
+#: plugins/admin/systems/workstationStartup.tpl:154
+#: plugins/admin/systems/workstationStartup.tpl:183
  #: plugins/admin/systems/terminalStartup.tpl:79
  #: plugins/admin/systems/terminalStartup.tpl:108
  #: plugins/admin/systems/servRepositorySetup.tpl:47
@@ -476,12 +488,12 @@ msgstr "Nombre de usuario de las direcciones mostradas"
  #: plugins/admin/systems/glpiManufacturer.tpl:6
  #: plugins/admin/systems/glpi_edit_os.tpl:8
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:472
-#: plugins/admin/systems/class_termDNS.inc:492
+#: plugins/admin/systems/class_termDNS.inc:477
+#: plugins/admin/systems/class_termDNS.inc:497
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
  #: plugins/admin/systems/servdnseditzone.tpl:106
  #: plugins/admin/systems/class_servDNSeditZone.inc:486
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:392
  #: plugins/admin/systems/goShareServer.tpl:14
  #: plugins/admin/systems/goMailServer.tpl:70
  #: plugins/admin/systems/goMailServer.tpl:101
@@ -494,7 +506,7 @@ msgstr "Nombre de usuario de las direcciones mostradas"
  #: plugins/admin/ogroups/ogroup_objects.tpl:54
  #: plugins/admin/ogroups/phonequeue.tpl:33
  #: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
-#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPackage.tpl:78
  #: plugins/admin/fai/faiPartitionTable.tpl:48
  #: plugins/admin/fai/faiPartitionTable.tpl:50
  #: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
@@ -543,15 +555,17 @@ msgstr "Añadir"
  #: plugins/admin/applications/remove.tpl:15
  #: plugins/admin/applications/class_applicationManagement.inc:352
  #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:506
+#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/departments/dep_move_confirm.tpl:17
+#: plugins/admin/systems/goNtpServer.tpl:31
+#: plugins/admin/systems/class_systemManagement.inc:654
  #: plugins/admin/systems/servdns.tpl:23
-#: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/servkolab.tpl:247 plugins/admin/systems/gencd.tpl:11
  #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/goNtpServer.tpl:32
-#: plugins/admin/systems/goKrbServer.tpl:33
+#: plugins/admin/systems/goKrbServer.tpl:32
+#: plugins/admin/systems/goFonServer.tpl:41
  #: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:140
-#: plugins/admin/systems/goFonServer.tpl:42
+#: plugins/admin/systems/goFaxServer.tpl:25
  #: plugins/admin/systems/remove_glpi.tpl:16
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
  #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -559,7 +573,7 @@ msgstr "Añadir"
  #: plugins/admin/systems/servRepository.tpl:68
  #: plugins/admin/systems/glpi_edit_type.tpl:29
  #: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/goFaxServer.tpl:26
+#: plugins/admin/systems/remove_ppd.tpl:14
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
  #: plugins/admin/systems/glpiSelectUser.tpl:51
  #: plugins/admin/systems/glpi_devices.tpl:761
@@ -572,26 +586,27 @@ msgstr "Añadir"
  #: plugins/admin/systems/SelectDeviceType.tpl:45
  #: plugins/admin/systems/class_baseSelectDialog.inc:43
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/ServiceAddDialog.tpl:31
-#: plugins/admin/systems/goLdapServer.tpl:12
-#: plugins/admin/systems/goShareServer.tpl:32
-#: plugins/admin/systems/goMailServer.tpl:224
-#: plugins/admin/systems/goImapServer.tpl:119
-#: plugins/admin/systems/goSyslogServer.tpl:8
-#: plugins/admin/systems/goGlpiServer.tpl:35
-#: plugins/admin/systems/goCupsServer.tpl:8
-#: plugins/admin/systems/goTerminalServer.tpl:26
-#: plugins/admin/systems/goLogDBServer.tpl:26
-#: plugins/admin/systems/goSpamServer.tpl:128
-#: plugins/admin/systems/goSpamServerRule.tpl:24
-#: plugins/admin/systems/goVirusServer.tpl:171
+#: plugins/admin/systems/ServiceAddDialog.tpl:30
+#: plugins/admin/systems/goLdapServer.tpl:11
+#: plugins/admin/systems/goShareServer.tpl:31
+#: plugins/admin/systems/goMailServer.tpl:223
+#: plugins/admin/systems/goImapServer.tpl:118
+#: plugins/admin/systems/goSyslogServer.tpl:7
+#: plugins/admin/systems/goGlpiServer.tpl:34
+#: plugins/admin/systems/goCupsServer.tpl:7
+#: plugins/admin/systems/goTerminalServer.tpl:25
+#: plugins/admin/systems/goLogDBServer.tpl:25
+#: plugins/admin/systems/goSpamServer.tpl:127
+#: plugins/admin/systems/goSpamServerRule.tpl:23
+#: plugins/admin/systems/goVirusServer.tpl:170
  #: plugins/admin/systems/class_goService.inc:34
  #: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:307
+#: plugins/admin/ogroups/class_ogroupManagement.inc:302
  #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:619
-#: plugins/admin/fai/class_faiManagement.inc:624
-#: plugins/admin/fai/class_faiManagement.inc:630
+#: plugins/admin/acl/class_aclManagement.inc:289
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/fai/class_faiManagement.inc:634
+#: plugins/admin/fai/class_faiManagement.inc:640
  #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
  #: plugins/admin/fai/faiScriptEntry.tpl:83
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:40
@@ -603,17 +618,17 @@ msgstr "Añadir"
  #: plugins/admin/fai/faiPackageNew.tpl:51
  #: plugins/admin/fai/faiNewBranch.tpl:20
  #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
  #: plugins/admin/mimetypes/remove.tpl:15
  #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
  #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:256
  #: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
  #: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
-#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:38
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:89
  msgid "Cancel"
  msgstr "Cancelar"
  
@@ -625,11 +640,11 @@ msgstr "Cuenta Principal"
  
  #: plugins/personal/mail/generic.tpl:15
  #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:18
-#: plugins/admin/systems/class_servGeneric.inc:340
-#: plugins/admin/systems/class_systemManagement.inc:819
+#: plugins/admin/systems/class_servGeneric.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:1004
  #: plugins/admin/systems/servnfs.tpl:39
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:355
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
  #: plugins/generic/references/class_reference.inc:44
  msgid "Server"
  msgstr "Servidor"
@@ -644,14 +659,14 @@ msgstr "Uso de la Cola de Correo"
  
  #: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:38
  #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:515
+#: plugins/admin/systems/class_printGeneric.inc:516
  msgid "not defined"
  msgstr "sin definirse"
  
  #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/personal/mail/class_mailAccount.inc:1019
  #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1077
+#: plugins/admin/groups/class_groupMail.inc:1084
  msgid "Quota size"
  msgstr "Tamaño de la Cola de correo"
  
@@ -690,22 +705,23 @@ msgstr "Lista de direcciones de correo alternativas."
  #: plugins/admin/applications/remove.tpl:13
  #: plugins/admin/departments/remove.tpl:14
  #: plugins/admin/systems/terminal.tpl:121
+#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/printer.tpl:102 plugins/admin/systems/printer.tpl:126
  #: plugins/admin/systems/workstation.tpl:98
  #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/remove_glpi.tpl:14
  #: plugins/admin/systems/phonesettings.tpl:210
  #: plugins/admin/systems/phonesettings.tpl:233
-#: plugins/admin/systems/workstationStartup.tpl:125
-#: plugins/admin/systems/workstationStartup.tpl:153
+#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:157
  #: plugins/admin/systems/terminalStartup.tpl:82
  #: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/remove_ppd.tpl:12
  #: plugins/admin/systems/glpi_edit_os.tpl:10
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
  #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:486
+#: plugins/admin/systems/class_termDNS.inc:491
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
  #: plugins/admin/systems/class_servDNSeditZone.inc:292
  #: plugins/admin/systems/class_servDNSeditZone.inc:480
@@ -778,7 +794,7 @@ msgid "MB"
  msgstr "Mb"
  
  #: plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1022
  msgid "Vacation message"
  msgstr "Mensaje de ausencia"
  
@@ -810,7 +826,7 @@ msgstr ""
  "El usuario solo esta permitido a enviar y recibir correo de forma local"
  
  #: plugins/personal/mail/generic.tpl:190
-#: plugins/personal/mail/class_mailAccount.inc:1036
+#: plugins/personal/mail/class_mailAccount.inc:1037
  msgid "Use custom sieve script"
  msgstr "Usar 'script sive' propios"
  
@@ -828,13 +844,14 @@ msgstr "¡Desactivar todas las opciones de correo!"
  #: plugins/admin/groups/class_groupManagement.inc:329
  #: plugins/admin/users/class_userManagement.inc:651
  #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:500
-#: plugins/admin/ogroups/class_ogroupManagement.inc:301
-#: plugins/admin/fai/class_faiManagement.inc:613
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
+#: plugins/admin/systems/class_systemManagement.inc:648
+#: plugins/admin/ogroups/class_ogroupManagement.inc:296
+#: plugins/admin/acl/class_aclManagement.inc:280
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:339
  #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:250
  msgid "Ok"
  msgstr ""
  
@@ -1026,13 +1043,13 @@ msgid ""
  msgstr ""
  
  #: plugins/personal/mail/class_mailAccount.inc:781
-#: plugins/admin/groups/class_groupMail.inc:880
+#: plugins/admin/groups/class_groupMail.inc:887
  msgid "The required field 'Primary address' is not set."
  msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
  
  #: plugins/personal/mail/class_mailAccount.inc:785
  #: plugins/personal/mail/class_mailAccount.inc:789
-#: plugins/addons/addressbook/class_addressbook.inc:694
+#: plugins/addons/addressbook/class_addressbook.inc:696
  #: plugins/admin/ogroups/class_mailogroup.inc:79
  msgid "Please enter a valid email address in 'Primary address' field."
  msgstr ""
@@ -1040,23 +1057,23 @@ msgstr ""
  "'Cuenta Principal'."
  
  #: plugins/personal/mail/class_mailAccount.inc:795
-#: plugins/admin/groups/class_groupMail.inc:889
+#: plugins/admin/groups/class_groupMail.inc:896
  #: plugins/admin/ogroups/class_mailogroup.inc:86
  msgid "The primary address you've entered is already in use."
  msgstr "La cuenta principal que ha introducido ya esta en uso."
  
  #: plugins/personal/mail/class_mailAccount.inc:801
-#: plugins/admin/groups/class_groupMail.inc:895
+#: plugins/admin/groups/class_groupMail.inc:902
  msgid "Value in 'Quota size' is not valid."
  msgstr "El valor de 'Tamaño de Cola' no es valido."
  
  #: plugins/personal/mail/class_mailAccount.inc:810
-#: plugins/admin/groups/class_groupMail.inc:904
+#: plugins/admin/groups/class_groupMail.inc:911
  msgid "Please specify a vaild mail size for mails to be rejected."
  msgstr "Por favor especifique un usuario valido."
  
  #: plugins/personal/mail/class_mailAccount.inc:820
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
  msgid "You need to set the maximum mail size in order to reject anything."
  msgstr ""
  "Necesita poner un valor máximo en el tamaño de mensaje de correo para poder "
@@ -1088,68 +1105,73 @@ msgid ""
  "methods."
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1012
+#, fuzzy
+msgid "Mail account"
+msgstr "Mi cuenta"
+
+#: plugins/personal/mail/class_mailAccount.inc:1017
  #: plugins/personal/nagios/nagios.tpl:17
-#: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/addons/addressbook/class_addressbook.inc:797
-#: plugins/admin/groups/class_groupMail.inc:1074
-#: plugins/admin/systems/class_servDNS.inc:394
+#: plugins/personal/nagios/class_nagiosAccount.inc:273
+#: plugins/addons/addressbook/class_addressbook.inc:799
+#: plugins/admin/groups/class_groupMail.inc:1081
+#: plugins/admin/systems/class_servDNS.inc:396
  #: plugins/admin/systems/servdnseditzone.tpl:51
  #: plugins/admin/ogroups/class_mailogroup.inc:175 html/getxls.php:225
  msgid "Mail address"
  msgstr "Dirección correo electrónico"
  
-#: plugins/personal/mail/class_mailAccount.inc:1017
-#: plugins/admin/groups/class_groupMail.inc:1078
+#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/admin/groups/class_groupMail.inc:1085
  msgid "Mail server"
  msgstr "Servidor de correo"
  
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1021
  #, fuzzy
  msgid "Add vacation information"
  msgstr "Información organizativa"
  
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1024
  msgid "Use spam filter"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1025
  #, fuzzy
  msgid "Spam level"
  msgstr "Nivel de log"
  
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1026
  #, fuzzy
  msgid "Spam mail box"
  msgstr "Tamaño del correo electrónico"
  
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1028
  #, fuzzy
  msgid "Reject due to mailsize"
  msgstr "rechazar correos mayores que"
  
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:1029
  #, fuzzy
  msgid "Mail max size"
  msgstr "Tamaño del correo electrónico"
  
-#: plugins/personal/mail/class_mailAccount.inc:1030
-#: plugins/personal/mail/class_mailAccount.inc:1035
+#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1036
  #, fuzzy
  msgid "Forwarding address"
  msgstr "Cuenta Principal"
  
-#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1032
  #, fuzzy
  msgid "Local delivery"
  msgstr "Último envío"
  
-#: plugins/personal/mail/class_mailAccount.inc:1032
+#: plugins/personal/mail/class_mailAccount.inc:1033
  #, fuzzy
  msgid "No delivery to own mailbox "
  msgstr "No se enviara a su propia carpeta de correo"
  
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1034
  #, fuzzy
  msgid "Mail alternative addresses"
  msgstr "Direcciones alternativas"
@@ -1220,8 +1242,9 @@ msgstr ""
  #: plugins/addons/ldapmanager/contentexport.tpl:66
  #: plugins/addons/ldapmanager/contentexportxls.tpl:69
  #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1452
+#: plugins/admin/departments/dep_iframe.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:145
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1421
  #: ihtml/themes/default/setup_useradmin.tpl:40
  #: ihtml/themes/default/setup_step4.tpl:114
  #: ihtml/themes/default/setup_step2.tpl:12
@@ -1231,13 +1254,14 @@ msgid "Back"
  msgstr "Atras"
  
  #: plugins/personal/password/class_password.inc:5
+#: plugins/personal/password/class_password.inc:17
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/admin/systems/class_goFaxServer.inc:94
  #: plugins/admin/systems/goKrbServer.tpl:20
  #: plugins/admin/systems/goFonServer.tpl:12
-#: plugins/admin/systems/class_goGlpiServer.inc:98
  #: plugins/admin/systems/goFaxServer.tpl:12
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_goGlpiServer.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:308
  #: plugins/admin/systems/goImapServer.tpl:34
  #: plugins/admin/systems/class_goFonServer.inc:107
  #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1250,7 +1274,7 @@ msgid "Password"
  msgstr "Contraseña"
  
  #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/generic/class_user.inc:1378
  #, fuzzy
  msgid "User password"
  msgstr "Borrar contraseña"
@@ -1300,12 +1324,12 @@ msgid "External password changer reported a problem: "
  msgstr "El programa externo de cambio de contraseña informo de un problema: "
  
  #: plugins/personal/password/main.inc:123
-#: plugins/admin/users/class_divListUsers.inc:261
+#: plugins/admin/users/class_divListUsers.inc:249
  msgid "Change password"
  msgstr "Cambiar contraseña"
  
  #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1327
+#: plugins/personal/posix/class_posixAccount.inc:1320
  #: plugins/personal/posix/paste_generic.tpl:8
  #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
  #: plugins/personal/samba/class_sambaAccount.inc:645
@@ -1313,7 +1337,7 @@ msgid "Home directory"
  msgstr "Directorio Principal"
  
  #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1328
+#: plugins/personal/posix/class_posixAccount.inc:1321
  msgid "Shell"
  msgstr "Shell"
  
@@ -1322,10 +1346,10 @@ msgid "Primary group"
  msgstr "Grupo primario"
  
  #: plugins/personal/posix/generic.tpl:35
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:235
  #: plugins/gofax/faxreports/contents.tpl:32
  #: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/class_faxreport.inc:482
+#: plugins/gofax/faxreports/class_faxreport.inc:487
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
  #: plugins/gofon/fonreports/contents.tpl:35
  msgid "Status"
@@ -1343,7 +1367,7 @@ msgstr "UID"
  
  #: plugins/personal/posix/generic.tpl:62
  #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:894
  msgid "GID"
  msgstr "GID"
  
@@ -1386,7 +1410,7 @@ msgstr "Mostrar los grupos de departamentos"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -1444,53 +1468,53 @@ msgstr "Parametros Unix"
  msgid "UNIX"
  msgstr "UNIX"
  
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:135
  msgid "expired"
  msgstr "expiró"
  
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:137
  msgid "grace time active"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:140
  msgid "active, password not changable"
  msgstr "activo, no puede cambiar la contraseña"
  
-#: plugins/personal/posix/class_posixAccount.inc:143
+#: plugins/personal/posix/class_posixAccount.inc:142
  msgid "active, password expired"
  msgstr "activo, la contraseña expiró"
  
-#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:144
  msgid "active"
  msgstr "activo"
  
-#: plugins/personal/posix/class_posixAccount.inc:156
-#: plugins/personal/posix/class_posixAccount.inc:1010
+#: plugins/personal/posix/class_posixAccount.inc:155
+#: plugins/personal/posix/class_posixAccount.inc:1002
  msgid "Group of user"
  msgstr "Grupo de usuarios"
  
-#: plugins/personal/posix/class_posixAccount.inc:191
+#: plugins/personal/posix/class_posixAccount.inc:190
  msgid "unconfigured"
  msgstr "Desconfigurado"
  
-#: plugins/personal/posix/class_posixAccount.inc:208
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:791
+#: plugins/personal/posix/class_posixAccount.inc:201
+#: plugins/admin/systems/class_workstationStartup.inc:825
  #: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:196
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
  msgid "automatic"
  msgstr "automático"
  
-#: plugins/personal/posix/class_posixAccount.inc:254
+#: plugins/personal/posix/class_posixAccount.inc:247
  msgid "This account has no unix extensions."
  msgstr "Este cuenta no tiene extensiones unix."
  
-#: plugins/personal/posix/class_posixAccount.inc:274
-#: plugins/personal/posix/class_posixAccount.inc:277
+#: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
  msgid "Remove posix account"
  msgstr "Eliminar cuenta Posix"
  
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:268
  msgid ""
  "This account has unix features enabled. To disable them, you'll need to "
  "remove the samba / environment account first."
@@ -1498,7 +1522,7 @@ msgstr ""
  "Esta cuenta tiene las características unix activadas. Para desactivarlas, "
  "necesita eliminar la cuenta samba primero."
  
-#: plugins/personal/posix/class_posixAccount.inc:278
+#: plugins/personal/posix/class_posixAccount.inc:271
  msgid ""
  "This account has posix features enabled. You can disable them by clicking "
  "below."
@@ -1506,11 +1530,11 @@ msgstr ""
  "Esta cuenta tiene características posix activadas. Puede desactivarla "
  "pulsando aqui"
  
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:274
  msgid "Create posix account"
  msgstr "Crear cuenta posix"
  
-#: plugins/personal/posix/class_posixAccount.inc:282
+#: plugins/personal/posix/class_posixAccount.inc:275
  msgid ""
  "This account has posix features disabled. You can enable them by clicking "
  "below."
@@ -1518,30 +1542,30 @@ msgstr ""
  "Esta cuenta tiene la extensión posix desactivada. Puede activarla pulsando "
  "aquí."
  
-#: plugins/personal/posix/class_posixAccount.inc:442
+#: plugins/personal/posix/class_posixAccount.inc:435
  #, php-format
  msgid "Password can't be changed up to %s days after last change"
  msgstr ""
  "La contraseñas no pueden ser cambiadas hasta %s días desde el último cambio"
  
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:439
  #, php-format
  msgid "Password must be changed after %s days"
  msgstr "La contraseñas deben ser cambiadas despues de %s días"
  
-#: plugins/personal/posix/class_posixAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:443
  #, php-format
  msgid "Disable account after %s days of inactivity after password expiery"
  msgstr ""
  "Desactivar cuente despues de %s días de inactividad despues de expirar la "
  "contraseña"
  
-#: plugins/personal/posix/class_posixAccount.inc:454
+#: plugins/personal/posix/class_posixAccount.inc:447
  #, php-format
  msgid "Warn user %s days before password expiery"
  msgstr "Avisar al usuario %s días antes de expirar la contraseña"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1550,7 +1574,7 @@ msgstr "Avisar al usuario %s días antes de expirar la contraseña"
  msgid "January"
  msgstr "Enero"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1559,7 +1583,7 @@ msgstr "Enero"
  msgid "February"
  msgstr "Febrero"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1568,7 +1592,7 @@ msgstr "Febrero"
  msgid "March"
  msgstr "Marzo"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1577,7 +1601,7 @@ msgstr "Marzo"
  msgid "April"
  msgstr "Abril"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1586,7 +1610,7 @@ msgstr "Abril"
  msgid "May"
  msgstr "Mayo"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1595,7 +1619,7 @@ msgstr "Mayo"
  msgid "June"
  msgstr "Junio"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1604,7 +1628,7 @@ msgstr "Junio"
  msgid "July"
  msgstr "Julio"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1613,7 +1637,7 @@ msgstr "Julio"
  msgid "August"
  msgstr "Agosto"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1622,7 +1646,7 @@ msgstr "Agosto"
  msgid "September"
  msgstr "Septiembre"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1631,7 +1655,7 @@ msgstr "Septiembre"
  msgid "October"
  msgstr "Octubre"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1640,7 +1664,7 @@ msgstr "Octubre"
  msgid "November"
  msgstr "Noviembre"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1649,154 +1673,159 @@ msgstr "Noviembre"
  msgid "December"
  msgstr "Diciembre"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  #: plugins/personal/samba/class_sambaAccount.inc:468
-#: plugins/admin/systems/class_terminalGeneric.inc:97
+#: plugins/admin/systems/class_terminalGeneric.inc:104
  #: ihtml/themes/default/setup_step4.tpl:91
  msgid "disabled"
  msgstr "desactivado"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  msgid "full access"
  msgstr "Acceso completo"
  
-#: plugins/personal/posix/class_posixAccount.inc:576
+#: plugins/personal/posix/class_posixAccount.inc:568
  msgid "allow access to these hosts"
  msgstr "Permitir el acceso a estos equipos"
  
-#: plugins/personal/posix/class_posixAccount.inc:622
+#: plugins/personal/posix/class_posixAccount.inc:614
  #, fuzzy, php-format
  msgid "Removing of user/posix account with dn '%s' failed."
  msgstr "Se ha fallado al eliminar la cuenta del proxy"
  
-#: plugins/personal/posix/class_posixAccount.inc:770
+#: plugins/personal/posix/class_posixAccount.inc:762
  msgid "Failed: overriding lock"
  msgstr "Fallo: Sobrepasado bloqueo"
  
-#: plugins/personal/posix/class_posixAccount.inc:859
+#: plugins/personal/posix/class_posixAccount.inc:851
  #, fuzzy, php-format
  msgid "Saving of user/posix account with dn '%s' failed."
  msgstr "Ha fallado la grabación de la cuenta proxy"
  
-#: plugins/personal/posix/class_posixAccount.inc:924
+#: plugins/personal/posix/class_posixAccount.inc:916
  msgid "The required field 'Home directory' is not set."
  msgstr "El campo requerido 'Directorio de usuario' no esta rellenado."
  
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:919
  msgid "Please enter a valid path in 'Home directory' field."
  msgstr ""
  "Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
  
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:927
  msgid "Value specified as 'UID' is not valid."
  msgstr "El valor especificado en 'UID' no es valido."
  
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:930
  msgid "Value specified as 'UID' is too small."
  msgstr "El valor especificado como 'UID' es demasiado pequeño."
  
-#: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/admin/groups/class_groupGeneric.inc:797
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:791
  msgid "Value specified as 'GID' is not valid."
  msgstr "El valor especificado como 'GID' no es valido."
  
-#: plugins/personal/posix/class_posixAccount.inc:945
-#: plugins/admin/groups/class_groupGeneric.inc:800
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:794
  msgid "Value specified as 'GID' is too small."
  msgstr "El valor especificado como 'GID' es muy pequeño."
  
-#: plugins/personal/posix/class_posixAccount.inc:953
+#: plugins/personal/posix/class_posixAccount.inc:945
  msgid "Value specified as 'shadowMin' is not valid."
  msgstr "El valor especificado en 'shadowMin' no es valido."
  
-#: plugins/personal/posix/class_posixAccount.inc:958
+#: plugins/personal/posix/class_posixAccount.inc:950
  msgid "Value specified as 'shadowMax' is not valid."
  msgstr "El valor especificado en 'shadowMax' no es valido."
  
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:955
  msgid "Value specified as 'shadowWarning' is not valid."
  msgstr "El valor especificado en 'shadowWarning' no es valido."
  
-#: plugins/personal/posix/class_posixAccount.inc:966
+#: plugins/personal/posix/class_posixAccount.inc:958
  msgid "'shadowWarning' without 'shadowMax' makes no sense."
  msgstr "'shadowWarning' sin 'shadowMax' no tiene sentido."
  
-#: plugins/personal/posix/class_posixAccount.inc:969
+#: plugins/personal/posix/class_posixAccount.inc:961
  msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
  msgstr ""
  "El valor especificado como 'shadowWarning' debería ser menor que 'shadowMax'."
  
-#: plugins/personal/posix/class_posixAccount.inc:972
+#: plugins/personal/posix/class_posixAccount.inc:964
  msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
  msgstr ""
  "El valor especificado como 'shadowWarning' debería ser mayor que 'shadowMin'."
  
-#: plugins/personal/posix/class_posixAccount.inc:977
+#: plugins/personal/posix/class_posixAccount.inc:969
  msgid "Value specified as 'shadowInactive' is not valid."
  msgstr "El valor especificado en 'shadowInactive' no es valido."
  
-#: plugins/personal/posix/class_posixAccount.inc:980
+#: plugins/personal/posix/class_posixAccount.inc:972
  msgid "'shadowInactive' without 'shadowMax' makes no sense."
  msgstr "'shadowInactive' sin 'shadowMax' no tiene sentido."
  
-#: plugins/personal/posix/class_posixAccount.inc:985
+#: plugins/personal/posix/class_posixAccount.inc:977
  msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
  msgstr ""
  "El valor especificado como 'shadowMin' debería ser menor que 'shadowMax'."
  
-#: plugins/personal/posix/class_posixAccount.inc:1148
-#: plugins/admin/groups/class_groupGeneric.inc:836
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:830
  msgid "Too many users, can't allocate a free ID!"
  msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
  
-#: plugins/personal/posix/class_posixAccount.inc:1317
+#: plugins/personal/posix/class_posixAccount.inc:1309
  #, fuzzy
  msgid "POSIX account"
  msgstr "Cuenta GLPI"
  
-#: plugins/personal/posix/class_posixAccount.inc:1329
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:100
+#: plugins/personal/posix/class_posixAccount.inc:1314
+#, fuzzy
+msgid "Posix Account"
+msgstr "Cuenta proxy"
+
+#: plugins/personal/posix/class_posixAccount.inc:1322
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:100
  #: html/getxls.php:135 html/getxls.php:158 html/getxls.php:347
  #: html/getxls.php:364
  msgid "User ID"
  msgstr "Identificador (ID) de usuario"
  
-#: plugins/personal/posix/class_posixAccount.inc:1330
+#: plugins/personal/posix/class_posixAccount.inc:1323
  #, fuzzy
  msgid "Group ID"
  msgstr "Grupo"
  
-#: plugins/personal/posix/class_posixAccount.inc:1332
+#: plugins/personal/posix/class_posixAccount.inc:1325
  #, fuzzy
  msgid "Force password change on login"
  msgstr "No se permite cambiar contraseña"
  
-#: plugins/personal/posix/class_posixAccount.inc:1333
+#: plugins/personal/posix/class_posixAccount.inc:1326
  #, fuzzy
  msgid "Shadow min"
  msgstr "Ocultamiento"
  
-#: plugins/personal/posix/class_posixAccount.inc:1334
+#: plugins/personal/posix/class_posixAccount.inc:1327
  #, fuzzy
  msgid "Shadow max"
  msgstr "Ocultamiento"
  
-#: plugins/personal/posix/class_posixAccount.inc:1335
+#: plugins/personal/posix/class_posixAccount.inc:1328
  #, fuzzy
  msgid "Shadow warning"
  msgstr "Ocultamiento"
  
-#: plugins/personal/posix/class_posixAccount.inc:1336
+#: plugins/personal/posix/class_posixAccount.inc:1329
  #, fuzzy
  msgid "Shadow inactive"
  msgstr "Ocultamiento"
  
-#: plugins/personal/posix/class_posixAccount.inc:1337
+#: plugins/personal/posix/class_posixAccount.inc:1330
  #, fuzzy
  msgid "Shadow expire"
  msgstr "Mostrar personal"
  
-#: plugins/personal/posix/class_posixAccount.inc:1338
+#: plugins/personal/posix/class_posixAccount.inc:1331
  #, fuzzy
  msgid "System trust model"
  msgstr "Autenticación del sistema"
@@ -1828,7 +1857,7 @@ msgid "Allow user to change password from client"
  msgstr "Permitir al usuario cambiar las opciones desde el cliente"
  
  #: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1056
  msgid "Login from windows client requires no password"
  msgstr "El inicio de sesión en window no requiere contraseña"
  
@@ -1837,7 +1866,7 @@ msgid "Temporary disable samba account"
  msgstr "Desactivar temporalmente la cuenta samba"
  
  #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1069
+#: plugins/personal/samba/class_sambaAccount.inc:1070
  msgid "Domain"
  msgstr "Dominio"
  
@@ -1846,12 +1875,12 @@ msgid "Terminal Server"
  msgstr "Servidor de terminal"
  
  #: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1052
  msgid "Allow login on terminal server"
  msgstr "Permitir entrada en el servidor de terminal"
  
  #: plugins/personal/samba/samba3.tpl:131
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1053
  msgid "Inherit client config"
  msgstr "Configuración del cliente por defecto"
  
@@ -1916,17 +1945,17 @@ msgid "Reconnect if disconnected"
  msgstr "Reconexión si se ha desconectado"
  
  #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1057
  msgid "Lock samba account"
  msgstr "Bloquear cuenta samba"
  
  #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1062
+#: plugins/personal/samba/class_sambaAccount.inc:1063
  msgid "Limit Logon Time"
  msgstr "Tiempo de entrada límite"
  
  #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1063
+#: plugins/personal/samba/class_sambaAccount.inc:1064
  msgid "Limit Logoff Time"
  msgstr "Tiempo de salida límite"
  
@@ -2068,41 +2097,46 @@ msgstr ""
  msgid "Saving of user/samba account with dn '%s' failed."
  msgstr "Ha fallado la eliminación de la cuenta de Kolab"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1047
+#, fuzzy
+msgid "Samba account"
+msgstr "Bloquear cuenta samba"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1055
  #, fuzzy
  msgid "Allow user to change password"
  msgstr "Permitir al usuario cambiar las opciones desde el cliente"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1059
+#: plugins/personal/samba/class_sambaAccount.inc:1060
  #, fuzzy
  msgid "Account expires"
  msgstr "La cuenta expirará después de"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1060
+#: plugins/personal/samba/class_sambaAccount.inc:1061
  #, fuzzy
  msgid "Password expires"
  msgstr "La contraseña expira en"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1065
+#: plugins/personal/samba/class_sambaAccount.inc:1066
  #, fuzzy
  msgid "Generic home directory"
  msgstr "Directorio Principal"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1066
+#: plugins/personal/samba/class_sambaAccount.inc:1067
  msgid "Generic samba home drive"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1067
+#: plugins/personal/samba/class_sambaAccount.inc:1068
  #, fuzzy
  msgid "Generic script path"
  msgstr "Ruta del Script"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1068
+#: plugins/personal/samba/class_sambaAccount.inc:1069
  #, fuzzy
  msgid "Generic profile path"
  msgstr "Ruta del Perfil"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1070
+#: plugins/personal/samba/class_sambaAccount.inc:1071
  #, fuzzy
  msgid "Allow connection from"
  msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
@@ -2119,100 +2153,90 @@ msgstr "hombre"
  msgid "This account has no valid GOsa extensions."
  msgstr "Esta cuenta no tiene extensiones GOsa validas"
  
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:335
  msgid "The specified file has not been uploaded via HTTP POST! Aborted."
  msgstr ""
  "¡El archivo especificado no ha podido ser subido vía HTTP POST! Abortado."
  
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:432
  msgid "Please enter a valid serial number"
  msgstr "Por favor introduzca un número de serie válido"
  
-#: plugins/personal/generic/class_user.inc:471
+#: plugins/personal/generic/class_user.inc:476
  msgid ""
  "(Some types of certificates are currently not supported and may be displayed "
  "as 'invalid'.)"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:481
+#: plugins/personal/generic/class_user.inc:486
  #, php-format
  msgid "Certificate is valid from %s to %s and is currently %s."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:484
+#: plugins/personal/generic/class_user.inc:489
  msgid "valid"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:485
+#: plugins/personal/generic/class_user.inc:490
  msgid "invalid"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:490
+#: plugins/personal/generic/class_user.inc:495
  msgid "No certificate installed"
  msgstr "No hay certificados instalados"
  
-#: plugins/personal/generic/class_user.inc:579
+#: plugins/personal/generic/class_user.inc:582
  #, fuzzy, php-format
  msgid "Removing of user/generic account with dn '%s' failed."
  msgstr "Eliminar cuenta Posix"
  
-#: plugins/personal/generic/class_user.inc:611
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:982
  msgid "Kerberos database communication failed"
  msgstr "La comunicación con la base de datos Kerberos ha fallado"
  
-#: plugins/personal/generic/class_user.inc:625
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:628
+#: plugins/personal/generic/class_user.inc:999
  msgid "Can't remove user from kerberos database."
  msgstr "No se puede eliminar el usuario de la base de datos Kerberos"
  
-#: plugins/personal/generic/class_user.inc:682
-#: plugins/admin/systems/class_printGeneric.inc:625
+#: plugins/personal/generic/class_user.inc:684
  #, fuzzy, php-format
  msgid "You are not allowed to move this object to '%s'."
  msgstr "¡No tiene permisos para eliminar este objeto grupo!"
  
-#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:935
  #, fuzzy, php-format
  msgid "Saving of user/generic account with dn '%s' failed."
  msgstr "Cuenta proxy"
  
-#: plugins/personal/generic/class_user.inc:1008
+#: plugins/personal/generic/class_user.inc:1010
  msgid "Can't add user to kerberos database."
  msgstr "No se puede añadir el usuario de la base de datos Kerberos"
  
-#: plugins/personal/generic/class_user.inc:1049
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "No tiene permisos para crear un usuario en esta 'Base'."
-
-#: plugins/personal/generic/class_user.inc:1052
-#, fuzzy
-msgid "You have no permissions to move this user to the specified 'Base'."
-msgstr "No tiene permisos para transladar a un usuario de su base original"
-
-#: plugins/personal/generic/class_user.inc:1058
-#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/personal/generic/class_user.inc:1057
+#: plugins/addons/addressbook/class_addressbook.inc:653
  #: plugins/admin/users/class_userManagement.inc:471
  #: plugins/admin/users/class_userManagement.inc:549
  msgid "The required field 'Name' is not set."
  msgstr "El campo requerido 'Nombre' no ha sido rellenado."
  
-#: plugins/personal/generic/class_user.inc:1067
+#: plugins/personal/generic/class_user.inc:1066
  msgid "There's already a person with this 'Login' in the database."
  msgstr "Ya existe un usuario con este 'Login' en la base de datos."
  
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/personal/generic/class_user.inc:1072
+#: plugins/addons/addressbook/class_addressbook.inc:657
  #: plugins/admin/users/class_userManagement.inc:474
  #: plugins/admin/users/class_userManagement.inc:552
  msgid "The required field 'Given name' is not set."
  msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
  
-#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1075
  msgid "The required field 'Login' is not set."
  msgstr " El campo requerido 'Login' no ha sido rellenado."
  
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1082
  msgid ""
  "There's already a person with this 'Name'/'Given name' combination in the "
  "database."
@@ -2220,7 +2244,7 @@ msgstr ""
  "Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
  "base de datos."
  
-#: plugins/personal/generic/class_user.inc:1090
+#: plugins/personal/generic/class_user.inc:1089
  msgid ""
  "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
@@ -2228,121 +2252,121 @@ msgstr ""
  "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
  "guiones están permitidos."
  
-#: plugins/personal/generic/class_user.inc:1093
+#: plugins/personal/generic/class_user.inc:1092
  msgid "The field 'Homepage' contains an invalid URL definition."
  msgstr "El campo 'Pagina web principal' contiene un URL no valida"
  
-#: plugins/personal/generic/class_user.inc:1096
-#: plugins/personal/generic/class_user.inc:1121
-#: plugins/addons/addressbook/class_addressbook.inc:661
-#: plugins/addons/addressbook/class_addressbook.inc:689
-#: plugins/admin/departments/class_departmentGeneric.inc:249
+#: plugins/personal/generic/class_user.inc:1095
+#: plugins/personal/generic/class_user.inc:1120
+#: plugins/addons/addressbook/class_addressbook.inc:663
+#: plugins/addons/addressbook/class_addressbook.inc:691
+#: plugins/admin/departments/class_departmentGeneric.inc:269
  msgid "The field 'Name' contains invalid characters."
  msgstr "El campo 'Nombre' contiene caracteres no validos."
  
-#: plugins/personal/generic/class_user.inc:1099
-#: plugins/personal/generic/class_user.inc:1118
-#: plugins/addons/addressbook/class_addressbook.inc:664
-#: plugins/addons/addressbook/class_addressbook.inc:686
+#: plugins/personal/generic/class_user.inc:1098
+#: plugins/personal/generic/class_user.inc:1117
+#: plugins/addons/addressbook/class_addressbook.inc:666
+#: plugins/addons/addressbook/class_addressbook.inc:688
  msgid "The field 'Given name' contains invalid characters."
  msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
  
-#: plugins/personal/generic/class_user.inc:1104
-#: plugins/addons/addressbook/class_addressbook.inc:669
-#: plugins/addons/addressbook/class_addressbook.inc:672
-#: plugins/admin/departments/class_departmentGeneric.inc:252
+#: plugins/personal/generic/class_user.inc:1103
+#: plugins/addons/addressbook/class_addressbook.inc:671
+#: plugins/addons/addressbook/class_addressbook.inc:674
+#: plugins/admin/departments/class_departmentGeneric.inc:272
  msgid "The field 'Phone' contains an invalid phone number."
  msgstr "El campo 'Teléfono' contiene un número de teléfono no valido."
  
-#: plugins/personal/generic/class_user.inc:1107
-#: plugins/addons/addressbook/class_addressbook.inc:675
-#: plugins/admin/departments/class_departmentGeneric.inc:255
+#: plugins/personal/generic/class_user.inc:1106
+#: plugins/addons/addressbook/class_addressbook.inc:677
+#: plugins/admin/departments/class_departmentGeneric.inc:275
  msgid "The field 'Fax' contains an invalid phone number."
  msgstr "El campo 'Fax' contiene un número de teléfono no valido."
  
-#: plugins/personal/generic/class_user.inc:1110
-#: plugins/addons/addressbook/class_addressbook.inc:678
+#: plugins/personal/generic/class_user.inc:1109
+#: plugins/addons/addressbook/class_addressbook.inc:680
  msgid "The field 'Mobile' contains an invalid phone number."
  msgstr "El campo 'Teléfono móvil' contiene un número de teléfono invalido."
  
-#: plugins/personal/generic/class_user.inc:1113
-#: plugins/addons/addressbook/class_addressbook.inc:681
+#: plugins/personal/generic/class_user.inc:1112
+#: plugins/addons/addressbook/class_addressbook.inc:683
  msgid "The field 'Pager' contains an invalid phone number."
  msgstr ""
  "El campo 'Dispositivo de Búsqueda' contiene un número de teléfono invalido."
  
-#: plugins/personal/generic/class_user.inc:1222
+#: plugins/personal/generic/class_user.inc:1221
  msgid "Could not open specified certificate!"
  msgstr "¡No puedo abrir el certificado especificado!"
  
-#: plugins/personal/generic/class_user.inc:1353
+#: plugins/personal/generic/class_user.inc:1352
  #: plugins/personal/generic/generic.tpl:442
  msgid "Unit"
  msgstr "Unidad"
  
-#: plugins/personal/generic/class_user.inc:1354
+#: plugins/personal/generic/class_user.inc:1353
  #: plugins/personal/generic/generic.tpl:467
  msgid "House identifier"
  msgstr "Tipo de Vía"
  
-#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/class_user.inc:1354
  #: plugins/personal/generic/generic.tpl:384
  msgid "Vocation"
  msgstr "Intereses"
  
-#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1355
  #: plugins/personal/generic/generic.tpl:511
  msgid "Last delivery"
  msgstr "Último envío"
  
-#: plugins/personal/generic/class_user.inc:1357
+#: plugins/personal/generic/class_user.inc:1356
  #: plugins/personal/generic/generic.tpl:433
  msgid "Person locality"
  msgstr "Población de la Persona"
  
-#: plugins/personal/generic/class_user.inc:1358
+#: plugins/personal/generic/class_user.inc:1357
  #: plugins/personal/generic/generic.tpl:392
  msgid "Unit description"
  msgstr "Descripción de la unidad"
  
-#: plugins/personal/generic/class_user.inc:1359
+#: plugins/personal/generic/class_user.inc:1358
  #: plugins/personal/generic/generic.tpl:401
  msgid "Subject area"
  msgstr "Adjunto al area"
  
-#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/class_user.inc:1359
  #: plugins/personal/generic/generic.tpl:410
  msgid "Functional title"
  msgstr "Título Funcional"
  
-#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/class_user.inc:1361
  #: plugins/personal/generic/generic.tpl:520
  msgid "Public visible"
  msgstr "Visible Publicamente"
  
-#: plugins/personal/generic/class_user.inc:1363
+#: plugins/personal/generic/class_user.inc:1362
  #: plugins/personal/generic/generic.tpl:451
  msgid "Street"
  msgstr "Calle"
  
-#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1363
  #: plugins/personal/generic/generic.tpl:419
  msgid "Role"
  msgstr "Papel desempeñado"
  
-#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/class_user.inc:1364
  #: plugins/personal/generic/generic.tpl:459
  #: plugins/addons/addressbook/address_edit.tpl:179
  #: plugins/addons/addressbook/address_info.tpl:133 html/getxls.php:227
  msgid "Postal code"
  msgstr "Código Postal"
  
-#: plugins/personal/generic/class_user.inc:1369
+#: plugins/personal/generic/class_user.inc:1368
  #, fuzzy
  msgid "Generic user settings"
  msgstr "Parámetros genéricos de la cola"
  
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:1373
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/users/class_userManagement.inc:28
  #: plugins/admin/systems/printer.tpl:91
@@ -2352,219 +2376,220 @@ msgstr "Parámetros genéricos de la cola"
  msgid "Users"
  msgstr "Usuarios"
  
-#: plugins/personal/generic/class_user.inc:1378
+#: plugins/personal/generic/class_user.inc:1377
  #: plugins/personal/generic/generic.tpl:143
  #: plugins/gofax/blocklists/generic.tpl:17
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:598
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
  #: plugins/addons/godfs/class_dfsManagment.inc:217
  #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:894
-#: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/groups/class_groupGeneric.inc:888
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:129
  #: plugins/admin/applications/generic.tpl:42
-#: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:134
+#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/class_divListApplication.inc:144
  #: plugins/admin/departments/generic.tpl:35
-#: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:107
+#: plugins/admin/departments/class_departmentGeneric.inc:586
+#: plugins/admin/departments/class_divListDepartment.inc:100
  #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:22
  #: plugins/admin/systems/phone.tpl:17 plugins/admin/systems/printer.tpl:27
  #: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/class_terminalGeneric.inc:513
-#: plugins/admin/systems/class_servGeneric.inc:346
-#: plugins/admin/systems/class_workstationGeneric.inc:515
+#: plugins/admin/systems/class_terminalGeneric.inc:553
+#: plugins/admin/systems/class_servGeneric.inc:359
+#: plugins/admin/systems/class_workstationGeneric.inc:537
  #: plugins/admin/systems/wingeneric.tpl:13
  #: plugins/admin/systems/component.tpl:17
-#: plugins/admin/systems/class_printGeneric.inc:864
-#: plugins/admin/systems/class_componentGeneric.inc:267
-#: plugins/admin/systems/class_glpiSelectUser.inc:167
+#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_componentGeneric.inc:269
+#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_glpiSelectUser.inc:181
  #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:148
+#: plugins/admin/systems/class_divListSystem.inc:187
  #: plugins/admin/systems/goLdapServer.tpl:2
  #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:719
-#: plugins/admin/ogroups/class_divListOGroup.inc:145
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_divListOGroup.inc:149
+#: plugins/admin/acl/class_divListACL.inc:98
+#: plugins/admin/fai/class_divListFai.inc:171
  #: plugins/admin/mimetypes/generic.tpl:44
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:683
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:153
  #: plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/class_gofonMacro.inc:484
-#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/macro/class_gofonMacro.inc:497
+#: plugins/gofon/macro/class_divListMacros.inc:106
  #: plugins/gofon/conference/generic.tpl:49
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
-#: plugins/gofon/conference/class_divListConferences.inc:119
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_divListConferences.inc:114
  msgid "Base"
  msgstr "Base"
  
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/addons/addressbook/class_addressbook.inc:792 html/getxls.php:301
  #, fuzzy
  msgid "Surename"
  msgstr "Nombre del servidor"
  
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/addons/addressbook/class_addressbook.inc:611
-#: plugins/addons/addressbook/class_addressbook.inc:791 html/getxls.php:86
+#: plugins/personal/generic/class_user.inc:1380
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/addressbook/class_addressbook.inc:793 html/getxls.php:86
  #: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
  msgid "Given name"
  msgstr "Nombre"
  
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/addons/addressbook/class_addressbook.inc:796
+#: plugins/personal/generic/class_user.inc:1381
+#: plugins/addons/addressbook/class_addressbook.inc:798
  #, fuzzy
  msgid "User identification"
  msgstr "Información de Usuario"
  
-#: plugins/personal/generic/class_user.inc:1383
+#: plugins/personal/generic/class_user.inc:1382
  #: plugins/personal/generic/generic.tpl:73
  #: plugins/addons/addressbook/address_edit.tpl:60
  #: plugins/addons/addressbook/address_info.tpl:40
  msgid "Personal title"
  msgstr "Título Personal"
  
-#: plugins/personal/generic/class_user.inc:1384
+#: plugins/personal/generic/class_user.inc:1383
  #: plugins/personal/generic/generic.tpl:83
  msgid "Academic title"
  msgstr "Títulos academicos"
  
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
+#: plugins/personal/generic/class_user.inc:1384
+#: plugins/addons/addressbook/class_addressbook.inc:809 html/getxls.php:224
  msgid "Home postal address"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1386
-#: plugins/addons/addressbook/class_addressbook.inc:795
+#: plugins/personal/generic/class_user.inc:1385
+#: plugins/addons/addressbook/class_addressbook.inc:797
  #, fuzzy
  msgid "Home phone number"
  msgstr "Número de teléfono"
  
-#: plugins/personal/generic/class_user.inc:1387
+#: plugins/personal/generic/class_user.inc:1386
  #: plugins/personal/generic/generic.tpl:183
  msgid "Homepage"
  msgstr "Página Web Principal"
  
-#: plugins/personal/generic/class_user.inc:1388
+#: plugins/personal/generic/class_user.inc:1387
  #: plugins/personal/generic/generic.tpl:250
-#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
+#: plugins/addons/addressbook/class_addressbook.inc:801 html/getxls.php:299
  msgid "Organization"
  msgstr "Organización"
  
-#: plugins/personal/generic/class_user.inc:1389
+#: plugins/personal/generic/class_user.inc:1388
  #: plugins/personal/generic/generic.tpl:258
  #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
  #: plugins/addons/addressbook/address_edit.tpl:155
-#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/class_addressbook.inc:802
  #: plugins/addons/addressbook/address_info.tpl:117
  #: plugins/admin/users/class_divListUsers.inc:56
  #: plugins/admin/applications/class_divListApplication.inc:51
-#: plugins/admin/ogroups/class_ogroupManagement.inc:354
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
  #: plugins/gofon/macro/class_divListMacros.inc:52
  #: plugins/generic/references/class_reference.inc:38
  msgid "Department"
  msgstr "Departamento"
  
-#: plugins/personal/generic/class_user.inc:1390
+#: plugins/personal/generic/class_user.inc:1389
  #: plugins/personal/generic/generic.tpl:93
  msgid "Date of birth"
  msgstr "Fecha de nacimiento"
  
-#: plugins/personal/generic/class_user.inc:1391
+#: plugins/personal/generic/class_user.inc:1390
  #, fuzzy
  msgid "Gender"
  msgstr "Remitente"
  
-#: plugins/personal/generic/class_user.inc:1392
+#: plugins/personal/generic/class_user.inc:1391
  #, fuzzy
  msgid "Preferred language"
  msgstr "Lenguaje preferido"
  
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1392
  #, fuzzy
  msgid "Department number"
  msgstr "Nombre del departamento"
  
-#: plugins/personal/generic/class_user.inc:1394
+#: plugins/personal/generic/class_user.inc:1393
  #, fuzzy
  msgid "Employee number"
  msgstr "Tipo de empleado"
  
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:1394
  #: plugins/personal/generic/generic.tpl:282
  msgid "Employee type"
  msgstr "Tipo de empleado"
  
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:1395
  #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/class_addressbook.inc:801
+#: plugins/addons/addressbook/class_addressbook.inc:803
  #: plugins/addons/godfs/generic.tpl:34
  #: plugins/admin/departments/generic.tpl:56
  #: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: plugins/admin/departments/class_departmentGeneric.inc:587
  #: plugins/admin/systems/workstation.tpl:19
-#: plugins/admin/systems/class_workstationGeneric.inc:514
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_workstationGeneric.inc:536
+#: plugins/admin/systems/class_printGeneric.inc:870
  #: plugins/admin/systems/class_glpiAccount.inc:782
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
  msgid "Location"
  msgstr "Localización"
  
-#: plugins/personal/generic/class_user.inc:1397
+#: plugins/personal/generic/class_user.inc:1396
  #: plugins/personal/generic/generic.tpl:360
-#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:806
  #: plugins/admin/departments/generic.tpl:60
-#: plugins/admin/departments/class_departmentGeneric.inc:547
+#: plugins/admin/departments/class_departmentGeneric.inc:591
  #: html/getxls.php:228 html/getxls.php:301
  msgid "State"
  msgstr "Estado"
  
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1397
  #: plugins/personal/generic/paste_generic.tpl:47
  msgid "User picture"
  msgstr "Foto del usuario"
  
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1398
  #, fuzzy
  msgid "Room number"
  msgstr "Número de teléfono"
  
-#: plugins/personal/generic/class_user.inc:1400
-#: plugins/addons/addressbook/class_addressbook.inc:792
+#: plugins/personal/generic/class_user.inc:1399
+#: plugins/addons/addressbook/class_addressbook.inc:794
  #, fuzzy
  msgid "Telefon number"
  msgstr "Número de teléfono"
  
-#: plugins/personal/generic/class_user.inc:1401
-#: plugins/addons/addressbook/class_addressbook.inc:794
+#: plugins/personal/generic/class_user.inc:1400
+#: plugins/addons/addressbook/class_addressbook.inc:796
  #, fuzzy
  msgid "Mobile number"
  msgstr "Teléfono particular"
  
-#: plugins/personal/generic/class_user.inc:1402
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/nagios/class_nagiosAccount.inc:272
  #, fuzzy
  msgid "Pager number"
  msgstr "Número de teléfono"
  
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1402
  #, fuzzy
  msgid "User certificates"
  msgstr "Certificado estandar"
  
-#: plugins/personal/generic/class_user.inc:1405
-#: plugins/addons/addressbook/class_addressbook.inc:802
-#: plugins/addons/addressbook/class_addressbook.inc:803 html/getxls.php:226
+#: plugins/personal/generic/class_user.inc:1404
+#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:805 html/getxls.php:226
  #: html/getxls.php:298 html/getxls.php:300
  #, fuzzy
  msgid "Postal address"
  msgstr "Código Postal"
  
-#: plugins/personal/generic/class_user.inc:1406
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:820
-#: plugins/addons/addressbook/class_addressbook.inc:793
+#: plugins/personal/generic/class_user.inc:1405
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
+#: plugins/addons/addressbook/class_addressbook.inc:795
  #, fuzzy
  msgid "Fax number"
  msgstr "Número de serie"
@@ -2639,7 +2664,7 @@ msgstr "Elija el subárbol donde colocar el usuario"
  #: plugins/admin/systems/workstation.tpl:35
  #: plugins/admin/systems/wingeneric.tpl:18
  #: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:36
+#: plugins/admin/mimetypes/generic.tpl:53 plugins/gofon/macro/generic.tpl:36
  #: plugins/gofon/conference/generic.tpl:56
  #: plugins/gofon/conference/generic.tpl:62
  msgid "Select a base"
@@ -2652,7 +2677,7 @@ msgstr "Seleccione una base"
  #: plugins/addons/addressbook/address_info.tpl:59
  #: plugins/addons/addressbook/address_info.tpl:155
  #: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/class_departmentGeneric.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:592
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
  msgid "Address"
  msgstr "Dirección"
@@ -2710,7 +2735,7 @@ msgstr "Teléfono Móvil"
  #: plugins/personal/generic/generic.tpl:326
  #: plugins/personal/nagios/nagios.tpl:79
  #: plugins/addons/addressbook/address_edit.tpl:246
-#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/class_addressbook.inc:800
  #: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
  #: html/getxls.php:300
  msgid "Pager"
@@ -2732,6 +2757,7 @@ msgstr ""
  
  #: plugins/personal/generic/generic_picture.tpl:27
  #: plugins/personal/generic/paste_generic.tpl:52
+#: plugins/admin/applications/generic.tpl:81
  msgid "Remove picture"
  msgstr "Eliminar foto"
  
@@ -2739,37 +2765,38 @@ msgstr "Eliminar foto"
  #: plugins/personal/generic/generic_certs.tpl:91
  #: plugins/personal/environment/hotplugDialogNew.tpl:53
  #: plugins/addons/addressbook/address_edit.tpl:264
-#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/departments/dep_move_confirm.tpl:15
+#: plugins/admin/systems/goNtpServer.tpl:29
  #: plugins/admin/systems/servdns.tpl:21
-#: plugins/admin/systems/servkolab.tpl:246
-#: plugins/admin/systems/goNtpServer.tpl:30
-#: plugins/admin/systems/goKrbServer.tpl:31
+#: plugins/admin/systems/servkolab.tpl:245
+#: plugins/admin/systems/goKrbServer.tpl:30
+#: plugins/admin/systems/goFonServer.tpl:39
  #: plugins/admin/systems/servnfs.tpl:139
-#: plugins/admin/systems/goFonServer.tpl:40
+#: plugins/admin/systems/goFaxServer.tpl:23
  #: plugins/admin/systems/servRepository.tpl:66
-#: plugins/admin/systems/goFaxServer.tpl:24
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
  #: plugins/admin/systems/glpi_devices.tpl:760
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
  #: plugins/admin/systems/servdnseditzone.tpl:119
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/goLdapServer.tpl:10
-#: plugins/admin/systems/goShareServer.tpl:30
-#: plugins/admin/systems/goMailServer.tpl:222
-#: plugins/admin/systems/goImapServer.tpl:117
-#: plugins/admin/systems/goSyslogServer.tpl:6
-#: plugins/admin/systems/goGlpiServer.tpl:33
-#: plugins/admin/systems/goCupsServer.tpl:6
-#: plugins/admin/systems/goTerminalServer.tpl:24
-#: plugins/admin/systems/goLogDBServer.tpl:24
-#: plugins/admin/systems/goSpamServer.tpl:126
-#: plugins/admin/systems/goSpamServerRule.tpl:22
-#: plugins/admin/systems/goVirusServer.tpl:169
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:29
+#: plugins/admin/systems/goMailServer.tpl:221
+#: plugins/admin/systems/goImapServer.tpl:116
+#: plugins/admin/systems/goSyslogServer.tpl:5
+#: plugins/admin/systems/goGlpiServer.tpl:32
+#: plugins/admin/systems/goCupsServer.tpl:5
+#: plugins/admin/systems/goTerminalServer.tpl:23
+#: plugins/admin/systems/goLogDBServer.tpl:23
+#: plugins/admin/systems/goSpamServer.tpl:125
+#: plugins/admin/systems/goSpamServerRule.tpl:21
+#: plugins/admin/systems/goVirusServer.tpl:168
  #: plugins/admin/systems/class_goService.inc:33
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:38
  #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/default/copyPasteDialog.tpl:19
  msgid "Save"
  msgstr "Guardar"
  
@@ -2791,21 +2818,21 @@ msgstr "Certificado estandar"
  #: plugins/personal/connectivity/class_kolabAccount.inc:258
  #: plugins/personal/environment/environment.tpl:159
  #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:597
+#: plugins/admin/groups/class_groupMail.inc:604
  #: plugins/admin/applications/class_applicationParameters.inc:124
  #: plugins/admin/systems/printer.tpl:71
  #: plugins/admin/systems/glpiPrinter.tpl:152
  #: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:182
+#: plugins/admin/systems/workstationStartup.tpl:186
  #: plugins/admin/systems/terminalStartup.tpl:111
  #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:393
  #: plugins/admin/systems/goMailServer.tpl:73
  #: plugins/admin/systems/goMailServer.tpl:104
  #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:78
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
+#: plugins/admin/fai/faiPackage.tpl:81
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:293
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:295
  msgid "Remove"
  msgstr "Eliminar"
  
@@ -2834,6 +2861,7 @@ msgid "Set new password"
  msgstr "Poner nueva Contraseña"
  
  #: plugins/personal/connectivity/pureftpd.tpl:4
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
  msgid "FTP account"
  msgstr "Cuenta FTP"
  
@@ -2889,6 +2917,7 @@ msgstr "Acceso FTP desactivado temporalmente"
  
  #: plugins/personal/connectivity/proxy.tpl:23
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
+#: plugins/personal/connectivity/class_proxyAccount.inc:297
  msgid "Proxy account"
  msgstr "Cuenta proxy"
  
@@ -2901,7 +2930,7 @@ msgid "Limit proxy access to working time"
  msgstr "Limitar acceso al proxy al horario laboral"
  
  #: plugins/personal/connectivity/proxy.tpl:84
-#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
  msgid "Restrict proxy usage by quota"
  msgstr "Restringir el uso del proxy con cuota"
  
@@ -2938,7 +2967,7 @@ msgstr "Parámetros de grupo"
  #: plugins/personal/connectivity/class_pureftpdAccount.inc:219
  #: plugins/personal/connectivity/class_oxchangeAccount.inc:950
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
  #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
  #: plugins/personal/connectivity/class_opengwAccount.inc:310
@@ -2946,12 +2975,18 @@ msgstr "Parámetros de grupo"
  msgid "Connectivity addon"
  msgstr "Conectividad"
  
+#: plugins/personal/connectivity/class_phpgwAccount.inc:148
+#, fuzzy
+msgid "PHPgroupware"
+msgstr "PHPGroupware"
+
  #: plugins/personal/connectivity/phpgw.tpl:3
  msgid "PHPGroupware account"
  msgstr "Cuenta PHPGroupware"
  
  #: plugins/personal/connectivity/kolab.tpl:3
  #: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/class_kolabAccount.inc:452
  msgid "Kolab account"
  msgstr "Cuenta Kolab"
  
@@ -2964,7 +2999,7 @@ msgstr ""
  "modificadas si añade una cuenta de correo."
  
  #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:459
+#: plugins/personal/connectivity/class_kolabAccount.inc:460
  msgid "Delegations"
  msgstr "Delegaciones"
  
@@ -2996,7 +3031,7 @@ msgid "days"
  msgstr "días"
  
  #: plugins/personal/connectivity/kolab.tpl:93
-#: plugins/personal/connectivity/class_kolabAccount.inc:460
+#: plugins/personal/connectivity/class_kolabAccount.inc:461
  msgid "Invitation policy"
  msgstr "Política de invitación"
  
@@ -3081,16 +3116,16 @@ msgstr "Ha fallado la eliminación de la cuenta de Kolab"
  msgid "Kolab account settings"
  msgstr "Cuenta Kolab"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:456
+#: plugins/personal/connectivity/class_kolabAccount.inc:457
  msgid "Free busy future"
  msgstr ""
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:457
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
  #, fuzzy
  msgid "Mail size restriction"
  msgstr "Parámetros de correo"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:458
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
  #, fuzzy
  msgid "Free busy information"
  msgstr "Información de estado de presencia"
@@ -3111,6 +3146,7 @@ msgid "Saving of user/webDAV account with dn '%s' failed."
  msgstr "Ha fallado al guardar la cuenta WebDAV"
  
  #: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_webdavAccount.inc:147
  #: plugins/personal/connectivity/webdav.tpl:3
  msgid "WebDAV account"
  msgstr "Cuenta WebDAV"
@@ -3168,32 +3204,32 @@ msgstr "Tipo de FS"
  msgid "Pure ftp account"
  msgstr "Crear cuenta de fax"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
  #, fuzzy
  msgid "Quota files"
  msgstr "Tamaño de la Cola de correo"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
  #, fuzzy
  msgid "Upload ratio"
  msgstr "Enviar"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
  #, fuzzy
  msgid "Quota MBytes"
  msgstr "Tamaño de la Cola de correo"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
  #, fuzzy
  msgid "Download ratio"
  msgstr "Descargar configuración"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
  #, fuzzy
  msgid "Upload bandwith"
  msgstr "Ancho de banda ascendente"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
  #, fuzzy
  msgid "Download bandwith"
  msgstr "Ancho de banda descendente"
@@ -3293,22 +3329,28 @@ msgstr "Open-Xchange"
  msgid "Open xchange account settings"
  msgstr "Cuenta de Open-Xchange"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:959
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
+#, fuzzy
+msgid "OpenExchange account"
+msgstr "Cuenta de Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
  #, fuzzy
  msgid "OXAppointmentDays"
  msgstr "Días de recordatorio"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
  #, fuzzy
  msgid "OXTaskDays"
  msgstr "Días para tareas"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:962
  #, fuzzy
  msgid "OXTimeZone"
  msgstr "Zona de uso horario del usuario"
  
  #: plugins/personal/connectivity/intranet.tpl:3
+#: plugins/personal/connectivity/class_intranetAccount.inc:181
  msgid "Intranet account"
  msgstr "Crear cuenta de intranet"
  
@@ -3368,17 +3410,18 @@ msgstr "El valor numérico para cuota no es valido."
  msgid "Saving of user/proxy account with dn '%s' failed."
  msgstr "Ha fallado la grabación de la cuenta proxy"
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:301
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
  msgid "Filter unwanted content"
  msgstr ""
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
  #, fuzzy
  msgid "Limit proxy access"
  msgstr "Limitar acceso al proxy al horario laboral"
  
  #: plugins/personal/connectivity/pptp.tpl:3
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_pptpAccount.inc:164
  msgid "PPTP account"
  msgstr "Cuenta PPTP"
  
@@ -3397,7 +3440,7 @@ msgstr "Ha fallado la eliminación de la cuenta de intranet"
  msgid "Saving of user/intranet account with dn '%s' failed."
  msgstr "Ha fallado la grabación de la cuenta de intranet"
  
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #, fuzzy
  msgid "Intranet account settings"
  msgstr "Crear cuenta de intranet"
@@ -3423,29 +3466,30 @@ msgstr "Ha fallado la grabación de la cuenta PPTP"
  
  #: plugins/personal/connectivity/opengw.tpl:1
  #: plugins/personal/connectivity/class_opengwAccount.inc:309
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
  msgid "Opengroupware"
  msgstr "Cuenta OpenGroupware"
  
  #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:319
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
  msgid "Location team"
  msgstr "Equipo de localización"
  
  #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:320
+#: plugins/personal/connectivity/class_opengwAccount.inc:321
  msgid "Template user"
  msgstr "Plantilla de usuario"
  
  #: plugins/personal/connectivity/opengw.tpl:33
-#: plugins/personal/connectivity/class_opengwAccount.inc:321
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/ogroups/class_termgroup.inc:42
+#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/admin/systems/class_servGeneric.inc:53
+#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/ogroups/class_termgroup.inc:41
  msgid "Locked"
  msgstr "Bloqueado"
  
  #: plugins/personal/connectivity/opengw.tpl:48
-#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/personal/connectivity/class_opengwAccount.inc:323
  msgid "Teams"
  msgstr "Equipos"
  
@@ -3477,6 +3521,11 @@ msgstr "PHPscheduleit"
  msgid "PHP Schedule it settings"
  msgstr "PHPscheduleit"
  
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:149
+#, fuzzy
+msgid "PHP schedule it"
+msgstr "PHPscheduleit"
+
  #: plugins/personal/connectivity/class_opengwAccount.inc:6
  msgid "Opengroupware account"
  msgstr "Cuenta OpenGroupware"
@@ -3535,7 +3584,7 @@ msgid "Profil quota"
  msgstr "Cuota del Perfil"
  
  #: plugins/personal/environment/environment.tpl:73
-#: plugins/personal/environment/class_environment.inc:1282
+#: plugins/personal/environment/class_environment.inc:1285
  msgid "Cache profile localy"
  msgstr ""
  
@@ -3544,7 +3593,7 @@ msgid "Kiosk profile settings"
  msgstr "Parámetros del perfil de Kiosk"
  
  #: plugins/personal/environment/environment.tpl:85
-#: plugins/personal/environment/class_environment.inc:1288
+#: plugins/personal/environment/class_environment.inc:1291
  msgid "Kiosk profile"
  msgstr ""
  
@@ -3553,22 +3602,22 @@ msgid "Manage"
  msgstr "Gestionar"
  
  #: plugins/personal/environment/environment.tpl:105
-#: plugins/personal/environment/class_environment.inc:1281
+#: plugins/personal/environment/class_environment.inc:1284
  msgid "Resolution changeable during session"
  msgstr ""
  
  #: plugins/personal/environment/environment.tpl:110
-#: plugins/personal/environment/class_environment.inc:1287
+#: plugins/personal/environment/class_environment.inc:1290
  #: plugins/admin/systems/workstationService.tpl:122
  #: plugins/admin/systems/terminalService.tpl:108
  msgid "Resolution"
  msgstr "Resolución"
  
  #: plugins/personal/environment/environment.tpl:133
-#: plugins/personal/environment/class_environment.inc:1293
+#: plugins/personal/environment/class_environment.inc:1296
  #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1123
-#: plugins/admin/systems/workstationStartup.tpl:158
+#: plugins/admin/systems/class_workstationStartup.inc:1168
+#: plugins/admin/systems/workstationStartup.tpl:162
  #: plugins/admin/systems/terminalStartup.tpl:87
  #: plugins/admin/systems/goShareServer.tpl:1
  msgid "Shares"
@@ -3597,7 +3646,7 @@ msgid "Logon script management"
  msgstr "Gestión del script de gestión"
  
  #: plugins/personal/environment/environment.tpl:203
-#: plugins/personal/environment/class_environment.inc:1292
+#: plugins/personal/environment/class_environment.inc:1295
  msgid "Hotplug devices"
  msgstr "Dispositivos de conexión en caliente (HotPlug)"
  
@@ -3607,7 +3656,7 @@ msgstr "Parámetros dispositivos de conexión en caliente (HotPlug)"
  
  #: plugins/personal/environment/environment.tpl:219
  #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "New"
  msgstr "Nuevo"
  
@@ -3664,7 +3713,7 @@ msgid "Please select an entry or press cancel."
  msgstr "¡Por favor seleccione una entrada o presione cancelar."
  
  #: plugins/personal/environment/class_selectPrinterDialog.inc:102
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:140
  msgid "Please select a printer or press cancel."
  msgstr "¡Por favor seleccione una impresora o presione cancelar."
  
@@ -3705,8 +3754,8 @@ msgid "auto"
  msgstr "automático"
  
  #: plugins/personal/environment/class_environment.inc:230
-#: plugins/admin/systems/class_terminalService.inc:95
  #: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_terminalService.inc:97
  #, php-format
  msgid ""
  "You have specified an external resolution hook which can't be read, please "
@@ -3774,7 +3823,7 @@ msgstr "No le es permitido borrar este usuario"
  #: plugins/personal/environment/class_environment.inc:591
  #: plugins/personal/environment/class_environment.inc:604
  #: plugins/admin/systems/class_terminalStartup.inc:203
-#: plugins/admin/systems/class_workstationStartup.inc:616
+#: plugins/admin/systems/class_workstationStartup.inc:645
  msgid "You must specify a valid mount point."
  msgstr "Por favor especifique un punto de montaje válido."
  
@@ -3838,30 +3887,32 @@ msgid "Administrator"
  msgstr "Administrador"
  
  #: plugins/personal/environment/class_environment.inc:1243
-#: plugins/personal/environment/class_environment.inc:1290
+#: plugins/personal/environment/class_environment.inc:1293
  msgid "Default printer"
  msgstr "Impresora por defecto"
  
  #: plugins/personal/environment/class_environment.inc:1270
+#: plugins/personal/environment/class_environment.inc:1275
+#: plugins/personal/environment/class_environment.inc:1277
  #, fuzzy
  msgid "Environment settings"
  msgstr "Parámetros de estado de usuarios"
  
-#: plugins/personal/environment/class_environment.inc:1277
+#: plugins/personal/environment/class_environment.inc:1280
  msgid "Command to extend the list of possible screen resolutions"
  msgstr ""
  
-#: plugins/personal/environment/class_environment.inc:1284
+#: plugins/personal/environment/class_environment.inc:1287
  #, fuzzy
  msgid "Profile quota"
  msgstr "Cuota del Perfil"
  
-#: plugins/personal/environment/class_environment.inc:1285
+#: plugins/personal/environment/class_environment.inc:1288
  #, fuzzy
  msgid "Profile server"
  msgstr "Servidor de Archivos"
  
-#: plugins/personal/environment/class_environment.inc:1291
+#: plugins/personal/environment/class_environment.inc:1294
  #: plugins/personal/environment/logonManagement.tpl:56
  msgid "Logon script"
  msgstr ""
@@ -3907,31 +3958,31 @@ msgstr "Nombre del Script"
  #: plugins/personal/environment/logonManagement.tpl:17
  #: plugins/personal/environment/hotplugDialogNew.tpl:17
  #: plugins/gofax/blocklists/generic.tpl:51
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:597
  #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
  #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:889
  #: plugins/admin/applications/generic.tpl:33
-#: plugins/admin/applications/class_applicationGeneric.inc:525
+#: plugins/admin/applications/class_applicationGeneric.inc:534
  #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/departments/class_departmentGeneric.inc:540
-#: plugins/admin/systems/class_winGeneric.inc:260
+#: plugins/admin/departments/class_departmentGeneric.inc:584
+#: plugins/admin/systems/class_winGeneric.inc:281
  #: plugins/admin/systems/server.tpl:14 plugins/admin/systems/phone.tpl:34
  #: plugins/admin/systems/printer.tpl:16
-#: plugins/admin/systems/class_servGeneric.inc:344
+#: plugins/admin/systems/class_servGeneric.inc:357
  #: plugins/admin/systems/wingeneric.tpl:25
  #: plugins/admin/systems/component.tpl:35
-#: plugins/admin/systems/class_printGeneric.inc:865
-#: plugins/admin/systems/class_componentGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_componentGeneric.inc:270
  #: plugins/admin/systems/servnfs.tpl:19
-#: plugins/admin/systems/class_phoneGeneric.inc:435
+#: plugins/admin/systems/class_phoneGeneric.inc:441
  #: plugins/admin/systems/class_goMailServer.inc:695
  #: plugins/admin/systems/class_goShareServer.inc:372
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:720
+#: plugins/admin/ogroups/class_ogroup.inc:703
  #: plugins/admin/fai/faiVariable.tpl:21
-#: plugins/admin/fai/class_faiScript.inc:527
-#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/class_faiScript.inc:538
+#: plugins/admin/fai/class_faiTemplate.inc:508
  #: plugins/admin/fai/faiPackage.tpl:21
  #: plugins/admin/fai/faiPartitionTable.tpl:21
  #: plugins/admin/fai/class_faiScriptEntry.inc:180
@@ -3939,7 +3990,7 @@ msgstr "Nombre del Script"
  #: plugins/admin/fai/class_faiPackage.inc:537
  #: plugins/admin/fai/class_faiProfile.inc:452
  #: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:21
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:464
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:13
  #: plugins/admin/fai/faiScript.tpl:21
  #: plugins/admin/fai/class_faiVariableEntry.inc:143
@@ -3948,16 +3999,16 @@ msgstr "Nombre del Script"
  #: plugins/admin/fai/class_faiPartitionTable.inc:529
  #: plugins/admin/fai/class_faiHookEntry.inc:189
  #: plugins/admin/fai/faiHookEntry.tpl:19
-#: plugins/admin/fai/class_faiVariable.inc:421
+#: plugins/admin/fai/class_faiVariable.inc:417
  #: plugins/admin/fai/class_faiTemplateEntry.inc:248
  #: plugins/admin/fai/faiTemplateEntry.tpl:13
-#: plugins/admin/mimetypes/generic.tpl:35
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:674
+#: plugins/admin/mimetypes/generic.tpl:34
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:682
  #: plugins/admin/mimetypes/paste_generic.tpl:21
  #: plugins/gofon/macro/generic.tpl:49
-#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/macro/class_gofonMacro.inc:498
  #: plugins/gofon/conference/generic.tpl:78
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
  #: plugins/generic/references/contents.tpl:11 html/getxls.php:158
  #: html/getxls.php:287
  msgid "Description"
@@ -3989,11 +4040,11 @@ msgstr ""
  #: plugins/admin/groups/application_options.tpl:11
  #: plugins/admin/users/class_userManagement.inc:654
  #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:503
+#: plugins/admin/systems/class_systemManagement.inc:651
  #: plugins/admin/systems/printerPPDDialog.tpl:22
  #: plugins/admin/systems/servRepositorySetup.tpl:54
-#: plugins/admin/ogroups/class_ogroupManagement.inc:304
-#: plugins/admin/fai/class_faiManagement.inc:616
+#: plugins/admin/ogroups/class_ogroupManagement.inc:299
+#: plugins/admin/fai/class_faiManagement.inc:626
  #: plugins/admin/fai/faiProfileEntry.tpl:70
  #: plugins/admin/fai/faiScriptEntry.tpl:82
  #: plugins/admin/fai/faiVariableEntry.tpl:54
@@ -4002,9 +4053,9 @@ msgstr ""
  #: plugins/admin/fai/faiPackageEntry.tpl:56
  #: plugins/admin/fai/faiPackageConfiguration.tpl:6
  #: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:340
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:342
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:260
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:253
  #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
  #: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
  msgid "Apply"
@@ -4093,7 +4144,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
-#: plugins/admin/fai/class_faiSummaryTab.inc:209
+#: plugins/admin/fai/class_faiSummaryTab.inc:236
  #: include/class_MultiSelectWindow.inc:81
  msgid "Close"
  msgstr "Cerrar"
@@ -4103,37 +4154,37 @@ msgid "Nagios Account"
  msgstr "Cuenta Nagios"
  
  #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
  msgid "Alias"
  msgstr "Alias"
  
  #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:276
+#: plugins/personal/nagios/class_nagiosAccount.inc:277
  msgid "Host notification period"
  msgstr "Periodo de Notificación de Host"
  
  #: plugins/personal/nagios/nagios.tpl:40
-#: plugins/personal/nagios/class_nagiosAccount.inc:280
+#: plugins/personal/nagios/class_nagiosAccount.inc:281
  msgid "Service notification period"
  msgstr "Periodo de Notificación de Servicio"
  
  #: plugins/personal/nagios/nagios.tpl:53
-#: plugins/personal/nagios/class_nagiosAccount.inc:279
+#: plugins/personal/nagios/class_nagiosAccount.inc:280
  msgid "Service notification options"
  msgstr "Opciones de Notificación de Servicio"
  
  #: plugins/personal/nagios/nagios.tpl:66
-#: plugins/personal/nagios/class_nagiosAccount.inc:275
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
  msgid "Host notification options"
  msgstr "Opciones de Notificación de Host"
  
  #: plugins/personal/nagios/nagios.tpl:90
-#: plugins/personal/nagios/class_nagiosAccount.inc:278
+#: plugins/personal/nagios/class_nagiosAccount.inc:279
  msgid "Service notification commands"
  msgstr "Comandos de Notificación de Servicio"
  
  #: plugins/personal/nagios/nagios.tpl:100
-#: plugins/personal/nagios/class_nagiosAccount.inc:274
+#: plugins/personal/nagios/class_nagiosAccount.inc:275
  msgid "Host notification commands"
  msgstr "Comandos de Notificación de Host"
  
@@ -4227,37 +4278,42 @@ msgstr "Ha fallado borrar cuenta de nagios"
  msgid "Nagios account settings"
  msgstr "Parámetros de Nagios"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:282
+#: plugins/personal/nagios/class_nagiosAccount.inc:265
+#, fuzzy
+msgid "Nagios account"
+msgstr "Cuenta Nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:283
  #, fuzzy
  msgid "View all hosts"
  msgstr "Ver todos los hosts"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:283
+#: plugins/personal/nagios/class_nagiosAccount.inc:284
  #, fuzzy
  msgid "View all services"
  msgstr "Ver todos los servicios"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:285
+#: plugins/personal/nagios/class_nagiosAccount.inc:286
  #, fuzzy
  msgid "Trigger system commands"
  msgstr "Ver la información de sistema"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:286
+#: plugins/personal/nagios/class_nagiosAccount.inc:287
  #, fuzzy
  msgid "Trigger all host commands"
  msgstr "Ver todos los hosts"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:287
+#: plugins/personal/nagios/class_nagiosAccount.inc:288
  #, fuzzy
  msgid "Trigger all service commands"
  msgstr "Ver todos los servicios"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:289
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
  #, fuzzy
  msgid "View configuration information"
  msgstr "Ver la información de configuración"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:290
+#: plugins/personal/nagios/class_nagiosAccount.inc:291
  #, fuzzy
  msgid "View system informations"
  msgstr "Ver la información de sistema"
@@ -4267,7 +4323,7 @@ msgid "Nagios settings"
  msgstr "Parámetros de Nagios"
  
  #: plugins/personal/netatalk/netatalk.tpl:4
-#: plugins/personal/netatalk/class_netatalk.inc:365
+#: plugins/personal/netatalk/class_netatalk.inc:366
  msgid "Share"
  msgstr "Compartido"
  
@@ -4328,7 +4384,12 @@ msgstr "Ha fallado la grabación de la cuenta Netatalk"
  msgid "Removing of user/netatalk account with dn '%s' failed."
  msgstr "Ha fallado la eliminación de la cuenta Netatalk"
  
-#: plugins/personal/netatalk/class_netatalk.inc:364
+#: plugins/personal/netatalk/class_netatalk.inc:360
+#, fuzzy
+msgid "Netatalk account"
+msgstr "Gestionar cuenta Netatalk"
+
+#: plugins/personal/netatalk/class_netatalk.inc:365
  #, fuzzy
  msgid "User home path"
  msgstr "Ruta del Perfil"
@@ -4362,9 +4423,9 @@ msgstr "Elija lugar del árbol para colocar la aplicación"
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
  #: plugins/admin/systems/class_goShareServer.inc:373
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
-#: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiSummaryTab.inc:345
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:136
  msgid "Type"
  msgstr "Tipo"
  
@@ -4387,13 +4448,15 @@ msgstr "Los números pueden contener también comodínes"
  #: plugins/gofax/blocklists/remove.tpl:2
  #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
  #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/systems/remove_ppd.tpl:2
  #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
  #: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
  #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
  #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:339 html/index.php:345
+#: html/index.php:49 html/index.php:337 html/index.php:343
  #: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/remove.tpl:2
  msgid "Warning"
@@ -4424,77 +4487,74 @@ msgid "Blocklist management"
  msgstr "Gestión de listas de bloqueo"
  
  #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
  msgid "FAX Blocklists"
  msgstr "Lista de bloqueos de FAX"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:168
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:167
  #, php-format
  msgid "You're about to delete the blocklist '%s'."
  msgstr "Has decidido eliminar la lista de bloqueo '%s'."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:185
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:184
  msgid "You have no permission to remove this blocklist."
  msgstr "No tiene permisos para eliminar esta lista de bloqueo."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:200
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:199
  msgid "Please specify a valid phone number."
  msgstr "Por favor especifique un usuario valido."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "send"
  msgstr "enviar"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "receive"
  msgstr "recibir"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:435
  #, fuzzy, php-format
  msgid "Removing of blocklist with dn '%s' failed."
  msgstr "Ha fallado la eliminación de la estación de trabajo"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:477
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr "No tiene permisos para crear una lista de bloqueo en esta 'Base'."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:482
-#: plugins/admin/departments/class_departmentGeneric.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:487
+#: plugins/admin/departments/class_departmentGeneric.inc:258
  msgid "Required field 'Name' is not set."
  msgstr "El campo requerido 'Nombre' no ha sido rellenado."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:490
  msgid "Required field 'Name' contains invalid characters"
  msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:497
  msgid "Specified name is already used."
  msgstr "El nombre especificado ya esta siendo usado"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:547
  #, fuzzy, php-format
  msgid "Saving of blocklist with dn '%s' failed."
  msgstr "Ha fallado la grabación de la estación de trabajo"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
  #, fuzzy
-msgid "Fax Blocklists"
+msgid "Fax blocklists"
  msgstr "Lista de bloqueos de FAX"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:596
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/addressbook/address_info.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:893
-#: plugins/admin/applications/class_applicationGeneric.inc:523
-#: plugins/admin/applications/class_applicationGeneric.inc:527
-#: plugins/admin/systems/class_terminalGeneric.inc:514
-#: plugins/admin/systems/class_servGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:863
-#: plugins/admin/systems/class_componentGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:887
+#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/systems/class_terminalGeneric.inc:554
+#: plugins/admin/systems/class_servGeneric.inc:356
+#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_componentGeneric.inc:268
  #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_phoneGeneric.inc:434
-#: plugins/admin/systems/class_servRepository.inc:358
+#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_servRepository.inc:374
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:105
@@ -4514,10 +4574,10 @@ msgstr "Lista de bloqueos de FAX"
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
  #: plugins/admin/systems/class_goShareServer.inc:370
  #: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:701
  #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
  #: plugins/admin/fai/faiPackage.tpl:9
  #: plugins/admin/fai/faiPartitionTable.tpl:9
  #: plugins/admin/fai/class_faiScriptEntry.inc:179
@@ -4525,7 +4585,7 @@ msgstr "Lista de bloqueos de FAX"
  #: plugins/admin/fai/class_faiPackage.inc:536
  #: plugins/admin/fai/class_faiProfile.inc:451
  #: plugins/admin/fai/class_faiHook.inc:535 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:454
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
  #: plugins/admin/fai/faiScript.tpl:9
  #: plugins/admin/fai/class_faiVariableEntry.inc:142
@@ -4534,23 +4594,23 @@ msgstr "Lista de bloqueos de FAX"
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
  #: plugins/admin/fai/class_faiHookEntry.inc:188
  #: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #: plugins/admin/fai/class_faiTemplateEntry.inc:247
  #: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:313
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
+#: plugins/admin/fai/class_faiSummaryTab.inc:340
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
  #: plugins/gofon/macro/parameter.tpl:6
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
  #: html/getxls.php:223 html/getxls.php:290
  msgid "Name"
  msgstr "Nombre"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:599
  #, fuzzy
  msgid "Blocklist"
  msgstr "Listas de bloqueo"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:600
  #, fuzzy
  msgid "Blocklist type"
  msgstr "N0mbre de listas de bloqueo"
@@ -4617,7 +4677,7 @@ msgstr "Mostrar listas de bloqueos entrantes"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -4628,242 +4688,107 @@ msgstr "Seleccione para buscar dentro del subárbol"
  msgid "Regular expression for matching list names"
  msgstr "Expresiones regulares para encontrar nombres de listas"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Go to root department"
-msgstr "Ir al departamento raíz"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Root"
-msgstr "Raíz"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-msgid "Go up one department"
-msgstr "Subir un departamento"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-#: include/class_acl.inc:368
-msgid "Up"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Go to users department"
-msgstr "Ir al departamento de los usuarios"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/fai/class_divListFai.inc:139
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Home"
-msgstr "Inicio"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/fai/class_divListFai.inc:141
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/conference/class_divListConferences.inc:103
-msgid "Reload list"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:142
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:103
-#: plugins/gofon/conference/class_divListConferences.inc:121
-msgid "Submit"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  msgid "Create new blocklist"
  msgstr "Crear nueva lista de bloqueos"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  msgid "New Blocklist"
  msgstr "Nueva lista de bloqueo"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
  #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:121
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
  msgid "Submit department"
  msgstr "Enviar departamentos"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/users/class_divListUsers.inc:255
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+#: include/class_MultiSelectWindow.inc:209
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:243
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
  #: plugins/admin/systems/glpiPrinter.tpl:18
  #: plugins/admin/systems/glpiPrinter.tpl:32 plugins/admin/systems/glpi.tpl:18
  #: plugins/admin/systems/glpi.tpl:32 plugins/admin/systems/glpi.tpl:46
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/acl/class_divListACL.inc:122
-#: plugins/admin/fai/class_faiScript.inc:283
-#: plugins/admin/fai/class_faiScript.inc:285
-#: plugins/admin/fai/class_faiTemplate.inc:257
-#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/acl/class_divListACL.inc:127
+#: plugins/admin/fai/class_faiScript.inc:293
+#: plugins/admin/fai/class_faiScript.inc:295
+#: plugins/admin/fai/class_faiTemplate.inc:270
+#: plugins/admin/fai/class_faiTemplate.inc:272
  #: plugins/admin/fai/class_faiHook.inc:294
  #: plugins/admin/fai/class_faiHook.inc:296
-#: plugins/admin/fai/class_divListFai.inc:241
-#: plugins/admin/fai/class_divListFai.inc:244
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/macro/class_divListMacros.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:159
-#: plugins/gofon/conference/class_divListConferences.inc:159
-#: include/class_acl.inc:370 include/class_acl.inc:415
+#: plugins/admin/fai/class_divListFai.inc:239
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/macro/class_divListMacros.inc:146
+#: plugins/gofon/conference/class_divListConferences.inc:155
+#: include/class_acl.inc:372 include/class_acl.inc:417
  msgid "edit"
  msgstr "Editar"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/users/class_divListUsers.inc:256
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/users/class_divListUsers.inc:244
  msgid "Edit user"
  msgstr "Editar usuario"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:274
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/acl/class_divListACL.inc:125
-#: plugins/admin/fai/class_faiScript.inc:287
-#: plugins/admin/fai/class_faiTemplate.inc:261
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/addons/mailqueue/contents.tpl:94
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/users/class_divListUsers.inc:262
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/acl/class_divListACL.inc:131
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:274
  #: plugins/admin/fai/class_faiHook.inc:298
-#: plugins/admin/fai/class_divListFai.inc:252
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/macro/class_divListMacros.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:167
-#: plugins/gofon/conference/class_divListConferences.inc:169
-#: include/class_acl.inc:371 include/class_acl.inc:416
+#: plugins/admin/fai/class_divListFai.inc:250
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/macro/class_divListMacros.inc:154
+#: plugins/gofon/conference/class_divListConferences.inc:165
+#: include/class_acl.inc:373 include/class_acl.inc:418
  msgid "delete"
  msgstr "borrar"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/admin/users/class_divListUsers.inc:263
  msgid "Delete user"
  msgstr "Borrar usuario"
  
@@ -4873,7 +4798,7 @@ msgid "Fax number for GOfax to trigger on"
  msgstr "Numero de fax que activa GOfax"
  
  #: plugins/gofax/faxaccount/generic.tpl:21
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
  #: plugins/admin/ogroups/phonequeue.tpl:47
  #: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
  #: html/getxls.php:281
@@ -4887,7 +4812,7 @@ msgstr ""
  "correo"
  
  #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:831
  msgid "Delivery format"
  msgstr "Formato de envío"
  
@@ -4908,12 +4833,12 @@ msgid "Deliver fax as mail to"
  msgstr "Enviar fax como correo electrónico a"
  
  #: plugins/gofax/faxaccount/generic.tpl:70
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
  msgid "Deliver fax as mail"
  msgstr "Enviar fax como correo electrónico"
  
  #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:830
  msgid "Deliver fax to printer"
  msgstr "Enviar fax a la impresora"
  
@@ -4980,15 +4905,15 @@ msgstr "Parametros del Fax"
  msgid "FAX"
  msgstr "FAX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
  msgid "This account has no fax extensions."
  msgstr "Esta cuenta no tiene extensiones de fax."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
  msgid "Remove fax account"
  msgstr "Eliminar cuenta de fax"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
  msgid ""
  "This account has fax features enabled. You can disable them by clicking "
  "below."
@@ -4996,11 +4921,11 @@ msgstr ""
  "Esta cuenta tiene la extensión de fax activada. Puede desactivarla pulsando "
  "aquí."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
  msgid "Create fax account"
  msgstr "Crear cuenta de fax"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:159
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
  msgid ""
  "This account has fax features disabled. You can enable them by clicking "
  "below."
@@ -5008,71 +4933,71 @@ msgstr ""
  "Esta cuenta tiene la extensión de fax desactivada. Puede activarla pulsando "
  "aquí."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:222
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:229
  msgid "You're trying to add an invalid phone number."
  msgstr "Esta intentando añadir un número de teléfono no valido."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:512
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:438
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:519
  #: plugins/admin/groups/class_groupApplication.inc:674
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
  msgid "back"
  msgstr "Atrás"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:617
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
  #, fuzzy, php-format
  msgid "Removing of user/fax account with dn '%s' failed."
  msgstr "Eliminar cuenta Posix"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:632
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
  msgid "The required field 'Fax' is not set."
  msgstr "No ha rellenado el campo requerido 'Fax'"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
  msgid "Please enter a valid telephone number in the 'Fax' field."
  msgstr "Por favor introduzca un numero de teléfono valido en el campo 'Fax'"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
  msgid "Mail delivery is checked, but no address has been specified."
  msgstr ""
  "Envío de correo ha sido seleccionado, pero no se ha especificado ninguna "
  "dirección de correo."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:646
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
  msgid "The mail address you've entered is invalid."
  msgstr "La cuenta de correo electrónico que ha introducido no es válida."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
  msgid ""
  "Deliver fax to printer, is only possible if valid printer is given. Please "
  "correct your choice."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:737
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:744
  #, fuzzy, php-format
  msgid "Saving of user/fax account with dn '%s' failed."
  msgstr "Ha fallado la grabación de la cuenta proxy"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:808
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
  #, fuzzy
  msgid "Fax account settings"
  msgstr "Parametros de samba"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
  msgid "Enable/Disable fax"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
  #, fuzzy
  msgid "Receive blocklist"
  msgstr "Mostrar listas de bloqueos entrantes"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
  #, fuzzy
  msgid "Send blocklist"
  msgstr "Mostrar listas de bloqueos salientes"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
  #, fuzzy
  msgid "Alternate fax number"
  msgstr "Intercambiar los números de fax"
@@ -5089,7 +5014,7 @@ msgid "Filter"
  msgstr "Filtro"
  
  #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:109
  #: plugins/addons/logview/contents.tpl:47
  #: plugins/addons/mailqueue/contents.tpl:11
  #: plugins/gofon/fonreports/contents.tpl:6
@@ -5128,17 +5053,17 @@ msgstr "Buscar"
  
  #: plugins/gofax/faxreports/contents.tpl:30
  #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:842
-#: plugins/admin/ogroups/class_ogroupManagement.inc:351
+#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/ogroups/class_ogroupManagement.inc:346
  #: plugins/admin/fai/faiTemplateEntry.tpl:110
  msgid "User"
  msgstr "Usuario"
  
  #: plugins/gofax/faxreports/contents.tpl:31
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #: plugins/addons/logview/contents.tpl:84
  #: plugins/gofon/fonreports/contents.tpl:30
-#: plugins/gofon/fonreports/class_fonreport.inc:398
+#: plugins/gofon/fonreports/class_fonreport.inc:399
  msgid "Date"
  msgstr "Fecha"
  
@@ -5179,22 +5104,22 @@ msgid "Date / Time"
  msgstr "Fecha / Hora"
  
  #: plugins/gofax/faxreports/detail.tpl:29
-#: plugins/gofax/faxreports/class_faxreport.inc:484
+#: plugins/gofax/faxreports/class_faxreport.inc:489
  msgid "Sender MSN"
  msgstr "MSN del Remitente"
  
  #: plugins/gofax/faxreports/detail.tpl:33
-#: plugins/gofax/faxreports/class_faxreport.inc:483
+#: plugins/gofax/faxreports/class_faxreport.inc:488
  msgid "Sender ID"
  msgstr "ID del Remitente"
  
  #: plugins/gofax/faxreports/detail.tpl:37
-#: plugins/gofax/faxreports/class_faxreport.inc:486
+#: plugins/gofax/faxreports/class_faxreport.inc:491
  msgid "Receiver MSN"
  msgstr "MSN del Receptor"
  
  #: plugins/gofax/faxreports/detail.tpl:41
-#: plugins/gofax/faxreports/class_faxreport.inc:485
+#: plugins/gofax/faxreports/class_faxreport.inc:490
  msgid "Receiver ID"
  msgstr "ID del Receptor"
  
@@ -5203,7 +5128,7 @@ msgid "Status message"
  msgstr "Estado del mensaje"
  
  #: plugins/gofax/faxreports/detail.tpl:53
-#: plugins/gofax/faxreports/class_faxreport.inc:489
+#: plugins/gofax/faxreports/class_faxreport.inc:494
  msgid "Transfer time"
  msgstr "Tiempo de envio"
  
@@ -5215,98 +5140,104 @@ msgstr "Reportes de FAX"
  msgid "FAX Reports"
  msgstr "Informes de FAX"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:108
  msgid ""
  "No fax extension defined in your server configuration, no reports can be "
  "shown!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: plugins/gofax/faxreports/class_faxreport.inc:111
  #: plugins/addons/logview/class_logview.inc:75
  #: plugins/gofon/fonreports/class_fonreport.inc:163
  msgid "There is no mysql extension available, please check your php setup."
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:117
+#: plugins/gofax/faxreports/class_faxreport.inc:118
  msgid "Can't connect to fax database, no reports can be shown!"
  msgstr ""
  "No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
  "informes!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:121
+#: plugins/gofax/faxreports/class_faxreport.inc:122
  msgid "Can't select fax database for report generation!"
  msgstr ""
  "¡No puedo seleccionar la base de datos de fax para la generación de informes!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:126
+#: plugins/gofax/faxreports/class_faxreport.inc:127
  #, fuzzy
  msgid "Can't query fax table 'faxlog' for report generation!"
  msgstr ""
  "¡No puedo seleccionar la base de datos de fax para la generación de informes!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:149
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:150
+#: plugins/gofax/faxreports/class_faxreport.inc:290
  msgid "Query for fax database failed!"
  msgstr "¡La consulta a la base de datos de fax ha fallado!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:158
-#: plugins/gofax/faxreports/class_faxreport.inc:168
+#: plugins/gofax/faxreports/class_faxreport.inc:159
+#: plugins/gofax/faxreports/class_faxreport.inc:169
  msgid "You have no permission to retrieve informations about this fax id!"
  msgstr ""
  "¡No tiene permisos para recuperar información sobre el identificador (ID) "
  "del fax!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:196
-#: plugins/gofax/faxreports/class_faxreport.inc:311
-#: plugins/gofon/fonreports/class_fonreport.inc:221
+#: plugins/gofax/faxreports/class_faxreport.inc:200
+#: plugins/gofax/faxreports/class_faxreport.inc:315
+#: plugins/gofon/fonreports/class_fonreport.inc:223
  msgid "Y-M-D"
  msgstr "Y-M-D"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions to view this attribute"
  msgstr "No tiene permisos para eliminar este departamento."
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/admin/groups/class_groupApplication.inc:427
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions"
  msgstr "Permisos"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:469
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:473
+#: plugins/gofax/faxreports/class_faxreport.inc:474
  #, fuzzy
  msgid "Fax report"
  msgstr "Reportes de FAX"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:474
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  #, fuzzy
  msgid "All entries are readonly"
  msgstr "Todos los campos son rellenarles."
  
  #: plugins/gofax/faxreports/class_faxreport.inc:479
  #, fuzzy
+msgid "Fax reports"
+msgstr "Reportes de FAX"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:484
+#, fuzzy
  msgid "Detailed view"
  msgstr "Dispositivos instalados"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:480
+#: plugins/gofax/faxreports/class_faxreport.inc:485
  #, fuzzy
  msgid "Fax ID"
  msgstr "FAX ID"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #, fuzzy
  msgid "Time"
  msgstr "Mime"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:487
+#: plugins/gofax/faxreports/class_faxreport.inc:492
  #, fuzzy
  msgid "Number of pages"
  msgstr "Nombre del departamento"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:488
+#: plugins/gofax/faxreports/class_faxreport.inc:493
  #, fuzzy
  msgid "Status Message"
  msgstr "Estado del mensaje"
@@ -5335,44 +5266,44 @@ msgstr ""
  msgid "Add entry"
  msgstr "Añadir entrada"
  
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:54
  #: plugins/admin/groups/class_groupApplication.inc:756
  msgid "Edit entry"
  msgstr "Editar entrada"
  
-#: plugins/addons/addressbook/contents.tpl:55
+#: plugins/addons/addressbook/contents.tpl:58
  msgid "Remove entry"
  msgstr "Eliminar entrada"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Select to see regular users"
  msgstr "Seleccione para ver usuarios estandar"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Show organizational entries"
  msgstr "Mostrar entradas de organizaciones"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Select to see users in addressbook"
  msgstr "Seleccione para ver los usuarios en la libreta de direcciones"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Show addressbook entries"
  msgstr "Enseñar las entradas de la libreta de direcciones"
  
-#: plugins/addons/addressbook/contents.tpl:81
+#: plugins/addons/addressbook/contents.tpl:84
  msgid "Display results for department"
  msgstr "Mostrar resultados para departamentos"
  
-#: plugins/addons/addressbook/contents.tpl:94
+#: plugins/addons/addressbook/contents.tpl:97
  msgid "Match object"
  msgstr "Encontrar objeto"
  
-#: plugins/addons/addressbook/contents.tpl:97
+#: plugins/addons/addressbook/contents.tpl:100
  msgid "Choose the object that will be searched in"
  msgstr "Elegir el objeto que sera buscado"
  
-#: plugins/addons/addressbook/contents.tpl:109
+#: plugins/addons/addressbook/contents.tpl:112
  msgid "Search string"
  msgstr "Cadena de búsqueda"
  
@@ -5381,10 +5312,10 @@ msgid "Dial connection..."
  msgstr "Marcando conexión"
  
  #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:427
-#: plugins/addons/addressbook/class_addressbook.inc:434
-#: plugins/addons/addressbook/class_addressbook.inc:438
-#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/addons/addressbook/class_addressbook.inc:429
+#: plugins/addons/addressbook/class_addressbook.inc:436
+#: plugins/addons/addressbook/class_addressbook.inc:440
+#: plugins/addons/addressbook/class_addressbook.inc:553
  msgid "Dial"
  msgstr "Llamar"
  
@@ -5408,7 +5339,7 @@ msgid "Personal"
  msgstr "Personal"
  
  #: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/class_addressbook.inc:807
  #: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
  #: html/getxls.php:298
  msgid "Initials"
@@ -5438,26 +5369,26 @@ msgstr "Ciudad"
  
  #: plugins/addons/addressbook/address_edit.tpl:191
  #: plugins/addons/addressbook/address_info.tpl:141
-#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_departmentGeneric.inc:585
  msgid "Country"
  msgstr "Pais"
  
-#: plugins/addons/addressbook/main.inc:35
+#: plugins/addons/addressbook/main.inc:36
  msgid "Address book"
  msgstr "Libreta de direcciones"
  
  #: plugins/addons/addressbook/class_addressbook.inc:6
-#: plugins/addons/addressbook/class_addressbook.inc:781
-#: plugins/addons/addressbook/class_addressbook.inc:787
+#: plugins/addons/addressbook/class_addressbook.inc:783
+#: plugins/addons/addressbook/class_addressbook.inc:789
  msgid "Addressbook"
  msgstr "Libreta de direcciones"
  
-#: plugins/addons/addressbook/class_addressbook.inc:172
+#: plugins/addons/addressbook/class_addressbook.inc:173
  #, php-format
  msgid "Dial from %s to %s now?"
  msgstr "¿Llamar desde %s a %s ahora?"
  
-#: plugins/addons/addressbook/class_addressbook.inc:176
+#: plugins/addons/addressbook/class_addressbook.inc:177
  msgid ""
  "You have no personal phone number set. Please change that in order to "
  "perform direct dials."
@@ -5465,50 +5396,50 @@ msgstr ""
  "No tiene configurado un numero de teléfono personal. Por favor cambie esto "
  "para permitir llamadas directas."
  
-#: plugins/addons/addressbook/class_addressbook.inc:202
-#: plugins/addons/addressbook/class_addressbook.inc:751
+#: plugins/addons/addressbook/class_addressbook.inc:203
+#: plugins/addons/addressbook/class_addressbook.inc:753
  #, fuzzy, php-format
  msgid "Removing of addressbook entry '%s' failed."
  msgstr "Ha fallado la eliminación de la cuenta de la libreta de direcciones"
  
-#: plugins/addons/addressbook/class_addressbook.inc:209
-#: plugins/addons/addressbook/class_addressbook.inc:318
+#: plugins/addons/addressbook/class_addressbook.inc:210
+#: plugins/addons/addressbook/class_addressbook.inc:319
  msgid "You are not allowed to delete this entry!"
  msgstr "¡No tiene permisos para eliminar esta entrada!"
  
-#: plugins/addons/addressbook/class_addressbook.inc:312
+#: plugins/addons/addressbook/class_addressbook.inc:313
  #, php-format
  msgid "You're about to delete the entry %s."
  msgstr "Has decidido eliminar la entrada %s"
  
-#: plugins/addons/addressbook/class_addressbook.inc:444
+#: plugins/addons/addressbook/class_addressbook.inc:446
  #, php-format
  msgid "Save contact for %s as vcard"
  msgstr "Salvar el contacto %s como una vcard"
  
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: plugins/addons/addressbook/class_addressbook.inc:452
  #, php-format
  msgid "Send mail to %s"
  msgstr "Enviar correo a %s"
  
-#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:565
  msgid "global addressbook"
  msgstr "Directorio de contactos global"
  
-#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/addons/addressbook/class_addressbook.inc:568
  msgid "user database"
  msgstr "Usuario de Base de datos"
  
-#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/addons/addressbook/class_addressbook.inc:572
  #, php-format
  msgid "Contact stored in '%s'"
  msgstr "Contacto guardado en '%s'"
  
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/addons/addressbook/class_addressbook.inc:574
  msgid "Creating new entry in"
  msgstr "Crear una nueva entrada en"
  
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/logview/class_logview.inc:112
  #: plugins/addons/logview/class_logview.inc:133
  #: plugins/addons/mailqueue/class_mailqueue.inc:306
@@ -5516,36 +5447,36 @@ msgstr "Crear una nueva entrada en"
  msgid "All"
  msgstr "Todo"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Work phone"
  msgstr "Teléfono del trabajo"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Cell phone"
  msgstr "Móvil"
  
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:223
  msgid "Home phone"
  msgstr "Teléfono particular"
  
-#: plugins/addons/addressbook/class_addressbook.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:704
  msgid ""
  "Cannot create a unique DN for your entry. Please fill more formular fields."
  msgstr ""
  "No se puede crear un 'DN' único para esta entrada. Por favor rellene los "
  "campos del formulario."
  
-#: plugins/addons/addressbook/class_addressbook.inc:782
+#: plugins/addons/addressbook/class_addressbook.inc:784
  #, fuzzy
  msgid "Addressbook entry acls"
  msgstr "Ha fallado la grabación de la cuenta de la libreta de direcciones"
  
-#: plugins/addons/addressbook/class_addressbook.inc:806 html/getxls.php:301
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:301
  #, fuzzy
  msgid "Title"
  msgstr "Archivo"
  
-#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: plugins/addons/addressbook/class_addressbook.inc:810 html/getxls.php:169
  #: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
  #, fuzzy
  msgid "Common name"
@@ -5747,12 +5678,12 @@ msgid "CSV import"
  msgstr "Importar desde CSV"
  
  #: plugins/addons/ldapmanager/class_export.inc:77
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:91
  msgid "Error while exporting the requested entries!"
  msgstr "¡Error mientras se exportaban las entradas indicadas!"
  
  #: plugins/addons/ldapmanager/class_export.inc:89
-#: plugins/addons/ldapmanager/class_exportxls.inc:102
+#: plugins/addons/ldapmanager/class_exportxls.inc:104
  #, fuzzy, php-format
  msgid "You are not allowed to export the given ldap entry (%s)"
  msgstr "¡No tiene permisos para eliminar esta entrada!"
@@ -5978,40 +5909,40 @@ msgstr ""
  msgid "Active"
  msgstr "Activo"
  
-#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/addons/mailqueue/contents.tpl:94
  msgid "Delete this message"
  msgstr "Eliminar este mensaje"
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "unhold"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "Release message"
  msgstr "Desbloquear el mensaje"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  msgid "hold"
  msgstr "Poner en espera"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  #: plugins/addons/mailqueue/class_mailqueue.inc:398
  msgid "Hold message"
  msgstr "Poner el mensaje en espera"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "requeue"
  msgstr "reencolar"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "Requeue this message"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  msgid "header"
  msgstr "cabecera"
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  msgid "Display header from this message"
  msgstr "Mostrar cabeceras para este mensaje"
  
@@ -6183,16 +6114,35 @@ msgstr ""
  msgid "Go up one dfsshare"
  msgstr "Subir un nivel en el compartido DFS"
  
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:370
+#: include/class_MultiSelectWindow.inc:194
+#: include/class_MultiSelectWindow.inc:196
+msgid "Up"
+msgstr ""
+
  #: plugins/addons/godfs/class_dfsManagment.inc:214
  msgid "Go to dfs root"
  msgstr ""
  
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+#: include/class_MultiSelectWindow.inc:188
+msgid "Root"
+msgstr "Raíz"
+
  #: plugins/addons/godfs/class_dfsManagment.inc:215
  msgid "Create new dfsshare"
  msgstr "Crear un nuevo compartido DFS"
  
  #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:22
+#: ihtml/themes/default/copyPasteDialog.tpl:28
  msgid "Finish"
  msgstr "Terminar"
  
@@ -6245,7 +6195,7 @@ msgstr "Intereses"
  
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:890 include/class_acl.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:884 include/class_acl.inc:164
  #: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
  msgid "Groups"
  msgstr "Grupos"
@@ -6261,12 +6211,12 @@ msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
  msgstr "No se ha encontrado ninguna definición de 'ACTIONCMD' en 'gosa.conf'"
  
  #: plugins/addons/notifications/class_msgplug.inc:116
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/systems/class_terminalGeneric.inc:207
-#: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/systems/class_workstationGeneric.inc:161
-#: plugins/admin/ogroups/class_termgroup.inc:210
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_servGeneric.inc:92
+#: plugins/admin/systems/class_workstationGeneric.inc:167
+#: plugins/admin/ogroups/class_termgroup.inc:209
  #, php-format
  msgid "Execution of '%s' failed!"
  msgstr "¡La ejecución de '%s' ha fallado!"
@@ -6328,19 +6278,19 @@ msgstr ""
  
  #: plugins/addons/notifications/contents.tpl:74
  #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:433
-#: plugins/admin/departments/class_departmentGeneric.inc:518
+#: plugins/admin/departments/class_departmentGeneric.inc:469
+#: plugins/admin/departments/class_departmentGeneric.inc:561
  #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/ServiceAddDialog.tpl:29
-#: plugins/admin/fai/class_faiManagement.inc:447
-#: plugins/admin/fai/class_faiManagement.inc:623
-#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/systems/ServiceAddDialog.tpl:28
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/admin/fai/class_faiManagement.inc:633
+#: plugins/admin/fai/class_faiManagement.inc:639
  #: plugins/admin/fai/faiPackageNew.tpl:50
  #: ihtml/themes/default/setup_introduction.tpl:12
  #: ihtml/themes/default/setup_useradmin.tpl:41
  #: ihtml/themes/default/setup_step2.tpl:13
  #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/default/snapshotdialog.tpl:78
+#: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Continuar"
  
@@ -6459,60 +6409,54 @@ msgstr ""
  msgid "This 'dn' is no group."
  msgstr "Este 'dn' no es un grupo."
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Samba group"
  msgstr "Grupo de samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain admins"
  msgstr "Administradores del dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain users"
  msgstr "Usuarios del dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:328
+#: plugins/admin/groups/class_groupGeneric.inc:319
  msgid "Domain guests"
  msgstr "Invitados del dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:324
  #, php-format
  msgid "Special group (%d)"
  msgstr "Grupo especial (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:446
+#: plugins/admin/groups/class_groupGeneric.inc:437
  msgid "! unknown id"
  msgstr "! id desconocido"
  
-#: plugins/admin/groups/class_groupGeneric.inc:483
+#: plugins/admin/groups/class_groupGeneric.inc:474
  #, php-format
  msgid ""
  "Your search method returned more than '%s' users, only '%s' users are shown."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/admin/groups/class_groupGeneric.inc:720
+#: plugins/admin/groups/class_groupGeneric.inc:503
+#: plugins/admin/groups/class_groupGeneric.inc:718
  #, fuzzy, php-format
  msgid "Removing of groups/generic with dn '%s' failed."
  msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
  
-#: plugins/admin/groups/class_groupGeneric.inc:630
+#: plugins/admin/groups/class_groupGeneric.inc:628
  #, php-format
  msgid "No configured SID found for '%s'."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:635
+#: plugins/admin/groups/class_groupGeneric.inc:633
  #, php-format
  msgid "No configured RIDBASE found for '%s'."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:746
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/ogroups/class_ogroup.inc:608
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "No tiene permisos para crear un grupo en esta 'Base'."
-
-#: plugins/admin/groups/class_groupGeneric.inc:756
+#: plugins/admin/groups/class_groupGeneric.inc:750
  msgid ""
  "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
@@ -6520,43 +6464,43 @@ msgstr ""
  "El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
  "numeros y guiones."
  
-#: plugins/admin/groups/class_groupGeneric.inc:767
-#: plugins/admin/groups/class_groupGeneric.inc:781
-#: plugins/admin/groups/class_groupGeneric.inc:788
+#: plugins/admin/groups/class_groupGeneric.inc:761
+#: plugins/admin/groups/class_groupGeneric.inc:775
+#: plugins/admin/groups/class_groupGeneric.inc:782
  msgid "Value specified as 'Name' is already used."
  msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
  
-#: plugins/admin/groups/class_groupGeneric.inc:885
+#: plugins/admin/groups/class_groupGeneric.inc:879
  #, fuzzy
  msgid "Generic group settings"
  msgstr "Parámetros genéricos de la cola"
  
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:891
  #, fuzzy
  msgid "Phone pickup group"
  msgstr "Miembros están en un grupo de salto telefónico"
  
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, fuzzy
  msgid "Nagios group"
  msgstr "Cuenta Nagios"
  
-#: plugins/admin/groups/class_groupGeneric.inc:901
+#: plugins/admin/groups/class_groupGeneric.inc:895
  #, fuzzy
  msgid "Group member"
  msgstr "Miembros del grupo"
  
-#: plugins/admin/groups/class_groupGeneric.inc:902
+#: plugins/admin/groups/class_groupGeneric.inc:896
  #, fuzzy
  msgid "Samba group type"
  msgstr "Grupo de samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:903
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Directorio Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:904
+#: plugins/admin/groups/class_groupGeneric.inc:898
  #, fuzzy
  msgid "Samba SID"
  msgstr "Samba"
@@ -6581,8 +6525,8 @@ msgstr "Añadir categoría"
  msgid "Available applications"
  msgstr "Aplicaciones disponibles"
  
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:565
-#: include/class_acl.inc:656
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:597
+#: include/class_acl.inc:688
  msgid "read"
  msgstr "leer"
  
@@ -6598,8 +6542,8 @@ msgstr "post externo"
  msgid "append"
  msgstr "añadir"
  
-#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:566
-#: include/class_acl.inc:658
+#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:598
+#: include/class_acl.inc:690
  msgid "write"
  msgstr "escribir"
  
@@ -6624,49 +6568,49 @@ msgstr "Esta intentando añadir una dirección de correo no valida"
  msgid "to the list of forwarders."
  msgstr "a la lista de remitentes."
  
-#: plugins/admin/groups/class_groupMail.inc:672
+#: plugins/admin/groups/class_groupMail.inc:679
  #, fuzzy, php-format
  msgid "Removing of groups/mail with dn '%s' failed."
  msgstr "Ha fallado la eliminación de parámetros de correo de grupo"
  
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/groups/class_groupMail.inc:861
  #, fuzzy, php-format
  msgid "Saving of groups/mail with dn '%s' failed."
  msgstr "Ha fallado la grabación de los parámetros de correo de grupos"
  
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/admin/groups/class_groupMail.inc:890
  msgid "Please enter a valid email addres in 'Primary address' field."
  msgstr ""
  "Por favor introduzca una dirección valida de correo electrónico en el campo "
  "'Cuenta Principal'."
  
-#: plugins/admin/groups/class_groupMail.inc:916
+#: plugins/admin/groups/class_groupMail.inc:923
  msgid ""
  "Please choose valid permission settings. Default permission can't be emtpy."
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:920
+#: plugins/admin/groups/class_groupMail.inc:927
  msgid "Please select a valid mail server."
  msgstr "Por favor seleccione un servidor de correo valido."
  
-#: plugins/admin/groups/class_groupMail.inc:1067
+#: plugins/admin/groups/class_groupMail.inc:1074
  #, fuzzy
  msgid "Group mail"
  msgstr "Nombre del grupo"
  
-#: plugins/admin/groups/class_groupMail.inc:1075
+#: plugins/admin/groups/class_groupMail.inc:1082
  #, fuzzy
  msgid "Alternate addresses"
  msgstr "Direcciones alternativas"
  
-#: plugins/admin/groups/class_groupMail.inc:1076
+#: plugins/admin/groups/class_groupMail.inc:1083
  #, fuzzy
  msgid "Forwarding addresses"
  msgstr "Cuenta Principal"
  
-#: plugins/admin/groups/class_groupMail.inc:1079
+#: plugins/admin/groups/class_groupMail.inc:1086
  #: plugins/admin/systems/printer.tpl:82
-#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_printGeneric.inc:873
  msgid "Permissions"
  msgstr "Permisos"
  
@@ -6735,7 +6679,9 @@ msgstr ""
  "activarlas apretando a continuación."
  
  #: plugins/admin/groups/class_groupApplication.inc:426
-#: include/class_tabs.inc:303
+#: plugins/admin/acl/class_aclManagement.inc:424
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430 include/class_tabs.inc:303
  msgid "ACL"
  msgstr "ACL"
  
@@ -6764,7 +6710,7 @@ msgid "The selected application has no options."
  msgstr "La aplicación seleccionada no tiene opciones."
  
  #: plugins/admin/groups/class_groupApplication.inc:682
-#: plugins/admin/departments/class_divListDepartment.inc:154
+#: plugins/admin/departments/class_divListDepartment.inc:147
  msgid "department"
  msgstr "departamento"
  
@@ -6837,11 +6783,11 @@ msgid "Group applications"
  msgstr "Mostrar aplicaciones"
  
  #: plugins/admin/groups/class_groupApplication.inc:1173
-#: plugins/admin/groups/class_divListGroup.inc:176
-#: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:353
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
+#: plugins/admin/groups/class_divListGroup.inc:184
+#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/ogroups/class_ogroupManagement.inc:348
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:684
  #: plugins/gofon/fonreports/contents.tpl:34
  #: plugins/generic/references/class_reference.inc:42
  msgid "Application"
@@ -6851,7 +6797,7 @@ msgstr "Aplicación"
  #: plugins/admin/systems/workstationStartup.tpl:53
  #: plugins/admin/systems/workstationStartup.tpl:87
  #: plugins/admin/systems/servRepositorySetup.tpl:19
-#: plugins/admin/systems/class_servRepository.inc:238
+#: plugins/admin/systems/class_servRepository.inc:252
  #: plugins/admin/fai/faiPackage.tpl:37
  #: plugins/admin/fai/class_faiPackage.inc:542
  #: plugins/admin/fai/faiPackageNew.tpl:21
@@ -6939,58 +6885,58 @@ msgstr "Mostrar grupos funcionales"
  msgid "Create new group"
  msgstr "Crear nuevo grupo"
  
-#: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:175
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  msgid "cut"
  msgstr "Cortar"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  msgid "Cut this entry"
  msgstr "Cortar por esta entrada"
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "copy"
  msgstr ""
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "Copy this entry"
  msgstr "Copiar esta entrada"
  
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/conference/class_divListConferences.inc:159
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/conference/class_divListConferences.inc:155
  msgid "Edit this entry"
  msgstr "Editar esta entrada"
  
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/conference/class_divListConferences.inc:169
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/conference/class_divListConferences.inc:165
  msgid "Delete this entry"
  msgstr "Borrar esta entrada"
  
@@ -7040,7 +6986,7 @@ msgstr "No le es permitido borrar este usuario"
  #: plugins/admin/users/class_userManagement.inc:449
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
  #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:288
  msgid "none"
  msgstr "ninguno"
  
@@ -7068,8 +7014,8 @@ msgstr ""
  "Elegir 'ninguno' para saltarse el uso de plantillas."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:812
-#: plugins/admin/fai/class_faiTemplate.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:997
+#: plugins/admin/fai/class_faiTemplate.inc:499
  msgid "Template"
  msgstr "Plantilla"
  
@@ -7148,112 +7094,112 @@ msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
  msgid "Show proxy users"
  msgstr "Mostrar los usuarios de proxy"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  msgid "Create new user"
  msgstr "Crear nuevo usuario"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  msgid "New user"
  msgstr "Nuevo usuario"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "Create new template"
  msgstr "Crear nueva plantilla"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "New template"
  msgstr "Nueva plantilla"
  
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:173
  msgid "GOsa"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:174
  msgid "Edit generic properties"
  msgstr "Editar propiedades genéricas"
  
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:176
  msgid "Edit UNIX properties"
  msgstr "Editar propiedades UNIX"
  
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:178
  msgid "Edit environment properties"
  msgstr "Editar propiedades de estado"
  
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:180
  msgid "Edit mail properties"
  msgstr "Editar propiedades de correo"
  
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:182
  msgid "Edit phone properties"
  msgstr "Editar propiedades telefónicas"
  
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:184
  msgid "Edit fax properies"
  msgstr "Editar propiedades de fax"
  
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:186
  msgid "Edit samba properties"
  msgstr "Editar propiedades samba"
  
-#: plugins/admin/users/class_divListUsers.inc:200
+#: plugins/admin/users/class_divListUsers.inc:188
  msgid "Edit netatalk properties"
  msgstr "Editar propiedades Netatalk"
  
-#: plugins/admin/users/class_divListUsers.inc:201
+#: plugins/admin/users/class_divListUsers.inc:189
  msgid "Create user from template"
  msgstr "Crear usuario desde plantilla"
  
-#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/users/class_divListUsers.inc:190
  msgid "Create user with this template"
  msgstr "Crear usuario con esta plantilla"
  
-#: plugins/admin/users/class_divListUsers.inc:260
+#: plugins/admin/users/class_divListUsers.inc:248
  msgid "password"
  msgstr "contraseña"
  
-#: plugins/admin/users/class_divListUsers.inc:264
+#: plugins/admin/users/class_divListUsers.inc:252
  #, fuzzy
  msgid "You are not allowed to change the password for this user."
  msgstr "¡No tiene permisos para cambiar su contraseña! en este momento"
  
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:266
  #, fuzzy
  msgid "You are not allowed to remove this user."
  msgstr "No le es permitido borrar este usuario"
  
-#: plugins/admin/users/class_divListUsers.inc:297
+#: plugins/admin/users/class_divListUsers.inc:285
  msgid "Online"
  msgstr "En linea"
  
-#: plugins/admin/users/class_divListUsers.inc:304
+#: plugins/admin/users/class_divListUsers.inc:292
  msgid "Offline"
  msgstr "Fuera de linea"
  
  #: plugins/admin/applications/generic.tpl:7
  #: plugins/admin/applications/generic.tpl:10
-#: plugins/admin/applications/class_applicationGeneric.inc:486
+#: plugins/admin/applications/class_applicationGeneric.inc:495
  #: plugins/admin/applications/class_divListApplication.inc:51
  msgid "Application name"
  msgstr "Nombre de la aplicación"
  
  #: plugins/admin/applications/generic.tpl:15
  #: plugins/gofon/macro/generic.tpl:14
-#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: plugins/gofon/macro/class_gofonMacro.inc:499 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Display name"
  msgstr "Nombre mostrado"
  
  #: plugins/admin/applications/generic.tpl:19
-#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/applications/class_applicationGeneric.inc:500
  msgid "Application name to be displayed (i.e. below icons)"
  msgstr ""
  "Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
  
  #: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/applications/class_applicationGeneric.inc:526
-#: plugins/admin/systems/terminal.tpl:149 plugins/admin/systems/server.tpl:73
-#: plugins/admin/systems/workstation.tpl:124
+#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/systems/terminal.tpl:153 plugins/admin/systems/server.tpl:74
+#: plugins/admin/systems/workstation.tpl:127
  #: plugins/admin/systems/goMailServer.tpl:215
  #: plugins/admin/systems/goImapServer.tpl:110
  #: plugins/admin/ogroups/termgroup.tpl:101
@@ -7271,9 +7217,9 @@ msgid "Choose subtree to place application in"
  msgstr "Elija lugar del árbol para colocar la aplicación"
  
  #: plugins/admin/applications/generic.tpl:66
-#: plugins/admin/applications/class_applicationGeneric.inc:528
+#: plugins/admin/applications/class_applicationGeneric.inc:537
  #: plugins/admin/mimetypes/generic.tpl:67
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:678
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:686
  msgid "Icon"
  msgstr "Icono"
  
@@ -7286,41 +7232,46 @@ msgstr "Actualizar"
  msgid "Reload picture from LDAP"
  msgstr "Recargar imagen desde LDAP"
  
-#: plugins/admin/applications/generic.tpl:96
-#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/generic.tpl:81
+#, fuzzy
+msgid "Remove picture from LDAP"
+msgstr "Recargar imagen desde LDAP"
+
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/applications/class_applicationGeneric.inc:541
  msgid "Only executable for members"
  msgstr "Solo ejecutables para los miembros"
  
-#: plugins/admin/applications/generic.tpl:101
-#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/applications/generic.tpl:104
+#: plugins/admin/applications/class_applicationGeneric.inc:545
  msgid "Replace user configuration on startup"
  msgstr "Reemplazar la configuración del usuario en el inicio"
  
-#: plugins/admin/applications/generic.tpl:107
-#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/generic.tpl:110
+#: plugins/admin/applications/class_applicationGeneric.inc:542
  msgid "Place icon on members desktop"
  msgstr "Colocar icono en los escritorios de los miembros "
  
-#: plugins/admin/applications/generic.tpl:112
-#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/applications/generic.tpl:115
+#: plugins/admin/applications/class_applicationGeneric.inc:544
  msgid "Place entry in members startmenu"
  msgstr "Colocar entrado en los menús de inicio de los miembros"
  
-#: plugins/admin/applications/generic.tpl:117
-#: plugins/admin/applications/class_applicationGeneric.inc:534
+#: plugins/admin/applications/generic.tpl:120
+#: plugins/admin/applications/class_applicationGeneric.inc:543
  msgid "Place entry in members launch bar"
  msgstr "Colocar entrada en los barra de inicio de los miembros"
  
-#: plugins/admin/applications/generic.tpl:135
+#: plugins/admin/applications/generic.tpl:138
  #: plugins/admin/systems/printerPPDDialog.tpl:11
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
  #: plugins/admin/fai/faiTemplateEntry.tpl:49
  msgid "Upload"
  msgstr "Enviar"
  
-#: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:297
-#: plugins/admin/fai/class_faiTemplate.inc:271
+#: plugins/admin/applications/generic.tpl:140
+#: plugins/admin/fai/class_faiScript.inc:307
+#: plugins/admin/fai/class_faiTemplate.inc:284
  #: plugins/admin/fai/class_faiScriptEntry.inc:89
  #: plugins/admin/fai/class_faiHook.inc:308
  #: plugins/admin/fai/class_faiHookEntry.inc:84
@@ -7346,7 +7297,7 @@ msgstr ""
  "Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
  
  #: plugins/admin/applications/class_applicationParameters.inc:98
-#: plugins/admin/fai/class_faiVariable.inc:412
+#: plugins/admin/fai/class_faiVariable.inc:408
  msgid "Variable"
  msgstr "Variable"
  
@@ -7404,73 +7355,69 @@ msgstr "Mantenimiento de aplicaciones"
  msgid "no example"
  msgstr "sin ejemplo"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:132
+#: plugins/admin/applications/class_applicationGeneric.inc:126
  msgid "This 'dn' is no application."
  msgstr "Este 'dn' no es una aplicación"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:228
+#: plugins/admin/applications/class_applicationGeneric.inc:227
  #, fuzzy, php-format
  msgid "Removing of application with dn '%s' failed."
  msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:240
+#: plugins/admin/applications/class_applicationGeneric.inc:239
  #, php-format
  msgid "Removing application from objectgroup '%s' failed"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:247
+#: plugins/admin/applications/class_applicationGeneric.inc:246
  #, php-format
  msgid "Removing application from group '%s' failed"
  msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:289
+#: plugins/admin/applications/class_applicationGeneric.inc:297
  msgid "The specified picture has not been uploaded correctly."
  msgstr "La foto indicada no ha sido subida correctamente."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:372
  msgid "Specified execute path must start with '/'."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:375
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr "No tiene permisos para crear una aplicación en esta 'Base'."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:380
+#: plugins/admin/applications/class_applicationGeneric.inc:389
  msgid "Required field 'Name' is not filled."
  msgstr "El campo requerido 'Nombre' no ha sido llenado."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:384
+#: plugins/admin/applications/class_applicationGeneric.inc:393
  msgid "Invalid character in application name. Only a-z 0-9 are allowed."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:388
+#: plugins/admin/applications/class_applicationGeneric.inc:397
  msgid "Required field 'Execute' is not filled."
  msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:403
-#: plugins/admin/applications/class_applicationGeneric.inc:411
+#: plugins/admin/applications/class_applicationGeneric.inc:412
+#: plugins/admin/applications/class_applicationGeneric.inc:420
  msgid "There's already an application with this 'Name'."
  msgstr "Ya existe una aplicación con este 'Nombre'."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:457
+#: plugins/admin/applications/class_applicationGeneric.inc:466
  #, fuzzy, php-format
  msgid "Saving of application with dn '%s' failed."
  msgstr "Ha fallado la grabación de la aplicación"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:482
+#: plugins/admin/applications/class_applicationGeneric.inc:491
  msgid "Application settings"
  msgstr "Parámetros de aplicaciones"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:515
+#: plugins/admin/applications/class_applicationGeneric.inc:524
  #, fuzzy
  msgid "Application generic"
  msgstr "Nombre de la aplicación"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_applicationGeneric.inc:538
  msgid "Flag"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:530
+#: plugins/admin/applications/class_applicationGeneric.inc:539
  #, fuzzy
  msgid "Script content"
  msgstr "Contenido de la Variable"
@@ -7503,13 +7450,13 @@ msgstr ""
  "Puede usar el selector de rango en la parte superior de la lista de "
  "aplicaciones, cuando trabaja con un gran número de aplicaciones."
  
-#: plugins/admin/applications/class_divListApplication.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
  msgid "new"
  msgstr "nuevo"
  
-#: plugins/admin/applications/class_divListApplication.inc:129
+#: plugins/admin/applications/class_divListApplication.inc:131
  msgid "Create new application"
  msgstr "Crear nueva aplicación"
  
@@ -7525,6 +7472,18 @@ msgstr "Ramas"
  msgid "Current release"
  msgstr "Versión actual"
  
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested operation"
+msgstr "Procesando la operación pedida"
+
+#: plugins/admin/departments/dep_iframe.tpl:7
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
  #: plugins/admin/departments/generic.tpl:8
  msgid "Name of department"
  msgstr "Nombre del departamento"
@@ -7539,7 +7498,7 @@ msgid "Descriptive text for department"
  msgstr "Descripción del departamento"
  
  #: plugins/admin/departments/generic.tpl:24
-#: plugins/admin/departments/class_departmentGeneric.inc:546
+#: plugins/admin/departments/class_departmentGeneric.inc:590
  msgid "Category"
  msgstr "Categoría"
  
@@ -7572,12 +7531,12 @@ msgstr "Número base de teléfono de este subarbol"
  msgid "Base facsimile telephone number of this subtree"
  msgstr "Número base de fax de este subarbol"
  
-#: plugins/admin/departments/generic.tpl:109
-#: plugins/admin/departments/class_departmentGeneric.inc:549
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/class_departmentGeneric.inc:593
  msgid "Administrative settings"
  msgstr "Parámetros administrativos"
  
-#: plugins/admin/departments/generic.tpl:111
+#: plugins/admin/departments/generic.tpl:119
  msgid "Tag department as an independent administrative unit"
  msgstr ""
  
@@ -7612,48 +7571,25 @@ msgstr ""
  "actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
  "presione 'Eliminar' para continuar o 'Cancelar' para abortar."
  
-#: plugins/admin/departments/dep_iframe.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
-msgid "Processing the requested operation"
-msgstr "Procesando la operación pedida"
-
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-
-#: plugins/admin/departments/dep_iframe.tpl:8
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
  #: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
  msgid "Department management"
  msgstr "Mantenimiento de Departamentos"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:175
+#: plugins/admin/departments/class_departmentGeneric.inc:190
  #, fuzzy, php-format
  msgid "Removing of department with dn '%s' failed."
  msgstr "Ha fallado la eliminación del departamento"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:224
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr "No tiene permisos para crear un departamento en esta 'Base'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:231
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:251
+#: plugins/admin/departments/class_departmentGeneric.inc:253
  msgid "Department with that 'Name' already exists."
  msgstr "Ya existe un Departamento con este 'Nombre'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:241
+#: plugins/admin/departments/class_departmentGeneric.inc:261
  msgid "Required field 'Description' is not set."
  msgstr "El campo requerido 'Descripción' no ha sido rellenado."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:245
+#: plugins/admin/departments/class_departmentGeneric.inc:265
  #, php-format
  msgid ""
  "The field 'Name' contains the reserved word '%s'. Please choose another name."
@@ -7661,47 +7597,47 @@ msgstr ""
  "El campo 'Nombre' contiene la palabra reservada '%s'. Por favor elija otro "
  "nombre."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:297
+#: plugins/admin/departments/class_departmentGeneric.inc:319
  msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:343
+#: plugins/admin/departments/class_departmentGeneric.inc:368
  #, fuzzy, php-format
  msgid "Saving of department with dn '%s' failed."
  msgstr "Ha fallado la grabación del departamento"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:385
+#: plugins/admin/departments/class_departmentGeneric.inc:421
  #, php-format
  msgid "Tagging '%s'."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:506
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:499
-#: include/class_ldap.inc:458 include/class_acl.inc:523
-#: include/class_acl.inc:530 include/class_acl.inc:537
-#: include/class_acl.inc:543 ihtml/themes/default/snapshotdialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:53
+#: plugins/admin/departments/class_departmentGeneric.inc:542
+#: include/class_ldap.inc:458 include/class_acl.inc:555
+#: include/class_acl.inc:562 include/class_acl.inc:569
+#: include/class_acl.inc:575 ihtml/themes/default/snapshotdialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
  msgstr "Objeto"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:502
+#: plugins/admin/departments/class_departmentGeneric.inc:545
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:532
-#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: plugins/admin/departments/class_departmentGeneric.inc:581
  #: plugins/admin/departments/class_departmentManagement.inc:25
  #: plugins/admin/systems/class_glpiSelectUser.inc:112
  #: plugins/admin/ogroups/class_divListOGroup.inc:58
  msgid "Departments"
  msgstr "Departamentos"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:544
+#: plugins/admin/departments/class_departmentGeneric.inc:588
  #: plugins/admin/systems/workstationService.tpl:89
  #: plugins/admin/systems/terminalService.tpl:79
  #: plugins/gofon/phoneaccount/generic.tpl:32
@@ -7710,23 +7646,24 @@ msgstr "Departamentos"
  msgid "Telephone"
  msgstr "Teléfono"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:545
+#: plugins/admin/departments/class_departmentGeneric.inc:589
  #: plugins/admin/departments/class_divListDepartment.inc:41
  msgid "Department name"
  msgstr "Nombre del departamento"
  
-#: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
+#: plugins/admin/departments/class_departmentManagement.inc:160
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:134
  #, php-format
  msgid "You're about to delete the whole LDAP subtree placed under '%s'."
  msgstr "Esta a punto de borrar todo el subárbol LDAP colocado bajo '%s'."
  
-#: plugins/admin/departments/class_departmentManagement.inc:175
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:153
+#: plugins/admin/departments/class_departmentManagement.inc:165
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:155
  msgid "You have no permission to remove this department."
  msgstr "No tiene permisos para eliminar este departamento."
  
-#: plugins/admin/departments/class_departmentManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:352
  msgid ".."
  msgstr ""
  
@@ -7751,14 +7688,30 @@ msgid "Regular expression for matching department names"
  msgstr "Expresiones regulares para encontrar nombres de departamentos"
  
  #: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/fai/class_divListFai.inc:139
-msgid "Go to users home department"
-msgstr "Ir al departamento base de los usuarios"
-
-#: plugins/admin/departments/class_divListDepartment.inc:101
  msgid "Create new department"
  msgstr "Crear nuevo departamento"
  
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#, fuzzy
+msgid "You are currently moving/renaming this department."
+msgstr "No tiene permisos para eliminar este departamento."
+
+#: plugins/admin/departments/dep_move_confirm.tpl:5
+msgid ""
+"Modifying a departments naming attribute 'ou' or base may corrupt acls and "
+"snapshot entries for all entire objects."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:8
+msgid "GOsa can NOT fix this for you, yet."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:11
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
+msgstr ""
+
  #: plugins/admin/systems/network.tpl:1
  msgid "Network\tsettings"
  msgstr "Red\tparámetros"
@@ -7780,7 +7733,7 @@ msgid "Enable DNS for this device"
  msgstr ""
  
  #: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/class_servDNS.inc:396
+#: plugins/admin/systems/class_servDNS.inc:398
  #: plugins/admin/systems/servdnseditzone.tpl:67
  #: plugins/admin/fai/faiPackageNew.tpl:31
  #: plugins/gofon/phoneaccount/generic.tpl:84
@@ -7793,8 +7746,8 @@ msgstr "Zona"
  
  #: plugins/admin/systems/network.tpl:77
  #: plugins/admin/systems/class_servDNS.inc:168
-#: plugins/admin/systems/class_servDNS.inc:399
-#: plugins/admin/systems/class_termDNS.inc:542
+#: plugins/admin/systems/class_servDNS.inc:401
+#: plugins/admin/systems/class_termDNS.inc:547
  #: plugins/admin/systems/servdnseditzone.tpl:85
  msgid "TTL"
  msgstr ""
@@ -7809,10 +7762,10 @@ msgid "present"
  msgstr "presente"
  
  #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:252
  #: plugins/admin/systems/class_terminalStartup.inc:161
-#: plugins/admin/systems/class_terminalGeneric.inc:242
-#: plugins/admin/systems/class_workstationStartup.inc:471
+#: plugins/admin/systems/class_terminalGeneric.inc:256
+#: plugins/admin/systems/class_workstationStartup.inc:498
+#: plugins/admin/systems/class_terminalService.inc:261
  msgid "This 'dn' has no terminal features."
  msgstr "Esta 'dn' no tiene características de terminal."
  
@@ -7848,6 +7801,94 @@ msgstr "no esta activo"
  msgid "offline"
  msgstr "fuera de linea"
  
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr "Plantilla de terminal"
+
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr "Nombre de terminal"
+
+#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
+#: plugins/admin/systems/workstation.tpl:44
+#: plugins/admin/systems/class_terminalGeneric.inc:548
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:390
+msgid "Mode"
+msgstr "Modo"
+
+#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:50
+msgid "Select terminal mode"
+msgstr "Seleccionar modo de terminal"
+
+#: plugins/admin/systems/terminal.tpl:47
+#: plugins/admin/systems/workstation.tpl:54
+#: plugins/admin/systems/class_workstationGeneric.inc:539
+#: plugins/admin/ogroups/termgroup.tpl:58
+#: plugins/admin/ogroups/class_termgroup.inc:391
+msgid "Syslog server"
+msgstr "Servidor de Logs"
+
+#: plugins/admin/systems/terminal.tpl:50
+#: plugins/admin/systems/workstation.tpl:57
+#: plugins/admin/ogroups/termgroup.tpl:61
+msgid "Choose server to use for logging"
+msgstr "Elija un servidor que será usado para registro"
+
+#: plugins/admin/systems/terminal.tpl:66
+#: plugins/admin/systems/class_terminalGeneric.inc:549
+msgid "Root server"
+msgstr "Servidor Raíz"
+
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Select NFS root filesystem to use"
+msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/class_terminalGeneric.inc:550
+msgid "Swap server"
+msgstr "Servidor de Intercambio"
+
+#: plugins/admin/systems/terminal.tpl:79
+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:98
+#: plugins/admin/systems/workstation.tpl:75
+msgid "Inherit time server attributes"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:80
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr "Servidor NTP"
+
+#: plugins/admin/systems/terminal.tpl:106
+#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/ogroups/termgroup.tpl:17
+msgid "Choose server to use for synchronizing time"
+msgstr "Elija un servidor que será usado para sincronización horaria"
+
+#: plugins/admin/systems/terminal.tpl:140 plugins/admin/systems/server.tpl:62
+#: plugins/admin/systems/workstation.tpl:115
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:47
+#: plugins/admin/ogroups/termgroup.tpl:88
+msgid "Action"
+msgstr "Acción"
+
+#: plugins/admin/systems/terminal.tpl:145
+#: plugins/admin/systems/workstation.tpl:120
+#: plugins/admin/ogroups/termgroup.tpl:93
+msgid "Select action to execute for this terminal"
+msgstr "Seleccione una acción que se ejecutara en este terminal"
+
  #: plugins/admin/systems/info.tpl:1
  msgid "System information"
  msgstr "Información de sistema"
@@ -7954,50 +7995,49 @@ msgstr "GUI"
  msgid "This 'dn' has no network features."
  msgstr "Esta 'dn' no tiene características de red."
  
-#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_winGeneric.inc:145
  #, php-format
  msgid "Removing of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_componentGeneric.inc:179
+#: plugins/admin/systems/class_winGeneric.inc:195
  msgid "You have no permissions to create a component on this 'Base'."
  msgstr "No tiene permisos para crear un componente en esta 'Base'."
  
-#: plugins/admin/systems/class_winGeneric.inc:184
-#: plugins/admin/systems/class_terminalGeneric.inc:400
-#: plugins/admin/systems/class_servGeneric.inc:261
-#: plugins/admin/systems/class_workstationGeneric.inc:400
-#: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/systems/class_componentGeneric.inc:189
-#: plugins/admin/systems/class_phoneGeneric.inc:333
+#: plugins/admin/systems/class_winGeneric.inc:205
+#: plugins/admin/systems/class_terminalGeneric.inc:434
+#: plugins/admin/systems/class_servGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:414
+#: plugins/admin/systems/class_printGeneric.inc:673
+#: plugins/admin/systems/class_componentGeneric.inc:191
+#: plugins/admin/systems/class_phoneGeneric.inc:338
  #, php-format
  msgid "There is already an entry '%s' in the base choosen by you"
  msgstr "Ya hay una entrada '%s' en la base elegida"
  
-#: plugins/admin/systems/class_winGeneric.inc:239
+#: plugins/admin/systems/class_winGeneric.inc:260
  #, php-format
  msgid "Saving of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:250
+#: plugins/admin/systems/class_winGeneric.inc:271
  #, fuzzy
  msgid "Win generic"
  msgstr "Servicio de impresión"
  
-#: plugins/admin/systems/class_winGeneric.inc:251
+#: plugins/admin/systems/class_winGeneric.inc:272
  #, fuzzy
  msgid "Windows workstation generic"
  msgstr "Nombre de la estación de trabajo"
  
-#: plugins/admin/systems/class_winGeneric.inc:256
+#: plugins/admin/systems/class_winGeneric.inc:277
  #, fuzzy
  msgid "Win workstation"
  msgstr "Estación de trabajo Windows"
  
-#: plugins/admin/systems/class_winGeneric.inc:259
+#: plugins/admin/systems/class_winGeneric.inc:280
  #: plugins/admin/systems/workstation.tpl:10
-#: plugins/admin/systems/class_workstationGeneric.inc:513
+#: plugins/admin/systems/class_workstationGeneric.inc:535
  msgid "Workstation name"
  msgstr "Nombre de la estación de trabajo"
  
@@ -8005,124 +8045,21 @@ msgstr "Nombre de la estación de trabajo"
  msgid "System management"
  msgstr "Gestión del sistema"
  
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr "Plantilla de terminal"
-
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-msgstr "Nombre de terminal"
-
-#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
-#: plugins/admin/systems/workstation.tpl:44
-#: plugins/admin/systems/class_terminalGeneric.inc:508
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/ogroups/termgroup.tpl:47
-#: plugins/admin/ogroups/class_termgroup.inc:391
-msgid "Mode"
-msgstr "Modo"
-
-#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
-#: plugins/admin/systems/workstation.tpl:47
-#: plugins/admin/ogroups/termgroup.tpl:50
-msgid "Select terminal mode"
-msgstr "Seleccionar modo de terminal"
-
-#: plugins/admin/systems/terminal.tpl:47
-#: plugins/admin/systems/workstation.tpl:54
-#: plugins/admin/systems/class_workstationGeneric.inc:517
-#: plugins/admin/ogroups/termgroup.tpl:58
-#: plugins/admin/ogroups/class_termgroup.inc:392
-msgid "Syslog server"
-msgstr "Servidor de Logs"
-
-#: plugins/admin/systems/terminal.tpl:50
-#: plugins/admin/systems/workstation.tpl:57
-#: plugins/admin/ogroups/termgroup.tpl:61
-msgid "Choose server to use for logging"
-msgstr "Elija un servidor que será usado para registro"
-
-#: plugins/admin/systems/terminal.tpl:66
-#: plugins/admin/systems/class_terminalGeneric.inc:509
-msgid "Root server"
-msgstr "Servidor Raíz"
-
-#: plugins/admin/systems/terminal.tpl:69
-msgid "Select NFS root filesystem to use"
-msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/class_terminalGeneric.inc:510
-msgid "Swap server"
-msgstr "Servidor de Intercambio"
-
-#: plugins/admin/systems/terminal.tpl:79
-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:98
-#: plugins/admin/systems/workstation.tpl:75
-msgid "Inherit time server attributes"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
-msgstr "Servidor NTP"
-
-#: plugins/admin/systems/terminal.tpl:106
-#: plugins/admin/systems/workstation.tpl:83
-#: plugins/admin/ogroups/termgroup.tpl:17
-msgid "Choose server to use for synchronizing time"
-msgstr "Elija un servidor que será usado para sincronización horaria"
-
-#: plugins/admin/systems/terminal.tpl:136 plugins/admin/systems/server.tpl:61
-#: plugins/admin/systems/workstation.tpl:112
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:47
-#: plugins/admin/ogroups/termgroup.tpl:88
-msgid "Action"
-msgstr "Acción"
-
-#: plugins/admin/systems/terminal.tpl:141
-#: plugins/admin/systems/workstation.tpl:117
-#: plugins/admin/ogroups/termgroup.tpl:93
-msgid "Select action to execute for this terminal"
-msgstr "Seleccione una acción que se ejecutara en este terminal"
-
-#: plugins/admin/systems/class_terminalService.inc:69
-#: plugins/admin/systems/class_workstationService.inc:92
-#: plugins/admin/systems/workstationService.tpl:157
-msgid "unknown"
-msgstr "desconocido"
+#: plugins/admin/systems/goNtpServer.tpl:2
+#, fuzzy
+msgid "Time server"
+msgstr "Servicio de Hora"
  
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
-#: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:214
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
  #: plugins/admin/systems/class_terminalStartup.inc:39
  #: plugins/admin/systems/class_terminalStartup.inc:121
  #: plugins/admin/systems/class_terminalStartup.inc:141
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_terminalGeneric.inc:298
-#: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_workstationStartup.inc:268
-#: plugins/admin/systems/class_workstationStartup.inc:285
-#: plugins/admin/systems/class_workstationStartup.inc:289
-#: plugins/admin/systems/class_workstationStartup.inc:790
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:312
+#: plugins/admin/systems/class_workstationStartup.inc:316
+#: plugins/admin/systems/class_workstationStartup.inc:824
  #: plugins/admin/systems/class_workstationService.inc:201
  #: plugins/admin/systems/class_workstationService.inc:204
  #: plugins/admin/systems/class_workstationService.inc:207
@@ -8137,209 +8074,25 @@ msgstr "desconocido"
  #: plugins/admin/systems/class_workstationService.inc:233
  #: plugins/admin/systems/class_workstationService.inc:234
  #: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_terminalService.inc:74
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:108
+#: plugins/admin/systems/class_terminalService.inc:118
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:121
+#: plugins/admin/systems/class_terminalService.inc:125
+#: plugins/admin/systems/class_terminalService.inc:218
+#: plugins/admin/systems/class_terminalService.inc:221
+#: plugins/admin/systems/class_terminalService.inc:224
+#: plugins/admin/systems/class_terminalService.inc:227
+#: plugins/admin/systems/class_terminalService.inc:230
+#: plugins/admin/systems/class_terminalService.inc:233
+#: plugins/admin/systems/class_terminalService.inc:236
  msgid "inherited"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalService.inc:101
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:95
-#: plugins/admin/systems/class_workstationService.inc:96
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "bit"
-msgstr "bit"
-
-#: plugins/admin/systems/class_terminalService.inc:155
-msgid "default"
-msgstr "por defecto"
-
-#: plugins/admin/systems/class_terminalService.inc:156
-#: plugins/admin/systems/class_workstationService.inc:138
-msgid "show chooser"
-msgstr "mostrar elegidos"
-
-#: plugins/admin/systems/class_terminalService.inc:157
-#: plugins/admin/systems/class_workstationService.inc:139
-msgid "direct"
-msgstr "Directo"
-
-#: plugins/admin/systems/class_terminalService.inc:160
-#: plugins/admin/systems/class_workstationService.inc:142
-msgid "load balanced"
-msgstr "balanceo de carga"
-
-#: plugins/admin/systems/class_terminalService.inc:163
-#: plugins/admin/systems/class_workstationService.inc:145
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: plugins/admin/systems/class_terminalService.inc:164
-#: plugins/admin/systems/class_workstationService.inc:146
-msgid "ICA client"
-msgstr "Cliente ICA"
-
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_workstationService.inc:204
-msgid "Bit"
-msgstr "Bit"
-
-#: plugins/admin/systems/class_terminalService.inc:307
-#: plugins/admin/systems/class_workstationService.inc:314
-msgid "Choose the phone located at the current terminal"
-msgstr "Elija el teléfono localizado en el terminal actual"
-
-#: plugins/admin/systems/class_terminalService.inc:370
-#: plugins/admin/systems/class_terminalService.inc:375
-#: plugins/admin/systems/class_workstationService.inc:380
-#: plugins/admin/systems/class_workstationService.inc:385
-msgid "Please specify a valid VSync range."
-msgstr "Por favor especifique un rango VSync valido"
-
-#: plugins/admin/systems/class_terminalService.inc:385
-#: plugins/admin/systems/class_terminalService.inc:390
-#: plugins/admin/systems/class_workstationService.inc:395
-#: plugins/admin/systems/class_workstationService.inc:400
-msgid "Please specify a valid HSync range."
-msgstr "Por favor especifique un rango HSync valido"
-
-#: plugins/admin/systems/class_terminalService.inc:421
-#, fuzzy, php-format
-msgid "Saving of object system terminal/service with dn '%s' failed."
-msgstr "Ha fallado la grabación de la información del servicio de terminal"
-
-#: plugins/admin/systems/class_terminalService.inc:430
-#: plugins/admin/systems/class_workstationService.inc:451
-#, fuzzy
-msgid "Service"
-msgstr "Servicios"
-
-#: plugins/admin/systems/class_terminalService.inc:431
-#: plugins/admin/systems/class_goTerminalServer.inc:31
-#: plugins/admin/systems/class_goTerminalServer.inc:54
-#: plugins/admin/systems/class_goTerminalServer.inc:117
-#: plugins/admin/systems/class_goTerminalServer.inc:118
-#: plugins/admin/systems/goTerminalServer.tpl:1
-#, fuzzy
-msgid "Terminal service"
-msgstr "Servidor de terminal"
-
-#: plugins/admin/systems/class_terminalService.inc:439
-#: plugins/admin/systems/class_workstationService.inc:460
-#, fuzzy
-msgid "Monitor"
-msgstr "Tamaño del monitor"
-
-#: plugins/admin/systems/class_terminalService.inc:440
-#: plugins/admin/ogroups/class_phonequeue.inc:748
-#, fuzzy
-msgid "Method"
-msgstr "método"
-
-#: plugins/admin/systems/class_terminalService.inc:441
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
-#: plugins/admin/systems/class_terminalService.inc:442
-#: plugins/admin/systems/class_goTerminalServer.inc:127
-#: plugins/admin/systems/goTerminalServer.tpl:12
-msgid "Font path"
-msgstr "Ruta a las fuentes tipográficas"
-
-#: plugins/admin/systems/class_terminalService.inc:443
-#: plugins/admin/systems/class_workstationService.inc:461
-#, fuzzy
-msgid "Gfx driver"
-msgstr "Nuevo controlador de dispositivo"
-
-#: plugins/admin/systems/class_terminalService.inc:444
-#: plugins/admin/systems/class_workstationService.inc:462
-#, fuzzy
-msgid "Gfx resolution"
-msgstr "Resolución"
-
-#: plugins/admin/systems/class_terminalService.inc:445
-#: plugins/admin/systems/class_workstationService.inc:463
-#, fuzzy
-msgid "Gfx color depth"
-msgstr "Profundidad del Color"
-
-#: plugins/admin/systems/class_terminalService.inc:446
-#: plugins/admin/systems/class_workstationService.inc:464
-#, fuzzy
-msgid "Hsync"
-msgstr "HSync"
-
-#: plugins/admin/systems/class_terminalService.inc:447
-#: plugins/admin/systems/class_workstationService.inc:465
-#, fuzzy
-msgid "Vsync"
-msgstr "VSync"
-
-#: plugins/admin/systems/class_terminalService.inc:448
-#, fuzzy
-msgid "Printer service enabled"
-msgstr "Servicio de impresión"
-
-#: plugins/admin/systems/class_terminalService.inc:449
-#: plugins/admin/systems/terminalService.tpl:221
-msgid "Spool server"
-msgstr "Servidor de Cola"
-
-#: plugins/admin/systems/class_terminalService.inc:450
-#: plugins/admin/systems/class_workstationService.inc:467
-#, fuzzy
-msgid "Scanner enabled"
-msgstr "desactivado"
-
-#: plugins/admin/systems/class_terminalService.inc:451
-#, fuzzy
-msgid "Scanner model"
-msgstr "desactivado"
-
-#: plugins/admin/systems/class_terminalService.inc:454
-#: plugins/admin/systems/class_workstationService.inc:468
-#, fuzzy
-msgid "Keyboard model"
-msgstr "Elija modelo de teclado"
-
-#: plugins/admin/systems/class_terminalService.inc:455
-#: plugins/admin/systems/class_workstationService.inc:469
-#, fuzzy
-msgid "Keyboard layout"
-msgstr "Elija localización del teclado"
-
-#: plugins/admin/systems/class_terminalService.inc:456
-#: plugins/admin/systems/class_workstationService.inc:470
-#, fuzzy
-msgid "Keyboard variant"
-msgstr "Elija variante de teclado"
-
-#: plugins/admin/systems/class_terminalService.inc:457
-#: plugins/admin/systems/class_workstationService.inc:471
-#, fuzzy
-msgid "Mouse type"
-msgstr "Tipo MIME"
-
-#: plugins/admin/systems/class_terminalService.inc:458
-#: plugins/admin/systems/class_workstationService.inc:472
-#, fuzzy
-msgid "Mouse port"
-msgstr "Punto de montaje"
-
-#: plugins/admin/systems/class_terminalService.inc:459
-#: plugins/admin/systems/class_workstationService.inc:473
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:76
-#: plugins/gofon/phoneaccount/generic.tpl:30
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Componente telefónico"
-
  #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:310
+#: plugins/admin/systems/class_workstationStartup.inc:337
  #, php-format
  msgid ""
  "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -8359,26 +8112,26 @@ msgid "Terminal startup"
  msgstr "Plantilla de terminal"
  
  #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1163
  #, fuzzy
  msgid "Ldap server"
  msgstr "Servidor LDAP"
  
  #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1122
+#: plugins/admin/systems/class_workstationStartup.inc:1167
  #, fuzzy
  msgid "Kernel modules"
  msgstr "Comprobar parámetros"
  
  #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1119
+#: plugins/admin/systems/class_workstationStartup.inc:1164
  #: plugins/admin/systems/workstationStartup.tpl:8
  #: plugins/admin/systems/terminalStartup.tpl:8
  msgid "Boot kernel"
  msgstr "Kernel de inicio"
  
  #: plugins/admin/systems/class_terminalStartup.inc:455
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1165
  #, fuzzy
  msgid "Kernel parameter"
  msgstr "Comprobar parámetros"
@@ -8387,7 +8140,7 @@ msgstr "Comprobar parámetros"
  msgid "Server name"
  msgstr "Nombre del servidor"
  
-#: plugins/admin/systems/server.tpl:66
+#: plugins/admin/systems/server.tpl:67
  msgid "Select action to execute for this server"
  msgstr "Seleccione una acción que se ejecutara en este servidor"
  
@@ -8474,7 +8227,7 @@ msgid "Supported interfaces"
  msgstr "Interfaces soportados"
  
  #: plugins/admin/systems/glpiPrinter.tpl:48
-#: plugins/admin/systems/class_servDNS.inc:395
+#: plugins/admin/systems/class_servDNS.inc:397
  msgid "Serial"
  msgstr "Serie"
  
@@ -8514,201 +8267,199 @@ msgstr "Adjuntos"
  msgid "Installed cartridges"
  msgstr "Cartuchos instalados"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:98
+#: plugins/admin/systems/class_terminalGeneric.inc:105
  msgid "text"
  msgstr "texto"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:106
  msgid "graphic"
  msgstr "Gráfico"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:173
+#: plugins/admin/systems/class_terminalGeneric.inc:181
  #, php-format
  msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:179
+#: plugins/admin/systems/class_terminalGeneric.inc:188
  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:191
+#: plugins/admin/systems/class_terminalGeneric.inc:200
  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:203
+#: plugins/admin/systems/class_terminalGeneric.inc:212
  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:280
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:294
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Switch off"
  msgstr "Apagar"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:281
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:295
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Reboot"
  msgstr "Reiniciar"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:282
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_servGeneric.inc:186
-#: plugins/admin/systems/class_workstationGeneric.inc:282
-#: plugins/admin/systems/class_workstationGeneric.inc:288
-#: plugins/admin/ogroups/class_termgroup.inc:301
+#: plugins/admin/systems/class_terminalGeneric.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:190
+#: plugins/admin/systems/class_servGeneric.inc:196
+#: plugins/admin/systems/class_workstationGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:295
+#: plugins/admin/ogroups/class_termgroup.inc:300
  msgid "Memory test"
  msgstr "Testeo de memoria"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:283
-#: plugins/admin/systems/class_terminalGeneric.inc:287
-#: plugins/admin/systems/class_servGeneric.inc:181
-#: plugins/admin/systems/class_servGeneric.inc:187
-#: plugins/admin/systems/class_workstationGeneric.inc:283
-#: plugins/admin/systems/class_workstationGeneric.inc:289
-#: plugins/admin/ogroups/class_termgroup.inc:302
+#: plugins/admin/systems/class_terminalGeneric.inc:297
+#: plugins/admin/systems/class_terminalGeneric.inc:301
+#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_servGeneric.inc:197
+#: plugins/admin/systems/class_workstationGeneric.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:296
+#: plugins/admin/ogroups/class_termgroup.inc:301
  msgid "System analysis"
  msgstr "Análisis del sistema"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:285
-#: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/systems/class_terminalGeneric.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_workstationGeneric.inc:292
  msgid "Wake up"
  msgstr "Despertar"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:333
+#: plugins/admin/systems/class_terminalGeneric.inc:348
  #, php-format
  msgid "Removing of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:383
-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:387
+#: plugins/admin/systems/class_terminalGeneric.inc:415
  msgid "The required field 'Terminal name' is not set."
  msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
  
-#: plugins/admin/systems/class_terminalGeneric.inc:410
-#: plugins/admin/systems/class_workstationGeneric.inc:410
+#: plugins/admin/systems/class_terminalGeneric.inc:444
+#: plugins/admin/systems/class_workstationGeneric.inc:424
  msgid ""
  "There must be at least one NTP server selected, or the inherit mode "
  "activated."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:488
+#: plugins/admin/systems/class_terminalGeneric.inc:528
  #, php-format
  msgid "Saving of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:499
-#: plugins/admin/systems/class_terminalGeneric.inc:505
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: plugins/admin/systems/class_terminalGeneric.inc:539
+#: plugins/admin/systems/class_terminalGeneric.inc:545
+#: plugins/admin/systems/class_systemManagement.inc:998
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/admin/ogroups/class_ogroupManagement.inc:353
  msgid "Terminal"
  msgstr "Terminal"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:500
+#: plugins/admin/systems/class_terminalGeneric.inc:540
  #, fuzzy
  msgid "Terminal generic"
  msgstr "Servidor de terminal"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: plugins/admin/systems/class_terminalGeneric.inc:551
  #, fuzzy
  msgid "Syslog server enabled"
  msgstr "Servidor de Logs"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: plugins/admin/systems/class_terminalGeneric.inc:552
  #, fuzzy
  msgid "Ntp server settings"
  msgstr "Parámetros del usuario"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:515
-#: plugins/admin/systems/class_servGeneric.inc:347
-#: plugins/admin/systems/class_workstationGeneric.inc:519
-#: plugins/admin/ogroups/class_termgroup.inc:393
+#: plugins/admin/systems/class_terminalGeneric.inc:555
+#: plugins/admin/systems/class_workstationGeneric.inc:541
+#, fuzzy
+msgid "Root password"
+msgstr "Poner Contraseña"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:556
+#: plugins/admin/systems/class_servGeneric.inc:360
+#: plugins/admin/systems/class_workstationGeneric.inc:542
+#: plugins/admin/ogroups/class_termgroup.inc:392
  #, fuzzy
  msgid "Action flag"
  msgstr "Acción"
  
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:41
+#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/ogroups/class_termgroup.inc:40
  msgid "Activated"
  msgstr "Activado"
  
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_servGeneric.inc:79
  msgid "This 'dn' has no server features."
  msgstr "Esta 'dn' no tiene características de servidor."
  
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#: plugins/admin/ogroups/class_termgroup.inc:206
+#: plugins/admin/systems/class_servGeneric.inc:87
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/ogroups/class_termgroup.inc:205
  msgid "No ACTIONCMD definition found in your gosa.conf"
  msgstr "No se ha encontrado ninguna definición de 'ACTIONCMD' en 'gosa.conf'"
  
-#: plugins/admin/systems/class_servGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:125
  #, php-format
  msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:176
-#: plugins/admin/systems/class_workstationGeneric.inc:278
-#: plugins/admin/ogroups/class_termgroup.inc:297
+#: plugins/admin/systems/class_servGeneric.inc:186
+#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/ogroups/class_termgroup.inc:296
  msgid "Instant update"
  msgstr "Actualización instantánea"
  
-#: plugins/admin/systems/class_servGeneric.inc:177
-#: plugins/admin/systems/class_servGeneric.inc:185
-#: plugins/admin/systems/class_workstationGeneric.inc:279
-#: plugins/admin/systems/class_workstationGeneric.inc:287
-#: plugins/admin/ogroups/class_termgroup.inc:298
+#: plugins/admin/systems/class_servGeneric.inc:187
+#: plugins/admin/systems/class_servGeneric.inc:195
+#: plugins/admin/systems/class_workstationGeneric.inc:286
+#: plugins/admin/systems/class_workstationGeneric.inc:294
+#: plugins/admin/ogroups/class_termgroup.inc:297
  msgid "Scheduled update"
  msgstr "Actualización programada"
  
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_servGeneric.inc:184
-#: plugins/admin/systems/class_workstationGeneric.inc:280
-#: plugins/admin/systems/class_workstationGeneric.inc:286
-#: plugins/admin/ogroups/class_termgroup.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:188
+#: plugins/admin/systems/class_servGeneric.inc:194
+#: plugins/admin/systems/class_workstationGeneric.inc:287
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/ogroups/class_termgroup.inc:298
  msgid "Reinstall"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:179
-#: plugins/admin/systems/class_workstationGeneric.inc:281
-#: plugins/admin/ogroups/class_termgroup.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:189
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:299
  msgid "Rescan hardware"
  msgstr "Buscar hardware"
  
-#: plugins/admin/systems/class_servGeneric.inc:207
+#: plugins/admin/systems/class_servGeneric.inc:218
  #, fuzzy, php-format
  msgid "Removing of system server/generic with dn '%s' failed."
  msgstr "Ha fallado la eliminación de la macro telefónica de presentación"
  
-#: plugins/admin/systems/class_servGeneric.inc:245
+#: plugins/admin/systems/class_servGeneric.inc:263
  msgid "The required field 'Server name' is not set."
  msgstr "El campo requerido 'Nombre del servidor' no ha sido rellenado."
  
-#: plugins/admin/systems/class_servGeneric.inc:250
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr "No tiene permisos para crear un servidor en esta 'Base'."
-
-#: plugins/admin/systems/class_servGeneric.inc:319
+#: plugins/admin/systems/class_servGeneric.inc:332
  #, php-format
  msgid "Saving of system server/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:335
+#: plugins/admin/systems/class_servGeneric.inc:348
  #, fuzzy
  msgid "Server generic"
  msgstr "Nombre del servidor"
  
-#: plugins/admin/systems/class_servGeneric.inc:345
-#: plugins/admin/systems/class_workstationGeneric.inc:516
+#: plugins/admin/systems/class_servGeneric.inc:358
+#: plugins/admin/systems/class_workstationGeneric.inc:538
  #, fuzzy
  msgid "Goto mode"
  msgstr "a la carpeta"
@@ -8737,53 +8488,48 @@ msgstr ""
  "Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
  "aquí."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:191
-#: plugins/admin/ogroups/class_termgroup.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:198
+#: plugins/admin/ogroups/class_termgroup.inc:248
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  "Ha fallado la grabación de los parámetros de inicio de la estación de trabajo"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:209
  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:324
+#: plugins/admin/systems/class_workstationGeneric.inc:332
  #, fuzzy, php-format
  msgid "Removing of system workstation/generic with dn '%s' failed."
  msgstr "Ha fallado la eliminación de la estación de trabajo Samba"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/ogroups/class_termgroup.inc:109
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr "No tiene permisos para crear una estación de trabajo en esta 'Base'."
-
-#: plugins/admin/systems/class_workstationGeneric.inc:387
+#: plugins/admin/systems/class_workstationGeneric.inc:396
  msgid "The required field 'Workstation name' is not set."
  msgstr ""
  " El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:477
-#: plugins/admin/systems/class_workstationGeneric.inc:495
+#: plugins/admin/systems/class_workstationGeneric.inc:491
+#: plugins/admin/systems/class_workstationGeneric.inc:517
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic with dn '%s' failed."
  msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:505
+#: plugins/admin/systems/class_workstationGeneric.inc:527
  #, fuzzy
  msgid "Workstation generic"
  msgstr "Nombre de la estación de trabajo"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:814
+#: plugins/admin/systems/class_workstationGeneric.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:999
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/admin/ogroups/class_ogroupManagement.inc:352
  #: plugins/generic/references/class_reference.inc:48
  msgid "Workstation"
  msgstr "Estación de trabajo"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:518
-#: plugins/admin/ogroups/class_termgroup.inc:394
+#: plugins/admin/systems/class_workstationGeneric.inc:540
+#: plugins/admin/ogroups/class_termgroup.inc:393
  #, fuzzy
  msgid "Ntp server"
  msgstr "Servidor NTP"
@@ -8792,94 +8538,117 @@ msgstr "Servidor NTP"
  msgid "Systems"
  msgstr "Sistemas"
  
-#: plugins/admin/systems/class_systemManagement.inc:222
+#: plugins/admin/systems/class_systemManagement.inc:191
+msgid "Creating the image failed. Please see the report below."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:200
+#, fuzzy, php-format
+msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
+"parece existir."
+
+#: plugins/admin/systems/class_systemManagement.inc:257
+#, fuzzy
+msgid "You are not allowed to create a new object of this type."
+msgstr "¡No tiene permisos para eliminar este objeto grupo!"
+
+#: plugins/admin/systems/class_systemManagement.inc:308
  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:247
+#: plugins/admin/systems/class_systemManagement.inc:336
+#: plugins/admin/systems/class_systemManagement.inc:402
+#, fuzzy
+msgid "You are not allowed to change the password for this object."
+msgstr "¡No tiene permisos para cambiar su contraseña! en este momento"
+
+#: plugins/admin/systems/class_systemManagement.inc:348
  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:264
-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:405
+#, fuzzy
+msgid "Can't detect object to change password."
+msgstr "Permitir al usuario cambiar las opciones desde el cliente"
  
-#: plugins/admin/systems/class_systemManagement.inc:318
+#: plugins/admin/systems/class_systemManagement.inc:467
  #, php-format
  msgid "You're about to delete all information about the component at '%s'."
  msgstr ""
  "Esta a punto de borrar toda la información sobre el componente en '%s'."
  
-#: plugins/admin/systems/class_systemManagement.inc:324
-#: plugins/admin/systems/class_systemManagement.inc:385
+#: plugins/admin/systems/class_systemManagement.inc:473
+#: plugins/admin/systems/class_systemManagement.inc:533
  #: plugins/admin/fai/class_faiManagement.inc:168
  #: plugins/admin/fai/class_faiManagement.inc:221
  msgid "You are not allowed to delete this component!"
  msgstr "¡No tiene permisos para eliminar este componente!"
  
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:837
  msgid "New terminal"
  msgstr "Nuevo terminal"
  
-#: plugins/admin/systems/class_systemManagement.inc:654
+#: plugins/admin/systems/class_systemManagement.inc:839
  msgid "New workstation"
  msgstr "Nueva estación de trabajo"
  
-#: plugins/admin/systems/class_systemManagement.inc:656
+#: plugins/admin/systems/class_systemManagement.inc:841
  msgid "New Device"
  msgstr "Nuevo dispositivo"
  
-#: plugins/admin/systems/class_systemManagement.inc:675
+#: plugins/admin/systems/class_systemManagement.inc:860
  msgid "Terminal template for"
  msgstr "Plantilla de terminal para"
  
-#: plugins/admin/systems/class_systemManagement.inc:691
+#: plugins/admin/systems/class_systemManagement.inc:876
  msgid "Workstation template for"
  msgstr "Plantilla de estación de trabajo para"
  
-#: plugins/admin/systems/class_systemManagement.inc:811
+#: plugins/admin/systems/class_systemManagement.inc:996
  msgid "New System from incoming"
  msgstr "Nuevo sistema desde la entrada"
  
-#: plugins/admin/systems/class_systemManagement.inc:815
+#: plugins/admin/systems/class_systemManagement.inc:1000
  msgid "Workstation is installing"
  msgstr "La estación de trabajo se está instalando"
  
-#: plugins/admin/systems/class_systemManagement.inc:816
+#: plugins/admin/systems/class_systemManagement.inc:1001
  msgid "Workstation is waiting for action"
  msgstr "la estación de trabajo esta esperando por una acción"
  
-#: plugins/admin/systems/class_systemManagement.inc:817
+#: plugins/admin/systems/class_systemManagement.inc:1002
  msgid "Workstation installation failed"
  msgstr "Ha fallado la instalación de la estación de trabajo"
  
-#: plugins/admin/systems/class_systemManagement.inc:820
+#: plugins/admin/systems/class_systemManagement.inc:1005
  msgid "Server is installing"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:821
+#: plugins/admin/systems/class_systemManagement.inc:1006
  msgid "Server is waiting for action"
  msgstr "El servidor está esperando por una acción"
  
-#: plugins/admin/systems/class_systemManagement.inc:822
+#: plugins/admin/systems/class_systemManagement.inc:1007
  msgid "Server installation failed"
  msgstr "Ha fallado la instalación del servidor"
  
-#: plugins/admin/systems/class_systemManagement.inc:823
+#: plugins/admin/systems/class_systemManagement.inc:1008
  msgid "Winstation"
  msgstr "Estación de trabajo Windows"
  
-#: plugins/admin/systems/class_systemManagement.inc:824
+#: plugins/admin/systems/class_systemManagement.inc:1009
  msgid "Network Device"
  msgstr "Dispositivo de Red"
  
-#: plugins/admin/systems/class_systemManagement.inc:825
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_systemManagement.inc:1010
+#: plugins/admin/systems/class_divListSystem.inc:148
  msgid "New Terminal"
  msgstr "Nuevo terminal"
  
-#: plugins/admin/systems/class_systemManagement.inc:826
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_systemManagement.inc:1011
+#: plugins/admin/systems/class_divListSystem.inc:154
  msgid "New Workstation"
  msgstr "Nueva estación de trabajo"
  
@@ -8990,9 +8759,9 @@ msgstr ""
  "Aceptar correo desde otros dominios que usen ninguna autentificación SMTP"
  
  #: plugins/admin/systems/class_servDNS.inc:34
-#: plugins/admin/systems/class_servDNS.inc:353
-#: plugins/admin/systems/class_servDNS.inc:382
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:355
+#: plugins/admin/systems/class_servDNS.inc:384
+#: plugins/admin/systems/class_servDNS.inc:385
  #, fuzzy
  msgid "DNS service"
  msgstr "Añadir servicio DNS"
@@ -9024,7 +8793,7 @@ msgstr ""
  "aquí."
  
  #: plugins/admin/systems/class_servDNS.inc:167
-#: plugins/admin/systems/class_servDNS.inc:392
+#: plugins/admin/systems/class_servDNS.inc:394
  msgid "Reverse zone"
  msgstr "Zona Inversa"
  
@@ -9033,46 +8802,46 @@ msgstr "Zona Inversa"
  msgid "Class"
  msgstr "Clase"
  
-#: plugins/admin/systems/class_servDNS.inc:231
+#: plugins/admin/systems/class_servDNS.inc:233
  #, php-format
  msgid ""
  "Can't delete the selected zone, because it is still in use by these entry/"
  "entries '%s'"
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:290
+#: plugins/admin/systems/class_servDNS.inc:292
  #, php-format
  msgid "Updating of system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:299
+#: plugins/admin/systems/class_servDNS.inc:301
  #, fuzzy, php-format
  msgid "Removing of system server/dns with dn '%s' failed."
  msgstr "Ha fallado la eliminación del servidor"
  
-#: plugins/admin/systems/class_servDNS.inc:320
+#: plugins/admin/systems/class_servDNS.inc:322
  #, fuzzy, php-format
  msgid "Saving of system server/dns with dn '%s' failed."
  msgstr ""
  "Ha fallado la grabación de los parámetros del servidor de base de datos"
  
-#: plugins/admin/systems/class_servDNS.inc:344
+#: plugins/admin/systems/class_servDNS.inc:346
  #, php-format
  msgid "Set status flag for system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:391
-#: plugins/admin/systems/class_termDNS.inc:541
+#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_termDNS.inc:546
  #: plugins/admin/systems/servdnseditzone.tpl:7
  msgid "Zone name"
  msgstr "Nombre de la zona"
  
-#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_servDNS.inc:395
  #, fuzzy
  msgid "Primary dns server"
  msgstr "Servidor DNS primario para esta zona"
  
-#: plugins/admin/systems/class_servDNS.inc:397
+#: plugins/admin/systems/class_servDNS.inc:399
  #: plugins/admin/systems/servdnseditzone.tpl:73
  #: plugins/admin/ogroups/phonequeue.tpl:70
  #: plugins/admin/ogroups/class_phonequeue.inc:751
@@ -9080,12 +8849,12 @@ msgstr "Servidor DNS primario para esta zona"
  msgid "Retry"
  msgstr "Reintentar"
  
-#: plugins/admin/systems/class_servDNS.inc:398
+#: plugins/admin/systems/class_servDNS.inc:400
  #: plugins/admin/systems/servdnseditzone.tpl:79
  msgid "Expire"
  msgstr "Expira"
  
-#: plugins/admin/systems/class_servDNS.inc:400
+#: plugins/admin/systems/class_servDNS.inc:402
  #: plugins/admin/systems/servdnseditzone.tpl:24
  msgid "Zone records"
  msgstr "Registros de zona"
@@ -9288,39 +9057,39 @@ msgstr "Permite descarga no autentificada de información de presencia."
  msgid "kolabFreeBusyFuture"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:110
+#: plugins/admin/systems/class_printGeneric.inc:111
  #, php-format
  msgid "Can't extract a valid base out of object dn, setting base to '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:257
-#: plugins/admin/systems/class_printGeneric.inc:265
-#: plugins/admin/systems/class_printGeneric.inc:270
-#: plugins/admin/systems/class_printGeneric.inc:327
-#: plugins/admin/systems/class_printGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:260
+#: plugins/admin/systems/class_printGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:273
+#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:341
  msgid "Add printer extension"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:258
+#: plugins/admin/systems/class_printGeneric.inc:261
  msgid ""
  "Could not intialize printer tab, parameter parent was missing while "
  "construction."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:266
+#: plugins/admin/systems/class_printGeneric.inc:269
  msgid "This is a workstation template, printer tab is disabled."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:271
+#: plugins/admin/systems/class_printGeneric.inc:274
  msgid "This is a terminal template, printer tab is disabled."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:320
+#: plugins/admin/systems/class_printGeneric.inc:315
  msgid "This 'dn' has no printer features."
  msgstr "Esta 'dn' no tiene características de impresora."
  
-#: plugins/admin/systems/class_printGeneric.inc:328
+#: plugins/admin/systems/class_printGeneric.inc:323
  msgid ""
  "This object has printer extension disabled. You can't enable it while 'cn' "
  "is not present in entry. Possibly you are currently creating a new terminal "
@@ -9330,12 +9099,12 @@ msgstr ""
  "siempre que 'cn' no este presente en esta entrada. Posiblemente está "
  "actualmente creando una nueva plantilla de terminal"
  
-#: plugins/admin/systems/class_printGeneric.inc:335
-#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:330
+#: plugins/admin/systems/class_printGeneric.inc:333
  msgid "Remove printer extension"
  msgstr "Eliminar extensión de impresión"
  
-#: plugins/admin/systems/class_printGeneric.inc:336
+#: plugins/admin/systems/class_printGeneric.inc:331
  msgid ""
  "This workstation has printer extension enabled.You can disable it by "
  "clicking below."
@@ -9343,7 +9112,7 @@ msgstr ""
  "Esta estación de trabajo tiene la extensión impresora activada. Puede "
  "desactivarla pulsando aquí."
  
-#: plugins/admin/systems/class_printGeneric.inc:339
+#: plugins/admin/systems/class_printGeneric.inc:334
  msgid ""
  "This terminal has printer extension enabled. You can disable it by clicking "
  "below."
@@ -9351,7 +9120,7 @@ msgstr ""
  "Este terminal tiene la extensión impresora activada. Puede desactivarla "
  "pulsando aquí."
  
-#: plugins/admin/systems/class_printGeneric.inc:344
+#: plugins/admin/systems/class_printGeneric.inc:339
  msgid ""
  "This workstation has printer extension disabled. You can enable it by "
  "clicking below."
@@ -9359,7 +9128,7 @@ msgstr ""
  "Esta estación de trabajo tiene la extensión impresora desactivada. Puede "
  "activarla pulsando aquí."
  
-#: plugins/admin/systems/class_printGeneric.inc:347
+#: plugins/admin/systems/class_printGeneric.inc:342
  msgid ""
  "This terminal has printer extension disabled. You can enable it by clicking "
  "below."
@@ -9367,83 +9136,83 @@ msgstr ""
  "Este terminal tiene la extensión impresora desactivada. Puede activarla "
  "pulsando aquí."
  
-#: plugins/admin/systems/class_printGeneric.inc:510
+#: plugins/admin/systems/class_printGeneric.inc:511
  #, php-format
  msgid "Your currently selected PPD file '%s' doesn't exist."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:518
+#: plugins/admin/systems/class_printGeneric.inc:519
  msgid "can't get ppd informations."
  msgstr "no puedo acceder a la información PPD"
  
-#: plugins/admin/systems/class_printGeneric.inc:531
+#: plugins/admin/systems/class_printGeneric.inc:532
  #, php-format
  msgid "This printer belongs to terminal %s. You can't rename this printer."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:533
+#: plugins/admin/systems/class_printGeneric.inc:534
  #, php-format
  msgid "This printer belongs to workstation %s. You can't rename this printer."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:588
+#: plugins/admin/systems/class_printGeneric.inc:589
  #, fuzzy, php-format
  msgid "Removing of system print/generic with dn '%s' failed."
  msgstr "Ha fallado la eliminación de la impresora"
  
-#: plugins/admin/systems/class_printGeneric.inc:814
+#: plugins/admin/systems/class_printGeneric.inc:818
  #, php-format
  msgid "Saving of system print/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:837
-#: plugins/admin/systems/class_printGeneric.inc:839
-#: plugins/admin/ogroups/class_ogroupManagement.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:841
+#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
  #: plugins/admin/fai/faiTemplateEntry.tpl:85
  #: plugins/admin/fai/faiTemplateEntry.tpl:127
  #: plugins/generic/references/class_reference.inc:36
  msgid "Group"
  msgstr "Grupo"
  
-#: plugins/admin/systems/class_printGeneric.inc:855
+#: plugins/admin/systems/class_printGeneric.inc:859
  #, fuzzy
  msgid "Print generic"
  msgstr "Servicio de impresión"
  
-#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_printGeneric.inc:871
  msgid "LabeledURL"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_printGeneric.inc:872
  #, fuzzy
  msgid "Printer PPD"
  msgstr "Impresora"
  
-#: plugins/admin/systems/class_printGeneric.inc:885
+#: plugins/admin/systems/class_printGeneric.inc:889
  #, php-format
  msgid ""
  "You are not allowed to remove the given object '%s' from the list of members "
  "of printer '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:902
+#: plugins/admin/systems/class_printGeneric.inc:906
  #, php-format
  msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:907
+#: plugins/admin/systems/class_printGeneric.inc:911
  #, php-format
  msgid ""
  "You are not allowed to add the given object '%s' to the list of members of '%"
  "s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:942
+#: plugins/admin/systems/class_printGeneric.inc:946
  #, php-format
  msgid "Can't add '%s' to the list of members, it is already used."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:953
+#: plugins/admin/systems/class_printGeneric.inc:957
  #, php-format
  msgid "Can't add '%s' to list of members, it is not reachable."
  msgstr ""
@@ -9466,45 +9235,40 @@ msgstr ""
  msgid "Changing the password impinges on authentification only."
  msgstr "Cambiar la contraseña afecta solamente a la autenticación."
  
-#: plugins/admin/systems/class_componentGeneric.inc:127
+#: plugins/admin/systems/class_componentGeneric.inc:125
  #, fuzzy, php-format
  msgid "Removing of system component/generic with dn '%s' failed."
  msgstr "Ha fallado la eliminación de componente genérico"
  
-#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_componentGeneric.inc:172
  msgid "The required field 'Component name' is not set."
  msgstr "El campo requerido 'Nombre de componente' no ha sido rellenado."
  
-#: plugins/admin/systems/class_componentGeneric.inc:170
-#: plugins/admin/systems/class_phoneGeneric.inc:307
+#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_phoneGeneric.inc:317
  msgid "The required field IP address is empty."
  msgstr " El campo requerido 'Dirección IP' no ha sido rellenado."
  
-#: plugins/admin/systems/class_componentGeneric.inc:173
-#: plugins/admin/systems/class_phoneGeneric.inc:310
+#: plugins/admin/systems/class_componentGeneric.inc:180
+#: plugins/admin/systems/class_phoneGeneric.inc:320
  msgid "The field IP address contains an invalid address."
  msgstr "El campo 'Dirección IP' contiene una dirección no valida."
  
-#: plugins/admin/systems/class_componentGeneric.inc:247
+#: plugins/admin/systems/class_componentGeneric.inc:249
  #, php-format
  msgid "Saving of system component/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:258
+#: plugins/admin/systems/class_componentGeneric.inc:260
  #, fuzzy
  msgid "Component generic"
  msgstr "Nuevo componente"
  
-#: plugins/admin/systems/class_componentGeneric.inc:263
+#: plugins/admin/systems/class_componentGeneric.inc:265
  #, fuzzy
  msgid "Network device"
  msgstr "Dispositivos de Red"
  
-#: plugins/admin/systems/goNtpServer.tpl:2
-#, fuzzy
-msgid "Time server"
-msgstr "Servicio de Hora"
-
  #: plugins/admin/systems/goKrbServer.tpl:1
  msgid "Kerberos kadmin access"
  msgstr "Acceso a Kerberos kadmin"
@@ -9519,6 +9283,23 @@ msgstr "Dominio Kerberos"
  msgid "Admin user"
  msgstr "Usuario administrador"
  
+#: plugins/admin/systems/goFonServer.tpl:1
+#, fuzzy
+msgid "VoIP database information"
+msgstr "Información de sistema"
+
+#: plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr "Base de datos de usuarios Asterisk"
+
+#: plugins/admin/systems/goFonServer.tpl:20
+msgid "Country dial prefix"
+msgstr "Prefijo de marcado nacional"
+
+#: plugins/admin/systems/goFonServer.tpl:28
+msgid "Local dial prefix"
+msgstr "Prefijo de marcado local"
+
  #: plugins/admin/systems/chooser.tpl:1
  msgid "Choose the kind of system component you want to create"
  msgstr "Elija el tipo de componente del sistema que desea crear"
@@ -9589,27 +9370,19 @@ msgstr ""
  msgid "Codepage"
  msgstr "Pagina de códigos"
  
-#: plugins/admin/systems/servnfs.tpl:121
-#: plugins/admin/systems/class_goShareServer.inc:376
-msgid "Option"
-msgstr "Opción"
-
-#: plugins/admin/systems/goFonServer.tpl:1
-#, fuzzy
-msgid "VoIP database information"
-msgstr "Información de sistema"
-
-#: plugins/admin/systems/goFonServer.tpl:4
-msgid "Asterisk DB user"
-msgstr "Base de datos de usuarios Asterisk"
+#: plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/class_goShareServer.inc:376
+msgid "Option"
+msgstr "Opción"
  
-#: plugins/admin/systems/goFonServer.tpl:20
-msgid "Country dial prefix"
-msgstr "Prefijo de marcado nacional"
+#: plugins/admin/systems/goFaxServer.tpl:1
+#, fuzzy
+msgid "FAX database information"
+msgstr "Base de datos de FAX"
  
-#: plugins/admin/systems/goFonServer.tpl:28
-msgid "Local dial prefix"
-msgstr "Prefijo de marcado local"
+#: plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
+msgstr "Base de datos de usuarios de FAX"
  
  #: plugins/admin/systems/remove_glpi.tpl:10
  msgid ""
@@ -9626,12 +9399,12 @@ msgid "This 'dn' has no phone features."
  msgstr "Esta 'dn' no tiene características de teléfono."
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  msgid "yes"
  msgstr "si"
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  msgid "no"
  msgstr "no"
  
@@ -9655,98 +9428,95 @@ msgstr ""
  msgid "Removing of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:315
+#: plugins/admin/systems/class_phoneGeneric.inc:325
  msgid "The required field 'Phone name' is not set."
  msgstr "El campo requerido 'Nombre del teléfono' no ha sido rellenado."
  
-#: plugins/admin/systems/class_phoneGeneric.inc:318
+#: plugins/admin/systems/class_phoneGeneric.inc:328
  msgid "The 'Phone name' '0' is reserved and cannot be used."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:323
-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_phoneGeneric.inc:413
+#: plugins/admin/systems/class_phoneGeneric.inc:418
  #, php-format
  msgid "Saving of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:426
+#: plugins/admin/systems/class_phoneGeneric.inc:431
  #, fuzzy
  msgid "Phone generic"
  msgstr "Número de teléfono"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:431
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
  #, fuzzy
  msgid "Phone hardware"
  msgstr "Componente telefónico"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/admin/systems/class_phoneGeneric.inc:442
  #, fuzzy
  msgid "SIP Mode"
  msgstr "Modo"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:437
+#: plugins/admin/systems/class_phoneGeneric.inc:443
  #, fuzzy
  msgid "SIP DTMF mode"
  msgstr "Modo DTMF"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:438
+#: plugins/admin/systems/class_phoneGeneric.inc:444
  #, fuzzy
  msgid "SIP Default ip"
  msgstr "Dirección IP por defecto"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_phoneGeneric.inc:445
  msgid "SIP Qualify"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_phoneGeneric.inc:446
  #, fuzzy
  msgid "IAX authentication type"
  msgstr "Autenticación de Nagios"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:441
+#: plugins/admin/systems/class_phoneGeneric.inc:447
  #, fuzzy
  msgid "IAX secret"
  msgstr "Servicio IMAP"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:442
+#: plugins/admin/systems/class_phoneGeneric.inc:448
  #, fuzzy
  msgid "IAX account code"
  msgstr "Código de cuenta"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:443
+#: plugins/admin/systems/class_phoneGeneric.inc:449
  #, fuzzy
  msgid "IAX trunk lines"
  msgstr "Lineas troncales"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:444
+#: plugins/admin/systems/class_phoneGeneric.inc:450
  #, fuzzy
  msgid "IAX permit settings"
  msgstr "Parametros del Fax"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:445
+#: plugins/admin/systems/class_phoneGeneric.inc:451
  #, fuzzy
  msgid "IAX deny settings"
  msgstr "Parametros del Fax"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:446
+#: plugins/admin/systems/class_phoneGeneric.inc:452
  msgid "CAPI MSN"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:447
+#: plugins/admin/systems/class_phoneGeneric.inc:453
  msgid "Hardware type"
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#, php-format
+msgid "The file '%s/encodings' does not exist, can't get supported charsets."
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:49
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#, fuzzy, php-format
+msgid "Can't read '%s/encodings', please check permissions."
  msgstr ""
  "No se puede leer '/etc/gosa/encodings', por favor compruebe los permisos."
  
@@ -9778,17 +9548,17 @@ msgstr "La ruta contiene caracteres no validos."
  msgid "Option contains invalid characters."
  msgstr "La opción contiene caracteres no validos."
  
-#: plugins/admin/systems/class_workstationStartup.inc:402
+#: plugins/admin/systems/class_workstationStartup.inc:429
  msgid ""
  "There are packages in your configuration, which can't be resolved with "
  "current server/release settings."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:447
+#: plugins/admin/systems/class_workstationStartup.inc:474
  msgid "Please select a 'FAI server' or remove the 'FAI classes'."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:509
+#: plugins/admin/systems/class_workstationStartup.inc:537
  msgid ""
  "There is already a profile in your selection that contain partition table "
  "configurations."
@@ -9796,18 +9566,18 @@ msgstr ""
  "Ya existe un usuario con este perfil en su selección que tiene "
  "configuraciones de tabla de particiones."
  
-#: plugins/admin/systems/class_workstationStartup.inc:721
+#: plugins/admin/systems/class_workstationStartup.inc:754
  msgid "Not available in current setup"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:897
  #, php-format
  msgid ""
  "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
  "Server was reset to 'auto'."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:879
+#: plugins/admin/systems/class_workstationStartup.inc:913
  #, php-format
  msgid ""
  "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9815,19 +9585,19 @@ msgid ""
  "reset to 'auto'."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1040
+#: plugins/admin/systems/class_workstationStartup.inc:1085
  #, fuzzy, php-format
  msgid "Saving of system workstation/startup with dn '%s' failed."
  msgstr ""
  "Ha fallado la grabación de los parámetros de inicio de la estación de trabajo"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1090
+#: plugins/admin/systems/class_workstationStartup.inc:1135
  #, php-format
  msgid ""
  "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/class_workstationStartup.inc:1137
  #: plugins/admin/systems/class_servRepositorySetup.inc:203
  #, php-format
  msgid ""
@@ -9835,27 +9605,27 @@ msgid ""
  "empty string."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1155
  #, fuzzy
  msgid "System startup"
  msgstr "Estado del Sistema"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: plugins/admin/systems/class_workstationStartup.inc:1170
  #: plugins/admin/fai/class_faiProfile.inc:453
  #: plugins/admin/fai/faiProfile.tpl:36
  msgid "FAI classes"
  msgstr "Clases FAI"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1126
+#: plugins/admin/systems/class_workstationStartup.inc:1171
  msgid "Debian mirror"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1127
+#: plugins/admin/systems/class_workstationStartup.inc:1172
  #, fuzzy
  msgid "Debian release"
  msgstr "Versión actual"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1129
+#: plugins/admin/systems/class_workstationStartup.inc:1174
  msgid "FAI status flag"
  msgstr ""
  
@@ -10022,13 +9792,13 @@ msgstr "Sección"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:462
  #: plugins/admin/systems/class_printerPPDDialog.inc:465
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:289
  msgid "True"
  msgstr "Verdadero"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:463
  #: plugins/admin/systems/class_printerPPDDialog.inc:466
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:286
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:287
  msgid "False"
  msgstr "Falso"
  
@@ -10037,7 +9807,23 @@ msgstr "Falso"
  msgid "Unsupported ppd type '%s' used for '%s' "
  msgstr ""
  
-#: plugins/admin/systems/class_printerPPDDialog.inc:485
+#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#, fuzzy, php-format
+msgid "Removing old ppd file '%s' failed."
+msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#, php-format
+msgid "Removing old ppd file '%s' failed. File is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#, php-format
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:502
  msgid ""
  "Please select a valid ppd file or use 'Cancel' to go back to printer "
  "configuration."
@@ -10050,7 +9836,7 @@ msgstr "Controlador de dispositivo de Impresión"
  #: plugins/admin/systems/printerPPDDialog.tpl:5
  #: plugins/admin/systems/workstationService.tpl:7
  #: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:246
+#: plugins/admin/systems/terminalService.tpl:254
  #: plugins/admin/systems/class_glpiAccount.inc:784
  msgid "Model"
  msgstr "Modelo"
@@ -10085,30 +9871,199 @@ msgstr "Mostrar objetos que concuerden con"
  msgid "Regular expression for matching object names"
  msgstr "Expresiones regulares que concuerden con nombres de objetos"
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#, fuzzy, php-format
+msgid "You're about to delete the ppd file '%s' at '%s'."
+msgstr "Va ha eliminar la aplicación '%s'."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#, fuzzy, php-format
+msgid "Could not found specified ppd file '%s'."
+msgstr "¡No puedo abrir el certificado especificado!"
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+msgid ""
+"Something went wrong while trying to remove the ppd file from server, "
+"possibly we have no write access."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
  #, php-format
  msgid "Selected vendor '%s' does not exists in our list of ppds."
  msgstr ""
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
  msgid "Printer ppd selection."
  msgstr "Seleccionar impresora ppd"
  
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:157
+#: plugins/admin/systems/class_terminalService.inc:71
+msgid "unknown"
+msgstr "desconocido"
+
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_terminalService.inc:105
+#: plugins/admin/systems/class_terminalService.inc:106
+msgid "bit"
+msgstr "bit"
+
+#: plugins/admin/systems/class_workstationService.inc:138
+#: plugins/admin/systems/class_terminalService.inc:158
+msgid "show chooser"
+msgstr "mostrar elegidos"
+
+#: plugins/admin/systems/class_workstationService.inc:139
+#: plugins/admin/systems/class_terminalService.inc:159
+msgid "direct"
+msgstr "Directo"
+
+#: plugins/admin/systems/class_workstationService.inc:142
+#: plugins/admin/systems/class_terminalService.inc:162
+msgid "load balanced"
+msgstr "balanceo de carga"
+
+#: plugins/admin/systems/class_workstationService.inc:145
+#: plugins/admin/systems/class_terminalService.inc:165
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_workstationService.inc:146
+#: plugins/admin/systems/class_terminalService.inc:166
+msgid "ICA client"
+msgstr "Cliente ICA"
+
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_terminalService.inc:221
+msgid "Bit"
+msgstr "Bit"
+
+#: plugins/admin/systems/class_workstationService.inc:314
+#: plugins/admin/systems/class_terminalService.inc:316
+msgid "Choose the phone located at the current terminal"
+msgstr "Elija el teléfono localizado en el terminal actual"
+
+#: plugins/admin/systems/class_workstationService.inc:380
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_terminalService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:395
+msgid "Please specify a valid VSync range."
+msgstr "Por favor especifique un rango VSync valido"
+
+#: plugins/admin/systems/class_workstationService.inc:395
+#: plugins/admin/systems/class_workstationService.inc:400
+#: plugins/admin/systems/class_terminalService.inc:404
+#: plugins/admin/systems/class_terminalService.inc:409
+msgid "Please specify a valid HSync range."
+msgstr "Por favor especifique un rango HSync valido"
+
  #: plugins/admin/systems/class_workstationService.inc:443
  #, fuzzy, php-format
  msgid "Saving of system workstation/service with dn '%s' failed."
  msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
  
+#: plugins/admin/systems/class_workstationService.inc:451
+#: plugins/admin/systems/class_terminalService.inc:466
+#, fuzzy
+msgid "Service"
+msgstr "Servicios"
+
  #: plugins/admin/systems/class_workstationService.inc:452
  #, fuzzy
  msgid "Workstation service"
  msgstr "Nombre de la estación de trabajo"
  
+#: plugins/admin/systems/class_workstationService.inc:460
+#: plugins/admin/systems/class_terminalService.inc:475
+#, fuzzy
+msgid "Monitor"
+msgstr "Tamaño del monitor"
+
+#: plugins/admin/systems/class_workstationService.inc:461
+#: plugins/admin/systems/class_terminalService.inc:479
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Nuevo controlador de dispositivo"
+
+#: plugins/admin/systems/class_workstationService.inc:462
+#: plugins/admin/systems/class_terminalService.inc:480
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Resolución"
+
+#: plugins/admin/systems/class_workstationService.inc:463
+#: plugins/admin/systems/class_terminalService.inc:481
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Profundidad del Color"
+
+#: plugins/admin/systems/class_workstationService.inc:464
+#: plugins/admin/systems/class_terminalService.inc:482
+#, fuzzy
+msgid "Hsync"
+msgstr "HSync"
+
+#: plugins/admin/systems/class_workstationService.inc:465
+#: plugins/admin/systems/class_terminalService.inc:483
+#, fuzzy
+msgid "Vsync"
+msgstr "VSync"
+
  #: plugins/admin/systems/class_workstationService.inc:466
  #, fuzzy
  msgid "Use DDC"
  msgstr "Identificador (ID) de usuario"
  
+#: plugins/admin/systems/class_workstationService.inc:467
+#: plugins/admin/systems/class_terminalService.inc:487
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "desactivado"
+
+#: plugins/admin/systems/class_workstationService.inc:468
+#: plugins/admin/systems/class_terminalService.inc:491
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Elija modelo de teclado"
+
+#: plugins/admin/systems/class_workstationService.inc:469
+#: plugins/admin/systems/class_terminalService.inc:492
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Elija localización del teclado"
+
+#: plugins/admin/systems/class_workstationService.inc:470
+#: plugins/admin/systems/class_terminalService.inc:493
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Elija variante de teclado"
+
+#: plugins/admin/systems/class_workstationService.inc:471
+#: plugins/admin/systems/class_terminalService.inc:494
+#, fuzzy
+msgid "Mouse type"
+msgstr "Tipo MIME"
+
+#: plugins/admin/systems/class_workstationService.inc:472
+#: plugins/admin/systems/class_terminalService.inc:495
+#, fuzzy
+msgid "Mouse port"
+msgstr "Punto de montaje"
+
+#: plugins/admin/systems/class_workstationService.inc:473
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:76
+#: plugins/admin/systems/class_terminalService.inc:496
+#: plugins/gofon/phoneaccount/generic.tpl:30
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Componente telefónico"
+
  #: plugins/admin/systems/workstationService.tpl:4
  #: plugins/admin/systems/terminalService.tpl:4
  msgid "Keyboard"
@@ -10186,41 +10141,42 @@ msgid "Display device"
  msgstr "Mostrar dispositivo"
  
  #: plugins/admin/systems/workstationService.tpl:167
+#: plugins/admin/systems/terminalService.tpl:147
  msgid "Use DDC for automatic detection"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:170
-#: plugins/admin/systems/terminalService.tpl:142
+#: plugins/admin/systems/terminalService.tpl:150
  msgid "HSync"
  msgstr "HSync"
  
  #: plugins/admin/systems/workstationService.tpl:175
-#: plugins/admin/systems/terminalService.tpl:146
+#: plugins/admin/systems/terminalService.tpl:154
  msgid "Horizontal refresh frequency for installed monitor"
  msgstr "Frecuencia de refresco horizontal para el monitor instalado"
  
  #: plugins/admin/systems/workstationService.tpl:181
-#: plugins/admin/systems/terminalService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:158
  msgid "VSync"
  msgstr "VSync"
  
  #: plugins/admin/systems/workstationService.tpl:186
-#: plugins/admin/systems/terminalService.tpl:154
+#: plugins/admin/systems/terminalService.tpl:162
  msgid "Vertical refresh frequency for installed monitor"
  msgstr "Frecuencia de refresco vertical para el monitor instalado"
  
  #: plugins/admin/systems/workstationService.tpl:201
-#: plugins/admin/systems/terminalService.tpl:237
+#: plugins/admin/systems/terminalService.tpl:245
  msgid "Scan device"
  msgstr "Dispositivo de escaneo"
  
  #: plugins/admin/systems/workstationService.tpl:204
-#: plugins/admin/systems/terminalService.tpl:239
+#: plugins/admin/systems/terminalService.tpl:247
  msgid "Select to start SANE scan service on terminal"
  msgstr "Seleccione para iniciar el servicio de escáner 'SANE' en el terminal"
  
  #: plugins/admin/systems/workstationService.tpl:207
-#: plugins/admin/systems/terminalService.tpl:241
+#: plugins/admin/systems/terminalService.tpl:249
  msgid "Provide scan services"
  msgstr "Provee servicios de exploración"
  
@@ -10262,17 +10218,17 @@ msgstr "Asignar clases FAI"
  msgid "set"
  msgstr "poner"
  
-#: plugins/admin/systems/workstationStartup.tpl:137
+#: plugins/admin/systems/workstationStartup.tpl:141
  #: plugins/admin/systems/terminalStartup.tpl:66
  msgid "Kernel modules (format: name parameters)"
  msgstr "Módulos del núcleo (formato: nombre parámetros)"
  
-#: plugins/admin/systems/workstationStartup.tpl:140
+#: plugins/admin/systems/workstationStartup.tpl:144
  #: plugins/admin/systems/terminalStartup.tpl:69
  msgid "Add additional modules to load on startup"
  msgstr "Añadir módulos adicionales que serán cargados al arrancar"
  
-#: plugins/admin/systems/workstationStartup.tpl:176
+#: plugins/admin/systems/workstationStartup.tpl:180
  #: plugins/admin/systems/terminalStartup.tpl:105
  msgid "Mountpoint"
  msgstr "Punto de montaje"
@@ -10302,68 +10258,78 @@ msgstr ""
  msgid "use debug mode for startup"
  msgstr "Usar el modo de depuración durante el arranque"
  
-#: plugins/admin/systems/terminalService.tpl:169
+#: plugins/admin/systems/terminalService.tpl:173
+#: plugins/admin/systems/class_terminalService.inc:477
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
+
+#: plugins/admin/systems/terminalService.tpl:177
  msgid "Connect method"
  msgstr "Método de conexión"
  
-#: plugins/admin/systems/terminalService.tpl:172
+#: plugins/admin/systems/terminalService.tpl:180
  msgid "Choose method to connect to terminal server"
  msgstr "Elija el método de conexión con el servidor de terminal"
  
-#: plugins/admin/systems/terminalService.tpl:180
+#: plugins/admin/systems/terminalService.tpl:188
  msgid "Terminal server"
  msgstr "Servidor de terminal"
  
-#: plugins/admin/systems/terminalService.tpl:183
+#: plugins/admin/systems/terminalService.tpl:191
  msgid "Select specific terminal server to use"
  msgstr "Seleccione específicamente que servidor de terminal usará"
  
-#: plugins/admin/systems/terminalService.tpl:191
+#: plugins/admin/systems/terminalService.tpl:199
  msgid "Font server"
  msgstr "Servidor de fuentes"
  
-#: plugins/admin/systems/terminalService.tpl:194
+#: plugins/admin/systems/terminalService.tpl:202
  msgid "Select specific font server to use"
  msgstr "Seleccione específicamente que servidor de fuentes usará"
  
-#: plugins/admin/systems/terminalService.tpl:211
+#: plugins/admin/systems/terminalService.tpl:219
  msgid "Print device"
  msgstr "Dispositivo de Impresión"
  
-#: plugins/admin/systems/terminalService.tpl:213
+#: plugins/admin/systems/terminalService.tpl:221
  msgid "Select to start IPP based printing service on terminal"
  msgstr ""
  "Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
  "terminal"
  
-#: plugins/admin/systems/terminalService.tpl:215
+#: plugins/admin/systems/terminalService.tpl:223
  msgid "Provide print services"
  msgstr "Proveer servicios de impresión"
  
-#: plugins/admin/systems/terminalService.tpl:224
+#: plugins/admin/systems/terminalService.tpl:229
+#: plugins/admin/systems/class_terminalService.inc:486
+msgid "Spool server"
+msgstr "Servidor de Cola"
+
+#: plugins/admin/systems/terminalService.tpl:232
  msgid "Select NFS filesystem to place spool files on"
  msgstr ""
  "Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
  
-#: plugins/admin/systems/terminalService.tpl:249
+#: plugins/admin/systems/terminalService.tpl:257
  msgid "Select scanner driver to use"
  msgstr "Seleccione que controladores de escáner se usaran"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:1
-#: plugins/admin/systems/class_servRepository.inc:349
+#: plugins/admin/systems/class_servRepository.inc:365
  #: plugins/admin/fai/faiPackage.tpl:33
  msgid "Repository"
  msgstr "Repositorio"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:364
+#: plugins/admin/systems/class_servRepository.inc:380
  msgid "Parent server"
  msgstr "Servidor Origen"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:39
-#: plugins/admin/systems/class_servRepository.inc:239
-#: plugins/admin/systems/class_servRepository.inc:262
-#: plugins/admin/systems/class_servRepository.inc:363
+#: plugins/admin/systems/class_servRepository.inc:253
+#: plugins/admin/systems/class_servRepository.inc:276
+#: plugins/admin/systems/class_servRepository.inc:379
  msgid "Sections"
  msgstr "Secciones"
  
@@ -10383,33 +10349,38 @@ msgstr ""
  "No puedo ejecutar el REPOSITORY_HOOK '%s' indicado. Por favor compruebe el "
  "archivo gosa.conf."
  
-#: plugins/admin/systems/class_servRepository.inc:35
-#: plugins/admin/systems/class_servRepository.inc:339
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:44
+#: plugins/admin/systems/class_servRepository.inc:355
+#: plugins/admin/systems/class_servRepository.inc:366
  #, fuzzy
  msgid "Repository service"
  msgstr "Parámetros del repositorio"
  
-#: plugins/admin/systems/class_servRepository.inc:138
+#: plugins/admin/systems/class_servRepository.inc:94
+#: plugins/admin/fai/class_faiSummaryTab.inc:175
+msgid "You can't use this plugin until FAI is activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:152
  #, php-format
  msgid ""
  "You can't delete this release, it is still used by these workstations [%s]. "
  "Please solve this dependencies first, to keep data base consistency."
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:172
+#: plugins/admin/systems/class_servRepository.inc:186
  #, php-format
  msgid ""
  "Be careful editing this release, it is still used by these workstations [%s]."
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:212
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
  #: plugins/admin/fai/class_faiManagement.inc:343
  msgid "This name is already in use."
  msgstr "El nombre especificado ya esta siendo usado"
  
-#: plugins/admin/systems/class_servRepository.inc:359
+#: plugins/admin/systems/class_servRepository.inc:375
  #: plugins/admin/systems/class_goGlpiServer.inc:92
  #: plugins/admin/systems/class_goCupsServer.inc:71
  #: plugins/admin/systems/class_serverService.inc:8
@@ -10421,7 +10392,7 @@ msgstr "El nombre especificado ya esta siendo usado"
  msgid "Start"
  msgstr "Inicio"
  
-#: plugins/admin/systems/class_servRepository.inc:360
+#: plugins/admin/systems/class_servRepository.inc:376
  #: plugins/admin/systems/class_goGlpiServer.inc:93
  #: plugins/admin/systems/class_goCupsServer.inc:72
  #: plugins/admin/systems/class_serverService.inc:7
@@ -10433,7 +10404,7 @@ msgstr "Inicio"
  msgid "Stop"
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:361
+#: plugins/admin/systems/class_servRepository.inc:377
  #: plugins/admin/systems/class_goGlpiServer.inc:94
  #: plugins/admin/systems/class_goCupsServer.inc:73
  #: plugins/admin/systems/class_serverService.inc:9
@@ -10445,12 +10416,12 @@ msgstr ""
  msgid "Restart"
  msgstr "Reintentar"
  
-#: plugins/admin/systems/class_servRepository.inc:362
+#: plugins/admin/systems/class_servRepository.inc:378
  #, fuzzy
  msgid "Releases"
  msgstr "Versión"
  
-#: plugins/admin/systems/class_servRepository.inc:365
+#: plugins/admin/systems/class_servRepository.inc:381
  msgid "Url"
  msgstr ""
  
@@ -10543,14 +10514,9 @@ msgstr "Expresiones regulares que concuerden con nombres de dispositivos"
  msgid "Use"
  msgstr "Usa"
  
-#: plugins/admin/systems/goFaxServer.tpl:1
-#, fuzzy
-msgid "FAX database information"
-msgstr "Base de datos de FAX"
-
-#: plugins/admin/systems/goFaxServer.tpl:4
-msgid "FAX DB user"
-msgstr "Base de datos de usuarios de FAX"
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
+msgstr ""
  
  #: plugins/admin/systems/class_glpiAccount.inc:147
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:161
@@ -10682,7 +10648,7 @@ msgid "Attachment"
  msgstr "Adjuntos"
  
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:136
  msgid "File"
  msgstr "Archivo"
  
@@ -10698,6 +10664,37 @@ msgstr "Tipo MIME"
  msgid "use"
  msgstr "uso"
  
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+msgid "Go to root department"
+msgstr "Ir al departamento raíz"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:194
+msgid "Go up one department"
+msgstr "Subir un departamento"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+msgid "Go to users department"
+msgstr "Ir al departamento de los usuarios"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+#: include/class_MultiSelectWindow.inc:204
+msgid "Home"
+msgstr "Inicio"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: include/class_MultiSelectWindow.inc:209
+msgid "Reload list"
+msgstr ""
+
  #: plugins/admin/systems/glpiSelectUser.tpl:23
  msgid ""
  "This dialog allows you to select a user as technical responsible person."
@@ -10837,7 +10834,7 @@ msgid "Add/Edit network interface"
  msgstr "Añadir/Editar dispositivo de red"
  
  #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:532
+#: plugins/admin/systems/class_termDNS.inc:537
  msgid "MAC address"
  msgstr "Dirección MAC"
  
@@ -10917,7 +10914,7 @@ msgid "New processor"
  msgstr "Nuevo procesador"
  
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "P"
  msgstr ""
  
@@ -11050,7 +11047,8 @@ msgid "Upload wasn't successfull."
  msgstr "El envío no fue correcto."
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
  msgstr ""
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:138
@@ -11208,73 +11206,73 @@ msgstr ""
  msgid "Cartridges"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:137
  #, php-format
  msgid ""
  "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:311
+#: plugins/admin/systems/class_termDNS.inc:319
  msgid "The required field 'IP-address' is not set."
  msgstr " El campo requerido 'Dirección IP' no ha sido rellenado."
  
-#: plugins/admin/systems/class_termDNS.inc:318
+#: plugins/admin/systems/class_termDNS.inc:323
  msgid "Wrong IP format in field IP-address."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:324
+#: plugins/admin/systems/class_termDNS.inc:330
  msgid "The required field 'MAC-address' is not set."
  msgstr " El campo requerido 'Dirección MAC' no ha sido rellenado."
  
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_termDNS.inc:333
  msgid ""
  "The given macaddress is invalid. There must be 6 2byte segments seperated by "
  "':'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:351
+#: plugins/admin/systems/class_termDNS.inc:353
  #, php-format
  msgid "Found duplicate value for record type '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:359
+#: plugins/admin/systems/class_termDNS.inc:361
  #, php-format
  msgid "Found more than one entry for the uniqe record type '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:370
+#: plugins/admin/systems/class_termDNS.inc:372
  #, php-format
  msgid ""
  "The device IP '%s' is added as 'A Record', this will be done automatically, "
  "please remove the record."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:377
+#: plugins/admin/systems/class_termDNS.inc:379
  #: plugins/admin/systems/class_servDNSeditZone.inc:409
  #, php-format
  msgid "Only lowercase is allowed, please check your '%ss'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:463
  #, fuzzy, php-format
  msgid "Saving of terminal/dns account with dn '%s' failed."
  msgstr "No se ha podido guardar la cuenta de correo"
  
-#: plugins/admin/systems/class_termDNS.inc:522
+#: plugins/admin/systems/class_termDNS.inc:527
  msgid "DNS"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:528
  #, fuzzy
  msgid "DNS settings"
  msgstr "Parametros de samba"
  
-#: plugins/admin/systems/class_termDNS.inc:531
+#: plugins/admin/systems/class_termDNS.inc:536
  #, fuzzy
  msgid "IP address"
  msgstr "Dirección IP"
  
-#: plugins/admin/systems/class_termDNS.inc:540
+#: plugins/admin/systems/class_termDNS.inc:545
  #, fuzzy
  msgid "DNS records"
  msgstr "Registros DNS"
@@ -11368,7 +11366,7 @@ msgstr "Elija un grupo de objetos"
  
  #: plugins/admin/systems/class_servDNSeditZone.inc:290
  #: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:371
  msgid "Down"
  msgstr "Abajo"
  
@@ -11452,42 +11450,37 @@ msgid ""
  "our zone editing dialog."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:206
  #, php-format
  msgid "Entry name '%s' contains invalid characters."
  msgstr "¡El nombre de la entrada '%s' contiene caracteres no validos!"
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
  #, php-format
  msgid "Can not rename '%s' to '%s',the destination name already exists."
  msgstr "No se puede renombrar '%s' a '%s',ya existe el nombre de destino."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:221
  #, php-format
  msgid "Can not create '%s',the destination name already exists."
  msgstr "No se puede crear '%s', el nombre de destino ya existe."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
  #, php-format
  msgid "The name '%s' is used more than once."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
  #, php-format
  msgid "The record type '%s' is a unique type and can't be defined twice."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:260
  #, php-format
  msgid "There is an empty '%s' for host '%s'."
  msgstr "Hay un '%s' vacío para el host '%s'."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:268
  #, php-format
  msgid "There is a duplicate entry in '%s' for '%s'."
  msgstr ""
@@ -11591,94 +11584,90 @@ msgstr "Mostrar dispositivos de Red"
  msgid "Display systems of user"
  msgstr "Mostrar sistemas del usuario"
  
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:148
  msgid "New Terminal template"
  msgstr "Nueva plantilla de terminal"
  
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:154
  msgid "New Workstation template"
  msgstr "Nueva plantilla de estación de trabajo"
  
-#: plugins/admin/systems/class_divListSystem.inc:140
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:160
  msgid "New Server"
  msgstr "Nuevo servidor"
  
-#: plugins/admin/systems/class_divListSystem.inc:142
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:166
  msgid "New Printer"
  msgstr "Nueva impresora"
  
-#: plugins/admin/systems/class_divListSystem.inc:144
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:172
  msgid "New Phone"
  msgstr "Nuevo teléfono"
  
-#: plugins/admin/systems/class_divListSystem.inc:146
-#: plugins/admin/systems/class_divListSystem.inc:147
+#: plugins/admin/systems/class_divListSystem.inc:178
  msgid "New Component"
  msgstr "Nuevo componente"
  
-#: plugins/admin/systems/class_divListSystem.inc:165
+#: plugins/admin/systems/class_divListSystem.inc:203
  msgid "Cups Server"
  msgstr "Servidor CUPS"
  
-#: plugins/admin/systems/class_divListSystem.inc:166
+#: plugins/admin/systems/class_divListSystem.inc:204
  msgid "Log Db"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:167
+#: plugins/admin/systems/class_divListSystem.inc:205
  msgid "Syslog Server"
  msgstr "Servidor SYSLOG"
  
-#: plugins/admin/systems/class_divListSystem.inc:168
+#: plugins/admin/systems/class_divListSystem.inc:206
  msgid "Mail Server"
  msgstr "Servidor de correo"
  
-#: plugins/admin/systems/class_divListSystem.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:207
  msgid "Imap Server"
  msgstr "Servidor IMAP"
  
-#: plugins/admin/systems/class_divListSystem.inc:170
+#: plugins/admin/systems/class_divListSystem.inc:208
  msgid "Nfs Server"
  msgstr "Servidor NFS"
  
-#: plugins/admin/systems/class_divListSystem.inc:171
+#: plugins/admin/systems/class_divListSystem.inc:209
  msgid "Kerberos Server"
  msgstr "Servidor Kerberos"
  
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:210
  msgid "Asterisk Server"
  msgstr "Servidor Asterisk"
  
-#: plugins/admin/systems/class_divListSystem.inc:173
+#: plugins/admin/systems/class_divListSystem.inc:211
  msgid "Fax Server"
  msgstr "Servidor FAX"
  
-#: plugins/admin/systems/class_divListSystem.inc:174
+#: plugins/admin/systems/class_divListSystem.inc:212
  msgid "Ldap Server"
  msgstr "Servidor LDAP"
  
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/acl/class_divListACL.inc:123
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/acl/class_divListACL.inc:128
  msgid "Edit system"
  msgstr "Editar sistema"
  
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/acl/class_divListACL.inc:126
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/acl/class_divListACL.inc:132
  msgid "Delete system"
  msgstr "Eliminar sistema"
  
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_divListSystem.inc:308
  msgid "Set root       password"
  msgstr "Poner Contraseña de root"
  
-#: plugins/admin/systems/class_divListSystem.inc:229
+#: plugins/admin/systems/class_divListSystem.inc:315
  #, fuzzy
  msgid "Create CD"
  msgstr "Crear"
  
-#: plugins/admin/systems/class_divListSystem.inc:230
+#: plugins/admin/systems/class_divListSystem.inc:316
  #, fuzzy
  msgid "Create FAI CD"
  msgstr "Crear nuevo objeto FAI."
@@ -11708,6 +11697,10 @@ msgstr "El nombre de dispositivo especificado ya esta siendo usado"
  msgid "Cups"
  msgstr "Arriba"
  
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr ""
+
  #: plugins/admin/systems/goLdapServer.tpl:1
  #: plugins/admin/systems/class_goLdapServer.inc:28
  #, fuzzy
@@ -11811,6 +11804,16 @@ msgstr "Servicio de impresión"
  msgid "Remove service"
  msgstr "Eliminar servicio DNS"
  
+#: plugins/admin/systems/class_goTerminalServer.inc:31
+#: plugins/admin/systems/class_goTerminalServer.inc:54
+#: plugins/admin/systems/class_goTerminalServer.inc:117
+#: plugins/admin/systems/class_goTerminalServer.inc:118
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#: plugins/admin/systems/class_terminalService.inc:467
+#, fuzzy
+msgid "Terminal service"
+msgstr "Servidor de terminal"
+
  #: plugins/admin/systems/class_goTerminalServer.inc:78
  #, fuzzy, php-format
  msgid "Saving server services/terminalServer with dn '%s' failed."
@@ -11825,6 +11828,12 @@ msgstr ""
  msgid "Temporary disable login"
  msgstr "Desactivación temporal del acceso"
  
+#: plugins/admin/systems/class_goTerminalServer.inc:127
+#: plugins/admin/systems/goTerminalServer.tpl:12
+#: plugins/admin/systems/class_terminalService.inc:478
+msgid "Font path"
+msgstr "Ruta a las fuentes tipográficas"
+
  #: plugins/admin/systems/class_serverService.inc:288
  msgid "Can't set status while this server is not saved."
  msgstr ""
@@ -12570,6 +12579,43 @@ msgstr ""
  "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
  "parece existir."
  
+#: plugins/admin/systems/class_terminalService.inc:157
+msgid "default"
+msgstr "por defecto"
+
+#: plugins/admin/systems/class_terminalService.inc:457
+#, fuzzy, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr "Ha fallado la grabación de la información del servicio de terminal"
+
+#: plugins/admin/systems/class_terminalService.inc:476
+#: plugins/admin/ogroups/class_phonequeue.inc:748
+#, fuzzy
+msgid "Method"
+msgstr "método"
+
+#: plugins/admin/systems/class_terminalService.inc:484
+msgid "Auto-Sync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:485
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/class_terminalService.inc:488
+#, fuzzy
+msgid "Scanner model"
+msgstr "desactivado"
+
+#: plugins/admin/systems/class_terminalService.inc:489
+msgid "Haeh ? "
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:490
+msgid "..."
+msgstr ""
+
  #: plugins/admin/ogroups/termgroup.tpl:2
  msgid ""
  "Actions you choose here influence all systems in this object group. "
@@ -12590,8 +12636,8 @@ msgstr "Objetos miembro"
  msgid "Phone queue"
  msgstr "Cola de teléfono"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:88
-#: plugins/admin/ogroups/class_termgroup.inc:383
+#: plugins/admin/ogroups/tabs_ogroups.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:382
  msgid "System"
  msgstr "Sistema"
  
@@ -12599,21 +12645,25 @@ msgstr "Sistema"
  msgid "Terminals"
  msgstr "Terminales"
  
-#: plugins/admin/ogroups/class_termgroup.inc:114
+#: plugins/admin/ogroups/class_termgroup.inc:108
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr "No tiene permisos para crear una estación de trabajo en esta 'Base'."
+
+#: plugins/admin/ogroups/class_termgroup.inc:113
  msgid "There must be at least one NTP server selected."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:168
+#: plugins/admin/ogroups/class_termgroup.inc:167
  #, php-format
  msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:376
+#: plugins/admin/ogroups/class_termgroup.inc:375
  #, fuzzy
  msgid "Saving workstation failed"
  msgstr "Ha fallado la grabación de la estación de trabajo Samba"
  
-#: plugins/admin/ogroups/class_termgroup.inc:384
+#: plugins/admin/ogroups/class_termgroup.inc:383
  #, fuzzy
  msgid "System group"
  msgstr "Estado del Sistema"
@@ -12675,18 +12725,18 @@ msgid "Display objects of department"
  msgstr "Mostrar objetos de departamentos"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:715
+#: plugins/admin/ogroups/class_ogroup.inc:698
  #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
  msgid "Object groups"
  msgstr "Grupos de objetos"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:159
+#: plugins/admin/ogroups/class_ogroupManagement.inc:154
  #, php-format
  msgid "You're about to delete the object group '%s'."
  msgstr "Has decidido eliminar el objeto grupo '%s'."
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:165
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:160
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
  msgid "You are not allowed to delete this object group!"
  msgstr "¡No tiene permisos para eliminar este objeto grupo!"
  
@@ -12694,78 +12744,78 @@ msgstr "¡No tiene permisos para eliminar este objeto grupo!"
  msgid "This 'dn' is no object group."
  msgstr "Este 'dn' no es un objeto tipo grupo."
  
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:290
  msgid "too many different objects!"
  msgstr "¡Demasiados objetos diferentes!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:292
  msgid "users"
  msgstr "usuarios"
  
-#: plugins/admin/ogroups/class_ogroup.inc:295
+#: plugins/admin/ogroups/class_ogroup.inc:293
  msgid "groups"
  msgstr "grupos"
  
-#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:294
  msgid "applications"
  msgstr "Aplicaciones"
  
-#: plugins/admin/ogroups/class_ogroup.inc:297
+#: plugins/admin/ogroups/class_ogroup.inc:295
  msgid "departments"
  msgstr "departamentos"
  
-#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:296
  msgid "servers"
  msgstr "servidores"
  
-#: plugins/admin/ogroups/class_ogroup.inc:299
+#: plugins/admin/ogroups/class_ogroup.inc:297
  msgid "workstations"
  msgstr "estaciones de trabajo"
  
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:298
  msgid "terminals"
  msgstr "terminales"
  
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:299
  msgid "phones"
  msgstr "teléfonos"
  
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:300
  msgid "printers"
  msgstr "servidores de Impresión"
  
-#: plugins/admin/ogroups/class_ogroup.inc:309
+#: plugins/admin/ogroups/class_ogroup.inc:307
  msgid "and"
  msgstr "y"
  
-#: plugins/admin/ogroups/class_ogroup.inc:462
+#: plugins/admin/ogroups/class_ogroup.inc:444
  msgid "Non existing dn:"
  msgstr "No existe 'dn':"
  
-#: plugins/admin/ogroups/class_ogroup.inc:604
+#: plugins/admin/ogroups/class_ogroup.inc:586
  msgid "There is already an object with this cn."
  msgstr "Ya existe un objeto con este 'cn'."
  
-#: plugins/admin/ogroups/class_ogroup.inc:618
+#: plugins/admin/ogroups/class_ogroup.inc:601
  msgid "You can combine two different object types at maximum only!"
  msgstr "¡Solo se pueden combinar dos objetos diferentes hasta un máximo!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:667
+#: plugins/admin/ogroups/class_ogroup.inc:650
  #, fuzzy, php-format
  msgid "Saving of object group/generic with dn '%s' failed."
  msgstr "Ha fallado la grabación del objeto grupo"
  
-#: plugins/admin/ogroups/class_ogroup.inc:680
+#: plugins/admin/ogroups/class_ogroup.inc:663
  #, fuzzy, php-format
  msgid "Removing of object group/generic with dn '%s' failed."
  msgstr "Ha fallado la eliminación del objeto grupo"
  
-#: plugins/admin/ogroups/class_ogroup.inc:710
+#: plugins/admin/ogroups/class_ogroup.inc:693
  #, fuzzy
  msgid "Object group generic"
  msgstr "Grupo de objetos"
  
-#: plugins/admin/ogroups/class_ogroup.inc:721
+#: plugins/admin/ogroups/class_ogroup.inc:704
  #, fuzzy
  msgid "Member"
  msgstr "Objetos miembro"
@@ -13021,7 +13071,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:307
  #, php-format
  msgid ""
  "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13033,9 +13083,9 @@ msgstr ""
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:97
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:317
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/macro/class_gofonMacro.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
+#: plugins/gofon/macro/class_gofonMacro.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:318
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:434
  #, php-format
  msgid "Can't select database %s on %s."
  msgstr "No puedo seleccionar la base de datos '%s' en '%s'."
@@ -13051,8 +13101,8 @@ msgstr "No puedo eliminar de la base de datos '%s' en servidor '%s'."
  #: plugins/admin/ogroups/class_phonequeue.inc:537
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1185
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:474
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:476
  #, php-format
  msgid "The specified telephonenumber '%s' is already assigned to '%s'."
  msgstr ""
@@ -13066,8 +13116,8 @@ msgstr "Ha fallado la grabación de los parámetros de correo del objeto grupo"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:90
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1067
-#: plugins/gofon/macro/class_gofonMacro.inc:234
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:423
  #, php-format
  msgid ""
  "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13226,16 +13276,16 @@ msgstr "Seleccione para mostrar grupos que contienen teléfonos"
  msgid "Show groups containing phones"
  msgstr "Mostrar grupos que contienen teléfonos"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
  msgid "Create new object group"
  msgstr "Crear nuevo objeto grupo"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:207
  #, fuzzy
  msgid "You are not allowed to remove this entry."
  msgstr "¡No tiene permisos para eliminar esta entrada!"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:218
+#: plugins/admin/ogroups/class_divListOGroup.inc:222
  #: plugins/generic/references/class_reference.inc:50
  msgid "Object group"
  msgstr "Grupo de objetos"
@@ -13250,17 +13300,32 @@ msgstr "Por favor introduzca un nuevo nombre"
  msgid "ACLs"
  msgstr "ACL"
  
-#: plugins/admin/acl/class_aclManagement.inc:159
+#: plugins/admin/acl/class_aclManagement.inc:122
+#, fuzzy
+msgid "You are not allowed to edit this acl."
+msgstr "¡No le está permitido eliminar esta macro!"
+
+#: plugins/admin/acl/class_aclManagement.inc:167
  #, fuzzy, php-format
  msgid "You're about to delete the acl %s."
  msgstr "Está a punto de borrar la macro '%s'."
  
-#: plugins/admin/acl/class_aclManagement.inc:165
-#: plugins/admin/acl/class_aclManagement.inc:191
+#: plugins/admin/acl/class_aclManagement.inc:173
+#: plugins/admin/acl/class_aclManagement.inc:198
  #, fuzzy
  msgid "You are not allowed to delete this acl!"
  msgstr "¡No le está permitido eliminar esta macro!"
  
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430
+#, fuzzy
+msgid "Access control list"
+msgstr "Opciones de acceso"
+
+#: plugins/admin/acl/class_aclManagement.inc:433
+msgid "I don't know Jack"
+msgstr ""
+
  #: plugins/admin/acl/class_divListACL.inc:31
  #, fuzzy
  msgid "List of acl"
@@ -13275,36 +13340,16 @@ msgstr "Lista de grupos"
  msgid "This menu allows you to edit and delete selected acls."
  msgstr ""
  
-#: plugins/admin/acl/class_divListACL.inc:61
+#: plugins/admin/acl/class_divListACL.inc:60
  #, fuzzy
  msgid "Display acls matching"
  msgstr "Mostrar grupos que concuerden con"
  
-#: plugins/admin/acl/class_divListACL.inc:109
+#: plugins/admin/acl/class_divListACL.inc:115
  #, fuzzy
  msgid "Acl"
  msgstr "Todo"
  
-#: plugins/admin/acl/class_divListACL.inc:153
-#, fuzzy
-msgid "Select to display users"
-msgstr "Seleccione para ver usuarios estandar"
-
-#: plugins/admin/acl/class_divListACL.inc:153
-#, fuzzy
-msgid "Display user"
-msgstr "Nombre mostrado"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-#, fuzzy
-msgid "Select to display departments"
-msgstr "Seleccione para ver los departamentos"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-#, fuzzy
-msgid "Display departments"
-msgstr "Mostrar Departamentos que concuerden con"
-
  #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
  #, fuzzy
  msgid "ACL management"
@@ -13330,35 +13375,37 @@ msgstr ""
  msgid "Fully Automatic Installation"
  msgstr "Instalación Totalmente Automática"
  
-#: plugins/admin/fai/class_faiScript.inc:422
+#: plugins/admin/fai/class_faiScript.inc:433
  #, fuzzy, php-format
  msgid "Creating of FAI/script with dn '%s' failed."
  msgstr "Ha fallado la Creación de la base del script FAI"
  
-#: plugins/admin/fai/class_faiScript.inc:519
+#: plugins/admin/fai/class_faiScript.inc:530
  #: plugins/admin/fai/class_faiHookEntry.inc:191
  #, fuzzy
  msgid "FAI script"
  msgstr "Script de importación"
  
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
+#: plugins/admin/fai/class_faiPackage.inc:539
+#: plugins/admin/fai/class_faiPackage.inc:542
  #, fuzzy
  msgid "Readonly"
  msgstr "Lectura"
  
-#: plugins/admin/fai/class_faiTemplate.inc:401
+#: plugins/admin/fai/class_faiTemplate.inc:414
  #, fuzzy, php-format
  msgid "Saving of FAI/template with dn '%s' failed."
  msgstr "Ha fallado la grabación de la base de la plantilla FAI"
  
-#: plugins/admin/fai/class_faiTemplate.inc:487
+#: plugins/admin/fai/class_faiTemplate.inc:500
  #, fuzzy
  msgid "FAI template"
  msgstr "Nueva plantilla"
  
  #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:853
+#: plugins/admin/fai/class_faiManagement.inc:863
  msgid "FAI"
  msgstr "FAI"
  
@@ -13400,18 +13447,18 @@ msgstr "El nombre de la rama suspendida especificada no es valido."
  msgid "You are not allowed to create a new branch."
  msgstr "¡No tiene permisos para cambiar su contraseña!"
  
-#: plugins/admin/fai/class_faiManagement.inc:506
-#: plugins/admin/fai/class_faiManagement.inc:522
+#: plugins/admin/fai/class_faiManagement.inc:516
+#: plugins/admin/fai/class_faiManagement.inc:532
  #, fuzzy, php-format
  msgid "You are not allowed to create a new '%s' object."
  msgstr "¡No tiene permisos para eliminar este objeto grupo!"
  
-#: plugins/admin/fai/class_faiManagement.inc:847
+#: plugins/admin/fai/class_faiManagement.inc:857
  #, fuzzy
  msgid "FAI releases"
  msgstr "Clases FAI"
  
-#: plugins/admin/fai/class_faiManagement.inc:848
+#: plugins/admin/fai/class_faiManagement.inc:858
  #, fuzzy
  msgid "FAI release management"
  msgstr "Gestión de listas de bloqueo"
@@ -13433,11 +13480,11 @@ msgstr "Paquetes usados"
  msgid "Choosen packages"
  msgstr "Paquetes elegidos"
  
-#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:674
  msgid "Configure"
  msgstr "Configurar"
  
-#: plugins/admin/fai/faiPackage.tpl:80
+#: plugins/admin/fai/faiPackage.tpl:87
  msgid "Toggle remove flag"
  msgstr "Cambiar la marca de eliminación"
  
@@ -13623,7 +13670,7 @@ msgstr ""
  #: plugins/admin/fai/class_faiProfile.inc:298
  #: plugins/admin/fai/class_faiPartitionTable.inc:520
  #: plugins/admin/fai/class_faiProfileEntry.inc:140
-#: plugins/admin/fai/class_faiSummaryTab.inc:45
+#: plugins/admin/fai/class_faiSummaryTab.inc:48
  msgid "Partition table"
  msgstr "Tabla de particiones"
  
@@ -13676,133 +13723,138 @@ msgstr "Mostrar acciones FAI"
  
  #: plugins/admin/fai/class_faiHook.inc:535
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #, fuzzy
  msgid "Read only"
  msgstr "Lectura"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  #, fuzzy
  msgid "primary"
  msgstr "Grupo primario"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  #, fuzzy
  msgid "logical"
  msgstr "Añadir Cuenta Local"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
  msgid "FS type"
  msgstr "Tipo de FS"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
-#: plugins/admin/fai/class_faiSummaryTab.inc:317
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:468
+#: plugins/admin/fai/class_faiSummaryTab.inc:344
  msgid "Mount point"
  msgstr "Punto de montaje"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
-#: plugins/admin/fai/class_faiSummaryTab.inc:316
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:343
  msgid "Size in MB"
  msgstr "Tamaño en Mb"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
-#: plugins/admin/fai/class_faiSummaryTab.inc:315
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:470
+#: plugins/admin/fai/class_faiSummaryTab.inc:342
  msgid "Mount options"
  msgstr "Opciones de Montaje"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
  msgid "FS option"
  msgstr "Opciones de FS"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
  msgid "Preserve"
  msgstr "Preservar"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:368
+#, fuzzy
+msgid "Please specify a valid disc name."
+msgstr "Por favor especifique un nombre de script valido."
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
  #, php-format
  msgid "please enter a unique mount point for partition %s"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
  #, php-format
  msgid "Please enter a valid mount point for partition %s."
  msgstr "Por favor introduzca un punto de montaje valido para la partición %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:401
  #, php-format
  msgid ""
  "File system type 'swap' is already used, change file system type for "
  "partition %s."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:405
  msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:411
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:415
  #, php-format
  msgid "Please enter a valid partition size for partition %s."
  msgstr ""
  "Por favor introduzca un tamaño de partición valido para la partición %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:412
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:421
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:423
  #, php-format
  msgid "Please enter a valid range for partition %s."
  msgstr "Por favor introduzca un rango valido para la partición %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:428
  #, php-format
  msgid "Please enter a range for partition size for partition %s."
  msgstr ""
  "Por favor introduzca un rango para el tamaño de la partición valido para la "
  "partición %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:434
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:443
  msgid ""
  "You have more than 3 primary partition table entries in your configuration, "
  "please check your configuration twice."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:446
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
  #, fuzzy
  msgid "Partition table entry"
  msgstr "Tabla de particiones"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
  #, fuzzy
  msgid "FAI partition table entry"
  msgstr "Nueva tabla de particiones"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:465
  #, fuzzy
  msgid "Partition type"
  msgstr "Tabla de particiones"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:466
  #, fuzzy
  msgid "Partition no."
  msgstr "Paticiones"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:467
  #, fuzzy
  msgid "File system type"
  msgstr "Tipo de sistema"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:469
  #, fuzzy
  msgid "Partition size"
  msgstr "Paticiones"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:471
  #, fuzzy
  msgid "File system options"
  msgstr "Ver la información de sistema"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:472
  #, fuzzy
  msgid "Partition flags"
  msgstr "Paticiones"
@@ -13997,12 +14049,12 @@ msgstr "Elija nombre de clase"
  msgid "A new class name."
  msgstr "Un nuevo nombre de clase."
  
-#: plugins/admin/fai/class_faiVariable.inc:334
+#: plugins/admin/fai/class_faiVariable.inc:330
  #, fuzzy, php-format
  msgid "Saving of FAI/variable with dn '%s' failed."
  msgstr "Ha fallado la grabación de la base de la tabla de particiones FAI"
  
-#: plugins/admin/fai/class_faiVariable.inc:413
+#: plugins/admin/fai/class_faiVariable.inc:409
  #, fuzzy
  msgid "FAI variable"
  msgstr "Mostrar variables FAI"
@@ -14084,7 +14136,7 @@ msgid "Destination path"
  msgstr "Ruta de destino"
  
  #: plugins/admin/fai/faiTemplateEntry.tpl:74
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:577
  #: plugins/gofon/conference/class_divListConferences.inc:53
  msgid "Owner"
  msgstr ""
@@ -14227,35 +14279,36 @@ msgstr ""
  "etc. de esta rama. Por favor pulse dos veces si quiere realmente hacer esto, "
  "ya que no hay manera de que GOsa recupere posteriormente la información."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:41
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
  msgid "Scripts"
  msgstr "Scripts"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:46
+#: plugins/admin/fai/class_faiSummaryTab.inc:49
  msgid "Package list"
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:86
+msgid ""
+"Unknown type of FAI source information. This is not a profile, workstation "
+"nor a ogroup."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:217
  msgid "This object has no FAI classes assigned."
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:203
+#: plugins/admin/fai/class_faiSummaryTab.inc:230
  msgid "Open"
  msgstr "Abierto"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:312
+#: plugins/admin/fai/class_faiSummaryTab.inc:339
  msgid "No."
  msgstr "No."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:314
+#: plugins/admin/fai/class_faiSummaryTab.inc:341
  msgid "FS options"
  msgstr "Opciones FS"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:553
-#, fuzzy
-msgid "Viewable"
-msgstr "Variable"
-
  #: plugins/admin/fai/branch_selector.tpl:21
  msgid "Create new branch"
  msgstr "Crear una nueva rama"
@@ -14341,94 +14394,94 @@ msgstr "Mostrar particiones FAI"
  msgid "Show partitions"
  msgstr "Mostrar particiones"
  
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "New profile"
  msgstr "Nuevo perfil"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "New partition table"
  msgstr "Nueva tabla de particiones"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "PT"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "New scripts"
  msgstr "Nuevos scripts"
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "S"
  msgstr "S"
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "New hooks"
  msgstr "Nuevas acciones"
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "H"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "New variables"
  msgstr "Nuevas variables"
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "V"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "New templates "
  msgstr "Nuevas plantillas"
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "I"
  msgstr "NI"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "New package list"
  msgstr "Nueva lista de paquetes"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "PK"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:242
-#: plugins/admin/fai/class_divListFai.inc:245
+#: plugins/admin/fai/class_divListFai.inc:240
+#: plugins/admin/fai/class_divListFai.inc:243
  msgid "Edit class"
  msgstr "Editar clase"
  
-#: plugins/admin/fai/class_divListFai.inc:253
+#: plugins/admin/fai/class_divListFai.inc:251
  msgid "Delete class"
  msgstr "Eliminar clase"
  
-#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/generic.tpl:12
  #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:180
  #, fuzzy
  msgid "Mime type"
  msgstr "Tipo MIME"
  
-#: plugins/admin/mimetypes/generic.tpl:17
+#: plugins/admin/mimetypes/generic.tpl:16
  #: plugins/admin/mimetypes/paste_generic.tpl:16
  #, fuzzy
  msgid "Please enter a name for the mime type here"
  msgstr "¡Por favor introduzca un número de teléfono valido!"
  
-#: plugins/admin/mimetypes/generic.tpl:23
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:673
+#: plugins/admin/mimetypes/generic.tpl:22
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:681
  #, fuzzy
  msgid "Mime group"
  msgstr "Grupo primario"
  
-#: plugins/admin/mimetypes/generic.tpl:27
+#: plugins/admin/mimetypes/generic.tpl:26
  #, fuzzy
  msgid "Categorize this mime type"
  msgstr "Categoría de este subarbol"
  
-#: plugins/admin/mimetypes/generic.tpl:39
+#: plugins/admin/mimetypes/generic.tpl:38
  #, fuzzy
  msgid "Please specify a description"
  msgstr "Por favor especifique un nombre de script valido."
@@ -14447,7 +14500,7 @@ msgid "Left click"
  msgstr ""
  
  #: plugins/admin/mimetypes/generic.tpl:99
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:679
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:687
  #, fuzzy
  msgid "File patterns"
  msgstr "Filtros"
@@ -14489,63 +14542,58 @@ msgstr ""
  msgid "Ask whether to save to local disk"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:461
  #, php-format
  msgid "Saving of mime type/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:452
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:470
  #, fuzzy, php-format
  msgid "Removing of mime type/generic with dn '%s' failed."
  msgstr "Ha fallado la eliminación de componente genérico"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:464
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:482
  #, fuzzy, php-format
  msgid "Removing mime type from objectgroup '%s' failed"
  msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:474
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:492
  #, fuzzy
  msgid "Please specify a valid name for this mime type."
  msgstr "Por favor especifique un nombre de adjunto valido."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:477
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:495
  #, fuzzy
  msgid "Please specify at least one file pattern."
  msgstr "Por favor especifique un nombre de adjunto valido."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:490
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:508
  #, fuzzy
  msgid "There's already a mime type with this 'Name'."
  msgstr "Ya existe una aplicación con este 'Nombre'."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:498
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:516
  #, fuzzy
  msgid "There's already an mime with this 'Name'."
  msgstr "Ya existe una aplicación con este 'Nombre'."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:510
-#, fuzzy
-msgid "You have no permissions to create a mime type on this 'Base'."
-msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
-
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
  #, fuzzy
  msgid "Mime type generic"
  msgstr "Tipo MIME"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
  #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
  #, fuzzy
  msgid "Mime types"
  msgstr "Tipo MIME"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:685
  #, fuzzy
  msgid "Left click action"
  msgstr "Crear aplicaciones"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:688
  #, fuzzy
  msgid "Embedded applications"
  msgstr "Aplicaciones Usadas"
@@ -14555,13 +14603,13 @@ msgstr "Aplicaciones Usadas"
  msgid "Manage mime types"
  msgstr "Gestionar tipos de sistemas"
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:276
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:278
  #, fuzzy, php-format
  msgid "You're about to delete the mime type '%s'."
  msgstr "Has decidido eliminar la entrada %s"
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:282
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:311
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:313
  #, fuzzy
  msgid "You are not allowed to delete this mime type!"
  msgstr "¡No tiene permisos para eliminar esta entrada!"
@@ -14598,7 +14646,7 @@ msgstr "Tipo MIME"
  msgid "Display mime types matching"
  msgstr "Mostrar tipos de cartuchos que concuerdan con"
  
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:140
  #, fuzzy
  msgid "Create new mime type"
  msgstr "Crear nueva plantilla"
@@ -14638,7 +14686,7 @@ msgstr "sin definirse"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:658
  #: plugins/gofon/macro/class_gofonMacro.inc:95
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:286
  msgid ""
  "There is currently no asterisk server defined. Possibly you are missing a "
  "server that handles the asterisk management (goFonServer). Your settings "
@@ -14772,23 +14820,28 @@ msgstr "Eliminar cuenta Posix"
  msgid "Phone account settings"
  msgstr "Configuración telefónica"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1237
+#, fuzzy
+msgid "GOfon reports"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:576
  #, fuzzy
  msgid "Telephone number"
  msgstr "Número de teléfono"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1242
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
  #, fuzzy
  msgid "Macro settings"
  msgstr "Parámetros de correo"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1246
  #, fuzzy
  msgid "Telephone pin"
  msgstr "Teléfono"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1247
  msgid "Voicemail pin"
  msgstr ""
  
@@ -14833,7 +14886,7 @@ msgid "Regular expression for matching macro names"
  msgstr "Expresión regular que concuerde con nombres de grupos"
  
  #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
-#: plugins/gofon/macro/class_gofonMacro.inc:483
+#: plugins/gofon/macro/class_gofonMacro.inc:496
  msgid "Macro name"
  msgstr "Nombre de la macro"
  
@@ -14853,13 +14906,13 @@ msgstr "macro de texto"
  msgid "Phone macros"
  msgstr "Macros telefónicas"
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:207
  #, php-format
  msgid "You're about to delete the macro '%s'."
  msgstr "Está a punto de borrar la macro '%s'."
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:214
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:213
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
  msgid "You are not allowed to delete this macro!"
  msgstr "¡No le está permitido eliminar esta macro!"
  
@@ -14868,83 +14921,88 @@ msgstr "¡No le está permitido eliminar esta macro!"
  msgid "This 'dn' is no phone macro."
  msgstr "Esta 'dn' no es una macro de teléfono."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:185
+#: plugins/gofon/macro/class_gofonMacro.inc:183
  msgid ""
  "This macro ist still in use. To delete this Macro ensure that nobody has "
  "selected this Macro."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: plugins/gofon/macro/class_gofonMacro.inc:190
+#: plugins/gofon/macro/class_gofonMacro.inc:205
  #: plugins/gofon/macro/class_gofonMacroParameters.inc:402
  #, fuzzy, php-format
  msgid "Removing of goFonMacro/generic account with dn '%s' failed."
  msgstr "Ha fallado borrar cuenta de nagios"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:220
+#: plugins/gofon/macro/class_gofonMacro.inc:218
  msgid ""
  "There is no mysql extension available in your php setup, can't save any "
  "changes to asterisk db."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:290
+#: plugins/gofon/macro/class_gofonMacro.inc:288
  #, php-format
  msgid "Unable to parse macro contents on line: %s"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:308
+#: plugins/gofon/macro/class_gofonMacro.inc:306
  #, php-format
  msgid "Can't perform SELECT query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:317
-#: plugins/gofon/macro/class_gofonMacro.inc:325
+#: plugins/gofon/macro/class_gofonMacro.inc:315
+#: plugins/gofon/macro/class_gofonMacro.inc:323
  #, php-format
  msgid "Can't perform DELETE query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:339
+#: plugins/gofon/macro/class_gofonMacro.inc:337
  #, php-format
  msgid "Can't perform INSERT query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:405
+#: plugins/gofon/macro/class_gofonMacro.inc:417
  #, php-format
  msgid "The given cn '%s' already exists."
  msgstr "Ya existe un cn '%s'."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:422
  msgid "You must specify the 'Display Name' in order to save this macro"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:414
+#: plugins/gofon/macro/class_gofonMacro.inc:426
  msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:418
+#: plugins/gofon/macro/class_gofonMacro.inc:430
  msgid "Makro length must be lower than 100 lines"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:423
+#: plugins/gofon/macro/class_gofonMacro.inc:435
  msgid "Please choose a valid  base."
  msgstr "Por favor elija una base válida."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:478
  #, fuzzy, php-format
  msgid "Saving of goFonMacro/generic account with dn '%s' failed."
  msgstr "Ha fallado al grabar la cuenta de nagios"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/macro/class_gofonMacro.inc:487
  #, fuzzy
  msgid "Asterisk macro management"
  msgstr "Gestión de Asterisk PBX"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:487
+#: plugins/gofon/macro/class_gofonMacro.inc:492
+#, fuzzy
+msgid "GOfon macro"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:500
  #, fuzzy
-msgid "Macro content"
+msgid "Macro content and parameter"
  msgstr "macro de texto"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:488
+#: plugins/gofon/macro/class_gofonMacro.inc:501
  msgid "Visibility flag"
  msgstr ""
  
@@ -15006,38 +15064,36 @@ msgstr "Nombre de la macro"
  msgid "Visible"
  msgstr "Variable"
  
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  #, fuzzy
  msgid "Create new phone macro"
  msgstr "Crear cuenta telefónica"
  
-#: plugins/gofon/macro/class_divListMacros.inc:132
-#: plugins/gofon/macro/class_divListMacros.inc:160
-#, fuzzy
-msgid "Edit macro"
-msgstr "Editar recurso compartido"
-
-#: plugins/gofon/macro/class_divListMacros.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:168
-#, fuzzy
-msgid "Delete macro"
-msgstr "Borrar usuario"
-
-#: plugins/gofon/macro/class_divListMacros.inc:137
+#: plugins/gofon/macro/class_divListMacros.inc:124
  #, fuzzy
  msgid "Macro"
  msgstr "Nombre de la maquina"
  
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  #, fuzzy
  msgid "visible"
  msgstr "Visible Publicamente"
  
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  #, fuzzy
  msgid "invisible"
  msgstr "Visible Publicamente"
  
+#: plugins/gofon/macro/class_divListMacros.inc:147
+#, fuzzy
+msgid "Edit macro"
+msgstr "Editar recurso compartido"
+
+#: plugins/gofon/macro/class_divListMacros.inc:155
+#, fuzzy
+msgid "Delete macro"
+msgstr "Borrar usuario"
+
  #: plugins/gofon/conference/headpage.tpl:6
  #: plugins/gofon/conference/class_divListConferences.inc:31
  #: plugins/gofon/conference/class_divListConferences.inc:32
@@ -15082,7 +15138,7 @@ msgid "Lifetime (in days)"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:137
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:566
  #, fuzzy
  msgid "Preset PIN"
  msgstr "presente"
@@ -15093,7 +15149,7 @@ msgid "PIN"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:157
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
  #, fuzzy
  msgid "Record conference"
  msgstr "Referencias"
@@ -15103,7 +15159,7 @@ msgid "Sound file format"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:568
  msgid "Play music on hold"
  msgstr ""
  
@@ -15136,87 +15192,88 @@ msgstr "Nombre de la maquina"
  msgid "Removing of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:252
  msgid ""
  "You have specified a conference 'without PIN' ... please leave the PIN "
  "fields empty."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
  #, fuzzy
  msgid "Please enter a PIN."
  msgstr "Por favor especifique una dirección de servidor - URI - válida."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:260
  #, fuzzy
  msgid "Please enter a name for the conference."
  msgstr "¡Por favor introduzca un número de teléfono valido!"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:251
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:264
  msgid "Only numeric chars are allowed in Number field."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:268
  msgid "Only numbers are allowed in Lifetime."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:298
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:408
  msgid ""
  "Can't save any changes to asterisk database, there is currently no mysql "
  "extension available in your php setup."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
  #, php-format
  msgid "Saving of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
-#: plugins/gofon/conference/class_divListConferences.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_divListConferences.inc:198
  #, fuzzy
  msgid "Conference"
  msgstr "Referencias"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:552
  #, fuzzy
  msgid "Phone conference management"
  msgstr "Mantenimiento de Departamentos"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
-msgid "GOfon"
-msgstr ""
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#, fuzzy
+msgid "GOfon conference"
+msgstr "Número de teléfono"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
  #, fuzzy
  msgid "Conference PIN"
  msgstr "Referencias"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:569
  #, fuzzy
  msgid "Activate menu"
  msgstr "Activar mensaje de ausencia"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:570
  msgid "Announce user activity"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:571
  #, fuzzy
  msgid "Count user"
  msgstr "Pais"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:572
  #, fuzzy
  msgid "Conference type"
  msgstr "Referencias"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:574
  #, fuzzy
  msgid "Format"
  msgstr "formateo"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:575
  msgid "Lifetime"
  msgstr ""
  
@@ -15235,17 +15292,17 @@ msgstr "Número de teléfono"
  msgid "Regular expression for matching conference names"
  msgstr "Expresiones regulares que concuerden con nombres de usuarios"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  #, fuzzy
  msgid "Create new conference"
  msgstr "Crear una nueva entrada en"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  #, fuzzy
  msgid "New conference"
  msgstr "Número de teléfono"
  
-#: plugins/gofon/conference/class_divListConferences.inc:196
+#: plugins/gofon/conference/class_divListConferences.inc:192
  #: include/class_pluglist.inc:145 include/class_pluglist.inc:146
  #: include/class_pluglist.inc:245
  #, fuzzy
@@ -15253,28 +15310,28 @@ msgid "Unknown"
  msgstr "estado desconocido"
  
  #: plugins/gofon/fonreports/contents.tpl:31
-#: plugins/gofon/fonreports/class_fonreport.inc:399
+#: plugins/gofon/fonreports/class_fonreport.inc:400
  msgid "Source"
  msgstr "Fuente"
  
  #: plugins/gofon/fonreports/contents.tpl:32
-#: plugins/gofon/fonreports/class_fonreport.inc:400
+#: plugins/gofon/fonreports/class_fonreport.inc:401
  msgid "Destination"
  msgstr "Destino"
  
  #: plugins/gofon/fonreports/contents.tpl:33
-#: plugins/gofon/fonreports/class_fonreport.inc:401
+#: plugins/gofon/fonreports/class_fonreport.inc:402
  msgid "Channel"
  msgstr "Canal"
  
  #: plugins/gofon/fonreports/contents.tpl:36
-#: plugins/gofon/fonreports/class_fonreport.inc:404
+#: plugins/gofon/fonreports/class_fonreport.inc:405
  msgid "Duration"
  msgstr "Duración"
  
  #: plugins/gofon/fonreports/main.inc:16
-#: plugins/gofon/fonreports/class_fonreport.inc:389
  #: plugins/gofon/fonreports/class_fonreport.inc:390
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  msgid "Phone reports"
  msgstr "Informes telefónicos"
  
@@ -15300,12 +15357,12 @@ msgstr ""
  msgid "Query for phone database failed!"
  msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:402
+#: plugins/gofon/fonreports/class_fonreport.inc:403
  #, fuzzy
  msgid "Application called"
  msgstr "Nombre de la aplicación"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:403
+#: plugins/gofon/fonreports/class_fonreport.inc:404
  #, fuzzy
  msgid "Disposition"
  msgstr "Desconexión"
@@ -15362,7 +15419,7 @@ msgstr ""
  "¡La generación de esta página provoca que el interprete PHP muestre algunos "
  "errores!"
  
-#: include/php_setup.inc:71 html/main.php:388
+#: include/php_setup.inc:71
  msgid "Toggle information"
  msgstr "Información de intercambio"
  
@@ -15386,15 +15443,15 @@ msgstr "estatico"
  msgid "method"
  msgstr "método"
  
-#: include/php_setup.inc:129
+#: include/php_setup.inc:135
  msgid "Trace"
  msgstr "Traza"
  
-#: include/php_setup.inc:130
+#: include/php_setup.inc:136
  msgid "Line"
  msgstr "Linea"
  
-#: include/php_setup.inc:131
+#: include/php_setup.inc:137
  msgid "Arguments"
  msgstr "Argumentos"
  
@@ -15485,7 +15542,7 @@ msgstr ""
  msgid "incomplete"
  msgstr "incompleto"
  
-#: include/functions.inc:1046 include/functions.inc:1233
+#: include/functions.inc:1046 include/functions.inc:1202
  msgid "LDAP error:"
  msgstr "Error LDAP:"
  
@@ -15531,19 +15588,19 @@ msgstr ""
  "Va ha editar la entrada LDAP '%s' que parece estar siendo usada por '%s'. "
  "Por favor, contacte con esta persona para clarificar los procedimientos."
  
-#: include/functions.inc:1415
+#: include/functions.inc:1384
  msgid "Entries per page"
  msgstr ""
  
-#: include/functions.inc:1443
+#: include/functions.inc:1412
  msgid "Apply filter"
  msgstr ""
  
-#: include/functions.inc:1717
+#: include/functions.inc:1686
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1760
+#: include/functions.inc:1729
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "Versión de desarrollo de GOsa (Rev %s)"
@@ -15552,7 +15609,7 @@ msgstr "Versión de desarrollo de GOsa (Rev %s)"
  msgid "Warning: Account has an invalid mailserver string!"
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:53
+#: include/class_mail-methods-cyrus.inc:58
  msgid ""
  "Warning: IMAP Server cannot be reached! If you save this account, some mail "
  "settings will not be stored on your server!"
@@ -15561,53 +15618,53 @@ msgstr ""
  "de los valores de la configuración del correo no serán guardados en el "
  "servidor"
  
-#: include/class_mail-methods-cyrus.inc:151
+#: include/class_mail-methods-cyrus.inc:156
  #, php-format
  msgid "Can't create IMAP mailbox. Server says '%s'."
  msgstr ""
  "No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
  
-#: include/class_mail-methods-cyrus.inc:170
+#: include/class_mail-methods-cyrus.inc:175
  #, php-format
  msgid "Can't write IMAP quota. Server says '%s'."
  msgstr "No se puede activar una cuota IMAP. El error del servidor es: '%s'"
  
-#: include/class_mail-methods-cyrus.inc:196
+#: include/class_mail-methods-cyrus.inc:201
  #, fuzzy
  msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
  msgstr ""
  "Aviso: imap_getacl no ha sido implementado, no se modificara información "
  "sobre las listas de acceso."
  
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:219
  msgid "Warning: imap_getacl is not available, can't get imap permissions!"
  msgstr ""
  "Aviso: no esta disponible imap_getacl, ¡no se puede acceder a los permisos "
  "IMAP!"
  
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_mail-methods-cyrus.inc:241
  #, php-format
  msgid "Can't remove IMAP mailbox. Server says '%s'."
  msgstr ""
  "No se puede eliminar la carpeta de correo IMAP. El error del servidor es: '%"
  "s'"
  
-#: include/class_mail-methods-cyrus.inc:264
+#: include/class_mail-methods-cyrus.inc:269
  #, php-format
  msgid "Can't log into SIEVE server. Server says '%s'."
  msgstr "No se puede conectar al servidor SIEVE. El error del servidor es: '%s'"
  
-#: include/class_mail-methods-cyrus.inc:277
+#: include/class_mail-methods-cyrus.inc:282
  #, php-format
  msgid "Can't get sieve script. Server says '%s'."
  msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
  
-#: include/class_mail-methods-cyrus.inc:348
+#: include/class_mail-methods-cyrus.inc:353
  #, php-format
  msgid "Can't send sieve script. Server says '%s'."
  msgstr "No puedo subir un 'script' SIEVE. El error del servidor es: '%s'"
  
-#: include/class_mail-methods-cyrus.inc:352
+#: include/class_mail-methods-cyrus.inc:357
  #, php-format
  msgid "Can't activate GOsa sieve script. Server says '%s'."
  msgstr ""
@@ -15647,7 +15704,7 @@ msgstr "¡Error mientras se exportaban las entradas indicadas!"
  msgid "Unknown FAIstate %s"
  msgstr "estado desconocido"
  
-#: include/class_ldap.inc:705
+#: include/class_ldap.inc:707
  #, php-format
  msgid ""
  "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -15656,19 +15713,19 @@ 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:774
+#: include/class_ldap.inc:776
  #, php-format
  msgid "while operating on '%s' using LDAP server '%s'"
  msgstr ""
  
-#: include/class_ldap.inc:776
+#: include/class_ldap.inc:778
  #, fuzzy, php-format
  msgid "while operating on LDAP server %s"
  msgstr ""
  "Hay un error trantando de conectarse al servidor LDAP. El error del servidor "
  "es: '%s'"
  
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1000
  #, php-format
  msgid ""
  "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -15677,14 +15734,14 @@ msgstr ""
  "El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
  "en la linea %s"
  
-#: include/class_ldap.inc:1027
+#: include/class_ldap.inc:1029
  #, php-format
  msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
  msgstr ""
  "Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
  "el LDIF desde la linea %s en adelante!"
  
-#: include/class_ldap.inc:1155
+#: include/class_ldap.inc:1157
  #, fuzzy, php-format
  msgid "Ldap import with dn '%s' failed."
  msgstr "Ha fallado la grabación de la impresora"
@@ -15698,7 +15755,7 @@ msgstr ""
  msgid "References"
  msgstr "Referencias"
  
-#: include/class_plugin.inc:420
+#: include/class_plugin.inc:421
  #, fuzzy, php-format
  msgid ""
  "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
@@ -15706,7 +15763,7 @@ msgstr ""
  "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
  "parece existir."
  
-#: include/class_plugin.inc:601
+#: include/class_plugin.inc:602
  #, php-format
  msgid ""
  "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -15714,7 +15771,7 @@ msgstr ""
  "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
  "parece existir."
  
-#: include/class_plugin.inc:635 include/class_password-methods.inc:183
+#: include/class_plugin.inc:636 include/class_password-methods.inc:183
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -15722,7 +15779,7 @@ msgstr ""
  "El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
  "parece existir."
  
-#: include/class_plugin.inc:669
+#: include/class_plugin.inc:670
  #, php-format
  msgid ""
  "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -15730,62 +15787,57 @@ msgstr ""
  "El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
  "parece existir."
  
-#: include/class_plugin.inc:977
+#: include/class_plugin.inc:978
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr ""
  
-#: include/class_plugin.inc:984
+#: include/class_plugin.inc:985
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr ""
  
-#: include/class_plugin.inc:998 include/class_plugin.inc:1027
+#: include/class_plugin.inc:999 include/class_plugin.inc:1028
  #, php-format
  msgid "Handle object tagging with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1014
+#: include/class_plugin.inc:1015
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr ""
  
-#: include/class_plugin.inc:1075 include/class_plugin.inc:1121
-#: include/class_plugin.inc:1122
+#: include/class_plugin.inc:1076 include/class_plugin.inc:1122
+#: include/class_plugin.inc:1123
  #, fuzzy, php-format
  msgid "Saving object snapshot with dn '%s' failed."
  msgstr "Ha fallado la grabación del objeto grupo"
  
-#: include/class_plugin.inc:1137
-#, fuzzy
-msgid "You are not allowed to delete this snapshot!"
-msgstr "¡No tiene permisos para eliminar esta entrada!"
-
-#: include/class_plugin.inc:1153
+#: include/class_plugin.inc:1149
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1165
+#: include/class_plugin.inc:1161
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable(s) '%s' is "
  "not configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1197
+#: include/class_plugin.inc:1193
  #, php-format
  msgid "Method get available snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1253
+#: include/class_plugin.inc:1249
  #, php-format
  msgid "Method get deleted snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1317 include/class_plugin.inc:1331
+#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
  #, fuzzy, php-format
  msgid "Restore snapshot with dn '%s' failed."
  msgstr "Ha fallado la eliminación del teléfono"
@@ -15889,7 +15941,7 @@ msgstr ""
  "NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
  "sistemas."
  
-#: include/class_config.inc:472
+#: include/class_config.inc:477
  msgid "SID and/or RIDBASE missing in your configuration!"
  msgstr "SID y/o RIDBASE no se encuentran en su configuración."
  
@@ -16437,7 +16489,7 @@ msgstr ""
  "¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
  "asegure que este accesible para GOsa."
  
-#: include/functions_setup.inc:784
+#: include/functions_setup.inc:792
  #, php-format
  msgid ""
  "You're missing the required attribute '%s' from this formular. Please "
@@ -16469,14 +16521,14 @@ msgstr ""
  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:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:252
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1092
+#, fuzzy
  msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
+"User and/or group could not be created, please check your configuration "
+"twice !"
  msgstr ""
-"No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
  
  #: include/functions_helpviewer.inc:43
  #, fuzzy, php-format
@@ -16542,102 +16594,107 @@ msgstr ""
  msgid "Use ACL defined in role"
  msgstr ""
  
-#: include/class_acl.inc:370
+#: include/class_acl.inc:372
  #, fuzzy
  msgid "Edit ACL"
  msgstr "Editar"
  
-#: include/class_acl.inc:371
+#: include/class_acl.inc:373
  #, fuzzy
  msgid "Delete ACL"
  msgstr "Borrar"
  
-#: include/class_acl.inc:408
+#: include/class_acl.inc:410
  msgid "No ACL settings for this category"
  msgstr ""
  
-#: include/class_acl.inc:410
+#: include/class_acl.inc:412
  #, php-format
  msgid "Contains ACLs for these objects: %s"
  msgstr ""
  
-#: include/class_acl.inc:415
+#: include/class_acl.inc:417
  #, fuzzy
  msgid "Edit categories ACLs"
  msgstr "Editar clase"
  
-#: include/class_acl.inc:416
+#: include/class_acl.inc:418
  msgid "Clear categories ACLs"
  msgstr ""
  
-#: include/class_acl.inc:455
+#: include/class_acl.inc:457
  #, php-format
  msgid "Edit ACL for '%s', scope is '%s'"
  msgstr ""
  
-#: include/class_acl.inc:465
+#: include/class_acl.inc:467
  msgid "All objects in current subtree"
  msgstr ""
  
-#: include/class_acl.inc:525 include/class_acl.inc:532
+#: include/class_acl.inc:557 include/class_acl.inc:564
  #, fuzzy
  msgid "Show/Hide Advanced Settings"
  msgstr "Configuración telefónica avanzada"
  
-#: include/class_acl.inc:550
+#: include/class_acl.inc:582
  #, fuzzy
  msgid "Create objects"
  msgstr "Crear nuevo objeto FAI."
  
-#: include/class_acl.inc:551
+#: include/class_acl.inc:583
  #, fuzzy
  msgid "Move objects"
  msgstr "Objetos miembro"
  
-#: include/class_acl.inc:552
+#: include/class_acl.inc:584
  #, fuzzy
  msgid "Remove objects"
  msgstr "Objetos miembro"
  
-#: include/class_acl.inc:554 include/class_acl.inc:560
+#: include/class_acl.inc:586 include/class_acl.inc:592
  msgid "Modifyable by owner"
  msgstr ""
  
-#: include/class_acl.inc:557
+#: include/class_acl.inc:589
  #, fuzzy
  msgid "Move object"
  msgstr "Objetos miembro"
  
-#: include/class_acl.inc:558
+#: include/class_acl.inc:590
  #, fuzzy
  msgid "Remove object"
  msgstr "Objetos miembro"
  
-#: include/class_acl.inc:686
+#: include/class_acl.inc:602
+#, fuzzy
+msgid "Complete object"
+msgstr "Crear nuevo objeto FAI."
+
+#: include/class_acl.inc:718
  #, php-format
  msgid "Unkown ACL type '%s'. Don't know how to handle it."
  msgstr ""
  
-#: include/class_acl.inc:726
+#: include/class_acl.inc:758
  #, fuzzy, php-format
  msgid "Unknown entry '%s'!"
  msgstr "estado desconocido"
  
-#: include/class_acl.inc:787
+#: include/class_acl.inc:819
  #, php-format
  msgid "Contains settings for these objects: %s"
  msgstr ""
  
-#: include/class_acl.inc:795
+#: include/class_acl.inc:827
  #, fuzzy
  msgid "Members:"
  msgstr "Objetos miembro"
  
-#: include/class_acl.inc:801
+#: include/class_acl.inc:833
  msgid "ACL is valid for all users"
  msgstr ""
  
-#: include/class_acl.inc:909
+#: include/class_acl.inc:941
  #, fuzzy, php-format
  msgid "Saving ACLs with dn '%s' failed."
  msgstr "Ha fallado la grabación del script FAI"
@@ -16647,32 +16704,32 @@ msgstr "Ha fallado la grabación del script FAI"
  msgid "This package has no debconf options."
  msgstr "Esta cuenta no tiene extensiones telefónicas"
  
-#: include/class_MultiSelectWindow.inc:400
+#: include/class_MultiSelectWindow.inc:458
  msgid ""
  "Error: The requested subtree has an inconsistent DN encoding, check your "
  "LDAP!"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:504
+#: include/class_MultiSelectWindow.inc:567
  msgid "Restore snapshopts of already deleted objects"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:505
+#: include/class_MultiSelectWindow.inc:568
  #, fuzzy
  msgid "Restore"
  msgstr "Reintentar"
  
-#: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:106
+#: include/class_MultiSelectWindow.inc:586
+#: include/class_SnapShotDialog.inc:113
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  #, fuzzy
  msgid "Create snapshot"
  msgstr "Crear cuenta de nagios"
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "Crear nuevo objeto FAI."
@@ -16689,46 +16746,57 @@ msgid ""
  "zone."
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:153
+#: include/functions_dns.inc:607
+#, php-format
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:147
+#, fuzzy, php-format
+msgid "You are going to paste the cutted entry '%s'."
+msgstr "Has decidido eliminar la entrada %s"
+
+#: include/class_CopyPasteHandler.inc:174
  #, fuzzy, php-format
-msgid "You are going to copy the entry '%s'."
+msgid "You are going to paste the copied entry '%s'."
  msgstr "Has decidido eliminar la entrada %s"
  
-#: include/class_CopyPasteHandler.inc:217
+#: include/class_CopyPasteHandler.inc:238
  #, fuzzy
  msgid "Paste"
  msgstr "Fecha"
  
-#: include/class_CopyPasteHandler.inc:219
+#: include/class_CopyPasteHandler.inc:240
  #, fuzzy
  msgid "Can't paste"
  msgstr "Crear cuenta telefónica"
  
-#: include/functions_FAI.inc:363
+#: include/functions_FAI.inc:361
  #, php-format
  msgid "Error, following objects should be equal '%s' and '%s'"
  msgstr ""
  
-#: include/functions_FAI.inc:470
+#: include/functions_FAI.inc:468
  #, php-format
  msgid "Release management failed, can't save '%s'"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:53
+#: include/class_SnapShotDialog.inc:63
  #, fuzzy, php-format
  msgid "You're about to delete the snapshot '%s'."
  msgstr "Está a punto de borrar la macro '%s'."
  
-#: include/class_SnapShotDialog.inc:108
+#: include/class_SnapShotDialog.inc:115
  #, fuzzy
  msgid "Remove snapshot"
  msgstr "Crear cuenta de nagios"
  
-#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
+#: include/class_SnapShotDialog.inc:117 include/class_SnapShotDialog.inc:137
  msgid "Y-m-d, H:i:s"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:142
+#: include/class_SnapShotDialog.inc:149
  #, fuzzy
  msgid "Please specify a valid description for this snapshot."
  msgstr "Por favor especifique un nombre de adjunto valido."
@@ -16772,7 +16840,7 @@ msgstr ""
  "El directorio '%s' especificado como directorio de compilación para smarty  "
  "no es accesible, ¡compruebe la existencia y los permisos de este directorio!"
  
-#: html/main.php:170
+#: html/main.php:172
  #, fuzzy
  msgid ""
  "FATAL: Register globals is on. GOsa will refuse to login unless this is "
@@ -16781,29 +16849,20 @@ msgstr ""
  "'Register globals' está activado. No se permitirá ninguna entrada hasta que "
  "esto sea solucionado por un administrador."
  
-#: html/main.php:212
+#: html/main.php:214
  msgid "Warning: memory is getting low - please increase the memory_limit!"
  msgstr ""
  "Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
  
-#: html/main.php:349
-#, fuzzy, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
-msgstr "No se pudo encontrar ninguna definición de extensión para '%s'"
-
-#: html/main.php:364
+#: html/main.php:353
  #, fuzzy
  msgid "Your password is about to expire, please change your password"
  msgstr "No tiene permisos para cambiar su contraseña."
  
-#: html/main.php:388
-#, fuzzy
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
-msgstr ""
-"¡La generación de esta página provoca que el interprete PHP muestre algunos "
-"errores!"
+#: html/main.php:361
+#, fuzzy, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgstr "No se pudo encontrar ninguna definición de extensión para '%s'"
  
  #: html/getkiosk.php:25
  #, php-format
@@ -16815,11 +16874,11 @@ msgstr ""
  msgid "Can't read file '%s', check permissions."
  msgstr "Borrar"
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Session will not be encrypted."
  msgstr "La sesion no sera encriptada."
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Enter SSL session"
  msgstr "Entrar en sesión SSL"
  
@@ -16843,31 +16902,38 @@ msgid ""
  "make sure, that this is possible."
  msgstr ""
  
-#: html/index.php:232
+#: html/index.php:231
  msgid ""
  "Your ldap setup contains old schema definitions. Please re-run the setup."
  msgstr ""
  
-#: html/index.php:260
+#: html/index.php:250 ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+"No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
+
+#: html/index.php:258
  msgid "Please specify a valid username!"
  msgstr "Por favor especifique un nombre de usuario valido."
  
-#: html/index.php:262
+#: html/index.php:260
  msgid "Please specify your password!"
  msgstr "Por favor especifique su contraseña."
  
-#: html/index.php:269
+#: html/index.php:267
  msgid "Please check the username/password combination."
  msgstr "Por favor compruebe su nombre de usuario/contraseña."
  
-#: html/index.php:293
+#: html/index.php:291
  #, fuzzy
  msgid "Account locked. Please contact your system administrator."
  msgstr ""
  "NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
  "sistemas."
  
-#: html/index.php:345
+#: html/index.php:343
  msgid ""
  "Your browser has cookies disabled. Please enable cookies and reload this "
  "page before logging in!"
@@ -17029,7 +17095,7 @@ msgstr ""
  "ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
  "limite' definido y active el uso de filtros en su lugar"
  
-#: ihtml/themes/default/login.tpl:14
+#: ihtml/themes/default/login.tpl:15
  #, fuzzy
  msgid "Please use your username and password to log in"
  msgstr ""
@@ -17421,14 +17487,24 @@ msgstr ""
  msgid "Copy & paste wizard"
  msgstr ""
  
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:7
  msgid ""
  "Some values need to be unique in the complete directory while some "
  "combinations make no sense. GOsa shows the relevant attributes. Please "
  "maintain the values below to fullfill the policies."
  msgstr ""
  
-#: ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/copyPasteDialog.tpl:9
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:10
+msgid ""
+"Or if you copy or cut an entry within GOsa and delete the source object, you "
+"may get errors while pasting this object again!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:26
  #, fuzzy
  msgid "Operation complete"
  msgstr "incompleto"
@@ -17476,35 +17552,124 @@ msgid ""
  "replace the existing object after pressing the restore button."
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:23
+#: ihtml/themes/default/snapshotdialog.tpl:9
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only nescessary to open and save them again (goFon), "
+"but some entries must be recreated manually (glpi)."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:12
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:29
  msgid "There is no snapshot available that could be restored"
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:25
+#: ihtml/themes/default/snapshotdialog.tpl:31
  msgid "Choose a snapshot and click the folder image, to restore the snapshot"
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:43
+#: ihtml/themes/default/snapshotdialog.tpl:49
  #, fuzzy
  msgid "Creating object snapshots"
  msgstr "Crear nuevo objeto grupo"
  
-#: ihtml/themes/default/snapshotdialog.tpl:46
+#: ihtml/themes/default/snapshotdialog.tpl:52
  msgid ""
  "This procedure will create a snapshot of the selected object. It will be "
  "stored inside a special branch of your directory system and can be restored "
  "later on."
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:61
+#: ihtml/themes/default/snapshotdialog.tpl:55
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:70
  #, fuzzy
  msgid "Timestamp"
  msgstr "Tiempo de espera"
  
-#: ihtml/themes/default/snapshotdialog.tpl:70
+#: ihtml/themes/default/snapshotdialog.tpl:79
  msgid "Reason for generating this snapshot"
  msgstr ""
  
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr "No tiene permisos para crear un usuario en esta 'Base'."
+
+#, fuzzy
+#~ msgid "You have no permissions to move this user to the specified 'Base'."
+#~ msgstr "No tiene permisos para transladar a un usuario de su base original"
+
+#~ msgid "You have no permissions to create a blocklist on this 'Base'."
+#~ msgstr "No tiene permisos para crear una lista de bloqueo en esta 'Base'."
+
+#~ msgid "You have no permissions to create a group on this 'Base'."
+#~ msgstr "No tiene permisos para crear un grupo en esta 'Base'."
+
+#~ msgid "You have no permissions to create a application on this 'Base'."
+#~ msgstr "No tiene permisos para crear una aplicación en esta 'Base'."
+
+#~ msgid "You have no permissions to create a department on this 'Base'."
+#~ msgstr "No tiene permisos para crear un departamento en esta 'Base'."
+
+#~ msgid "Go to users home department"
+#~ msgstr "Ir al departamento base de los usuarios"
+
+#~ msgid "You have no permissions to create a terminal on this 'Base'."
+#~ msgstr "No tiene permisos para crear un terminal en esta 'Base'."
+
+#~ msgid "You have no permissions to create a server on this 'Base'."
+#~ msgstr "No tiene permisos para crear un servidor en esta 'Base'."
+
+#~ msgid "You are not allowed to set this systems password!"
+#~ msgstr "¡No tiene permisos para cambiar contraseñas de sistema!"
+
+#~ msgid "You have no permissions to create a phone on this 'Base'."
+#~ msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
+
+#, fuzzy
+#~ msgid "Select to display users"
+#~ msgstr "Seleccione para ver usuarios estandar"
+
+#, fuzzy
+#~ msgid "Display user"
+#~ msgstr "Nombre mostrado"
+
+#, fuzzy
+#~ msgid "Select to display departments"
+#~ msgstr "Seleccione para ver los departamentos"
+
+#, fuzzy
+#~ msgid "Display departments"
+#~ msgstr "Mostrar Departamentos que concuerden con"
+
+#, fuzzy
+#~ msgid "Viewable"
+#~ msgstr "Variable"
+
+#, fuzzy
+#~ msgid "You have no permissions to create a mime type on this 'Base'."
+#~ msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
+
+#, fuzzy
+#~ msgid "You are not allowed to delete this snapshot!"
+#~ msgstr "¡No tiene permisos para eliminar esta entrada!"
+
+#, fuzzy
+#~ msgid ""
+#~ "Generating this page caused the W3C          conformance checker to raise "
+#~ "some errors!"
+#~ msgstr ""
+#~ "¡La generación de esta página provoca que el interprete PHP muestre "
+#~ "algunos errores!"
+
  #~ msgid "This zoneName is already in use"
  #~ msgstr "El nombre de zona especificado ya esta siendo usado"
  
diff --git a/locale/fr/LC_MESSAGES/messages.po b/locale/fr/LC_MESSAGES/messages.po

index b249ea8ecb6079c2b50f689a8367cadd30288b94..8fb3a72b6aafac386ffc7c29e9c554b8c7bc2a7b 100644 (file)
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -1,14 +1,12 @@
  # translation of messages.po to Français
  # Benoit Mortier <benoit.mortier@opensides.be>, 2005, 2006.
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/admin/systems/class_terminalService.inc:452
-#: plugins/admin/systems/class_terminalService.inc:453
-#: include/class_plugin.inc:115 include/class_plugin.inc:116
+#: plugins/personal/generic/class_user.inc:1360 include/class_plugin.inc:115
+#: include/class_plugin.inc:116
  msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-17 12:33+0100\n"
+"POT-Creation-Date: 2006-12-18 11:18+0100\n"
  "PO-Revision-Date: 2006-08-10 11:00+0200\n"
  "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
  "Language-Team: Français <fr@li.org>\n"
@@ -18,7 +16,24 @@ msgstr ""
  "X-Generator: KBabel 1.11.1\n"
  "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
  
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1373
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1011
+#: plugins/personal/password/class_password.inc:16
+#: plugins/personal/posix/class_posixAccount.inc:1313
+#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/connectivity/class_phpgwAccount.inc:147
+#: plugins/personal/connectivity/class_kolabAccount.inc:451
+#: plugins/personal/connectivity/class_webdavAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:223
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:954
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#: plugins/personal/connectivity/class_intranetAccount.inc:180
+#: plugins/personal/connectivity/class_pptpAccount.inc:163
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/personal/environment/class_environment.inc:1274
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#: plugins/personal/netatalk/class_netatalk.inc:359
  msgid "My account"
  msgstr "Mon Compte"
  
@@ -26,8 +41,8 @@ msgstr "Mon Compte"
  msgid "Administration"
  msgstr "Administration"
  
-#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:788
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
  msgid "Addons"
  msgstr "Extensions"
  
@@ -39,28 +54,28 @@ msgstr "Extensions"
  #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
  #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
  #: plugins/personal/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1368
+#: plugins/personal/generic/class_user.inc:1367
  #: plugins/gofax/blocklists/generic.tpl:1
  #: plugins/gofax/faxaccount/generic.tpl:6
  #: plugins/gofax/faxaccount/paste_generic.tpl:4
  #: plugins/admin/groups/mail.tpl:7
-#: plugins/admin/groups/class_groupGeneric.inc:884
-#: plugins/admin/applications/class_applicationGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:531
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#: plugins/admin/applications/class_applicationGeneric.inc:523
+#: plugins/admin/departments/class_departmentGeneric.inc:575
  #: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/class_servGeneric.inc:334
-#: plugins/admin/systems/class_workstationGeneric.inc:504
+#: plugins/admin/systems/class_servGeneric.inc:347
+#: plugins/admin/systems/class_workstationGeneric.inc:526
  #: plugins/admin/systems/servkolab.tpl:6 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/class_printGeneric.inc:854
-#: plugins/admin/systems/class_componentGeneric.inc:257
-#: plugins/admin/systems/class_phoneGeneric.inc:425
+#: plugins/admin/systems/class_printGeneric.inc:858
+#: plugins/admin/systems/class_componentGeneric.inc:259
+#: plugins/admin/systems/class_phoneGeneric.inc:430
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
  #: plugins/admin/systems/servdnseditzone.tpl:1
  #: plugins/admin/systems/goMailServer.tpl:1
  #: plugins/admin/systems/goImapServer.tpl:1
  #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:709
+#: plugins/admin/ogroups/class_ogroup.inc:692
  #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
  #: plugins/admin/fai/faiPartitionTable.tpl:4
  #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
@@ -71,9 +86,9 @@ msgstr "Extensions"
  #: plugins/admin/fai/faiHookEntry.tpl:5
  #: plugins/admin/fai/faiTemplateEntry.tpl:3
  #: plugins/admin/mimetypes/generic.tpl:4
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:671
  #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_gofonMacro.inc:486
  #: plugins/generic/references/class_reference.inc:20
  msgid "Generic"
  msgstr "Informations"
@@ -85,30 +100,30 @@ msgstr "Unix"
  #: contrib/gosa.conf:82 contrib/gosa.conf:98
  #: plugins/personal/environment/class_environment.inc:12
  #: plugins/personal/environment/class_environment.inc:1269
-#: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/groups/class_divListGroup.inc:188
+#: plugins/admin/users/class_divListUsers.inc:177
  msgid "Environment"
  msgstr "Environnement"
  
  #: contrib/gosa.conf:83 contrib/gosa.conf:100
  #: plugins/personal/mail/class_mailAccount.inc:22
  #: plugins/personal/mail/class_mailAccount.inc:1006
-#: plugins/admin/groups/class_groupMail.inc:1066
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:191
-#: plugins/admin/ogroups/tabs_ogroups.inc:76
+#: plugins/admin/groups/class_groupMail.inc:1073
+#: plugins/admin/groups/class_divListGroup.inc:180
+#: plugins/admin/users/class_divListUsers.inc:179
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
  #: plugins/admin/ogroups/tabs_ogroups.inc:184
  #: plugins/admin/ogroups/paste_mail.tpl:4
  #: plugins/admin/ogroups/class_mailogroup.inc:167
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/admin/ogroups/class_divListOGroup.inc:171
  #: plugins/generic/references/class_reference.inc:24
  msgid "Mail"
  msgstr "Messagerie"
  
  #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
  #: plugins/personal/samba/class_sambaAccount.inc:1041
-#: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/groups/class_divListGroup.inc:182
+#: plugins/admin/users/class_divListUsers.inc:185
  #: plugins/generic/references/class_reference.inc:26
  #: plugins/generic/references/class_reference.inc:28
  msgid "Samba"
@@ -116,7 +131,7 @@ msgstr "Samba"
  
  #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
  #: plugins/personal/netatalk/class_netatalk.inc:355
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:187
  msgid "Netatalk"
  msgstr "Netatalk"
  
@@ -127,15 +142,14 @@ msgstr "Connectivité"
  
  #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
  #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:581
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:586
  #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:807
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
  #: plugins/gofax/faxaccount/paste_generic.tpl:8
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:183
  #: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/class_departmentGeneric.inc:550
+#: plugins/admin/departments/class_departmentGeneric.inc:594
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Fax"
@@ -148,12 +162,12 @@ msgstr "Fax"
  #: plugins/addons/addressbook/address_edit.tpl:221
  #: plugins/addons/addressbook/address_info.tpl:67
  #: plugins/addons/addressbook/address_info.tpl:163
-#: plugins/admin/groups/class_divListGroup.inc:178
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/groups/class_divListGroup.inc:186
+#: plugins/admin/users/class_divListUsers.inc:181
  #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:818
+#: plugins/admin/systems/class_systemManagement.inc:1003
  #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/ogroups/class_ogroupManagement.inc:351
  #: plugins/admin/ogroups/class_phonequeue.inc:718
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1231
@@ -173,9 +187,9 @@ msgstr "Nagios"
  msgid "Applications"
  msgstr "Applications"
  
-#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:92
  #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:240
+#: plugins/admin/systems/class_servRepository.inc:254
  #: plugins/admin/ogroups/phonequeue.tpl:43
  #: plugins/gofon/conference/generic.tpl:121
  msgid "Options"
@@ -189,21 +203,21 @@ msgstr "Paramètres"
  
  #: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
  #: plugins/admin/systems/class_terminalStartup.inc:442
-#: plugins/admin/systems/class_workstationStartup.inc:1109
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: plugins/admin/systems/class_workstationStartup.inc:1154
+#: plugins/admin/ogroups/tabs_ogroups.inc:96
  msgid "Startup"
  msgstr "Démarrage"
  
  #: contrib/gosa.conf:120 contrib/gosa.conf:136
-#: plugins/admin/ogroups/tabs_ogroups.inc:103
+#: plugins/admin/ogroups/tabs_ogroups.inc:99
  msgid "Devices"
  msgstr "Périphériques"
  
  #: contrib/gosa.conf:121 contrib/gosa.conf:137
  #: plugins/personal/environment/environment.tpl:235
-#: plugins/admin/systems/class_systemManagement.inc:827
-#: plugins/admin/systems/class_printGeneric.inc:860
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/systems/class_systemManagement.inc:1012
+#: plugins/admin/systems/class_printGeneric.inc:864
+#: plugins/admin/ogroups/class_ogroupManagement.inc:354
  #: plugins/generic/references/class_reference.inc:52
  msgid "Printer"
  msgstr "Imprimante"
@@ -222,16 +236,16 @@ msgstr "Imprimante"
  #: plugins/admin/fai/faiPackageEntry.tpl:22
  #: plugins/gofon/macro/headpage.tpl:20
  #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:64
+#: ihtml/themes/default/MultiSelectWindow.tpl:27
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
  msgid "Information"
  msgstr "Information"
  
  #: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:385
  #: plugins/admin/systems/class_goFaxServer.inc:85
  #: plugins/admin/systems/class_servKolab.inc:375
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:366
  #: plugins/admin/systems/class_goGlpiServer.inc:84
  #: plugins/admin/systems/class_goCupsServer.inc:64
  #: plugins/admin/systems/class_goTerminalServer.inc:118
@@ -250,7 +264,6 @@ msgid "Services"
  msgstr "Services"
  
  #: contrib/gosa.conf:129 contrib/gosa.conf:139
-#: plugins/admin/fai/class_faiSummaryTab.inc:546
  msgid "FAI summary"
  msgstr "Sommaire FAI"
  
@@ -277,7 +290,7 @@ msgstr "Exporter en Excel"
  #: plugins/addons/ldapmanager/contentcsv.tpl:112
  #: plugins/addons/ldapmanager/contentimport.tpl:50
  #: plugins/addons/notifications/contents.tpl:52
-#: plugins/admin/applications/generic.tpl:132
+#: plugins/admin/applications/generic.tpl:135
  msgid "Import"
  msgstr "Importer"
  
@@ -290,33 +303,32 @@ msgid "Partitions"
  msgstr "Partitions"
  
  #: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:518
+#: plugins/admin/applications/generic.tpl:130
+#: plugins/admin/fai/class_faiScript.inc:529
  #: plugins/admin/fai/faiScriptEntry.tpl:56
  #: plugins/admin/fai/faiHookEntry.tpl:56
  msgid "Script"
  msgstr "Script"
  
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:45
  msgid "Hooks"
  msgstr "Connexions"
  
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:46
  msgid "Variables"
  msgstr "Variables"
  
-#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:47
  msgid "Templates"
  msgstr "Modèles"
  
  #: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
-#: plugins/admin/fai/class_faiSummaryTab.inc:47
+#: plugins/admin/fai/class_faiSummaryTab.inc:50
  msgid "Profiles"
  msgstr "Profils"
  
-#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:103
  #: plugins/admin/acl/class_divListACL.inc:49
-#: plugins/admin/fai/class_faiSummaryTab.inc:545
  msgid "Summary"
  msgstr "Sommaire"
  
@@ -371,7 +383,7 @@ msgstr "Sélectionner les adresses à ajouter"
  #: plugins/personal/environment/hotplugDialog.tpl:24
  #: plugins/personal/environment/selectPrinterDialog.tpl:24
  #: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:62
+#: plugins/addons/addressbook/contents.tpl:65
  #: plugins/addons/godfs/contents.tpl:31
  #: plugins/admin/groups/mail_locals.tpl:22
  #: plugins/admin/groups/group_objects.tpl:20
@@ -387,8 +399,8 @@ msgstr "Sélectionner les adresses à ajouter"
  #: plugins/admin/fai/faiPackageEntry.tpl:32
  #: plugins/gofon/macro/headpage.tpl:29
  #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:75
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:78
  msgid "Filters"
  msgstr "Filtres"
  
@@ -403,7 +415,7 @@ msgstr "Sélectionner pour voir les départements"
  #: plugins/personal/samba/samba3_workstations.tpl:27
  #: plugins/personal/environment/selectPrinterDialog.tpl:34
  #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:84
+#: plugins/addons/addressbook/contents.tpl:87
  #: plugins/admin/groups/mail_locals.tpl:33
  #: plugins/admin/groups/group_objects.tpl:40
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
@@ -454,22 +466,22 @@ msgstr "Utilisateur dont on montre les adresses"
  #: plugins/admin/groups/mail.tpl:135 plugins/admin/groups/mail_locals.tpl:66
  #: plugins/admin/groups/generic.tpl:137
  #: plugins/admin/groups/application.tpl:39
-#: plugins/admin/groups/class_groupMail.inc:591
+#: plugins/admin/groups/class_groupMail.inc:598
  #: plugins/admin/groups/group_objects.tpl:55
  #: plugins/admin/groups/paste_mail.tpl:30
  #: plugins/admin/groups/paste_mail.tpl:41
  #: plugins/admin/systems/terminal.tpl:117
+#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/workstation.tpl:94
  #: plugins/admin/systems/glpiPrinter.tpl:115
  #: plugins/admin/systems/glpiPrinter.tpl:149
  #: plugins/admin/systems/servdns.tpl:6 plugins/admin/systems/glpi.tpl:125
-#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/phonesettings.tpl:207
  #: plugins/admin/systems/phonesettings.tpl:230
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:124
-#: plugins/admin/systems/workstationStartup.tpl:150
-#: plugins/admin/systems/workstationStartup.tpl:179
+#: plugins/admin/systems/workstationStartup.tpl:127
+#: plugins/admin/systems/workstationStartup.tpl:154
+#: plugins/admin/systems/workstationStartup.tpl:183
  #: plugins/admin/systems/terminalStartup.tpl:79
  #: plugins/admin/systems/terminalStartup.tpl:108
  #: plugins/admin/systems/servRepositorySetup.tpl:47
@@ -477,12 +489,12 @@ msgstr "Utilisateur dont on montre les adresses"
  #: plugins/admin/systems/glpiManufacturer.tpl:6
  #: plugins/admin/systems/glpi_edit_os.tpl:8
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:472
-#: plugins/admin/systems/class_termDNS.inc:492
+#: plugins/admin/systems/class_termDNS.inc:477
+#: plugins/admin/systems/class_termDNS.inc:497
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
  #: plugins/admin/systems/servdnseditzone.tpl:106
  #: plugins/admin/systems/class_servDNSeditZone.inc:486
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:392
  #: plugins/admin/systems/goShareServer.tpl:14
  #: plugins/admin/systems/goMailServer.tpl:70
  #: plugins/admin/systems/goMailServer.tpl:101
@@ -495,7 +507,7 @@ msgstr "Utilisateur dont on montre les adresses"
  #: plugins/admin/ogroups/ogroup_objects.tpl:54
  #: plugins/admin/ogroups/phonequeue.tpl:33
  #: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
-#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPackage.tpl:78
  #: plugins/admin/fai/faiPartitionTable.tpl:48
  #: plugins/admin/fai/faiPartitionTable.tpl:50
  #: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
@@ -544,15 +556,17 @@ msgstr "Ajouter"
  #: plugins/admin/applications/remove.tpl:15
  #: plugins/admin/applications/class_applicationManagement.inc:352
  #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:506
+#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/departments/dep_move_confirm.tpl:17
+#: plugins/admin/systems/goNtpServer.tpl:31
+#: plugins/admin/systems/class_systemManagement.inc:654
  #: plugins/admin/systems/servdns.tpl:23
-#: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/servkolab.tpl:247 plugins/admin/systems/gencd.tpl:11
  #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/goNtpServer.tpl:32
-#: plugins/admin/systems/goKrbServer.tpl:33
+#: plugins/admin/systems/goKrbServer.tpl:32
+#: plugins/admin/systems/goFonServer.tpl:41
  #: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:140
-#: plugins/admin/systems/goFonServer.tpl:42
+#: plugins/admin/systems/goFaxServer.tpl:25
  #: plugins/admin/systems/remove_glpi.tpl:16
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
  #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -560,7 +574,7 @@ msgstr "Ajouter"
  #: plugins/admin/systems/servRepository.tpl:68
  #: plugins/admin/systems/glpi_edit_type.tpl:29
  #: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/goFaxServer.tpl:26
+#: plugins/admin/systems/remove_ppd.tpl:14
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
  #: plugins/admin/systems/glpiSelectUser.tpl:51
  #: plugins/admin/systems/glpi_devices.tpl:761
@@ -573,26 +587,27 @@ msgstr "Ajouter"
  #: plugins/admin/systems/SelectDeviceType.tpl:45
  #: plugins/admin/systems/class_baseSelectDialog.inc:43
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/ServiceAddDialog.tpl:31
-#: plugins/admin/systems/goLdapServer.tpl:12
-#: plugins/admin/systems/goShareServer.tpl:32
-#: plugins/admin/systems/goMailServer.tpl:224
-#: plugins/admin/systems/goImapServer.tpl:119
-#: plugins/admin/systems/goSyslogServer.tpl:8
-#: plugins/admin/systems/goGlpiServer.tpl:35
-#: plugins/admin/systems/goCupsServer.tpl:8
-#: plugins/admin/systems/goTerminalServer.tpl:26
-#: plugins/admin/systems/goLogDBServer.tpl:26
-#: plugins/admin/systems/goSpamServer.tpl:128
-#: plugins/admin/systems/goSpamServerRule.tpl:24
-#: plugins/admin/systems/goVirusServer.tpl:171
+#: plugins/admin/systems/ServiceAddDialog.tpl:30
+#: plugins/admin/systems/goLdapServer.tpl:11
+#: plugins/admin/systems/goShareServer.tpl:31
+#: plugins/admin/systems/goMailServer.tpl:223
+#: plugins/admin/systems/goImapServer.tpl:118
+#: plugins/admin/systems/goSyslogServer.tpl:7
+#: plugins/admin/systems/goGlpiServer.tpl:34
+#: plugins/admin/systems/goCupsServer.tpl:7
+#: plugins/admin/systems/goTerminalServer.tpl:25
+#: plugins/admin/systems/goLogDBServer.tpl:25
+#: plugins/admin/systems/goSpamServer.tpl:127
+#: plugins/admin/systems/goSpamServerRule.tpl:23
+#: plugins/admin/systems/goVirusServer.tpl:170
  #: plugins/admin/systems/class_goService.inc:34
  #: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:307
+#: plugins/admin/ogroups/class_ogroupManagement.inc:302
  #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:619
-#: plugins/admin/fai/class_faiManagement.inc:624
-#: plugins/admin/fai/class_faiManagement.inc:630
+#: plugins/admin/acl/class_aclManagement.inc:289
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/fai/class_faiManagement.inc:634
+#: plugins/admin/fai/class_faiManagement.inc:640
  #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
  #: plugins/admin/fai/faiScriptEntry.tpl:83
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:40
@@ -604,17 +619,17 @@ msgstr "Ajouter"
  #: plugins/admin/fai/faiPackageNew.tpl:51
  #: plugins/admin/fai/faiNewBranch.tpl:20
  #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
  #: plugins/admin/mimetypes/remove.tpl:15
  #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
  #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:256
  #: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
  #: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
-#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:38
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:89
  msgid "Cancel"
  msgstr "Annuler"
  
@@ -626,11 +641,11 @@ msgstr "Adresse principale"
  
  #: plugins/personal/mail/generic.tpl:15
  #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:18
-#: plugins/admin/systems/class_servGeneric.inc:340
-#: plugins/admin/systems/class_systemManagement.inc:819
+#: plugins/admin/systems/class_servGeneric.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:1004
  #: plugins/admin/systems/servnfs.tpl:39
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:355
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
  #: plugins/generic/references/class_reference.inc:44
  msgid "Server"
  msgstr "Serveur"
@@ -645,14 +660,14 @@ msgstr "Utilisation des Quota"
  
  #: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:38
  #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:515
+#: plugins/admin/systems/class_printGeneric.inc:516
  msgid "not defined"
  msgstr "non défini"
  
  #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/personal/mail/class_mailAccount.inc:1019
  #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1077
+#: plugins/admin/groups/class_groupMail.inc:1084
  msgid "Quota size"
  msgstr "Taille des Quota"
  
@@ -691,22 +706,23 @@ msgstr "Liste des adresses de messagerie alternatives"
  #: plugins/admin/applications/remove.tpl:13
  #: plugins/admin/departments/remove.tpl:14
  #: plugins/admin/systems/terminal.tpl:121
+#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/printer.tpl:102 plugins/admin/systems/printer.tpl:126
  #: plugins/admin/systems/workstation.tpl:98
  #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/remove_glpi.tpl:14
  #: plugins/admin/systems/phonesettings.tpl:210
  #: plugins/admin/systems/phonesettings.tpl:233
-#: plugins/admin/systems/workstationStartup.tpl:125
-#: plugins/admin/systems/workstationStartup.tpl:153
+#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:157
  #: plugins/admin/systems/terminalStartup.tpl:82
  #: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/remove_ppd.tpl:12
  #: plugins/admin/systems/glpi_edit_os.tpl:10
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
  #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:486
+#: plugins/admin/systems/class_termDNS.inc:491
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
  #: plugins/admin/systems/class_servDNSeditZone.inc:292
  #: plugins/admin/systems/class_servDNSeditZone.inc:480
@@ -782,7 +798,7 @@ msgid "MB"
  msgstr "MB"
  
  #: plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1022
  msgid "Vacation message"
  msgstr "Message d'absence"
  
@@ -815,7 +831,7 @@ msgstr ""
  "locaux"
  
  #: plugins/personal/mail/generic.tpl:190
-#: plugins/personal/mail/class_mailAccount.inc:1036
+#: plugins/personal/mail/class_mailAccount.inc:1037
  msgid "Use custom sieve script"
  msgstr "Utiliser des scripts sieve personnalisés"
  
@@ -833,13 +849,14 @@ msgstr "désactive toutes les options de messagerie!"
  #: plugins/admin/groups/class_groupManagement.inc:329
  #: plugins/admin/users/class_userManagement.inc:651
  #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:500
-#: plugins/admin/ogroups/class_ogroupManagement.inc:301
-#: plugins/admin/fai/class_faiManagement.inc:613
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
+#: plugins/admin/systems/class_systemManagement.inc:648
+#: plugins/admin/ogroups/class_ogroupManagement.inc:296
+#: plugins/admin/acl/class_aclManagement.inc:280
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:339
  #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:250
  msgid "Ok"
  msgstr "Ok"
  
@@ -1032,13 +1049,13 @@ msgstr ""
  "un dans la configuration système."
  
  #: plugins/personal/mail/class_mailAccount.inc:781
-#: plugins/admin/groups/class_groupMail.inc:880
+#: plugins/admin/groups/class_groupMail.inc:887
  msgid "The required field 'Primary address' is not set."
  msgstr "Le champ obligatoire 'Adresse Principale' n'est pas rempli."
  
  #: plugins/personal/mail/class_mailAccount.inc:785
  #: plugins/personal/mail/class_mailAccount.inc:789
-#: plugins/addons/addressbook/class_addressbook.inc:694
+#: plugins/addons/addressbook/class_addressbook.inc:696
  #: plugins/admin/ogroups/class_mailogroup.inc:79
  msgid "Please enter a valid email address in 'Primary address' field."
  msgstr ""
@@ -1046,24 +1063,24 @@ msgstr ""
  "Principale'."
  
  #: plugins/personal/mail/class_mailAccount.inc:795
-#: plugins/admin/groups/class_groupMail.inc:889
+#: plugins/admin/groups/class_groupMail.inc:896
  #: plugins/admin/ogroups/class_mailogroup.inc:86
  msgid "The primary address you've entered is already in use."
  msgstr "L'adresse principale entrée est déjà utilisée."
  
  #: plugins/personal/mail/class_mailAccount.inc:801
-#: plugins/admin/groups/class_groupMail.inc:895
+#: plugins/admin/groups/class_groupMail.inc:902
  msgid "Value in 'Quota size' is not valid."
  msgstr "La valeur dans le champ 'Taille du quota' n'est pas valide."
  
  #: plugins/personal/mail/class_mailAccount.inc:810
-#: plugins/admin/groups/class_groupMail.inc:904
+#: plugins/admin/groups/class_groupMail.inc:911
  msgid "Please specify a vaild mail size for mails to be rejected."
  msgstr ""
  "Veuillez indiquer une taille valide pour les messages devant être rejetés."
  
  #: plugins/personal/mail/class_mailAccount.inc:820
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
  msgid "You need to set the maximum mail size in order to reject anything."
  msgstr ""
  "Il est nécessaire d'indiquer une taille maximale des messages afin de "
@@ -1098,61 +1115,66 @@ msgstr ""
  "Veuillez effacer en premier lieu le compte de messagerie pour permettre a "
  "kolab d'appeler sa procédure d'effacement"
  
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1012
+#, fuzzy
+msgid "Mail account"
+msgstr "Mon Compte"
+
+#: plugins/personal/mail/class_mailAccount.inc:1017
  #: plugins/personal/nagios/nagios.tpl:17
-#: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/addons/addressbook/class_addressbook.inc:797
-#: plugins/admin/groups/class_groupMail.inc:1074
-#: plugins/admin/systems/class_servDNS.inc:394
+#: plugins/personal/nagios/class_nagiosAccount.inc:273
+#: plugins/addons/addressbook/class_addressbook.inc:799
+#: plugins/admin/groups/class_groupMail.inc:1081
+#: plugins/admin/systems/class_servDNS.inc:396
  #: plugins/admin/systems/servdnseditzone.tpl:51
  #: plugins/admin/ogroups/class_mailogroup.inc:175 html/getxls.php:225
  msgid "Mail address"
  msgstr "Adresse de messagerie"
  
-#: plugins/personal/mail/class_mailAccount.inc:1017
-#: plugins/admin/groups/class_groupMail.inc:1078
+#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/admin/groups/class_groupMail.inc:1085
  msgid "Mail server"
  msgstr "Serveur de messagerie"
  
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1021
  msgid "Add vacation information"
  msgstr "Ajouter un message d'absence"
  
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1024
  msgid "Use spam filter"
  msgstr "Utiliser le filtre antispam"
  
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1025
  msgid "Spam level"
  msgstr "Niveau de spam"
  
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1026
  msgid "Spam mail box"
  msgstr "boite de messagerie pour les spam"
  
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1028
  msgid "Reject due to mailsize"
  msgstr "Rejeter si plus gros que"
  
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:1029
  msgid "Mail max size"
  msgstr "Taille maximum des messages"
  
-#: plugins/personal/mail/class_mailAccount.inc:1030
-#: plugins/personal/mail/class_mailAccount.inc:1035
+#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1036
  msgid "Forwarding address"
  msgstr "Adresse de transfert"
  
-#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1032
  msgid "Local delivery"
  msgstr "Distribution locale"
  
-#: plugins/personal/mail/class_mailAccount.inc:1032
+#: plugins/personal/mail/class_mailAccount.inc:1033
  #, fuzzy
  msgid "No delivery to own mailbox "
  msgstr "Aucune distribution des messages dans la boite de l'utilisateur"
  
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1034
  msgid "Mail alternative addresses"
  msgstr "Adresses alternatives de messagerie"
  
@@ -1222,8 +1244,9 @@ msgstr ""
  #: plugins/addons/ldapmanager/contentexport.tpl:66
  #: plugins/addons/ldapmanager/contentexportxls.tpl:69
  #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1452
+#: plugins/admin/departments/dep_iframe.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:145
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1421
  #: ihtml/themes/default/setup_useradmin.tpl:40
  #: ihtml/themes/default/setup_step4.tpl:114
  #: ihtml/themes/default/setup_step2.tpl:12
@@ -1233,13 +1256,14 @@ msgid "Back"
  msgstr "Retour"
  
  #: plugins/personal/password/class_password.inc:5
+#: plugins/personal/password/class_password.inc:17
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/admin/systems/class_goFaxServer.inc:94
  #: plugins/admin/systems/goKrbServer.tpl:20
  #: plugins/admin/systems/goFonServer.tpl:12
-#: plugins/admin/systems/class_goGlpiServer.inc:98
  #: plugins/admin/systems/goFaxServer.tpl:12
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_goGlpiServer.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:308
  #: plugins/admin/systems/goImapServer.tpl:34
  #: plugins/admin/systems/class_goFonServer.inc:107
  #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1252,7 +1276,7 @@ msgid "Password"
  msgstr "Mot de passe"
  
  #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/generic/class_user.inc:1378
  msgid "User password"
  msgstr "Mot de passe utilisateur"
  
@@ -1305,12 +1329,12 @@ msgstr ""
  "Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
  
  #: plugins/personal/password/main.inc:123
-#: plugins/admin/users/class_divListUsers.inc:261
+#: plugins/admin/users/class_divListUsers.inc:249
  msgid "Change password"
  msgstr "Modifier le mot de passe"
  
  #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1327
+#: plugins/personal/posix/class_posixAccount.inc:1320
  #: plugins/personal/posix/paste_generic.tpl:8
  #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
  #: plugins/personal/samba/class_sambaAccount.inc:645
@@ -1318,7 +1342,7 @@ msgid "Home directory"
  msgstr "Répertoire Home"
  
  #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1328
+#: plugins/personal/posix/class_posixAccount.inc:1321
  msgid "Shell"
  msgstr "Shell"
  
@@ -1327,10 +1351,10 @@ msgid "Primary group"
  msgstr "Groupe principal"
  
  #: plugins/personal/posix/generic.tpl:35
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:235
  #: plugins/gofax/faxreports/contents.tpl:32
  #: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/class_faxreport.inc:482
+#: plugins/gofax/faxreports/class_faxreport.inc:487
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
  #: plugins/gofon/fonreports/contents.tpl:35
  msgid "Status"
@@ -1348,7 +1372,7 @@ msgstr "UID"
  
  #: plugins/personal/posix/generic.tpl:62
  #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:894
  msgid "GID"
  msgstr "GID"
  
@@ -1391,7 +1415,7 @@ msgstr "Afficher les groupes du département"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -1449,53 +1473,53 @@ msgstr "Paramètres unix"
  msgid "UNIX"
  msgstr "UNIX"
  
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:135
  msgid "expired"
  msgstr "expire"
  
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:137
  msgid "grace time active"
  msgstr ", temps de grâce activé"
  
-#: plugins/personal/posix/class_posixAccount.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:140
  msgid "active, password not changable"
  msgstr "actif, impossible de changer le mot de passe"
  
-#: plugins/personal/posix/class_posixAccount.inc:143
+#: plugins/personal/posix/class_posixAccount.inc:142
  msgid "active, password expired"
  msgstr "actif, mot de passe expiré"
  
-#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:144
  msgid "active"
  msgstr "actif"
  
-#: plugins/personal/posix/class_posixAccount.inc:156
-#: plugins/personal/posix/class_posixAccount.inc:1010
+#: plugins/personal/posix/class_posixAccount.inc:155
+#: plugins/personal/posix/class_posixAccount.inc:1002
  msgid "Group of user"
  msgstr "Groupe d'utilisateurs"
  
-#: plugins/personal/posix/class_posixAccount.inc:191
+#: plugins/personal/posix/class_posixAccount.inc:190
  msgid "unconfigured"
  msgstr "non configuré"
  
-#: plugins/personal/posix/class_posixAccount.inc:208
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:791
+#: plugins/personal/posix/class_posixAccount.inc:201
+#: plugins/admin/systems/class_workstationStartup.inc:825
  #: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:196
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
  msgid "automatic"
  msgstr "automatique"
  
-#: plugins/personal/posix/class_posixAccount.inc:254
+#: plugins/personal/posix/class_posixAccount.inc:247
  msgid "This account has no unix extensions."
  msgstr "Ce compte n'a pas d'extension unix."
  
-#: plugins/personal/posix/class_posixAccount.inc:274
-#: plugins/personal/posix/class_posixAccount.inc:277
+#: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
  msgid "Remove posix account"
  msgstr "Supprimer le compte posix"
  
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:268
  msgid ""
  "This account has unix features enabled. To disable them, you'll need to "
  "remove the samba / environment account first."
@@ -1503,7 +1527,7 @@ msgstr ""
  "Ce compte possède l'extension unix. Pour le désactiver vous devez au "
  "préalable supprimer le(s) compte samba / environnement."
  
-#: plugins/personal/posix/class_posixAccount.inc:278
+#: plugins/personal/posix/class_posixAccount.inc:271
  msgid ""
  "This account has posix features enabled. You can disable them by clicking "
  "below."
@@ -1511,11 +1535,11 @@ msgstr ""
  "Ce compte possède l'extension posix. Vous pouvez le supprimer en cliquant "
  "sur le bouton ci-dessous."
  
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:274
  msgid "Create posix account"
  msgstr "Créer un compte posix"
  
-#: plugins/personal/posix/class_posixAccount.inc:282
+#: plugins/personal/posix/class_posixAccount.inc:275
  msgid ""
  "This account has posix features disabled. You can enable them by clicking "
  "below."
@@ -1523,31 +1547,31 @@ msgstr ""
  "Aucune extension posix n'existe pour ce compte. Vous pouvez en créer une en "
  "cliquant sur le bouton ci-dessous."
  
-#: plugins/personal/posix/class_posixAccount.inc:442
+#: plugins/personal/posix/class_posixAccount.inc:435
  #, php-format
  msgid "Password can't be changed up to %s days after last change"
  msgstr ""
  "Les mots de passe ne peuvent être changé qu'après %s jours à compter de la "
  "dernière modification de celui-ci"
  
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:439
  #, php-format
  msgid "Password must be changed after %s days"
  msgstr "Le mot de passe doit être changé après %s jours"
  
-#: plugins/personal/posix/class_posixAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:443
  #, php-format
  msgid "Disable account after %s days of inactivity after password expiery"
  msgstr ""
  "Désactiver le compte après %s jours d'inactivité après l'expiration du mot "
  "de passe"
  
-#: plugins/personal/posix/class_posixAccount.inc:454
+#: plugins/personal/posix/class_posixAccount.inc:447
  #, php-format
  msgid "Warn user %s days before password expiery"
  msgstr "Avertir l'utilisateur %s jours avant l'expiration de son mot de passe"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1556,7 +1580,7 @@ msgstr "Avertir l'utilisateur %s jours avant l'expiration de son mot de passe"
  msgid "January"
  msgstr "Janvier"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1565,7 +1589,7 @@ msgstr "Janvier"
  msgid "February"
  msgstr "Février"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1574,7 +1598,7 @@ msgstr "Février"
  msgid "March"
  msgstr "Mars"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1583,7 +1607,7 @@ msgstr "Mars"
  msgid "April"
  msgstr "Avril"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1592,7 +1616,7 @@ msgstr "Avril"
  msgid "May"
  msgstr "Mai"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1601,7 +1625,7 @@ msgstr "Mai"
  msgid "June"
  msgstr "Juin"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1610,7 +1634,7 @@ msgstr "Juin"
  msgid "July"
  msgstr "Juillet"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1619,7 +1643,7 @@ msgstr "Juillet"
  msgid "August"
  msgstr "Aôut"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1628,7 +1652,7 @@ msgstr "Aôut"
  msgid "September"
  msgstr "Septembre"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1637,7 +1661,7 @@ msgstr "Septembre"
  msgid "October"
  msgstr "Octobre"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1646,7 +1670,7 @@ msgstr "Octobre"
  msgid "November"
  msgstr "Novembre"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1655,165 +1679,170 @@ msgstr "Novembre"
  msgid "December"
  msgstr "Décembre"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  #: plugins/personal/samba/class_sambaAccount.inc:468
-#: plugins/admin/systems/class_terminalGeneric.inc:97
+#: plugins/admin/systems/class_terminalGeneric.inc:104
  #: ihtml/themes/default/setup_step4.tpl:91
  msgid "disabled"
  msgstr "désactivé"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  msgid "full access"
  msgstr "accès complet"
  
-#: plugins/personal/posix/class_posixAccount.inc:576
+#: plugins/personal/posix/class_posixAccount.inc:568
  msgid "allow access to these hosts"
  msgstr "permettre l'accès a ces hôtes"
  
-#: plugins/personal/posix/class_posixAccount.inc:622
+#: plugins/personal/posix/class_posixAccount.inc:614
  #, php-format
  msgid "Removing of user/posix account with dn '%s' failed."
  msgstr "La suppression du compte posix avec le dn '%s' à échoué."
  
-#: plugins/personal/posix/class_posixAccount.inc:770
+#: plugins/personal/posix/class_posixAccount.inc:762
  msgid "Failed: overriding lock"
  msgstr "Échoué: réécriture du verrou"
  
-#: plugins/personal/posix/class_posixAccount.inc:859
+#: plugins/personal/posix/class_posixAccount.inc:851
  #, php-format
  msgid "Saving of user/posix account with dn '%s' failed."
  msgstr "La sauvegarde du compte posix avec le dn '%s' à échoué."
  
-#: plugins/personal/posix/class_posixAccount.inc:924
+#: plugins/personal/posix/class_posixAccount.inc:916
  msgid "The required field 'Home directory' is not set."
  msgstr "Le champ obligatoire 'Répertoire Home' n'est pas renseigné."
  
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:919
  msgid "Please enter a valid path in 'Home directory' field."
  msgstr ""
  "Veuillez indiquer un chemin d'accès valide dans le champ 'Répertoire Home'."
  
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:927
  msgid "Value specified as 'UID' is not valid."
  msgstr "La valeur de l''UID' spécifiée n'est pas valide."
  
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:930
  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:942
-#: plugins/admin/groups/class_groupGeneric.inc:797
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:791
  msgid "Value specified as 'GID' is not valid."
  msgstr "La valeur du 'GID' n'est pas valide."
  
-#: plugins/personal/posix/class_posixAccount.inc:945
-#: plugins/admin/groups/class_groupGeneric.inc:800
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:794
  msgid "Value specified as 'GID' is too small."
  msgstr "La valeur spécifiée comme 'GID' est trop petite."
  
-#: plugins/personal/posix/class_posixAccount.inc:953
+#: plugins/personal/posix/class_posixAccount.inc:945
  msgid "Value specified as 'shadowMin' is not valid."
  msgstr ""
  "La valeur de 'Les mots de passe ne peuvent être changé qu'après x jours à "
  "compter de la dernière modification de celui-ci' n'est pas valide."
  
-#: plugins/personal/posix/class_posixAccount.inc:958
+#: plugins/personal/posix/class_posixAccount.inc:950
  msgid "Value specified as 'shadowMax' is not valid."
  msgstr ""
  "La valeur ' Le mot de passe doit être changé après x jours' n'est pas valide."
  
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:955
  msgid "Value specified as 'shadowWarning' is not valid."
  msgstr ""
  "La valeur 'avertissement de l'utilisateur x jours avant le changement de mot "
  "de passe' spécifiée n'est pas valide."
  
-#: plugins/personal/posix/class_posixAccount.inc:966
+#: plugins/personal/posix/class_posixAccount.inc:958
  msgid "'shadowWarning' without 'shadowMax' makes no sense."
  msgstr ""
  "La valeur 'Avertir l'utilisateur x jours avant l'expiration de son mot de "
  "passe' sans la valeur 'Le mot de passe doit être changé après x jours' n'a "
  "pas de sens."
  
-#: plugins/personal/posix/class_posixAccount.inc:969
+#: plugins/personal/posix/class_posixAccount.inc:961
  msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
  msgstr ""
  "La valeur de 'Avertir l'utilisateur x jours avant l'expiration de son mot de "
  "passe' doit être inférieure à celle de ' Le mot de passe doit être changé "
  "après 64 jours '."
  
-#: plugins/personal/posix/class_posixAccount.inc:972
+#: plugins/personal/posix/class_posixAccount.inc:964
  msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
  msgstr ""
  "La valeur de 'Avertir l'utilisateur x jours avant l'expiration de son mot de "
  "passe' doit être supérieure à celle de 'Les mots de passe ne peuvent être "
  "changé qu'après x jours à compter de la dernière modification de celui-ci '."
  
-#: plugins/personal/posix/class_posixAccount.inc:977
+#: plugins/personal/posix/class_posixAccount.inc:969
  msgid "Value specified as 'shadowInactive' is not valid."
  msgstr ""
  "La valeur de 'Désactiver le compte après x jours d'inactivité après "
  "l'expiration du mot de passe ' n'est pas valide."
  
-#: plugins/personal/posix/class_posixAccount.inc:980
+#: plugins/personal/posix/class_posixAccount.inc:972
  msgid "'shadowInactive' without 'shadowMax' makes no sense."
  msgstr ""
  "'Désactiver le compte après x jours d'inactivité après l'expiration du mot "
  "de passe ' sans 'Le mot de passe doit être changé après x jours ' n'a pas de "
  "sens."
  
-#: plugins/personal/posix/class_posixAccount.inc:985
+#: plugins/personal/posix/class_posixAccount.inc:977
  msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
  msgstr ""
  "La valeur pour 'Les mots de passe ne peuvent être changé qu'après x jours à "
  "compter de la dernière modification de celui-ci ' doit être inférieure à "
  "celle de 'Le mot de passe doit être changé après x jours '."
  
-#: plugins/personal/posix/class_posixAccount.inc:1148
-#: plugins/admin/groups/class_groupGeneric.inc:836
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:830
  msgid "Too many users, can't allocate a free ID!"
  msgstr "Trop d'utilisateurs, impossible d'assigner un ID libre!"
  
-#: plugins/personal/posix/class_posixAccount.inc:1317
+#: plugins/personal/posix/class_posixAccount.inc:1309
  msgid "POSIX account"
  msgstr "Compte POSIX"
  
-#: plugins/personal/posix/class_posixAccount.inc:1329
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:100
+#: plugins/personal/posix/class_posixAccount.inc:1314
+#, fuzzy
+msgid "Posix Account"
+msgstr "Compte Proxy"
+
+#: plugins/personal/posix/class_posixAccount.inc:1322
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:100
  #: html/getxls.php:135 html/getxls.php:158 html/getxls.php:347
  #: html/getxls.php:364
  msgid "User ID"
  msgstr "ID de l'utilisateur"
  
-#: plugins/personal/posix/class_posixAccount.inc:1330
+#: plugins/personal/posix/class_posixAccount.inc:1323
  msgid "Group ID"
  msgstr "ID du groupe"
  
-#: plugins/personal/posix/class_posixAccount.inc:1332
+#: plugins/personal/posix/class_posixAccount.inc:1325
  msgid "Force password change on login"
  msgstr "Forcer le changement du mot de passe lors du login"
  
-#: plugins/personal/posix/class_posixAccount.inc:1333
+#: plugins/personal/posix/class_posixAccount.inc:1326
  msgid "Shadow min"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1334
+#: plugins/personal/posix/class_posixAccount.inc:1327
  msgid "Shadow max"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1335
+#: plugins/personal/posix/class_posixAccount.inc:1328
  msgid "Shadow warning"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1336
+#: plugins/personal/posix/class_posixAccount.inc:1329
  msgid "Shadow inactive"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1337
+#: plugins/personal/posix/class_posixAccount.inc:1330
  msgid "Shadow expire"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1338
+#: plugins/personal/posix/class_posixAccount.inc:1331
  msgid "System trust model"
  msgstr "Système de Confiance"
  
@@ -1846,7 +1875,7 @@ msgstr ""
  "cliente"
  
  #: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1056
  msgid "Login from windows client requires no password"
  msgstr ""
  "L'identification sur une station windows ne nécessite pas de mot de passe"
@@ -1856,7 +1885,7 @@ msgid "Temporary disable samba account"
  msgstr "Désactiver temporairement le compte Samba"
  
  #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1069
+#: plugins/personal/samba/class_sambaAccount.inc:1070
  msgid "Domain"
  msgstr "Domaine"
  
@@ -1865,12 +1894,12 @@ msgid "Terminal Server"
  msgstr "Serveur de terminaux"
  
  #: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1052
  msgid "Allow login on terminal server"
  msgstr "Permet la connexion sur un serveur de terminaux"
  
  #: plugins/personal/samba/samba3.tpl:131
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1053
  msgid "Inherit client config"
  msgstr "Hérite de la configuration du client"
  
@@ -1935,17 +1964,17 @@ msgid "Reconnect if disconnected"
  msgstr "Reconnexion si déconnecté"
  
  #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1057
  msgid "Lock samba account"
  msgstr "Verrouiller le compte Samba"
  
  #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1062
+#: plugins/personal/samba/class_sambaAccount.inc:1063
  msgid "Limit Logon Time"
  msgstr "Limiter les temps d'accès"
  
  #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1063
+#: plugins/personal/samba/class_sambaAccount.inc:1064
  msgid "Limit Logoff Time"
  msgstr "Limiter les heures de deconnections"
  
@@ -2086,37 +2115,42 @@ msgstr ""
  msgid "Saving of user/samba account with dn '%s' failed."
  msgstr "La sauvegarde du compte Samba avec le dn '%s' à échoué."
  
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1047
+#, fuzzy
+msgid "Samba account"
+msgstr "Verrouiller le compte Samba"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1055
  msgid "Allow user to change password"
  msgstr "Autoriser les utilisateurs à changer leur mot de passe"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1059
+#: plugins/personal/samba/class_sambaAccount.inc:1060
  msgid "Account expires"
  msgstr "Le compte expire après"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1060
+#: plugins/personal/samba/class_sambaAccount.inc:1061
  msgid "Password expires"
  msgstr "Le mot de passe expire"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1065
+#: plugins/personal/samba/class_sambaAccount.inc:1066
  msgid "Generic home directory"
  msgstr "Répertoire home de base"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1066
+#: plugins/personal/samba/class_sambaAccount.inc:1067
  msgid "Generic samba home drive"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1067
+#: plugins/personal/samba/class_sambaAccount.inc:1068
  #, fuzzy
  msgid "Generic script path"
  msgstr "Chemin du Script"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1068
+#: plugins/personal/samba/class_sambaAccount.inc:1069
  #, fuzzy
  msgid "Generic profile path"
  msgstr "Chemin du Profile"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1070
+#: plugins/personal/samba/class_sambaAccount.inc:1071
  msgid "Allow connection from"
  msgstr "Permet la connections depuis"
  
@@ -2132,108 +2166,95 @@ msgstr "masculin"
  msgid "This account has no valid GOsa extensions."
  msgstr "Ce compte n'a pas d'extensions GOsa valides."
  
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:335
  msgid "The specified file has not been uploaded via HTTP POST! Aborted."
  msgstr "Ce fichier n'a pas été téléchargé via la méthode HTTP POST! Abandon."
  
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:432
  msgid "Please enter a valid serial number"
  msgstr "Veuillez entrer un numéro de série valide"
  
-#: plugins/personal/generic/class_user.inc:471
+#: plugins/personal/generic/class_user.inc:476
  msgid ""
  "(Some types of certificates are currently not supported and may be displayed "
  "as 'invalid'.)"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:481
+#: plugins/personal/generic/class_user.inc:486
  #, php-format
  msgid "Certificate is valid from %s to %s and is currently %s."
  msgstr "Le certificat est valide de %s à %s et est actuellement %s."
  
-#: plugins/personal/generic/class_user.inc:484
+#: plugins/personal/generic/class_user.inc:489
  msgid "valid"
  msgstr "valide"
  
-#: plugins/personal/generic/class_user.inc:485
+#: plugins/personal/generic/class_user.inc:490
  msgid "invalid"
  msgstr "invalide"
  
-#: plugins/personal/generic/class_user.inc:490
+#: plugins/personal/generic/class_user.inc:495
  msgid "No certificate installed"
  msgstr "Pas de certificat installé"
  
-#: plugins/personal/generic/class_user.inc:579
+#: plugins/personal/generic/class_user.inc:582
  #, php-format
  msgid "Removing of user/generic account with dn '%s' failed."
  msgstr "La suppression du compte générique avec le dn '%s' à échoué."
  
-#: plugins/personal/generic/class_user.inc:611
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:982
  msgid "Kerberos database communication failed"
  msgstr "La communication vers la base de données kerberos a échoué"
  
-#: plugins/personal/generic/class_user.inc:625
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:628
+#: plugins/personal/generic/class_user.inc:999
  msgid "Can't remove user from kerberos database."
  msgstr "Impossible de supprimer l'utilisateur de la base de données kerberos."
  
-#: plugins/personal/generic/class_user.inc:682
-#: plugins/admin/systems/class_printGeneric.inc:625
+#: plugins/personal/generic/class_user.inc:684
  #, php-format
  msgid "You are not allowed to move this object to '%s'."
  msgstr "Vous n'êtes pas autorisé à bouger cet objet vers '%s'."
  
-#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:935
  #, php-format
  msgid "Saving of user/generic account with dn '%s' failed."
  msgstr "La sauvegarde du compte générique avec le dn '%s' à échoué."
  
-#: plugins/personal/generic/class_user.inc:1008
+#: plugins/personal/generic/class_user.inc:1010
  msgid "Can't add user to kerberos database."
  msgstr "Impossible d'ajouter un utilisateur à la base de données kerberos."
  
-#: plugins/personal/generic/class_user.inc:1049
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-"Vous n'avez pas l'autorisation pour créer un utilisateur sur cette 'Base'."
-
-#: plugins/personal/generic/class_user.inc:1052
-#, fuzzy
-msgid "You have no permissions to move this user to the specified 'Base'."
-msgstr ""
-"Vous n'avez pas l'autorisation pour déplacer un utilisateur sur depuis cette "
-"'Base'."
-
-#: plugins/personal/generic/class_user.inc:1058
-#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/personal/generic/class_user.inc:1057
+#: plugins/addons/addressbook/class_addressbook.inc:653
  #: plugins/admin/users/class_userManagement.inc:471
  #: plugins/admin/users/class_userManagement.inc:549
  msgid "The required field 'Name' is not set."
  msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
  
-#: plugins/personal/generic/class_user.inc:1067
+#: plugins/personal/generic/class_user.inc:1066
  msgid "There's already a person with this 'Login' in the database."
  msgstr "Une personne ayant ce 'Identifiant' existe déjà dans l'annuaire."
  
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/personal/generic/class_user.inc:1072
+#: plugins/addons/addressbook/class_addressbook.inc:657
  #: plugins/admin/users/class_userManagement.inc:474
  #: plugins/admin/users/class_userManagement.inc:552
  msgid "The required field 'Given name' is not set."
  msgstr "Le champ obligatoire 'Nom Complet' n'est pas rempli."
  
-#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1075
  msgid "The required field 'Login' is not set."
  msgstr "Le champ obligatoire 'Identifiant' n'est pas renseigné."
  
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1082
  msgid ""
  "There's already a person with this 'Name'/'Given name' combination in the "
  "database."
  msgstr "Une personne ayant ce 'Nom'/'Nom Complet' existe déjà dans l'annuaire."
  
-#: plugins/personal/generic/class_user.inc:1090
+#: plugins/personal/generic/class_user.inc:1089
  msgid ""
  "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
@@ -2241,119 +2262,119 @@ msgstr ""
  "Le champ 'Identifiant' contient des caractères invalides. Les minuscules, "
  "chiffres et tirets sont autorisés."
  
-#: plugins/personal/generic/class_user.inc:1093
+#: plugins/personal/generic/class_user.inc:1092
  msgid "The field 'Homepage' contains an invalid URL definition."
  msgstr "Le champ 'Page d'accueil' contient une URL invalide."
  
-#: plugins/personal/generic/class_user.inc:1096
-#: plugins/personal/generic/class_user.inc:1121
-#: plugins/addons/addressbook/class_addressbook.inc:661
-#: plugins/addons/addressbook/class_addressbook.inc:689
-#: plugins/admin/departments/class_departmentGeneric.inc:249
+#: plugins/personal/generic/class_user.inc:1095
+#: plugins/personal/generic/class_user.inc:1120
+#: plugins/addons/addressbook/class_addressbook.inc:663
+#: plugins/addons/addressbook/class_addressbook.inc:691
+#: plugins/admin/departments/class_departmentGeneric.inc:269
  msgid "The field 'Name' contains invalid characters."
  msgstr "Le champ 'Nom' contient des caractères invalides."
  
-#: plugins/personal/generic/class_user.inc:1099
-#: plugins/personal/generic/class_user.inc:1118
-#: plugins/addons/addressbook/class_addressbook.inc:664
-#: plugins/addons/addressbook/class_addressbook.inc:686
+#: plugins/personal/generic/class_user.inc:1098
+#: plugins/personal/generic/class_user.inc:1117
+#: plugins/addons/addressbook/class_addressbook.inc:666
+#: plugins/addons/addressbook/class_addressbook.inc:688
  msgid "The field 'Given name' contains invalid characters."
  msgstr "Le champ 'Nom complet' contient des caractères invalides."
  
-#: plugins/personal/generic/class_user.inc:1104
-#: plugins/addons/addressbook/class_addressbook.inc:669
-#: plugins/addons/addressbook/class_addressbook.inc:672
-#: plugins/admin/departments/class_departmentGeneric.inc:252
+#: plugins/personal/generic/class_user.inc:1103
+#: plugins/addons/addressbook/class_addressbook.inc:671
+#: plugins/addons/addressbook/class_addressbook.inc:674
+#: plugins/admin/departments/class_departmentGeneric.inc:272
  msgid "The field 'Phone' contains an invalid phone number."
  msgstr "Le champ 'Téléphone' contient un numéro invalide."
  
-#: plugins/personal/generic/class_user.inc:1107
-#: plugins/addons/addressbook/class_addressbook.inc:675
-#: plugins/admin/departments/class_departmentGeneric.inc:255
+#: plugins/personal/generic/class_user.inc:1106
+#: plugins/addons/addressbook/class_addressbook.inc:677
+#: plugins/admin/departments/class_departmentGeneric.inc:275
  msgid "The field 'Fax' contains an invalid phone number."
  msgstr "Le champ 'Fax' contient un numéro invalide."
  
-#: plugins/personal/generic/class_user.inc:1110
-#: plugins/addons/addressbook/class_addressbook.inc:678
+#: plugins/personal/generic/class_user.inc:1109
+#: plugins/addons/addressbook/class_addressbook.inc:680
  msgid "The field 'Mobile' contains an invalid phone number."
  msgstr "Le champ 'GSM' contient un numéro invalide."
  
-#: plugins/personal/generic/class_user.inc:1113
-#: plugins/addons/addressbook/class_addressbook.inc:681
+#: plugins/personal/generic/class_user.inc:1112
+#: plugins/addons/addressbook/class_addressbook.inc:683
  msgid "The field 'Pager' contains an invalid phone number."
  msgstr "Le champ 'Bip' contient un numéro invalide."
  
-#: plugins/personal/generic/class_user.inc:1222
+#: plugins/personal/generic/class_user.inc:1221
  msgid "Could not open specified certificate!"
  msgstr "Impossible d'ouvrir le certificat demandé!"
  
-#: plugins/personal/generic/class_user.inc:1353
+#: plugins/personal/generic/class_user.inc:1352
  #: plugins/personal/generic/generic.tpl:442
  msgid "Unit"
  msgstr "Unité"
  
-#: plugins/personal/generic/class_user.inc:1354
+#: plugins/personal/generic/class_user.inc:1353
  #: plugins/personal/generic/generic.tpl:467
  msgid "House identifier"
  msgstr "Identifiant du batiment"
  
-#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/class_user.inc:1354
  #: plugins/personal/generic/generic.tpl:384
  msgid "Vocation"
  msgstr "Travail"
  
-#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1355
  #: plugins/personal/generic/generic.tpl:511
  msgid "Last delivery"
  msgstr "Dernière distribution"
  
-#: plugins/personal/generic/class_user.inc:1357
+#: plugins/personal/generic/class_user.inc:1356
  #: plugins/personal/generic/generic.tpl:433
  msgid "Person locality"
  msgstr "Lieu de résidence"
  
-#: plugins/personal/generic/class_user.inc:1358
+#: plugins/personal/generic/class_user.inc:1357
  #: plugins/personal/generic/generic.tpl:392
  msgid "Unit description"
  msgstr "Description de l'unité"
  
-#: plugins/personal/generic/class_user.inc:1359
+#: plugins/personal/generic/class_user.inc:1358
  #: plugins/personal/generic/generic.tpl:401
  msgid "Subject area"
  msgstr "Zone de sujet"
  
-#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/class_user.inc:1359
  #: plugins/personal/generic/generic.tpl:410
  msgid "Functional title"
  msgstr "Fonction"
  
-#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/class_user.inc:1361
  #: plugins/personal/generic/generic.tpl:520
  msgid "Public visible"
  msgstr "Visible par tous"
  
-#: plugins/personal/generic/class_user.inc:1363
+#: plugins/personal/generic/class_user.inc:1362
  #: plugins/personal/generic/generic.tpl:451
  msgid "Street"
  msgstr "Rue"
  
-#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1363
  #: plugins/personal/generic/generic.tpl:419
  msgid "Role"
  msgstr "Rôle"
  
-#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/class_user.inc:1364
  #: plugins/personal/generic/generic.tpl:459
  #: plugins/addons/addressbook/address_edit.tpl:179
  #: plugins/addons/addressbook/address_info.tpl:133 html/getxls.php:227
  msgid "Postal code"
  msgstr "Code postal"
  
-#: plugins/personal/generic/class_user.inc:1369
+#: plugins/personal/generic/class_user.inc:1368
  msgid "Generic user settings"
  msgstr "Paramètres par défaut des utilisateurs"
  
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:1373
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/users/class_userManagement.inc:28
  #: plugins/admin/systems/printer.tpl:91
@@ -2363,206 +2384,207 @@ msgstr "Paramètres par défaut des utilisateurs"
  msgid "Users"
  msgstr "Utilisateurs"
  
-#: plugins/personal/generic/class_user.inc:1378
+#: plugins/personal/generic/class_user.inc:1377
  #: plugins/personal/generic/generic.tpl:143
  #: plugins/gofax/blocklists/generic.tpl:17
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:598
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
  #: plugins/addons/godfs/class_dfsManagment.inc:217
  #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:894
-#: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/groups/class_groupGeneric.inc:888
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:129
  #: plugins/admin/applications/generic.tpl:42
-#: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:134
+#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/class_divListApplication.inc:144
  #: plugins/admin/departments/generic.tpl:35
-#: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:107
+#: plugins/admin/departments/class_departmentGeneric.inc:586
+#: plugins/admin/departments/class_divListDepartment.inc:100
  #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:22
  #: plugins/admin/systems/phone.tpl:17 plugins/admin/systems/printer.tpl:27
  #: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/class_terminalGeneric.inc:513
-#: plugins/admin/systems/class_servGeneric.inc:346
-#: plugins/admin/systems/class_workstationGeneric.inc:515
+#: plugins/admin/systems/class_terminalGeneric.inc:553
+#: plugins/admin/systems/class_servGeneric.inc:359
+#: plugins/admin/systems/class_workstationGeneric.inc:537
  #: plugins/admin/systems/wingeneric.tpl:13
  #: plugins/admin/systems/component.tpl:17
-#: plugins/admin/systems/class_printGeneric.inc:864
-#: plugins/admin/systems/class_componentGeneric.inc:267
-#: plugins/admin/systems/class_glpiSelectUser.inc:167
+#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_componentGeneric.inc:269
+#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_glpiSelectUser.inc:181
  #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:148
+#: plugins/admin/systems/class_divListSystem.inc:187
  #: plugins/admin/systems/goLdapServer.tpl:2
  #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:719
-#: plugins/admin/ogroups/class_divListOGroup.inc:145
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_divListOGroup.inc:149
+#: plugins/admin/acl/class_divListACL.inc:98
+#: plugins/admin/fai/class_divListFai.inc:171
  #: plugins/admin/mimetypes/generic.tpl:44
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:683
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:153
  #: plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/class_gofonMacro.inc:484
-#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/macro/class_gofonMacro.inc:497
+#: plugins/gofon/macro/class_divListMacros.inc:106
  #: plugins/gofon/conference/generic.tpl:49
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
-#: plugins/gofon/conference/class_divListConferences.inc:119
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_divListConferences.inc:114
  msgid "Base"
  msgstr "Base"
  
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/addons/addressbook/class_addressbook.inc:792 html/getxls.php:301
  msgid "Surename"
  msgstr "Nom de famille"
  
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/addons/addressbook/class_addressbook.inc:611
-#: plugins/addons/addressbook/class_addressbook.inc:791 html/getxls.php:86
+#: plugins/personal/generic/class_user.inc:1380
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/addressbook/class_addressbook.inc:793 html/getxls.php:86
  #: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
  msgid "Given name"
  msgstr "Prénom"
  
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/addons/addressbook/class_addressbook.inc:796
+#: plugins/personal/generic/class_user.inc:1381
+#: plugins/addons/addressbook/class_addressbook.inc:798
  msgid "User identification"
  msgstr "Identification de l'utilisateur"
  
-#: plugins/personal/generic/class_user.inc:1383
+#: plugins/personal/generic/class_user.inc:1382
  #: plugins/personal/generic/generic.tpl:73
  #: plugins/addons/addressbook/address_edit.tpl:60
  #: plugins/addons/addressbook/address_info.tpl:40
  msgid "Personal title"
  msgstr "Titre Personnel"
  
-#: plugins/personal/generic/class_user.inc:1384
+#: plugins/personal/generic/class_user.inc:1383
  #: plugins/personal/generic/generic.tpl:83
  msgid "Academic title"
  msgstr "Titre Universitaire"
  
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
+#: plugins/personal/generic/class_user.inc:1384
+#: plugins/addons/addressbook/class_addressbook.inc:809 html/getxls.php:224
  msgid "Home postal address"
  msgstr "Adresse postale personelle"
  
-#: plugins/personal/generic/class_user.inc:1386
-#: plugins/addons/addressbook/class_addressbook.inc:795
+#: plugins/personal/generic/class_user.inc:1385
+#: plugins/addons/addressbook/class_addressbook.inc:797
  msgid "Home phone number"
  msgstr "Numéro de téléphone personnel"
  
-#: plugins/personal/generic/class_user.inc:1387
+#: plugins/personal/generic/class_user.inc:1386
  #: plugins/personal/generic/generic.tpl:183
  msgid "Homepage"
  msgstr "Page d'accueil"
  
-#: plugins/personal/generic/class_user.inc:1388
+#: plugins/personal/generic/class_user.inc:1387
  #: plugins/personal/generic/generic.tpl:250
-#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
+#: plugins/addons/addressbook/class_addressbook.inc:801 html/getxls.php:299
  msgid "Organization"
  msgstr "Entreprise"
  
-#: plugins/personal/generic/class_user.inc:1389
+#: plugins/personal/generic/class_user.inc:1388
  #: plugins/personal/generic/generic.tpl:258
  #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
  #: plugins/addons/addressbook/address_edit.tpl:155
-#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/class_addressbook.inc:802
  #: plugins/addons/addressbook/address_info.tpl:117
  #: plugins/admin/users/class_divListUsers.inc:56
  #: plugins/admin/applications/class_divListApplication.inc:51
-#: plugins/admin/ogroups/class_ogroupManagement.inc:354
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
  #: plugins/gofon/macro/class_divListMacros.inc:52
  #: plugins/generic/references/class_reference.inc:38
  msgid "Department"
  msgstr "Département"
  
-#: plugins/personal/generic/class_user.inc:1390
+#: plugins/personal/generic/class_user.inc:1389
  #: plugins/personal/generic/generic.tpl:93
  msgid "Date of birth"
  msgstr "Date de naissance"
  
-#: plugins/personal/generic/class_user.inc:1391
+#: plugins/personal/generic/class_user.inc:1390
  msgid "Gender"
  msgstr "Genre"
  
-#: plugins/personal/generic/class_user.inc:1392
+#: plugins/personal/generic/class_user.inc:1391
  msgid "Preferred language"
  msgstr "Langue préférée"
  
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1392
  msgid "Department number"
  msgstr "Numéro du département"
  
-#: plugins/personal/generic/class_user.inc:1394
+#: plugins/personal/generic/class_user.inc:1393
  msgid "Employee number"
  msgstr "Numéro de l'employé"
  
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:1394
  #: plugins/personal/generic/generic.tpl:282
  msgid "Employee type"
  msgstr "Type de l'employé"
  
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:1395
  #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/class_addressbook.inc:801
+#: plugins/addons/addressbook/class_addressbook.inc:803
  #: plugins/addons/godfs/generic.tpl:34
  #: plugins/admin/departments/generic.tpl:56
  #: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: plugins/admin/departments/class_departmentGeneric.inc:587
  #: plugins/admin/systems/workstation.tpl:19
-#: plugins/admin/systems/class_workstationGeneric.inc:514
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_workstationGeneric.inc:536
+#: plugins/admin/systems/class_printGeneric.inc:870
  #: plugins/admin/systems/class_glpiAccount.inc:782
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
  msgid "Location"
  msgstr "Lieu"
  
-#: plugins/personal/generic/class_user.inc:1397
+#: plugins/personal/generic/class_user.inc:1396
  #: plugins/personal/generic/generic.tpl:360
-#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:806
  #: plugins/admin/departments/generic.tpl:60
-#: plugins/admin/departments/class_departmentGeneric.inc:547
+#: plugins/admin/departments/class_departmentGeneric.inc:591
  #: html/getxls.php:228 html/getxls.php:301
  msgid "State"
  msgstr "Département"
  
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1397
  #: plugins/personal/generic/paste_generic.tpl:47
  msgid "User picture"
  msgstr "Image de l'utilisateur"
  
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1398
  msgid "Room number"
  msgstr "Numéro du bureau"
  
-#: plugins/personal/generic/class_user.inc:1400
-#: plugins/addons/addressbook/class_addressbook.inc:792
+#: plugins/personal/generic/class_user.inc:1399
+#: plugins/addons/addressbook/class_addressbook.inc:794
  msgid "Telefon number"
  msgstr "Numéro de téléphone"
  
-#: plugins/personal/generic/class_user.inc:1401
-#: plugins/addons/addressbook/class_addressbook.inc:794
+#: plugins/personal/generic/class_user.inc:1400
+#: plugins/addons/addressbook/class_addressbook.inc:796
  msgid "Mobile number"
  msgstr "Numéro de GSM"
  
-#: plugins/personal/generic/class_user.inc:1402
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/nagios/class_nagiosAccount.inc:272
  msgid "Pager number"
  msgstr "Numéro de la page"
  
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1402
  msgid "User certificates"
  msgstr "Certificats de l'utilisateur"
  
-#: plugins/personal/generic/class_user.inc:1405
-#: plugins/addons/addressbook/class_addressbook.inc:802
-#: plugins/addons/addressbook/class_addressbook.inc:803 html/getxls.php:226
+#: plugins/personal/generic/class_user.inc:1404
+#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:805 html/getxls.php:226
  #: html/getxls.php:298 html/getxls.php:300
  msgid "Postal address"
  msgstr "Adresse postale"
  
-#: plugins/personal/generic/class_user.inc:1406
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:820
-#: plugins/addons/addressbook/class_addressbook.inc:793
+#: plugins/personal/generic/class_user.inc:1405
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
+#: plugins/addons/addressbook/class_addressbook.inc:795
  msgid "Fax number"
  msgstr "Numéro de fax"
  
@@ -2636,7 +2658,7 @@ msgstr "Sélectionnez la branche où sera enregistrée l'utilisateur"
  #: plugins/admin/systems/workstation.tpl:35
  #: plugins/admin/systems/wingeneric.tpl:18
  #: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:36
+#: plugins/admin/mimetypes/generic.tpl:53 plugins/gofon/macro/generic.tpl:36
  #: plugins/gofon/conference/generic.tpl:56
  #: plugins/gofon/conference/generic.tpl:62
  msgid "Select a base"
@@ -2649,7 +2671,7 @@ msgstr "Sélectionnez une base"
  #: plugins/addons/addressbook/address_info.tpl:59
  #: plugins/addons/addressbook/address_info.tpl:155
  #: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/class_departmentGeneric.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:592
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
  msgid "Address"
  msgstr "Adresse"
@@ -2707,7 +2729,7 @@ msgstr "GSM"
  #: plugins/personal/generic/generic.tpl:326
  #: plugins/personal/nagios/nagios.tpl:79
  #: plugins/addons/addressbook/address_edit.tpl:246
-#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/class_addressbook.inc:800
  #: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
  #: html/getxls.php:300
  msgid "Pager"
@@ -2729,6 +2751,7 @@ msgstr ""
  
  #: plugins/personal/generic/generic_picture.tpl:27
  #: plugins/personal/generic/paste_generic.tpl:52
+#: plugins/admin/applications/generic.tpl:81
  msgid "Remove picture"
  msgstr "Suppression de l'image personnelle"
  
@@ -2736,37 +2759,38 @@ msgstr "Suppression de l'image personnelle"
  #: plugins/personal/generic/generic_certs.tpl:91
  #: plugins/personal/environment/hotplugDialogNew.tpl:53
  #: plugins/addons/addressbook/address_edit.tpl:264
-#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/departments/dep_move_confirm.tpl:15
+#: plugins/admin/systems/goNtpServer.tpl:29
  #: plugins/admin/systems/servdns.tpl:21
-#: plugins/admin/systems/servkolab.tpl:246
-#: plugins/admin/systems/goNtpServer.tpl:30
-#: plugins/admin/systems/goKrbServer.tpl:31
+#: plugins/admin/systems/servkolab.tpl:245
+#: plugins/admin/systems/goKrbServer.tpl:30
+#: plugins/admin/systems/goFonServer.tpl:39
  #: plugins/admin/systems/servnfs.tpl:139
-#: plugins/admin/systems/goFonServer.tpl:40
+#: plugins/admin/systems/goFaxServer.tpl:23
  #: plugins/admin/systems/servRepository.tpl:66
-#: plugins/admin/systems/goFaxServer.tpl:24
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
  #: plugins/admin/systems/glpi_devices.tpl:760
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
  #: plugins/admin/systems/servdnseditzone.tpl:119
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/goLdapServer.tpl:10
-#: plugins/admin/systems/goShareServer.tpl:30
-#: plugins/admin/systems/goMailServer.tpl:222
-#: plugins/admin/systems/goImapServer.tpl:117
-#: plugins/admin/systems/goSyslogServer.tpl:6
-#: plugins/admin/systems/goGlpiServer.tpl:33
-#: plugins/admin/systems/goCupsServer.tpl:6
-#: plugins/admin/systems/goTerminalServer.tpl:24
-#: plugins/admin/systems/goLogDBServer.tpl:24
-#: plugins/admin/systems/goSpamServer.tpl:126
-#: plugins/admin/systems/goSpamServerRule.tpl:22
-#: plugins/admin/systems/goVirusServer.tpl:169
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:29
+#: plugins/admin/systems/goMailServer.tpl:221
+#: plugins/admin/systems/goImapServer.tpl:116
+#: plugins/admin/systems/goSyslogServer.tpl:5
+#: plugins/admin/systems/goGlpiServer.tpl:32
+#: plugins/admin/systems/goCupsServer.tpl:5
+#: plugins/admin/systems/goTerminalServer.tpl:23
+#: plugins/admin/systems/goLogDBServer.tpl:23
+#: plugins/admin/systems/goSpamServer.tpl:125
+#: plugins/admin/systems/goSpamServerRule.tpl:21
+#: plugins/admin/systems/goVirusServer.tpl:168
  #: plugins/admin/systems/class_goService.inc:33
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:38
  #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/default/copyPasteDialog.tpl:19
  msgid "Save"
  msgstr "Enregistrer"
  
@@ -2788,21 +2812,21 @@ msgstr "Certificat standard"
  #: plugins/personal/connectivity/class_kolabAccount.inc:258
  #: plugins/personal/environment/environment.tpl:159
  #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:597
+#: plugins/admin/groups/class_groupMail.inc:604
  #: plugins/admin/applications/class_applicationParameters.inc:124
  #: plugins/admin/systems/printer.tpl:71
  #: plugins/admin/systems/glpiPrinter.tpl:152
  #: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:182
+#: plugins/admin/systems/workstationStartup.tpl:186
  #: plugins/admin/systems/terminalStartup.tpl:111
  #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:393
  #: plugins/admin/systems/goMailServer.tpl:73
  #: plugins/admin/systems/goMailServer.tpl:104
  #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:78
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
+#: plugins/admin/fai/faiPackage.tpl:81
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:293
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:295
  msgid "Remove"
  msgstr "Supprimer"
  
@@ -2831,6 +2855,7 @@ msgid "Set new password"
  msgstr "Attribuer un nouveau mot de passe"
  
  #: plugins/personal/connectivity/pureftpd.tpl:4
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
  msgid "FTP account"
  msgstr "Compte FTP"
  
@@ -2886,6 +2911,7 @@ msgstr "Désactiver temporairement l'accès FTP"
  
  #: plugins/personal/connectivity/proxy.tpl:23
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
+#: plugins/personal/connectivity/class_proxyAccount.inc:297
  msgid "Proxy account"
  msgstr "Compte Proxy"
  
@@ -2898,7 +2924,7 @@ msgid "Limit proxy access to working time"
  msgstr "Accès au proxy autorisé durant la plage horaire suivante"
  
  #: plugins/personal/connectivity/proxy.tpl:84
-#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
  msgid "Restrict proxy usage by quota"
  msgstr "Restreindre la quantité de données téléchargeables"
  
@@ -2934,7 +2960,7 @@ msgstr "Préférences des compte PHP Groupware"
  #: plugins/personal/connectivity/class_pureftpdAccount.inc:219
  #: plugins/personal/connectivity/class_oxchangeAccount.inc:950
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
  #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
  #: plugins/personal/connectivity/class_opengwAccount.inc:310
@@ -2942,12 +2968,18 @@ msgstr "Préférences des compte PHP Groupware"
  msgid "Connectivity addon"
  msgstr "Connectivité"
  
+#: plugins/personal/connectivity/class_phpgwAccount.inc:148
+#, fuzzy
+msgid "PHPgroupware"
+msgstr "PHPGroupware"
+
  #: plugins/personal/connectivity/phpgw.tpl:3
  msgid "PHPGroupware account"
  msgstr "Compte PHPGroupware"
  
  #: plugins/personal/connectivity/kolab.tpl:3
  #: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/class_kolabAccount.inc:452
  msgid "Kolab account"
  msgstr "Compte Kolab"
  
@@ -2960,7 +2992,7 @@ msgstr ""
  "vous ajoutez un compte mail."
  
  #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:459
+#: plugins/personal/connectivity/class_kolabAccount.inc:460
  msgid "Delegations"
  msgstr "Delegation"
  
@@ -2992,7 +3024,7 @@ msgid "days"
  msgstr "jours"
  
  #: plugins/personal/connectivity/kolab.tpl:93
-#: plugins/personal/connectivity/class_kolabAccount.inc:460
+#: plugins/personal/connectivity/class_kolabAccount.inc:461
  msgid "Invitation policy"
  msgstr "Politique d'invitation"
  
@@ -3078,15 +3110,15 @@ msgstr "La sauvegarde du compte Kolab avec le dn '%s' à échoué."
  msgid "Kolab account settings"
  msgstr "Compte Kolab"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:456
+#: plugins/personal/connectivity/class_kolabAccount.inc:457
  msgid "Free busy future"
  msgstr ""
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:457
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
  msgid "Mail size restriction"
  msgstr ""
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:458
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
  msgid "Free busy information"
  msgstr "Informations de disponibilité"
  
@@ -3106,6 +3138,7 @@ msgid "Saving of user/webDAV account with dn '%s' failed."
  msgstr "La sauvegarde du Compte WebDAV avec le dn '%s' à échoué."
  
  #: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_webdavAccount.inc:147
  #: plugins/personal/connectivity/webdav.tpl:3
  msgid "WebDAV account"
  msgstr "Compte WebDAV"
@@ -3166,27 +3199,27 @@ msgstr ""
  msgid "Pure ftp account"
  msgstr "Créer un compte Pureftpd"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
  msgid "Quota files"
  msgstr "Quota des fichiers"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
  msgid "Upload ratio"
  msgstr "Ratio de Téléchargement (upload)"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
  msgid "Quota MBytes"
  msgstr "Quota en MBytes"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
  msgid "Download ratio"
  msgstr "Ratio de Téléchargement (download)"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
  msgid "Upload bandwith"
  msgstr "Bande passante montante"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
  msgid "Download bandwith"
  msgstr "Bande passante descendante"
  
@@ -3286,19 +3319,25 @@ msgstr "Open-Xchange"
  msgid "Open xchange account settings"
  msgstr "Compte Open Xchange"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:959
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
+#, fuzzy
+msgid "OpenExchange account"
+msgstr "Compte Open Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
  msgid "OXAppointmentDays"
  msgstr "OX-Rendez vous"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
  msgid "OXTaskDays"
  msgstr "OX-Tâches"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:962
  msgid "OXTimeZone"
  msgstr "OX - Zone Horaire de l'utilisateur"
  
  #: plugins/personal/connectivity/intranet.tpl:3
+#: plugins/personal/connectivity/class_intranetAccount.inc:181
  msgid "Intranet account"
  msgstr "Créer un compte Intranet"
  
@@ -3358,16 +3397,17 @@ msgstr "La valeur dans le champ 'Paramètres du quota' n'est pas valide."
  msgid "Saving of user/proxy account with dn '%s' failed."
  msgstr "La sauvegarde du compte Compte Proxy avec le dn '%s' à échoué."
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:301
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
  msgid "Filter unwanted content"
  msgstr "Filtrer le contenu non désiré"
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
  msgid "Limit proxy access"
  msgstr "Accès au proxy autorisé durant la plage horaire suivante"
  
  #: plugins/personal/connectivity/pptp.tpl:3
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_pptpAccount.inc:164
  msgid "PPTP account"
  msgstr "Compte PPTP"
  
@@ -3386,7 +3426,7 @@ msgstr "La suppression du compte intranet avec le dn '%s' à échoué."
  msgid "Saving of user/intranet account with dn '%s' failed."
  msgstr "La sauvegarde du compte Intranet avec le dn '%s' à échoué."
  
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  msgid "Intranet account settings"
  msgstr "Paramètres du compte Intranet"
  
@@ -3411,29 +3451,30 @@ msgstr "La sauvegarde du Compte PPTP avec le dn '%s' à échoué."
  
  #: plugins/personal/connectivity/opengw.tpl:1
  #: plugins/personal/connectivity/class_opengwAccount.inc:309
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
  msgid "Opengroupware"
  msgstr "Compte PHPGroupware"
  
  #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:319
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
  msgid "Location team"
  msgstr "Emplacement de l'équipe"
  
  #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:320
+#: plugins/personal/connectivity/class_opengwAccount.inc:321
  msgid "Template user"
  msgstr "Modèle d'utilisateur"
  
  #: plugins/personal/connectivity/opengw.tpl:33
-#: plugins/personal/connectivity/class_opengwAccount.inc:321
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/ogroups/class_termgroup.inc:42
+#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/admin/systems/class_servGeneric.inc:53
+#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/ogroups/class_termgroup.inc:41
  msgid "Locked"
  msgstr "Verrouillé"
  
  #: plugins/personal/connectivity/opengw.tpl:48
-#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/personal/connectivity/class_opengwAccount.inc:323
  msgid "Teams"
  msgstr "Equipes"
  
@@ -3463,6 +3504,11 @@ msgstr "Compte PHPscheduleit"
  msgid "PHP Schedule it settings"
  msgstr "Paramètres du compte PHPscheduleit"
  
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:149
+#, fuzzy
+msgid "PHP schedule it"
+msgstr "Compte PHPscheduleit"
+
  #: plugins/personal/connectivity/class_opengwAccount.inc:6
  msgid "Opengroupware account"
  msgstr "Compte Opengroupware"
@@ -3526,7 +3572,7 @@ msgid "Profil quota"
  msgstr "Quota du profil"
  
  #: plugins/personal/environment/environment.tpl:73
-#: plugins/personal/environment/class_environment.inc:1282
+#: plugins/personal/environment/class_environment.inc:1285
  msgid "Cache profile localy"
  msgstr "Cacher le profile en local"
  
@@ -3535,7 +3581,7 @@ msgid "Kiosk profile settings"
  msgstr "Paramètres du profil Kiosk"
  
  #: plugins/personal/environment/environment.tpl:85
-#: plugins/personal/environment/class_environment.inc:1288
+#: plugins/personal/environment/class_environment.inc:1291
  msgid "Kiosk profile"
  msgstr "Profil Kiosk"
  
@@ -3544,22 +3590,22 @@ msgid "Manage"
  msgstr "Gérer"
  
  #: plugins/personal/environment/environment.tpl:105
-#: plugins/personal/environment/class_environment.inc:1281
+#: plugins/personal/environment/class_environment.inc:1284
  msgid "Resolution changeable during session"
  msgstr "La résolution peut être changée pendant la session"
  
  #: plugins/personal/environment/environment.tpl:110
-#: plugins/personal/environment/class_environment.inc:1287
+#: plugins/personal/environment/class_environment.inc:1290
  #: plugins/admin/systems/workstationService.tpl:122
  #: plugins/admin/systems/terminalService.tpl:108
  msgid "Resolution"
  msgstr "Résolution"
  
  #: plugins/personal/environment/environment.tpl:133
-#: plugins/personal/environment/class_environment.inc:1293
+#: plugins/personal/environment/class_environment.inc:1296
  #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1123
-#: plugins/admin/systems/workstationStartup.tpl:158
+#: plugins/admin/systems/class_workstationStartup.inc:1168
+#: plugins/admin/systems/workstationStartup.tpl:162
  #: plugins/admin/systems/terminalStartup.tpl:87
  #: plugins/admin/systems/goShareServer.tpl:1
  msgid "Shares"
@@ -3588,7 +3634,7 @@ msgid "Logon script management"
  msgstr "Administration des scripts de démarrage"
  
  #: plugins/personal/environment/environment.tpl:203
-#: plugins/personal/environment/class_environment.inc:1292
+#: plugins/personal/environment/class_environment.inc:1295
  msgid "Hotplug devices"
  msgstr "Périphériques Hotplug"
  
@@ -3598,7 +3644,7 @@ msgstr "Paramètre des périphériques Hotplug"
  
  #: plugins/personal/environment/environment.tpl:219
  #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "New"
  msgstr "Nouveau"
  
@@ -3657,7 +3703,7 @@ msgid "Please select an entry or press cancel."
  msgstr "Veuillez sélectionner une entrée ou cliquez sur annuler."
  
  #: plugins/personal/environment/class_selectPrinterDialog.inc:102
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:140
  msgid "Please select a printer or press cancel."
  msgstr "Veuillez sélectionner une imprimante ou cliquez sur annuler."
  
@@ -3697,8 +3743,8 @@ msgid "auto"
  msgstr "automatique"
  
  #: plugins/personal/environment/class_environment.inc:230
-#: plugins/admin/systems/class_terminalService.inc:95
  #: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_terminalService.inc:97
  #, php-format
  msgid ""
  "You have specified an external resolution hook which can't be read, please "
@@ -3773,7 +3819,7 @@ msgstr "Vous n'êtes pas autorisé à écrire des script de démarrage."
  #: plugins/personal/environment/class_environment.inc:591
  #: plugins/personal/environment/class_environment.inc:604
  #: plugins/admin/systems/class_terminalStartup.inc:203
-#: plugins/admin/systems/class_workstationStartup.inc:616
+#: plugins/admin/systems/class_workstationStartup.inc:645
  msgid "You must specify a valid mount point."
  msgstr "Veuillez indiquer un point de montage valide."
  
@@ -3844,27 +3890,29 @@ msgid "Administrator"
  msgstr "Administrateur"
  
  #: plugins/personal/environment/class_environment.inc:1243
-#: plugins/personal/environment/class_environment.inc:1290
+#: plugins/personal/environment/class_environment.inc:1293
  msgid "Default printer"
  msgstr "Imprimante par défaut"
  
  #: plugins/personal/environment/class_environment.inc:1270
+#: plugins/personal/environment/class_environment.inc:1275
+#: plugins/personal/environment/class_environment.inc:1277
  msgid "Environment settings"
  msgstr "Préférences d'environnement"
  
-#: plugins/personal/environment/class_environment.inc:1277
+#: plugins/personal/environment/class_environment.inc:1280
  msgid "Command to extend the list of possible screen resolutions"
  msgstr "Commande pour étendre la liste des résolutions écrans possibles"
  
-#: plugins/personal/environment/class_environment.inc:1284
+#: plugins/personal/environment/class_environment.inc:1287
  msgid "Profile quota"
  msgstr "Quota du profil"
  
-#: plugins/personal/environment/class_environment.inc:1285
+#: plugins/personal/environment/class_environment.inc:1288
  msgid "Profile server"
  msgstr "Serveur de profil"
  
-#: plugins/personal/environment/class_environment.inc:1291
+#: plugins/personal/environment/class_environment.inc:1294
  #: plugins/personal/environment/logonManagement.tpl:56
  msgid "Logon script"
  msgstr "Script de démarrage"
@@ -3910,31 +3958,31 @@ msgstr "Nom du script"
  #: plugins/personal/environment/logonManagement.tpl:17
  #: plugins/personal/environment/hotplugDialogNew.tpl:17
  #: plugins/gofax/blocklists/generic.tpl:51
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:597
  #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
  #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:889
  #: plugins/admin/applications/generic.tpl:33
-#: plugins/admin/applications/class_applicationGeneric.inc:525
+#: plugins/admin/applications/class_applicationGeneric.inc:534
  #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/departments/class_departmentGeneric.inc:540
-#: plugins/admin/systems/class_winGeneric.inc:260
+#: plugins/admin/departments/class_departmentGeneric.inc:584
+#: plugins/admin/systems/class_winGeneric.inc:281
  #: plugins/admin/systems/server.tpl:14 plugins/admin/systems/phone.tpl:34
  #: plugins/admin/systems/printer.tpl:16
-#: plugins/admin/systems/class_servGeneric.inc:344
+#: plugins/admin/systems/class_servGeneric.inc:357
  #: plugins/admin/systems/wingeneric.tpl:25
  #: plugins/admin/systems/component.tpl:35
-#: plugins/admin/systems/class_printGeneric.inc:865
-#: plugins/admin/systems/class_componentGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_componentGeneric.inc:270
  #: plugins/admin/systems/servnfs.tpl:19
-#: plugins/admin/systems/class_phoneGeneric.inc:435
+#: plugins/admin/systems/class_phoneGeneric.inc:441
  #: plugins/admin/systems/class_goMailServer.inc:695
  #: plugins/admin/systems/class_goShareServer.inc:372
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:720
+#: plugins/admin/ogroups/class_ogroup.inc:703
  #: plugins/admin/fai/faiVariable.tpl:21
-#: plugins/admin/fai/class_faiScript.inc:527
-#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/class_faiScript.inc:538
+#: plugins/admin/fai/class_faiTemplate.inc:508
  #: plugins/admin/fai/faiPackage.tpl:21
  #: plugins/admin/fai/faiPartitionTable.tpl:21
  #: plugins/admin/fai/class_faiScriptEntry.inc:180
@@ -3942,7 +3990,7 @@ msgstr "Nom du script"
  #: plugins/admin/fai/class_faiPackage.inc:537
  #: plugins/admin/fai/class_faiProfile.inc:452
  #: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:21
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:464
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:13
  #: plugins/admin/fai/faiScript.tpl:21
  #: plugins/admin/fai/class_faiVariableEntry.inc:143
@@ -3951,16 +3999,16 @@ msgstr "Nom du script"
  #: plugins/admin/fai/class_faiPartitionTable.inc:529
  #: plugins/admin/fai/class_faiHookEntry.inc:189
  #: plugins/admin/fai/faiHookEntry.tpl:19
-#: plugins/admin/fai/class_faiVariable.inc:421
+#: plugins/admin/fai/class_faiVariable.inc:417
  #: plugins/admin/fai/class_faiTemplateEntry.inc:248
  #: plugins/admin/fai/faiTemplateEntry.tpl:13
-#: plugins/admin/mimetypes/generic.tpl:35
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:674
+#: plugins/admin/mimetypes/generic.tpl:34
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:682
  #: plugins/admin/mimetypes/paste_generic.tpl:21
  #: plugins/gofon/macro/generic.tpl:49
-#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/macro/class_gofonMacro.inc:498
  #: plugins/gofon/conference/generic.tpl:78
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
  #: plugins/generic/references/contents.tpl:11 html/getxls.php:158
  #: html/getxls.php:287
  msgid "Description"
@@ -3992,11 +4040,11 @@ msgstr "Le script peut être remplacé par l'utilisateur"
  #: plugins/admin/groups/application_options.tpl:11
  #: plugins/admin/users/class_userManagement.inc:654
  #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:503
+#: plugins/admin/systems/class_systemManagement.inc:651
  #: plugins/admin/systems/printerPPDDialog.tpl:22
  #: plugins/admin/systems/servRepositorySetup.tpl:54
-#: plugins/admin/ogroups/class_ogroupManagement.inc:304
-#: plugins/admin/fai/class_faiManagement.inc:616
+#: plugins/admin/ogroups/class_ogroupManagement.inc:299
+#: plugins/admin/fai/class_faiManagement.inc:626
  #: plugins/admin/fai/faiProfileEntry.tpl:70
  #: plugins/admin/fai/faiScriptEntry.tpl:82
  #: plugins/admin/fai/faiVariableEntry.tpl:54
@@ -4005,9 +4053,9 @@ msgstr "Le script peut être remplacé par l'utilisateur"
  #: plugins/admin/fai/faiPackageEntry.tpl:56
  #: plugins/admin/fai/faiPackageConfiguration.tpl:6
  #: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:340
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:342
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:260
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:253
  #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
  #: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
  msgid "Apply"
@@ -4101,7 +4149,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
-#: plugins/admin/fai/class_faiSummaryTab.inc:209
+#: plugins/admin/fai/class_faiSummaryTab.inc:236
  #: include/class_MultiSelectWindow.inc:81
  msgid "Close"
  msgstr "Fermer"
@@ -4111,37 +4159,37 @@ msgid "Nagios Account"
  msgstr "Compte Nagios"
  
  #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
  msgid "Alias"
  msgstr "Alias de l'utilisateur"
  
  #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:276
+#: plugins/personal/nagios/class_nagiosAccount.inc:277
  msgid "Host notification period"
  msgstr "Période de notification pour les systèmes"
  
  #: plugins/personal/nagios/nagios.tpl:40
-#: plugins/personal/nagios/class_nagiosAccount.inc:280
+#: plugins/personal/nagios/class_nagiosAccount.inc:281
  msgid "Service notification period"
  msgstr "Période de notification pour les services"
  
  #: plugins/personal/nagios/nagios.tpl:53
-#: plugins/personal/nagios/class_nagiosAccount.inc:279
+#: plugins/personal/nagios/class_nagiosAccount.inc:280
  msgid "Service notification options"
  msgstr "Options pour la période de notification pour les services"
  
  #: plugins/personal/nagios/nagios.tpl:66
-#: plugins/personal/nagios/class_nagiosAccount.inc:275
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
  msgid "Host notification options"
  msgstr "Options pour la notification des systèmes"
  
  #: plugins/personal/nagios/nagios.tpl:90
-#: plugins/personal/nagios/class_nagiosAccount.inc:278
+#: plugins/personal/nagios/class_nagiosAccount.inc:279
  msgid "Service notification commands"
  msgstr "Commandes pour la notification des services"
  
  #: plugins/personal/nagios/nagios.tpl:100
-#: plugins/personal/nagios/class_nagiosAccount.inc:274
+#: plugins/personal/nagios/class_nagiosAccount.inc:275
  msgid "Host notification commands"
  msgstr "Commandes pour la notification des systèmes"
  
@@ -4234,31 +4282,36 @@ msgstr "La suppression du compte nagios avec le dn '%s' à échoué."
  msgid "Nagios account settings"
  msgstr "Paramètres Nagios"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:282
+#: plugins/personal/nagios/class_nagiosAccount.inc:265
+#, fuzzy
+msgid "Nagios account"
+msgstr "Compte Nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:283
  msgid "View all hosts"
  msgstr "Voir tout les hôtes"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:283
+#: plugins/personal/nagios/class_nagiosAccount.inc:284
  msgid "View all services"
  msgstr "Voir tout les services"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:285
+#: plugins/personal/nagios/class_nagiosAccount.inc:286
  msgid "Trigger system commands"
  msgstr "Permettre les commandes systèmes"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:286
+#: plugins/personal/nagios/class_nagiosAccount.inc:287
  msgid "Trigger all host commands"
  msgstr "Permettre les commandes sur tout les hôtes"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:287
+#: plugins/personal/nagios/class_nagiosAccount.inc:288
  msgid "Trigger all service commands"
  msgstr "Permettre les commandes sur tout les services"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:289
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
  msgid "View configuration information"
  msgstr "Voir les informations de configuration"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:290
+#: plugins/personal/nagios/class_nagiosAccount.inc:291
  msgid "View system informations"
  msgstr "Voir les informations sur le système"
  
@@ -4267,7 +4320,7 @@ msgid "Nagios settings"
  msgstr "Paramètres Nagios"
  
  #: plugins/personal/netatalk/netatalk.tpl:4
-#: plugins/personal/netatalk/class_netatalk.inc:365
+#: plugins/personal/netatalk/class_netatalk.inc:366
  msgid "Share"
  msgstr "Partage"
  
@@ -4328,7 +4381,12 @@ msgstr "La sauvegarde du compte Netatalk avec le dn '%s' à échoué."
  msgid "Removing of user/netatalk account with dn '%s' failed."
  msgstr "La suppression du compte netatalk avec le dn '%s' à échoué."
  
-#: plugins/personal/netatalk/class_netatalk.inc:364
+#: plugins/personal/netatalk/class_netatalk.inc:360
+#, fuzzy
+msgid "Netatalk account"
+msgstr "Créer un compte Netatalk"
+
+#: plugins/personal/netatalk/class_netatalk.inc:365
  #, fuzzy
  msgid "User home path"
  msgstr "Chemin du Profile"
@@ -4362,9 +4420,9 @@ msgstr "Sélectionnez la branche où sera placée le groupe"
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
  #: plugins/admin/systems/class_goShareServer.inc:373
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
-#: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiSummaryTab.inc:345
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:136
  msgid "Type"
  msgstr "Type"
  
@@ -4388,13 +4446,15 @@ msgstr "Les nombres peuvent aussi contenir des jokers."
  #: plugins/gofax/blocklists/remove.tpl:2
  #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
  #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/systems/remove_ppd.tpl:2
  #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
  #: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
  #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
  #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:339 html/index.php:345
+#: html/index.php:49 html/index.php:337 html/index.php:343
  #: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/remove.tpl:2
  msgid "Warning"
@@ -4426,77 +4486,74 @@ msgid "Blocklist management"
  msgstr "Configuration des listes rouges"
  
  #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
  msgid "FAX Blocklists"
  msgstr "Liste Rouge des Fax"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:168
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:167
  #, php-format
  msgid "You're about to delete the blocklist '%s'."
  msgstr "Vous êtes sur le point de supprimer la liste rouge '%s'."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:185
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:184
  msgid "You have no permission to remove this blocklist."
  msgstr "Vous n'avez pas l'autorisation de supprimer cette liste rouge."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:200
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:199
  msgid "Please specify a valid phone number."
  msgstr "Veuillez entrer un numéro de téléphone valide."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "send"
  msgstr "envoyer"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "receive"
  msgstr "recevoir"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:435
  #, php-format
  msgid "Removing of blocklist with dn '%s' failed."
  msgstr "La suppression de l'objet liste rouge avec le dn '%s' à échoué."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:477
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr ""
-"Vous n'avez pas l'autorisation de créer une liste rouge sur cette 'Base'."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:482
-#: plugins/admin/departments/class_departmentGeneric.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:487
+#: plugins/admin/departments/class_departmentGeneric.inc:258
  msgid "Required field 'Name' is not set."
  msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:490
  msgid "Required field 'Name' contains invalid characters"
  msgstr "Le champ obligatoire 'Nom' contient des caractères invalides"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:497
  msgid "Specified name is already used."
  msgstr "Le nom spécifié est déjà utilisé."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:547
  #, php-format
  msgid "Saving of blocklist with dn '%s' failed."
  msgstr "La sauvegarde de l'objet liste rouge avec le dn '%s' à échoué."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
-msgid "Fax Blocklists"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
+#, fuzzy
+msgid "Fax blocklists"
  msgstr "Liste Rouge des Fax"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:596
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/addressbook/address_info.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:893
-#: plugins/admin/applications/class_applicationGeneric.inc:523
-#: plugins/admin/applications/class_applicationGeneric.inc:527
-#: plugins/admin/systems/class_terminalGeneric.inc:514
-#: plugins/admin/systems/class_servGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:863
-#: plugins/admin/systems/class_componentGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:887
+#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/systems/class_terminalGeneric.inc:554
+#: plugins/admin/systems/class_servGeneric.inc:356
+#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_componentGeneric.inc:268
  #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_phoneGeneric.inc:434
-#: plugins/admin/systems/class_servRepository.inc:358
+#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_servRepository.inc:374
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:105
@@ -4516,10 +4573,10 @@ msgstr "Liste Rouge des Fax"
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
  #: plugins/admin/systems/class_goShareServer.inc:370
  #: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:701
  #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
  #: plugins/admin/fai/faiPackage.tpl:9
  #: plugins/admin/fai/faiPartitionTable.tpl:9
  #: plugins/admin/fai/class_faiScriptEntry.inc:179
@@ -4527,7 +4584,7 @@ msgstr "Liste Rouge des Fax"
  #: plugins/admin/fai/class_faiPackage.inc:536
  #: plugins/admin/fai/class_faiProfile.inc:451
  #: plugins/admin/fai/class_faiHook.inc:535 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:454
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
  #: plugins/admin/fai/faiScript.tpl:9
  #: plugins/admin/fai/class_faiVariableEntry.inc:142
@@ -4536,23 +4593,23 @@ msgstr "Liste Rouge des Fax"
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
  #: plugins/admin/fai/class_faiHookEntry.inc:188
  #: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #: plugins/admin/fai/class_faiTemplateEntry.inc:247
  #: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:313
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
+#: plugins/admin/fai/class_faiSummaryTab.inc:340
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
  #: plugins/gofon/macro/parameter.tpl:6
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
  #: html/getxls.php:223 html/getxls.php:290
  msgid "Name"
  msgstr "Nom"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:599
  #, fuzzy
  msgid "Blocklist"
  msgstr "Listes Rouges"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:600
  msgid "Blocklist type"
  msgstr "Type de liste rouge"
  
@@ -4618,7 +4675,7 @@ msgstr "Afficher les listes rouges de correspondants"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -4629,242 +4686,107 @@ msgstr "Sélectionner pour chercher dans le sous arbre"
  msgid "Regular expression for matching list names"
  msgstr "Expression régulière pour trouver des listes correspondantes"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Go to root department"
-msgstr "Aller au département de base"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Root"
-msgstr "Racine"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-msgid "Go up one department"
-msgstr "Monter d'un département"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-#: include/class_acl.inc:368
-msgid "Up"
-msgstr "Au dessus"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Go to users department"
-msgstr "Aller au département des utilisateurs"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/fai/class_divListFai.inc:139
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Home"
-msgstr "Acceuil"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/fai/class_divListFai.inc:141
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/conference/class_divListConferences.inc:103
-msgid "Reload list"
-msgstr "Recharger la liste"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:142
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:103
-#: plugins/gofon/conference/class_divListConferences.inc:121
-msgid "Submit"
-msgstr "Soumettre"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  msgid "Create new blocklist"
  msgstr "Création d'un nouvelle liste rouge"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  msgid "New Blocklist"
  msgstr "Nouvelle listes rouges"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
  #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:121
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
  msgid "Submit department"
  msgstr "Soumettre le département"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/users/class_divListUsers.inc:255
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+#: include/class_MultiSelectWindow.inc:209
+msgid "Submit"
+msgstr "Soumettre"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:243
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
  #: plugins/admin/systems/glpiPrinter.tpl:18
  #: plugins/admin/systems/glpiPrinter.tpl:32 plugins/admin/systems/glpi.tpl:18
  #: plugins/admin/systems/glpi.tpl:32 plugins/admin/systems/glpi.tpl:46
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/acl/class_divListACL.inc:122
-#: plugins/admin/fai/class_faiScript.inc:283
-#: plugins/admin/fai/class_faiScript.inc:285
-#: plugins/admin/fai/class_faiTemplate.inc:257
-#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/acl/class_divListACL.inc:127
+#: plugins/admin/fai/class_faiScript.inc:293
+#: plugins/admin/fai/class_faiScript.inc:295
+#: plugins/admin/fai/class_faiTemplate.inc:270
+#: plugins/admin/fai/class_faiTemplate.inc:272
  #: plugins/admin/fai/class_faiHook.inc:294
  #: plugins/admin/fai/class_faiHook.inc:296
-#: plugins/admin/fai/class_divListFai.inc:241
-#: plugins/admin/fai/class_divListFai.inc:244
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/macro/class_divListMacros.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:159
-#: plugins/gofon/conference/class_divListConferences.inc:159
-#: include/class_acl.inc:370 include/class_acl.inc:415
+#: plugins/admin/fai/class_divListFai.inc:239
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/macro/class_divListMacros.inc:146
+#: plugins/gofon/conference/class_divListConferences.inc:155
+#: include/class_acl.inc:372 include/class_acl.inc:417
  msgid "edit"
  msgstr "éditer"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/users/class_divListUsers.inc:256
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/users/class_divListUsers.inc:244
  msgid "Edit user"
  msgstr "Editer un utilisateur"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:274
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/acl/class_divListACL.inc:125
-#: plugins/admin/fai/class_faiScript.inc:287
-#: plugins/admin/fai/class_faiTemplate.inc:261
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/addons/mailqueue/contents.tpl:94
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/users/class_divListUsers.inc:262
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/acl/class_divListACL.inc:131
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:274
  #: plugins/admin/fai/class_faiHook.inc:298
-#: plugins/admin/fai/class_divListFai.inc:252
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/macro/class_divListMacros.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:167
-#: plugins/gofon/conference/class_divListConferences.inc:169
-#: include/class_acl.inc:371 include/class_acl.inc:416
+#: plugins/admin/fai/class_divListFai.inc:250
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/macro/class_divListMacros.inc:154
+#: plugins/gofon/conference/class_divListConferences.inc:165
+#: include/class_acl.inc:373 include/class_acl.inc:418
  msgid "delete"
  msgstr "supprimer"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/admin/users/class_divListUsers.inc:263
  msgid "Delete user"
  msgstr "Supprimer un utilisateur"
  
@@ -4874,7 +4796,7 @@ msgid "Fax number for GOfax to trigger on"
  msgstr "Numéro de fax pour lesquels GOfax s'activera"
  
  #: plugins/gofax/faxaccount/generic.tpl:21
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
  #: plugins/admin/ogroups/phonequeue.tpl:47
  #: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
  #: html/getxls.php:281
@@ -4888,7 +4810,7 @@ msgstr ""
  "passerelle de messagerie"
  
  #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:831
  msgid "Delivery format"
  msgstr "Format de distribution"
  
@@ -4911,12 +4833,12 @@ msgid "Deliver fax as mail to"
  msgstr "Délivrer les fax comme des messages à"
  
  #: plugins/gofax/faxaccount/generic.tpl:70
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
  msgid "Deliver fax as mail"
  msgstr "Délivrer les fax comme des messages"
  
  #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:830
  msgid "Deliver fax to printer"
  msgstr "Imprimer directement les fax"
  
@@ -4983,15 +4905,15 @@ msgstr "Configuration du FAX"
  msgid "FAX"
  msgstr "FAX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
  msgid "This account has no fax extensions."
  msgstr "Ce compte n'a pas d'extensions FAX."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
  msgid "Remove fax account"
  msgstr "Supprimer le compte FAX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
  msgid ""
  "This account has fax features enabled. You can disable them by clicking "
  "below."
@@ -4999,11 +4921,11 @@ msgstr ""
  "Le fax est activée pour ce compte, vous pouvez le désactiver en cliquant sur "
  "le bouton ci-dessous."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
  msgid "Create fax account"
  msgstr "Créer un compte FAX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:159
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
  msgid ""
  "This account has fax features disabled. You can enable them by clicking "
  "below."
@@ -5011,40 +4933,40 @@ msgstr ""
  "Le fax est désactivé pour ce compte, vous pouvez l'activer en cliquant sur  "
  "le bouton ci-dessous."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:222
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:229
  msgid "You're trying to add an invalid phone number."
  msgstr "Vous essayez d'ajouter un numéro de téléphone invalide."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:512
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:438
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:519
  #: plugins/admin/groups/class_groupApplication.inc:674
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
  msgid "back"
  msgstr "retour"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:617
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
  #, php-format
  msgid "Removing of user/fax account with dn '%s' failed."
  msgstr "La suppression du compte fax avec le dn '%s' à échoué."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:632
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
  msgid "The required field 'Fax' is not set."
  msgstr "Le champ obligatoire 'Fax' n'est pas renseigné."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
  msgid "Please enter a valid telephone number in the 'Fax' field."
  msgstr "Veuillez entrer un numéro de téléphone valide dans le champ 'Fax'."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
  msgid "Mail delivery is checked, but no address has been specified."
  msgstr ""
  "La livraison par messagerie est activée, mais aucune adresse est spécifiée."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:646
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
  msgid "The mail address you've entered is invalid."
  msgstr "L'adresse de messagerie introduite est incorrecte."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
  msgid ""
  "Deliver fax to printer, is only possible if valid printer is given. Please "
  "correct your choice."
@@ -5052,28 +4974,28 @@ msgstr ""
  "La réception d'un fax sur une imprimante ne fonctionnera que si une "
  "imprimante valable est mentionnée. Veuillez corriger votre choix."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:737
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:744
  #, php-format
  msgid "Saving of user/fax account with dn '%s' failed."
  msgstr "La sauvegarde du compte fax avec le dn '%s' à échoué."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:808
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
  msgid "Fax account settings"
  msgstr "Configuration compte fax"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
  msgid "Enable/Disable fax"
  msgstr "Activer/désactiver le fax"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
  msgid "Receive blocklist"
  msgstr "Afficher les listes rouges de réception"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
  msgid "Send blocklist"
  msgstr "Afficher les listes rouges d'émission"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
  msgid "Alternate fax number"
  msgstr "Numéros de fax alternatif"
  
@@ -5089,7 +5011,7 @@ msgid "Filter"
  msgstr "Filtre"
  
  #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:109
  #: plugins/addons/logview/contents.tpl:47
  #: plugins/addons/mailqueue/contents.tpl:11
  #: plugins/gofon/fonreports/contents.tpl:6
@@ -5128,17 +5050,17 @@ msgstr "Recherche"
  
  #: plugins/gofax/faxreports/contents.tpl:30
  #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:842
-#: plugins/admin/ogroups/class_ogroupManagement.inc:351
+#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/ogroups/class_ogroupManagement.inc:346
  #: plugins/admin/fai/faiTemplateEntry.tpl:110
  msgid "User"
  msgstr "Utilisateur"
  
  #: plugins/gofax/faxreports/contents.tpl:31
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #: plugins/addons/logview/contents.tpl:84
  #: plugins/gofon/fonreports/contents.tpl:30
-#: plugins/gofon/fonreports/class_fonreport.inc:398
+#: plugins/gofon/fonreports/class_fonreport.inc:399
  msgid "Date"
  msgstr "Date"
  
@@ -5179,22 +5101,22 @@ msgid "Date / Time"
  msgstr "Date / Heure"
  
  #: plugins/gofax/faxreports/detail.tpl:29
-#: plugins/gofax/faxreports/class_faxreport.inc:484
+#: plugins/gofax/faxreports/class_faxreport.inc:489
  msgid "Sender MSN"
  msgstr "MSN de l'expéditeur"
  
  #: plugins/gofax/faxreports/detail.tpl:33
-#: plugins/gofax/faxreports/class_faxreport.inc:483
+#: plugins/gofax/faxreports/class_faxreport.inc:488
  msgid "Sender ID"
  msgstr "ID de l'expéditeur"
  
  #: plugins/gofax/faxreports/detail.tpl:37
-#: plugins/gofax/faxreports/class_faxreport.inc:486
+#: plugins/gofax/faxreports/class_faxreport.inc:491
  msgid "Receiver MSN"
  msgstr "MSN du correspondant"
  
  #: plugins/gofax/faxreports/detail.tpl:41
-#: plugins/gofax/faxreports/class_faxreport.inc:485
+#: plugins/gofax/faxreports/class_faxreport.inc:490
  msgid "Receiver ID"
  msgstr "ID du correspondant"
  
@@ -5203,7 +5125,7 @@ msgid "Status message"
  msgstr "Statut"
  
  #: plugins/gofax/faxreports/detail.tpl:53
-#: plugins/gofax/faxreports/class_faxreport.inc:489
+#: plugins/gofax/faxreports/class_faxreport.inc:494
  msgid "Transfer time"
  msgstr "Temps de transfert"
  
@@ -5215,57 +5137,57 @@ msgstr "Rapports des Fax"
  msgid "FAX Reports"
  msgstr "Rapports des Fax"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:108
  msgid ""
  "No fax extension defined in your server configuration, no reports can be "
  "shown!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: plugins/gofax/faxreports/class_faxreport.inc:111
  #: plugins/addons/logview/class_logview.inc:75
  #: plugins/gofon/fonreports/class_fonreport.inc:163
  msgid "There is no mysql extension available, please check your php setup."
  msgstr ""
  "Il n'y a pas d'extension msql disponible, vérifiez votre configuration php."
  
-#: plugins/gofax/faxreports/class_faxreport.inc:117
+#: plugins/gofax/faxreports/class_faxreport.inc:118
  msgid "Can't connect to fax database, no reports can be shown!"
  msgstr ""
  "Impossible de se connecter à la base de données des fax, aucun rapport ne "
  "peut être affiché!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:121
+#: plugins/gofax/faxreports/class_faxreport.inc:122
  msgid "Can't select fax database for report generation!"
  msgstr ""
  "Impossible de sélectionner la base de données fax pour la génération de "
  "rapports!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:126
+#: plugins/gofax/faxreports/class_faxreport.inc:127
  #, fuzzy
  msgid "Can't query fax table 'faxlog' for report generation!"
  msgstr ""
  "Impossible de sélectionner la base de données fax pour la génération de "
  "rapports!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:149
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:150
+#: plugins/gofax/faxreports/class_faxreport.inc:290
  msgid "Query for fax database failed!"
  msgstr "La requête sur la base de données des fax a échoué!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:158
-#: plugins/gofax/faxreports/class_faxreport.inc:168
+#: plugins/gofax/faxreports/class_faxreport.inc:159
+#: plugins/gofax/faxreports/class_faxreport.inc:169
  msgid "You have no permission to retrieve informations about this fax id!"
  msgstr ""
  "Vous n'avez pas l'autorisation de récupérer les informations à propos de "
  "l'identifiant de ce fax!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:196
-#: plugins/gofax/faxreports/class_faxreport.inc:311
-#: plugins/gofon/fonreports/class_fonreport.inc:221
+#: plugins/gofax/faxreports/class_faxreport.inc:200
+#: plugins/gofax/faxreports/class_faxreport.inc:315
+#: plugins/gofon/fonreports/class_fonreport.inc:223
  msgid "Y-M-D"
  msgstr "A-M-J"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions to view this attribute"
@@ -5273,42 +5195,48 @@ msgstr ""
  "Permissions insuffisantes, vous ne pouvez pas changer l'attribut '%s' dans "
  "la macro goFonMacro"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/admin/groups/class_groupApplication.inc:427
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions"
  msgstr "Permissions du fichier"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:469
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:473
+#: plugins/gofax/faxreports/class_faxreport.inc:474
  msgid "Fax report"
  msgstr "Rapport des Fax"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:474
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  msgid "All entries are readonly"
  msgstr ""
  
  #: plugins/gofax/faxreports/class_faxreport.inc:479
+#, fuzzy
+msgid "Fax reports"
+msgstr "Rapport des Fax"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:484
  msgid "Detailed view"
  msgstr "Vue détaillée"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:480
+#: plugins/gofax/faxreports/class_faxreport.inc:485
  #, fuzzy
  msgid "Fax ID"
  msgstr "FAX ID"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #, fuzzy
  msgid "Time"
  msgstr "Mime"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:487
+#: plugins/gofax/faxreports/class_faxreport.inc:492
  #, fuzzy
  msgid "Number of pages"
  msgstr "Nom du département"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:488
+#: plugins/gofax/faxreports/class_faxreport.inc:493
  #, fuzzy
  msgid "Status Message"
  msgstr "Statut"
@@ -5338,45 +5266,45 @@ msgstr ""
  msgid "Add entry"
  msgstr "Ajouter une entrée"
  
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:54
  #: plugins/admin/groups/class_groupApplication.inc:756
  msgid "Edit entry"
  msgstr "Modifier une entrée"
  
-#: plugins/addons/addressbook/contents.tpl:55
+#: plugins/addons/addressbook/contents.tpl:58
  msgid "Remove entry"
  msgstr "Supprimer une entrée"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Select to see regular users"
  msgstr "Sélectionnez afin d'afficher les utilisateurs habituels"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Show organizational entries"
  msgstr "Afficher les entrées de l'organisation"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Select to see users in addressbook"
  msgstr ""
  "Sélectionner pour afficher les utilisateurs présent dans le carnet d'adresse"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Show addressbook entries"
  msgstr "Afficher les entrées du carnet d'adresses"
  
-#: plugins/addons/addressbook/contents.tpl:81
+#: plugins/addons/addressbook/contents.tpl:84
  msgid "Display results for department"
  msgstr "Afficher les résultats pour le département"
  
-#: plugins/addons/addressbook/contents.tpl:94
+#: plugins/addons/addressbook/contents.tpl:97
  msgid "Match object"
  msgstr "Objet correspondant"
  
-#: plugins/addons/addressbook/contents.tpl:97
+#: plugins/addons/addressbook/contents.tpl:100
  msgid "Choose the object that will be searched in"
  msgstr "Indiquez l'objet dans lequel la recherche sera effectuée"
  
-#: plugins/addons/addressbook/contents.tpl:109
+#: plugins/addons/addressbook/contents.tpl:112
  msgid "Search string"
  msgstr "Phrase de recherche"
  
@@ -5385,10 +5313,10 @@ msgid "Dial connection..."
  msgstr "Appel en cours ..."
  
  #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:427
-#: plugins/addons/addressbook/class_addressbook.inc:434
-#: plugins/addons/addressbook/class_addressbook.inc:438
-#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/addons/addressbook/class_addressbook.inc:429
+#: plugins/addons/addressbook/class_addressbook.inc:436
+#: plugins/addons/addressbook/class_addressbook.inc:440
+#: plugins/addons/addressbook/class_addressbook.inc:553
  msgid "Dial"
  msgstr "Appeler"
  
@@ -5413,7 +5341,7 @@ msgid "Personal"
  msgstr "Personnel"
  
  #: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/class_addressbook.inc:807
  #: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
  #: html/getxls.php:298
  msgid "Initials"
@@ -5443,26 +5371,26 @@ msgstr "Ville"
  
  #: plugins/addons/addressbook/address_edit.tpl:191
  #: plugins/addons/addressbook/address_info.tpl:141
-#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_departmentGeneric.inc:585
  msgid "Country"
  msgstr "Pays"
  
-#: plugins/addons/addressbook/main.inc:35
+#: plugins/addons/addressbook/main.inc:36
  msgid "Address book"
  msgstr "Carnet d'adresses"
  
  #: plugins/addons/addressbook/class_addressbook.inc:6
-#: plugins/addons/addressbook/class_addressbook.inc:781
-#: plugins/addons/addressbook/class_addressbook.inc:787
+#: plugins/addons/addressbook/class_addressbook.inc:783
+#: plugins/addons/addressbook/class_addressbook.inc:789
  msgid "Addressbook"
  msgstr "Carnet d'adresses"
  
-#: plugins/addons/addressbook/class_addressbook.inc:172
+#: plugins/addons/addressbook/class_addressbook.inc:173
  #, php-format
  msgid "Dial from %s to %s now?"
  msgstr "Appeler de %s vers %s maintenant ?"
  
-#: plugins/addons/addressbook/class_addressbook.inc:176
+#: plugins/addons/addressbook/class_addressbook.inc:177
  msgid ""
  "You have no personal phone number set. Please change that in order to "
  "perform direct dials."
@@ -5470,50 +5398,50 @@ msgstr ""
  "Vous n'avez pas de numéro de téléphone personnel indiqué. Veuillez rectifier "
  "cela en vue de pouvoir faire des appels directs."
  
-#: plugins/addons/addressbook/class_addressbook.inc:202
-#: plugins/addons/addressbook/class_addressbook.inc:751
+#: plugins/addons/addressbook/class_addressbook.inc:203
+#: plugins/addons/addressbook/class_addressbook.inc:753
  #, php-format
  msgid "Removing of addressbook entry '%s' failed."
  msgstr "La suppression de l'entrée du carnet d'adresses '%s' à échoué."
  
-#: plugins/addons/addressbook/class_addressbook.inc:209
-#: plugins/addons/addressbook/class_addressbook.inc:318
+#: plugins/addons/addressbook/class_addressbook.inc:210
+#: plugins/addons/addressbook/class_addressbook.inc:319
  msgid "You are not allowed to delete this entry!"
  msgstr "Vous n'êtes pas autorisé à supprimer cette entrée!"
  
-#: plugins/addons/addressbook/class_addressbook.inc:312
+#: plugins/addons/addressbook/class_addressbook.inc:313
  #, php-format
  msgid "You're about to delete the entry %s."
  msgstr "Vous êtes sur le point de supprimer l'entrée %s."
  
-#: plugins/addons/addressbook/class_addressbook.inc:444
+#: plugins/addons/addressbook/class_addressbook.inc:446
  #, php-format
  msgid "Save contact for %s as vcard"
  msgstr "Enregistrer le contact %s au format vcard"
  
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: plugins/addons/addressbook/class_addressbook.inc:452
  #, php-format
  msgid "Send mail to %s"
  msgstr "Envoyer un message à %s"
  
-#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:565
  msgid "global addressbook"
  msgstr "Carnet d'adresses général"
  
-#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/addons/addressbook/class_addressbook.inc:568
  msgid "user database"
  msgstr "Base de données des utilisateurs"
  
-#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/addons/addressbook/class_addressbook.inc:572
  #, php-format
  msgid "Contact stored in '%s'"
  msgstr "Contact enregistré dans '%s'"
  
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/addons/addressbook/class_addressbook.inc:574
  msgid "Creating new entry in"
  msgstr "Création d'une nouvelle entrée dans"
  
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/logview/class_logview.inc:112
  #: plugins/addons/logview/class_logview.inc:133
  #: plugins/addons/mailqueue/class_mailqueue.inc:306
@@ -5521,35 +5449,35 @@ msgstr "Création d'une nouvelle entrée dans"
  msgid "All"
  msgstr "Tout"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Work phone"
  msgstr "Téléphone du bureau"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Cell phone"
  msgstr "GSM"
  
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:223
  msgid "Home phone"
  msgstr "Téléphone personnel"
  
-#: plugins/addons/addressbook/class_addressbook.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:704
  msgid ""
  "Cannot create a unique DN for your entry. Please fill more formular fields."
  msgstr ""
  "Impossible de créer un DN unique pour cette entrée. Veuillez remplir plus de "
  "champs."
  
-#: plugins/addons/addressbook/class_addressbook.inc:782
+#: plugins/addons/addressbook/class_addressbook.inc:784
  #, fuzzy
  msgid "Addressbook entry acls"
  msgstr "Afficher les entrées du carnet d'adresses"
  
-#: plugins/addons/addressbook/class_addressbook.inc:806 html/getxls.php:301
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:301
  msgid "Title"
  msgstr "Titre"
  
-#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: plugins/addons/addressbook/class_addressbook.inc:810 html/getxls.php:169
  #: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
  msgid "Common name"
  msgstr "Nom complet"
@@ -5751,12 +5679,12 @@ msgid "CSV import"
  msgstr "Importer un fichier CSV"
  
  #: plugins/addons/ldapmanager/class_export.inc:77
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:91
  msgid "Error while exporting the requested entries!"
  msgstr "Une erreur s'est produite lors de l'exportation!"
  
  #: plugins/addons/ldapmanager/class_export.inc:89
-#: plugins/addons/ldapmanager/class_exportxls.inc:102
+#: plugins/addons/ldapmanager/class_exportxls.inc:104
  #, fuzzy, php-format
  msgid "You are not allowed to export the given ldap entry (%s)"
  msgstr "Vous n'êtes pas autorisé à supprimer cette entrée!"
@@ -5984,40 +5912,40 @@ msgstr "Erreur"
  msgid "Active"
  msgstr "Actif"
  
-#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/addons/mailqueue/contents.tpl:94
  msgid "Delete this message"
  msgstr "Supprimer ce message"
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "unhold"
  msgstr "enlever de la file d'attente"
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "Release message"
  msgstr "Enlever le message de la file d'attente"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  msgid "hold"
  msgstr "mettre dans la file d'attente"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  #: plugins/addons/mailqueue/class_mailqueue.inc:398
  msgid "Hold message"
  msgstr "Mettre en attente"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "requeue"
  msgstr "remettre dans la queue"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "Requeue this message"
  msgstr "Remettre ce message dans la queue"
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  msgid "header"
  msgstr "entête"
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  msgid "Display header from this message"
  msgstr "Afficher l'entête de ce message"
  
@@ -6194,16 +6122,35 @@ msgstr "Pas d'entrée DFS trouvée"
  msgid "Go up one dfsshare"
  msgstr "Monter d'un partage DFS"
  
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:370
+#: include/class_MultiSelectWindow.inc:194
+#: include/class_MultiSelectWindow.inc:196
+msgid "Up"
+msgstr "Au dessus"
+
  #: plugins/addons/godfs/class_dfsManagment.inc:214
  msgid "Go to dfs root"
  msgstr "Aller au répertoire de base de DFS"
  
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+#: include/class_MultiSelectWindow.inc:188
+msgid "Root"
+msgstr "Racine"
+
  #: plugins/addons/godfs/class_dfsManagment.inc:215
  msgid "Create new dfsshare"
  msgstr "Création d'un nouveau share dfs"
  
  #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:22
+#: ihtml/themes/default/copyPasteDialog.tpl:28
  msgid "Finish"
  msgstr "Terminé"
  
@@ -6253,7 +6200,7 @@ msgstr "Notifications"
  
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:890 include/class_acl.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:884 include/class_acl.inc:164
  #: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
  msgid "Groups"
  msgstr "Groupes"
@@ -6267,12 +6214,12 @@ msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
  msgstr "Aucune définition de NOTIFY_COMMAND n'est présente dans gosa.conf"
  
  #: plugins/addons/notifications/class_msgplug.inc:116
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/systems/class_terminalGeneric.inc:207
-#: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/systems/class_workstationGeneric.inc:161
-#: plugins/admin/ogroups/class_termgroup.inc:210
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_servGeneric.inc:92
+#: plugins/admin/systems/class_workstationGeneric.inc:167
+#: plugins/admin/ogroups/class_termgroup.inc:209
  #, php-format
  msgid "Execution of '%s' failed!"
  msgstr "L'exécution de '%s' a échoué!"
@@ -6330,19 +6277,19 @@ msgstr ""
  
  #: plugins/addons/notifications/contents.tpl:74
  #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:433
-#: plugins/admin/departments/class_departmentGeneric.inc:518
+#: plugins/admin/departments/class_departmentGeneric.inc:469
+#: plugins/admin/departments/class_departmentGeneric.inc:561
  #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/ServiceAddDialog.tpl:29
-#: plugins/admin/fai/class_faiManagement.inc:447
-#: plugins/admin/fai/class_faiManagement.inc:623
-#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/systems/ServiceAddDialog.tpl:28
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/admin/fai/class_faiManagement.inc:633
+#: plugins/admin/fai/class_faiManagement.inc:639
  #: plugins/admin/fai/faiPackageNew.tpl:50
  #: ihtml/themes/default/setup_introduction.tpl:12
  #: ihtml/themes/default/setup_useradmin.tpl:41
  #: ihtml/themes/default/setup_step2.tpl:13
  #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/default/snapshotdialog.tpl:78
+#: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Continuer"
  
@@ -6464,32 +6411,32 @@ msgstr ""
  msgid "This 'dn' is no group."
  msgstr "Ce 'dn' n'est pas un groupe."
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Samba group"
  msgstr "Groupe Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain admins"
  msgstr "Administrateurs du domaine"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain users"
  msgstr "Utilisateurs du domaine"
  
-#: plugins/admin/groups/class_groupGeneric.inc:328
+#: plugins/admin/groups/class_groupGeneric.inc:319
  msgid "Domain guests"
  msgstr "Invités du domaine"
  
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:324
  #, php-format
  msgid "Special group (%d)"
  msgstr "Groupe spécial (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:446
+#: plugins/admin/groups/class_groupGeneric.inc:437
  msgid "! unknown id"
  msgstr "! identifiant inconnu"
  
-#: plugins/admin/groups/class_groupGeneric.inc:483
+#: plugins/admin/groups/class_groupGeneric.inc:474
  #, php-format
  msgid ""
  "Your search method returned more than '%s' users, only '%s' users are shown."
@@ -6497,29 +6444,23 @@ msgstr ""
  "'%s' utilisateurs ont été trouvé grâce à votre recherche, les '%s' premiers "
  "seront montrés."
  
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/admin/groups/class_groupGeneric.inc:720
+#: plugins/admin/groups/class_groupGeneric.inc:503
+#: plugins/admin/groups/class_groupGeneric.inc:718
  #, fuzzy, php-format
  msgid "Removing of groups/generic with dn '%s' failed."
  msgstr "La suppression de l'application du groupe '%s' à échoué"
  
-#: plugins/admin/groups/class_groupGeneric.inc:630
+#: plugins/admin/groups/class_groupGeneric.inc:628
  #, php-format
  msgid "No configured SID found for '%s'."
  msgstr "Pas de SID trouvé pour '%s'."
  
-#: plugins/admin/groups/class_groupGeneric.inc:635
+#: plugins/admin/groups/class_groupGeneric.inc:633
  #, php-format
  msgid "No configured RIDBASE found for '%s'."
  msgstr "Pas de RIDBASE trouvé pour '%s'"
  
-#: plugins/admin/groups/class_groupGeneric.inc:746
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/ogroups/class_ogroup.inc:608
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation de créer un groupe dans cette 'Base'."
-
-#: plugins/admin/groups/class_groupGeneric.inc:756
+#: plugins/admin/groups/class_groupGeneric.inc:750
  msgid ""
  "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
@@ -6527,43 +6468,43 @@ msgstr ""
  "Le champ 'Nom' contient des caractères invalides. Minuscule, chiffre et "
  "tirets sont valides."
  
-#: plugins/admin/groups/class_groupGeneric.inc:767
-#: plugins/admin/groups/class_groupGeneric.inc:781
-#: plugins/admin/groups/class_groupGeneric.inc:788
+#: plugins/admin/groups/class_groupGeneric.inc:761
+#: plugins/admin/groups/class_groupGeneric.inc:775
+#: plugins/admin/groups/class_groupGeneric.inc:782
  msgid "Value specified as 'Name' is already used."
  msgstr "La valeur spécifiée dans le champs 'Nom' existe déjà."
  
-#: plugins/admin/groups/class_groupGeneric.inc:885
+#: plugins/admin/groups/class_groupGeneric.inc:879
  #, fuzzy
  msgid "Generic group settings"
  msgstr "Paramètres par défaut des queues"
  
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:891
  #, fuzzy
  msgid "Phone pickup group"
  msgstr "Les membres sont dans un groupe téléphonique"
  
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, fuzzy
  msgid "Nagios group"
  msgstr "Compte Nagios"
  
-#: plugins/admin/groups/class_groupGeneric.inc:901
+#: plugins/admin/groups/class_groupGeneric.inc:895
  #, fuzzy
  msgid "Group member"
  msgstr "Membre du groupe"
  
-#: plugins/admin/groups/class_groupGeneric.inc:902
+#: plugins/admin/groups/class_groupGeneric.inc:896
  #, fuzzy
  msgid "Samba group type"
  msgstr "Groupe Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:903
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Répertoire de l'utilisateur samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:904
+#: plugins/admin/groups/class_groupGeneric.inc:898
  #, fuzzy
  msgid "Samba SID"
  msgstr "Samba"
@@ -6588,8 +6529,8 @@ msgstr "Ajouter une catégorie"
  msgid "Available applications"
  msgstr "Applications disponibles"
  
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:565
-#: include/class_acl.inc:656
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:597
+#: include/class_acl.inc:688
  msgid "read"
  msgstr "lecture"
  
@@ -6605,8 +6546,8 @@ msgstr "envoi externe"
  msgid "append"
  msgstr "ajouter"
  
-#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:566
-#: include/class_acl.inc:658
+#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:598
+#: include/class_acl.inc:690
  msgid "write"
  msgstr "écrire"
  
@@ -6631,51 +6572,51 @@ msgstr "Vous essayez d'ajouter une adresse mail non valide "
  msgid "to the list of forwarders."
  msgstr "liste des personnes vers lesquelles les mails seront relayés."
  
-#: plugins/admin/groups/class_groupMail.inc:672
+#: plugins/admin/groups/class_groupMail.inc:679
  #, fuzzy, php-format
  msgid "Removing of groups/mail with dn '%s' failed."
  msgstr "La suppression des paramètres de messagerie pour le groupe à échoué"
  
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/groups/class_groupMail.inc:861
  #, fuzzy, php-format
  msgid "Saving of groups/mail with dn '%s' failed."
  msgstr "La sauvegarde des paramètres de messagerie pour le groupe à échoué"
  
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/admin/groups/class_groupMail.inc:890
  msgid "Please enter a valid email addres in 'Primary address' field."
  msgstr ""
  "Veuillez entrer une adresse de messagerie valide dans le champ 'Adresse "
  "principale'."
  
-#: plugins/admin/groups/class_groupMail.inc:916
+#: plugins/admin/groups/class_groupMail.inc:923
  msgid ""
  "Please choose valid permission settings. Default permission can't be emtpy."
  msgstr ""
  "Veuillez choisir des permissions valables. Les permissions par défaut ne "
  "peuvent pas être vides."
  
-#: plugins/admin/groups/class_groupMail.inc:920
+#: plugins/admin/groups/class_groupMail.inc:927
  msgid "Please select a valid mail server."
  msgstr "Veuillez sélectionner un serveur de messagerie valide."
  
-#: plugins/admin/groups/class_groupMail.inc:1067
+#: plugins/admin/groups/class_groupMail.inc:1074
  #, fuzzy
  msgid "Group mail"
  msgstr "Nom du groupe"
  
-#: plugins/admin/groups/class_groupMail.inc:1075
+#: plugins/admin/groups/class_groupMail.inc:1082
  #, fuzzy
  msgid "Alternate addresses"
  msgstr "Adresses alternatives"
  
-#: plugins/admin/groups/class_groupMail.inc:1076
+#: plugins/admin/groups/class_groupMail.inc:1083
  #, fuzzy
  msgid "Forwarding addresses"
  msgstr "Adresse principale"
  
-#: plugins/admin/groups/class_groupMail.inc:1079
+#: plugins/admin/groups/class_groupMail.inc:1086
  #: plugins/admin/systems/printer.tpl:82
-#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_printGeneric.inc:873
  msgid "Permissions"
  msgstr "Permissions"
  
@@ -6744,7 +6685,9 @@ msgstr ""
  "en cliquant sur le bouton ci-dessous."
  
  #: plugins/admin/groups/class_groupApplication.inc:426
-#: include/class_tabs.inc:303
+#: plugins/admin/acl/class_aclManagement.inc:424
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430 include/class_tabs.inc:303
  msgid "ACL"
  msgstr "ACL"
  
@@ -6772,7 +6715,7 @@ msgid "The selected application has no options."
  msgstr "L'application sélectionnée n'a pas d'options."
  
  #: plugins/admin/groups/class_groupApplication.inc:682
-#: plugins/admin/departments/class_divListDepartment.inc:154
+#: plugins/admin/departments/class_divListDepartment.inc:147
  msgid "department"
  msgstr "département"
  
@@ -6847,11 +6790,11 @@ msgid "Group applications"
  msgstr "Afficher les applications"
  
  #: plugins/admin/groups/class_groupApplication.inc:1173
-#: plugins/admin/groups/class_divListGroup.inc:176
-#: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:353
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
+#: plugins/admin/groups/class_divListGroup.inc:184
+#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/ogroups/class_ogroupManagement.inc:348
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:684
  #: plugins/gofon/fonreports/contents.tpl:34
  #: plugins/generic/references/class_reference.inc:42
  msgid "Application"
@@ -6861,7 +6804,7 @@ msgstr "Applications"
  #: plugins/admin/systems/workstationStartup.tpl:53
  #: plugins/admin/systems/workstationStartup.tpl:87
  #: plugins/admin/systems/servRepositorySetup.tpl:19
-#: plugins/admin/systems/class_servRepository.inc:238
+#: plugins/admin/systems/class_servRepository.inc:252
  #: plugins/admin/fai/faiPackage.tpl:37
  #: plugins/admin/fai/class_faiPackage.inc:542
  #: plugins/admin/fai/faiPackageNew.tpl:21
@@ -6953,58 +6896,58 @@ msgstr "Afficher les groupes fonctionnels"
  msgid "Create new group"
  msgstr "Créer un nouveau groupe"
  
-#: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:175
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  msgid "cut"
  msgstr "couper"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  msgid "Cut this entry"
  msgstr "Couper cette entrée"
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "copy"
  msgstr "copier"
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "Copy this entry"
  msgstr "Copier cette entrée"
  
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/conference/class_divListConferences.inc:159
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/conference/class_divListConferences.inc:155
  msgid "Edit this entry"
  msgstr "Modifier cette entrée"
  
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/conference/class_divListConferences.inc:169
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/conference/class_divListConferences.inc:165
  msgid "Delete this entry"
  msgstr "Supprimer cette entrée"
  
@@ -7055,7 +6998,7 @@ msgstr "Vous n'êtes pas autorisé à supprimer cette utilisateur!"
  #: plugins/admin/users/class_userManagement.inc:449
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
  #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:288
  msgid "none"
  msgstr "aucun"
  
@@ -7083,8 +7026,8 @@ msgstr ""
  "Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:812
-#: plugins/admin/fai/class_faiTemplate.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:997
+#: plugins/admin/fai/class_faiTemplate.inc:499
  msgid "Template"
  msgstr "Modèle"
  
@@ -7165,111 +7108,111 @@ msgstr "Sélectionnez afin d'afficher les utilisateurs ayant un compte proxy"
  msgid "Show proxy users"
  msgstr "Afficher les utilisateurs proxy"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  msgid "Create new user"
  msgstr "Création d'un nouvel utilisateur"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  msgid "New user"
  msgstr "Nouvel utilisateur"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "Create new template"
  msgstr "Créer un nouveau modèle"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "New template"
  msgstr "Nouveau modèle"
  
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:173
  msgid "GOsa"
  msgstr "GOsa"
  
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:174
  msgid "Edit generic properties"
  msgstr "Modifier les propriétés de base"
  
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:176
  msgid "Edit UNIX properties"
  msgstr "Modifier les propriétés UNIX"
  
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:178
  msgid "Edit environment properties"
  msgstr "Modifier les propriétés d'environnement"
  
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:180
  msgid "Edit mail properties"
  msgstr "Modifier les propriétés de messagerie"
  
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:182
  msgid "Edit phone properties"
  msgstr "Modifier les propriétés téléphoniques"
  
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:184
  msgid "Edit fax properies"
  msgstr "Modifier les propriétés fax"
  
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:186
  msgid "Edit samba properties"
  msgstr "Modifier les propriétés samba"
  
-#: plugins/admin/users/class_divListUsers.inc:200
+#: plugins/admin/users/class_divListUsers.inc:188
  msgid "Edit netatalk properties"
  msgstr "Modifier les propriétés de Netatalk"
  
-#: plugins/admin/users/class_divListUsers.inc:201
+#: plugins/admin/users/class_divListUsers.inc:189
  msgid "Create user from template"
  msgstr "Créer un nouvel utilisateur depuis un modèle"
  
-#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/users/class_divListUsers.inc:190
  msgid "Create user with this template"
  msgstr "Créer un nouvel utilisateur avec ce modèle"
  
-#: plugins/admin/users/class_divListUsers.inc:260
+#: plugins/admin/users/class_divListUsers.inc:248
  msgid "password"
  msgstr "mot de passe"
  
-#: plugins/admin/users/class_divListUsers.inc:264
+#: plugins/admin/users/class_divListUsers.inc:252
  #, fuzzy
  msgid "You are not allowed to change the password for this user."
  msgstr "Vous n'êtes pas autorisé à modifier votre mot de passe en ce moment"
  
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:266
  #, fuzzy
  msgid "You are not allowed to remove this user."
  msgstr "Vous n'êtes pas autorisé à supprimer cette utilisateur!"
  
-#: plugins/admin/users/class_divListUsers.inc:297
+#: plugins/admin/users/class_divListUsers.inc:285
  msgid "Online"
  msgstr "En ligne"
  
-#: plugins/admin/users/class_divListUsers.inc:304
+#: plugins/admin/users/class_divListUsers.inc:292
  msgid "Offline"
  msgstr "Hors-ligne"
  
  #: plugins/admin/applications/generic.tpl:7
  #: plugins/admin/applications/generic.tpl:10
-#: plugins/admin/applications/class_applicationGeneric.inc:486
+#: plugins/admin/applications/class_applicationGeneric.inc:495
  #: plugins/admin/applications/class_divListApplication.inc:51
  msgid "Application name"
  msgstr "Nom de l'application"
  
  #: plugins/admin/applications/generic.tpl:15
  #: plugins/gofon/macro/generic.tpl:14
-#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: plugins/gofon/macro/class_gofonMacro.inc:499 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Display name"
  msgstr "Nom à afficher"
  
  #: plugins/admin/applications/generic.tpl:19
-#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/applications/class_applicationGeneric.inc:500
  msgid "Application name to be displayed (i.e. below icons)"
  msgstr "Le nom de l'application à afficher (ex: en dessous des icônes)"
  
  #: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/applications/class_applicationGeneric.inc:526
-#: plugins/admin/systems/terminal.tpl:149 plugins/admin/systems/server.tpl:73
-#: plugins/admin/systems/workstation.tpl:124
+#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/systems/terminal.tpl:153 plugins/admin/systems/server.tpl:74
+#: plugins/admin/systems/workstation.tpl:127
  #: plugins/admin/systems/goMailServer.tpl:215
  #: plugins/admin/systems/goImapServer.tpl:110
  #: plugins/admin/ogroups/termgroup.tpl:101
@@ -7289,9 +7232,9 @@ msgstr ""
  "l'application"
  
  #: plugins/admin/applications/generic.tpl:66
-#: plugins/admin/applications/class_applicationGeneric.inc:528
+#: plugins/admin/applications/class_applicationGeneric.inc:537
  #: plugins/admin/mimetypes/generic.tpl:67
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:678
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:686
  msgid "Icon"
  msgstr "Icône"
  
@@ -7304,41 +7247,46 @@ msgstr "Mise à Jour"
  msgid "Reload picture from LDAP"
  msgstr "Recharger l'image à partir de l'annuaire LDAP"
  
-#: plugins/admin/applications/generic.tpl:96
-#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/generic.tpl:81
+#, fuzzy
+msgid "Remove picture from LDAP"
+msgstr "Recharger l'image à partir de l'annuaire LDAP"
+
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/applications/class_applicationGeneric.inc:541
  msgid "Only executable for members"
  msgstr "Exécutable uniquement par les membres"
  
-#: plugins/admin/applications/generic.tpl:101
-#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/applications/generic.tpl:104
+#: plugins/admin/applications/class_applicationGeneric.inc:545
  msgid "Replace user configuration on startup"
  msgstr "Remplacer la configuration de l'utilisateur au démarrage"
  
-#: plugins/admin/applications/generic.tpl:107
-#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/generic.tpl:110
+#: plugins/admin/applications/class_applicationGeneric.inc:542
  msgid "Place icon on members desktop"
  msgstr "Placer une icône sur le bureau des membres"
  
-#: plugins/admin/applications/generic.tpl:112
-#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/applications/generic.tpl:115
+#: plugins/admin/applications/class_applicationGeneric.inc:544
  msgid "Place entry in members startmenu"
  msgstr "Placer une entrée dans le menu démarrage des membres"
  
-#: plugins/admin/applications/generic.tpl:117
-#: plugins/admin/applications/class_applicationGeneric.inc:534
+#: plugins/admin/applications/generic.tpl:120
+#: plugins/admin/applications/class_applicationGeneric.inc:543
  msgid "Place entry in members launch bar"
  msgstr "Placer une entrée dans le menu démarrage des membres"
  
-#: plugins/admin/applications/generic.tpl:135
+#: plugins/admin/applications/generic.tpl:138
  #: plugins/admin/systems/printerPPDDialog.tpl:11
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
  #: plugins/admin/fai/faiTemplateEntry.tpl:49
  msgid "Upload"
  msgstr "Télécharger"
  
-#: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:297
-#: plugins/admin/fai/class_faiTemplate.inc:271
+#: plugins/admin/applications/generic.tpl:140
+#: plugins/admin/fai/class_faiScript.inc:307
+#: plugins/admin/fai/class_faiTemplate.inc:284
  #: plugins/admin/fai/class_faiScriptEntry.inc:89
  #: plugins/admin/fai/class_faiHook.inc:308
  #: plugins/admin/fai/class_faiHookEntry.inc:84
@@ -7367,7 +7315,7 @@ msgstr ""
  "cliquant en-dessous."
  
  #: plugins/admin/applications/class_applicationParameters.inc:98
-#: plugins/admin/fai/class_faiVariable.inc:412
+#: plugins/admin/fai/class_faiVariable.inc:408
  msgid "Variable"
  msgstr "Variable"
  
@@ -7425,77 +7373,71 @@ msgstr "Gestion des applications"
  msgid "no example"
  msgstr "pas d'exemple"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:132
+#: plugins/admin/applications/class_applicationGeneric.inc:126
  msgid "This 'dn' is no application."
  msgstr "Ce 'dn' n'est pas une application."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:228
+#: plugins/admin/applications/class_applicationGeneric.inc:227
  #, fuzzy, php-format
  msgid "Removing of application with dn '%s' failed."
  msgstr "La suppression de l'application du groupe '%s' à échoué"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:240
+#: plugins/admin/applications/class_applicationGeneric.inc:239
  #, php-format
  msgid "Removing application from objectgroup '%s' failed"
  msgstr "La suppression de l'application du groupe d'objet '%s' à échoue"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:247
+#: plugins/admin/applications/class_applicationGeneric.inc:246
  #, php-format
  msgid "Removing application from group '%s' failed"
  msgstr "La suppression de l'application du groupe '%s' à échoué"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:289
+#: plugins/admin/applications/class_applicationGeneric.inc:297
  msgid "The specified picture has not been uploaded correctly."
  msgstr "L'image spécifiée n'as pas été télé-chargée correctement."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:372
  msgid "Specified execute path must start with '/'."
  msgstr "Le répertoire d'éxecutiondoit commencer par '/'."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:375
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr ""
-"Vous n'avez pas les droits suffisants pour créer une application dans cette "
-"'Base'."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:380
+#: plugins/admin/applications/class_applicationGeneric.inc:389
  msgid "Required field 'Name' is not filled."
  msgstr "Le champ obligatoire 'Nom' n'est pas rempli."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:384
+#: plugins/admin/applications/class_applicationGeneric.inc:393
  msgid "Invalid character in application name. Only a-z 0-9 are allowed."
  msgstr ""
  "Caractère non valide dans le nom de l'application. Seul les caractères de a-"
  "z et 0-9 sont permis."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:388
+#: plugins/admin/applications/class_applicationGeneric.inc:397
  msgid "Required field 'Execute' is not filled."
  msgstr "Le champ obligatoire 'Exécuter' n'est pas rempli."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:403
-#: plugins/admin/applications/class_applicationGeneric.inc:411
+#: plugins/admin/applications/class_applicationGeneric.inc:412
+#: plugins/admin/applications/class_applicationGeneric.inc:420
  msgid "There's already an application with this 'Name'."
  msgstr "Une application ayant le même 'Nom' existe déjà."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:457
+#: plugins/admin/applications/class_applicationGeneric.inc:466
  #, fuzzy, php-format
  msgid "Saving of application with dn '%s' failed."
  msgstr "La sauvegarde de l'application à échouée"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:482
+#: plugins/admin/applications/class_applicationGeneric.inc:491
  msgid "Application settings"
  msgstr "Préférences de l'application"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:515
+#: plugins/admin/applications/class_applicationGeneric.inc:524
  #, fuzzy
  msgid "Application generic"
  msgstr "Nom de l'application"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_applicationGeneric.inc:538
  msgid "Flag"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:530
+#: plugins/admin/applications/class_applicationGeneric.inc:539
  #, fuzzy
  msgid "Script content"
  msgstr "Contenu de la variable"
@@ -7528,13 +7470,13 @@ msgstr ""
  "sélectionnées. Si vous avez un grand nombre d'applications il est conseillé "
  "d'utiliser les filtres."
  
-#: plugins/admin/applications/class_divListApplication.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
  msgid "new"
  msgstr "nouveau"
  
-#: plugins/admin/applications/class_divListApplication.inc:129
+#: plugins/admin/applications/class_divListApplication.inc:131
  msgid "Create new application"
  msgstr "Créer une nouvelle application"
  
@@ -7550,6 +7492,20 @@ msgstr "Branches"
  msgid "Current release"
  msgstr "Version actuelle"
  
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested operation"
+msgstr "Opération en cours"
+
+#: plugins/admin/departments/dep_iframe.tpl:7
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+"Votre navigateur ne supporte pas les iframes, veuillez utiliser ce lien pour "
+"effectuer l'opération demandée."
+
  #: plugins/admin/departments/generic.tpl:8
  msgid "Name of department"
  msgstr "Nom du département"
@@ -7564,7 +7520,7 @@ msgid "Descriptive text for department"
  msgstr "Description du département"
  
  #: plugins/admin/departments/generic.tpl:24
-#: plugins/admin/departments/class_departmentGeneric.inc:546
+#: plugins/admin/departments/class_departmentGeneric.inc:590
  msgid "Category"
  msgstr "Catégorie"
  
@@ -7599,12 +7555,12 @@ msgstr "Numéro de téléphone de base pour cette sous-branche"
  msgid "Base facsimile telephone number of this subtree"
  msgstr "Numéro de fax de base pour cette sous-branche"
  
-#: plugins/admin/departments/generic.tpl:109
-#: plugins/admin/departments/class_departmentGeneric.inc:549
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/class_departmentGeneric.inc:593
  msgid "Administrative settings"
  msgstr "Paramètres administratifs"
  
-#: plugins/admin/departments/generic.tpl:111
+#: plugins/admin/departments/generic.tpl:119
  msgid "Tag department as an independent administrative unit"
  msgstr "Marquer le département comme une entité administrative indépendante"
  
@@ -7641,103 +7597,74 @@ msgstr ""
  "fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour "
  "continuer ou 'Annuler' pour abandonner."
  
-#: plugins/admin/departments/dep_iframe.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
-msgid "Processing the requested operation"
-msgstr "Opération en cours"
-
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-"Aussitôt que l'opération de déplacement est finie, vous pouvez aller à la "
-"fin de la page et cliquer sur 'Continuer' pour continuer la configuration "
-"des départements."
+#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
+msgid "Department management"
+msgstr "Gestion des départements"
  
-#: plugins/admin/departments/dep_iframe.tpl:8
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-"Votre navigateur ne supporte pas les iframes, veuillez utiliser ce lien pour "
-"effectuer l'opération demandée."
-
-#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
-msgid "Department management"
-msgstr "Gestion des départements"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:175
+#: plugins/admin/departments/class_departmentGeneric.inc:190
  #, fuzzy, php-format
  msgid "Removing of department with dn '%s' failed."
  msgstr "La suppression du département à échoué"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:224
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-"Vous n'avez pas l'autorisation pour créer un département sur cette 'Base'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:231
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:251
+#: plugins/admin/departments/class_departmentGeneric.inc:253
  msgid "Department with that 'Name' already exists."
  msgstr "Un département ayant ce 'Nom' existe déjà."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:241
+#: plugins/admin/departments/class_departmentGeneric.inc:261
  msgid "Required field 'Description' is not set."
  msgstr "Le champ obligatoire 'Description' n'est pas rempli."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:245
+#: plugins/admin/departments/class_departmentGeneric.inc:265
  #, php-format
  msgid ""
  "The field 'Name' contains the reserved word '%s'. Please choose another name."
  msgstr ""
  "Le champ 'Nom' contient le mot réservé '%s'. Veuillez choisir un autre nom."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:297
+#: plugins/admin/departments/class_departmentGeneric.inc:319
  msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
  msgstr ""
  "Erreur fatale: Impossible de trouver un marqueur libre pour marquer l'entité "
  "administrative!"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:343
+#: plugins/admin/departments/class_departmentGeneric.inc:368
  #, fuzzy, php-format
  msgid "Saving of department with dn '%s' failed."
  msgstr "La sauvegarde du département à échoué"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:385
+#: plugins/admin/departments/class_departmentGeneric.inc:421
  #, php-format
  msgid "Tagging '%s'."
  msgstr "Marquer '%s'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:506
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr "Bouger '%s' vers '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:499
-#: include/class_ldap.inc:458 include/class_acl.inc:523
-#: include/class_acl.inc:530 include/class_acl.inc:537
-#: include/class_acl.inc:543 ihtml/themes/default/snapshotdialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:53
+#: plugins/admin/departments/class_departmentGeneric.inc:542
+#: include/class_ldap.inc:458 include/class_acl.inc:555
+#: include/class_acl.inc:562 include/class_acl.inc:569
+#: include/class_acl.inc:575 ihtml/themes/default/snapshotdialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
  msgstr "Objet"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:502
+#: plugins/admin/departments/class_departmentGeneric.inc:545
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr "Impossible de copier %s, arrêt de l'opération"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:532
-#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: plugins/admin/departments/class_departmentGeneric.inc:581
  #: plugins/admin/departments/class_departmentManagement.inc:25
  #: plugins/admin/systems/class_glpiSelectUser.inc:112
  #: plugins/admin/ogroups/class_divListOGroup.inc:58
  msgid "Departments"
  msgstr "Départements"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:544
+#: plugins/admin/departments/class_departmentGeneric.inc:588
  #: plugins/admin/systems/workstationService.tpl:89
  #: plugins/admin/systems/terminalService.tpl:79
  #: plugins/gofon/phoneaccount/generic.tpl:32
@@ -7746,25 +7673,26 @@ msgstr "Départements"
  msgid "Telephone"
  msgstr "Téléphone"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:545
+#: plugins/admin/departments/class_departmentGeneric.inc:589
  #: plugins/admin/departments/class_divListDepartment.inc:41
  msgid "Department name"
  msgstr "Nom du département"
  
-#: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
+#: plugins/admin/departments/class_departmentManagement.inc:160
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:134
  #, php-format
  msgid "You're about to delete the whole LDAP subtree placed under '%s'."
  msgstr ""
  "Vous êtes sur le point de supprimer la branche complète de l'annuaire LDAP "
  "placé sous '%s'."
  
-#: plugins/admin/departments/class_departmentManagement.inc:175
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:153
+#: plugins/admin/departments/class_departmentManagement.inc:165
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:155
  msgid "You have no permission to remove this department."
  msgstr "Vous n'avez pas les droits nécessaires pour supprimer ce département."
  
-#: plugins/admin/departments/class_departmentManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:352
  msgid ".."
  msgstr ".."
  
@@ -7789,14 +7717,30 @@ msgid "Regular expression for matching department names"
  msgstr "Expression régulière pour faire correspondre le nom des applications"
  
  #: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/fai/class_divListFai.inc:139
-msgid "Go to users home department"
-msgstr "Aller au département de base des utilisateurs"
-
-#: plugins/admin/departments/class_divListDepartment.inc:101
  msgid "Create new department"
  msgstr "Créer un nouveau département"
  
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#, fuzzy
+msgid "You are currently moving/renaming this department."
+msgstr "Vous n'avez pas les droits nécessaires pour supprimer ce département."
+
+#: plugins/admin/departments/dep_move_confirm.tpl:5
+msgid ""
+"Modifying a departments naming attribute 'ou' or base may corrupt acls and "
+"snapshot entries for all entire objects."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:8
+msgid "GOsa can NOT fix this for you, yet."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:11
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
+msgstr ""
+
  #: plugins/admin/systems/network.tpl:1
  msgid "Network\tsettings"
  msgstr "Configuration réseau"
@@ -7818,7 +7762,7 @@ msgid "Enable DNS for this device"
  msgstr "Activer le DNS pour ce périphérique"
  
  #: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/class_servDNS.inc:396
+#: plugins/admin/systems/class_servDNS.inc:398
  #: plugins/admin/systems/servdnseditzone.tpl:67
  #: plugins/admin/fai/faiPackageNew.tpl:31
  #: plugins/gofon/phoneaccount/generic.tpl:84
@@ -7831,8 +7775,8 @@ msgstr "Zone"
  
  #: plugins/admin/systems/network.tpl:77
  #: plugins/admin/systems/class_servDNS.inc:168
-#: plugins/admin/systems/class_servDNS.inc:399
-#: plugins/admin/systems/class_termDNS.inc:542
+#: plugins/admin/systems/class_servDNS.inc:401
+#: plugins/admin/systems/class_termDNS.inc:547
  #: plugins/admin/systems/servdnseditzone.tpl:85
  msgid "TTL"
  msgstr "TTL"
@@ -7847,10 +7791,10 @@ msgid "present"
  msgstr "présent"
  
  #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:252
  #: plugins/admin/systems/class_terminalStartup.inc:161
-#: plugins/admin/systems/class_terminalGeneric.inc:242
-#: plugins/admin/systems/class_workstationStartup.inc:471
+#: plugins/admin/systems/class_terminalGeneric.inc:256
+#: plugins/admin/systems/class_workstationStartup.inc:498
+#: plugins/admin/systems/class_terminalService.inc:261
  msgid "This 'dn' has no terminal features."
  msgstr "Ce 'dn' n'a pas d'extension de terminaux."
  
@@ -7884,6 +7828,92 @@ msgstr "n'est pas en cours d'exécution"
  msgid "offline"
  msgstr "hors-ligne"
  
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr "Modèle de terminaux"
+
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr "Nom du terminal"
+
+#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
+#: plugins/admin/systems/workstation.tpl:44
+#: plugins/admin/systems/class_terminalGeneric.inc:548
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:390
+msgid "Mode"
+msgstr "Mode"
+
+#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:50
+msgid "Select terminal mode"
+msgstr "Sélectionnez le mode du terminal"
+
+#: plugins/admin/systems/terminal.tpl:47
+#: plugins/admin/systems/workstation.tpl:54
+#: plugins/admin/systems/class_workstationGeneric.inc:539
+#: plugins/admin/ogroups/termgroup.tpl:58
+#: plugins/admin/ogroups/class_termgroup.inc:391
+msgid "Syslog server"
+msgstr "Serveur de logs systèmes"
+
+#: plugins/admin/systems/terminal.tpl:50
+#: plugins/admin/systems/workstation.tpl:57
+#: plugins/admin/ogroups/termgroup.tpl:61
+msgid "Choose server to use for logging"
+msgstr "Sélectionnez le serveur de logs à utiliser"
+
+#: plugins/admin/systems/terminal.tpl:66
+#: plugins/admin/systems/class_terminalGeneric.inc:549
+msgid "Root server"
+msgstr "Serveur Primaire"
+
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Select NFS root filesystem to use"
+msgstr "Sélectionnez le système de fichier root NFS à utiliser"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/class_terminalGeneric.inc:550
+msgid "Swap server"
+msgstr "Serveur de Swap"
+
+#: plugins/admin/systems/terminal.tpl:79
+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:98
+#: plugins/admin/systems/workstation.tpl:75
+msgid "Inherit time server attributes"
+msgstr "hérite des paramètres du serveur de temps"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:80
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr "Serveur NTP"
+
+#: plugins/admin/systems/terminal.tpl:106
+#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/ogroups/termgroup.tpl:17
+msgid "Choose server to use for synchronizing time"
+msgstr "Sélectionnez le serveur pour la synchronisation du temps"
+
+#: plugins/admin/systems/terminal.tpl:140 plugins/admin/systems/server.tpl:62
+#: plugins/admin/systems/workstation.tpl:115
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:47
+#: plugins/admin/ogroups/termgroup.tpl:88
+msgid "Action"
+msgstr "Action"
+
+#: plugins/admin/systems/terminal.tpl:145
+#: plugins/admin/systems/workstation.tpl:120
+#: plugins/admin/ogroups/termgroup.tpl:93
+msgid "Select action to execute for this terminal"
+msgstr "Sélectionnez l'opération à exécuter sur le terminal"
+
  #: plugins/admin/systems/info.tpl:1
  msgid "System information"
  msgstr "Information sur le système"
@@ -7990,50 +8020,49 @@ msgstr "Interface graphique"
  msgid "This 'dn' has no network features."
  msgstr "Ce 'dn' n'a pas d'extensions réseaux."
  
-#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_winGeneric.inc:145
  #, php-format
  msgid "Removing of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_componentGeneric.inc:179
+#: plugins/admin/systems/class_winGeneric.inc:195
  msgid "You have no permissions to create a component on this 'Base'."
  msgstr "Vous n'avez pas l'autorisation de créer un composant sur cette 'Base'."
  
-#: plugins/admin/systems/class_winGeneric.inc:184
-#: plugins/admin/systems/class_terminalGeneric.inc:400
-#: plugins/admin/systems/class_servGeneric.inc:261
-#: plugins/admin/systems/class_workstationGeneric.inc:400
-#: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/systems/class_componentGeneric.inc:189
-#: plugins/admin/systems/class_phoneGeneric.inc:333
+#: plugins/admin/systems/class_winGeneric.inc:205
+#: plugins/admin/systems/class_terminalGeneric.inc:434
+#: plugins/admin/systems/class_servGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:414
+#: plugins/admin/systems/class_printGeneric.inc:673
+#: plugins/admin/systems/class_componentGeneric.inc:191
+#: plugins/admin/systems/class_phoneGeneric.inc:338
  #, php-format
  msgid "There is already an entry '%s' in the base choosen by you"
  msgstr "Une entrée '%s' existe déjà dans la base sélectionnée"
  
-#: plugins/admin/systems/class_winGeneric.inc:239
+#: plugins/admin/systems/class_winGeneric.inc:260
  #, php-format
  msgid "Saving of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:250
+#: plugins/admin/systems/class_winGeneric.inc:271
  #, fuzzy
  msgid "Win generic"
  msgstr "Services d'impression"
  
-#: plugins/admin/systems/class_winGeneric.inc:251
+#: plugins/admin/systems/class_winGeneric.inc:272
  #, fuzzy
  msgid "Windows workstation generic"
  msgstr "Nom de la station de travail"
  
-#: plugins/admin/systems/class_winGeneric.inc:256
+#: plugins/admin/systems/class_winGeneric.inc:277
  #, fuzzy
  msgid "Win workstation"
  msgstr "Station de travail Windows"
  
-#: plugins/admin/systems/class_winGeneric.inc:259
+#: plugins/admin/systems/class_winGeneric.inc:280
  #: plugins/admin/systems/workstation.tpl:10
-#: plugins/admin/systems/class_workstationGeneric.inc:513
+#: plugins/admin/systems/class_workstationGeneric.inc:535
  msgid "Workstation name"
  msgstr "Nom de la station de travail"
  
@@ -8041,122 +8070,20 @@ msgstr "Nom de la station de travail"
  msgid "System management"
  msgstr "Administration du système"
  
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr "Modèle de terminaux"
-
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-msgstr "Nom du terminal"
-
-#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
-#: plugins/admin/systems/workstation.tpl:44
-#: plugins/admin/systems/class_terminalGeneric.inc:508
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/ogroups/termgroup.tpl:47
-#: plugins/admin/ogroups/class_termgroup.inc:391
-msgid "Mode"
-msgstr "Mode"
-
-#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
-#: plugins/admin/systems/workstation.tpl:47
-#: plugins/admin/ogroups/termgroup.tpl:50
-msgid "Select terminal mode"
-msgstr "Sélectionnez le mode du terminal"
-
-#: plugins/admin/systems/terminal.tpl:47
-#: plugins/admin/systems/workstation.tpl:54
-#: plugins/admin/systems/class_workstationGeneric.inc:517
-#: plugins/admin/ogroups/termgroup.tpl:58
-#: plugins/admin/ogroups/class_termgroup.inc:392
-msgid "Syslog server"
-msgstr "Serveur de logs systèmes"
-
-#: plugins/admin/systems/terminal.tpl:50
-#: plugins/admin/systems/workstation.tpl:57
-#: plugins/admin/ogroups/termgroup.tpl:61
-msgid "Choose server to use for logging"
-msgstr "Sélectionnez le serveur de logs à utiliser"
-
-#: plugins/admin/systems/terminal.tpl:66
-#: plugins/admin/systems/class_terminalGeneric.inc:509
-msgid "Root server"
-msgstr "Serveur Primaire"
-
-#: plugins/admin/systems/terminal.tpl:69
-msgid "Select NFS root filesystem to use"
-msgstr "Sélectionnez le système de fichier root NFS à utiliser"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/class_terminalGeneric.inc:510
-msgid "Swap server"
-msgstr "Serveur de Swap"
-
-#: plugins/admin/systems/terminal.tpl:79
-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:98
-#: plugins/admin/systems/workstation.tpl:75
-msgid "Inherit time server attributes"
-msgstr "hérite des paramètres du serveur de temps"
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
-msgstr "Serveur NTP"
-
-#: plugins/admin/systems/terminal.tpl:106
-#: plugins/admin/systems/workstation.tpl:83
-#: plugins/admin/ogroups/termgroup.tpl:17
-msgid "Choose server to use for synchronizing time"
-msgstr "Sélectionnez le serveur pour la synchronisation du temps"
-
-#: plugins/admin/systems/terminal.tpl:136 plugins/admin/systems/server.tpl:61
-#: plugins/admin/systems/workstation.tpl:112
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:47
-#: plugins/admin/ogroups/termgroup.tpl:88
-msgid "Action"
-msgstr "Action"
-
-#: plugins/admin/systems/terminal.tpl:141
-#: plugins/admin/systems/workstation.tpl:117
-#: plugins/admin/ogroups/termgroup.tpl:93
-msgid "Select action to execute for this terminal"
-msgstr "Sélectionnez l'opération à exécuter sur le terminal"
-
-#: plugins/admin/systems/class_terminalService.inc:69
-#: plugins/admin/systems/class_workstationService.inc:92
-#: plugins/admin/systems/workstationService.tpl:157
-msgid "unknown"
-msgstr "inconnu"
+#: plugins/admin/systems/goNtpServer.tpl:2
+msgid "Time server"
+msgstr "Services de temps"
  
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
-#: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:214
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
  #: plugins/admin/systems/class_terminalStartup.inc:39
  #: plugins/admin/systems/class_terminalStartup.inc:121
  #: plugins/admin/systems/class_terminalStartup.inc:141
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_terminalGeneric.inc:298
-#: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_workstationStartup.inc:268
-#: plugins/admin/systems/class_workstationStartup.inc:285
-#: plugins/admin/systems/class_workstationStartup.inc:289
-#: plugins/admin/systems/class_workstationStartup.inc:790
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:312
+#: plugins/admin/systems/class_workstationStartup.inc:316
+#: plugins/admin/systems/class_workstationStartup.inc:824
  #: plugins/admin/systems/class_workstationService.inc:201
  #: plugins/admin/systems/class_workstationService.inc:204
  #: plugins/admin/systems/class_workstationService.inc:207
@@ -8171,212 +8098,25 @@ msgstr "inconnu"
  #: plugins/admin/systems/class_workstationService.inc:233
  #: plugins/admin/systems/class_workstationService.inc:234
  #: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_terminalService.inc:74
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:108
+#: plugins/admin/systems/class_terminalService.inc:118
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:121
+#: plugins/admin/systems/class_terminalService.inc:125
+#: plugins/admin/systems/class_terminalService.inc:218
+#: plugins/admin/systems/class_terminalService.inc:221
+#: plugins/admin/systems/class_terminalService.inc:224
+#: plugins/admin/systems/class_terminalService.inc:227
+#: plugins/admin/systems/class_terminalService.inc:230
+#: plugins/admin/systems/class_terminalService.inc:233
+#: plugins/admin/systems/class_terminalService.inc:236
  msgid "inherited"
  msgstr "hérité"
  
-#: plugins/admin/systems/class_terminalService.inc:101
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:95
-#: plugins/admin/systems/class_workstationService.inc:96
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "bit"
-msgstr "bit"
-
-#: plugins/admin/systems/class_terminalService.inc:155
-msgid "default"
-msgstr "défaut"
-
-#: plugins/admin/systems/class_terminalService.inc:156
-#: plugins/admin/systems/class_workstationService.inc:138
-msgid "show chooser"
-msgstr "Afficher le sélecteur"
-
-#: plugins/admin/systems/class_terminalService.inc:157
-#: plugins/admin/systems/class_workstationService.inc:139
-msgid "direct"
-msgstr "direct"
-
-#: plugins/admin/systems/class_terminalService.inc:160
-#: plugins/admin/systems/class_workstationService.inc:142
-msgid "load balanced"
-msgstr "répartition de charge"
-
-#: plugins/admin/systems/class_terminalService.inc:163
-#: plugins/admin/systems/class_workstationService.inc:145
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: plugins/admin/systems/class_terminalService.inc:164
-#: plugins/admin/systems/class_workstationService.inc:146
-msgid "ICA client"
-msgstr "Client ICA"
-
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_workstationService.inc:204
-msgid "Bit"
-msgstr "Bit"
-
-#: plugins/admin/systems/class_terminalService.inc:307
-#: plugins/admin/systems/class_workstationService.inc:314
-msgid "Choose the phone located at the current terminal"
-msgstr "Choisissez le téléphone situé à coté du terminal"
-
-#: plugins/admin/systems/class_terminalService.inc:370
-#: plugins/admin/systems/class_terminalService.inc:375
-#: plugins/admin/systems/class_workstationService.inc:380
-#: plugins/admin/systems/class_workstationService.inc:385
-msgid "Please specify a valid VSync range."
-msgstr ""
-"Veuillez spécifier une plage valide pour la fréquence de synchronisation "
-"verticale."
-
-#: plugins/admin/systems/class_terminalService.inc:385
-#: plugins/admin/systems/class_terminalService.inc:390
-#: plugins/admin/systems/class_workstationService.inc:395
-#: plugins/admin/systems/class_workstationService.inc:400
-msgid "Please specify a valid HSync range."
-msgstr ""
-"Veuillez spécifier une plage valide pour la fréquence de synchronisation "
-"Horizontale."
-
-#: plugins/admin/systems/class_terminalService.inc:421
-#, fuzzy, php-format
-msgid "Saving of object system terminal/service with dn '%s' failed."
-msgstr "La sauvegarde des Informations sur les services du terminal à échoué"
-
-#: plugins/admin/systems/class_terminalService.inc:430
-#: plugins/admin/systems/class_workstationService.inc:451
-#, fuzzy
-msgid "Service"
-msgstr "Services"
-
-#: plugins/admin/systems/class_terminalService.inc:431
-#: plugins/admin/systems/class_goTerminalServer.inc:31
-#: plugins/admin/systems/class_goTerminalServer.inc:54
-#: plugins/admin/systems/class_goTerminalServer.inc:117
-#: plugins/admin/systems/class_goTerminalServer.inc:118
-#: plugins/admin/systems/goTerminalServer.tpl:1
-msgid "Terminal service"
-msgstr "Services de terminaux"
-
-#: plugins/admin/systems/class_terminalService.inc:439
-#: plugins/admin/systems/class_workstationService.inc:460
-#, fuzzy
-msgid "Monitor"
-msgstr "Taille écran"
-
-#: plugins/admin/systems/class_terminalService.inc:440
-#: plugins/admin/ogroups/class_phonequeue.inc:748
-#, fuzzy
-msgid "Method"
-msgstr "méthode"
-
-#: plugins/admin/systems/class_terminalService.inc:441
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Remote desktop"
-msgstr "Bureau distant"
-
-#: plugins/admin/systems/class_terminalService.inc:442
-#: plugins/admin/systems/class_goTerminalServer.inc:127
-#: plugins/admin/systems/goTerminalServer.tpl:12
-msgid "Font path"
-msgstr "Répertoire des polices de caractères"
-
-#: plugins/admin/systems/class_terminalService.inc:443
-#: plugins/admin/systems/class_workstationService.inc:461
-#, fuzzy
-msgid "Gfx driver"
-msgstr "Nouveau pilote"
-
-#: plugins/admin/systems/class_terminalService.inc:444
-#: plugins/admin/systems/class_workstationService.inc:462
-#, fuzzy
-msgid "Gfx resolution"
-msgstr "Résolution"
-
-#: plugins/admin/systems/class_terminalService.inc:445
-#: plugins/admin/systems/class_workstationService.inc:463
-#, fuzzy
-msgid "Gfx color depth"
-msgstr "Profondeur des couleurs"
-
-#: plugins/admin/systems/class_terminalService.inc:446
-#: plugins/admin/systems/class_workstationService.inc:464
-#, fuzzy
-msgid "Hsync"
-msgstr "Fréquence de synchronisation Horizontale"
-
-#: plugins/admin/systems/class_terminalService.inc:447
-#: plugins/admin/systems/class_workstationService.inc:465
-#, fuzzy
-msgid "Vsync"
-msgstr "Fréquence de synchronisation verticale"
-
-#: plugins/admin/systems/class_terminalService.inc:448
-#, fuzzy
-msgid "Printer service enabled"
-msgstr "Service d'impression"
-
-#: plugins/admin/systems/class_terminalService.inc:449
-#: plugins/admin/systems/terminalService.tpl:221
-msgid "Spool server"
-msgstr "Serveur de file d'attente"
-
-#: plugins/admin/systems/class_terminalService.inc:450
-#: plugins/admin/systems/class_workstationService.inc:467
-#, fuzzy
-msgid "Scanner enabled"
-msgstr "activé"
-
-#: plugins/admin/systems/class_terminalService.inc:451
-#, fuzzy
-msgid "Scanner model"
-msgstr "activé"
-
-#: plugins/admin/systems/class_terminalService.inc:454
-#: plugins/admin/systems/class_workstationService.inc:468
-#, fuzzy
-msgid "Keyboard model"
-msgstr "Sélectionnez le modèle du clavier"
-
-#: plugins/admin/systems/class_terminalService.inc:455
-#: plugins/admin/systems/class_workstationService.inc:469
-#, fuzzy
-msgid "Keyboard layout"
-msgstr "Sélectionnez la disposition du clavier"
-
-#: plugins/admin/systems/class_terminalService.inc:456
-#: plugins/admin/systems/class_workstationService.inc:470
-#, fuzzy
-msgid "Keyboard variant"
-msgstr "Sélectionnez la variante du clavier"
-
-#: plugins/admin/systems/class_terminalService.inc:457
-#: plugins/admin/systems/class_workstationService.inc:471
-#, fuzzy
-msgid "Mouse type"
-msgstr "type mime"
-
-#: plugins/admin/systems/class_terminalService.inc:458
-#: plugins/admin/systems/class_workstationService.inc:472
-#, fuzzy
-msgid "Mouse port"
-msgstr "Point de montage"
-
-#: plugins/admin/systems/class_terminalService.inc:459
-#: plugins/admin/systems/class_workstationService.inc:473
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:76
-#: plugins/gofon/phoneaccount/generic.tpl:30
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Matériel téléphonique"
-
  #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:310
+#: plugins/admin/systems/class_workstationStartup.inc:337
  #, fuzzy, php-format
  msgid ""
  "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -8396,26 +8136,26 @@ msgid "Terminal startup"
  msgstr "Modèle de terminaux"
  
  #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1163
  #, fuzzy
  msgid "Ldap server"
  msgstr "Serveur Ldap"
  
  #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1122
+#: plugins/admin/systems/class_workstationStartup.inc:1167
  #, fuzzy
  msgid "Kernel modules"
  msgstr "Vérifier le paramètre"
  
  #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1119
+#: plugins/admin/systems/class_workstationStartup.inc:1164
  #: plugins/admin/systems/workstationStartup.tpl:8
  #: plugins/admin/systems/terminalStartup.tpl:8
  msgid "Boot kernel"
  msgstr "Kernel utilisé au démarrage"
  
  #: plugins/admin/systems/class_terminalStartup.inc:455
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1165
  #, fuzzy
  msgid "Kernel parameter"
  msgstr "Vérifier le paramètre"
@@ -8424,7 +8164,7 @@ msgstr "Vérifier le paramètre"
  msgid "Server name"
  msgstr "Nom du serveur"
  
-#: plugins/admin/systems/server.tpl:66
+#: plugins/admin/systems/server.tpl:67
  msgid "Select action to execute for this server"
  msgstr "Sélectionnez l'opération à exécuter sur le serveur"
  
@@ -8511,7 +8251,7 @@ msgid "Supported interfaces"
  msgstr "Interfaces supportées"
  
  #: plugins/admin/systems/glpiPrinter.tpl:48
-#: plugins/admin/systems/class_servDNS.inc:395
+#: plugins/admin/systems/class_servDNS.inc:397
  msgid "Serial"
  msgstr "Série"
  
@@ -8551,86 +8291,82 @@ msgstr "Documents liés"
  msgid "Installed cartridges"
  msgstr "Cartouches installés"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:98
+#: plugins/admin/systems/class_terminalGeneric.inc:105
  msgid "text"
  msgstr "texte"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:106
  msgid "graphic"
  msgstr "graphique"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:173
+#: plugins/admin/systems/class_terminalGeneric.inc:181
  #, php-format
  msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:179
+#: plugins/admin/systems/class_terminalGeneric.inc:188
  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:191
+#: plugins/admin/systems/class_terminalGeneric.inc:200
  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:203
+#: plugins/admin/systems/class_terminalGeneric.inc:212
  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:280
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:294
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Switch off"
  msgstr "Eteindre"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:281
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:295
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Reboot"
  msgstr "Redémarrer"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:282
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_servGeneric.inc:186
-#: plugins/admin/systems/class_workstationGeneric.inc:282
-#: plugins/admin/systems/class_workstationGeneric.inc:288
-#: plugins/admin/ogroups/class_termgroup.inc:301
+#: plugins/admin/systems/class_terminalGeneric.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:190
+#: plugins/admin/systems/class_servGeneric.inc:196
+#: plugins/admin/systems/class_workstationGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:295
+#: plugins/admin/ogroups/class_termgroup.inc:300
  msgid "Memory test"
  msgstr "Test mémoire"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:283
-#: plugins/admin/systems/class_terminalGeneric.inc:287
-#: plugins/admin/systems/class_servGeneric.inc:181
-#: plugins/admin/systems/class_servGeneric.inc:187
-#: plugins/admin/systems/class_workstationGeneric.inc:283
-#: plugins/admin/systems/class_workstationGeneric.inc:289
-#: plugins/admin/ogroups/class_termgroup.inc:302
+#: plugins/admin/systems/class_terminalGeneric.inc:297
+#: plugins/admin/systems/class_terminalGeneric.inc:301
+#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_servGeneric.inc:197
+#: plugins/admin/systems/class_workstationGeneric.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:296
+#: plugins/admin/ogroups/class_termgroup.inc:301
  msgid "System analysis"
  msgstr "Analyse du système"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:285
-#: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/systems/class_terminalGeneric.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_workstationGeneric.inc:292
  msgid "Wake up"
  msgstr "Réveiller"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:333
+#: plugins/admin/systems/class_terminalGeneric.inc:348
  #, php-format
  msgid "Removing of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:383
-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:387
+#: plugins/admin/systems/class_terminalGeneric.inc:415
  msgid "The required field 'Terminal name' is not set."
  msgstr "Le champ obligatoire 'Nom du terminal' n'est pas renseigné."
  
-#: plugins/admin/systems/class_terminalGeneric.inc:410
-#: plugins/admin/systems/class_workstationGeneric.inc:410
+#: plugins/admin/systems/class_terminalGeneric.inc:444
+#: plugins/admin/systems/class_workstationGeneric.inc:424
  msgid ""
  "There must be at least one NTP server selected, or the inherit mode "
  "activated."
@@ -8638,116 +8374,118 @@ msgstr ""
  "Il doit y avoir au moins un serveur NTP sélectionné, ou le mode d'héritage "
  "activé."
  
-#: plugins/admin/systems/class_terminalGeneric.inc:488
+#: plugins/admin/systems/class_terminalGeneric.inc:528
  #, php-format
  msgid "Saving of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:499
-#: plugins/admin/systems/class_terminalGeneric.inc:505
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: plugins/admin/systems/class_terminalGeneric.inc:539
+#: plugins/admin/systems/class_terminalGeneric.inc:545
+#: plugins/admin/systems/class_systemManagement.inc:998
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/admin/ogroups/class_ogroupManagement.inc:353
  msgid "Terminal"
  msgstr "Terminal"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:500
+#: plugins/admin/systems/class_terminalGeneric.inc:540
  #, fuzzy
  msgid "Terminal generic"
  msgstr "Services de terminaux"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: plugins/admin/systems/class_terminalGeneric.inc:551
  #, fuzzy
  msgid "Syslog server enabled"
  msgstr "Serveur de logs systèmes"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: plugins/admin/systems/class_terminalGeneric.inc:552
  #, fuzzy
  msgid "Ntp server settings"
  msgstr "Préférences utilisateur"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:515
-#: plugins/admin/systems/class_servGeneric.inc:347
-#: plugins/admin/systems/class_workstationGeneric.inc:519
-#: plugins/admin/ogroups/class_termgroup.inc:393
+#: plugins/admin/systems/class_terminalGeneric.inc:555
+#: plugins/admin/systems/class_workstationGeneric.inc:541
+#, fuzzy
+msgid "Root password"
+msgstr "Attribuer le mot de passe"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:556
+#: plugins/admin/systems/class_servGeneric.inc:360
+#: plugins/admin/systems/class_workstationGeneric.inc:542
+#: plugins/admin/ogroups/class_termgroup.inc:392
  #, fuzzy
  msgid "Action flag"
  msgstr "Action"
  
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:41
+#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/ogroups/class_termgroup.inc:40
  msgid "Activated"
  msgstr "Activé"
  
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_servGeneric.inc:79
  msgid "This 'dn' has no server features."
  msgstr "Ce 'dn' n'a pas d'options serveur."
  
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#: plugins/admin/ogroups/class_termgroup.inc:206
+#: plugins/admin/systems/class_servGeneric.inc:87
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/ogroups/class_termgroup.inc:205
  msgid "No ACTIONCMD definition found in your gosa.conf"
  msgstr "Aucune définition de ACTIONCMD n'est présente dans gosa.conf"
  
-#: plugins/admin/systems/class_servGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:125
  #, php-format
  msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:176
-#: plugins/admin/systems/class_workstationGeneric.inc:278
-#: plugins/admin/ogroups/class_termgroup.inc:297
+#: plugins/admin/systems/class_servGeneric.inc:186
+#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/ogroups/class_termgroup.inc:296
  msgid "Instant update"
  msgstr "Mise à jour immédiate"
  
-#: plugins/admin/systems/class_servGeneric.inc:177
-#: plugins/admin/systems/class_servGeneric.inc:185
-#: plugins/admin/systems/class_workstationGeneric.inc:279
-#: plugins/admin/systems/class_workstationGeneric.inc:287
-#: plugins/admin/ogroups/class_termgroup.inc:298
+#: plugins/admin/systems/class_servGeneric.inc:187
+#: plugins/admin/systems/class_servGeneric.inc:195
+#: plugins/admin/systems/class_workstationGeneric.inc:286
+#: plugins/admin/systems/class_workstationGeneric.inc:294
+#: plugins/admin/ogroups/class_termgroup.inc:297
  msgid "Scheduled update"
  msgstr "Mise à jour programmée"
  
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_servGeneric.inc:184
-#: plugins/admin/systems/class_workstationGeneric.inc:280
-#: plugins/admin/systems/class_workstationGeneric.inc:286
-#: plugins/admin/ogroups/class_termgroup.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:188
+#: plugins/admin/systems/class_servGeneric.inc:194
+#: plugins/admin/systems/class_workstationGeneric.inc:287
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/ogroups/class_termgroup.inc:298
  msgid "Reinstall"
  msgstr "Reinstaller"
  
-#: plugins/admin/systems/class_servGeneric.inc:179
-#: plugins/admin/systems/class_workstationGeneric.inc:281
-#: plugins/admin/ogroups/class_termgroup.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:189
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:299
  msgid "Rescan hardware"
  msgstr "Recherche du matériel"
  
-#: plugins/admin/systems/class_servGeneric.inc:207
+#: plugins/admin/systems/class_servGeneric.inc:218
  #, fuzzy, php-format
  msgid "Removing of system server/generic with dn '%s' failed."
  msgstr "La suppression des références de la macro téléphonique à échoué"
  
-#: plugins/admin/systems/class_servGeneric.inc:245
+#: plugins/admin/systems/class_servGeneric.inc:263
  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:250
-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'."
-
-#: plugins/admin/systems/class_servGeneric.inc:319
+#: plugins/admin/systems/class_servGeneric.inc:332
  #, php-format
  msgid "Saving of system server/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:335
+#: plugins/admin/systems/class_servGeneric.inc:348
  #, fuzzy
  msgid "Server generic"
  msgstr "Nom du serveur"
  
-#: plugins/admin/systems/class_servGeneric.inc:345
-#: plugins/admin/systems/class_workstationGeneric.inc:516
+#: plugins/admin/systems/class_servGeneric.inc:358
+#: plugins/admin/systems/class_workstationGeneric.inc:538
  #, fuzzy
  msgid "Goto mode"
  msgstr "vers le répertoire"
@@ -8776,55 +8514,48 @@ 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:191
-#: plugins/admin/ogroups/class_termgroup.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:198
+#: plugins/admin/ogroups/class_termgroup.inc:248
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  "La sauvegarde des paramètres de démarrage pour la station de travail à échoué"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:209
  msgid "This 'dn' has no workstation features."
  msgstr "Ce 'dn' ne comporte pas d'extensions stations de travail."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:324
+#: plugins/admin/systems/class_workstationGeneric.inc:332
  #, fuzzy, php-format
  msgid "Removing of system workstation/generic with dn '%s' failed."
  msgstr "La suppression d'une station de travail Samba à échoué"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/ogroups/class_termgroup.inc:109
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr ""
-"Vous n'avez pas les droits nécessaires pour créer une station de travail "
-"dans cette 'Base'."
-
-#: plugins/admin/systems/class_workstationGeneric.inc:387
+#: plugins/admin/systems/class_workstationGeneric.inc:396
  msgid "The required field 'Workstation name' is not set."
  msgstr ""
  "Le champ obligatoire 'Nom de la station de travail' n'est pas renseigné."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:477
-#: plugins/admin/systems/class_workstationGeneric.inc:495
+#: plugins/admin/systems/class_workstationGeneric.inc:491
+#: plugins/admin/systems/class_workstationGeneric.inc:517
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic with dn '%s' failed."
  msgstr "La sauvegarde des services de la station de travail à échoué"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:505
+#: plugins/admin/systems/class_workstationGeneric.inc:527
  #, fuzzy
  msgid "Workstation generic"
  msgstr "Nom de la station de travail"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:814
+#: plugins/admin/systems/class_workstationGeneric.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:999
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/admin/ogroups/class_ogroupManagement.inc:352
  #: plugins/generic/references/class_reference.inc:48
  msgid "Workstation"
  msgstr "Stations de travail"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:518
-#: plugins/admin/ogroups/class_termgroup.inc:394
+#: plugins/admin/systems/class_workstationGeneric.inc:540
+#: plugins/admin/ogroups/class_termgroup.inc:393
  #, fuzzy
  msgid "Ntp server"
  msgstr "Serveur NTP"
@@ -8833,97 +8564,120 @@ msgstr "Serveur NTP"
  msgid "Systems"
  msgstr "Systèmes"
  
-#: plugins/admin/systems/class_systemManagement.inc:222
+#: plugins/admin/systems/class_systemManagement.inc:191
+msgid "Creating the image failed. Please see the report below."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:200
+#, fuzzy, php-format
+msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+msgstr ""
+"La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
+"pas."
+
+#: plugins/admin/systems/class_systemManagement.inc:257
+#, fuzzy
+msgid "You are not allowed to create a new object of this type."
+msgstr "Vous n'êtes pas autorisé à supprimer le groupe objet!"
+
+#: plugins/admin/systems/class_systemManagement.inc:308
  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:247
+#: plugins/admin/systems/class_systemManagement.inc:336
+#: plugins/admin/systems/class_systemManagement.inc:402
+#, fuzzy
+msgid "You are not allowed to change the password for this object."
+msgstr "Vous n'êtes pas autorisé à modifier votre mot de passe en ce moment"
+
+#: plugins/admin/systems/class_systemManagement.inc:348
  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:264
-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:405
+#, fuzzy
+msgid "Can't detect object to change password."
+msgstr "Impossible de détecter le nom de l'objet."
  
-#: plugins/admin/systems/class_systemManagement.inc:318
+#: plugins/admin/systems/class_systemManagement.inc:467
  #, php-format
  msgid "You're about to delete all information about the component at '%s'."
  msgstr ""
  "Vous êtes sur le point de supprimer toute les informations relatives aux "
  "composant '%s'."
  
-#: plugins/admin/systems/class_systemManagement.inc:324
-#: plugins/admin/systems/class_systemManagement.inc:385
+#: plugins/admin/systems/class_systemManagement.inc:473
+#: plugins/admin/systems/class_systemManagement.inc:533
  #: plugins/admin/fai/class_faiManagement.inc:168
  #: plugins/admin/fai/class_faiManagement.inc:221
  msgid "You are not allowed to delete this component!"
  msgstr "Vous n'êtes pas autorisé à supprimer ce composant!"
  
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:837
  msgid "New terminal"
  msgstr "Nouveau terminal"
  
-#: plugins/admin/systems/class_systemManagement.inc:654
+#: plugins/admin/systems/class_systemManagement.inc:839
  msgid "New workstation"
  msgstr "Nouvelle station de travail"
  
-#: plugins/admin/systems/class_systemManagement.inc:656
+#: plugins/admin/systems/class_systemManagement.inc:841
  msgid "New Device"
  msgstr "Nouveau périphérique"
  
-#: plugins/admin/systems/class_systemManagement.inc:675
+#: plugins/admin/systems/class_systemManagement.inc:860
  msgid "Terminal template for"
  msgstr "Modèle de terminal pour "
  
-#: plugins/admin/systems/class_systemManagement.inc:691
+#: plugins/admin/systems/class_systemManagement.inc:876
  msgid "Workstation template for"
  msgstr "Modèle de station de travail pour"
  
-#: plugins/admin/systems/class_systemManagement.inc:811
+#: plugins/admin/systems/class_systemManagement.inc:996
  msgid "New System from incoming"
  msgstr "Nouveau système depuis l'arrivée"
  
-#: plugins/admin/systems/class_systemManagement.inc:815
+#: plugins/admin/systems/class_systemManagement.inc:1000
  msgid "Workstation is installing"
  msgstr "La station de travail s'installe"
  
-#: plugins/admin/systems/class_systemManagement.inc:816
+#: plugins/admin/systems/class_systemManagement.inc:1001
  msgid "Workstation is waiting for action"
  msgstr "La station de travail attend une action"
  
-#: plugins/admin/systems/class_systemManagement.inc:817
+#: plugins/admin/systems/class_systemManagement.inc:1002
  msgid "Workstation installation failed"
  msgstr "L'installation de la station de travail à échoué"
  
-#: plugins/admin/systems/class_systemManagement.inc:820
+#: plugins/admin/systems/class_systemManagement.inc:1005
  msgid "Server is installing"
  msgstr "Le serveur s'installe"
  
-#: plugins/admin/systems/class_systemManagement.inc:821
+#: plugins/admin/systems/class_systemManagement.inc:1006
  msgid "Server is waiting for action"
  msgstr "Le serveur attend une action"
  
-#: plugins/admin/systems/class_systemManagement.inc:822
+#: plugins/admin/systems/class_systemManagement.inc:1007
  msgid "Server installation failed"
  msgstr "L'installation du serveur à échoué"
  
-#: plugins/admin/systems/class_systemManagement.inc:823
+#: plugins/admin/systems/class_systemManagement.inc:1008
  msgid "Winstation"
  msgstr "Stations Windows"
  
-#: plugins/admin/systems/class_systemManagement.inc:824
+#: plugins/admin/systems/class_systemManagement.inc:1009
  msgid "Network Device"
  msgstr "Périphérique réseau"
  
-#: plugins/admin/systems/class_systemManagement.inc:825
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_systemManagement.inc:1010
+#: plugins/admin/systems/class_divListSystem.inc:148
  msgid "New Terminal"
  msgstr "Nouveau terminal"
  
-#: plugins/admin/systems/class_systemManagement.inc:826
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_systemManagement.inc:1011
+#: plugins/admin/systems/class_divListSystem.inc:154
  msgid "New Workstation"
  msgstr "Nouvelle station de travail"
  
@@ -9036,9 +8790,9 @@ msgstr ""
  "Accepter les messages sur du SMTP non authentifié venant d'autre domaines"
  
  #: plugins/admin/systems/class_servDNS.inc:34
-#: plugins/admin/systems/class_servDNS.inc:353
-#: plugins/admin/systems/class_servDNS.inc:382
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:355
+#: plugins/admin/systems/class_servDNS.inc:384
+#: plugins/admin/systems/class_servDNS.inc:385
  msgid "DNS service"
  msgstr "Service DNS"
  
@@ -9069,7 +8823,7 @@ msgstr ""
  "le bouton ci-dessous."
  
  #: plugins/admin/systems/class_servDNS.inc:167
-#: plugins/admin/systems/class_servDNS.inc:392
+#: plugins/admin/systems/class_servDNS.inc:394
  msgid "Reverse zone"
  msgstr "Zone inverse"
  
@@ -9078,7 +8832,7 @@ msgstr "Zone inverse"
  msgid "Class"
  msgstr "Classe"
  
-#: plugins/admin/systems/class_servDNS.inc:231
+#: plugins/admin/systems/class_servDNS.inc:233
  #, php-format
  msgid ""
  "Can't delete the selected zone, because it is still in use by these entry/"
@@ -9087,38 +8841,38 @@ msgstr ""
  "Vous ne pouvez pas effacer cette zone car elle est encore utilisée par ces "
  "éléments/ éléments '%s'"
  
-#: plugins/admin/systems/class_servDNS.inc:290
+#: plugins/admin/systems/class_servDNS.inc:292
  #, php-format
  msgid "Updating of system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:299
+#: plugins/admin/systems/class_servDNS.inc:301
  #, fuzzy, php-format
  msgid "Removing of system server/dns with dn '%s' failed."
  msgstr "La suppression du serveur à échoué"
  
-#: plugins/admin/systems/class_servDNS.inc:320
+#: plugins/admin/systems/class_servDNS.inc:322
  #, fuzzy, php-format
  msgid "Saving of system server/dns with dn '%s' failed."
  msgstr "La sauvegarde des paramètres de la base de données à échoué"
  
-#: plugins/admin/systems/class_servDNS.inc:344
+#: plugins/admin/systems/class_servDNS.inc:346
  #, php-format
  msgid "Set status flag for system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:391
-#: plugins/admin/systems/class_termDNS.inc:541
+#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_termDNS.inc:546
  #: plugins/admin/systems/servdnseditzone.tpl:7
  msgid "Zone name"
  msgstr "Nom de la zone"
  
-#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_servDNS.inc:395
  #, fuzzy
  msgid "Primary dns server"
  msgstr "Serveur dns primaire pour cette zone"
  
-#: plugins/admin/systems/class_servDNS.inc:397
+#: plugins/admin/systems/class_servDNS.inc:399
  #: plugins/admin/systems/servdnseditzone.tpl:73
  #: plugins/admin/ogroups/phonequeue.tpl:70
  #: plugins/admin/ogroups/class_phonequeue.inc:751
@@ -9126,12 +8880,12 @@ msgstr "Serveur dns primaire pour cette zone"
  msgid "Retry"
  msgstr "Réessayer"
  
-#: plugins/admin/systems/class_servDNS.inc:398
+#: plugins/admin/systems/class_servDNS.inc:400
  #: plugins/admin/systems/servdnseditzone.tpl:79
  msgid "Expire"
  msgstr "Expire"
  
-#: plugins/admin/systems/class_servDNS.inc:400
+#: plugins/admin/systems/class_servDNS.inc:402
  #: plugins/admin/systems/servdnseditzone.tpl:24
  msgid "Zone records"
  msgstr "Enregistrement de zone"
@@ -9333,23 +9087,23 @@ msgstr ""
  msgid "kolabFreeBusyFuture"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:110
+#: plugins/admin/systems/class_printGeneric.inc:111
  #, php-format
  msgid "Can't extract a valid base out of object dn, setting base to '%s'."
  msgstr ""
  "Impossible d'obtenir un base valide depuis le dn de l'objet, je met la base "
  "à '%s'. "
  
-#: plugins/admin/systems/class_printGeneric.inc:257
-#: plugins/admin/systems/class_printGeneric.inc:265
-#: plugins/admin/systems/class_printGeneric.inc:270
-#: plugins/admin/systems/class_printGeneric.inc:327
-#: plugins/admin/systems/class_printGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:260
+#: plugins/admin/systems/class_printGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:273
+#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:341
  msgid "Add printer extension"
  msgstr "Ajouter une extension d'imprimante"
  
-#: plugins/admin/systems/class_printGeneric.inc:258
+#: plugins/admin/systems/class_printGeneric.inc:261
  msgid ""
  "Could not intialize printer tab, parameter parent was missing while "
  "construction."
@@ -9357,20 +9111,20 @@ msgstr ""
  "Impossible d'initialiser l'onglet imprimante, le paramètre parent était "
  "manquant pendant la construction."
  
-#: plugins/admin/systems/class_printGeneric.inc:266
+#: plugins/admin/systems/class_printGeneric.inc:269
  msgid "This is a workstation template, printer tab is disabled."
  msgstr ""
  "Ceci est un modèle de station de travail, l'onglet imprimante est désactivé."
  
-#: plugins/admin/systems/class_printGeneric.inc:271
+#: plugins/admin/systems/class_printGeneric.inc:274
  msgid "This is a terminal template, printer tab is disabled."
  msgstr "Ceci est un modèle de terminal, l'onglet imprimante est désactivé."
  
-#: plugins/admin/systems/class_printGeneric.inc:320
+#: plugins/admin/systems/class_printGeneric.inc:315
  msgid "This 'dn' has no printer features."
  msgstr "Ce 'dn' n'a pas d'extensions d'impression."
  
-#: plugins/admin/systems/class_printGeneric.inc:328
+#: plugins/admin/systems/class_printGeneric.inc:323
  msgid ""
  "This object has printer extension disabled. You can't enable it while 'cn' "
  "is not present in entry. Possibly you are currently creating a new terminal "
@@ -9380,12 +9134,12 @@ msgstr ""
  "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:335
-#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:330
+#: plugins/admin/systems/class_printGeneric.inc:333
  msgid "Remove printer extension"
  msgstr "Enlever l'extension d'impression"
  
-#: plugins/admin/systems/class_printGeneric.inc:336
+#: plugins/admin/systems/class_printGeneric.inc:331
  msgid ""
  "This workstation has printer extension enabled.You can disable it by "
  "clicking below."
@@ -9393,7 +9147,7 @@ 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:339
+#: plugins/admin/systems/class_printGeneric.inc:334
  msgid ""
  "This terminal has printer extension enabled. You can disable it by clicking "
  "below."
@@ -9401,7 +9155,7 @@ 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:344
+#: plugins/admin/systems/class_printGeneric.inc:339
  msgid ""
  "This workstation has printer extension disabled. You can enable it by "
  "clicking below."
@@ -9409,7 +9163,7 @@ 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:347
+#: plugins/admin/systems/class_printGeneric.inc:342
  msgid ""
  "This terminal has printer extension disabled. You can enable it by clicking "
  "below."
@@ -9417,87 +9171,87 @@ 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:510
+#: plugins/admin/systems/class_printGeneric.inc:511
  #, 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:518
+#: plugins/admin/systems/class_printGeneric.inc:519
  msgid "can't get ppd informations."
  msgstr "Impossible d'obtenir les informations sur le fichier ppd."
  
-#: plugins/admin/systems/class_printGeneric.inc:531
+#: plugins/admin/systems/class_printGeneric.inc:532
  #, php-format
  msgid "This printer belongs to terminal %s. You can't rename this printer."
  msgstr ""
  "Cette imprimante appartient au terminal %s. Vous ne pouvez pas changer son "
  "nom."
  
-#: plugins/admin/systems/class_printGeneric.inc:533
+#: plugins/admin/systems/class_printGeneric.inc:534
  #, php-format
  msgid "This printer belongs to workstation %s. You can't rename this printer."
  msgstr ""
  "Cette imprimante appartient à la station de travail %s. Vous ne pouvez pas "
  "changer son nom."
  
-#: plugins/admin/systems/class_printGeneric.inc:588
+#: plugins/admin/systems/class_printGeneric.inc:589
  #, fuzzy, php-format
  msgid "Removing of system print/generic with dn '%s' failed."
  msgstr "La suppression de l'imprimante à échoué"
  
-#: plugins/admin/systems/class_printGeneric.inc:814
+#: plugins/admin/systems/class_printGeneric.inc:818
  #, php-format
  msgid "Saving of system print/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:837
-#: plugins/admin/systems/class_printGeneric.inc:839
-#: plugins/admin/ogroups/class_ogroupManagement.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:841
+#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
  #: plugins/admin/fai/faiTemplateEntry.tpl:85
  #: plugins/admin/fai/faiTemplateEntry.tpl:127
  #: plugins/generic/references/class_reference.inc:36
  msgid "Group"
  msgstr "Groupes"
  
-#: plugins/admin/systems/class_printGeneric.inc:855
+#: plugins/admin/systems/class_printGeneric.inc:859
  #, fuzzy
  msgid "Print generic"
  msgstr "Services d'impression"
  
-#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_printGeneric.inc:871
  msgid "LabeledURL"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_printGeneric.inc:872
  #, fuzzy
  msgid "Printer PPD"
  msgstr "Imprimante"
  
-#: plugins/admin/systems/class_printGeneric.inc:885
+#: plugins/admin/systems/class_printGeneric.inc:889
  #, php-format
  msgid ""
  "You are not allowed to remove the given object '%s' from the list of members "
  "of printer '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:902
+#: plugins/admin/systems/class_printGeneric.inc:906
  #, php-format
  msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:907
+#: plugins/admin/systems/class_printGeneric.inc:911
  #, php-format
  msgid ""
  "You are not allowed to add the given object '%s' to the list of members of '%"
  "s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:942
+#: plugins/admin/systems/class_printGeneric.inc:946
  #, php-format
  msgid "Can't add '%s' to the list of members, it is already used."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:953
+#: plugins/admin/systems/class_printGeneric.inc:957
  #, php-format
  msgid "Can't add '%s' to list of members, it is not reachable."
  msgstr ""
@@ -9522,43 +9276,39 @@ msgstr ""
  msgid "Changing the password impinges on authentification only."
  msgstr "Changer le mot de passe influe seulement sur l'authentification."
  
-#: plugins/admin/systems/class_componentGeneric.inc:127
+#: plugins/admin/systems/class_componentGeneric.inc:125
  #, fuzzy, php-format
  msgid "Removing of system component/generic with dn '%s' failed."
  msgstr "La suppression du composant générique à échoué"
  
-#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_componentGeneric.inc:172
  msgid "The required field 'Component name' is not set."
  msgstr "Le champ obligatoire 'Nom du composant' n'est pas rempli."
  
-#: plugins/admin/systems/class_componentGeneric.inc:170
-#: plugins/admin/systems/class_phoneGeneric.inc:307
+#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_phoneGeneric.inc:317
  msgid "The required field IP address is empty."
  msgstr "Le champ obligatoire adresse IP n'est pas rempli."
  
-#: plugins/admin/systems/class_componentGeneric.inc:173
-#: plugins/admin/systems/class_phoneGeneric.inc:310
+#: plugins/admin/systems/class_componentGeneric.inc:180
+#: plugins/admin/systems/class_phoneGeneric.inc:320
  msgid "The field IP address contains an invalid address."
  msgstr "Le champ adresse IP contient une adresse invalide."
  
-#: plugins/admin/systems/class_componentGeneric.inc:247
+#: plugins/admin/systems/class_componentGeneric.inc:249
  #, php-format
  msgid "Saving of system component/generic with dn '%s' failed."
  msgstr "La sauvegarde du système avec le dn '%s' à échoué."
  
-#: plugins/admin/systems/class_componentGeneric.inc:258
+#: plugins/admin/systems/class_componentGeneric.inc:260
  msgid "Component generic"
  msgstr "Composant générique"
  
-#: plugins/admin/systems/class_componentGeneric.inc:263
+#: plugins/admin/systems/class_componentGeneric.inc:265
  #, fuzzy
  msgid "Network device"
  msgstr "Périphériques réseau"
  
-#: plugins/admin/systems/goNtpServer.tpl:2
-msgid "Time server"
-msgstr "Services de temps"
-
  #: plugins/admin/systems/goKrbServer.tpl:1
  msgid "Kerberos kadmin access"
  msgstr "Accès kadmin Kerberos"
@@ -9573,6 +9323,22 @@ msgstr "Realm Kerberos"
  msgid "Admin user"
  msgstr "Administrateur"
  
+#: plugins/admin/systems/goFonServer.tpl:1
+msgid "VoIP database information"
+msgstr "Information sur la base de données VOIP"
+
+#: plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr "Utilisateur de la base de données Asterisk"
+
+#: plugins/admin/systems/goFonServer.tpl:20
+msgid "Country dial prefix"
+msgstr "Préfixe du pays"
+
+#: plugins/admin/systems/goFonServer.tpl:28
+msgid "Local dial prefix"
+msgstr "Préfixe local"
+
  #: plugins/admin/systems/chooser.tpl:1
  msgid "Choose the kind of system component you want to create"
  msgstr "Choisissez le type de composant système que vous souhaitez créer"
@@ -9643,26 +9409,18 @@ msgstr "Monter les partages automatiquement sur les machines Apple."
  msgid "Codepage"
  msgstr "Codage caractêres"
  
-#: plugins/admin/systems/servnfs.tpl:121
-#: plugins/admin/systems/class_goShareServer.inc:376
-msgid "Option"
-msgstr "Option"
-
-#: plugins/admin/systems/goFonServer.tpl:1
-msgid "VoIP database information"
-msgstr "Information sur la base de données VOIP"
-
-#: plugins/admin/systems/goFonServer.tpl:4
-msgid "Asterisk DB user"
-msgstr "Utilisateur de la base de données Asterisk"
+#: plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/class_goShareServer.inc:376
+msgid "Option"
+msgstr "Option"
  
-#: plugins/admin/systems/goFonServer.tpl:20
-msgid "Country dial prefix"
-msgstr "Préfixe du pays"
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
+msgstr "Information sur la base de données des FAX"
  
-#: plugins/admin/systems/goFonServer.tpl:28
-msgid "Local dial prefix"
-msgstr "Préfixe local"
+#: plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
+msgstr "utilisateur de la base de données du FAX"
  
  #: plugins/admin/systems/remove_glpi.tpl:10
  msgid ""
@@ -9679,12 +9437,12 @@ msgid "This 'dn' has no phone features."
  msgstr "Ce 'dn' n'a pas d'extensions téléphoniques."
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  msgid "yes"
  msgstr "oui"
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  msgid "no"
  msgstr "non"
  
@@ -9710,100 +9468,97 @@ msgstr ""
  msgid "Removing of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:315
+#: plugins/admin/systems/class_phoneGeneric.inc:325
  msgid "The required field 'Phone name' is not set."
  msgstr "Le champ obligatoire 'Nom du téléphone' n'est pas rempli."
  
-#: plugins/admin/systems/class_phoneGeneric.inc:318
+#: plugins/admin/systems/class_phoneGeneric.inc:328
  msgid "The 'Phone name' '0' is reserved and cannot be used."
  msgstr "Le 'Nom du téléphone' '0' est réservé et ne peut pas être utilisé."
  
-#: plugins/admin/systems/class_phoneGeneric.inc:323
-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_phoneGeneric.inc:413
+#: plugins/admin/systems/class_phoneGeneric.inc:418
  #, php-format
  msgid "Saving of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:426
+#: plugins/admin/systems/class_phoneGeneric.inc:431
  #, fuzzy
  msgid "Phone generic"
  msgstr "Numéro de téléphone"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:431
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
  #, fuzzy
  msgid "Phone hardware"
  msgstr "Matériel téléphonique"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/admin/systems/class_phoneGeneric.inc:442
  #, fuzzy
  msgid "SIP Mode"
  msgstr "Mode"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:437
+#: plugins/admin/systems/class_phoneGeneric.inc:443
  #, fuzzy
  msgid "SIP DTMF mode"
  msgstr "Mode DTMF"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:438
+#: plugins/admin/systems/class_phoneGeneric.inc:444
  #, fuzzy
  msgid "SIP Default ip"
  msgstr "Adresse ip par défaut"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_phoneGeneric.inc:445
  msgid "SIP Qualify"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_phoneGeneric.inc:446
  #, fuzzy
  msgid "IAX authentication type"
  msgstr "Authentification nagios"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:441
+#: plugins/admin/systems/class_phoneGeneric.inc:447
  #, fuzzy
  msgid "IAX secret"
  msgstr "Service FAX"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:442
+#: plugins/admin/systems/class_phoneGeneric.inc:448
  #, fuzzy
  msgid "IAX account code"
  msgstr "Code du compte téléphonique"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:443
+#: plugins/admin/systems/class_phoneGeneric.inc:449
  #, fuzzy
  msgid "IAX trunk lines"
  msgstr "Regrouper des lignes"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:444
+#: plugins/admin/systems/class_phoneGeneric.inc:450
  #, fuzzy
  msgid "IAX permit settings"
  msgstr "Configuration du FAX"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:445
+#: plugins/admin/systems/class_phoneGeneric.inc:451
  #, fuzzy
  msgid "IAX deny settings"
  msgstr "Configuration du FAX"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:446
+#: plugins/admin/systems/class_phoneGeneric.inc:452
  msgid "CAPI MSN"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:447
+#: plugins/admin/systems/class_phoneGeneric.inc:453
  msgid "Hardware type"
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#, fuzzy, php-format
+msgid "The file '%s/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:49
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#, fuzzy, php-format
+msgid "Can't read '%s/encodings', please check permissions."
  msgstr ""
  "Impossible de lire '/etc/gosa/encodings', veuillez vérifier les permissions."
  
@@ -9835,7 +9590,7 @@ msgstr "Le chemin contient des caractères invalides."
  msgid "Option contains invalid characters."
  msgstr "L'option contient des caractères invalides."
  
-#: plugins/admin/systems/class_workstationStartup.inc:402
+#: plugins/admin/systems/class_workstationStartup.inc:429
  msgid ""
  "There are packages in your configuration, which can't be resolved with "
  "current server/release settings."
@@ -9843,11 +9598,11 @@ msgstr ""
  "Il y à des paquets dans votre configuration, qui ne peuvent pas être trouvés "
  "avec les paramètres de serveur/version actuels."
  
-#: plugins/admin/systems/class_workstationStartup.inc:447
+#: plugins/admin/systems/class_workstationStartup.inc:474
  msgid "Please select a 'FAI server' or remove the 'FAI classes'."
  msgstr "Veuillez sélectionner un 'serveur FAI' ou effacer les 'Classes FAI'."
  
-#: plugins/admin/systems/class_workstationStartup.inc:509
+#: plugins/admin/systems/class_workstationStartup.inc:537
  msgid ""
  "There is already a profile in your selection that contain partition table "
  "configurations."
@@ -9855,11 +9610,11 @@ msgstr ""
  "Il y a déjà un profil dans votre sélection qui contient des configurations "
  "de table de partitions."
  
-#: plugins/admin/systems/class_workstationStartup.inc:721
+#: plugins/admin/systems/class_workstationStartup.inc:754
  msgid "Not available in current setup"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:897
  #, php-format
  msgid ""
  "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
@@ -9868,7 +9623,7 @@ msgstr ""
  "Impossible de trouver une ou plusieurs des classes FAI [%s] dans le serveur "
  "FAI '%s'. le serveur à été remis en 'auto'."
  
-#: plugins/admin/systems/class_workstationStartup.inc:879
+#: plugins/admin/systems/class_workstationStartup.inc:913
  #, fuzzy, php-format
  msgid ""
  "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9880,20 +9635,20 @@ msgstr ""
  "Toutes les classes on été enlevées de ce compte, cliquez sur annuler si vous "
  "ne voulez pas sauver ceci."
  
-#: plugins/admin/systems/class_workstationStartup.inc:1040
+#: plugins/admin/systems/class_workstationStartup.inc:1085
  #, fuzzy, php-format
  msgid "Saving of system workstation/startup with dn '%s' failed."
  msgstr ""
  "La sauvegarde des paramètres de démarrage pour la station de travail à échoué"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1090
+#: plugins/admin/systems/class_workstationStartup.inc:1135
  #, php-format
  msgid ""
  "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
  msgstr ""
  "Impossible d'exécuter REPOSITORY_HOOK '%s' veuillez vérifier votre gosa.conf."
  
-#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/class_workstationStartup.inc:1137
  #: plugins/admin/systems/class_servRepositorySetup.inc:203
  #, php-format
  msgid ""
@@ -9903,27 +9658,27 @@ msgstr ""
  "La commande spécifié REPOSITORY_HOOK '%s', spécifié dans votre gosa.conf, "
  "retourne une chaîne vide."
  
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1155
  #, fuzzy
  msgid "System startup"
  msgstr "Statut du système"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: plugins/admin/systems/class_workstationStartup.inc:1170
  #: plugins/admin/fai/class_faiProfile.inc:453
  #: plugins/admin/fai/faiProfile.tpl:36
  msgid "FAI classes"
  msgstr "Classes FAI"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1126
+#: plugins/admin/systems/class_workstationStartup.inc:1171
  msgid "Debian mirror"
  msgstr "Miroir Debian"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1127
+#: plugins/admin/systems/class_workstationStartup.inc:1172
  #, fuzzy
  msgid "Debian release"
  msgstr "Version actuelle"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1129
+#: plugins/admin/systems/class_workstationStartup.inc:1174
  msgid "FAI status flag"
  msgstr ""
  
@@ -10102,13 +9857,13 @@ msgstr "Section"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:462
  #: plugins/admin/systems/class_printerPPDDialog.inc:465
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:289
  msgid "True"
  msgstr "Vrai"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:463
  #: plugins/admin/systems/class_printerPPDDialog.inc:466
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:286
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:287
  msgid "False"
  msgstr "Faux"
  
@@ -10117,7 +9872,25 @@ msgstr "Faux"
  msgid "Unsupported ppd type '%s' used for '%s' "
  msgstr "Type de PPD '%s' non supporté pour '%s' "
  
-#: plugins/admin/systems/class_printerPPDDialog.inc:485
+#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#, fuzzy, php-format
+msgid "Removing old ppd file '%s' failed."
+msgstr "La suppression de l'application du groupe '%s' à échoué"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#, fuzzy, php-format
+msgid "Removing old ppd file '%s' failed. File is not accessible."
+msgstr ""
+"Impossible d'ajouter un nouveau fichier ppd, le fichier source '%s' n'est "
+"pas accessible."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#, php-format
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:502
  msgid ""
  "Please select a valid ppd file or use 'Cancel' to go back to printer "
  "configuration."
@@ -10130,7 +9903,7 @@ msgstr "Pilote d'Imprimante"
  #: plugins/admin/systems/printerPPDDialog.tpl:5
  #: plugins/admin/systems/workstationService.tpl:7
  #: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:246
+#: plugins/admin/systems/terminalService.tpl:254
  #: plugins/admin/systems/class_glpiAccount.inc:784
  msgid "Model"
  msgstr "Modèle"
@@ -10165,30 +9938,203 @@ msgstr "Afficher les objets correspondants"
  msgid "Regular expression for matching object names"
  msgstr "Expression régulière pour trouver les objets correspondants"
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#, fuzzy, php-format
+msgid "You're about to delete the ppd file '%s' at '%s'."
+msgstr "Vous êtes sur le point de supprimer l'application '%s'."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#, fuzzy, php-format
+msgid "Could not found specified ppd file '%s'."
+msgstr "Impossible d'ouvrir le certificat demandé!"
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+msgid ""
+"Something went wrong while trying to remove the ppd file from server, "
+"possibly we have no write access."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
  #, php-format
  msgid "Selected vendor '%s' does not exists in our list of ppds."
  msgstr "Le vendeur sélectionné '%s' n'existe pas dans notre liste de ppds."
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
  msgid "Printer ppd selection."
  msgstr "Sélection du ppd de votre imprimante."
  
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:157
+#: plugins/admin/systems/class_terminalService.inc:71
+msgid "unknown"
+msgstr "inconnu"
+
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_terminalService.inc:105
+#: plugins/admin/systems/class_terminalService.inc:106
+msgid "bit"
+msgstr "bit"
+
+#: plugins/admin/systems/class_workstationService.inc:138
+#: plugins/admin/systems/class_terminalService.inc:158
+msgid "show chooser"
+msgstr "Afficher le sélecteur"
+
+#: plugins/admin/systems/class_workstationService.inc:139
+#: plugins/admin/systems/class_terminalService.inc:159
+msgid "direct"
+msgstr "direct"
+
+#: plugins/admin/systems/class_workstationService.inc:142
+#: plugins/admin/systems/class_terminalService.inc:162
+msgid "load balanced"
+msgstr "répartition de charge"
+
+#: plugins/admin/systems/class_workstationService.inc:145
+#: plugins/admin/systems/class_terminalService.inc:165
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_workstationService.inc:146
+#: plugins/admin/systems/class_terminalService.inc:166
+msgid "ICA client"
+msgstr "Client ICA"
+
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_terminalService.inc:221
+msgid "Bit"
+msgstr "Bit"
+
+#: plugins/admin/systems/class_workstationService.inc:314
+#: plugins/admin/systems/class_terminalService.inc:316
+msgid "Choose the phone located at the current terminal"
+msgstr "Choisissez le téléphone situé à coté du terminal"
+
+#: plugins/admin/systems/class_workstationService.inc:380
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_terminalService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:395
+msgid "Please specify a valid VSync range."
+msgstr ""
+"Veuillez spécifier une plage valide pour la fréquence de synchronisation "
+"verticale."
+
+#: plugins/admin/systems/class_workstationService.inc:395
+#: plugins/admin/systems/class_workstationService.inc:400
+#: plugins/admin/systems/class_terminalService.inc:404
+#: plugins/admin/systems/class_terminalService.inc:409
+msgid "Please specify a valid HSync range."
+msgstr ""
+"Veuillez spécifier une plage valide pour la fréquence de synchronisation "
+"Horizontale."
+
  #: plugins/admin/systems/class_workstationService.inc:443
  #, fuzzy, php-format
  msgid "Saving of system workstation/service with dn '%s' failed."
  msgstr "La sauvegarde des services de la station de travail à échoué"
  
+#: plugins/admin/systems/class_workstationService.inc:451
+#: plugins/admin/systems/class_terminalService.inc:466
+#, fuzzy
+msgid "Service"
+msgstr "Services"
+
  #: plugins/admin/systems/class_workstationService.inc:452
  #, fuzzy
  msgid "Workstation service"
  msgstr "Nom de la station de travail"
  
+#: plugins/admin/systems/class_workstationService.inc:460
+#: plugins/admin/systems/class_terminalService.inc:475
+#, fuzzy
+msgid "Monitor"
+msgstr "Taille écran"
+
+#: plugins/admin/systems/class_workstationService.inc:461
+#: plugins/admin/systems/class_terminalService.inc:479
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Nouveau pilote"
+
+#: plugins/admin/systems/class_workstationService.inc:462
+#: plugins/admin/systems/class_terminalService.inc:480
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Résolution"
+
+#: plugins/admin/systems/class_workstationService.inc:463
+#: plugins/admin/systems/class_terminalService.inc:481
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Profondeur des couleurs"
+
+#: plugins/admin/systems/class_workstationService.inc:464
+#: plugins/admin/systems/class_terminalService.inc:482
+#, fuzzy
+msgid "Hsync"
+msgstr "Fréquence de synchronisation Horizontale"
+
+#: plugins/admin/systems/class_workstationService.inc:465
+#: plugins/admin/systems/class_terminalService.inc:483
+#, fuzzy
+msgid "Vsync"
+msgstr "Fréquence de synchronisation verticale"
+
  #: plugins/admin/systems/class_workstationService.inc:466
  #, fuzzy
  msgid "Use DDC"
  msgstr "ID de l'utilisateur"
  
+#: plugins/admin/systems/class_workstationService.inc:467
+#: plugins/admin/systems/class_terminalService.inc:487
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "activé"
+
+#: plugins/admin/systems/class_workstationService.inc:468
+#: plugins/admin/systems/class_terminalService.inc:491
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Sélectionnez le modèle du clavier"
+
+#: plugins/admin/systems/class_workstationService.inc:469
+#: plugins/admin/systems/class_terminalService.inc:492
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Sélectionnez la disposition du clavier"
+
+#: plugins/admin/systems/class_workstationService.inc:470
+#: plugins/admin/systems/class_terminalService.inc:493
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Sélectionnez la variante du clavier"
+
+#: plugins/admin/systems/class_workstationService.inc:471
+#: plugins/admin/systems/class_terminalService.inc:494
+#, fuzzy
+msgid "Mouse type"
+msgstr "type mime"
+
+#: plugins/admin/systems/class_workstationService.inc:472
+#: plugins/admin/systems/class_terminalService.inc:495
+#, fuzzy
+msgid "Mouse port"
+msgstr "Point de montage"
+
+#: plugins/admin/systems/class_workstationService.inc:473
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:76
+#: plugins/admin/systems/class_terminalService.inc:496
+#: plugins/gofon/phoneaccount/generic.tpl:30
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Matériel téléphonique"
+
  #: plugins/admin/systems/workstationService.tpl:4
  #: plugins/admin/systems/terminalService.tpl:4
  msgid "Keyboard"
@@ -10267,41 +10213,42 @@ msgid "Display device"
  msgstr "Écran"
  
  #: plugins/admin/systems/workstationService.tpl:167
+#: plugins/admin/systems/terminalService.tpl:147
  msgid "Use DDC for automatic detection"
  msgstr "Utiliser DCC pour la détection automatique"
  
  #: plugins/admin/systems/workstationService.tpl:170
-#: plugins/admin/systems/terminalService.tpl:142
+#: plugins/admin/systems/terminalService.tpl:150
  msgid "HSync"
  msgstr "Fréquence de synchronisation Horizontale"
  
  #: plugins/admin/systems/workstationService.tpl:175
-#: plugins/admin/systems/terminalService.tpl:146
+#: plugins/admin/systems/terminalService.tpl:154
  msgid "Horizontal refresh frequency for installed monitor"
  msgstr "Fréquence de rafraîchissement horizontal pour l'écran installé"
  
  #: plugins/admin/systems/workstationService.tpl:181
-#: plugins/admin/systems/terminalService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:158
  msgid "VSync"
  msgstr "Fréquence de synchronisation verticale"
  
  #: plugins/admin/systems/workstationService.tpl:186
-#: plugins/admin/systems/terminalService.tpl:154
+#: plugins/admin/systems/terminalService.tpl:162
  msgid "Vertical refresh frequency for installed monitor"
  msgstr "Fréquence de rafraîchissement verticale pour l'écran installé"
  
  #: plugins/admin/systems/workstationService.tpl:201
-#: plugins/admin/systems/terminalService.tpl:237
+#: plugins/admin/systems/terminalService.tpl:245
  msgid "Scan device"
  msgstr "Scanner"
  
  #: plugins/admin/systems/workstationService.tpl:204
-#: plugins/admin/systems/terminalService.tpl:239
+#: plugins/admin/systems/terminalService.tpl:247
  msgid "Select to start SANE scan service on terminal"
  msgstr "Sélectionner afin de démarrer le service scanner SANE sur le terminal"
  
  #: plugins/admin/systems/workstationService.tpl:207
-#: plugins/admin/systems/terminalService.tpl:241
+#: plugins/admin/systems/terminalService.tpl:249
  msgid "Provide scan services"
  msgstr "Fournir des services de scanner"
  
@@ -10341,17 +10288,17 @@ msgstr "Liste des classes FAI utilisées"
  msgid "set"
  msgstr "activé"
  
-#: plugins/admin/systems/workstationStartup.tpl:137
+#: plugins/admin/systems/workstationStartup.tpl:141
  #: plugins/admin/systems/terminalStartup.tpl:66
  msgid "Kernel modules (format: name parameters)"
  msgstr "Modules du kernel (format : nom paramètre)"
  
-#: plugins/admin/systems/workstationStartup.tpl:140
+#: plugins/admin/systems/workstationStartup.tpl:144
  #: plugins/admin/systems/terminalStartup.tpl:69
  msgid "Add additional modules to load on startup"
  msgstr "Ajouter des modules à charger au démarrage"
  
-#: plugins/admin/systems/workstationStartup.tpl:176
+#: plugins/admin/systems/workstationStartup.tpl:180
  #: plugins/admin/systems/terminalStartup.tpl:105
  msgid "Mountpoint"
  msgstr "Point de montage"
@@ -10382,65 +10329,75 @@ msgstr "Sélectionnez afin d'avoir d'obtenir un démarrage plus verbeux"
  msgid "use debug mode for startup"
  msgstr "utilisez le mode de débogage pour le démarrage"
  
-#: plugins/admin/systems/terminalService.tpl:169
+#: plugins/admin/systems/terminalService.tpl:173
+#: plugins/admin/systems/class_terminalService.inc:477
+msgid "Remote desktop"
+msgstr "Bureau distant"
+
+#: plugins/admin/systems/terminalService.tpl:177
  msgid "Connect method"
  msgstr "Méthode de connexion"
  
-#: plugins/admin/systems/terminalService.tpl:172
+#: plugins/admin/systems/terminalService.tpl:180
  msgid "Choose method to connect to terminal server"
  msgstr "Sélectionnez la méthode de connexion au terminal"
  
-#: plugins/admin/systems/terminalService.tpl:180
+#: plugins/admin/systems/terminalService.tpl:188
  msgid "Terminal server"
  msgstr "Serveur de terminaux"
  
-#: plugins/admin/systems/terminalService.tpl:183
+#: plugins/admin/systems/terminalService.tpl:191
  msgid "Select specific terminal server to use"
  msgstr "Sélectionnez un serveur de terminaux à utiliser"
  
-#: plugins/admin/systems/terminalService.tpl:191
+#: plugins/admin/systems/terminalService.tpl:199
  msgid "Font server"
  msgstr "Serveur de Police de caractère"
  
-#: plugins/admin/systems/terminalService.tpl:194
+#: plugins/admin/systems/terminalService.tpl:202
  msgid "Select specific font server to use"
  msgstr "Sélectionnez le serveur de polices de caractère à utiliser"
  
-#: plugins/admin/systems/terminalService.tpl:211
+#: plugins/admin/systems/terminalService.tpl:219
  msgid "Print device"
  msgstr "Imprimante"
  
-#: plugins/admin/systems/terminalService.tpl:213
+#: plugins/admin/systems/terminalService.tpl:221
  msgid "Select to start IPP based printing service on terminal"
  msgstr "Sélectionnez pour démarrer le service d'impression IPP sur le terminal"
  
-#: plugins/admin/systems/terminalService.tpl:215
+#: plugins/admin/systems/terminalService.tpl:223
  msgid "Provide print services"
  msgstr "Fournir des services d'impression"
  
-#: plugins/admin/systems/terminalService.tpl:224
+#: plugins/admin/systems/terminalService.tpl:229
+#: plugins/admin/systems/class_terminalService.inc:486
+msgid "Spool server"
+msgstr "Serveur de file d'attente"
+
+#: plugins/admin/systems/terminalService.tpl:232
  msgid "Select NFS filesystem to place spool files on"
  msgstr "Sélectionnez le système de fichier NFS où sera placé la file d'attente"
  
-#: plugins/admin/systems/terminalService.tpl:249
+#: plugins/admin/systems/terminalService.tpl:257
  msgid "Select scanner driver to use"
  msgstr "Sélectionnez le pilote du scanner"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:1
-#: plugins/admin/systems/class_servRepository.inc:349
+#: plugins/admin/systems/class_servRepository.inc:365
  #: plugins/admin/fai/faiPackage.tpl:33
  msgid "Repository"
  msgstr "Dépôt"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:364
+#: plugins/admin/systems/class_servRepository.inc:380
  msgid "Parent server"
  msgstr "Serveur Père"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:39
-#: plugins/admin/systems/class_servRepository.inc:239
-#: plugins/admin/systems/class_servRepository.inc:262
-#: plugins/admin/systems/class_servRepository.inc:363
+#: plugins/admin/systems/class_servRepository.inc:253
+#: plugins/admin/systems/class_servRepository.inc:276
+#: plugins/admin/systems/class_servRepository.inc:379
  msgid "Sections"
  msgstr "Sections"
  
@@ -10460,13 +10417,18 @@ msgstr ""
  "Impossible d'exécuter la commande spécifiée REPOSITORY_HOOK '%s'. Veuillez "
  "vérifier votre gosaconf."
  
-#: plugins/admin/systems/class_servRepository.inc:35
-#: plugins/admin/systems/class_servRepository.inc:339
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:44
+#: plugins/admin/systems/class_servRepository.inc:355
+#: plugins/admin/systems/class_servRepository.inc:366
  msgid "Repository service"
  msgstr "Service de dépôt"
  
-#: plugins/admin/systems/class_servRepository.inc:138
+#: plugins/admin/systems/class_servRepository.inc:94
+#: plugins/admin/fai/class_faiSummaryTab.inc:175
+msgid "You can't use this plugin until FAI is activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:152
  #, php-format
  msgid ""
  "You can't delete this release, it is still used by these workstations [%s]. "
@@ -10476,7 +10438,7 @@ msgstr ""
  "stations de travail [%s]. Veuillez régler ces problèmes d'abord pour que la "
  "base de données reste cohérente."
  
-#: plugins/admin/systems/class_servRepository.inc:172
+#: plugins/admin/systems/class_servRepository.inc:186
  #, php-format
  msgid ""
  "Be careful editing this release, it is still used by these workstations [%s]."
@@ -10484,13 +10446,13 @@ msgstr ""
  "Soyez prudent en éditant cette version, elle est toujours par ces système(s) "
  "[%s]. "
  
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:212
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
  #: plugins/admin/fai/class_faiManagement.inc:343
  msgid "This name is already in use."
  msgstr "Le nom spécifié est déjà utilisé."
  
-#: plugins/admin/systems/class_servRepository.inc:359
+#: plugins/admin/systems/class_servRepository.inc:375
  #: plugins/admin/systems/class_goGlpiServer.inc:92
  #: plugins/admin/systems/class_goCupsServer.inc:71
  #: plugins/admin/systems/class_serverService.inc:8
@@ -10501,7 +10463,7 @@ msgstr "Le nom spécifié est déjà utilisé."
  msgid "Start"
  msgstr "Démarrer"
  
-#: plugins/admin/systems/class_servRepository.inc:360
+#: plugins/admin/systems/class_servRepository.inc:376
  #: plugins/admin/systems/class_goGlpiServer.inc:93
  #: plugins/admin/systems/class_goCupsServer.inc:72
  #: plugins/admin/systems/class_serverService.inc:7
@@ -10513,7 +10475,7 @@ msgstr "Démarrer"
  msgid "Stop"
  msgstr "Arrêter"
  
-#: plugins/admin/systems/class_servRepository.inc:361
+#: plugins/admin/systems/class_servRepository.inc:377
  #: plugins/admin/systems/class_goGlpiServer.inc:94
  #: plugins/admin/systems/class_goCupsServer.inc:73
  #: plugins/admin/systems/class_serverService.inc:9
@@ -10524,12 +10486,12 @@ msgstr "Arrêter"
  msgid "Restart"
  msgstr "Redémarrer"
  
-#: plugins/admin/systems/class_servRepository.inc:362
+#: plugins/admin/systems/class_servRepository.inc:378
  #, fuzzy
  msgid "Releases"
  msgstr "Version"
  
-#: plugins/admin/systems/class_servRepository.inc:365
+#: plugins/admin/systems/class_servRepository.inc:381
  msgid "Url"
  msgstr ""
  
@@ -10625,13 +10587,9 @@ msgstr "Expression régulière concordant avec les noms des périphériques"
  msgid "Use"
  msgstr "Utiliser"
  
-#: plugins/admin/systems/goFaxServer.tpl:1
-msgid "FAX database information"
-msgstr "Information sur la base de données des FAX"
-
-#: plugins/admin/systems/goFaxServer.tpl:4
-msgid "FAX DB user"
-msgstr "utilisateur de la base de données du FAX"
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
+msgstr ""
  
  #: plugins/admin/systems/class_glpiAccount.inc:147
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:161
@@ -10767,7 +10725,7 @@ msgid "Attachment"
  msgstr "Document lié"
  
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:136
  msgid "File"
  msgstr "Fichier"
  
@@ -10783,6 +10741,37 @@ msgstr "type mime"
  msgid "use"
  msgstr "utiliser"
  
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+msgid "Go to root department"
+msgstr "Aller au département de base"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:194
+msgid "Go up one department"
+msgstr "Monter d'un département"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+msgid "Go to users department"
+msgstr "Aller au département des utilisateurs"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+#: include/class_MultiSelectWindow.inc:204
+msgid "Home"
+msgstr "Acceuil"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: include/class_MultiSelectWindow.inc:209
+msgid "Reload list"
+msgstr "Recharger la liste"
+
  #: plugins/admin/systems/glpiSelectUser.tpl:23
  msgid ""
  "This dialog allows you to select a user as technical responsible person."
@@ -10924,7 +10913,7 @@ msgid "Add/Edit network interface"
  msgstr "Ajouter/Modifier une carte réseau"
  
  #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:532
+#: plugins/admin/systems/class_termDNS.inc:537
  msgid "MAC address"
  msgstr "Adresse MAC"
  
@@ -11006,7 +10995,7 @@ msgid "New processor"
  msgstr "Nouveau processeur"
  
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "P"
  msgstr "P"
  
@@ -11141,7 +11130,8 @@ msgid "Upload wasn't successfull."
  msgstr "Le téléchargement n'a pas réussi."
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#, fuzzy, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
  msgstr ""
  "Le répertoire de téléchargement pour gpli '/etc/gosa/glpi' est manquant."
  
@@ -11306,7 +11296,7 @@ msgstr ""
  msgid "Cartridges"
  msgstr "Cartouches"
  
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:137
  #, php-format
  msgid ""
  "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
@@ -11314,19 +11304,19 @@ msgstr ""
  "Impossible d'exécuter la commande spécifiée AUTO_NETWORK_HOOK '%s' veuillez "
  "vérifier votre gosa.conf."
  
-#: plugins/admin/systems/class_termDNS.inc:311
+#: plugins/admin/systems/class_termDNS.inc:319
  msgid "The required field 'IP-address' is not set."
  msgstr "Le champ obligatoire 'adresse IP' n'est pas rempli."
  
-#: plugins/admin/systems/class_termDNS.inc:318
+#: plugins/admin/systems/class_termDNS.inc:323
  msgid "Wrong IP format in field IP-address."
  msgstr "L'adresse ip dans le champ adresse IP n'est pas valide."
  
-#: plugins/admin/systems/class_termDNS.inc:324
+#: plugins/admin/systems/class_termDNS.inc:330
  msgid "The required field 'MAC-address' is not set."
  msgstr "Le champ obligatoire 'MAC-address' n'est pas rempli."
  
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_termDNS.inc:333
  msgid ""
  "The given macaddress is invalid. There must be 6 2byte segments seperated by "
  "':'."
@@ -11334,17 +11324,17 @@ msgstr ""
  "La mac adresse introduite est invalide. Il doit y avoir 6 fois deux bytes "
  "séparés par ':'."
  
-#: plugins/admin/systems/class_termDNS.inc:351
+#: plugins/admin/systems/class_termDNS.inc:353
  #, php-format
  msgid "Found duplicate value for record type '%s'."
  msgstr "Valeur dupliquée trouvée pour l'enregistrement de type '%s'."
  
-#: plugins/admin/systems/class_termDNS.inc:359
+#: plugins/admin/systems/class_termDNS.inc:361
  #, php-format
  msgid "Found more than one entry for the uniqe record type '%s'."
  msgstr "Plus d'un entrée trouvée pour l'enregistrement unique '%s'."
  
-#: plugins/admin/systems/class_termDNS.inc:370
+#: plugins/admin/systems/class_termDNS.inc:372
  #, php-format
  msgid ""
  "The device IP '%s' is added as 'A Record', this will be done automatically, "
@@ -11353,33 +11343,33 @@ msgstr ""
  "L'adresse IP '%s' est ajoutée comme un 'A' record, ceci sera fait "
  "automatiquement, veuillez enlever l'enregistrement."
  
-#: plugins/admin/systems/class_termDNS.inc:377
+#: plugins/admin/systems/class_termDNS.inc:379
  #: plugins/admin/systems/class_servDNSeditZone.inc:409
  #, php-format
  msgid "Only lowercase is allowed, please check your '%ss'."
  msgstr ""
  "Seulement les minuscules sont autorisée, veuillez vérifier votre '%ss'."
  
-#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:463
  #, fuzzy, php-format
  msgid "Saving of terminal/dns account with dn '%s' failed."
  msgstr "La sauvegarde du compte de messagerie à échoué"
  
-#: plugins/admin/systems/class_termDNS.inc:522
+#: plugins/admin/systems/class_termDNS.inc:527
  msgid "DNS"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:528
  #, fuzzy
  msgid "DNS settings"
  msgstr "Configuration Samba"
  
-#: plugins/admin/systems/class_termDNS.inc:531
+#: plugins/admin/systems/class_termDNS.inc:536
  #, fuzzy
  msgid "IP address"
  msgstr "Adresse IP"
  
-#: plugins/admin/systems/class_termDNS.inc:540
+#: plugins/admin/systems/class_termDNS.inc:545
  #, fuzzy
  msgid "DNS records"
  msgstr "Enregistrement dns"
@@ -11485,7 +11475,7 @@ msgstr "Choisissez un groupe d'objets"
  
  #: plugins/admin/systems/class_servDNSeditZone.inc:290
  #: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:371
  msgid "Down"
  msgstr "En bas"
  
@@ -11578,43 +11568,38 @@ msgstr ""
  "Impossible de renommer '%s' en '%s' il y a déjà une entrée avec le même nom "
  "dans la page d'édition de la zone."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:206
  #, php-format
  msgid "Entry name '%s' contains invalid characters."
  msgstr "l'enregistrement '%s' contient des des caractères invalides."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
  #, php-format
  msgid "Can not rename '%s' to '%s',the destination name already exists."
  msgstr "Impossible de renommer '%s' en '%s', ce enregistrement existe déjà."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:221
  #, php-format
  msgid "Can not create '%s',the destination name already exists."
  msgstr "Impossible de créer '%s', cet enregistrement existe déjà."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
  #, php-format
  msgid "The name '%s' is used more than once."
  msgstr "Le nom '%s' est utilisé plus d'une fois."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
-msgstr "Le nom '%s' doit être écrit en minuscule."
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
  #, php-format
  msgid "The record type '%s' is a unique type and can't be defined twice."
  msgstr ""
  "Le type d'enregistrement '%s' est unique et ne peut être défini deux fois."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:260
  #, php-format
  msgid "There is an empty '%s' for host '%s'."
  msgstr "Il y a un '%s' vide pour l'hôte '%s'."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:268
  #, php-format
  msgid "There is a duplicate entry in '%s' for '%s'."
  msgstr "Il y a deux enregistrements '%s' pour '%s'."
@@ -11726,94 +11711,90 @@ msgstr "Montrer les périphériques réseau"
  msgid "Display systems of user"
  msgstr "Afficher les systèmes de l'utilisateur"
  
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:148
  msgid "New Terminal template"
  msgstr "Nouveau modèle de terminal"
  
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:154
  msgid "New Workstation template"
  msgstr "Nouveau modèle de station de travail"
  
-#: plugins/admin/systems/class_divListSystem.inc:140
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:160
  msgid "New Server"
  msgstr "Nouveau Serveur"
  
-#: plugins/admin/systems/class_divListSystem.inc:142
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:166
  msgid "New Printer"
  msgstr "Nouvelle Imprimante"
  
-#: plugins/admin/systems/class_divListSystem.inc:144
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:172
  msgid "New Phone"
  msgstr "Nouveau Téléphone"
  
-#: plugins/admin/systems/class_divListSystem.inc:146
-#: plugins/admin/systems/class_divListSystem.inc:147
+#: plugins/admin/systems/class_divListSystem.inc:178
  msgid "New Component"
  msgstr "Nouveau composant"
  
-#: plugins/admin/systems/class_divListSystem.inc:165
+#: plugins/admin/systems/class_divListSystem.inc:203
  msgid "Cups Server"
  msgstr "Serveur Cups"
  
-#: plugins/admin/systems/class_divListSystem.inc:166
+#: plugins/admin/systems/class_divListSystem.inc:204
  msgid "Log Db"
  msgstr "Base de données de logs"
  
-#: plugins/admin/systems/class_divListSystem.inc:167
+#: plugins/admin/systems/class_divListSystem.inc:205
  msgid "Syslog Server"
  msgstr "Serveur de logs systèmes"
  
-#: plugins/admin/systems/class_divListSystem.inc:168
+#: plugins/admin/systems/class_divListSystem.inc:206
  msgid "Mail Server"
  msgstr "Serveur de messagerie"
  
-#: plugins/admin/systems/class_divListSystem.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:207
  msgid "Imap Server"
  msgstr "Serveur Imap"
  
-#: plugins/admin/systems/class_divListSystem.inc:170
+#: plugins/admin/systems/class_divListSystem.inc:208
  msgid "Nfs Server"
  msgstr "Serveur NFS"
  
-#: plugins/admin/systems/class_divListSystem.inc:171
+#: plugins/admin/systems/class_divListSystem.inc:209
  msgid "Kerberos Server"
  msgstr "Serveur Kerberos"
  
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:210
  msgid "Asterisk Server"
  msgstr "Serveur Asterisk"
  
-#: plugins/admin/systems/class_divListSystem.inc:173
+#: plugins/admin/systems/class_divListSystem.inc:211
  msgid "Fax Server"
  msgstr "Serveur de Fax"
  
-#: plugins/admin/systems/class_divListSystem.inc:174
+#: plugins/admin/systems/class_divListSystem.inc:212
  msgid "Ldap Server"
  msgstr "Serveur Ldap"
  
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/acl/class_divListACL.inc:123
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/acl/class_divListACL.inc:128
  msgid "Edit system"
  msgstr "Editer un système"
  
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/acl/class_divListACL.inc:126
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/acl/class_divListACL.inc:132
  msgid "Delete system"
  msgstr "Effacer un système"
  
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_divListSystem.inc:308
  msgid "Set root       password"
  msgstr "Indiquez le mot de passe administrateur"
  
-#: plugins/admin/systems/class_divListSystem.inc:229
+#: plugins/admin/systems/class_divListSystem.inc:315
  #, fuzzy
  msgid "Create CD"
  msgstr "Créer"
  
-#: plugins/admin/systems/class_divListSystem.inc:230
+#: plugins/admin/systems/class_divListSystem.inc:316
  #, fuzzy
  msgid "Create FAI CD"
  msgstr "Créer un nouvel objet FAI"
@@ -11844,6 +11825,10 @@ msgstr "Tout les service disponibles sont déjà utilisés."
  msgid "Cups"
  msgstr "au dessus"
  
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr ""
+
  #: plugins/admin/systems/goLdapServer.tpl:1
  #: plugins/admin/systems/class_goLdapServer.inc:28
  msgid "LDAP service"
@@ -11928,6 +11913,15 @@ msgstr "Editer le service"
  msgid "Remove service"
  msgstr "Supprimer le service"
  
+#: plugins/admin/systems/class_goTerminalServer.inc:31
+#: plugins/admin/systems/class_goTerminalServer.inc:54
+#: plugins/admin/systems/class_goTerminalServer.inc:117
+#: plugins/admin/systems/class_goTerminalServer.inc:118
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#: plugins/admin/systems/class_terminalService.inc:467
+msgid "Terminal service"
+msgstr "Services de terminaux"
+
  #: plugins/admin/systems/class_goTerminalServer.inc:78
  #, fuzzy, php-format
  msgid "Saving server services/terminalServer with dn '%s' failed."
@@ -11944,6 +11938,12 @@ msgstr ""
  msgid "Temporary disable login"
  msgstr "Désactiver temporairement le login"
  
+#: plugins/admin/systems/class_goTerminalServer.inc:127
+#: plugins/admin/systems/goTerminalServer.tpl:12
+#: plugins/admin/systems/class_terminalService.inc:478
+msgid "Font path"
+msgstr "Répertoire des polices de caractères"
+
  #: plugins/admin/systems/class_serverService.inc:288
  msgid "Can't set status while this server is not saved."
  msgstr "Impossible d'activer le statut tant que ce serveur n'est pas sauvé"
@@ -12663,6 +12663,44 @@ msgstr ""
  "La commande '%s', spécifiée dans le ACTION_HOOK de l'extension '%s' n'existe "
  "pas."
  
+#: plugins/admin/systems/class_terminalService.inc:157
+msgid "default"
+msgstr "défaut"
+
+#: plugins/admin/systems/class_terminalService.inc:457
+#, fuzzy, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr "La sauvegarde des Informations sur les services du terminal à échoué"
+
+#: plugins/admin/systems/class_terminalService.inc:476
+#: plugins/admin/ogroups/class_phonequeue.inc:748
+#, fuzzy
+msgid "Method"
+msgstr "méthode"
+
+#: plugins/admin/systems/class_terminalService.inc:484
+msgid "Auto-Sync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:485
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Service d'impression"
+
+#: plugins/admin/systems/class_terminalService.inc:488
+#, fuzzy
+msgid "Scanner model"
+msgstr "activé"
+
+#: plugins/admin/systems/class_terminalService.inc:489
+msgid "Haeh ? "
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:490
+#, fuzzy
+msgid "..."
+msgstr ".."
+
  #: plugins/admin/ogroups/termgroup.tpl:2
  msgid ""
  "Actions you choose here influence all systems in this object group. "
@@ -12686,8 +12724,8 @@ msgstr "Objets membres"
  msgid "Phone queue"
  msgstr "Queue téléphonique"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:88
-#: plugins/admin/ogroups/class_termgroup.inc:383
+#: plugins/admin/ogroups/tabs_ogroups.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:382
  msgid "System"
  msgstr "Système"
  
@@ -12695,21 +12733,27 @@ msgstr "Système"
  msgid "Terminals"
  msgstr "Terminaux"
  
-#: plugins/admin/ogroups/class_termgroup.inc:114
+#: plugins/admin/ogroups/class_termgroup.inc:108
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr ""
+"Vous n'avez pas les droits nécessaires pour créer une station de travail "
+"dans cette 'Base'."
+
+#: plugins/admin/ogroups/class_termgroup.inc:113
  msgid "There must be at least one NTP server selected."
  msgstr "Il doit y avoir au moins un serveur NTP sélectionné."
  
-#: plugins/admin/ogroups/class_termgroup.inc:168
+#: plugins/admin/ogroups/class_termgroup.inc:167
  #, php-format
  msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:376
+#: plugins/admin/ogroups/class_termgroup.inc:375
  #, fuzzy
  msgid "Saving workstation failed"
  msgstr "L'installation du serveur à échoué"
  
-#: plugins/admin/ogroups/class_termgroup.inc:384
+#: plugins/admin/ogroups/class_termgroup.inc:383
  #, fuzzy
  msgid "System group"
  msgstr "Statut du système"
@@ -12771,18 +12815,18 @@ msgid "Display objects of department"
  msgstr "Afficher les objets du département"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:715
+#: plugins/admin/ogroups/class_ogroup.inc:698
  #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
  msgid "Object groups"
  msgstr "Groupes d'objets"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:159
+#: plugins/admin/ogroups/class_ogroupManagement.inc:154
  #, php-format
  msgid "You're about to delete the object group '%s'."
  msgstr "Vous êtes sur le point de supprimer le groupe objet '%s'."
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:165
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:160
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
  msgid "You are not allowed to delete this object group!"
  msgstr "Vous n'êtes pas autorisé à supprimer le groupe objet!"
  
@@ -12790,78 +12834,78 @@ msgstr "Vous n'êtes pas autorisé à supprimer le groupe objet!"
  msgid "This 'dn' is no object group."
  msgstr "Ce 'dn' n'est pas un groupe objet."
  
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:290
  msgid "too many different objects!"
  msgstr "nombre d'objets différents trop important!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:292
  msgid "users"
  msgstr "utilisateurs"
  
-#: plugins/admin/ogroups/class_ogroup.inc:295
+#: plugins/admin/ogroups/class_ogroup.inc:293
  msgid "groups"
  msgstr "groupes"
  
-#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:294
  msgid "applications"
  msgstr "applications"
  
-#: plugins/admin/ogroups/class_ogroup.inc:297
+#: plugins/admin/ogroups/class_ogroup.inc:295
  msgid "departments"
  msgstr "départements"
  
-#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:296
  msgid "servers"
  msgstr "serveurs"
  
-#: plugins/admin/ogroups/class_ogroup.inc:299
+#: plugins/admin/ogroups/class_ogroup.inc:297
  msgid "workstations"
  msgstr "stations de travail"
  
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:298
  msgid "terminals"
  msgstr "terminaux"
  
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:299
  msgid "phones"
  msgstr "téléphones"
  
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:300
  msgid "printers"
  msgstr "imprimantes"
  
-#: plugins/admin/ogroups/class_ogroup.inc:309
+#: plugins/admin/ogroups/class_ogroup.inc:307
  msgid "and"
  msgstr "et"
  
-#: plugins/admin/ogroups/class_ogroup.inc:462
+#: plugins/admin/ogroups/class_ogroup.inc:444
  msgid "Non existing dn:"
  msgstr "le dn n'existe pas:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:604
+#: plugins/admin/ogroups/class_ogroup.inc:586
  msgid "There is already an object with this cn."
  msgstr "Il y a déjà un objet avec ce cn."
  
-#: plugins/admin/ogroups/class_ogroup.inc:618
+#: plugins/admin/ogroups/class_ogroup.inc:601
  msgid "You can combine two different object types at maximum only!"
  msgstr "Vous pouvez combiner au maximum deux objets différents !"
  
-#: plugins/admin/ogroups/class_ogroup.inc:667
+#: plugins/admin/ogroups/class_ogroup.inc:650
  #, fuzzy, php-format
  msgid "Saving of object group/generic with dn '%s' failed."
  msgstr "La sauvegarde du groupe d'objets à échoué"
  
-#: plugins/admin/ogroups/class_ogroup.inc:680
+#: plugins/admin/ogroups/class_ogroup.inc:663
  #, fuzzy, php-format
  msgid "Removing of object group/generic with dn '%s' failed."
  msgstr "La suppression du groupe d'objet à échoué"
  
-#: plugins/admin/ogroups/class_ogroup.inc:710
+#: plugins/admin/ogroups/class_ogroup.inc:693
  #, fuzzy
  msgid "Object group generic"
  msgstr "Groupes d'objets"
  
-#: plugins/admin/ogroups/class_ogroup.inc:721
+#: plugins/admin/ogroups/class_ogroup.inc:704
  #, fuzzy
  msgid "Member"
  msgstr "Membres"
@@ -13119,7 +13163,7 @@ msgstr ""
  "peuvent pas être sauvés."
  
  #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:307
  #, php-format
  msgid ""
  "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13133,9 +13177,9 @@ msgstr ""
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:97
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:317
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/macro/class_gofonMacro.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
+#: plugins/gofon/macro/class_gofonMacro.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:318
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:434
  #, php-format
  msgid "Can't select database %s on %s."
  msgstr "Impossible de sélectionner la base de données %s située sur %s."
@@ -13152,8 +13196,8 @@ msgstr ""
  #: plugins/admin/ogroups/class_phonequeue.inc:537
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1185
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:474
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:476
  #, php-format
  msgid "The specified telephonenumber '%s' is already assigned to '%s'."
  msgstr "Le numéro de téléphone %s est déjà utilisé par '%s'."
@@ -13167,8 +13211,8 @@ msgstr "La sauvegarde des paramètres de messagerie pour le groupe à échoué"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:90
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1067
-#: plugins/gofon/macro/class_gofonMacro.inc:234
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:423
  #, php-format
  msgid ""
  "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13333,16 +13377,16 @@ msgstr "Sélectionner pour afficher les groupes contenant des téléphones"
  msgid "Show groups containing phones"
  msgstr "Afficher les groupes contenant un/des téléphones"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
  msgid "Create new object group"
  msgstr "Créer un nouveau groupe d'objets"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:207
  #, fuzzy
  msgid "You are not allowed to remove this entry."
  msgstr "Vous n'êtes pas autorisé à supprimer cette entrée!"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:218
+#: plugins/admin/ogroups/class_divListOGroup.inc:222
  #: plugins/generic/references/class_reference.inc:50
  msgid "Object group"
  msgstr "Groupes d'objets"
@@ -13356,16 +13400,31 @@ msgstr "Veuillez entrer un nouveau nom"
  msgid "ACLs"
  msgstr "ACLs"
  
-#: plugins/admin/acl/class_aclManagement.inc:159
+#: plugins/admin/acl/class_aclManagement.inc:122
+#, fuzzy
+msgid "You are not allowed to edit this acl."
+msgstr "Vous n'êtes pas autorisé à supprimer cette acl!"
+
+#: plugins/admin/acl/class_aclManagement.inc:167
  #, php-format
  msgid "You're about to delete the acl %s."
  msgstr "Vous êtes sur le point de supprimer l'acl '%s'."
  
-#: plugins/admin/acl/class_aclManagement.inc:165
-#: plugins/admin/acl/class_aclManagement.inc:191
+#: plugins/admin/acl/class_aclManagement.inc:173
+#: plugins/admin/acl/class_aclManagement.inc:198
  msgid "You are not allowed to delete this acl!"
  msgstr "Vous n'êtes pas autorisé à supprimer cette acl!"
  
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430
+#, fuzzy
+msgid "Access control list"
+msgstr "Contrôle d'accès"
+
+#: plugins/admin/acl/class_aclManagement.inc:433
+msgid "I don't know Jack"
+msgstr ""
+
  #: plugins/admin/acl/class_divListACL.inc:31
  msgid "List of acl"
  msgstr "Liste des acl"
@@ -13378,30 +13437,14 @@ msgstr "Liste des acls"
  msgid "This menu allows you to edit and delete selected acls."
  msgstr "Ce menu vous permet créer, effacer les acls sélectionnées."
  
-#: plugins/admin/acl/class_divListACL.inc:61
+#: plugins/admin/acl/class_divListACL.inc:60
  msgid "Display acls matching"
  msgstr "Afficher les acls correspondant à"
  
-#: plugins/admin/acl/class_divListACL.inc:109
+#: plugins/admin/acl/class_divListACL.inc:115
  msgid "Acl"
  msgstr "Acl"
  
-#: plugins/admin/acl/class_divListACL.inc:153
-msgid "Select to display users"
-msgstr "Sélectionnez afin d'afficher les utilisateurs"
-
-#: plugins/admin/acl/class_divListACL.inc:153
-msgid "Display user"
-msgstr "Afficher l'utilisateur"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-msgid "Select to display departments"
-msgstr "Sélectionner pour voir les départements"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-msgid "Display departments"
-msgstr "Afficher les départements"
-
  #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
  msgid "ACL management"
  msgstr "Gestion des ACL"
@@ -13426,33 +13469,35 @@ msgstr "Choisissez une variable à effacer ou éditer"
  msgid "Fully Automatic Installation"
  msgstr "Installation entièrement automatique (FAI)"
  
-#: plugins/admin/fai/class_faiScript.inc:422
+#: plugins/admin/fai/class_faiScript.inc:433
  #, php-format
  msgid "Creating of FAI/script with dn '%s' failed."
  msgstr "Créer un nouveau script FAI avec le dn '%s' à échoué."
  
-#: plugins/admin/fai/class_faiScript.inc:519
+#: plugins/admin/fai/class_faiScript.inc:530
  #: plugins/admin/fai/class_faiHookEntry.inc:191
  msgid "FAI script"
  msgstr "Script FAI"
  
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
+#: plugins/admin/fai/class_faiPackage.inc:539
+#: plugins/admin/fai/class_faiPackage.inc:542
  #, fuzzy
  msgid "Readonly"
  msgstr "Lire"
  
-#: plugins/admin/fai/class_faiTemplate.inc:401
+#: plugins/admin/fai/class_faiTemplate.inc:414
  #, php-format
  msgid "Saving of FAI/template with dn '%s' failed."
  msgstr "La sauvegarde du modèle FAI avec le dn '%s' à échoué."
  
-#: plugins/admin/fai/class_faiTemplate.inc:487
+#: plugins/admin/fai/class_faiTemplate.inc:500
  msgid "FAI template"
  msgstr "Modèle FAI"
  
  #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:853
+#: plugins/admin/fai/class_faiManagement.inc:863
  msgid "FAI"
  msgstr "FAI"
  
@@ -13498,18 +13543,18 @@ msgstr "Le nom utilisé pour le verrouillage est invalide."
  msgid "You are not allowed to create a new branch."
  msgstr "Vous n'êtes pas autorisé à ajouter un adresse de transfert."
  
-#: plugins/admin/fai/class_faiManagement.inc:506
-#: plugins/admin/fai/class_faiManagement.inc:522
+#: plugins/admin/fai/class_faiManagement.inc:516
+#: plugins/admin/fai/class_faiManagement.inc:532
  #, fuzzy, php-format
  msgid "You are not allowed to create a new '%s' object."
  msgstr "Vous n'êtes pas autorisé à supprimer le groupe objet!"
  
-#: plugins/admin/fai/class_faiManagement.inc:847
+#: plugins/admin/fai/class_faiManagement.inc:857
  #, fuzzy
  msgid "FAI releases"
  msgstr "Classes FAI"
  
-#: plugins/admin/fai/class_faiManagement.inc:848
+#: plugins/admin/fai/class_faiManagement.inc:858
  #, fuzzy
  msgid "FAI release management"
  msgstr "Gestion de FAI"
@@ -13531,11 +13576,11 @@ msgstr "Paquets utilisés"
  msgid "Choosen packages"
  msgstr "Paquets Choisis"
  
-#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:674
  msgid "Configure"
  msgstr "Configurer"
  
-#: plugins/admin/fai/faiPackage.tpl:80
+#: plugins/admin/fai/faiPackage.tpl:87
  msgid "Toggle remove flag"
  msgstr "Activer/Désactiver le marqueur à effacer"
  
@@ -13721,7 +13766,7 @@ msgstr "Ensemble de paquets"
  #: plugins/admin/fai/class_faiProfile.inc:298
  #: plugins/admin/fai/class_faiPartitionTable.inc:520
  #: plugins/admin/fai/class_faiProfileEntry.inc:140
-#: plugins/admin/fai/class_faiSummaryTab.inc:45
+#: plugins/admin/fai/class_faiSummaryTab.inc:48
  msgid "Partition table"
  msgstr "Table des partitions"
  
@@ -13770,59 +13815,64 @@ msgstr "Afficher la connexion FAI"
  
  #: plugins/admin/fai/class_faiHook.inc:535
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #, fuzzy
  msgid "Read only"
  msgstr "Lire"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  msgid "primary"
  msgstr "principal"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  msgid "logical"
  msgstr "logique"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
  msgid "FS type"
  msgstr "FS type"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
-#: plugins/admin/fai/class_faiSummaryTab.inc:317
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:468
+#: plugins/admin/fai/class_faiSummaryTab.inc:344
  msgid "Mount point"
  msgstr "Point de montage"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
-#: plugins/admin/fai/class_faiSummaryTab.inc:316
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:343
  msgid "Size in MB"
  msgstr "Taille en MB"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
-#: plugins/admin/fai/class_faiSummaryTab.inc:315
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:470
+#: plugins/admin/fai/class_faiSummaryTab.inc:342
  msgid "Mount options"
  msgstr "Options de montage"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
  msgid "FS option"
  msgstr "option du système de fichier"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
  msgid "Preserve"
  msgstr "Préserver"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:368
+#, fuzzy
+msgid "Please specify a valid disc name."
+msgstr "Veuillez spécifier un nom de script valide."
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
  #, php-format
  msgid "please enter a unique mount point for partition %s"
  msgstr "Veuillez entrer un point de montage unique pour la partition %s"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
  #, php-format
  msgid "Please enter a valid mount point for partition %s."
  msgstr "Veuillez entrer un point de montage valide pour la partition %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:401
  #, php-format
  msgid ""
  "File system type 'swap' is already used, change file system type for "
@@ -13831,31 +13881,31 @@ msgstr ""
  "Le système de fichier 'swap' est déjà utilisé, veuillez changer le type pour "
  "la partition %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:405
  msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
  msgstr ""
  "Veuillez utiliser 'swap' comme point de montage, si 'swap' est utilisé comme "
  "type de fichier."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:411
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:415
  #, php-format
  msgid "Please enter a valid partition size for partition %s."
  msgstr "Veuillez entrer une taille valide pour la partition %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:412
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:421
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:423
  #, php-format
  msgid "Please enter a valid range for partition %s."
  msgstr "Veuillez entrer une dimension valide pour la partition %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:428
  #, php-format
  msgid "Please enter a range for partition size for partition %s."
  msgstr ""
  "Veuillez entrer une dimension valide pour la taille de la partition %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:434
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:443
  msgid ""
  "You have more than 3 primary partition table entries in your configuration, "
  "please check your configuration twice."
@@ -13863,42 +13913,42 @@ msgstr ""
  "Vous avez plus de 3 partitions primaires dans votre configuration, veuillez "
  "vérifier votre configuration."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:446
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
  #, fuzzy
  msgid "Partition table entry"
  msgstr "Table des partitions"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
  #, fuzzy
  msgid "FAI partition table entry"
  msgstr "Nouvelle table des partitions"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:465
  #, fuzzy
  msgid "Partition type"
  msgstr "Table des partitions"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:466
  #, fuzzy
  msgid "Partition no."
  msgstr "Partitions"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:467
  #, fuzzy
  msgid "File system type"
  msgstr "Type de système"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:469
  #, fuzzy
  msgid "Partition size"
  msgstr "Partitions"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:471
  #, fuzzy
  msgid "File system options"
  msgstr "voir les informations sur le système"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:472
  #, fuzzy
  msgid "Partition flags"
  msgstr "Partitions"
@@ -14100,12 +14150,12 @@ msgstr "Choisissez un nom de classe"
  msgid "A new class name."
  msgstr "Un nouveau nom de classe."
  
-#: plugins/admin/fai/class_faiVariable.inc:334
+#: plugins/admin/fai/class_faiVariable.inc:330
  #, fuzzy, php-format
  msgid "Saving of FAI/variable with dn '%s' failed."
  msgstr "La sauvegarde de la variable de base FAI à échoué"
  
-#: plugins/admin/fai/class_faiVariable.inc:413
+#: plugins/admin/fai/class_faiVariable.inc:409
  #, fuzzy
  msgid "FAI variable"
  msgstr "Afficher les variables FAI"
@@ -14187,7 +14237,7 @@ msgid "Destination path"
  msgstr "Répertoire de destination"
  
  #: plugins/admin/fai/faiTemplateEntry.tpl:74
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:577
  #: plugins/gofon/conference/class_divListConferences.inc:53
  msgid "Owner"
  msgstr "Propriétaire"
@@ -14353,35 +14403,36 @@ msgstr ""
  "voulez effectuez cette opération. Toutes les données seront perdues étant "
  "donné qu'il est impossible pour GOsa de récupérer vos données."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:41
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
  msgid "Scripts"
  msgstr "Scripts"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:46
+#: plugins/admin/fai/class_faiSummaryTab.inc:49
  msgid "Package list"
  msgstr "Liste des paquets"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:86
+msgid ""
+"Unknown type of FAI source information. This is not a profile, workstation "
+"nor a ogroup."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:217
  msgid "This object has no FAI classes assigned."
  msgstr "Cet objet n'a pas de classe FAI assignée."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:203
+#: plugins/admin/fai/class_faiSummaryTab.inc:230
  msgid "Open"
  msgstr "Ouvrir"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:312
+#: plugins/admin/fai/class_faiSummaryTab.inc:339
  msgid "No."
  msgstr "Non."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:314
+#: plugins/admin/fai/class_faiSummaryTab.inc:341
  msgid "FS options"
  msgstr "Options FS"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:553
-#, fuzzy
-msgid "Viewable"
-msgstr "Variable"
-
  #: plugins/admin/fai/branch_selector.tpl:21
  msgid "Create new branch"
  msgstr "Création d'une nouvelle branche"
@@ -14468,94 +14519,94 @@ msgstr "Afficher les partitions FAI"
  msgid "Show partitions"
  msgstr "Afficher les partitions"
  
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "New profile"
  msgstr "Nouveau profil"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "New partition table"
  msgstr "Nouvelle table des partitions"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "PT"
  msgstr "PT"
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "New scripts"
  msgstr "Nouveau scripts"
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "S"
  msgstr "S"
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "New hooks"
  msgstr "Nouvelles connexions"
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "H"
  msgstr "H"
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "New variables"
  msgstr "Nouvelles variables"
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "V"
  msgstr "V"
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "New templates "
  msgstr "Nouveau modèles"
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "I"
  msgstr "NI"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "New package list"
  msgstr "Nouvelle liste des paquets"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "PK"
  msgstr "PK"
  
-#: plugins/admin/fai/class_divListFai.inc:242
-#: plugins/admin/fai/class_divListFai.inc:245
+#: plugins/admin/fai/class_divListFai.inc:240
+#: plugins/admin/fai/class_divListFai.inc:243
  msgid "Edit class"
  msgstr "Editer la classe"
  
-#: plugins/admin/fai/class_divListFai.inc:253
+#: plugins/admin/fai/class_divListFai.inc:251
  msgid "Delete class"
  msgstr "Effacer la classe"
  
-#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/generic.tpl:12
  #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:180
  #, fuzzy
  msgid "Mime type"
  msgstr "type mime"
  
-#: plugins/admin/mimetypes/generic.tpl:17
+#: plugins/admin/mimetypes/generic.tpl:16
  #: plugins/admin/mimetypes/paste_generic.tpl:16
  #, fuzzy
  msgid "Please enter a name for the mime type here"
  msgstr "Veuillez entrer un nom pour la conférence."
  
-#: plugins/admin/mimetypes/generic.tpl:23
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:673
+#: plugins/admin/mimetypes/generic.tpl:22
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:681
  #, fuzzy
  msgid "Mime group"
  msgstr "Groupe principal"
  
-#: plugins/admin/mimetypes/generic.tpl:27
+#: plugins/admin/mimetypes/generic.tpl:26
  #, fuzzy
  msgid "Categorize this mime type"
  msgstr "Catégorie pour cette branche de l'annuaire"
  
-#: plugins/admin/mimetypes/generic.tpl:39
+#: plugins/admin/mimetypes/generic.tpl:38
  #, fuzzy
  msgid "Please specify a description"
  msgstr "Veuillez spécifier un nom de script valide."
@@ -14574,7 +14625,7 @@ msgid "Left click"
  msgstr ""
  
  #: plugins/admin/mimetypes/generic.tpl:99
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:679
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:687
  #, fuzzy
  msgid "File patterns"
  msgstr "Filtres"
@@ -14616,63 +14667,58 @@ msgstr ""
  msgid "Ask whether to save to local disk"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:461
  #, php-format
  msgid "Saving of mime type/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:452
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:470
  #, fuzzy, php-format
  msgid "Removing of mime type/generic with dn '%s' failed."
  msgstr "La suppression du compte générique à échoué"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:464
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:482
  #, fuzzy, php-format
  msgid "Removing mime type from objectgroup '%s' failed"
  msgstr "La suppression de l'application du groupe d'objet '%s' à échoue"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:474
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:492
  #, fuzzy
  msgid "Please specify a valid name for this mime type."
  msgstr "Veuillez spécifier un nom valide pour ce document lié."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:477
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:495
  #, fuzzy
  msgid "Please specify at least one file pattern."
  msgstr "Veuillez spécifier un nom valide pour ce document lié."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:490
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:508
  #, fuzzy
  msgid "There's already a mime type with this 'Name'."
  msgstr "Une application ayant le même 'Nom' existe déjà."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:498
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:516
  #, fuzzy
  msgid "There's already an mime with this 'Name'."
  msgstr "Une application ayant le même 'Nom' existe déjà."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:510
-#, fuzzy
-msgid "You have no permissions to create a mime type on this 'Base'."
-msgstr "Vous n'avez pas l'autorisation de créer un téléphone sur cette 'Base'."
-
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
  #, fuzzy
  msgid "Mime type generic"
  msgstr "type mime"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
  #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
  #, fuzzy
  msgid "Mime types"
  msgstr "type mime"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:685
  #, fuzzy
  msgid "Left click action"
  msgstr "Créer des applications"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:688
  #, fuzzy
  msgid "Embedded applications"
  msgstr "Applications utilisées"
@@ -14682,13 +14728,13 @@ msgstr "Applications utilisées"
  msgid "Manage mime types"
  msgstr "Gérer les types de systèmes d'exploitation"
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:276
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:278
  #, fuzzy, php-format
  msgid "You're about to delete the mime type '%s'."
  msgstr "Vous êtes sur le point de supprimer l'entrée %s."
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:282
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:311
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:313
  #, fuzzy
  msgid "You are not allowed to delete this mime type!"
  msgstr "Vous n'êtes pas autorisé à supprimer cette entrée!"
@@ -14725,7 +14771,7 @@ msgstr "type mime"
  msgid "Display mime types matching"
  msgstr "Afficher les types de cartouches correspondantes"
  
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:140
  #, fuzzy
  msgid "Create new mime type"
  msgstr "Créer un nouveau modèle"
@@ -14761,7 +14807,7 @@ msgstr "non défini"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:658
  #: plugins/gofon/macro/class_gofonMacro.inc:95
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:286
  msgid ""
  "There is currently no asterisk server defined. Possibly you are missing a "
  "server that handles the asterisk management (goFonServer). Your settings "
@@ -14902,23 +14948,28 @@ msgstr "La suppression du compte téléphonique à échoué"
  msgid "Phone account settings"
  msgstr "Configuration du téléphone"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1237
+#, fuzzy
+msgid "GOfon reports"
+msgstr "Rapports téléphoniques"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:576
  #, fuzzy
  msgid "Telephone number"
  msgstr "Numéro de téléphone"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1242
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
  #, fuzzy
  msgid "Macro settings"
  msgstr "Paramètres de messagerie"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1246
  #, fuzzy
  msgid "Telephone pin"
  msgstr "Téléphone"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1247
  #, fuzzy
  msgid "Voicemail pin"
  msgstr "Code PIN de la boite vocale"
@@ -14959,7 +15010,7 @@ msgid "Regular expression for matching macro names"
  msgstr "Expression régulière correspondant à des noms de macro"
  
  #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
-#: plugins/gofon/macro/class_gofonMacro.inc:483
+#: plugins/gofon/macro/class_gofonMacro.inc:496
  msgid "Macro name"
  msgstr "Nom de la macro"
  
@@ -14979,13 +15030,13 @@ msgstr "Texte de la macro"
  msgid "Phone macros"
  msgstr "Macros téléphoniques"
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:207
  #, php-format
  msgid "You're about to delete the macro '%s'."
  msgstr "Vous êtes sur le point de supprimer la macro '%s'."
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:214
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:213
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
  msgid "You are not allowed to delete this macro!"
  msgstr "Vous n'êtes pas autorisé à supprimer cette macro!"
  
@@ -14994,7 +15045,7 @@ msgstr "Vous n'êtes pas autorisé à supprimer cette macro!"
  msgid "This 'dn' is no phone macro."
  msgstr "Ce 'dn' n'est pas une macro téléphonique."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:185
+#: plugins/gofon/macro/class_gofonMacro.inc:183
  msgid ""
  "This macro ist still in use. To delete this Macro ensure that nobody has "
  "selected this Macro."
@@ -15002,14 +15053,14 @@ msgstr ""
  "Cette macro est toujours utilisée. Pour effacer cette macro, veuillez vous "
  "assurer que personne ne l'utilise."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: plugins/gofon/macro/class_gofonMacro.inc:190
+#: plugins/gofon/macro/class_gofonMacro.inc:205
  #: plugins/gofon/macro/class_gofonMacroParameters.inc:402
  #, fuzzy, php-format
  msgid "Removing of goFonMacro/generic account with dn '%s' failed."
  msgstr "La suppression du compte générique à échoué"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:220
+#: plugins/gofon/macro/class_gofonMacro.inc:218
  msgid ""
  "There is no mysql extension available in your php setup, can't save any "
  "changes to asterisk db."
@@ -15017,67 +15068,72 @@ msgstr ""
  "Il n'y a pas d'extension mysql disponible dans votre configuration de php, "
  "je ne peut pas sauver les changement dans votre base de données asterisk."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:290
+#: plugins/gofon/macro/class_gofonMacro.inc:288
  #, php-format
  msgid "Unable to parse macro contents on line: %s"
  msgstr "Impossible de lire le contenu de la macro à la ligne: %s"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:308
+#: plugins/gofon/macro/class_gofonMacro.inc:306
  #, php-format
  msgid "Can't perform SELECT query in DB '%s'"
  msgstr "Impossible d'exécuter une requête SELECT sur la base de données '%s'"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:317
-#: plugins/gofon/macro/class_gofonMacro.inc:325
+#: plugins/gofon/macro/class_gofonMacro.inc:315
+#: plugins/gofon/macro/class_gofonMacro.inc:323
  #, php-format
  msgid "Can't perform DELETE query in DB '%s'"
  msgstr "Impossible d'exécuter une requête DELETE sur la base de données '%s'"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:339
+#: plugins/gofon/macro/class_gofonMacro.inc:337
  #, php-format
  msgid "Can't perform INSERT query in DB '%s'"
  msgstr "Impossible d'exécuter une requête INSERT sur la base de données '%s'"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:405
+#: plugins/gofon/macro/class_gofonMacro.inc:417
  #, php-format
  msgid "The given cn '%s' already exists."
  msgstr "Le cn indiqué '%s' existe déjà."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:422
  msgid "You must specify the 'Display Name' in order to save this macro"
  msgstr ""
  "Vous devez spécifier le 'Nom d'affichage' pour pouvoir sauver cette macro"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:414
+#: plugins/gofon/macro/class_gofonMacro.inc:426
  msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
  msgstr ""
  "Le cn introduit est trop long, pour créer une macro le maximum est de 20 "
  "caractères."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:418
+#: plugins/gofon/macro/class_gofonMacro.inc:430
  msgid "Makro length must be lower than 100 lines"
  msgstr "La longueur de la macro doit être plus petite que 100 lignes"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:423
+#: plugins/gofon/macro/class_gofonMacro.inc:435
  msgid "Please choose a valid  base."
  msgstr "Veuillez choisir une base valide."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:478
  #, fuzzy, php-format
  msgid "Saving of goFonMacro/generic account with dn '%s' failed."
  msgstr "La sauvegarde duc ompte oxchange à échoué"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/macro/class_gofonMacro.inc:487
  #, fuzzy
  msgid "Asterisk macro management"
  msgstr "Administration d'Asterisk"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:487
+#: plugins/gofon/macro/class_gofonMacro.inc:492
+#, fuzzy
+msgid "GOfon macro"
+msgstr "pas de macros"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:500
  #, fuzzy
-msgid "Macro content"
+msgid "Macro content and parameter"
  msgstr "Texte de la macro"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:488
+#: plugins/gofon/macro/class_gofonMacro.inc:501
  msgid "Visibility flag"
  msgstr ""
  
@@ -15136,32 +15192,30 @@ msgstr "Nom de la macro"
  msgid "Visible"
  msgstr "Visible"
  
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "Create new phone macro"
  msgstr "Créer une nouvelle macro téléphonique"
  
-#: plugins/gofon/macro/class_divListMacros.inc:132
-#: plugins/gofon/macro/class_divListMacros.inc:160
-msgid "Edit macro"
-msgstr "Editer une macro"
-
-#: plugins/gofon/macro/class_divListMacros.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:168
-msgid "Delete macro"
-msgstr "Supprimer une macro"
-
-#: plugins/gofon/macro/class_divListMacros.inc:137
+#: plugins/gofon/macro/class_divListMacros.inc:124
  msgid "Macro"
  msgstr "Macro"
  
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  msgid "visible"
  msgstr "visible"
  
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  msgid "invisible"
  msgstr "invisible"
  
+#: plugins/gofon/macro/class_divListMacros.inc:147
+msgid "Edit macro"
+msgstr "Editer une macro"
+
+#: plugins/gofon/macro/class_divListMacros.inc:155
+msgid "Delete macro"
+msgstr "Supprimer une macro"
+
  #: plugins/gofon/conference/headpage.tpl:6
  #: plugins/gofon/conference/class_divListConferences.inc:31
  #: plugins/gofon/conference/class_divListConferences.inc:32
@@ -15200,7 +15254,7 @@ msgid "Lifetime (in days)"
  msgstr "Durée (en jours)"
  
  #: plugins/gofon/conference/generic.tpl:137
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:566
  msgid "Preset PIN"
  msgstr "Code PIN préselectionné"
  
@@ -15210,7 +15264,7 @@ msgid "PIN"
  msgstr "Code PIN"
  
  #: plugins/gofon/conference/generic.tpl:157
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
  msgid "Record conference"
  msgstr "Enregistrer la conférence"
  
@@ -15219,7 +15273,7 @@ msgid "Sound file format"
  msgstr "Format du fichier son "
  
  #: plugins/gofon/conference/generic.tpl:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:568
  msgid "Play music on hold"
  msgstr "Musique d'attente"
  
@@ -15248,7 +15302,7 @@ msgstr "Gestion"
  msgid "Removing of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:252
  msgid ""
  "You have specified a conference 'without PIN' ... please leave the PIN "
  "fields empty."
@@ -15256,24 +15310,24 @@ msgstr ""
  "Vous avez spécifié une conférence 'sans code PIN' ...veuillez laisser le "
  "champ code pin vide."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
  msgid "Please enter a PIN."
  msgstr " Veuillez entrer un code pin."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:260
  msgid "Please enter a name for the conference."
  msgstr "Veuillez entrer un nom pour la conférence."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:251
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:264
  msgid "Only numeric chars are allowed in Number field."
  msgstr "Seul des chiffres sont permis dans le champ numéro."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:268
  msgid "Only numbers are allowed in Lifetime."
  msgstr "Seul des nombres sont autorisés dans la durée."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:298
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:408
  msgid ""
  "Can't save any changes to asterisk database, there is currently no mysql "
  "extension available in your php setup."
@@ -15281,56 +15335,57 @@ msgstr ""
  "Impossible de sauver les changement dans votre base de données asterisk, il "
  "n'y a pas d'extension mysql disponible dans votre configuration php."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
  #, php-format
  msgid "Saving of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
-#: plugins/gofon/conference/class_divListConferences.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_divListConferences.inc:198
  msgid "Conference"
  msgstr "Conférence"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:552
  #, fuzzy
  msgid "Phone conference management"
  msgstr "Gestion des conférences"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
-msgid "GOfon"
-msgstr ""
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#, fuzzy
+msgid "GOfon conference"
+msgstr "Conférences téléphoniques"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
  #, fuzzy
  msgid "Conference PIN"
  msgstr "Conférence"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:569
  #, fuzzy
  msgid "Activate menu"
  msgstr "Activer le menu de session"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:570
  #, fuzzy
  msgid "Announce user activity"
  msgstr "Fréquence du message d'annonce"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:571
  #, fuzzy
  msgid "Count user"
  msgstr "Compter les utilisateurs"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:572
  #, fuzzy
  msgid "Conference type"
  msgstr "Nom de la conférence"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:574
  #, fuzzy
  msgid "Format"
  msgstr "format"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:575
  #, fuzzy
  msgid "Lifetime"
  msgstr "Durée (en jours)"
@@ -15347,43 +15402,43 @@ msgstr "Nom - numéro"
  msgid "Regular expression for matching conference names"
  msgstr "Expression régulière concordant avec les noms des conférences"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  msgid "Create new conference"
  msgstr "Création d'une nouvelle conférence"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  msgid "New conference"
  msgstr "Nouvelle conférence"
  
-#: plugins/gofon/conference/class_divListConferences.inc:196
+#: plugins/gofon/conference/class_divListConferences.inc:192
  #: include/class_pluglist.inc:145 include/class_pluglist.inc:146
  #: include/class_pluglist.inc:245
  msgid "Unknown"
  msgstr "Inconnu"
  
  #: plugins/gofon/fonreports/contents.tpl:31
-#: plugins/gofon/fonreports/class_fonreport.inc:399
+#: plugins/gofon/fonreports/class_fonreport.inc:400
  msgid "Source"
  msgstr "Emetteur"
  
  #: plugins/gofon/fonreports/contents.tpl:32
-#: plugins/gofon/fonreports/class_fonreport.inc:400
+#: plugins/gofon/fonreports/class_fonreport.inc:401
  msgid "Destination"
  msgstr "Destinataire"
  
  #: plugins/gofon/fonreports/contents.tpl:33
-#: plugins/gofon/fonreports/class_fonreport.inc:401
+#: plugins/gofon/fonreports/class_fonreport.inc:402
  msgid "Channel"
  msgstr "Canal"
  
  #: plugins/gofon/fonreports/contents.tpl:36
-#: plugins/gofon/fonreports/class_fonreport.inc:404
+#: plugins/gofon/fonreports/class_fonreport.inc:405
  msgid "Duration"
  msgstr "Durée"
  
  #: plugins/gofon/fonreports/main.inc:16
-#: plugins/gofon/fonreports/class_fonreport.inc:389
  #: plugins/gofon/fonreports/class_fonreport.inc:390
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  msgid "Phone reports"
  msgstr "Rapports téléphoniques"
  
@@ -15408,12 +15463,12 @@ msgstr ""
  msgid "Query for phone database failed!"
  msgstr "La requête sur la base de données des téléphones a échoué!"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:402
+#: plugins/gofon/fonreports/class_fonreport.inc:403
  #, fuzzy
  msgid "Application called"
  msgstr "Nom de l'application"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:403
+#: plugins/gofon/fonreports/class_fonreport.inc:404
  #, fuzzy
  msgid "Disposition"
  msgstr "Déconnexion"
@@ -15468,7 +15523,7 @@ msgstr ""
  "La création de cette page à occasionné des erreurs d'après l'interpréteur "
  "PHP!"
  
-#: include/php_setup.inc:71 html/main.php:388
+#: include/php_setup.inc:71
  msgid "Toggle information"
  msgstr "Afficher/Cacher l'information"
  
@@ -15492,15 +15547,15 @@ msgstr "statique"
  msgid "method"
  msgstr "méthode"
  
-#: include/php_setup.inc:129
+#: include/php_setup.inc:135
  msgid "Trace"
  msgstr "Trace"
  
-#: include/php_setup.inc:130
+#: include/php_setup.inc:136
  msgid "Line"
  msgstr "Ligne"
  
-#: include/php_setup.inc:131
+#: include/php_setup.inc:137
  msgid "Arguments"
  msgstr "Arguments"
  
@@ -15592,7 +15647,7 @@ msgstr ""
  msgid "incomplete"
  msgstr "incomplet"
  
-#: include/functions.inc:1046 include/functions.inc:1233
+#: include/functions.inc:1046 include/functions.inc:1202
  msgid "LDAP error:"
  msgstr "Erreur LDAP :"
  
@@ -15638,19 +15693,19 @@ msgstr ""
  "d'utilisation par '%s'. Veuillez contacter cette personne afin de clarifier "
  "la situation."
  
-#: include/functions.inc:1415
+#: include/functions.inc:1384
  msgid "Entries per page"
  msgstr "Entrées par page"
  
-#: include/functions.inc:1443
+#: include/functions.inc:1412
  msgid "Apply filter"
  msgstr "Appliquer le filtre"
  
-#: include/functions.inc:1717
+#: include/functions.inc:1686
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1760
+#: include/functions.inc:1729
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "Version de développement de GOsa (Rev %s)"
@@ -15661,7 +15716,7 @@ msgstr ""
  "Attention: Le compte à un chaîne de connexion au serveur de messagerie "
  "invalide!"
  
-#: include/class_mail-methods-cyrus.inc:53
+#: include/class_mail-methods-cyrus.inc:58
  msgid ""
  "Warning: IMAP Server cannot be reached! If you save this account, some mail "
  "settings will not be stored on your server!"
@@ -15669,52 +15724,52 @@ msgstr ""
  "Erreur: Impossible de contacter le serveur IMAP. Si vous sauvez ce compte, "
  "certains paramètres ne seront pas stockés sur votre serveur!"
  
-#: include/class_mail-methods-cyrus.inc:151
+#: include/class_mail-methods-cyrus.inc:156
  #, php-format
  msgid "Can't create IMAP mailbox. Server says '%s'."
  msgstr ""
  "Impossible de créer la boite de messagerie IMAP. Le serveur indique '%s'."
  
-#: include/class_mail-methods-cyrus.inc:170
+#: include/class_mail-methods-cyrus.inc:175
  #, php-format
  msgid "Can't write IMAP quota. Server says '%s'."
  msgstr "Impossible de créer les quotas IMAP. Le serveur indique'%s'."
  
-#: include/class_mail-methods-cyrus.inc:196
+#: include/class_mail-methods-cyrus.inc:201
  msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
  msgstr ""
  "Erreur: imap_getacl n'est pas implémenté, il est impossible de supprimer les "
  "informations à propos des acls."
  
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:219
  msgid "Warning: imap_getacl is not available, can't get imap permissions!"
  msgstr ""
  "Erreur: imap_getacl n'est pas disponible, impossible d'obtenir les "
  "permissions imap!"
  
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_mail-methods-cyrus.inc:241
  #, php-format
  msgid "Can't remove IMAP mailbox. Server says '%s'."
  msgstr ""
  "Impossible de supprimer les boites de messagerie IMAP. Le serveur répond '%"
  "s'."
  
-#: include/class_mail-methods-cyrus.inc:264
+#: include/class_mail-methods-cyrus.inc:269
  #, php-format
  msgid "Can't log into SIEVE server. Server says '%s'."
  msgstr "Impossible de se connecter au serveur SIEVE. Le serveur répond '%s'."
  
-#: include/class_mail-methods-cyrus.inc:277
+#: include/class_mail-methods-cyrus.inc:282
  #, php-format
  msgid "Can't get sieve script. Server says '%s'."
  msgstr "Impossible de récupérer le script sieve. Le serveur répond '%s'."
  
-#: include/class_mail-methods-cyrus.inc:348
+#: include/class_mail-methods-cyrus.inc:353
  #, php-format
  msgid "Can't send sieve script. Server says '%s'."
  msgstr "Impossible d'envoyer un script à sieve. Le serveur répond '%s'."
  
-#: include/class_mail-methods-cyrus.inc:352
+#: include/class_mail-methods-cyrus.inc:357
  #, php-format
  msgid "Can't activate GOsa sieve script. Server says '%s'."
  msgstr ""
@@ -15756,7 +15811,7 @@ msgstr "Une erreur s'est produite lors de la récupération du dn - Arrêt!"
  msgid "Unknown FAIstate %s"
  msgstr "Statut FAI inconnu %s"
  
-#: include/class_ldap.inc:705
+#: include/class_ldap.inc:707
  #, php-format
  msgid ""
  "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -15765,17 +15820,17 @@ 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:774
+#: include/class_ldap.inc:776
  #, php-format
  msgid "while operating on '%s' using LDAP server '%s'"
  msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
  
-#: include/class_ldap.inc:776
+#: include/class_ldap.inc:778
  #, php-format
  msgid "while operating on LDAP server %s"
  msgstr "lors de l'opération sur le serveur LDAP '%s'"
  
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1000
  #, php-format
  msgid ""
  "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -15784,14 +15839,14 @@ msgstr ""
  "Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
  "avec 'dn: ...' à la ligne %s"
  
-#: include/class_ldap.inc:1027
+#: include/class_ldap.inc:1029
  #, php-format
  msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
  msgstr ""
  "Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
  "votre fichier LDIF à partir de la ligne %s!"
  
-#: include/class_ldap.inc:1155
+#: include/class_ldap.inc:1157
  #, php-format
  msgid "Ldap import with dn '%s' failed."
  msgstr "L'importation ldap avec le dn '%s' à échoué."
@@ -15805,14 +15860,14 @@ msgstr "L'effacement à été interrompu par l'extension '%s': %s"
  msgid "References"
  msgstr "Références"
  
-#: include/class_plugin.inc:420
+#: include/class_plugin.inc:421
  #, php-format
  msgid ""
  "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
  msgstr ""
  "La commande '%s', utilisée dans le CHECK de l'extension '%s' n'existe pas."
  
-#: include/class_plugin.inc:601
+#: include/class_plugin.inc:602
  #, php-format
  msgid ""
  "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -15820,7 +15875,7 @@ msgstr ""
  "La commande '%s', utilisée dans le POSTCREATE de l'extension '%s' n'existe "
  "pas."
  
-#: include/class_plugin.inc:635 include/class_password-methods.inc:183
+#: include/class_plugin.inc:636 include/class_password-methods.inc:183
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -15828,7 +15883,7 @@ msgstr ""
  "La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
  "pas."
  
-#: include/class_plugin.inc:669
+#: include/class_plugin.inc:670
  #, php-format
  msgid ""
  "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -15836,37 +15891,33 @@ msgstr ""
  "La commande '%s', utilisée dans le POSTREMOVE de l'extension '%s' n'existe "
  "pas."
  
-#: include/class_plugin.inc:977
+#: include/class_plugin.inc:978
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr "L'objet '%s' est déjà marqué"
  
-#: include/class_plugin.inc:984
+#: include/class_plugin.inc:985
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr "Ajouter une marque (%s) à l'objet '%s'"
  
-#: include/class_plugin.inc:998 include/class_plugin.inc:1027
+#: include/class_plugin.inc:999 include/class_plugin.inc:1028
  #, php-format
  msgid "Handle object tagging with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1014
+#: include/class_plugin.inc:1015
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr "Suppression de la marque de l'objet '%s'"
  
-#: include/class_plugin.inc:1075 include/class_plugin.inc:1121
-#: include/class_plugin.inc:1122
+#: include/class_plugin.inc:1076 include/class_plugin.inc:1122
+#: include/class_plugin.inc:1123
  #, php-format
  msgid "Saving object snapshot with dn '%s' failed."
  msgstr "La sauvegarde de la copie instantanée avec le dn '%s' à échoué."
  
-#: include/class_plugin.inc:1137
-msgid "You are not allowed to delete this snapshot!"
-msgstr "Vous n'êtes pas autorisé à supprimer cette copie instantanée!"
-
-#: include/class_plugin.inc:1153
+#: include/class_plugin.inc:1149
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -15875,24 +15926,24 @@ msgstr ""
  "La fonctionnalité pour les copie instantanées est activée, mais la variable "
  "requise '%s' n'est pas configurée dans votre gosa.conf."
  
-#: include/class_plugin.inc:1165
+#: include/class_plugin.inc:1161
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable(s) '%s' is "
  "not configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1197
+#: include/class_plugin.inc:1193
  #, php-format
  msgid "Method get available snapshots with dn '%s' failed."
  msgstr "La méthode obtenir les copie instantanées avec le dn '%s' à échoué."
  
-#: include/class_plugin.inc:1253
+#: include/class_plugin.inc:1249
  #, php-format
  msgid "Method get deleted snapshots with dn '%s' failed."
  msgstr "La méthode obtenir les copie instantanées avec le dn '%s' à échoue."
  
-#: include/class_plugin.inc:1317 include/class_plugin.inc:1331
+#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
  #, php-format
  msgid "Restore snapshot with dn '%s' failed."
  msgstr "La restauration de la copie instantanée avec le dn '%s' à échoué."
@@ -15997,7 +16048,7 @@ msgstr ""
  "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
  "l'administrateur du système."
  
-#: include/class_config.inc:472
+#: include/class_config.inc:477
  msgid "SID and/or RIDBASE missing in your configuration!"
  msgstr "SID et/ou RIDBASE absents du fichier de configuration!"
  
@@ -16529,7 +16580,7 @@ msgstr ""
  "Impossible de s'identifier sur l'annuaire LDAP! Veuillez vérifiez que GOsa "
  "puisse le contacter."
  
-#: include/functions_setup.inc:784
+#: include/functions_setup.inc:792
  #, php-format
  msgid ""
  "You're missing the required attribute '%s' from this formular. Please "
@@ -16565,15 +16616,14 @@ msgstr ""
  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:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:252
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1092
+#, fuzzy
  msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
+"User and/or group could not be created, please check your configuration "
+"twice !"
  msgstr ""
-"Le compte administrateur de GOsa n'existe pas, vous ne pourrez rien "
-"administrer!"
+"Impossible de se connecter à la base de données spécifiée. Veuillez vérifier "
+"la configuration de glpi."
  
  #: include/functions_helpviewer.inc:43
  #, php-format
@@ -16634,92 +16684,97 @@ msgstr "Le sous arbre complet (permanent)"
  msgid "Use ACL defined in role"
  msgstr ""
  
-#: include/class_acl.inc:370
+#: include/class_acl.inc:372
  msgid "Edit ACL"
  msgstr "Editer l'ACL"
  
-#: include/class_acl.inc:371
+#: include/class_acl.inc:373
  msgid "Delete ACL"
  msgstr "Supprimer l'ACL"
  
-#: include/class_acl.inc:408
+#: include/class_acl.inc:410
  msgid "No ACL settings for this category"
  msgstr "Pas d'ACL pour cette catégorie"
  
-#: include/class_acl.inc:410
+#: include/class_acl.inc:412
  #, php-format
  msgid "Contains ACLs for these objects: %s"
  msgstr "Contient les ACL pour ces objets: %s"
  
-#: include/class_acl.inc:415
+#: include/class_acl.inc:417
  msgid "Edit categories ACLs"
  msgstr "Editer les catégories d'ACL"
  
-#: include/class_acl.inc:416
+#: include/class_acl.inc:418
  msgid "Clear categories ACLs"
  msgstr "Effacer les catégories d'ACL"
  
-#: include/class_acl.inc:455
+#: include/class_acl.inc:457
  #, php-format
  msgid "Edit ACL for '%s', scope is '%s'"
  msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
  
-#: include/class_acl.inc:465
+#: include/class_acl.inc:467
  msgid "All objects in current subtree"
  msgstr "Tout les objets dans le sous arbres actuel"
  
-#: include/class_acl.inc:525 include/class_acl.inc:532
+#: include/class_acl.inc:557 include/class_acl.inc:564
  msgid "Show/Hide Advanced Settings"
  msgstr "Afficher/Cacher les paramètres avancés"
  
-#: include/class_acl.inc:550
+#: include/class_acl.inc:582
  msgid "Create objects"
  msgstr "Créer des objets"
  
-#: include/class_acl.inc:551
+#: include/class_acl.inc:583
  msgid "Move objects"
  msgstr "Bouger des objets"
  
-#: include/class_acl.inc:552
+#: include/class_acl.inc:584
  msgid "Remove objects"
  msgstr "Enlever des objets"
  
-#: include/class_acl.inc:554 include/class_acl.inc:560
+#: include/class_acl.inc:586 include/class_acl.inc:592
  msgid "Modifyable by owner"
  msgstr "Modifiable par le propriétaire"
  
-#: include/class_acl.inc:557
+#: include/class_acl.inc:589
  msgid "Move object"
  msgstr "Déplacer un objet"
  
-#: include/class_acl.inc:558
+#: include/class_acl.inc:590
  msgid "Remove object"
  msgstr "Enlever un objets"
  
-#: include/class_acl.inc:686
+#: include/class_acl.inc:602
+#, fuzzy
+msgid "Complete object"
+msgstr "Créer des objets"
+
+#: include/class_acl.inc:718
  #, php-format
  msgid "Unkown ACL type '%s'. Don't know how to handle it."
  msgstr "Type d'ACL inconnu '%s'. je ne sais pas comment l'utiliser."
  
-#: include/class_acl.inc:726
+#: include/class_acl.inc:758
  #, php-format
  msgid "Unknown entry '%s'!"
  msgstr "Entrée inconnue '%s'!"
  
-#: include/class_acl.inc:787
+#: include/class_acl.inc:819
  #, php-format
  msgid "Contains settings for these objects: %s"
  msgstr "Contient les paramètres pour ces objets: %s"
  
-#: include/class_acl.inc:795
+#: include/class_acl.inc:827
  msgid "Members:"
  msgstr "Membres:"
  
-#: include/class_acl.inc:801
+#: include/class_acl.inc:833
  msgid "ACL is valid for all users"
  msgstr "ACL valide pour tout les utilisateurs"
  
-#: include/class_acl.inc:909
+#: include/class_acl.inc:941
  #, php-format
  msgid "Saving ACLs with dn '%s' failed."
  msgstr "La sauvegarde des ACL avec le dn '%s' à échoué."
@@ -16728,7 +16783,7 @@ msgstr "La sauvegarde des ACL avec le dn '%s' à échoué."
  msgid "This package has no debconf options."
  msgstr "Ce paquet n'a pas d'options debconf."
  
-#: include/class_MultiSelectWindow.inc:400
+#: include/class_MultiSelectWindow.inc:458
  msgid ""
  "Error: The requested subtree has an inconsistent DN encoding, check your "
  "LDAP!"
@@ -16736,24 +16791,24 @@ msgstr ""
  "Erreur: Le sous arbre demandé à un encodage du DN inconstant, veuillez "
  "vérifier votre arbre LDAP!"
  
-#: include/class_MultiSelectWindow.inc:504
+#: include/class_MultiSelectWindow.inc:567
  msgid "Restore snapshopts of already deleted objects"
  msgstr "Restaurer la copie instantanée des objets déjà effacés"
  
-#: include/class_MultiSelectWindow.inc:505
+#: include/class_MultiSelectWindow.inc:568
  msgid "Restore"
  msgstr "Restaurer"
  
-#: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:106
+#: include/class_MultiSelectWindow.inc:586
+#: include/class_SnapShotDialog.inc:113
  msgid "Restore snapshot"
  msgstr "Restaurer la copie instantanée"
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  msgid "Create snapshot"
  msgstr "Créer une copie instantanée"
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  msgid "Create a new snapshot from this object"
  msgstr "Créer une nouvelle copie instantanée depuis cet objet"
  
@@ -16773,43 +16828,54 @@ msgstr ""
  "Plus d'un zone inverse existe pour la zone dns '%s'. Arrêt de la lecture de "
  "la zone."
  
-#: include/class_CopyPasteHandler.inc:153
+#: include/functions_dns.inc:607
  #, php-format
-msgid "You are going to copy the entry '%s'."
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:147
+#, fuzzy, php-format
+msgid "You are going to paste the cutted entry '%s'."
+msgstr "Vous êtes sur le point de copier l'entrée %s."
+
+#: include/class_CopyPasteHandler.inc:174
+#, fuzzy, php-format
+msgid "You are going to paste the copied entry '%s'."
  msgstr "Vous êtes sur le point de copier l'entrée %s."
  
-#: include/class_CopyPasteHandler.inc:217
+#: include/class_CopyPasteHandler.inc:238
  msgid "Paste"
  msgstr "Coller"
  
-#: include/class_CopyPasteHandler.inc:219
+#: include/class_CopyPasteHandler.inc:240
  msgid "Can't paste"
  msgstr "Impossible de coller"
  
-#: include/functions_FAI.inc:363
+#: include/functions_FAI.inc:361
  #, php-format
  msgid "Error, following objects should be equal '%s' and '%s'"
  msgstr "Erreur, les objets suivants doivent être égal '%s' et '%s'"
  
-#: include/functions_FAI.inc:470
+#: include/functions_FAI.inc:468
  #, php-format
  msgid "Release management failed, can't save '%s'"
  msgstr "La gestion des version à échoué, impossible de sauver '%s'."
  
-#: include/class_SnapShotDialog.inc:53
+#: include/class_SnapShotDialog.inc:63
  #, php-format
  msgid "You're about to delete the snapshot '%s'."
  msgstr "Vous êtes sur le point de supprimer la copie instantanée '%s'."
  
-#: include/class_SnapShotDialog.inc:108
+#: include/class_SnapShotDialog.inc:115
  msgid "Remove snapshot"
  msgstr "Effacer la copie instantanée"
  
-#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
+#: include/class_SnapShotDialog.inc:117 include/class_SnapShotDialog.inc:137
  msgid "Y-m-d, H:i:s"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:142
+#: include/class_SnapShotDialog.inc:149
  msgid "Please specify a valid description for this snapshot."
  msgstr "Veuillez spécifier un nom valide pour cette copie instantanée."
  
@@ -16854,7 +16920,7 @@ msgstr ""
  "Le répertoire '%s' spécifié comme répertoire de compilation smarty n'est pas "
  "accessible, vérifiez son existence et les droits de ce répertoire!"
  
-#: html/main.php:170
+#: html/main.php:172
  msgid ""
  "FATAL: Register globals is on. GOsa will refuse to login unless this is "
  "fixed by an administrator."
@@ -16862,29 +16928,21 @@ msgstr ""
  "FATAL: Register globals est activé. GOsa ne permettra pas aux utilisateurs "
  "de se connecter tant que ceci n'est pas corrigé par un administrateur."
  
-#: html/main.php:212
+#: html/main.php:214
  msgid "Warning: memory is getting low - please increase the memory_limit!"
  msgstr ""
  "Attention: la mémoire disponible est insuffisante - Veuillez augmenter le "
  "paramètre memory_limit!"
  
-#: html/main.php:349
-#, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
-msgstr "FATAL: Impossible de trouver une définition pour l'extension '%s'!"
-
-#: html/main.php:364
+#: html/main.php:353
  msgid "Your password is about to expire, please change your password"
  msgstr ""
  "Votre mot de passe va bientôt expiré, veuillez changer votre mot de passe"
  
-#: html/main.php:388
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
-msgstr ""
-"La création de cette page à occasionné des erreurs d'après le vérificateur "
-"du W3C!"
+#: html/main.php:361
+#, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgstr "FATAL: Impossible de trouver une définition pour l'extension '%s'!"
  
  #: html/getkiosk.php:25
  #, php-format
@@ -16896,11 +16954,11 @@ msgstr "Impossible d'ouvrir '%s', le fichier n'existe probablement pas."
  msgid "Can't read file '%s', check permissions."
  msgstr "Impossible de lire le fichier '%s', vérifiez les permissions"
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Session will not be encrypted."
  msgstr "La session ne sera pas cryptée."
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Enter SSL session"
  msgstr "Démarrer une session SSL"
  
@@ -16924,30 +16982,38 @@ msgstr ""
  "GOsa ne peut pas obtenir d'informations sur les schémas installés. Veuillez "
  "vous assurez qu'il puisse les obtenir."
  
-#: html/index.php:232
+#: html/index.php:231
  msgid ""
  "Your ldap setup contains old schema definitions. Please re-run the setup."
  msgstr ""
  "Votre installation LDAP contient de vieux schémas. Veuillez recommencer "
  "l'installation."
  
-#: html/index.php:260
+#: html/index.php:250 ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+"Le compte administrateur de GOsa n'existe pas, vous ne pourrez rien "
+"administrer!"
+
+#: html/index.php:258
  msgid "Please specify a valid username!"
  msgstr "Le nom d'utilisateur est incorrect!"
  
-#: html/index.php:262
+#: html/index.php:260
  msgid "Please specify your password!"
  msgstr "Veuillez introduire votre mot de passe!"
  
-#: html/index.php:269
+#: html/index.php:267
  msgid "Please check the username/password combination."
  msgstr "Veuillez vérifier le nom d'utilisateur et le mot de passe."
  
-#: html/index.php:293
+#: html/index.php:291
  msgid "Account locked. Please contact your system administrator."
  msgstr "Compte Vérrouillé. Veuillez contacter votre administrateur système."
  
-#: html/index.php:345
+#: html/index.php:343
  msgid ""
  "Your browser has cookies disabled. Please enable cookies and reload this "
  "page before logging in!"
@@ -17102,7 +17168,7 @@ msgstr ""
  "au paramètre sizelimit défini et laissez moi utiliser les filtres pour "
  "restreindre les données a visualiser"
  
-#: ihtml/themes/default/login.tpl:14
+#: ihtml/themes/default/login.tpl:15
  msgid "Please use your username and password to log in"
  msgstr ""
  "Veuillez utiliser votre nom d'utilisateur et votre mot de passe afin de vous "
@@ -17492,7 +17558,7 @@ msgstr "ACL assignés à cet objet"
  msgid "Copy & paste wizard"
  msgstr "Assistant pour le copier/coller"
  
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:7
  msgid ""
  "Some values need to be unique in the complete directory while some "
  "combinations make no sense. GOsa shows the relevant attributes. Please "
@@ -17502,7 +17568,17 @@ msgstr ""
  "combinations n'ont pas de sens. Gosa vous montre les valeurs "
  "correspondantes. Veuillez maintenir les valeurs pour respecter les policies."
  
-#: ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/copyPasteDialog.tpl:9
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:10
+msgid ""
+"Or if you copy or cut an entry within GOsa and delete the source object, you "
+"may get errors while pasting this object again!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:26
  msgid "Operation complete"
  msgstr "Opération réalisée"
  
@@ -17546,21 +17622,34 @@ msgstr ""
  "Cela va remplacer les objets sélectionnés après que vous ayez pressé le "
  "bouton restaurer."
  
-#: ihtml/themes/default/snapshotdialog.tpl:23
+#: ihtml/themes/default/snapshotdialog.tpl:9
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only nescessary to open and save them again (goFon), "
+"but some entries must be recreated manually (glpi)."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:12
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:29
  msgid "There is no snapshot available that could be restored"
  msgstr "Il n'y a pas de copie instantanée qui peut être restaurée"
  
-#: ihtml/themes/default/snapshotdialog.tpl:25
+#: ihtml/themes/default/snapshotdialog.tpl:31
  msgid "Choose a snapshot and click the folder image, to restore the snapshot"
  msgstr ""
  "Choisissez une copie instantanée et cliquez sur l'image du répertoire, pour "
  "restaurer la copie"
  
-#: ihtml/themes/default/snapshotdialog.tpl:43
+#: ihtml/themes/default/snapshotdialog.tpl:49
  msgid "Creating object snapshots"
  msgstr "Créer une copie instantanée"
  
-#: ihtml/themes/default/snapshotdialog.tpl:46
+#: ihtml/themes/default/snapshotdialog.tpl:52
  msgid ""
  "This procedure will create a snapshot of the selected object. It will be "
  "stored inside a special branch of your directory system and can be restored "
@@ -17570,14 +17659,108 @@ msgstr ""
  "sera stocké dans une branche spéciale de votre annuaire et pourra être "
  "restaurée plus tard."
  
-#: ihtml/themes/default/snapshotdialog.tpl:61
+#: ihtml/themes/default/snapshotdialog.tpl:55
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:70
  msgid "Timestamp"
  msgstr "Date et Heure"
  
-#: ihtml/themes/default/snapshotdialog.tpl:70
+#: ihtml/themes/default/snapshotdialog.tpl:79
  msgid "Reason for generating this snapshot"
  msgstr "Raison pour la génération de cette copie instantanée"
  
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr ""
+#~ "Vous n'avez pas l'autorisation pour créer un utilisateur sur cette 'Base'."
+
+#, fuzzy
+#~ msgid "You have no permissions to move this user to the specified 'Base'."
+#~ msgstr ""
+#~ "Vous n'avez pas l'autorisation pour déplacer un utilisateur sur depuis "
+#~ "cette 'Base'."
+
+#~ msgid "You have no permissions to create a blocklist on this 'Base'."
+#~ msgstr ""
+#~ "Vous n'avez pas l'autorisation de créer une liste rouge sur cette 'Base'."
+
+#~ 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'."
+
+#~ msgid "You have no permissions to create a application on this 'Base'."
+#~ msgstr ""
+#~ "Vous n'avez pas les droits suffisants pour créer une application dans "
+#~ "cette 'Base'."
+
+#~ msgid ""
+#~ "As soon as the move operation has finished, you can scroll down to end of "
+#~ "the page and press the 'Continue' button to continue with the department "
+#~ "management dialog."
+#~ msgstr ""
+#~ "Aussitôt que l'opération de déplacement est finie, vous pouvez aller à la "
+#~ "fin de la page et cliquer sur 'Continuer' pour continuer la configuration "
+#~ "des départements."
+
+#~ msgid "You have no permissions to create a department on this 'Base'."
+#~ msgstr ""
+#~ "Vous n'avez pas l'autorisation pour créer un département sur cette 'Base'."
+
+#~ msgid "Go to users home department"
+#~ msgstr "Aller au département de base des utilisateurs"
+
+#~ 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'."
+
+#~ 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'."
+
+#~ 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!"
+
+#~ 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'."
+
+#~ msgid "The host name '%s' should be written in lowercase."
+#~ msgstr "Le nom '%s' doit être écrit en minuscule."
+
+#~ msgid "Select to display users"
+#~ msgstr "Sélectionnez afin d'afficher les utilisateurs"
+
+#~ msgid "Display user"
+#~ msgstr "Afficher l'utilisateur"
+
+#~ msgid "Select to display departments"
+#~ msgstr "Sélectionner pour voir les départements"
+
+#~ msgid "Display departments"
+#~ msgstr "Afficher les départements"
+
+#, fuzzy
+#~ msgid "Viewable"
+#~ msgstr "Variable"
+
+#, fuzzy
+#~ msgid "You have no permissions to create a mime type on this 'Base'."
+#~ msgstr ""
+#~ "Vous n'avez pas l'autorisation de créer un téléphone sur cette 'Base'."
+
+#~ msgid "You are not allowed to delete this snapshot!"
+#~ msgstr "Vous n'êtes pas autorisé à supprimer cette copie instantanée!"
+
+#~ msgid ""
+#~ "Generating this page caused the W3C          conformance checker to raise "
+#~ "some errors!"
+#~ msgstr ""
+#~ "La création de cette page à occasionné des erreurs d'après le "
+#~ "vérificateur du W3C!"
+
  #~ msgid "Only insider delivery"
  #~ msgstr "Seulement distribution interne"
  
diff --git a/locale/it/LC_MESSAGES/messages.po b/locale/it/LC_MESSAGES/messages.po

index 0603b589e1e6cbf1d825d63984d48deb02d10cf7..0234957e9ceed74c4e41032874c9dfa5dfce0e1e 100644 (file)
--- a/locale/it/LC_MESSAGES/messages.po
+++ b/locale/it/LC_MESSAGES/messages.po
@@ -2,15 +2,13 @@
  # Copyright (c) 2005 B-Open Solutions srl - http://www.bopen.it/
  # Copyright (c) 2005 Alessandro Amici <a.amici@bopen.it>
  # Alessandro Amici <a.amici@bopen.it>, 2005.
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/admin/systems/class_terminalService.inc:452
-#: plugins/admin/systems/class_terminalService.inc:453
-#: include/class_plugin.inc:115 include/class_plugin.inc:116
+#: plugins/personal/generic/class_user.inc:1360 include/class_plugin.inc:115
+#: include/class_plugin.inc:116
  msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-17 12:33+0100\n"
+"POT-Creation-Date: 2006-12-18 11:18+0100\n"
  "PO-Revision-Date: 2005-11-18 15:26+0100\n"
  "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
  "Language-Team: Italian\n"
@@ -19,7 +17,24 @@ msgstr ""
  "Content-Transfer-Encoding: 8bit\n"
  "X-Generator: KBabel 1.9.1\n"
  
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1373
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1011
+#: plugins/personal/password/class_password.inc:16
+#: plugins/personal/posix/class_posixAccount.inc:1313
+#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/connectivity/class_phpgwAccount.inc:147
+#: plugins/personal/connectivity/class_kolabAccount.inc:451
+#: plugins/personal/connectivity/class_webdavAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:223
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:954
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#: plugins/personal/connectivity/class_intranetAccount.inc:180
+#: plugins/personal/connectivity/class_pptpAccount.inc:163
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/personal/environment/class_environment.inc:1274
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#: plugins/personal/netatalk/class_netatalk.inc:359
  msgid "My account"
  msgstr "Identità"
  
@@ -27,8 +42,8 @@ msgstr "Identità"
  msgid "Administration"
  msgstr "Amministrazione"
  
-#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:788
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
  msgid "Addons"
  msgstr "Extra"
  
@@ -40,28 +55,28 @@ msgstr "Extra"
  #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
  #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
  #: plugins/personal/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1368
+#: plugins/personal/generic/class_user.inc:1367
  #: plugins/gofax/blocklists/generic.tpl:1
  #: plugins/gofax/faxaccount/generic.tpl:6
  #: plugins/gofax/faxaccount/paste_generic.tpl:4
  #: plugins/admin/groups/mail.tpl:7
-#: plugins/admin/groups/class_groupGeneric.inc:884
-#: plugins/admin/applications/class_applicationGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:531
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#: plugins/admin/applications/class_applicationGeneric.inc:523
+#: plugins/admin/departments/class_departmentGeneric.inc:575
  #: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/class_servGeneric.inc:334
-#: plugins/admin/systems/class_workstationGeneric.inc:504
+#: plugins/admin/systems/class_servGeneric.inc:347
+#: plugins/admin/systems/class_workstationGeneric.inc:526
  #: plugins/admin/systems/servkolab.tpl:6 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/class_printGeneric.inc:854
-#: plugins/admin/systems/class_componentGeneric.inc:257
-#: plugins/admin/systems/class_phoneGeneric.inc:425
+#: plugins/admin/systems/class_printGeneric.inc:858
+#: plugins/admin/systems/class_componentGeneric.inc:259
+#: plugins/admin/systems/class_phoneGeneric.inc:430
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
  #: plugins/admin/systems/servdnseditzone.tpl:1
  #: plugins/admin/systems/goMailServer.tpl:1
  #: plugins/admin/systems/goImapServer.tpl:1
  #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:709
+#: plugins/admin/ogroups/class_ogroup.inc:692
  #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
  #: plugins/admin/fai/faiPartitionTable.tpl:4
  #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
@@ -72,9 +87,9 @@ msgstr "Extra"
  #: plugins/admin/fai/faiHookEntry.tpl:5
  #: plugins/admin/fai/faiTemplateEntry.tpl:3
  #: plugins/admin/mimetypes/generic.tpl:4
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:671
  #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_gofonMacro.inc:486
  #: plugins/generic/references/class_reference.inc:20
  msgid "Generic"
  msgstr "Generale"
@@ -86,30 +101,30 @@ msgstr "Unix"
  #: contrib/gosa.conf:82 contrib/gosa.conf:98
  #: plugins/personal/environment/class_environment.inc:12
  #: plugins/personal/environment/class_environment.inc:1269
-#: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/groups/class_divListGroup.inc:188
+#: plugins/admin/users/class_divListUsers.inc:177
  msgid "Environment"
  msgstr "Ambiente"
  
  #: contrib/gosa.conf:83 contrib/gosa.conf:100
  #: plugins/personal/mail/class_mailAccount.inc:22
  #: plugins/personal/mail/class_mailAccount.inc:1006
-#: plugins/admin/groups/class_groupMail.inc:1066
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:191
-#: plugins/admin/ogroups/tabs_ogroups.inc:76
+#: plugins/admin/groups/class_groupMail.inc:1073
+#: plugins/admin/groups/class_divListGroup.inc:180
+#: plugins/admin/users/class_divListUsers.inc:179
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
  #: plugins/admin/ogroups/tabs_ogroups.inc:184
  #: plugins/admin/ogroups/paste_mail.tpl:4
  #: plugins/admin/ogroups/class_mailogroup.inc:167
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/admin/ogroups/class_divListOGroup.inc:171
  #: plugins/generic/references/class_reference.inc:24
  msgid "Mail"
  msgstr "Posta"
  
  #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
  #: plugins/personal/samba/class_sambaAccount.inc:1041
-#: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/groups/class_divListGroup.inc:182
+#: plugins/admin/users/class_divListUsers.inc:185
  #: plugins/generic/references/class_reference.inc:26
  #: plugins/generic/references/class_reference.inc:28
  msgid "Samba"
@@ -117,7 +132,7 @@ msgstr "Samba"
  
  #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
  #: plugins/personal/netatalk/class_netatalk.inc:355
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:187
  msgid "Netatalk"
  msgstr ""
  
@@ -128,15 +143,14 @@ msgstr "Connettività"
  
  #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
  #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:581
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:586
  #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:807
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
  #: plugins/gofax/faxaccount/paste_generic.tpl:8
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:183
  #: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/class_departmentGeneric.inc:550
+#: plugins/admin/departments/class_departmentGeneric.inc:594
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Fax"
@@ -149,12 +163,12 @@ msgstr "Fax"
  #: plugins/addons/addressbook/address_edit.tpl:221
  #: plugins/addons/addressbook/address_info.tpl:67
  #: plugins/addons/addressbook/address_info.tpl:163
-#: plugins/admin/groups/class_divListGroup.inc:178
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/groups/class_divListGroup.inc:186
+#: plugins/admin/users/class_divListUsers.inc:181
  #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:818
+#: plugins/admin/systems/class_systemManagement.inc:1003
  #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/ogroups/class_ogroupManagement.inc:351
  #: plugins/admin/ogroups/class_phonequeue.inc:718
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1231
@@ -174,9 +188,9 @@ msgstr "Nagios"
  msgid "Applications"
  msgstr "Applicazioni"
  
-#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:92
  #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:240
+#: plugins/admin/systems/class_servRepository.inc:254
  #: plugins/admin/ogroups/phonequeue.tpl:43
  #: plugins/gofon/conference/generic.tpl:121
  msgid "Options"
@@ -190,21 +204,21 @@ msgstr "Parametro"
  
  #: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
  #: plugins/admin/systems/class_terminalStartup.inc:442
-#: plugins/admin/systems/class_workstationStartup.inc:1109
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: plugins/admin/systems/class_workstationStartup.inc:1154
+#: plugins/admin/ogroups/tabs_ogroups.inc:96
  msgid "Startup"
  msgstr "Avvio"
  
  #: contrib/gosa.conf:120 contrib/gosa.conf:136
-#: plugins/admin/ogroups/tabs_ogroups.inc:103
+#: plugins/admin/ogroups/tabs_ogroups.inc:99
  msgid "Devices"
  msgstr "Dispositivi"
  
  #: contrib/gosa.conf:121 contrib/gosa.conf:137
  #: plugins/personal/environment/environment.tpl:235
-#: plugins/admin/systems/class_systemManagement.inc:827
-#: plugins/admin/systems/class_printGeneric.inc:860
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/systems/class_systemManagement.inc:1012
+#: plugins/admin/systems/class_printGeneric.inc:864
+#: plugins/admin/ogroups/class_ogroupManagement.inc:354
  #: plugins/generic/references/class_reference.inc:52
  msgid "Printer"
  msgstr "Stampante"
@@ -223,16 +237,16 @@ msgstr "Stampante"
  #: plugins/admin/fai/faiPackageEntry.tpl:22
  #: plugins/gofon/macro/headpage.tpl:20
  #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:64
+#: ihtml/themes/default/MultiSelectWindow.tpl:27
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
  msgid "Information"
  msgstr "Informazioni"
  
  #: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:385
  #: plugins/admin/systems/class_goFaxServer.inc:85
  #: plugins/admin/systems/class_servKolab.inc:375
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:366
  #: plugins/admin/systems/class_goGlpiServer.inc:84
  #: plugins/admin/systems/class_goCupsServer.inc:64
  #: plugins/admin/systems/class_goTerminalServer.inc:118
@@ -251,7 +265,6 @@ msgid "Services"
  msgstr "Servizi"
  
  #: contrib/gosa.conf:129 contrib/gosa.conf:139
-#: plugins/admin/fai/class_faiSummaryTab.inc:546
  msgid "FAI summary"
  msgstr ""
  
@@ -278,7 +291,7 @@ msgstr "Esporta in formato Excel"
  #: plugins/addons/ldapmanager/contentcsv.tpl:112
  #: plugins/addons/ldapmanager/contentimport.tpl:50
  #: plugins/addons/notifications/contents.tpl:52
-#: plugins/admin/applications/generic.tpl:132
+#: plugins/admin/applications/generic.tpl:135
  msgid "Import"
  msgstr "Importa"
  
@@ -291,33 +304,32 @@ msgid "Partitions"
  msgstr "Partizioni"
  
  #: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:518
+#: plugins/admin/applications/generic.tpl:130
+#: plugins/admin/fai/class_faiScript.inc:529
  #: plugins/admin/fai/faiScriptEntry.tpl:56
  #: plugins/admin/fai/faiHookEntry.tpl:56
  msgid "Script"
  msgstr "Script"
  
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:45
  msgid "Hooks"
  msgstr ""
  
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:46
  msgid "Variables"
  msgstr "Variabili"
  
-#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:47
  msgid "Templates"
  msgstr "Template"
  
  #: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
-#: plugins/admin/fai/class_faiSummaryTab.inc:47
+#: plugins/admin/fai/class_faiSummaryTab.inc:50
  msgid "Profiles"
  msgstr "Profili"
  
-#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:103
  #: plugins/admin/acl/class_divListACL.inc:49
-#: plugins/admin/fai/class_faiSummaryTab.inc:545
  msgid "Summary"
  msgstr ""
  
@@ -373,7 +385,7 @@ msgstr "Seleziona gli indirizzi da aggiungere"
  #: plugins/personal/environment/hotplugDialog.tpl:24
  #: plugins/personal/environment/selectPrinterDialog.tpl:24
  #: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:62
+#: plugins/addons/addressbook/contents.tpl:65
  #: plugins/addons/godfs/contents.tpl:31
  #: plugins/admin/groups/mail_locals.tpl:22
  #: plugins/admin/groups/group_objects.tpl:20
@@ -389,8 +401,8 @@ msgstr "Seleziona gli indirizzi da aggiungere"
  #: plugins/admin/fai/faiPackageEntry.tpl:32
  #: plugins/gofon/macro/headpage.tpl:29
  #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:75
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:78
  msgid "Filters"
  msgstr "Filtri"
  
@@ -405,7 +417,7 @@ msgstr "Imposta dipartimento"
  #: plugins/personal/samba/samba3_workstations.tpl:27
  #: plugins/personal/environment/selectPrinterDialog.tpl:34
  #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:84
+#: plugins/addons/addressbook/contents.tpl:87
  #: plugins/admin/groups/mail_locals.tpl:33
  #: plugins/admin/groups/group_objects.tpl:40
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
@@ -456,22 +468,22 @@ msgstr "Nome dell'utente del quale mostrare gli indirizzi"
  #: plugins/admin/groups/mail.tpl:135 plugins/admin/groups/mail_locals.tpl:66
  #: plugins/admin/groups/generic.tpl:137
  #: plugins/admin/groups/application.tpl:39
-#: plugins/admin/groups/class_groupMail.inc:591
+#: plugins/admin/groups/class_groupMail.inc:598
  #: plugins/admin/groups/group_objects.tpl:55
  #: plugins/admin/groups/paste_mail.tpl:30
  #: plugins/admin/groups/paste_mail.tpl:41
  #: plugins/admin/systems/terminal.tpl:117
+#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/workstation.tpl:94
  #: plugins/admin/systems/glpiPrinter.tpl:115
  #: plugins/admin/systems/glpiPrinter.tpl:149
  #: plugins/admin/systems/servdns.tpl:6 plugins/admin/systems/glpi.tpl:125
-#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/phonesettings.tpl:207
  #: plugins/admin/systems/phonesettings.tpl:230
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:124
-#: plugins/admin/systems/workstationStartup.tpl:150
-#: plugins/admin/systems/workstationStartup.tpl:179
+#: plugins/admin/systems/workstationStartup.tpl:127
+#: plugins/admin/systems/workstationStartup.tpl:154
+#: plugins/admin/systems/workstationStartup.tpl:183
  #: plugins/admin/systems/terminalStartup.tpl:79
  #: plugins/admin/systems/terminalStartup.tpl:108
  #: plugins/admin/systems/servRepositorySetup.tpl:47
@@ -479,12 +491,12 @@ msgstr "Nome dell'utente del quale mostrare gli indirizzi"
  #: plugins/admin/systems/glpiManufacturer.tpl:6
  #: plugins/admin/systems/glpi_edit_os.tpl:8
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:472
-#: plugins/admin/systems/class_termDNS.inc:492
+#: plugins/admin/systems/class_termDNS.inc:477
+#: plugins/admin/systems/class_termDNS.inc:497
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
  #: plugins/admin/systems/servdnseditzone.tpl:106
  #: plugins/admin/systems/class_servDNSeditZone.inc:486
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:392
  #: plugins/admin/systems/goShareServer.tpl:14
  #: plugins/admin/systems/goMailServer.tpl:70
  #: plugins/admin/systems/goMailServer.tpl:101
@@ -497,7 +509,7 @@ msgstr "Nome dell'utente del quale mostrare gli indirizzi"
  #: plugins/admin/ogroups/ogroup_objects.tpl:54
  #: plugins/admin/ogroups/phonequeue.tpl:33
  #: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
-#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPackage.tpl:78
  #: plugins/admin/fai/faiPartitionTable.tpl:48
  #: plugins/admin/fai/faiPartitionTable.tpl:50
  #: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
@@ -546,15 +558,17 @@ msgstr "Aggiungi"
  #: plugins/admin/applications/remove.tpl:15
  #: plugins/admin/applications/class_applicationManagement.inc:352
  #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:506
+#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/departments/dep_move_confirm.tpl:17
+#: plugins/admin/systems/goNtpServer.tpl:31
+#: plugins/admin/systems/class_systemManagement.inc:654
  #: plugins/admin/systems/servdns.tpl:23
-#: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/servkolab.tpl:247 plugins/admin/systems/gencd.tpl:11
  #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/goNtpServer.tpl:32
-#: plugins/admin/systems/goKrbServer.tpl:33
+#: plugins/admin/systems/goKrbServer.tpl:32
+#: plugins/admin/systems/goFonServer.tpl:41
  #: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:140
-#: plugins/admin/systems/goFonServer.tpl:42
+#: plugins/admin/systems/goFaxServer.tpl:25
  #: plugins/admin/systems/remove_glpi.tpl:16
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
  #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -562,7 +576,7 @@ msgstr "Aggiungi"
  #: plugins/admin/systems/servRepository.tpl:68
  #: plugins/admin/systems/glpi_edit_type.tpl:29
  #: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/goFaxServer.tpl:26
+#: plugins/admin/systems/remove_ppd.tpl:14
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
  #: plugins/admin/systems/glpiSelectUser.tpl:51
  #: plugins/admin/systems/glpi_devices.tpl:761
@@ -575,26 +589,27 @@ msgstr "Aggiungi"
  #: plugins/admin/systems/SelectDeviceType.tpl:45
  #: plugins/admin/systems/class_baseSelectDialog.inc:43
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/ServiceAddDialog.tpl:31
-#: plugins/admin/systems/goLdapServer.tpl:12
-#: plugins/admin/systems/goShareServer.tpl:32
-#: plugins/admin/systems/goMailServer.tpl:224
-#: plugins/admin/systems/goImapServer.tpl:119
-#: plugins/admin/systems/goSyslogServer.tpl:8
-#: plugins/admin/systems/goGlpiServer.tpl:35
-#: plugins/admin/systems/goCupsServer.tpl:8
-#: plugins/admin/systems/goTerminalServer.tpl:26
-#: plugins/admin/systems/goLogDBServer.tpl:26
-#: plugins/admin/systems/goSpamServer.tpl:128
-#: plugins/admin/systems/goSpamServerRule.tpl:24
-#: plugins/admin/systems/goVirusServer.tpl:171
+#: plugins/admin/systems/ServiceAddDialog.tpl:30
+#: plugins/admin/systems/goLdapServer.tpl:11
+#: plugins/admin/systems/goShareServer.tpl:31
+#: plugins/admin/systems/goMailServer.tpl:223
+#: plugins/admin/systems/goImapServer.tpl:118
+#: plugins/admin/systems/goSyslogServer.tpl:7
+#: plugins/admin/systems/goGlpiServer.tpl:34
+#: plugins/admin/systems/goCupsServer.tpl:7
+#: plugins/admin/systems/goTerminalServer.tpl:25
+#: plugins/admin/systems/goLogDBServer.tpl:25
+#: plugins/admin/systems/goSpamServer.tpl:127
+#: plugins/admin/systems/goSpamServerRule.tpl:23
+#: plugins/admin/systems/goVirusServer.tpl:170
  #: plugins/admin/systems/class_goService.inc:34
  #: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:307
+#: plugins/admin/ogroups/class_ogroupManagement.inc:302
  #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:619
-#: plugins/admin/fai/class_faiManagement.inc:624
-#: plugins/admin/fai/class_faiManagement.inc:630
+#: plugins/admin/acl/class_aclManagement.inc:289
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/fai/class_faiManagement.inc:634
+#: plugins/admin/fai/class_faiManagement.inc:640
  #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
  #: plugins/admin/fai/faiScriptEntry.tpl:83
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:40
@@ -606,17 +621,17 @@ msgstr "Aggiungi"
  #: plugins/admin/fai/faiPackageNew.tpl:51
  #: plugins/admin/fai/faiNewBranch.tpl:20
  #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
  #: plugins/admin/mimetypes/remove.tpl:15
  #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
  #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:256
  #: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
  #: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
-#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:38
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:89
  msgid "Cancel"
  msgstr "Annulla"
  
@@ -628,11 +643,11 @@ msgstr "Indirizzo principale"
  
  #: plugins/personal/mail/generic.tpl:15
  #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:18
-#: plugins/admin/systems/class_servGeneric.inc:340
-#: plugins/admin/systems/class_systemManagement.inc:819
+#: plugins/admin/systems/class_servGeneric.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:1004
  #: plugins/admin/systems/servnfs.tpl:39
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:355
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
  #: plugins/generic/references/class_reference.inc:44
  msgid "Server"
  msgstr "Server"
@@ -647,14 +662,14 @@ msgstr "Utilizzo quota"
  
  #: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:38
  #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:515
+#: plugins/admin/systems/class_printGeneric.inc:516
  msgid "not defined"
  msgstr "non definito"
  
  #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/personal/mail/class_mailAccount.inc:1019
  #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1077
+#: plugins/admin/groups/class_groupMail.inc:1084
  msgid "Quota size"
  msgstr "Dimensione quota"
  
@@ -693,22 +708,23 @@ msgstr "Lista degli indirizzi alternativi"
  #: plugins/admin/applications/remove.tpl:13
  #: plugins/admin/departments/remove.tpl:14
  #: plugins/admin/systems/terminal.tpl:121
+#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/printer.tpl:102 plugins/admin/systems/printer.tpl:126
  #: plugins/admin/systems/workstation.tpl:98
  #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/remove_glpi.tpl:14
  #: plugins/admin/systems/phonesettings.tpl:210
  #: plugins/admin/systems/phonesettings.tpl:233
-#: plugins/admin/systems/workstationStartup.tpl:125
-#: plugins/admin/systems/workstationStartup.tpl:153
+#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:157
  #: plugins/admin/systems/terminalStartup.tpl:82
  #: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/remove_ppd.tpl:12
  #: plugins/admin/systems/glpi_edit_os.tpl:10
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
  #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:486
+#: plugins/admin/systems/class_termDNS.inc:491
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
  #: plugins/admin/systems/class_servDNSeditZone.inc:292
  #: plugins/admin/systems/class_servDNSeditZone.inc:480
@@ -780,7 +796,7 @@ msgid "MB"
  msgstr "Mb"
  
  #: plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1022
  msgid "Vacation message"
  msgstr "Messaggio di di risposta automatica"
  
@@ -811,7 +827,7 @@ msgid "User is only allowed to send and receive local mails"
  msgstr "L'utente è abilitato a mandare e ricevere solo mail locali"
  
  #: plugins/personal/mail/generic.tpl:190
-#: plugins/personal/mail/class_mailAccount.inc:1036
+#: plugins/personal/mail/class_mailAccount.inc:1037
  msgid "Use custom sieve script"
  msgstr "Usa uno script di sieve personalizzato"
  
@@ -829,13 +845,14 @@ msgstr "disabilita tutte le opzioni di posta!"
  #: plugins/admin/groups/class_groupManagement.inc:329
  #: plugins/admin/users/class_userManagement.inc:651
  #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:500
-#: plugins/admin/ogroups/class_ogroupManagement.inc:301
-#: plugins/admin/fai/class_faiManagement.inc:613
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
+#: plugins/admin/systems/class_systemManagement.inc:648
+#: plugins/admin/ogroups/class_ogroupManagement.inc:296
+#: plugins/admin/acl/class_aclManagement.inc:280
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:339
  #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:250
  msgid "Ok"
  msgstr ""
  
@@ -1021,36 +1038,36 @@ msgid ""
  msgstr ""
  
  #: plugins/personal/mail/class_mailAccount.inc:781
-#: plugins/admin/groups/class_groupMail.inc:880
+#: plugins/admin/groups/class_groupMail.inc:887
  msgid "The required field 'Primary address' is not set."
  msgstr "Il campo 'Indirizzo principale' non è stao inserito"
  
  #: plugins/personal/mail/class_mailAccount.inc:785
  #: plugins/personal/mail/class_mailAccount.inc:789
-#: plugins/addons/addressbook/class_addressbook.inc:694
+#: plugins/addons/addressbook/class_addressbook.inc:696
  #: plugins/admin/ogroups/class_mailogroup.inc:79
  msgid "Please enter a valid email address in 'Primary address' field."
  msgstr ""
  "Inserire un indirizzo di posta valido nel campo 'Indirizzo principale'."
  
  #: plugins/personal/mail/class_mailAccount.inc:795
-#: plugins/admin/groups/class_groupMail.inc:889
+#: plugins/admin/groups/class_groupMail.inc:896
  #: plugins/admin/ogroups/class_mailogroup.inc:86
  msgid "The primary address you've entered is already in use."
  msgstr "L'indirizzo principale inserito è già in uso."
  
  #: plugins/personal/mail/class_mailAccount.inc:801
-#: plugins/admin/groups/class_groupMail.inc:895
+#: plugins/admin/groups/class_groupMail.inc:902
  msgid "Value in 'Quota size' is not valid."
  msgstr "Il valore di 'Dimensione quota' non è valido"
  
  #: plugins/personal/mail/class_mailAccount.inc:810
-#: plugins/admin/groups/class_groupMail.inc:904
+#: plugins/admin/groups/class_groupMail.inc:911
  msgid "Please specify a vaild mail size for mails to be rejected."
  msgstr "Specificare una dimenzione valida per le mail da rigettare."
  
  #: plugins/personal/mail/class_mailAccount.inc:820
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
  msgid "You need to set the maximum mail size in order to reject anything."
  msgstr "Devi specificare la dimensione massima delle mail da rigettare."
  
@@ -1080,67 +1097,72 @@ msgid ""
  "methods."
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1012
+#, fuzzy
+msgid "Mail account"
+msgstr "Identità"
+
+#: plugins/personal/mail/class_mailAccount.inc:1017
  #: plugins/personal/nagios/nagios.tpl:17
-#: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/addons/addressbook/class_addressbook.inc:797
-#: plugins/admin/groups/class_groupMail.inc:1074
-#: plugins/admin/systems/class_servDNS.inc:394
+#: plugins/personal/nagios/class_nagiosAccount.inc:273
+#: plugins/addons/addressbook/class_addressbook.inc:799
+#: plugins/admin/groups/class_groupMail.inc:1081
+#: plugins/admin/systems/class_servDNS.inc:396
  #: plugins/admin/systems/servdnseditzone.tpl:51
  #: plugins/admin/ogroups/class_mailogroup.inc:175 html/getxls.php:225
  msgid "Mail address"
  msgstr "Indirizzo principale"
  
-#: plugins/personal/mail/class_mailAccount.inc:1017
-#: plugins/admin/groups/class_groupMail.inc:1078
+#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/admin/groups/class_groupMail.inc:1085
  #, fuzzy
  msgid "Mail server"
  msgstr "Server"
  
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1021
  #, fuzzy
  msgid "Add vacation information"
  msgstr "Informazioni organizzazione"
  
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1024
  msgid "Use spam filter"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1025
  msgid "Spam level"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1026
  msgid "Spam mail box"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1028
  #, fuzzy
  msgid "Reject due to mailsize"
  msgstr "Rifiuta mail più grandi di"
  
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:1029
  #, fuzzy
  msgid "Mail max size"
  msgstr "Inoltra i messaggi a"
  
-#: plugins/personal/mail/class_mailAccount.inc:1030
-#: plugins/personal/mail/class_mailAccount.inc:1035
+#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1036
  #, fuzzy
  msgid "Forwarding address"
  msgstr "Indirizzo principale"
  
-#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1032
  #, fuzzy
  msgid "Local delivery"
  msgstr "Ultimo recapito"
  
-#: plugins/personal/mail/class_mailAccount.inc:1032
+#: plugins/personal/mail/class_mailAccount.inc:1033
  #, fuzzy
  msgid "No delivery to own mailbox "
  msgstr "Non recapitare nella propria mailbox"
  
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1034
  #, fuzzy
  msgid "Mail alternative addresses"
  msgstr "Indirizzi alternativi"
@@ -1211,8 +1233,9 @@ msgstr ""
  #: plugins/addons/ldapmanager/contentexport.tpl:66
  #: plugins/addons/ldapmanager/contentexportxls.tpl:69
  #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1452
+#: plugins/admin/departments/dep_iframe.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:145
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1421
  #: ihtml/themes/default/setup_useradmin.tpl:40
  #: ihtml/themes/default/setup_step4.tpl:114
  #: ihtml/themes/default/setup_step2.tpl:12
@@ -1222,13 +1245,14 @@ msgid "Back"
  msgstr "Indietro"
  
  #: plugins/personal/password/class_password.inc:5
+#: plugins/personal/password/class_password.inc:17
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/admin/systems/class_goFaxServer.inc:94
  #: plugins/admin/systems/goKrbServer.tpl:20
  #: plugins/admin/systems/goFonServer.tpl:12
-#: plugins/admin/systems/class_goGlpiServer.inc:98
  #: plugins/admin/systems/goFaxServer.tpl:12
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_goGlpiServer.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:308
  #: plugins/admin/systems/goImapServer.tpl:34
  #: plugins/admin/systems/class_goFonServer.inc:107
  #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1241,7 +1265,7 @@ msgid "Password"
  msgstr "Password"
  
  #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/generic/class_user.inc:1378
  #, fuzzy
  msgid "User password"
  msgstr "Nuova password"
@@ -1292,12 +1316,12 @@ msgid "External password changer reported a problem: "
  msgstr "Il programma esterno per cambiare la password ha avuto un problema:"
  
  #: plugins/personal/password/main.inc:123
-#: plugins/admin/users/class_divListUsers.inc:261
+#: plugins/admin/users/class_divListUsers.inc:249
  msgid "Change password"
  msgstr "Cambia la password"
  
  #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1327
+#: plugins/personal/posix/class_posixAccount.inc:1320
  #: plugins/personal/posix/paste_generic.tpl:8
  #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
  #: plugins/personal/samba/class_sambaAccount.inc:645
@@ -1305,7 +1329,7 @@ msgid "Home directory"
  msgstr "Home directory"
  
  #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1328
+#: plugins/personal/posix/class_posixAccount.inc:1321
  msgid "Shell"
  msgstr "Shell"
  
@@ -1314,10 +1338,10 @@ msgid "Primary group"
  msgstr "Gruppo primario"
  
  #: plugins/personal/posix/generic.tpl:35
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:235
  #: plugins/gofax/faxreports/contents.tpl:32
  #: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/class_faxreport.inc:482
+#: plugins/gofax/faxreports/class_faxreport.inc:487
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
  #: plugins/gofon/fonreports/contents.tpl:35
  msgid "Status"
@@ -1335,7 +1359,7 @@ msgstr "UID"
  
  #: plugins/personal/posix/generic.tpl:62
  #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:894
  msgid "GID"
  msgstr "GID"
  
@@ -1378,7 +1402,7 @@ msgstr "Mostra gruppi di dipartimenti"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -1435,57 +1459,57 @@ msgstr "Impostazioni Unix"
  msgid "UNIX"
  msgstr "Unix"
  
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:135
  #, fuzzy
  msgid "expired"
  msgstr "Esporta"
  
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:137
  msgid "grace time active"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:140
  #, fuzzy
  msgid "active, password not changable"
  msgstr "Nuova password"
  
-#: plugins/personal/posix/class_posixAccount.inc:143
+#: plugins/personal/posix/class_posixAccount.inc:142
  #, fuzzy
  msgid "active, password expired"
  msgstr "La password spira il"
  
-#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:144
  #, fuzzy
  msgid "active"
  msgstr "Privato"
  
-#: plugins/personal/posix/class_posixAccount.inc:156
-#: plugins/personal/posix/class_posixAccount.inc:1010
+#: plugins/personal/posix/class_posixAccount.inc:155
+#: plugins/personal/posix/class_posixAccount.inc:1002
  msgid "Group of user"
  msgstr "Gruppo di utenti"
  
-#: plugins/personal/posix/class_posixAccount.inc:191
+#: plugins/personal/posix/class_posixAccount.inc:190
  msgid "unconfigured"
  msgstr "non configurata"
  
-#: plugins/personal/posix/class_posixAccount.inc:208
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:791
+#: plugins/personal/posix/class_posixAccount.inc:201
+#: plugins/admin/systems/class_workstationStartup.inc:825
  #: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:196
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
  msgid "automatic"
  msgstr "automatico"
  
-#: plugins/personal/posix/class_posixAccount.inc:254
+#: plugins/personal/posix/class_posixAccount.inc:247
  msgid "This account has no unix extensions."
  msgstr "Questa identità non possiede estensioni Unix"
  
-#: plugins/personal/posix/class_posixAccount.inc:274
-#: plugins/personal/posix/class_posixAccount.inc:277
+#: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
  msgid "Remove posix account"
  msgstr "Elimina estensioni Unix"
  
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:268
  msgid ""
  "This account has unix features enabled. To disable them, you'll need to "
  "remove the samba / environment account first."
@@ -1493,46 +1517,46 @@ msgstr ""
  "Questa identià possiede estensioni Unix. Per eliminarle devi eliminare prima "
  "le estensioni Samba / ambiente."
  
-#: plugins/personal/posix/class_posixAccount.inc:278
+#: plugins/personal/posix/class_posixAccount.inc:271
  msgid ""
  "This account has posix features enabled. You can disable them by clicking "
  "below."
  msgstr "Questa identià possiede estensioni Unix."
  
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:274
  msgid "Create posix account"
  msgstr "Crea estensioni Unix"
  
-#: plugins/personal/posix/class_posixAccount.inc:282
+#: plugins/personal/posix/class_posixAccount.inc:275
  msgid ""
  "This account has posix features disabled. You can enable them by clicking "
  "below."
  msgstr "Questa identità non possiede estensioni Unix"
  
-#: plugins/personal/posix/class_posixAccount.inc:442
+#: plugins/personal/posix/class_posixAccount.inc:435
  #, php-format
  msgid "Password can't be changed up to %s days after last change"
  msgstr ""
  "La password non può essere cambiata per %s giorni dall'ultimo cambiamento"
  
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:439
  #, php-format
  msgid "Password must be changed after %s days"
  msgstr "La password deve essere cambiata dopo %s giorni"
  
-#: plugins/personal/posix/class_posixAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:443
  #, php-format
  msgid "Disable account after %s days of inactivity after password expiery"
  msgstr ""
  "Disabilita l'account dopo %s giorni di inattività dopo che la password è "
  "spirata"
  
-#: plugins/personal/posix/class_posixAccount.inc:454
+#: plugins/personal/posix/class_posixAccount.inc:447
  #, php-format
  msgid "Warn user %s days before password expiery"
  msgstr "Avvisa l'utente %s giorni prima che la password spiri"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1541,7 +1565,7 @@ msgstr "Avvisa l'utente %s giorni prima che la password spiri"
  msgid "January"
  msgstr "Gennaio"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1550,7 +1574,7 @@ msgstr "Gennaio"
  msgid "February"
  msgstr "Febbraio"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1559,7 +1583,7 @@ msgstr "Febbraio"
  msgid "March"
  msgstr "Marzo"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1568,7 +1592,7 @@ msgstr "Marzo"
  msgid "April"
  msgstr "Aprile"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1577,7 +1601,7 @@ msgstr "Aprile"
  msgid "May"
  msgstr "Maggio"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1586,7 +1610,7 @@ msgstr "Maggio"
  msgid "June"
  msgstr "Giugno"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1595,7 +1619,7 @@ msgstr "Giugno"
  msgid "July"
  msgstr "Luglio"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1604,7 +1628,7 @@ msgstr "Luglio"
  msgid "August"
  msgstr "Agosto"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1613,7 +1637,7 @@ msgstr "Agosto"
  msgid "September"
  msgstr "Settembre"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1622,7 +1646,7 @@ msgstr "Settembre"
  msgid "October"
  msgstr "Ottobre"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1631,7 +1655,7 @@ msgstr "Ottobre"
  msgid "November"
  msgstr "Novembre"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1640,149 +1664,154 @@ msgstr "Novembre"
  msgid "December"
  msgstr "Dicembre"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  #: plugins/personal/samba/class_sambaAccount.inc:468
-#: plugins/admin/systems/class_terminalGeneric.inc:97
+#: plugins/admin/systems/class_terminalGeneric.inc:104
  #: ihtml/themes/default/setup_step4.tpl:91
  msgid "disabled"
  msgstr "disabilitato"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  msgid "full access"
  msgstr "accesso completo"
  
-#: plugins/personal/posix/class_posixAccount.inc:576
+#: plugins/personal/posix/class_posixAccount.inc:568
  msgid "allow access to these hosts"
  msgstr "accesso limitato ai seguenti host"
  
-#: plugins/personal/posix/class_posixAccount.inc:622
+#: plugins/personal/posix/class_posixAccount.inc:614
  #, fuzzy, php-format
  msgid "Removing of user/posix account with dn '%s' failed."
  msgstr "Elimina estensioni Unix"
  
-#: plugins/personal/posix/class_posixAccount.inc:770
+#: plugins/personal/posix/class_posixAccount.inc:762
  msgid "Failed: overriding lock"
  msgstr "Fallito: override the lock"
  
-#: plugins/personal/posix/class_posixAccount.inc:859
+#: plugins/personal/posix/class_posixAccount.inc:851
  #, fuzzy, php-format
  msgid "Saving of user/posix account with dn '%s' failed."
  msgstr "Estenzioni Proxy Internet"
  
-#: plugins/personal/posix/class_posixAccount.inc:924
+#: plugins/personal/posix/class_posixAccount.inc:916
  msgid "The required field 'Home directory' is not set."
  msgstr "Il campo necessario 'Home directory' non è vuoto"
  
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:919
  msgid "Please enter a valid path in 'Home directory' field."
  msgstr "Inserire un nome cartella valido per il campo 'Home directory'."
  
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:927
  msgid "Value specified as 'UID' is not valid."
  msgstr "Il valore specificato per l'UID non è valido."
  
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:930
  msgid "Value specified as 'UID' is too small."
  msgstr "Il valore specificato per l'UID è troppo basso."
  
-#: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/admin/groups/class_groupGeneric.inc:797
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:791
  msgid "Value specified as 'GID' is not valid."
  msgstr "Il valore specificato per il GID non è valido."
  
-#: plugins/personal/posix/class_posixAccount.inc:945
-#: plugins/admin/groups/class_groupGeneric.inc:800
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:794
  msgid "Value specified as 'GID' is too small."
  msgstr "Il valore specificato per il GID è troppo basso."
  
-#: plugins/personal/posix/class_posixAccount.inc:953
+#: plugins/personal/posix/class_posixAccount.inc:945
  msgid "Value specified as 'shadowMin' is not valid."
  msgstr "Il valore specificato come 'shadowMin' non è valido"
  
-#: plugins/personal/posix/class_posixAccount.inc:958
+#: plugins/personal/posix/class_posixAccount.inc:950
  msgid "Value specified as 'shadowMax' is not valid."
  msgstr "Il valore specificato come 'shadowMax' non è valido"
  
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:955
  msgid "Value specified as 'shadowWarning' is not valid."
  msgstr "Il valore specificato come 'shadowWarning' non è valido"
  
-#: plugins/personal/posix/class_posixAccount.inc:966
+#: plugins/personal/posix/class_posixAccount.inc:958
  msgid "'shadowWarning' without 'shadowMax' makes no sense."
  msgstr "'shadowWarning' senza 'shadowMax' non ha senso."
  
-#: plugins/personal/posix/class_posixAccount.inc:969
+#: plugins/personal/posix/class_posixAccount.inc:961
  msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:972
+#: plugins/personal/posix/class_posixAccount.inc:964
  msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:977
+#: plugins/personal/posix/class_posixAccount.inc:969
  msgid "Value specified as 'shadowInactive' is not valid."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:980
+#: plugins/personal/posix/class_posixAccount.inc:972
  msgid "'shadowInactive' without 'shadowMax' makes no sense."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:985
+#: plugins/personal/posix/class_posixAccount.inc:977
  msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1148
-#: plugins/admin/groups/class_groupGeneric.inc:836
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:830
  msgid "Too many users, can't allocate a free ID!"
  msgstr "Troppi utenti non posso allocare un ID libero!"
  
-#: plugins/personal/posix/class_posixAccount.inc:1317
+#: plugins/personal/posix/class_posixAccount.inc:1309
  #, fuzzy
  msgid "POSIX account"
  msgstr "Estenzioni FTP"
  
-#: plugins/personal/posix/class_posixAccount.inc:1329
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:100
+#: plugins/personal/posix/class_posixAccount.inc:1314
+#, fuzzy
+msgid "Posix Account"
+msgstr "Estenzioni Proxy Internet"
+
+#: plugins/personal/posix/class_posixAccount.inc:1322
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:100
  #: html/getxls.php:135 html/getxls.php:158 html/getxls.php:347
  #: html/getxls.php:364
  msgid "User ID"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1330
+#: plugins/personal/posix/class_posixAccount.inc:1323
  #, fuzzy
  msgid "Group ID"
  msgstr "Gruppo"
  
-#: plugins/personal/posix/class_posixAccount.inc:1332
+#: plugins/personal/posix/class_posixAccount.inc:1325
  #, fuzzy
  msgid "Force password change on login"
  msgstr "Cambia la password"
  
-#: plugins/personal/posix/class_posixAccount.inc:1333
+#: plugins/personal/posix/class_posixAccount.inc:1326
  #, fuzzy
  msgid "Shadow min"
  msgstr "Mostra terminali"
  
-#: plugins/personal/posix/class_posixAccount.inc:1334
+#: plugins/personal/posix/class_posixAccount.inc:1327
  msgid "Shadow max"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1335
+#: plugins/personal/posix/class_posixAccount.inc:1328
  #, fuzzy
  msgid "Shadow warning"
  msgstr "Mostra workstation"
  
-#: plugins/personal/posix/class_posixAccount.inc:1336
+#: plugins/personal/posix/class_posixAccount.inc:1329
  #, fuzzy
  msgid "Shadow inactive"
  msgstr "Mostra stampanti"
  
-#: plugins/personal/posix/class_posixAccount.inc:1337
+#: plugins/personal/posix/class_posixAccount.inc:1330
  #, fuzzy
  msgid "Shadow expire"
  msgstr "Mostra persone"
  
-#: plugins/personal/posix/class_posixAccount.inc:1338
+#: plugins/personal/posix/class_posixAccount.inc:1331
  #, fuzzy
  msgid "System trust model"
  msgstr "Accesso ai sistemi"
@@ -1815,7 +1844,7 @@ msgid "Allow user to change password from client"
  msgstr "Permetti all'utente di cambiare la propria password da un client"
  
  #: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1056
  msgid "Login from windows client requires no password"
  msgstr "L'accesso ai client Windows non richiede password"
  
@@ -1824,7 +1853,7 @@ msgid "Temporary disable samba account"
  msgstr "Disabilita temporaneamente l'account Samba"
  
  #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1069
+#: plugins/personal/samba/class_sambaAccount.inc:1070
  msgid "Domain"
  msgstr "Dominio"
  
@@ -1833,12 +1862,12 @@ msgid "Terminal Server"
  msgstr "Terminal Server"
  
  #: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1052
  msgid "Allow login on terminal server"
  msgstr "Permetti la connessione al Terminal Server"
  
  #: plugins/personal/samba/samba3.tpl:131
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1053
  msgid "Inherit client config"
  msgstr "Eredita la configurazione del client"
  
@@ -1903,17 +1932,17 @@ msgid "Reconnect if disconnected"
  msgstr ""
  
  #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1057
  msgid "Lock samba account"
  msgstr "Blocca l'account samba"
  
  #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1062
+#: plugins/personal/samba/class_sambaAccount.inc:1063
  msgid "Limit Logon Time"
  msgstr "Limita il tempo per la connessione"
  
  #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1063
+#: plugins/personal/samba/class_sambaAccount.inc:1064
  msgid "Limit Logoff Time"
  msgstr "Limita il tempo per la disconnessione"
  
@@ -2042,41 +2071,46 @@ msgstr ""
  msgid "Saving of user/samba account with dn '%s' failed."
  msgstr "Account Kolab"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1047
+#, fuzzy
+msgid "Samba account"
+msgstr "Blocca l'account samba"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1055
  #, fuzzy
  msgid "Allow user to change password"
  msgstr "Permetti all'utente di cambiare la propria password da un client"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1059
+#: plugins/personal/samba/class_sambaAccount.inc:1060
  #, fuzzy
  msgid "Account expires"
  msgstr "L'account spira dopo"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1060
+#: plugins/personal/samba/class_sambaAccount.inc:1061
  #, fuzzy
  msgid "Password expires"
  msgstr "La password spira il"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1065
+#: plugins/personal/samba/class_sambaAccount.inc:1066
  #, fuzzy
  msgid "Generic home directory"
  msgstr "Home directory"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1066
+#: plugins/personal/samba/class_sambaAccount.inc:1067
  msgid "Generic samba home drive"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1067
+#: plugins/personal/samba/class_sambaAccount.inc:1068
  #, fuzzy
  msgid "Generic script path"
  msgstr "Script path"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1068
+#: plugins/personal/samba/class_sambaAccount.inc:1069
  #, fuzzy
  msgid "Generic profile path"
  msgstr "Path del profilo"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1070
+#: plugins/personal/samba/class_sambaAccount.inc:1071
  #, fuzzy
  msgid "Allow connection from"
  msgstr "Permetti la connessione solo da queste workstation"
@@ -2093,225 +2127,214 @@ msgstr "maschio"
  msgid "This account has no valid GOsa extensions."
  msgstr "Questa identità non possiede estensioni GOsa."
  
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:335
  msgid "The specified file has not been uploaded via HTTP POST! Aborted."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:432
  msgid "Please enter a valid serial number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:471
+#: plugins/personal/generic/class_user.inc:476
  msgid ""
  "(Some types of certificates are currently not supported and may be displayed "
  "as 'invalid'.)"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:481
+#: plugins/personal/generic/class_user.inc:486
  #, php-format
  msgid "Certificate is valid from %s to %s and is currently %s."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:484
+#: plugins/personal/generic/class_user.inc:489
  msgid "valid"
  msgstr "valido"
  
-#: plugins/personal/generic/class_user.inc:485
+#: plugins/personal/generic/class_user.inc:490
  msgid "invalid"
  msgstr "invalido"
  
-#: plugins/personal/generic/class_user.inc:490
+#: plugins/personal/generic/class_user.inc:495
  msgid "No certificate installed"
  msgstr "Non ci sono certificati installati"
  
-#: plugins/personal/generic/class_user.inc:579
+#: plugins/personal/generic/class_user.inc:582
  #, fuzzy, php-format
  msgid "Removing of user/generic account with dn '%s' failed."
  msgstr "Elimina estensioni Unix"
  
-#: plugins/personal/generic/class_user.inc:611
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:982
  msgid "Kerberos database communication failed"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:625
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:628
+#: plugins/personal/generic/class_user.inc:999
  msgid "Can't remove user from kerberos database."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:682
-#: plugins/admin/systems/class_printGeneric.inc:625
+#: plugins/personal/generic/class_user.inc:684
  #, fuzzy, php-format
  msgid "You are not allowed to move this object to '%s'."
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:935
  #, fuzzy, php-format
  msgid "Saving of user/generic account with dn '%s' failed."
  msgstr "Estenzioni Proxy Internet"
  
-#: plugins/personal/generic/class_user.inc:1008
+#: plugins/personal/generic/class_user.inc:1010
  msgid "Can't add user to kerberos database."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1049
-#, fuzzy
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: plugins/personal/generic/class_user.inc:1052
-#, fuzzy
-msgid "You have no permissions to move this user to the specified 'Base'."
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: plugins/personal/generic/class_user.inc:1058
-#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/personal/generic/class_user.inc:1057
+#: plugins/addons/addressbook/class_addressbook.inc:653
  #: plugins/admin/users/class_userManagement.inc:471
  #: plugins/admin/users/class_userManagement.inc:549
  msgid "The required field 'Name' is not set."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1067
+#: plugins/personal/generic/class_user.inc:1066
  msgid "There's already a person with this 'Login' in the database."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/personal/generic/class_user.inc:1072
+#: plugins/addons/addressbook/class_addressbook.inc:657
  #: plugins/admin/users/class_userManagement.inc:474
  #: plugins/admin/users/class_userManagement.inc:552
  msgid "The required field 'Given name' is not set."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1075
  msgid "The required field 'Login' is not set."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1082
  msgid ""
  "There's already a person with this 'Name'/'Given name' combination in the "
  "database."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1090
+#: plugins/personal/generic/class_user.inc:1089
  msgid ""
  "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1093
+#: plugins/personal/generic/class_user.inc:1092
  msgid "The field 'Homepage' contains an invalid URL definition."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1096
-#: plugins/personal/generic/class_user.inc:1121
-#: plugins/addons/addressbook/class_addressbook.inc:661
-#: plugins/addons/addressbook/class_addressbook.inc:689
-#: plugins/admin/departments/class_departmentGeneric.inc:249
+#: plugins/personal/generic/class_user.inc:1095
+#: plugins/personal/generic/class_user.inc:1120
+#: plugins/addons/addressbook/class_addressbook.inc:663
+#: plugins/addons/addressbook/class_addressbook.inc:691
+#: plugins/admin/departments/class_departmentGeneric.inc:269
  msgid "The field 'Name' contains invalid characters."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1099
-#: plugins/personal/generic/class_user.inc:1118
-#: plugins/addons/addressbook/class_addressbook.inc:664
-#: plugins/addons/addressbook/class_addressbook.inc:686
+#: plugins/personal/generic/class_user.inc:1098
+#: plugins/personal/generic/class_user.inc:1117
+#: plugins/addons/addressbook/class_addressbook.inc:666
+#: plugins/addons/addressbook/class_addressbook.inc:688
  msgid "The field 'Given name' contains invalid characters."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1104
-#: plugins/addons/addressbook/class_addressbook.inc:669
-#: plugins/addons/addressbook/class_addressbook.inc:672
-#: plugins/admin/departments/class_departmentGeneric.inc:252
+#: plugins/personal/generic/class_user.inc:1103
+#: plugins/addons/addressbook/class_addressbook.inc:671
+#: plugins/addons/addressbook/class_addressbook.inc:674
+#: plugins/admin/departments/class_departmentGeneric.inc:272
  msgid "The field 'Phone' contains an invalid phone number."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1107
-#: plugins/addons/addressbook/class_addressbook.inc:675
-#: plugins/admin/departments/class_departmentGeneric.inc:255
+#: plugins/personal/generic/class_user.inc:1106
+#: plugins/addons/addressbook/class_addressbook.inc:677
+#: plugins/admin/departments/class_departmentGeneric.inc:275
  msgid "The field 'Fax' contains an invalid phone number."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1110
-#: plugins/addons/addressbook/class_addressbook.inc:678
+#: plugins/personal/generic/class_user.inc:1109
+#: plugins/addons/addressbook/class_addressbook.inc:680
  msgid "The field 'Mobile' contains an invalid phone number."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1113
-#: plugins/addons/addressbook/class_addressbook.inc:681
+#: plugins/personal/generic/class_user.inc:1112
+#: plugins/addons/addressbook/class_addressbook.inc:683
  msgid "The field 'Pager' contains an invalid phone number."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1222
+#: plugins/personal/generic/class_user.inc:1221
  msgid "Could not open specified certificate!"
  msgstr "Impossibile aprite il certificato selezionato!"
  
-#: plugins/personal/generic/class_user.inc:1353
+#: plugins/personal/generic/class_user.inc:1352
  #: plugins/personal/generic/generic.tpl:442
  msgid "Unit"
  msgstr "Unità"
  
-#: plugins/personal/generic/class_user.inc:1354
+#: plugins/personal/generic/class_user.inc:1353
  #: plugins/personal/generic/generic.tpl:467
  msgid "House identifier"
  msgstr "Identificativo della casa"
  
-#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/class_user.inc:1354
  #: plugins/personal/generic/generic.tpl:384
  msgid "Vocation"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1355
  #: plugins/personal/generic/generic.tpl:511
  msgid "Last delivery"
  msgstr "Ultimo recapito"
  
-#: plugins/personal/generic/class_user.inc:1357
+#: plugins/personal/generic/class_user.inc:1356
  #: plugins/personal/generic/generic.tpl:433
  msgid "Person locality"
  msgstr "Località personale"
  
-#: plugins/personal/generic/class_user.inc:1358
+#: plugins/personal/generic/class_user.inc:1357
  #: plugins/personal/generic/generic.tpl:392
  msgid "Unit description"
  msgstr "Descrizoione unità"
  
-#: plugins/personal/generic/class_user.inc:1359
+#: plugins/personal/generic/class_user.inc:1358
  #: plugins/personal/generic/generic.tpl:401
  msgid "Subject area"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/class_user.inc:1359
  #: plugins/personal/generic/generic.tpl:410
  msgid "Functional title"
  msgstr "Funzione"
  
-#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/class_user.inc:1361
  #: plugins/personal/generic/generic.tpl:520
  msgid "Public visible"
  msgstr "Pubblico"
  
-#: plugins/personal/generic/class_user.inc:1363
+#: plugins/personal/generic/class_user.inc:1362
  #: plugins/personal/generic/generic.tpl:451
  msgid "Street"
  msgstr "Strada"
  
-#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1363
  #: plugins/personal/generic/generic.tpl:419
  msgid "Role"
  msgstr "Ruolo"
  
-#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/class_user.inc:1364
  #: plugins/personal/generic/generic.tpl:459
  #: plugins/addons/addressbook/address_edit.tpl:179
  #: plugins/addons/addressbook/address_info.tpl:133 html/getxls.php:227
  msgid "Postal code"
  msgstr "CAP"
  
-#: plugins/personal/generic/class_user.inc:1369
+#: plugins/personal/generic/class_user.inc:1368
  #, fuzzy
  msgid "Generic user settings"
  msgstr "Impostazioni generali delle code"
  
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:1373
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/users/class_userManagement.inc:28
  #: plugins/admin/systems/printer.tpl:91
@@ -2321,218 +2344,219 @@ msgstr "Impostazioni generali delle code"
  msgid "Users"
  msgstr "Utenti"
  
-#: plugins/personal/generic/class_user.inc:1378
+#: plugins/personal/generic/class_user.inc:1377
  #: plugins/personal/generic/generic.tpl:143
  #: plugins/gofax/blocklists/generic.tpl:17
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:598
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
  #: plugins/addons/godfs/class_dfsManagment.inc:217
  #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:894
-#: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/groups/class_groupGeneric.inc:888
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:129
  #: plugins/admin/applications/generic.tpl:42
-#: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:134
+#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/class_divListApplication.inc:144
  #: plugins/admin/departments/generic.tpl:35
-#: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:107
+#: plugins/admin/departments/class_departmentGeneric.inc:586
+#: plugins/admin/departments/class_divListDepartment.inc:100
  #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:22
  #: plugins/admin/systems/phone.tpl:17 plugins/admin/systems/printer.tpl:27
  #: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/class_terminalGeneric.inc:513
-#: plugins/admin/systems/class_servGeneric.inc:346
-#: plugins/admin/systems/class_workstationGeneric.inc:515
+#: plugins/admin/systems/class_terminalGeneric.inc:553
+#: plugins/admin/systems/class_servGeneric.inc:359
+#: plugins/admin/systems/class_workstationGeneric.inc:537
  #: plugins/admin/systems/wingeneric.tpl:13
  #: plugins/admin/systems/component.tpl:17
-#: plugins/admin/systems/class_printGeneric.inc:864
-#: plugins/admin/systems/class_componentGeneric.inc:267
-#: plugins/admin/systems/class_glpiSelectUser.inc:167
+#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_componentGeneric.inc:269
+#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_glpiSelectUser.inc:181
  #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:148
+#: plugins/admin/systems/class_divListSystem.inc:187
  #: plugins/admin/systems/goLdapServer.tpl:2
  #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:719
-#: plugins/admin/ogroups/class_divListOGroup.inc:145
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_divListOGroup.inc:149
+#: plugins/admin/acl/class_divListACL.inc:98
+#: plugins/admin/fai/class_divListFai.inc:171
  #: plugins/admin/mimetypes/generic.tpl:44
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:683
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:153
  #: plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/class_gofonMacro.inc:484
-#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/macro/class_gofonMacro.inc:497
+#: plugins/gofon/macro/class_divListMacros.inc:106
  #: plugins/gofon/conference/generic.tpl:49
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
-#: plugins/gofon/conference/class_divListConferences.inc:119
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_divListConferences.inc:114
  msgid "Base"
  msgstr "Base"
  
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/addons/addressbook/class_addressbook.inc:792 html/getxls.php:301
  msgid "Surename"
  msgstr "Cognome"
  
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/addons/addressbook/class_addressbook.inc:611
-#: plugins/addons/addressbook/class_addressbook.inc:791 html/getxls.php:86
+#: plugins/personal/generic/class_user.inc:1380
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/addressbook/class_addressbook.inc:793 html/getxls.php:86
  #: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
  msgid "Given name"
  msgstr "Nome"
  
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/addons/addressbook/class_addressbook.inc:796
+#: plugins/personal/generic/class_user.inc:1381
+#: plugins/addons/addressbook/class_addressbook.inc:798
  #, fuzzy
  msgid "User identification"
  msgstr "Amministrazione utenti"
  
-#: plugins/personal/generic/class_user.inc:1383
+#: plugins/personal/generic/class_user.inc:1382
  #: plugins/personal/generic/generic.tpl:73
  #: plugins/addons/addressbook/address_edit.tpl:60
  #: plugins/addons/addressbook/address_info.tpl:40
  msgid "Personal title"
  msgstr "Titolo onorifico"
  
-#: plugins/personal/generic/class_user.inc:1384
+#: plugins/personal/generic/class_user.inc:1383
  #: plugins/personal/generic/generic.tpl:83
  msgid "Academic title"
  msgstr "Titolo di studio"
  
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
+#: plugins/personal/generic/class_user.inc:1384
+#: plugins/addons/addressbook/class_addressbook.inc:809 html/getxls.php:224
  msgid "Home postal address"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1386
-#: plugins/addons/addressbook/class_addressbook.inc:795
+#: plugins/personal/generic/class_user.inc:1385
+#: plugins/addons/addressbook/class_addressbook.inc:797
  #, fuzzy
  msgid "Home phone number"
  msgstr "Numero di telefono"
  
-#: plugins/personal/generic/class_user.inc:1387
+#: plugins/personal/generic/class_user.inc:1386
  #: plugins/personal/generic/generic.tpl:183
  msgid "Homepage"
  msgstr "Home Page"
  
-#: plugins/personal/generic/class_user.inc:1388
+#: plugins/personal/generic/class_user.inc:1387
  #: plugins/personal/generic/generic.tpl:250
-#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
+#: plugins/addons/addressbook/class_addressbook.inc:801 html/getxls.php:299
  msgid "Organization"
  msgstr "Organizzazione"
  
-#: plugins/personal/generic/class_user.inc:1389
+#: plugins/personal/generic/class_user.inc:1388
  #: plugins/personal/generic/generic.tpl:258
  #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
  #: plugins/addons/addressbook/address_edit.tpl:155
-#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/class_addressbook.inc:802
  #: plugins/addons/addressbook/address_info.tpl:117
  #: plugins/admin/users/class_divListUsers.inc:56
  #: plugins/admin/applications/class_divListApplication.inc:51
-#: plugins/admin/ogroups/class_ogroupManagement.inc:354
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
  #: plugins/gofon/macro/class_divListMacros.inc:52
  #: plugins/generic/references/class_reference.inc:38
  msgid "Department"
  msgstr "Dipartimento"
  
-#: plugins/personal/generic/class_user.inc:1390
+#: plugins/personal/generic/class_user.inc:1389
  #: plugins/personal/generic/generic.tpl:93
  msgid "Date of birth"
  msgstr "Data di nascita"
  
-#: plugins/personal/generic/class_user.inc:1391
+#: plugins/personal/generic/class_user.inc:1390
  #, fuzzy
  msgid "Gender"
  msgstr "Generale"
  
-#: plugins/personal/generic/class_user.inc:1392
+#: plugins/personal/generic/class_user.inc:1391
  #, fuzzy
  msgid "Preferred language"
  msgstr "Lingua preferita"
  
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1392
  #, fuzzy
  msgid "Department number"
  msgstr "Dipartimento"
  
-#: plugins/personal/generic/class_user.inc:1394
+#: plugins/personal/generic/class_user.inc:1393
  #, fuzzy
  msgid "Employee number"
  msgstr "Qualifica"
  
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:1394
  #: plugins/personal/generic/generic.tpl:282
  msgid "Employee type"
  msgstr "Qualifica"
  
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:1395
  #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/class_addressbook.inc:801
+#: plugins/addons/addressbook/class_addressbook.inc:803
  #: plugins/addons/godfs/generic.tpl:34
  #: plugins/admin/departments/generic.tpl:56
  #: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: plugins/admin/departments/class_departmentGeneric.inc:587
  #: plugins/admin/systems/workstation.tpl:19
-#: plugins/admin/systems/class_workstationGeneric.inc:514
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_workstationGeneric.inc:536
+#: plugins/admin/systems/class_printGeneric.inc:870
  #: plugins/admin/systems/class_glpiAccount.inc:782
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
  msgid "Location"
  msgstr "Località"
  
-#: plugins/personal/generic/class_user.inc:1397
+#: plugins/personal/generic/class_user.inc:1396
  #: plugins/personal/generic/generic.tpl:360
-#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:806
  #: plugins/admin/departments/generic.tpl:60
-#: plugins/admin/departments/class_departmentGeneric.inc:547
+#: plugins/admin/departments/class_departmentGeneric.inc:591
  #: html/getxls.php:228 html/getxls.php:301
  msgid "State"
  msgstr "Stato"
  
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1397
  #: plugins/personal/generic/paste_generic.tpl:47
  #, fuzzy
  msgid "User picture"
  msgstr "Foto personale"
  
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1398
  #, fuzzy
  msgid "Room number"
  msgstr "Numero di telefono"
  
-#: plugins/personal/generic/class_user.inc:1400
-#: plugins/addons/addressbook/class_addressbook.inc:792
+#: plugins/personal/generic/class_user.inc:1399
+#: plugins/addons/addressbook/class_addressbook.inc:794
  #, fuzzy
  msgid "Telefon number"
  msgstr "Numero di telefono"
  
-#: plugins/personal/generic/class_user.inc:1401
-#: plugins/addons/addressbook/class_addressbook.inc:794
+#: plugins/personal/generic/class_user.inc:1400
+#: plugins/addons/addressbook/class_addressbook.inc:796
  #, fuzzy
  msgid "Mobile number"
  msgstr "Cellulare"
  
-#: plugins/personal/generic/class_user.inc:1402
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/nagios/class_nagiosAccount.inc:272
  #, fuzzy
  msgid "Pager number"
  msgstr "Numero di telefono"
  
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1402
  #, fuzzy
  msgid "User certificates"
  msgstr "Certificato standard"
  
-#: plugins/personal/generic/class_user.inc:1405
-#: plugins/addons/addressbook/class_addressbook.inc:802
-#: plugins/addons/addressbook/class_addressbook.inc:803 html/getxls.php:226
+#: plugins/personal/generic/class_user.inc:1404
+#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:805 html/getxls.php:226
  #: html/getxls.php:298 html/getxls.php:300
  msgid "Postal address"
  msgstr "CAP"
  
-#: plugins/personal/generic/class_user.inc:1406
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:820
-#: plugins/addons/addressbook/class_addressbook.inc:793
+#: plugins/personal/generic/class_user.inc:1405
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
+#: plugins/addons/addressbook/class_addressbook.inc:795
  #, fuzzy
  msgid "Fax number"
  msgstr "Numero di telefono"
@@ -2610,7 +2634,7 @@ msgstr "Scegli il subtree per l'utente"
  #: plugins/admin/systems/workstation.tpl:35
  #: plugins/admin/systems/wingeneric.tpl:18
  #: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:36
+#: plugins/admin/mimetypes/generic.tpl:53 plugins/gofon/macro/generic.tpl:36
  #: plugins/gofon/conference/generic.tpl:56
  #: plugins/gofon/conference/generic.tpl:62
  #, fuzzy
@@ -2624,7 +2648,7 @@ msgstr "Rimuovi"
  #: plugins/addons/addressbook/address_info.tpl:59
  #: plugins/addons/addressbook/address_info.tpl:155
  #: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/class_departmentGeneric.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:592
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
  msgid "Address"
  msgstr "Indirizzo"
@@ -2682,7 +2706,7 @@ msgstr "Cellulare"
  #: plugins/personal/generic/generic.tpl:326
  #: plugins/personal/nagios/nagios.tpl:79
  #: plugins/addons/addressbook/address_edit.tpl:246
-#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/class_addressbook.inc:800
  #: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
  #: html/getxls.php:300
  msgid "Pager"
@@ -2703,6 +2727,7 @@ msgstr ""
  
  #: plugins/personal/generic/generic_picture.tpl:27
  #: plugins/personal/generic/paste_generic.tpl:52
+#: plugins/admin/applications/generic.tpl:81
  msgid "Remove picture"
  msgstr "Elimina foto"
  
@@ -2710,37 +2735,38 @@ msgstr "Elimina foto"
  #: plugins/personal/generic/generic_certs.tpl:91
  #: plugins/personal/environment/hotplugDialogNew.tpl:53
  #: plugins/addons/addressbook/address_edit.tpl:264
-#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/departments/dep_move_confirm.tpl:15
+#: plugins/admin/systems/goNtpServer.tpl:29
  #: plugins/admin/systems/servdns.tpl:21
-#: plugins/admin/systems/servkolab.tpl:246
-#: plugins/admin/systems/goNtpServer.tpl:30
-#: plugins/admin/systems/goKrbServer.tpl:31
+#: plugins/admin/systems/servkolab.tpl:245
+#: plugins/admin/systems/goKrbServer.tpl:30
+#: plugins/admin/systems/goFonServer.tpl:39
  #: plugins/admin/systems/servnfs.tpl:139
-#: plugins/admin/systems/goFonServer.tpl:40
+#: plugins/admin/systems/goFaxServer.tpl:23
  #: plugins/admin/systems/servRepository.tpl:66
-#: plugins/admin/systems/goFaxServer.tpl:24
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
  #: plugins/admin/systems/glpi_devices.tpl:760
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
  #: plugins/admin/systems/servdnseditzone.tpl:119
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/goLdapServer.tpl:10
-#: plugins/admin/systems/goShareServer.tpl:30
-#: plugins/admin/systems/goMailServer.tpl:222
-#: plugins/admin/systems/goImapServer.tpl:117
-#: plugins/admin/systems/goSyslogServer.tpl:6
-#: plugins/admin/systems/goGlpiServer.tpl:33
-#: plugins/admin/systems/goCupsServer.tpl:6
-#: plugins/admin/systems/goTerminalServer.tpl:24
-#: plugins/admin/systems/goLogDBServer.tpl:24
-#: plugins/admin/systems/goSpamServer.tpl:126
-#: plugins/admin/systems/goSpamServerRule.tpl:22
-#: plugins/admin/systems/goVirusServer.tpl:169
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:29
+#: plugins/admin/systems/goMailServer.tpl:221
+#: plugins/admin/systems/goImapServer.tpl:116
+#: plugins/admin/systems/goSyslogServer.tpl:5
+#: plugins/admin/systems/goGlpiServer.tpl:32
+#: plugins/admin/systems/goCupsServer.tpl:5
+#: plugins/admin/systems/goTerminalServer.tpl:23
+#: plugins/admin/systems/goLogDBServer.tpl:23
+#: plugins/admin/systems/goSpamServer.tpl:125
+#: plugins/admin/systems/goSpamServerRule.tpl:21
+#: plugins/admin/systems/goVirusServer.tpl:168
  #: plugins/admin/systems/class_goService.inc:33
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:38
  #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/default/copyPasteDialog.tpl:19
  msgid "Save"
  msgstr "Salva"
  
@@ -2762,21 +2788,21 @@ msgstr "Certificato standard"
  #: plugins/personal/connectivity/class_kolabAccount.inc:258
  #: plugins/personal/environment/environment.tpl:159
  #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:597
+#: plugins/admin/groups/class_groupMail.inc:604
  #: plugins/admin/applications/class_applicationParameters.inc:124
  #: plugins/admin/systems/printer.tpl:71
  #: plugins/admin/systems/glpiPrinter.tpl:152
  #: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:182
+#: plugins/admin/systems/workstationStartup.tpl:186
  #: plugins/admin/systems/terminalStartup.tpl:111
  #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:393
  #: plugins/admin/systems/goMailServer.tpl:73
  #: plugins/admin/systems/goMailServer.tpl:104
  #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:78
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
+#: plugins/admin/fai/faiPackage.tpl:81
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:293
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:295
  msgid "Remove"
  msgstr "Rimuovi"
  
@@ -2808,6 +2834,7 @@ msgid "Set new password"
  msgstr "Cambia password"
  
  #: plugins/personal/connectivity/pureftpd.tpl:4
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
  msgid "FTP account"
  msgstr "Estenzioni FTP"
  
@@ -2863,6 +2890,7 @@ msgstr "Disabilita temporaneamente l'accesso FTP"
  
  #: plugins/personal/connectivity/proxy.tpl:23
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
+#: plugins/personal/connectivity/class_proxyAccount.inc:297
  msgid "Proxy account"
  msgstr "Estenzioni Proxy Internet"
  
@@ -2875,7 +2903,7 @@ msgid "Limit proxy access to working time"
  msgstr "Limita l'accesso a Internet alle ore lavorative"
  
  #: plugins/personal/connectivity/proxy.tpl:84
-#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
  msgid "Restrict proxy usage by quota"
  msgstr "Restringi la quota d'uso di Internet"
  
@@ -2912,7 +2940,7 @@ msgstr "Impostazioni FAX"
  #: plugins/personal/connectivity/class_pureftpdAccount.inc:219
  #: plugins/personal/connectivity/class_oxchangeAccount.inc:950
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
  #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
  #: plugins/personal/connectivity/class_opengwAccount.inc:310
@@ -2920,12 +2948,18 @@ msgstr "Impostazioni FAX"
  msgid "Connectivity addon"
  msgstr "Connettività"
  
+#: plugins/personal/connectivity/class_phpgwAccount.inc:148
+#, fuzzy
+msgid "PHPgroupware"
+msgstr "Estenzioni PHPGroupware"
+
  #: plugins/personal/connectivity/phpgw.tpl:3
  msgid "PHPGroupware account"
  msgstr "Estenzioni PHPGroupware"
  
  #: plugins/personal/connectivity/kolab.tpl:3
  #: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/class_kolabAccount.inc:452
  msgid "Kolab account"
  msgstr "Account Kolab"
  
@@ -2936,7 +2970,7 @@ msgid ""
  msgstr ""
  
  #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:459
+#: plugins/personal/connectivity/class_kolabAccount.inc:460
  msgid "Delegations"
  msgstr ""
  
@@ -2968,7 +3002,7 @@ msgid "days"
  msgstr "giorni"
  
  #: plugins/personal/connectivity/kolab.tpl:93
-#: plugins/personal/connectivity/class_kolabAccount.inc:460
+#: plugins/personal/connectivity/class_kolabAccount.inc:461
  msgid "Invitation policy"
  msgstr ""
  
@@ -3046,16 +3080,16 @@ msgstr "Account Kolab"
  msgid "Kolab account settings"
  msgstr "Account Kolab"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:456
+#: plugins/personal/connectivity/class_kolabAccount.inc:457
  msgid "Free busy future"
  msgstr ""
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:457
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
  #, fuzzy
  msgid "Mail size restriction"
  msgstr "Opzioni di posta dell'identità"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:458
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
  #, fuzzy
  msgid "Free busy information"
  msgstr "Informazioni generali"
@@ -3076,6 +3110,7 @@ msgid "Saving of user/webDAV account with dn '%s' failed."
  msgstr "Estenzioni WebDAV"
  
  #: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_webdavAccount.inc:147
  #: plugins/personal/connectivity/webdav.tpl:3
  msgid "WebDAV account"
  msgstr "Estenzioni WebDAV"
@@ -3133,32 +3168,32 @@ msgstr "Tipo"
  msgid "Pure ftp account"
  msgstr "Crea estensioni FAX"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
  #, fuzzy
  msgid "Quota files"
  msgstr "Dimensione quota"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
  #, fuzzy
  msgid "Upload ratio"
  msgstr "Banda di upload"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
  #, fuzzy
  msgid "Quota MBytes"
  msgstr "Dimensione quota"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
  #, fuzzy
  msgid "Download ratio"
  msgstr "Scarica il file di  configurazione"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
  #, fuzzy
  msgid "Upload bandwith"
  msgstr "Banda di upload"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
  #, fuzzy
  msgid "Download bandwith"
  msgstr "Banda di download"
@@ -3255,19 +3290,25 @@ msgstr "Open-Xchange"
  msgid "Open xchange account settings"
  msgstr "Opzioni di posta dell'identità"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:959
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
+#, fuzzy
+msgid "OpenExchange account"
+msgstr "Opzioni di posta dell'identità"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
  msgid "OXAppointmentDays"
  msgstr ""
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
  msgid "OXTaskDays"
  msgstr ""
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:962
  msgid "OXTimeZone"
  msgstr ""
  
  #: plugins/personal/connectivity/intranet.tpl:3
+#: plugins/personal/connectivity/class_intranetAccount.inc:181
  #, fuzzy
  msgid "Intranet account"
  msgstr "Crea estensioni telefoniche"
@@ -3329,17 +3370,18 @@ msgstr "Il valore di 'Dimensione quota' non è valido"
  msgid "Saving of user/proxy account with dn '%s' failed."
  msgstr "Estenzioni Proxy Internet"
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:301
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
  msgid "Filter unwanted content"
  msgstr ""
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
  #, fuzzy
  msgid "Limit proxy access"
  msgstr "Limita l'accesso a Internet alle ore lavorative"
  
  #: plugins/personal/connectivity/pptp.tpl:3
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_pptpAccount.inc:164
  #, fuzzy
  msgid "PPTP account"
  msgstr "Estenzioni FTP"
@@ -3359,7 +3401,7 @@ msgstr "Rimuovi le estensioni di posta"
  msgid "Saving of user/intranet account with dn '%s' failed."
  msgstr "Crea estensioni telefoniche"
  
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #, fuzzy
  msgid "Intranet account settings"
  msgstr "Crea estensioni telefoniche"
@@ -3386,32 +3428,33 @@ msgstr "Estenzioni FTP"
  
  #: plugins/personal/connectivity/opengw.tpl:1
  #: plugins/personal/connectivity/class_opengwAccount.inc:309
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
  #, fuzzy
  msgid "Opengroupware"
  msgstr "Estenzioni PHPGroupware"
  
  #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:319
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
  #, fuzzy
  msgid "Location team"
  msgstr "Nome locazione"
  
  #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:320
+#: plugins/personal/connectivity/class_opengwAccount.inc:321
  #, fuzzy
  msgid "Template user"
  msgstr "Template"
  
  #: plugins/personal/connectivity/opengw.tpl:33
-#: plugins/personal/connectivity/class_opengwAccount.inc:321
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/ogroups/class_termgroup.inc:42
+#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/admin/systems/class_servGeneric.inc:53
+#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/ogroups/class_termgroup.inc:41
  msgid "Locked"
  msgstr ""
  
  #: plugins/personal/connectivity/opengw.tpl:48
-#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/personal/connectivity/class_opengwAccount.inc:323
  msgid "Teams"
  msgstr ""
  
@@ -3445,6 +3488,11 @@ msgstr "Estenzioni PHPGroupware"
  msgid "PHP Schedule it settings"
  msgstr "Estenzioni PHPGroupware"
  
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:149
+#, fuzzy
+msgid "PHP schedule it"
+msgstr "Estenzioni PHPGroupware"
+
  #: plugins/personal/connectivity/class_opengwAccount.inc:6
  #, fuzzy
  msgid "Opengroupware account"
@@ -3510,7 +3558,7 @@ msgid "Profil quota"
  msgstr "Path del profilo"
  
  #: plugins/personal/environment/environment.tpl:73
-#: plugins/personal/environment/class_environment.inc:1282
+#: plugins/personal/environment/class_environment.inc:1285
  msgid "Cache profile localy"
  msgstr ""
  
@@ -3520,7 +3568,7 @@ msgid "Kiosk profile settings"
  msgstr "Opzioni di posta dell'identità"
  
  #: plugins/personal/environment/environment.tpl:85
-#: plugins/personal/environment/class_environment.inc:1288
+#: plugins/personal/environment/class_environment.inc:1291
  msgid "Kiosk profile"
  msgstr ""
  
@@ -3530,22 +3578,22 @@ msgid "Manage"
  msgstr "Nome gruppo"
  
  #: plugins/personal/environment/environment.tpl:105
-#: plugins/personal/environment/class_environment.inc:1281
+#: plugins/personal/environment/class_environment.inc:1284
  msgid "Resolution changeable during session"
  msgstr ""
  
  #: plugins/personal/environment/environment.tpl:110
-#: plugins/personal/environment/class_environment.inc:1287
+#: plugins/personal/environment/class_environment.inc:1290
  #: plugins/admin/systems/workstationService.tpl:122
  #: plugins/admin/systems/terminalService.tpl:108
  msgid "Resolution"
  msgstr ""
  
  #: plugins/personal/environment/environment.tpl:133
-#: plugins/personal/environment/class_environment.inc:1293
+#: plugins/personal/environment/class_environment.inc:1296
  #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1123
-#: plugins/admin/systems/workstationStartup.tpl:158
+#: plugins/admin/systems/class_workstationStartup.inc:1168
+#: plugins/admin/systems/workstationStartup.tpl:162
  #: plugins/admin/systems/terminalStartup.tpl:87
  #: plugins/admin/systems/goShareServer.tpl:1
  #, fuzzy
@@ -3579,7 +3627,7 @@ msgid "Logon script management"
  msgstr "Riferimenti"
  
  #: plugins/personal/environment/environment.tpl:203
-#: plugins/personal/environment/class_environment.inc:1292
+#: plugins/personal/environment/class_environment.inc:1295
  #, fuzzy
  msgid "Hotplug devices"
  msgstr "Dispositivi del client"
@@ -3591,7 +3639,7 @@ msgstr "Dispositivi del client"
  
  #: plugins/personal/environment/environment.tpl:219
  #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "New"
  msgstr "Nuovo"
  
@@ -3652,7 +3700,7 @@ msgid "Please select an entry or press cancel."
  msgstr "Prego inserire un numero di telefono valido!"
  
  #: plugins/personal/environment/class_selectPrinterDialog.inc:102
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:140
  #, fuzzy
  msgid "Please select a printer or press cancel."
  msgstr "Prego inserire un numero di telefono valido!"
@@ -3698,8 +3746,8 @@ msgid "auto"
  msgstr "Rapporto"
  
  #: plugins/personal/environment/class_environment.inc:230
-#: plugins/admin/systems/class_terminalService.inc:95
  #: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_terminalService.inc:97
  #, php-format
  msgid ""
  "You have specified an external resolution hook which can't be read, please "
@@ -3767,7 +3815,7 @@ msgstr "Non hai il permesso di cambiare la tua password."
  #: plugins/personal/environment/class_environment.inc:591
  #: plugins/personal/environment/class_environment.inc:604
  #: plugins/admin/systems/class_terminalStartup.inc:203
-#: plugins/admin/systems/class_workstationStartup.inc:616
+#: plugins/admin/systems/class_workstationStartup.inc:645
  #, fuzzy
  msgid "You must specify a valid mount point."
  msgstr "Prego inserire un numero di telefono valido!"
@@ -3837,31 +3885,33 @@ msgid "Administrator"
  msgstr "Amministrazione"
  
  #: plugins/personal/environment/class_environment.inc:1243
-#: plugins/personal/environment/class_environment.inc:1290
+#: plugins/personal/environment/class_environment.inc:1293
  #, fuzzy
  msgid "Default printer"
  msgstr "Permessi predefiniti"
  
  #: plugins/personal/environment/class_environment.inc:1270
+#: plugins/personal/environment/class_environment.inc:1275
+#: plugins/personal/environment/class_environment.inc:1277
  #, fuzzy
  msgid "Environment settings"
  msgstr "Opzioni di posta dell'identità"
  
-#: plugins/personal/environment/class_environment.inc:1277
+#: plugins/personal/environment/class_environment.inc:1280
  msgid "Command to extend the list of possible screen resolutions"
  msgstr ""
  
-#: plugins/personal/environment/class_environment.inc:1284
+#: plugins/personal/environment/class_environment.inc:1287
  #, fuzzy
  msgid "Profile quota"
  msgstr "Path del profilo"
  
-#: plugins/personal/environment/class_environment.inc:1285
+#: plugins/personal/environment/class_environment.inc:1288
  #, fuzzy
  msgid "Profile server"
  msgstr "Server"
  
-#: plugins/personal/environment/class_environment.inc:1291
+#: plugins/personal/environment/class_environment.inc:1294
  #: plugins/personal/environment/logonManagement.tpl:56
  msgid "Logon script"
  msgstr ""
@@ -3915,31 +3965,31 @@ msgstr "Script path"
  #: plugins/personal/environment/logonManagement.tpl:17
  #: plugins/personal/environment/hotplugDialogNew.tpl:17
  #: plugins/gofax/blocklists/generic.tpl:51
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:597
  #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
  #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:889
  #: plugins/admin/applications/generic.tpl:33
-#: plugins/admin/applications/class_applicationGeneric.inc:525
+#: plugins/admin/applications/class_applicationGeneric.inc:534
  #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/departments/class_departmentGeneric.inc:540
-#: plugins/admin/systems/class_winGeneric.inc:260
+#: plugins/admin/departments/class_departmentGeneric.inc:584
+#: plugins/admin/systems/class_winGeneric.inc:281
  #: plugins/admin/systems/server.tpl:14 plugins/admin/systems/phone.tpl:34
  #: plugins/admin/systems/printer.tpl:16
-#: plugins/admin/systems/class_servGeneric.inc:344
+#: plugins/admin/systems/class_servGeneric.inc:357
  #: plugins/admin/systems/wingeneric.tpl:25
  #: plugins/admin/systems/component.tpl:35
-#: plugins/admin/systems/class_printGeneric.inc:865
-#: plugins/admin/systems/class_componentGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_componentGeneric.inc:270
  #: plugins/admin/systems/servnfs.tpl:19
-#: plugins/admin/systems/class_phoneGeneric.inc:435
+#: plugins/admin/systems/class_phoneGeneric.inc:441
  #: plugins/admin/systems/class_goMailServer.inc:695
  #: plugins/admin/systems/class_goShareServer.inc:372
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:720
+#: plugins/admin/ogroups/class_ogroup.inc:703
  #: plugins/admin/fai/faiVariable.tpl:21
-#: plugins/admin/fai/class_faiScript.inc:527
-#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/class_faiScript.inc:538
+#: plugins/admin/fai/class_faiTemplate.inc:508
  #: plugins/admin/fai/faiPackage.tpl:21
  #: plugins/admin/fai/faiPartitionTable.tpl:21
  #: plugins/admin/fai/class_faiScriptEntry.inc:180
@@ -3947,7 +3997,7 @@ msgstr "Script path"
  #: plugins/admin/fai/class_faiPackage.inc:537
  #: plugins/admin/fai/class_faiProfile.inc:452
  #: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:21
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:464
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:13
  #: plugins/admin/fai/faiScript.tpl:21
  #: plugins/admin/fai/class_faiVariableEntry.inc:143
@@ -3956,16 +4006,16 @@ msgstr "Script path"
  #: plugins/admin/fai/class_faiPartitionTable.inc:529
  #: plugins/admin/fai/class_faiHookEntry.inc:189
  #: plugins/admin/fai/faiHookEntry.tpl:19
-#: plugins/admin/fai/class_faiVariable.inc:421
+#: plugins/admin/fai/class_faiVariable.inc:417
  #: plugins/admin/fai/class_faiTemplateEntry.inc:248
  #: plugins/admin/fai/faiTemplateEntry.tpl:13
-#: plugins/admin/mimetypes/generic.tpl:35
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:674
+#: plugins/admin/mimetypes/generic.tpl:34
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:682
  #: plugins/admin/mimetypes/paste_generic.tpl:21
  #: plugins/gofon/macro/generic.tpl:49
-#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/macro/class_gofonMacro.inc:498
  #: plugins/gofon/conference/generic.tpl:78
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
  #: plugins/generic/references/contents.tpl:11 html/getxls.php:158
  #: html/getxls.php:287
  msgid "Description"
@@ -3998,11 +4048,11 @@ msgstr ""
  #: plugins/admin/groups/application_options.tpl:11
  #: plugins/admin/users/class_userManagement.inc:654
  #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:503
+#: plugins/admin/systems/class_systemManagement.inc:651
  #: plugins/admin/systems/printerPPDDialog.tpl:22
  #: plugins/admin/systems/servRepositorySetup.tpl:54
-#: plugins/admin/ogroups/class_ogroupManagement.inc:304
-#: plugins/admin/fai/class_faiManagement.inc:616
+#: plugins/admin/ogroups/class_ogroupManagement.inc:299
+#: plugins/admin/fai/class_faiManagement.inc:626
  #: plugins/admin/fai/faiProfileEntry.tpl:70
  #: plugins/admin/fai/faiScriptEntry.tpl:82
  #: plugins/admin/fai/faiVariableEntry.tpl:54
@@ -4011,9 +4061,9 @@ msgstr ""
  #: plugins/admin/fai/faiPackageEntry.tpl:56
  #: plugins/admin/fai/faiPackageConfiguration.tpl:6
  #: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:340
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:342
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:260
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:253
  #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
  #: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
  msgid "Apply"
@@ -4103,7 +4153,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
-#: plugins/admin/fai/class_faiSummaryTab.inc:209
+#: plugins/admin/fai/class_faiSummaryTab.inc:236
  #: include/class_MultiSelectWindow.inc:81
  #, fuzzy
  msgid "Close"
@@ -4115,43 +4165,43 @@ msgid "Nagios Account"
  msgstr "Contatto"
  
  #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
  #, fuzzy
  msgid "Alias"
  msgstr "Italiano"
  
  #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:276
+#: plugins/personal/nagios/class_nagiosAccount.inc:277
  #, fuzzy
  msgid "Host notification period"
  msgstr "Opzioni applicazione"
  
  #: plugins/personal/nagios/nagios.tpl:40
-#: plugins/personal/nagios/class_nagiosAccount.inc:280
+#: plugins/personal/nagios/class_nagiosAccount.inc:281
  #, fuzzy
  msgid "Service notification period"
  msgstr "Opzioni applicazione"
  
  #: plugins/personal/nagios/nagios.tpl:53
-#: plugins/personal/nagios/class_nagiosAccount.inc:279
+#: plugins/personal/nagios/class_nagiosAccount.inc:280
  #, fuzzy
  msgid "Service notification options"
  msgstr "Opzioni applicazione"
  
  #: plugins/personal/nagios/nagios.tpl:66
-#: plugins/personal/nagios/class_nagiosAccount.inc:275
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
  #, fuzzy
  msgid "Host notification options"
  msgstr "Opzioni applicazione"
  
  #: plugins/personal/nagios/nagios.tpl:90
-#: plugins/personal/nagios/class_nagiosAccount.inc:278
+#: plugins/personal/nagios/class_nagiosAccount.inc:279
  #, fuzzy
  msgid "Service notification commands"
  msgstr "Opzioni applicazione"
  
  #: plugins/personal/nagios/nagios.tpl:100
-#: plugins/personal/nagios/class_nagiosAccount.inc:274
+#: plugins/personal/nagios/class_nagiosAccount.inc:275
  #, fuzzy
  msgid "Host notification commands"
  msgstr "Opzioni applicazione"
@@ -4251,35 +4301,40 @@ msgstr "Rimuovi le estensioni di posta"
  msgid "Nagios account settings"
  msgstr "Opzioni di posta dell'identità"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:282
+#: plugins/personal/nagios/class_nagiosAccount.inc:265
+#, fuzzy
+msgid "Nagios account"
+msgstr "Contatto"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:283
  msgid "View all hosts"
  msgstr ""
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:283
+#: plugins/personal/nagios/class_nagiosAccount.inc:284
  #, fuzzy
  msgid "View all services"
  msgstr "Dispositivi del client"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:285
+#: plugins/personal/nagios/class_nagiosAccount.inc:286
  #, fuzzy
  msgid "Trigger system commands"
  msgstr "Informazioni organizzazione"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:286
+#: plugins/personal/nagios/class_nagiosAccount.inc:287
  msgid "Trigger all host commands"
  msgstr ""
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:287
+#: plugins/personal/nagios/class_nagiosAccount.inc:288
  #, fuzzy
  msgid "Trigger all service commands"
  msgstr "Dispositivi del client"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:289
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
  #, fuzzy
  msgid "View configuration information"
  msgstr "Informazioni organizzazione"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:290
+#: plugins/personal/nagios/class_nagiosAccount.inc:291
  #, fuzzy
  msgid "View system informations"
  msgstr "Informazioni organizzazione"
@@ -4290,7 +4345,7 @@ msgid "Nagios settings"
  msgstr "Opzioni di posta dell'identità"
  
  #: plugins/personal/netatalk/netatalk.tpl:4
-#: plugins/personal/netatalk/class_netatalk.inc:365
+#: plugins/personal/netatalk/class_netatalk.inc:366
  #, fuzzy
  msgid "Share"
  msgstr "reset"
@@ -4355,7 +4410,12 @@ msgstr "Crea estensioni telefoniche"
  msgid "Removing of user/netatalk account with dn '%s' failed."
  msgstr "Rimuovi le estensioni di posta"
  
-#: plugins/personal/netatalk/class_netatalk.inc:364
+#: plugins/personal/netatalk/class_netatalk.inc:360
+#, fuzzy
+msgid "Netatalk account"
+msgstr "Crea estensioni telefoniche"
+
+#: plugins/personal/netatalk/class_netatalk.inc:365
  #, fuzzy
  msgid "User home path"
  msgstr "Telefono privato"
@@ -4389,9 +4449,9 @@ msgstr "Scegli il subtree dove mettere il gruppo"
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
  #: plugins/admin/systems/class_goShareServer.inc:373
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
-#: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiSummaryTab.inc:345
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:136
  msgid "Type"
  msgstr "Tipo"
  
@@ -4414,13 +4474,15 @@ msgstr ""
  #: plugins/gofax/blocklists/remove.tpl:2
  #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
  #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/systems/remove_ppd.tpl:2
  #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
  #: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
  #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
  #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:339 html/index.php:345
+#: html/index.php:49 html/index.php:337 html/index.php:343
  #: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/remove.tpl:2
  msgid "Warning"
@@ -4450,77 +4512,74 @@ msgid "Blocklist management"
  msgstr ""
  
  #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
  msgid "FAX Blocklists"
  msgstr "Liste blocco FAX"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:168
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:167
  #, php-format
  msgid "You're about to delete the blocklist '%s'."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:185
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:184
  msgid "You have no permission to remove this blocklist."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:200
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:199
  msgid "Please specify a valid phone number."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "send"
  msgstr "invia"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "receive"
  msgstr "ricevi"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:435
  #, fuzzy, php-format
  msgid "Removing of blocklist with dn '%s' failed."
  msgstr "Elimina estensioni per le applicazioni"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:477
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:482
-#: plugins/admin/departments/class_departmentGeneric.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:487
+#: plugins/admin/departments/class_departmentGeneric.inc:258
  msgid "Required field 'Name' is not set."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:490
  msgid "Required field 'Name' contains invalid characters"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:497
  msgid "Specified name is already used."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:547
  #, fuzzy, php-format
  msgid "Saving of blocklist with dn '%s' failed."
  msgstr "Nome applicazione"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
  #, fuzzy
-msgid "Fax Blocklists"
+msgid "Fax blocklists"
  msgstr "Liste blocco FAX"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:596
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/addressbook/address_info.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:893
-#: plugins/admin/applications/class_applicationGeneric.inc:523
-#: plugins/admin/applications/class_applicationGeneric.inc:527
-#: plugins/admin/systems/class_terminalGeneric.inc:514
-#: plugins/admin/systems/class_servGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:863
-#: plugins/admin/systems/class_componentGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:887
+#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/systems/class_terminalGeneric.inc:554
+#: plugins/admin/systems/class_servGeneric.inc:356
+#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_componentGeneric.inc:268
  #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_phoneGeneric.inc:434
-#: plugins/admin/systems/class_servRepository.inc:358
+#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_servRepository.inc:374
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:105
@@ -4540,10 +4599,10 @@ msgstr "Liste blocco FAX"
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
  #: plugins/admin/systems/class_goShareServer.inc:370
  #: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:701
  #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
  #: plugins/admin/fai/faiPackage.tpl:9
  #: plugins/admin/fai/faiPartitionTable.tpl:9
  #: plugins/admin/fai/class_faiScriptEntry.inc:179
@@ -4551,7 +4610,7 @@ msgstr "Liste blocco FAX"
  #: plugins/admin/fai/class_faiPackage.inc:536
  #: plugins/admin/fai/class_faiProfile.inc:451
  #: plugins/admin/fai/class_faiHook.inc:535 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:454
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
  #: plugins/admin/fai/faiScript.tpl:9
  #: plugins/admin/fai/class_faiVariableEntry.inc:142
@@ -4560,23 +4619,23 @@ msgstr "Liste blocco FAX"
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
  #: plugins/admin/fai/class_faiHookEntry.inc:188
  #: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #: plugins/admin/fai/class_faiTemplateEntry.inc:247
  #: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:313
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
+#: plugins/admin/fai/class_faiSummaryTab.inc:340
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
  #: plugins/gofon/macro/parameter.tpl:6
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
  #: html/getxls.php:223 html/getxls.php:290
  msgid "Name"
  msgstr "Cognome"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:599
  #, fuzzy
  msgid "Blocklist"
  msgstr "Liste di blocco"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:600
  #, fuzzy
  msgid "Blocklist type"
  msgstr "Liste di blocco"
@@ -4645,7 +4704,7 @@ msgstr ""
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -4657,245 +4716,110 @@ msgstr "Seleziona per mostrare le applicazioni"
  msgid "Regular expression for matching list names"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Go to root department"
-msgstr "Vai al dipartimento base"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Root"
-msgstr "Root"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-msgid "Go up one department"
-msgstr "Sali di dipartimento"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-#: include/class_acl.inc:368
-msgid "Up"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Go to users department"
-msgstr "Vai agli utenti del dipartimento"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/fai/class_divListFai.inc:139
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Home"
-msgstr "Home"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/fai/class_divListFai.inc:141
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/conference/class_divListConferences.inc:103
-msgid "Reload list"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:142
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:103
-#: plugins/gofon/conference/class_divListConferences.inc:121
-msgid "Submit"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  #, fuzzy
  msgid "Create new blocklist"
  msgstr "Lista delle liste di blocchi"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  #, fuzzy
  msgid "New Blocklist"
  msgstr "Liste di blocco"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
  #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:121
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
  msgid "Submit department"
  msgstr "Imposta dipartimento"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/users/class_divListUsers.inc:255
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+#: include/class_MultiSelectWindow.inc:209
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:243
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
  #: plugins/admin/systems/glpiPrinter.tpl:18
  #: plugins/admin/systems/glpiPrinter.tpl:32 plugins/admin/systems/glpi.tpl:18
  #: plugins/admin/systems/glpi.tpl:32 plugins/admin/systems/glpi.tpl:46
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/acl/class_divListACL.inc:122
-#: plugins/admin/fai/class_faiScript.inc:283
-#: plugins/admin/fai/class_faiScript.inc:285
-#: plugins/admin/fai/class_faiTemplate.inc:257
-#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/acl/class_divListACL.inc:127
+#: plugins/admin/fai/class_faiScript.inc:293
+#: plugins/admin/fai/class_faiScript.inc:295
+#: plugins/admin/fai/class_faiTemplate.inc:270
+#: plugins/admin/fai/class_faiTemplate.inc:272
  #: plugins/admin/fai/class_faiHook.inc:294
  #: plugins/admin/fai/class_faiHook.inc:296
-#: plugins/admin/fai/class_divListFai.inc:241
-#: plugins/admin/fai/class_divListFai.inc:244
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/macro/class_divListMacros.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:159
-#: plugins/gofon/conference/class_divListConferences.inc:159
-#: include/class_acl.inc:370 include/class_acl.inc:415
+#: plugins/admin/fai/class_divListFai.inc:239
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/macro/class_divListMacros.inc:146
+#: plugins/gofon/conference/class_divListConferences.inc:155
+#: include/class_acl.inc:372 include/class_acl.inc:417
  msgid "edit"
  msgstr "modifica"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/users/class_divListUsers.inc:256
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/users/class_divListUsers.inc:244
  #, fuzzy
  msgid "Edit user"
  msgstr "Modifica contatto"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:274
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/acl/class_divListACL.inc:125
-#: plugins/admin/fai/class_faiScript.inc:287
-#: plugins/admin/fai/class_faiTemplate.inc:261
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/addons/mailqueue/contents.tpl:94
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/users/class_divListUsers.inc:262
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/acl/class_divListACL.inc:131
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:274
  #: plugins/admin/fai/class_faiHook.inc:298
-#: plugins/admin/fai/class_divListFai.inc:252
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/macro/class_divListMacros.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:167
-#: plugins/gofon/conference/class_divListConferences.inc:169
-#: include/class_acl.inc:371 include/class_acl.inc:416
+#: plugins/admin/fai/class_divListFai.inc:250
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/macro/class_divListMacros.inc:154
+#: plugins/gofon/conference/class_divListConferences.inc:165
+#: include/class_acl.inc:373 include/class_acl.inc:418
  msgid "delete"
  msgstr "elimina"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/admin/users/class_divListUsers.inc:263
  #, fuzzy
  msgid "Delete user"
  msgstr "Rimuovi"
@@ -4906,7 +4830,7 @@ msgid "Fax number for GOfax to trigger on"
  msgstr ""
  
  #: plugins/gofax/faxaccount/generic.tpl:21
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
  #: plugins/admin/ogroups/phonequeue.tpl:47
  #: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
  #: html/getxls.php:281
@@ -4918,7 +4842,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
  msgstr ""
  
  #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:831
  msgid "Delivery format"
  msgstr "Formato di recapito"
  
@@ -4939,12 +4863,12 @@ msgid "Deliver fax as mail to"
  msgstr ""
  
  #: plugins/gofax/faxaccount/generic.tpl:70
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
  msgid "Deliver fax as mail"
  msgstr "Recapita Fax come mail"
  
  #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:830
  msgid "Deliver fax to printer"
  msgstr "Recapita Fax alla stampante"
  
@@ -5012,94 +4936,94 @@ msgstr "Impostazioni FAX"
  msgid "FAX"
  msgstr "FAX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
  msgid "This account has no fax extensions."
  msgstr "Questa identità non possiede estensioni FAX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
  msgid "Remove fax account"
  msgstr "Elimina estensioni FAX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
  msgid ""
  "This account has fax features enabled. You can disable them by clicking "
  "below."
  msgstr "Questa identià possiede estensioni FAX."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
  msgid "Create fax account"
  msgstr "Crea estensioni FAX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:159
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
  msgid ""
  "This account has fax features disabled. You can enable them by clicking "
  "below."
  msgstr "Questa identità non possiede estensioni FAX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:222
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:229
  msgid "You're trying to add an invalid phone number."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:512
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:438
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:519
  #: plugins/admin/groups/class_groupApplication.inc:674
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
  #, fuzzy
  msgid "back"
  msgstr "Indietro"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:617
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
  #, fuzzy, php-format
  msgid "Removing of user/fax account with dn '%s' failed."
  msgstr "Elimina estensioni Unix"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:632
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
  msgid "The required field 'Fax' is not set."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
  msgid "Please enter a valid telephone number in the 'Fax' field."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
  msgid "Mail delivery is checked, but no address has been specified."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:646
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
  msgid "The mail address you've entered is invalid."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
  msgid ""
  "Deliver fax to printer, is only possible if valid printer is given. Please "
  "correct your choice."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:737
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:744
  #, fuzzy, php-format
  msgid "Saving of user/fax account with dn '%s' failed."
  msgstr "Estenzioni Proxy Internet"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:808
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
  #, fuzzy
  msgid "Fax account settings"
  msgstr "Impostazioni Samba"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
  msgid "Enable/Disable fax"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
  #, fuzzy
  msgid "Receive blocklist"
  msgstr "Lista delle liste di blocchi"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
  #, fuzzy
  msgid "Send blocklist"
  msgstr "Liste di blocco"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
  #, fuzzy
  msgid "Alternate fax number"
  msgstr "Numeri di Fax alternativi"
@@ -5116,7 +5040,7 @@ msgid "Filter"
  msgstr "Filtro"
  
  #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:109
  #: plugins/addons/logview/contents.tpl:47
  #: plugins/addons/mailqueue/contents.tpl:11
  #: plugins/gofon/fonreports/contents.tpl:6
@@ -5155,17 +5079,17 @@ msgstr "Cerca"
  
  #: plugins/gofax/faxreports/contents.tpl:30
  #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:842
-#: plugins/admin/ogroups/class_ogroupManagement.inc:351
+#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/ogroups/class_ogroupManagement.inc:346
  #: plugins/admin/fai/faiTemplateEntry.tpl:110
  msgid "User"
  msgstr ""
  
  #: plugins/gofax/faxreports/contents.tpl:31
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #: plugins/addons/logview/contents.tpl:84
  #: plugins/gofon/fonreports/contents.tpl:30
-#: plugins/gofon/fonreports/class_fonreport.inc:398
+#: plugins/gofon/fonreports/class_fonreport.inc:399
  msgid "Date"
  msgstr "Data"
  
@@ -5206,22 +5130,22 @@ msgid "Date / Time"
  msgstr ""
  
  #: plugins/gofax/faxreports/detail.tpl:29
-#: plugins/gofax/faxreports/class_faxreport.inc:484
+#: plugins/gofax/faxreports/class_faxreport.inc:489
  msgid "Sender MSN"
  msgstr ""
  
  #: plugins/gofax/faxreports/detail.tpl:33
-#: plugins/gofax/faxreports/class_faxreport.inc:483
+#: plugins/gofax/faxreports/class_faxreport.inc:488
  msgid "Sender ID"
  msgstr ""
  
  #: plugins/gofax/faxreports/detail.tpl:37
-#: plugins/gofax/faxreports/class_faxreport.inc:486
+#: plugins/gofax/faxreports/class_faxreport.inc:491
  msgid "Receiver MSN"
  msgstr ""
  
  #: plugins/gofax/faxreports/detail.tpl:41
-#: plugins/gofax/faxreports/class_faxreport.inc:485
+#: plugins/gofax/faxreports/class_faxreport.inc:490
  msgid "Receiver ID"
  msgstr ""
  
@@ -5230,7 +5154,7 @@ msgid "Status message"
  msgstr ""
  
  #: plugins/gofax/faxreports/detail.tpl:53
-#: plugins/gofax/faxreports/class_faxreport.inc:489
+#: plugins/gofax/faxreports/class_faxreport.inc:494
  msgid "Transfer time"
  msgstr ""
  
@@ -5242,90 +5166,96 @@ msgstr "Rapporti FAX"
  msgid "FAX Reports"
  msgstr "Rapporti FAX"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:108
  msgid ""
  "No fax extension defined in your server configuration, no reports can be "
  "shown!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: plugins/gofax/faxreports/class_faxreport.inc:111
  #: plugins/addons/logview/class_logview.inc:75
  #: plugins/gofon/fonreports/class_fonreport.inc:163
  msgid "There is no mysql extension available, please check your php setup."
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:117
+#: plugins/gofax/faxreports/class_faxreport.inc:118
  msgid "Can't connect to fax database, no reports can be shown!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:121
+#: plugins/gofax/faxreports/class_faxreport.inc:122
  msgid "Can't select fax database for report generation!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:126
+#: plugins/gofax/faxreports/class_faxreport.inc:127
  #, fuzzy
  msgid "Can't query fax table 'faxlog' for report generation!"
  msgstr "Impossibile selezionare il database!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:149
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:150
+#: plugins/gofax/faxreports/class_faxreport.inc:290
  msgid "Query for fax database failed!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:158
-#: plugins/gofax/faxreports/class_faxreport.inc:168
+#: plugins/gofax/faxreports/class_faxreport.inc:159
+#: plugins/gofax/faxreports/class_faxreport.inc:169
  msgid "You have no permission to retrieve informations about this fax id!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:196
-#: plugins/gofax/faxreports/class_faxreport.inc:311
-#: plugins/gofon/fonreports/class_fonreport.inc:221
+#: plugins/gofax/faxreports/class_faxreport.inc:200
+#: plugins/gofax/faxreports/class_faxreport.inc:315
+#: plugins/gofon/fonreports/class_fonreport.inc:223
  msgid "Y-M-D"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  msgid "Insufficient permissions to view this attribute"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/admin/groups/class_groupApplication.inc:427
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions"
  msgstr "Permessi"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:469
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:473
+#: plugins/gofax/faxreports/class_faxreport.inc:474
  #, fuzzy
  msgid "Fax report"
  msgstr "Rapporti FAX"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:474
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  #, fuzzy
  msgid "All entries are readonly"
  msgstr "Tutti i campi sono scrivibili"
  
  #: plugins/gofax/faxreports/class_faxreport.inc:479
  #, fuzzy
+msgid "Fax reports"
+msgstr "Rapporti FAX"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:484
+#, fuzzy
  msgid "Detailed view"
  msgstr "Dispositivi del client"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:480
+#: plugins/gofax/faxreports/class_faxreport.inc:485
  #, fuzzy
  msgid "Fax ID"
  msgstr "Fax"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #, fuzzy
  msgid "Time"
  msgstr "Cellulare"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:487
+#: plugins/gofax/faxreports/class_faxreport.inc:492
  msgid "Number of pages"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:488
+#: plugins/gofax/faxreports/class_faxreport.inc:493
  #, fuzzy
  msgid "Status Message"
  msgstr "Rimuovi"
@@ -5354,44 +5284,44 @@ msgstr ""
  msgid "Add entry"
  msgstr "Aggiungi contatto"
  
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:54
  #: plugins/admin/groups/class_groupApplication.inc:756
  msgid "Edit entry"
  msgstr "Modifica contatto"
  
-#: plugins/addons/addressbook/contents.tpl:55
+#: plugins/addons/addressbook/contents.tpl:58
  msgid "Remove entry"
  msgstr "Elimina contatto"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Select to see regular users"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Show organizational entries"
  msgstr "Mostra contatti di organizzazioni"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Select to see users in addressbook"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Show addressbook entries"
  msgstr "Mostra contatti della rubrica"
  
-#: plugins/addons/addressbook/contents.tpl:81
+#: plugins/addons/addressbook/contents.tpl:84
  msgid "Display results for department"
  msgstr "Mostra risultati per dipartimento"
  
-#: plugins/addons/addressbook/contents.tpl:94
+#: plugins/addons/addressbook/contents.tpl:97
  msgid "Match object"
  msgstr "Oggetto corrispondente"
  
-#: plugins/addons/addressbook/contents.tpl:97
+#: plugins/addons/addressbook/contents.tpl:100
  msgid "Choose the object that will be searched in"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:109
+#: plugins/addons/addressbook/contents.tpl:112
  msgid "Search string"
  msgstr "Ricerca"
  
@@ -5400,10 +5330,10 @@ msgid "Dial connection..."
  msgstr ""
  
  #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:427
-#: plugins/addons/addressbook/class_addressbook.inc:434
-#: plugins/addons/addressbook/class_addressbook.inc:438
-#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/addons/addressbook/class_addressbook.inc:429
+#: plugins/addons/addressbook/class_addressbook.inc:436
+#: plugins/addons/addressbook/class_addressbook.inc:440
+#: plugins/addons/addressbook/class_addressbook.inc:553
  msgid "Dial"
  msgstr ""
  
@@ -5424,7 +5354,7 @@ msgid "Personal"
  msgstr "Personale"
  
  #: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/class_addressbook.inc:807
  #: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
  #: html/getxls.php:298
  msgid "Initials"
@@ -5454,76 +5384,76 @@ msgstr "Città"
  
  #: plugins/addons/addressbook/address_edit.tpl:191
  #: plugins/addons/addressbook/address_info.tpl:141
-#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_departmentGeneric.inc:585
  msgid "Country"
  msgstr "Paese"
  
-#: plugins/addons/addressbook/main.inc:35
+#: plugins/addons/addressbook/main.inc:36
  msgid "Address book"
  msgstr "Rubrica"
  
  #: plugins/addons/addressbook/class_addressbook.inc:6
-#: plugins/addons/addressbook/class_addressbook.inc:781
-#: plugins/addons/addressbook/class_addressbook.inc:787
+#: plugins/addons/addressbook/class_addressbook.inc:783
+#: plugins/addons/addressbook/class_addressbook.inc:789
  msgid "Addressbook"
  msgstr "Rubrica"
  
-#: plugins/addons/addressbook/class_addressbook.inc:172
+#: plugins/addons/addressbook/class_addressbook.inc:173
  #, php-format
  msgid "Dial from %s to %s now?"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:176
+#: plugins/addons/addressbook/class_addressbook.inc:177
  msgid ""
  "You have no personal phone number set. Please change that in order to "
  "perform direct dials."
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:202
-#: plugins/addons/addressbook/class_addressbook.inc:751
+#: plugins/addons/addressbook/class_addressbook.inc:203
+#: plugins/addons/addressbook/class_addressbook.inc:753
  #, fuzzy, php-format
  msgid "Removing of addressbook entry '%s' failed."
  msgstr "Mostra contatti della rubrica"
  
-#: plugins/addons/addressbook/class_addressbook.inc:209
-#: plugins/addons/addressbook/class_addressbook.inc:318
+#: plugins/addons/addressbook/class_addressbook.inc:210
+#: plugins/addons/addressbook/class_addressbook.inc:319
  msgid "You are not allowed to delete this entry!"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:312
+#: plugins/addons/addressbook/class_addressbook.inc:313
  #, php-format
  msgid "You're about to delete the entry %s."
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:444
+#: plugins/addons/addressbook/class_addressbook.inc:446
  #, php-format
  msgid "Save contact for %s as vcard"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: plugins/addons/addressbook/class_addressbook.inc:452
  #, php-format
  msgid "Send mail to %s"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:565
  msgid "global addressbook"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/addons/addressbook/class_addressbook.inc:568
  #, fuzzy
  msgid "user database"
  msgstr "Database"
  
-#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/addons/addressbook/class_addressbook.inc:572
  #, fuzzy, php-format
  msgid "Contact stored in '%s'"
  msgstr "Rimuovi"
  
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/addons/addressbook/class_addressbook.inc:574
  msgid "Creating new entry in"
  msgstr "Crea in"
  
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/logview/class_logview.inc:112
  #: plugins/addons/logview/class_logview.inc:133
  #: plugins/addons/mailqueue/class_mailqueue.inc:306
@@ -5531,33 +5461,33 @@ msgstr "Crea in"
  msgid "All"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Work phone"
  msgstr "Telefono del lavoro"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Cell phone"
  msgstr "Cellolare"
  
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:223
  msgid "Home phone"
  msgstr "Telefono privato"
  
-#: plugins/addons/addressbook/class_addressbook.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:704
  msgid ""
  "Cannot create a unique DN for your entry. Please fill more formular fields."
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:782
+#: plugins/addons/addressbook/class_addressbook.inc:784
  #, fuzzy
  msgid "Addressbook entry acls"
  msgstr "Mostra contatti della rubrica"
  
-#: plugins/addons/addressbook/class_addressbook.inc:806 html/getxls.php:301
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:301
  msgid "Title"
  msgstr "Titolo"
  
-#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: plugins/addons/addressbook/class_addressbook.inc:810 html/getxls.php:169
  #: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
  msgid "Common name"
  msgstr "Nome comune"
@@ -5743,12 +5673,12 @@ msgid "CSV import"
  msgstr "Importa da formato CSV"
  
  #: plugins/addons/ldapmanager/class_export.inc:77
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:91
  msgid "Error while exporting the requested entries!"
  msgstr ""
  
  #: plugins/addons/ldapmanager/class_export.inc:89
-#: plugins/addons/ldapmanager/class_exportxls.inc:102
+#: plugins/addons/ldapmanager/class_exportxls.inc:104
  #, fuzzy, php-format
  msgid "You are not allowed to export the given ldap entry (%s)"
  msgstr "Non hai il permesso di cambiare la tua password."
@@ -5974,46 +5904,46 @@ msgstr ""
  msgid "Active"
  msgstr "Privato"
  
-#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/addons/mailqueue/contents.tpl:94
  #, fuzzy
  msgid "Delete this message"
  msgstr "Elimina questo record"
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "unhold"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  #, fuzzy
  msgid "Release message"
  msgstr "Rimuovi"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  #, fuzzy
  msgid "hold"
  msgstr "metodo"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  #: plugins/addons/mailqueue/class_mailqueue.inc:398
  #, fuzzy
  msgid "Hold message"
  msgstr "Home Page"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  #, fuzzy
  msgid "requeue"
  msgstr "Numero di telefono"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "Requeue this message"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  #, fuzzy
  msgid "header"
  msgstr "leggere"
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  #, fuzzy
  msgid "Display header from this message"
  msgstr "Mostra utenti che corrispondono a"
@@ -6198,17 +6128,36 @@ msgstr ""
  msgid "Go up one dfsshare"
  msgstr "Sali di dipartimento"
  
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:370
+#: include/class_MultiSelectWindow.inc:194
+#: include/class_MultiSelectWindow.inc:196
+msgid "Up"
+msgstr ""
+
  #: plugins/addons/godfs/class_dfsManagment.inc:214
  msgid "Go to dfs root"
  msgstr ""
  
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+#: include/class_MultiSelectWindow.inc:188
+msgid "Root"
+msgstr "Root"
+
  #: plugins/addons/godfs/class_dfsManagment.inc:215
  #, fuzzy
  msgid "Create new dfsshare"
  msgstr "Crea in"
  
  #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:22
+#: ihtml/themes/default/copyPasteDialog.tpl:28
  msgid "Finish"
  msgstr "Esegui"
  
@@ -6265,7 +6214,7 @@ msgstr "Località"
  
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:890 include/class_acl.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:884 include/class_acl.inc:164
  #: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
  msgid "Groups"
  msgstr "Gruppi di utenti"
@@ -6280,12 +6229,12 @@ msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
  msgstr ""
  
  #: plugins/addons/notifications/class_msgplug.inc:116
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/systems/class_terminalGeneric.inc:207
-#: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/systems/class_workstationGeneric.inc:161
-#: plugins/admin/ogroups/class_termgroup.inc:210
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_servGeneric.inc:92
+#: plugins/admin/systems/class_workstationGeneric.inc:167
+#: plugins/admin/ogroups/class_termgroup.inc:209
  #, php-format
  msgid "Execution of '%s' failed!"
  msgstr ""
@@ -6347,19 +6296,19 @@ msgstr ""
  
  #: plugins/addons/notifications/contents.tpl:74
  #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:433
-#: plugins/admin/departments/class_departmentGeneric.inc:518
+#: plugins/admin/departments/class_departmentGeneric.inc:469
+#: plugins/admin/departments/class_departmentGeneric.inc:561
  #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/ServiceAddDialog.tpl:29
-#: plugins/admin/fai/class_faiManagement.inc:447
-#: plugins/admin/fai/class_faiManagement.inc:623
-#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/systems/ServiceAddDialog.tpl:28
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/admin/fai/class_faiManagement.inc:633
+#: plugins/admin/fai/class_faiManagement.inc:639
  #: plugins/admin/fai/faiPackageNew.tpl:50
  #: ihtml/themes/default/setup_introduction.tpl:12
  #: ihtml/themes/default/setup_useradmin.tpl:41
  #: ihtml/themes/default/setup_step2.tpl:13
  #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/default/snapshotdialog.tpl:78
+#: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Continua"
  
@@ -6475,102 +6424,96 @@ msgstr ""
  msgid "This 'dn' is no group."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Samba group"
  msgstr "Gruppo Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain admins"
  msgstr "Amministratori di Dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain users"
  msgstr "Utenti di Dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:328
+#: plugins/admin/groups/class_groupGeneric.inc:319
  msgid "Domain guests"
  msgstr "Ospiti di Dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:324
  #, php-format
  msgid "Special group (%d)"
  msgstr "Gruppo speciale (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:446
+#: plugins/admin/groups/class_groupGeneric.inc:437
  msgid "! unknown id"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:483
+#: plugins/admin/groups/class_groupGeneric.inc:474
  #, php-format
  msgid ""
  "Your search method returned more than '%s' users, only '%s' users are shown."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/admin/groups/class_groupGeneric.inc:720
+#: plugins/admin/groups/class_groupGeneric.inc:503
+#: plugins/admin/groups/class_groupGeneric.inc:718
  #, fuzzy, php-format
  msgid "Removing of groups/generic with dn '%s' failed."
  msgstr "Mostra gruppi di applicazioni"
  
-#: plugins/admin/groups/class_groupGeneric.inc:630
+#: plugins/admin/groups/class_groupGeneric.inc:628
  #, php-format
  msgid "No configured SID found for '%s'."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:635
+#: plugins/admin/groups/class_groupGeneric.inc:633
  #, php-format
  msgid "No configured RIDBASE found for '%s'."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:746
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/ogroups/class_ogroup.inc:608
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:756
+#: plugins/admin/groups/class_groupGeneric.inc:750
  msgid ""
  "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:767
-#: plugins/admin/groups/class_groupGeneric.inc:781
-#: plugins/admin/groups/class_groupGeneric.inc:788
+#: plugins/admin/groups/class_groupGeneric.inc:761
+#: plugins/admin/groups/class_groupGeneric.inc:775
+#: plugins/admin/groups/class_groupGeneric.inc:782
  msgid "Value specified as 'Name' is already used."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:885
+#: plugins/admin/groups/class_groupGeneric.inc:879
  #, fuzzy
  msgid "Generic group settings"
  msgstr "Impostazioni generali delle code"
  
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:891
  #, fuzzy
  msgid "Phone pickup group"
  msgstr "I membri sono in un gruppo di risposta telefonica"
  
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, fuzzy
  msgid "Nagios group"
  msgstr "Contatto"
  
-#: plugins/admin/groups/class_groupGeneric.inc:901
+#: plugins/admin/groups/class_groupGeneric.inc:895
  #, fuzzy
  msgid "Group member"
  msgstr "Membri del gruppo"
  
-#: plugins/admin/groups/class_groupGeneric.inc:902
+#: plugins/admin/groups/class_groupGeneric.inc:896
  #, fuzzy
  msgid "Samba group type"
  msgstr "Gruppo Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:903
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Home di Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:904
+#: plugins/admin/groups/class_groupGeneric.inc:898
  #, fuzzy
  msgid "Samba SID"
  msgstr "Samba"
@@ -6598,8 +6541,8 @@ msgstr "Aggiungi contatto"
  msgid "Available applications"
  msgstr "Applicazioni disponibili"
  
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:565
-#: include/class_acl.inc:656
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:597
+#: include/class_acl.inc:688
  msgid "read"
  msgstr "leggere"
  
@@ -6615,8 +6558,8 @@ msgstr "spedire esterno"
  msgid "append"
  msgstr "appendere"
  
-#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:566
-#: include/class_acl.inc:658
+#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:598
+#: include/class_acl.inc:690
  msgid "write"
  msgstr "scrivere"
  
@@ -6640,49 +6583,49 @@ msgstr "Stai cercando di aggungere un indirizzo di posta non valido"
  msgid "to the list of forwarders."
  msgstr "alla lista degli inoltri"
  
-#: plugins/admin/groups/class_groupMail.inc:672
+#: plugins/admin/groups/class_groupMail.inc:679
  #, fuzzy, php-format
  msgid "Removing of groups/mail with dn '%s' failed."
  msgstr "Opzioni di posta dell'identità"
  
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/groups/class_groupMail.inc:861
  #, fuzzy, php-format
  msgid "Saving of groups/mail with dn '%s' failed."
  msgstr "Opzioni di posta dell'identità"
  
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/admin/groups/class_groupMail.inc:890
  msgid "Please enter a valid email addres in 'Primary address' field."
  msgstr ""
  "Prego inserire un indirizzo email valido nel campo 'Indirizzo principale'"
  
-#: plugins/admin/groups/class_groupMail.inc:916
+#: plugins/admin/groups/class_groupMail.inc:923
  msgid ""
  "Please choose valid permission settings. Default permission can't be emtpy."
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:920
+#: plugins/admin/groups/class_groupMail.inc:927
  #, fuzzy
  msgid "Please select a valid mail server."
  msgstr "Prego inserire un numero di telefono valido!"
  
-#: plugins/admin/groups/class_groupMail.inc:1067
+#: plugins/admin/groups/class_groupMail.inc:1074
  #, fuzzy
  msgid "Group mail"
  msgstr "Nome gruppo"
  
-#: plugins/admin/groups/class_groupMail.inc:1075
+#: plugins/admin/groups/class_groupMail.inc:1082
  #, fuzzy
  msgid "Alternate addresses"
  msgstr "Indirizzi alternativi"
  
-#: plugins/admin/groups/class_groupMail.inc:1076
+#: plugins/admin/groups/class_groupMail.inc:1083
  #, fuzzy
  msgid "Forwarding addresses"
  msgstr "Indirizzo principale"
  
-#: plugins/admin/groups/class_groupMail.inc:1079
+#: plugins/admin/groups/class_groupMail.inc:1086
  #: plugins/admin/systems/printer.tpl:82
-#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_printGeneric.inc:873
  msgid "Permissions"
  msgstr "Permessi"
  
@@ -6747,7 +6690,9 @@ msgid ""
  msgstr "Questo gruppo non possiede estensioni per le applicazioni."
  
  #: plugins/admin/groups/class_groupApplication.inc:426
-#: include/class_tabs.inc:303
+#: plugins/admin/acl/class_aclManagement.inc:424
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430 include/class_tabs.inc:303
  msgid "ACL"
  msgstr "ACL"
  
@@ -6776,7 +6721,7 @@ msgid "The selected application has no options."
  msgstr ""
  
  #: plugins/admin/groups/class_groupApplication.inc:682
-#: plugins/admin/departments/class_divListDepartment.inc:154
+#: plugins/admin/departments/class_divListDepartment.inc:147
  #, fuzzy
  msgid "department"
  msgstr "dipartimenti"
@@ -6854,11 +6799,11 @@ msgid "Group applications"
  msgstr "Mostra applicazioni"
  
  #: plugins/admin/groups/class_groupApplication.inc:1173
-#: plugins/admin/groups/class_divListGroup.inc:176
-#: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:353
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
+#: plugins/admin/groups/class_divListGroup.inc:184
+#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/ogroups/class_ogroupManagement.inc:348
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:684
  #: plugins/gofon/fonreports/contents.tpl:34
  #: plugins/generic/references/class_reference.inc:42
  msgid "Application"
@@ -6868,7 +6813,7 @@ msgstr "Applicazione"
  #: plugins/admin/systems/workstationStartup.tpl:53
  #: plugins/admin/systems/workstationStartup.tpl:87
  #: plugins/admin/systems/servRepositorySetup.tpl:19
-#: plugins/admin/systems/class_servRepository.inc:238
+#: plugins/admin/systems/class_servRepository.inc:252
  #: plugins/admin/fai/faiPackage.tpl:37
  #: plugins/admin/fai/class_faiPackage.inc:542
  #: plugins/admin/fai/faiPackageNew.tpl:21
@@ -6959,62 +6904,62 @@ msgstr "Mostra gruppi funzionali"
  msgid "Create new group"
  msgstr "Crea estensioni telefoniche"
  
-#: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:175
  #, fuzzy
  msgid "Posix"
  msgstr "Proxy"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  #, fuzzy
  msgid "cut"
  msgstr "Esegui"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  #, fuzzy
  msgid "Cut this entry"
  msgstr "Modifica questo record"
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "copy"
  msgstr ""
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  #, fuzzy
  msgid "Copy this entry"
  msgstr "Modifica questo record"
  
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/conference/class_divListConferences.inc:159
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/conference/class_divListConferences.inc:155
  msgid "Edit this entry"
  msgstr "Modifica questo record"
  
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/conference/class_divListConferences.inc:169
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/conference/class_divListConferences.inc:165
  msgid "Delete this entry"
  msgstr "Elimina questo record"
  
@@ -7058,7 +7003,7 @@ msgstr ""
  #: plugins/admin/users/class_userManagement.inc:449
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
  #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:288
  msgid "none"
  msgstr "nessuno"
  
@@ -7083,8 +7028,8 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:812
-#: plugins/admin/fai/class_faiTemplate.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:997
+#: plugins/admin/fai/class_faiTemplate.inc:499
  msgid "Template"
  msgstr ""
  
@@ -7164,126 +7109,126 @@ msgstr "Seleziona per vedere gli utenti proxy"
  msgid "Show proxy users"
  msgstr "Mostra utenti proxy"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  #, fuzzy
  msgid "Create new user"
  msgstr "Crea in"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  #, fuzzy
  msgid "New user"
  msgstr "utenti"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  #, fuzzy
  msgid "Create new template"
  msgstr "Nuovo template"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "New template"
  msgstr "Nuovo template"
  
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:173
  msgid "GOsa"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:174
  #, fuzzy
  msgid "Edit generic properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:176
  #, fuzzy
  msgid "Edit UNIX properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:178
  #, fuzzy
  msgid "Edit environment properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:180
  #, fuzzy
  msgid "Edit mail properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:182
  #, fuzzy
  msgid "Edit phone properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:184
  #, fuzzy
  msgid "Edit fax properies"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:186
  #, fuzzy
  msgid "Edit samba properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_divListUsers.inc:200
+#: plugins/admin/users/class_divListUsers.inc:188
  #, fuzzy
  msgid "Edit netatalk properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_divListUsers.inc:201
+#: plugins/admin/users/class_divListUsers.inc:189
  #, fuzzy
  msgid "Create user from template"
  msgstr "Nuovo template"
  
-#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/users/class_divListUsers.inc:190
  #, fuzzy
  msgid "Create user with this template"
  msgstr "Nuovo template"
  
-#: plugins/admin/users/class_divListUsers.inc:260
+#: plugins/admin/users/class_divListUsers.inc:248
  #, fuzzy
  msgid "password"
  msgstr "Password"
  
-#: plugins/admin/users/class_divListUsers.inc:264
+#: plugins/admin/users/class_divListUsers.inc:252
  #, fuzzy
  msgid "You are not allowed to change the password for this user."
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:266
  #, fuzzy
  msgid "You are not allowed to remove this user."
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: plugins/admin/users/class_divListUsers.inc:297
+#: plugins/admin/users/class_divListUsers.inc:285
  #, fuzzy
  msgid "Online"
  msgstr "nessuno"
  
-#: plugins/admin/users/class_divListUsers.inc:304
+#: plugins/admin/users/class_divListUsers.inc:292
  msgid "Offline"
  msgstr ""
  
  #: plugins/admin/applications/generic.tpl:7
  #: plugins/admin/applications/generic.tpl:10
-#: plugins/admin/applications/class_applicationGeneric.inc:486
+#: plugins/admin/applications/class_applicationGeneric.inc:495
  #: plugins/admin/applications/class_divListApplication.inc:51
  msgid "Application name"
  msgstr "Nome applicazione"
  
  #: plugins/admin/applications/generic.tpl:15
  #: plugins/gofon/macro/generic.tpl:14
-#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: plugins/gofon/macro/class_gofonMacro.inc:499 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Display name"
  msgstr "Mostra il nome"
  
  #: plugins/admin/applications/generic.tpl:19
-#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/applications/class_applicationGeneric.inc:500
  msgid "Application name to be displayed (i.e. below icons)"
  msgstr ""
  
  #: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/applications/class_applicationGeneric.inc:526
-#: plugins/admin/systems/terminal.tpl:149 plugins/admin/systems/server.tpl:73
-#: plugins/admin/systems/workstation.tpl:124
+#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/systems/terminal.tpl:153 plugins/admin/systems/server.tpl:74
+#: plugins/admin/systems/workstation.tpl:127
  #: plugins/admin/systems/goMailServer.tpl:215
  #: plugins/admin/systems/goImapServer.tpl:110
  #: plugins/admin/ogroups/termgroup.tpl:101
@@ -7301,9 +7246,9 @@ msgid "Choose subtree to place application in"
  msgstr ""
  
  #: plugins/admin/applications/generic.tpl:66
-#: plugins/admin/applications/class_applicationGeneric.inc:528
+#: plugins/admin/applications/class_applicationGeneric.inc:537
  #: plugins/admin/mimetypes/generic.tpl:67
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:678
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:686
  msgid "Icon"
  msgstr "Icna"
  
@@ -7316,41 +7261,46 @@ msgstr "Aggiorna"
  msgid "Reload picture from LDAP"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:96
-#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/generic.tpl:81
+#, fuzzy
+msgid "Remove picture from LDAP"
+msgstr "Elimina foto"
+
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/applications/class_applicationGeneric.inc:541
  msgid "Only executable for members"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:101
-#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/applications/generic.tpl:104
+#: plugins/admin/applications/class_applicationGeneric.inc:545
  msgid "Replace user configuration on startup"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:107
-#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/generic.tpl:110
+#: plugins/admin/applications/class_applicationGeneric.inc:542
  msgid "Place icon on members desktop"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:112
-#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/applications/generic.tpl:115
+#: plugins/admin/applications/class_applicationGeneric.inc:544
  msgid "Place entry in members startmenu"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:117
-#: plugins/admin/applications/class_applicationGeneric.inc:534
+#: plugins/admin/applications/generic.tpl:120
+#: plugins/admin/applications/class_applicationGeneric.inc:543
  msgid "Place entry in members launch bar"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:135
+#: plugins/admin/applications/generic.tpl:138
  #: plugins/admin/systems/printerPPDDialog.tpl:11
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
  #: plugins/admin/fai/faiTemplateEntry.tpl:49
  msgid "Upload"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:297
-#: plugins/admin/fai/class_faiTemplate.inc:271
+#: plugins/admin/applications/generic.tpl:140
+#: plugins/admin/fai/class_faiScript.inc:307
+#: plugins/admin/fai/class_faiTemplate.inc:284
  #: plugins/admin/fai/class_faiScriptEntry.inc:89
  #: plugins/admin/fai/class_faiHook.inc:308
  #: plugins/admin/fai/class_faiHookEntry.inc:84
@@ -7376,7 +7326,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/applications/class_applicationParameters.inc:98
-#: plugins/admin/fai/class_faiVariable.inc:412
+#: plugins/admin/fai/class_faiVariable.inc:408
  msgid "Variable"
  msgstr ""
  
@@ -7432,74 +7382,70 @@ msgstr ""
  msgid "no example"
  msgstr "incompleto"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:132
+#: plugins/admin/applications/class_applicationGeneric.inc:126
  msgid "This 'dn' is no application."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:228
+#: plugins/admin/applications/class_applicationGeneric.inc:227
  #, fuzzy, php-format
  msgid "Removing of application with dn '%s' failed."
  msgstr "Mostra gruppi di applicazioni"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:240
+#: plugins/admin/applications/class_applicationGeneric.inc:239
  #, php-format
  msgid "Removing application from objectgroup '%s' failed"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:247
+#: plugins/admin/applications/class_applicationGeneric.inc:246
  #, fuzzy, php-format
  msgid "Removing application from group '%s' failed"
  msgstr "Mostra gruppi di applicazioni"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:289
+#: plugins/admin/applications/class_applicationGeneric.inc:297
  msgid "The specified picture has not been uploaded correctly."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:372
  msgid "Specified execute path must start with '/'."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:375
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:380
+#: plugins/admin/applications/class_applicationGeneric.inc:389
  msgid "Required field 'Name' is not filled."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:384
+#: plugins/admin/applications/class_applicationGeneric.inc:393
  msgid "Invalid character in application name. Only a-z 0-9 are allowed."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:388
+#: plugins/admin/applications/class_applicationGeneric.inc:397
  msgid "Required field 'Execute' is not filled."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:403
-#: plugins/admin/applications/class_applicationGeneric.inc:411
+#: plugins/admin/applications/class_applicationGeneric.inc:412
+#: plugins/admin/applications/class_applicationGeneric.inc:420
  msgid "There's already an application with this 'Name'."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:457
+#: plugins/admin/applications/class_applicationGeneric.inc:466
  #, fuzzy, php-format
  msgid "Saving of application with dn '%s' failed."
  msgstr "Nome applicazione"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:482
+#: plugins/admin/applications/class_applicationGeneric.inc:491
  #, fuzzy
  msgid "Application settings"
  msgstr "Opzioni applicazione"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:515
+#: plugins/admin/applications/class_applicationGeneric.inc:524
  #, fuzzy
  msgid "Application generic"
  msgstr "Nome applicazione"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_applicationGeneric.inc:538
  msgid "Flag"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:530
+#: plugins/admin/applications/class_applicationGeneric.inc:539
  #, fuzzy
  msgid "Script content"
  msgstr "Mostra terminali"
@@ -7530,14 +7476,14 @@ msgid ""
  "working with a large number of applications."
  msgstr ""
  
-#: plugins/admin/applications/class_divListApplication.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
  #, fuzzy
  msgid "new"
  msgstr "Nuovo"
  
-#: plugins/admin/applications/class_divListApplication.inc:129
+#: plugins/admin/applications/class_divListApplication.inc:131
  #, fuzzy
  msgid "Create new application"
  msgstr "Crea estensioni per le applicazioni"
@@ -7556,6 +7502,18 @@ msgstr "Annulla"
  msgid "Current release"
  msgstr "Password attuale"
  
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested operation"
+msgstr ""
+
+#: plugins/admin/departments/dep_iframe.tpl:7
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
  #: plugins/admin/departments/generic.tpl:8
  msgid "Name of department"
  msgstr ""
@@ -7570,7 +7528,7 @@ msgid "Descriptive text for department"
  msgstr ""
  
  #: plugins/admin/departments/generic.tpl:24
-#: plugins/admin/departments/class_departmentGeneric.inc:546
+#: plugins/admin/departments/class_departmentGeneric.inc:590
  msgid "Category"
  msgstr ""
  
@@ -7603,13 +7561,13 @@ msgstr ""
  msgid "Base facsimile telephone number of this subtree"
  msgstr ""
  
-#: plugins/admin/departments/generic.tpl:109
-#: plugins/admin/departments/class_departmentGeneric.inc:549
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/class_departmentGeneric.inc:593
  #, fuzzy
  msgid "Administrative settings"
  msgstr "Amministrazione"
  
-#: plugins/admin/departments/generic.tpl:111
+#: plugins/admin/departments/generic.tpl:119
  msgid "Tag department as an independent administrative unit"
  msgstr ""
  
@@ -7638,94 +7596,71 @@ msgid ""
  "'Delete' to continue or 'Cancel' to abort."
  msgstr ""
  
-#: plugins/admin/departments/dep_iframe.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
-msgid "Processing the requested operation"
+#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
+msgid "Department management"
  msgstr ""
  
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
+#: plugins/admin/departments/class_departmentGeneric.inc:190
+#, fuzzy, php-format
+msgid "Removing of department with dn '%s' failed."
+msgstr "Imposta dipartimento"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:251
+#: plugins/admin/departments/class_departmentGeneric.inc:253
+msgid "Department with that 'Name' already exists."
  msgstr ""
  
-#: plugins/admin/departments/dep_iframe.tpl:8
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
-msgid "Department management"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:175
-#, fuzzy, php-format
-msgid "Removing of department with dn '%s' failed."
-msgstr "Imposta dipartimento"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:224
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:231
-#: plugins/admin/departments/class_departmentGeneric.inc:233
-msgid "Department with that 'Name' already exists."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:241
+#: plugins/admin/departments/class_departmentGeneric.inc:261
  msgid "Required field 'Description' is not set."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:245
+#: plugins/admin/departments/class_departmentGeneric.inc:265
  #, php-format
  msgid ""
  "The field 'Name' contains the reserved word '%s'. Please choose another name."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:297
+#: plugins/admin/departments/class_departmentGeneric.inc:319
  msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:343
+#: plugins/admin/departments/class_departmentGeneric.inc:368
  #, fuzzy, php-format
  msgid "Saving of department with dn '%s' failed."
  msgstr "Imposta dipartimento"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:385
+#: plugins/admin/departments/class_departmentGeneric.inc:421
  #, php-format
  msgid "Tagging '%s'."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:506
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:499
-#: include/class_ldap.inc:458 include/class_acl.inc:523
-#: include/class_acl.inc:530 include/class_acl.inc:537
-#: include/class_acl.inc:543 ihtml/themes/default/snapshotdialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:53
+#: plugins/admin/departments/class_departmentGeneric.inc:542
+#: include/class_ldap.inc:458 include/class_acl.inc:555
+#: include/class_acl.inc:562 include/class_acl.inc:569
+#: include/class_acl.inc:575 ihtml/themes/default/snapshotdialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
  msgstr "Oggetto"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:502
+#: plugins/admin/departments/class_departmentGeneric.inc:545
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:532
-#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: plugins/admin/departments/class_departmentGeneric.inc:581
  #: plugins/admin/departments/class_departmentManagement.inc:25
  #: plugins/admin/systems/class_glpiSelectUser.inc:112
  #: plugins/admin/ogroups/class_divListOGroup.inc:58
  msgid "Departments"
  msgstr "Dipartimenti"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:544
+#: plugins/admin/departments/class_departmentGeneric.inc:588
  #: plugins/admin/systems/workstationService.tpl:89
  #: plugins/admin/systems/terminalService.tpl:79
  #: plugins/gofon/phoneaccount/generic.tpl:32
@@ -7734,24 +7669,25 @@ msgstr "Dipartimenti"
  msgid "Telephone"
  msgstr "Telefono"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:545
+#: plugins/admin/departments/class_departmentGeneric.inc:589
  #: plugins/admin/departments/class_divListDepartment.inc:41
  #, fuzzy
  msgid "Department name"
  msgstr "Dipartimento"
  
-#: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
+#: plugins/admin/departments/class_departmentManagement.inc:160
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:134
  #, php-format
  msgid "You're about to delete the whole LDAP subtree placed under '%s'."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:175
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:153
+#: plugins/admin/departments/class_departmentManagement.inc:165
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:155
  msgid "You have no permission to remove this department."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:352
  msgid ".."
  msgstr ""
  
@@ -7776,16 +7712,30 @@ msgid "Regular expression for matching department names"
  msgstr ""
  
  #: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/fai/class_divListFai.inc:139
-#, fuzzy
-msgid "Go to users home department"
-msgstr "Mostra utenti del dipartimento"
-
-#: plugins/admin/departments/class_divListDepartment.inc:101
  #, fuzzy
  msgid "Create new department"
  msgstr "Lista dei dipartimenti"
  
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+msgid "You are currently moving/renaming this department."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:5
+msgid ""
+"Modifying a departments naming attribute 'ou' or base may corrupt acls and "
+"snapshot entries for all entire objects."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:8
+msgid "GOsa can NOT fix this for you, yet."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:11
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
+msgstr ""
+
  #: plugins/admin/systems/network.tpl:1
  #, fuzzy
  msgid "Network\tsettings"
@@ -7808,7 +7758,7 @@ msgid "Enable DNS for this device"
  msgstr ""
  
  #: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/class_servDNS.inc:396
+#: plugins/admin/systems/class_servDNS.inc:398
  #: plugins/admin/systems/servdnseditzone.tpl:67
  #: plugins/admin/fai/faiPackageNew.tpl:31
  #: plugins/gofon/phoneaccount/generic.tpl:84
@@ -7823,8 +7773,8 @@ msgstr "telefoni"
  
  #: plugins/admin/systems/network.tpl:77
  #: plugins/admin/systems/class_servDNS.inc:168
-#: plugins/admin/systems/class_servDNS.inc:399
-#: plugins/admin/systems/class_termDNS.inc:542
+#: plugins/admin/systems/class_servDNS.inc:401
+#: plugins/admin/systems/class_termDNS.inc:547
  #: plugins/admin/systems/servdnseditzone.tpl:85
  msgid "TTL"
  msgstr ""
@@ -7840,10 +7790,10 @@ msgid "present"
  msgstr "presente"
  
  #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:252
  #: plugins/admin/systems/class_terminalStartup.inc:161
-#: plugins/admin/systems/class_terminalGeneric.inc:242
-#: plugins/admin/systems/class_workstationStartup.inc:471
+#: plugins/admin/systems/class_terminalGeneric.inc:256
+#: plugins/admin/systems/class_workstationStartup.inc:498
+#: plugins/admin/systems/class_terminalService.inc:261
  msgid "This 'dn' has no terminal features."
  msgstr ""
  
@@ -7876,6 +7826,92 @@ msgstr ""
  msgid "offline"
  msgstr ""
  
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
+#: plugins/admin/systems/workstation.tpl:44
+#: plugins/admin/systems/class_terminalGeneric.inc:548
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:390
+msgid "Mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:50
+msgid "Select terminal mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:47
+#: plugins/admin/systems/workstation.tpl:54
+#: plugins/admin/systems/class_workstationGeneric.inc:539
+#: plugins/admin/ogroups/termgroup.tpl:58
+#: plugins/admin/ogroups/class_termgroup.inc:391
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:50
+#: plugins/admin/systems/workstation.tpl:57
+#: plugins/admin/ogroups/termgroup.tpl:61
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:66
+#: plugins/admin/systems/class_terminalGeneric.inc:549
+msgid "Root server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Select NFS root filesystem to use"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/class_terminalGeneric.inc:550
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:79
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:98
+#: plugins/admin/systems/workstation.tpl:75
+msgid "Inherit time server attributes"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:80
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:106
+#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/ogroups/termgroup.tpl:17
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:140 plugins/admin/systems/server.tpl:62
+#: plugins/admin/systems/workstation.tpl:115
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:47
+#: plugins/admin/ogroups/termgroup.tpl:88
+msgid "Action"
+msgstr "Azione"
+
+#: plugins/admin/systems/terminal.tpl:145
+#: plugins/admin/systems/workstation.tpl:120
+#: plugins/admin/ogroups/termgroup.tpl:93
+msgid "Select action to execute for this terminal"
+msgstr ""
+
  #: plugins/admin/systems/info.tpl:1
  msgid "System information"
  msgstr ""
@@ -7982,50 +8018,49 @@ msgstr ""
  msgid "This 'dn' has no network features."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_winGeneric.inc:145
  #, php-format
  msgid "Removing of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_componentGeneric.inc:179
+#: plugins/admin/systems/class_winGeneric.inc:195
  msgid "You have no permissions to create a component on this 'Base'."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:184
-#: plugins/admin/systems/class_terminalGeneric.inc:400
-#: plugins/admin/systems/class_servGeneric.inc:261
-#: plugins/admin/systems/class_workstationGeneric.inc:400
-#: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/systems/class_componentGeneric.inc:189
-#: plugins/admin/systems/class_phoneGeneric.inc:333
+#: plugins/admin/systems/class_winGeneric.inc:205
+#: plugins/admin/systems/class_terminalGeneric.inc:434
+#: plugins/admin/systems/class_servGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:414
+#: plugins/admin/systems/class_printGeneric.inc:673
+#: plugins/admin/systems/class_componentGeneric.inc:191
+#: plugins/admin/systems/class_phoneGeneric.inc:338
  #, php-format
  msgid "There is already an entry '%s' in the base choosen by you"
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:239
+#: plugins/admin/systems/class_winGeneric.inc:260
  #, php-format
  msgid "Saving of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:250
+#: plugins/admin/systems/class_winGeneric.inc:271
  #, fuzzy
  msgid "Win generic"
  msgstr "Stampante"
  
-#: plugins/admin/systems/class_winGeneric.inc:251
+#: plugins/admin/systems/class_winGeneric.inc:272
  #, fuzzy
  msgid "Windows workstation generic"
  msgstr "Mostra workstation"
  
-#: plugins/admin/systems/class_winGeneric.inc:256
+#: plugins/admin/systems/class_winGeneric.inc:277
  #, fuzzy
  msgid "Win workstation"
  msgstr "Amministrazione"
  
-#: plugins/admin/systems/class_winGeneric.inc:259
+#: plugins/admin/systems/class_winGeneric.inc:280
  #: plugins/admin/systems/workstation.tpl:10
-#: plugins/admin/systems/class_workstationGeneric.inc:513
+#: plugins/admin/systems/class_workstationGeneric.inc:535
  msgid "Workstation name"
  msgstr ""
  
@@ -8033,122 +8068,21 @@ msgstr ""
  msgid "System management"
  msgstr ""
  
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
-#: plugins/admin/systems/workstation.tpl:44
-#: plugins/admin/systems/class_terminalGeneric.inc:508
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/ogroups/termgroup.tpl:47
-#: plugins/admin/ogroups/class_termgroup.inc:391
-msgid "Mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
-#: plugins/admin/systems/workstation.tpl:47
-#: plugins/admin/ogroups/termgroup.tpl:50
-msgid "Select terminal mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:47
-#: plugins/admin/systems/workstation.tpl:54
-#: plugins/admin/systems/class_workstationGeneric.inc:517
-#: plugins/admin/ogroups/termgroup.tpl:58
-#: plugins/admin/ogroups/class_termgroup.inc:392
-msgid "Syslog server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:50
-#: plugins/admin/systems/workstation.tpl:57
-#: plugins/admin/ogroups/termgroup.tpl:61
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:66
-#: plugins/admin/systems/class_terminalGeneric.inc:509
-msgid "Root server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:69
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/class_terminalGeneric.inc:510
-msgid "Swap server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:79
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:98
-#: plugins/admin/systems/workstation.tpl:75
-msgid "Inherit time server attributes"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:106
-#: plugins/admin/systems/workstation.tpl:83
-#: plugins/admin/ogroups/termgroup.tpl:17
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:136 plugins/admin/systems/server.tpl:61
-#: plugins/admin/systems/workstation.tpl:112
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:47
-#: plugins/admin/ogroups/termgroup.tpl:88
-msgid "Action"
-msgstr "Azione"
-
-#: plugins/admin/systems/terminal.tpl:141
-#: plugins/admin/systems/workstation.tpl:117
-#: plugins/admin/ogroups/termgroup.tpl:93
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:69
-#: plugins/admin/systems/class_workstationService.inc:92
-#: plugins/admin/systems/workstationService.tpl:157
-msgid "unknown"
-msgstr ""
+#: plugins/admin/systems/goNtpServer.tpl:2
+#, fuzzy
+msgid "Time server"
+msgstr "Server"
  
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
-#: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:214
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
  #: plugins/admin/systems/class_terminalStartup.inc:39
  #: plugins/admin/systems/class_terminalStartup.inc:121
  #: plugins/admin/systems/class_terminalStartup.inc:141
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_terminalGeneric.inc:298
-#: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_workstationStartup.inc:268
-#: plugins/admin/systems/class_workstationStartup.inc:285
-#: plugins/admin/systems/class_workstationStartup.inc:289
-#: plugins/admin/systems/class_workstationStartup.inc:790
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:312
+#: plugins/admin/systems/class_workstationStartup.inc:316
+#: plugins/admin/systems/class_workstationStartup.inc:824
  #: plugins/admin/systems/class_workstationService.inc:201
  #: plugins/admin/systems/class_workstationService.inc:204
  #: plugins/admin/systems/class_workstationService.inc:207
@@ -8163,204 +8097,25 @@ msgstr ""
  #: plugins/admin/systems/class_workstationService.inc:233
  #: plugins/admin/systems/class_workstationService.inc:234
  #: plugins/admin/systems/class_workstationService.inc:235
-msgid "inherited"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:101
+#: plugins/admin/systems/class_terminalService.inc:74
  #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:95
-#: plugins/admin/systems/class_workstationService.inc:96
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:98
-#, fuzzy
-msgid "bit"
-msgstr "scrivere"
-
-#: plugins/admin/systems/class_terminalService.inc:155
-msgid "default"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:156
-#: plugins/admin/systems/class_workstationService.inc:138
-msgid "show chooser"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:157
-#: plugins/admin/systems/class_workstationService.inc:139
-msgid "direct"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:160
-#: plugins/admin/systems/class_workstationService.inc:142
-msgid "load balanced"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:163
-#: plugins/admin/systems/class_workstationService.inc:145
-msgid "Windows RDP"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:164
-#: plugins/admin/systems/class_workstationService.inc:146
-msgid "ICA client"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_workstationService.inc:204
-#, fuzzy
-msgid "Bit"
-msgstr "scrivere"
-
-#: plugins/admin/systems/class_terminalService.inc:307
-#: plugins/admin/systems/class_workstationService.inc:314
-msgid "Choose the phone located at the current terminal"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:370
-#: plugins/admin/systems/class_terminalService.inc:375
-#: plugins/admin/systems/class_workstationService.inc:380
-#: plugins/admin/systems/class_workstationService.inc:385
-msgid "Please specify a valid VSync range."
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:385
-#: plugins/admin/systems/class_terminalService.inc:390
-#: plugins/admin/systems/class_workstationService.inc:395
-#: plugins/admin/systems/class_workstationService.inc:400
-msgid "Please specify a valid HSync range."
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:421
-#, fuzzy, php-format
-msgid "Saving of object system terminal/service with dn '%s' failed."
-msgstr "Informazioni organizzazione"
-
-#: plugins/admin/systems/class_terminalService.inc:430
-#: plugins/admin/systems/class_workstationService.inc:451
-#, fuzzy
-msgid "Service"
-msgstr "Servizi"
-
-#: plugins/admin/systems/class_terminalService.inc:431
-#: plugins/admin/systems/class_goTerminalServer.inc:31
-#: plugins/admin/systems/class_goTerminalServer.inc:54
-#: plugins/admin/systems/class_goTerminalServer.inc:117
-#: plugins/admin/systems/class_goTerminalServer.inc:118
-#: plugins/admin/systems/goTerminalServer.tpl:1
-#, fuzzy
-msgid "Terminal service"
-msgstr "Terminal Server"
-
-#: plugins/admin/systems/class_terminalService.inc:439
-#: plugins/admin/systems/class_workstationService.inc:460
-#, fuzzy
-msgid "Monitor"
-msgstr "Dimensione quota"
-
-#: plugins/admin/systems/class_terminalService.inc:440
-#: plugins/admin/ogroups/class_phonequeue.inc:748
-#, fuzzy
-msgid "Method"
-msgstr "metodo"
-
-#: plugins/admin/systems/class_terminalService.inc:441
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Remote desktop"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:442
-#: plugins/admin/systems/class_goTerminalServer.inc:127
-#: plugins/admin/systems/goTerminalServer.tpl:12
-msgid "Font path"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:443
-#: plugins/admin/systems/class_workstationService.inc:461
-#, fuzzy
-msgid "Gfx driver"
-msgstr "Server"
-
-#: plugins/admin/systems/class_terminalService.inc:444
-#: plugins/admin/systems/class_workstationService.inc:462
-msgid "Gfx resolution"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:445
-#: plugins/admin/systems/class_workstationService.inc:463
-msgid "Gfx color depth"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:446
-#: plugins/admin/systems/class_workstationService.inc:464
-msgid "Hsync"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:447
-#: plugins/admin/systems/class_workstationService.inc:465
-msgid "Vsync"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:448
-#, fuzzy
-msgid "Printer service enabled"
-msgstr "Nome della stampante"
-
-#: plugins/admin/systems/class_terminalService.inc:449
-#: plugins/admin/systems/terminalService.tpl:221
-msgid "Spool server"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:450
-#: plugins/admin/systems/class_workstationService.inc:467
-#, fuzzy
-msgid "Scanner enabled"
-msgstr "disabilitato"
-
-#: plugins/admin/systems/class_terminalService.inc:451
-#, fuzzy
-msgid "Scanner model"
-msgstr "disabilitato"
-
-#: plugins/admin/systems/class_terminalService.inc:454
-#: plugins/admin/systems/class_workstationService.inc:468
-msgid "Keyboard model"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:455
-#: plugins/admin/systems/class_workstationService.inc:469
-msgid "Keyboard layout"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:456
-#: plugins/admin/systems/class_workstationService.inc:470
-msgid "Keyboard variant"
+#: plugins/admin/systems/class_terminalService.inc:108
+#: plugins/admin/systems/class_terminalService.inc:118
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:121
+#: plugins/admin/systems/class_terminalService.inc:125
+#: plugins/admin/systems/class_terminalService.inc:218
+#: plugins/admin/systems/class_terminalService.inc:221
+#: plugins/admin/systems/class_terminalService.inc:224
+#: plugins/admin/systems/class_terminalService.inc:227
+#: plugins/admin/systems/class_terminalService.inc:230
+#: plugins/admin/systems/class_terminalService.inc:233
+#: plugins/admin/systems/class_terminalService.inc:236
+msgid "inherited"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalService.inc:457
-#: plugins/admin/systems/class_workstationService.inc:471
-#, fuzzy
-msgid "Mouse type"
-msgstr "Tipo"
-
-#: plugins/admin/systems/class_terminalService.inc:458
-#: plugins/admin/systems/class_workstationService.inc:472
-#, fuzzy
-msgid "Mouse port"
-msgstr "Monitoraggio"
-
-#: plugins/admin/systems/class_terminalService.inc:459
-#: plugins/admin/systems/class_workstationService.inc:473
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:76
-#: plugins/gofon/phoneaccount/generic.tpl:30
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Dispositivo telefonico"
-
  #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:310
+#: plugins/admin/systems/class_workstationStartup.inc:337
  #, php-format
  msgid ""
  "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -8378,26 +8133,26 @@ msgid "Terminal startup"
  msgstr "Terminali"
  
  #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1163
  #, fuzzy
  msgid "Ldap server"
  msgstr "Server"
  
  #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1122
+#: plugins/admin/systems/class_workstationStartup.inc:1167
  #, fuzzy
  msgid "Kernel modules"
  msgstr "Parametro"
  
  #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1119
+#: plugins/admin/systems/class_workstationStartup.inc:1164
  #: plugins/admin/systems/workstationStartup.tpl:8
  #: plugins/admin/systems/terminalStartup.tpl:8
  msgid "Boot kernel"
  msgstr ""
  
  #: plugins/admin/systems/class_terminalStartup.inc:455
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1165
  #, fuzzy
  msgid "Kernel parameter"
  msgstr "Parametro"
@@ -8406,7 +8161,7 @@ msgstr "Parametro"
  msgid "Server name"
  msgstr ""
  
-#: plugins/admin/systems/server.tpl:66
+#: plugins/admin/systems/server.tpl:67
  msgid "Select action to execute for this server"
  msgstr ""
  
@@ -8499,7 +8254,7 @@ msgid "Supported interfaces"
  msgstr "Mostra dispositiva di rete"
  
  #: plugins/admin/systems/glpiPrinter.tpl:48
-#: plugins/admin/systems/class_servDNS.inc:395
+#: plugins/admin/systems/class_servDNS.inc:397
  #, fuzzy
  msgid "Serial"
  msgstr "Terminali"
@@ -8544,207 +8299,205 @@ msgstr "Argomenti"
  msgid "Installed cartridges"
  msgstr "Dispositivi del client"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:98
+#: plugins/admin/systems/class_terminalGeneric.inc:105
  msgid "text"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:106
  msgid "graphic"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:173
+#: plugins/admin/systems/class_terminalGeneric.inc:181
  #, php-format
  msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:179
+#: plugins/admin/systems/class_terminalGeneric.inc:188
  msgid "No WAKECMD definition found in your gosa.conf"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:191
+#: plugins/admin/systems/class_terminalGeneric.inc:200
  msgid "No REBOOTCMD definition found in your gosa.conf"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:203
+#: plugins/admin/systems/class_terminalGeneric.inc:212
  msgid "No HALTCMD definition found in your gosa.conf"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:280
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:294
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Switch off"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:281
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:295
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Reboot"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:282
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_servGeneric.inc:186
-#: plugins/admin/systems/class_workstationGeneric.inc:282
-#: plugins/admin/systems/class_workstationGeneric.inc:288
-#: plugins/admin/ogroups/class_termgroup.inc:301
+#: plugins/admin/systems/class_terminalGeneric.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:190
+#: plugins/admin/systems/class_servGeneric.inc:196
+#: plugins/admin/systems/class_workstationGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:295
+#: plugins/admin/ogroups/class_termgroup.inc:300
  msgid "Memory test"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:283
-#: plugins/admin/systems/class_terminalGeneric.inc:287
-#: plugins/admin/systems/class_servGeneric.inc:181
-#: plugins/admin/systems/class_servGeneric.inc:187
-#: plugins/admin/systems/class_workstationGeneric.inc:283
-#: plugins/admin/systems/class_workstationGeneric.inc:289
-#: plugins/admin/ogroups/class_termgroup.inc:302
+#: plugins/admin/systems/class_terminalGeneric.inc:297
+#: plugins/admin/systems/class_terminalGeneric.inc:301
+#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_servGeneric.inc:197
+#: plugins/admin/systems/class_workstationGeneric.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:296
+#: plugins/admin/ogroups/class_termgroup.inc:301
  #, fuzzy
  msgid "System analysis"
  msgstr "Log di sitema"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:285
-#: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/systems/class_terminalGeneric.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_workstationGeneric.inc:292
  msgid "Wake up"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:333
+#: plugins/admin/systems/class_terminalGeneric.inc:348
  #, php-format
  msgid "Removing of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:383
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:387
+#: plugins/admin/systems/class_terminalGeneric.inc:415
  msgid "The required field 'Terminal name' is not set."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:410
-#: plugins/admin/systems/class_workstationGeneric.inc:410
+#: plugins/admin/systems/class_terminalGeneric.inc:444
+#: plugins/admin/systems/class_workstationGeneric.inc:424
  msgid ""
  "There must be at least one NTP server selected, or the inherit mode "
  "activated."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:488
+#: plugins/admin/systems/class_terminalGeneric.inc:528
  #, php-format
  msgid "Saving of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:499
-#: plugins/admin/systems/class_terminalGeneric.inc:505
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: plugins/admin/systems/class_terminalGeneric.inc:539
+#: plugins/admin/systems/class_terminalGeneric.inc:545
+#: plugins/admin/systems/class_systemManagement.inc:998
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/admin/ogroups/class_ogroupManagement.inc:353
  #, fuzzy
  msgid "Terminal"
  msgstr "Terminali"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:500
+#: plugins/admin/systems/class_terminalGeneric.inc:540
  #, fuzzy
  msgid "Terminal generic"
  msgstr "Terminal Server"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: plugins/admin/systems/class_terminalGeneric.inc:551
  #, fuzzy
  msgid "Syslog server enabled"
  msgstr "Mostra server"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: plugins/admin/systems/class_terminalGeneric.inc:552
  #, fuzzy
  msgid "Ntp server settings"
  msgstr "Opzioni di posta dell'identità"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:515
-#: plugins/admin/systems/class_servGeneric.inc:347
-#: plugins/admin/systems/class_workstationGeneric.inc:519
-#: plugins/admin/ogroups/class_termgroup.inc:393
+#: plugins/admin/systems/class_terminalGeneric.inc:555
+#: plugins/admin/systems/class_workstationGeneric.inc:541
+#, fuzzy
+msgid "Root password"
+msgstr "Cambia password"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:556
+#: plugins/admin/systems/class_servGeneric.inc:360
+#: plugins/admin/systems/class_workstationGeneric.inc:542
+#: plugins/admin/ogroups/class_termgroup.inc:392
  #, fuzzy
  msgid "Action flag"
  msgstr "Azione"
  
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:41
+#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/ogroups/class_termgroup.inc:40
  #, fuzzy
  msgid "Activated"
  msgstr "Privato"
  
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_servGeneric.inc:79
  msgid "This 'dn' has no server features."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#: plugins/admin/ogroups/class_termgroup.inc:206
+#: plugins/admin/systems/class_servGeneric.inc:87
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/ogroups/class_termgroup.inc:205
  msgid "No ACTIONCMD definition found in your gosa.conf"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:125
  #, php-format
  msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:176
-#: plugins/admin/systems/class_workstationGeneric.inc:278
-#: plugins/admin/ogroups/class_termgroup.inc:297
+#: plugins/admin/systems/class_servGeneric.inc:186
+#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/ogroups/class_termgroup.inc:296
  #, fuzzy
  msgid "Instant update"
  msgstr "Crea estensioni telefoniche"
  
-#: plugins/admin/systems/class_servGeneric.inc:177
-#: plugins/admin/systems/class_servGeneric.inc:185
-#: plugins/admin/systems/class_workstationGeneric.inc:279
-#: plugins/admin/systems/class_workstationGeneric.inc:287
-#: plugins/admin/ogroups/class_termgroup.inc:298
+#: plugins/admin/systems/class_servGeneric.inc:187
+#: plugins/admin/systems/class_servGeneric.inc:195
+#: plugins/admin/systems/class_workstationGeneric.inc:286
+#: plugins/admin/systems/class_workstationGeneric.inc:294
+#: plugins/admin/ogroups/class_termgroup.inc:297
  msgid "Scheduled update"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_servGeneric.inc:184
-#: plugins/admin/systems/class_workstationGeneric.inc:280
-#: plugins/admin/systems/class_workstationGeneric.inc:286
-#: plugins/admin/ogroups/class_termgroup.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:188
+#: plugins/admin/systems/class_servGeneric.inc:194
+#: plugins/admin/systems/class_workstationGeneric.inc:287
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/ogroups/class_termgroup.inc:298
  msgid "Reinstall"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:179
-#: plugins/admin/systems/class_workstationGeneric.inc:281
-#: plugins/admin/ogroups/class_termgroup.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:189
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:299
  #, fuzzy
  msgid "Rescan hardware"
  msgstr "Dispositivo telefonico"
  
-#: plugins/admin/systems/class_servGeneric.inc:207
+#: plugins/admin/systems/class_servGeneric.inc:218
  #, fuzzy, php-format
  msgid "Removing of system server/generic with dn '%s' failed."
  msgstr "Elimina estensioni Unix"
  
-#: plugins/admin/systems/class_servGeneric.inc:245
+#: plugins/admin/systems/class_servGeneric.inc:263
  #, fuzzy
  msgid "The required field 'Server name' is not set."
  msgstr "Il campo 'Indirizzo principale' non è stao inserito"
  
-#: plugins/admin/systems/class_servGeneric.inc:250
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_servGeneric.inc:319
+#: plugins/admin/systems/class_servGeneric.inc:332
  #, php-format
  msgid "Saving of system server/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:335
+#: plugins/admin/systems/class_servGeneric.inc:348
  #, fuzzy
  msgid "Server generic"
  msgstr "Cognome"
  
-#: plugins/admin/systems/class_servGeneric.inc:345
-#: plugins/admin/systems/class_workstationGeneric.inc:516
+#: plugins/admin/systems/class_servGeneric.inc:358
+#: plugins/admin/systems/class_workstationGeneric.inc:538
  #, fuzzy
  msgid "Goto mode"
  msgstr "nella cartella"
@@ -8769,51 +8522,46 @@ msgid ""
  "below."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:191
-#: plugins/admin/ogroups/class_termgroup.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:198
+#: plugins/admin/ogroups/class_termgroup.inc:248
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
  msgstr "Mostra workstation"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:209
  msgid "This 'dn' has no workstation features."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:324
+#: plugins/admin/systems/class_workstationGeneric.inc:332
  #, fuzzy, php-format
  msgid "Removing of system workstation/generic with dn '%s' failed."
  msgstr "Elimina estensioni Samba"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/ogroups/class_termgroup.inc:109
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:387
+#: plugins/admin/systems/class_workstationGeneric.inc:396
  msgid "The required field 'Workstation name' is not set."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:477
-#: plugins/admin/systems/class_workstationGeneric.inc:495
+#: plugins/admin/systems/class_workstationGeneric.inc:491
+#: plugins/admin/systems/class_workstationGeneric.inc:517
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic with dn '%s' failed."
  msgstr "Stampante"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:505
+#: plugins/admin/systems/class_workstationGeneric.inc:527
  #, fuzzy
  msgid "Workstation generic"
  msgstr "Mostra workstation"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:814
+#: plugins/admin/systems/class_workstationGeneric.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:999
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/admin/ogroups/class_ogroupManagement.inc:352
  #: plugins/generic/references/class_reference.inc:48
  msgid "Workstation"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:518
-#: plugins/admin/ogroups/class_termgroup.inc:394
+#: plugins/admin/systems/class_workstationGeneric.inc:540
+#: plugins/admin/ogroups/class_termgroup.inc:393
  #, fuzzy
  msgid "Ntp server"
  msgstr "Servizi"
@@ -8822,102 +8570,123 @@ msgstr "Servizi"
  msgid "Systems"
  msgstr "Sistemi"
  
-#: plugins/admin/systems/class_systemManagement.inc:222
+#: plugins/admin/systems/class_systemManagement.inc:191
+msgid "Creating the image failed. Please see the report below."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:200
+#, php-format
+msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:257
+#, fuzzy
+msgid "You are not allowed to create a new object of this type."
+msgstr "Non hai il permesso di cambiare la tua password."
+
+#: plugins/admin/systems/class_systemManagement.inc:308
  msgid "You can't edit this object type yet!"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:247
+#: plugins/admin/systems/class_systemManagement.inc:336
+#: plugins/admin/systems/class_systemManagement.inc:402
+#, fuzzy
+msgid "You are not allowed to change the password for this object."
+msgstr "Non hai il permesso di cambiare la tua password."
+
+#: plugins/admin/systems/class_systemManagement.inc:348
  msgid "Passwords entered as new and repeated do not match!"
  msgstr "Le password nuova e ripetuta non corrispondono"
  
-#: plugins/admin/systems/class_systemManagement.inc:264
-msgid "You are not allowed to set this systems password!"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:405
+#, fuzzy
+msgid "Can't detect object to change password."
+msgstr "Cambia la password"
  
-#: plugins/admin/systems/class_systemManagement.inc:318
+#: plugins/admin/systems/class_systemManagement.inc:467
  #, php-format
  msgid "You're about to delete all information about the component at '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:324
-#: plugins/admin/systems/class_systemManagement.inc:385
+#: plugins/admin/systems/class_systemManagement.inc:473
+#: plugins/admin/systems/class_systemManagement.inc:533
  #: plugins/admin/fai/class_faiManagement.inc:168
  #: plugins/admin/fai/class_faiManagement.inc:221
  msgid "You are not allowed to delete this component!"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:837
  msgid "New terminal"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:654
+#: plugins/admin/systems/class_systemManagement.inc:839
  msgid "New workstation"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:656
+#: plugins/admin/systems/class_systemManagement.inc:841
  #, fuzzy
  msgid "New Device"
  msgstr "Mostra dispositiva di rete"
  
-#: plugins/admin/systems/class_systemManagement.inc:675
+#: plugins/admin/systems/class_systemManagement.inc:860
  #, fuzzy
  msgid "Terminal template for"
  msgstr "Terminal Server"
  
-#: plugins/admin/systems/class_systemManagement.inc:691
+#: plugins/admin/systems/class_systemManagement.inc:876
  msgid "Workstation template for"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:811
+#: plugins/admin/systems/class_systemManagement.inc:996
  #, fuzzy
  msgid "New System from incoming"
  msgstr "Informazioni organizzazione"
  
-#: plugins/admin/systems/class_systemManagement.inc:815
+#: plugins/admin/systems/class_systemManagement.inc:1000
  msgid "Workstation is installing"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:816
+#: plugins/admin/systems/class_systemManagement.inc:1001
  msgid "Workstation is waiting for action"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:817
+#: plugins/admin/systems/class_systemManagement.inc:1002
  #, fuzzy
  msgid "Workstation installation failed"
  msgstr "Mostra workstation"
  
-#: plugins/admin/systems/class_systemManagement.inc:820
+#: plugins/admin/systems/class_systemManagement.inc:1005
  msgid "Server is installing"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:821
+#: plugins/admin/systems/class_systemManagement.inc:1006
  #, fuzzy
  msgid "Server is waiting for action"
  msgstr "Informazioni generali"
  
-#: plugins/admin/systems/class_systemManagement.inc:822
+#: plugins/admin/systems/class_systemManagement.inc:1007
  #, fuzzy
  msgid "Server installation failed"
  msgstr "Opzioni applicazione"
  
-#: plugins/admin/systems/class_systemManagement.inc:823
+#: plugins/admin/systems/class_systemManagement.inc:1008
  #, fuzzy
  msgid "Winstation"
  msgstr "Amministrazione"
  
-#: plugins/admin/systems/class_systemManagement.inc:824
+#: plugins/admin/systems/class_systemManagement.inc:1009
  #, fuzzy
  msgid "Network Device"
  msgstr "Mostra dispositiva di rete"
  
-#: plugins/admin/systems/class_systemManagement.inc:825
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_systemManagement.inc:1010
+#: plugins/admin/systems/class_divListSystem.inc:148
  #, fuzzy
  msgid "New Terminal"
  msgstr "Terminali"
  
-#: plugins/admin/systems/class_systemManagement.inc:826
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_systemManagement.inc:1011
+#: plugins/admin/systems/class_divListSystem.inc:154
  #, fuzzy
  msgid "New Workstation"
  msgstr "Mostra workstation"
@@ -9029,9 +8798,9 @@ msgid "Accept mail from other domains over non-authenticated SMTP"
  msgstr ""
  
  #: plugins/admin/systems/class_servDNS.inc:34
-#: plugins/admin/systems/class_servDNS.inc:353
-#: plugins/admin/systems/class_servDNS.inc:382
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:355
+#: plugins/admin/systems/class_servDNS.inc:384
+#: plugins/admin/systems/class_servDNS.inc:385
  #, fuzzy
  msgid "DNS service"
  msgstr "Mostra dispositiva di rete"
@@ -9059,7 +8828,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/systems/class_servDNS.inc:167
-#: plugins/admin/systems/class_servDNS.inc:392
+#: plugins/admin/systems/class_servDNS.inc:394
  #, fuzzy
  msgid "Reverse zone"
  msgstr "Riferimenti"
@@ -9070,46 +8839,46 @@ msgstr "Riferimenti"
  msgid "Class"
  msgstr "classe"
  
-#: plugins/admin/systems/class_servDNS.inc:231
+#: plugins/admin/systems/class_servDNS.inc:233
  #, php-format
  msgid ""
  "Can't delete the selected zone, because it is still in use by these entry/"
  "entries '%s'"
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:290
+#: plugins/admin/systems/class_servDNS.inc:292
  #, php-format
  msgid "Updating of system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:299
+#: plugins/admin/systems/class_servDNS.inc:301
  #, fuzzy, php-format
  msgid "Removing of system server/dns with dn '%s' failed."
  msgstr "Imposta dipartimento"
  
-#: plugins/admin/systems/class_servDNS.inc:320
+#: plugins/admin/systems/class_servDNS.inc:322
  #, fuzzy, php-format
  msgid "Saving of system server/dns with dn '%s' failed."
  msgstr "Opzioni di posta dell'identità"
  
-#: plugins/admin/systems/class_servDNS.inc:344
+#: plugins/admin/systems/class_servDNS.inc:346
  #, php-format
  msgid "Set status flag for system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:391
-#: plugins/admin/systems/class_termDNS.inc:541
+#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_termDNS.inc:546
  #: plugins/admin/systems/servdnseditzone.tpl:7
  #, fuzzy
  msgid "Zone name"
  msgstr "Nome comune"
  
-#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_servDNS.inc:395
  #, fuzzy
  msgid "Primary dns server"
  msgstr "server"
  
-#: plugins/admin/systems/class_servDNS.inc:397
+#: plugins/admin/systems/class_servDNS.inc:399
  #: plugins/admin/systems/servdnseditzone.tpl:73
  #: plugins/admin/ogroups/phonequeue.tpl:70
  #: plugins/admin/ogroups/class_phonequeue.inc:751
@@ -9117,13 +8886,13 @@ msgstr "server"
  msgid "Retry"
  msgstr "Riprova"
  
-#: plugins/admin/systems/class_servDNS.inc:398
+#: plugins/admin/systems/class_servDNS.inc:400
  #: plugins/admin/systems/servdnseditzone.tpl:79
  #, fuzzy
  msgid "Expire"
  msgstr "Esporta"
  
-#: plugins/admin/systems/class_servDNS.inc:400
+#: plugins/admin/systems/class_servDNS.inc:402
  #: plugins/admin/systems/servdnseditzone.tpl:24
  #, fuzzy
  msgid "Zone records"
@@ -9325,39 +9094,39 @@ msgstr ""
  msgid "kolabFreeBusyFuture"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:110
+#: plugins/admin/systems/class_printGeneric.inc:111
  #, php-format
  msgid "Can't extract a valid base out of object dn, setting base to '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:257
-#: plugins/admin/systems/class_printGeneric.inc:265
-#: plugins/admin/systems/class_printGeneric.inc:270
-#: plugins/admin/systems/class_printGeneric.inc:327
-#: plugins/admin/systems/class_printGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:260
+#: plugins/admin/systems/class_printGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:273
+#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:341
  msgid "Add printer extension"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:258
+#: plugins/admin/systems/class_printGeneric.inc:261
  msgid ""
  "Could not intialize printer tab, parameter parent was missing while "
  "construction."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:266
+#: plugins/admin/systems/class_printGeneric.inc:269
  msgid "This is a workstation template, printer tab is disabled."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:271
+#: plugins/admin/systems/class_printGeneric.inc:274
  msgid "This is a terminal template, printer tab is disabled."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:320
+#: plugins/admin/systems/class_printGeneric.inc:315
  msgid "This 'dn' has no printer features."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:328
+#: plugins/admin/systems/class_printGeneric.inc:323
  #, fuzzy
  msgid ""
  "This object has printer extension disabled. You can't enable it while 'cn' "
@@ -9365,118 +9134,118 @@ msgid ""
  "template"
  msgstr "Questa identità non possiede estensioni di posta."
  
-#: plugins/admin/systems/class_printGeneric.inc:335
-#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:330
+#: plugins/admin/systems/class_printGeneric.inc:333
  #, fuzzy
  msgid "Remove printer extension"
  msgstr "Elimina foto"
  
-#: plugins/admin/systems/class_printGeneric.inc:336
+#: plugins/admin/systems/class_printGeneric.inc:331
  #, 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:339
+#: plugins/admin/systems/class_printGeneric.inc:334
  #, 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:344
+#: plugins/admin/systems/class_printGeneric.inc:339
  #, 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:347
+#: plugins/admin/systems/class_printGeneric.inc:342
  #, 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:510
+#: plugins/admin/systems/class_printGeneric.inc:511
  #, php-format
  msgid "Your currently selected PPD file '%s' doesn't exist."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:518
+#: plugins/admin/systems/class_printGeneric.inc:519
  #, fuzzy
  msgid "can't get ppd informations."
  msgstr "Informazioni organizzazione"
  
-#: plugins/admin/systems/class_printGeneric.inc:531
+#: plugins/admin/systems/class_printGeneric.inc:532
  #, php-format
  msgid "This printer belongs to terminal %s. You can't rename this printer."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:533
+#: plugins/admin/systems/class_printGeneric.inc:534
  #, php-format
  msgid "This printer belongs to workstation %s. You can't rename this printer."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:588
+#: plugins/admin/systems/class_printGeneric.inc:589
  #, fuzzy, php-format
  msgid "Removing of system print/generic with dn '%s' failed."
  msgstr "Imposta dipartimento"
  
-#: plugins/admin/systems/class_printGeneric.inc:814
+#: plugins/admin/systems/class_printGeneric.inc:818
  #, php-format
  msgid "Saving of system print/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:837
-#: plugins/admin/systems/class_printGeneric.inc:839
-#: plugins/admin/ogroups/class_ogroupManagement.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:841
+#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
  #: plugins/admin/fai/faiTemplateEntry.tpl:85
  #: plugins/admin/fai/faiTemplateEntry.tpl:127
  #: plugins/generic/references/class_reference.inc:36
  msgid "Group"
  msgstr "Gruppo"
  
-#: plugins/admin/systems/class_printGeneric.inc:855
+#: plugins/admin/systems/class_printGeneric.inc:859
  #, fuzzy
  msgid "Print generic"
  msgstr "Stampante"
  
-#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_printGeneric.inc:871
  msgid "LabeledURL"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_printGeneric.inc:872
  #, fuzzy
  msgid "Printer PPD"
  msgstr "Stampante"
  
-#: plugins/admin/systems/class_printGeneric.inc:885
+#: plugins/admin/systems/class_printGeneric.inc:889
  #, php-format
  msgid ""
  "You are not allowed to remove the given object '%s' from the list of members "
  "of printer '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:902
+#: plugins/admin/systems/class_printGeneric.inc:906
  #, php-format
  msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:907
+#: plugins/admin/systems/class_printGeneric.inc:911
  #, php-format
  msgid ""
  "You are not allowed to add the given object '%s' to the list of members of '%"
  "s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:942
+#: plugins/admin/systems/class_printGeneric.inc:946
  #, php-format
  msgid "Can't add '%s' to the list of members, it is already used."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:953
+#: plugins/admin/systems/class_printGeneric.inc:957
  #, php-format
  msgid "Can't add '%s' to list of members, it is not reachable."
  msgstr ""
@@ -9500,59 +9269,71 @@ msgstr ""
  msgid "Changing the password impinges on authentification only."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:127
+#: plugins/admin/systems/class_componentGeneric.inc:125
  #, fuzzy, php-format
  msgid "Removing of system component/generic with dn '%s' failed."
  msgstr "Imposta dipartimento"
  
-#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_componentGeneric.inc:172
  #, fuzzy
  msgid "The required field 'Component name' is not set."
  msgstr "Il campo necessario 'Home directory' non è vuoto"
  
-#: plugins/admin/systems/class_componentGeneric.inc:170
-#: plugins/admin/systems/class_phoneGeneric.inc:307
+#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_phoneGeneric.inc:317
  #, fuzzy
  msgid "The required field IP address is empty."
  msgstr "Il campo 'Indirizzo principale' non è stao inserito"
  
-#: plugins/admin/systems/class_componentGeneric.inc:173
-#: plugins/admin/systems/class_phoneGeneric.inc:310
+#: plugins/admin/systems/class_componentGeneric.inc:180
+#: plugins/admin/systems/class_phoneGeneric.inc:320
  #, fuzzy
  msgid "The field IP address contains an invalid address."
  msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
  
-#: plugins/admin/systems/class_componentGeneric.inc:247
+#: plugins/admin/systems/class_componentGeneric.inc:249
  #, php-format
  msgid "Saving of system component/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:258
+#: plugins/admin/systems/class_componentGeneric.inc:260
  msgid "Component generic"
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:263
+#: plugins/admin/systems/class_componentGeneric.inc:265
  #, fuzzy
  msgid "Network device"
  msgstr "Mostra dispositiva di rete"
  
-#: plugins/admin/systems/goNtpServer.tpl:2
-#, fuzzy
-msgid "Time server"
-msgstr "Server"
-
  #: plugins/admin/systems/goKrbServer.tpl:1
  msgid "Kerberos kadmin access"
  msgstr ""
  
-#: plugins/admin/systems/goKrbServer.tpl:4
-msgid "Kerberos Realm"
+#: plugins/admin/systems/goKrbServer.tpl:4
+msgid "Kerberos Realm"
+msgstr ""
+
+#: plugins/admin/systems/goKrbServer.tpl:12
+#: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goImapServer.inc:171
+msgid "Admin user"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:1
+#, fuzzy
+msgid "VoIP database information"
+msgstr "Informazioni personali"
+
+#: plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:20
+msgid "Country dial prefix"
  msgstr ""
  
-#: plugins/admin/systems/goKrbServer.tpl:12
-#: plugins/admin/systems/goImapServer.tpl:25
-#: plugins/admin/systems/class_goImapServer.inc:171
-msgid "Admin user"
+#: plugins/admin/systems/goFonServer.tpl:28
+msgid "Local dial prefix"
  msgstr ""
  
  #: plugins/admin/systems/chooser.tpl:1
@@ -9627,21 +9408,13 @@ msgstr "Home Page"
  msgid "Option"
  msgstr "Opzioni"
  
-#: plugins/admin/systems/goFonServer.tpl:1
+#: plugins/admin/systems/goFaxServer.tpl:1
  #, fuzzy
-msgid "VoIP database information"
-msgstr "Informazioni personali"
-
-#: plugins/admin/systems/goFonServer.tpl:4
-msgid "Asterisk DB user"
-msgstr ""
-
-#: plugins/admin/systems/goFonServer.tpl:20
-msgid "Country dial prefix"
-msgstr ""
+msgid "FAX database information"
+msgstr "Informazioni organizzazione"
  
-#: plugins/admin/systems/goFonServer.tpl:28
-msgid "Local dial prefix"
+#: plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
  msgstr ""
  
  #: plugins/admin/systems/remove_glpi.tpl:10
@@ -9656,13 +9429,13 @@ msgid "This 'dn' has no phone features."
  msgstr ""
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  #, fuzzy
  msgid "yes"
  msgstr "Sistemi"
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  #, fuzzy
  msgid "no"
  msgstr "nessuno"
@@ -9688,97 +9461,93 @@ msgstr ""
  msgid "Removing of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:315
+#: plugins/admin/systems/class_phoneGeneric.inc:325
  #, fuzzy
  msgid "The required field 'Phone name' is not set."
  msgstr "Il campo necessario 'Home directory' non è vuoto"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:318
+#: plugins/admin/systems/class_phoneGeneric.inc:328
  msgid "The 'Phone name' '0' is reserved and cannot be used."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:323
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:413
+#: plugins/admin/systems/class_phoneGeneric.inc:418
  #, php-format
  msgid "Saving of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:426
+#: plugins/admin/systems/class_phoneGeneric.inc:431
  #, fuzzy
  msgid "Phone generic"
  msgstr "Numero di telefono"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:431
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
  #, fuzzy
  msgid "Phone hardware"
  msgstr "Dispositivo telefonico"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/admin/systems/class_phoneGeneric.inc:442
  msgid "SIP Mode"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:437
+#: plugins/admin/systems/class_phoneGeneric.inc:443
  msgid "SIP DTMF mode"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:438
+#: plugins/admin/systems/class_phoneGeneric.inc:444
  #, fuzzy
  msgid "SIP Default ip"
  msgstr "Stampante predefinita"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_phoneGeneric.inc:445
  msgid "SIP Qualify"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_phoneGeneric.inc:446
  #, fuzzy
  msgid "IAX authentication type"
  msgstr "Destinazione"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:441
+#: plugins/admin/systems/class_phoneGeneric.inc:447
  #, fuzzy
  msgid "IAX secret"
  msgstr "server"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:442
+#: plugins/admin/systems/class_phoneGeneric.inc:448
  #, fuzzy
  msgid "IAX account code"
  msgstr "Sicurezza"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:443
+#: plugins/admin/systems/class_phoneGeneric.inc:449
  msgid "IAX trunk lines"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:444
+#: plugins/admin/systems/class_phoneGeneric.inc:450
  #, fuzzy
  msgid "IAX permit settings"
  msgstr "Impostazioni FAX"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:445
+#: plugins/admin/systems/class_phoneGeneric.inc:451
  #, fuzzy
  msgid "IAX deny settings"
  msgstr "Impostazioni FAX"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:446
+#: plugins/admin/systems/class_phoneGeneric.inc:452
  msgid "CAPI MSN"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:447
+#: plugins/admin/systems/class_phoneGeneric.inc:453
  msgid "Hardware type"
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#, php-format
+msgid "The file '%s/encodings' does not exist, can't get supported charsets."
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:49
-#, fuzzy
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#, fuzzy, php-format
+msgid "Can't read '%s/encodings', please check permissions."
  msgstr "Rimuovi"
  
  #: plugins/admin/systems/class_servNfs.inc:178
@@ -9816,35 +9585,35 @@ msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
  msgid "Option contains invalid characters."
  msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
  
-#: plugins/admin/systems/class_workstationStartup.inc:402
+#: plugins/admin/systems/class_workstationStartup.inc:429
  msgid ""
  "There are packages in your configuration, which can't be resolved with "
  "current server/release settings."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:447
+#: plugins/admin/systems/class_workstationStartup.inc:474
  #, fuzzy
  msgid "Please select a 'FAI server' or remove the 'FAI classes'."
  msgstr "Prego inserire un numero di telefono valido!"
  
-#: plugins/admin/systems/class_workstationStartup.inc:509
+#: plugins/admin/systems/class_workstationStartup.inc:537
  msgid ""
  "There is already a profile in your selection that contain partition table "
  "configurations."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:721
+#: plugins/admin/systems/class_workstationStartup.inc:754
  msgid "Not available in current setup"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:897
  #, php-format
  msgid ""
  "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
  "Server was reset to 'auto'."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:879
+#: plugins/admin/systems/class_workstationStartup.inc:913
  #, php-format
  msgid ""
  "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9852,18 +9621,18 @@ msgid ""
  "reset to 'auto'."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1040
+#: plugins/admin/systems/class_workstationStartup.inc:1085
  #, fuzzy, php-format
  msgid "Saving of system workstation/startup with dn '%s' failed."
  msgstr "Mostra workstation"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1090
+#: plugins/admin/systems/class_workstationStartup.inc:1135
  #, fuzzy, php-format
  msgid ""
  "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
  msgstr "Impossibile connettersi al server del database!"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/class_workstationStartup.inc:1137
  #: plugins/admin/systems/class_servRepositorySetup.inc:203
  #, php-format
  msgid ""
@@ -9871,28 +9640,28 @@ msgid ""
  "empty string."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1155
  #, fuzzy
  msgid "System startup"
  msgstr "Accesso ai sistemi"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: plugins/admin/systems/class_workstationStartup.inc:1170
  #: plugins/admin/fai/class_faiProfile.inc:453
  #: plugins/admin/fai/faiProfile.tpl:36
  #, fuzzy
  msgid "FAI classes"
  msgstr "Scegli il tuo numero di telefono personale"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1126
+#: plugins/admin/systems/class_workstationStartup.inc:1171
  msgid "Debian mirror"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1127
+#: plugins/admin/systems/class_workstationStartup.inc:1172
  #, fuzzy
  msgid "Debian release"
  msgstr "Password attuale"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1129
+#: plugins/admin/systems/class_workstationStartup.inc:1174
  msgid "FAI status flag"
  msgstr ""
  
@@ -10070,14 +9839,14 @@ msgstr "Azione"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:462
  #: plugins/admin/systems/class_printerPPDDialog.inc:465
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:289
  #, fuzzy
  msgid "True"
  msgstr "Futuro"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:463
  #: plugins/admin/systems/class_printerPPDDialog.inc:466
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:286
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:287
  #, fuzzy
  msgid "False"
  msgstr "femmina"
@@ -10087,7 +9856,23 @@ msgstr "femmina"
  msgid "Unsupported ppd type '%s' used for '%s' "
  msgstr ""
  
-#: plugins/admin/systems/class_printerPPDDialog.inc:485
+#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#, fuzzy, php-format
+msgid "Removing old ppd file '%s' failed."
+msgstr "Mostra gruppi di applicazioni"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#, php-format
+msgid "Removing old ppd file '%s' failed. File is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#, php-format
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:502
  msgid ""
  "Please select a valid ppd file or use 'Cancel' to go back to printer "
  "configuration."
@@ -10101,7 +9886,7 @@ msgstr "Stampante"
  #: plugins/admin/systems/printerPPDDialog.tpl:5
  #: plugins/admin/systems/workstationService.tpl:7
  #: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:246
+#: plugins/admin/systems/terminalService.tpl:254
  #: plugins/admin/systems/class_glpiAccount.inc:784
  msgid "Model"
  msgstr ""
@@ -10138,31 +9923,195 @@ msgstr ""
  msgid "Regular expression for matching object names"
  msgstr ""
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#, fuzzy, php-format
+msgid "You're about to delete the ppd file '%s' at '%s'."
+msgstr "Non hai il permesso di cambiare la tua password."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#, fuzzy, php-format
+msgid "Could not found specified ppd file '%s'."
+msgstr "Impossibile aprite il certificato selezionato!"
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+msgid ""
+"Something went wrong while trying to remove the ppd file from server, "
+"possibly we have no write access."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
  #, php-format
  msgid "Selected vendor '%s' does not exists in our list of ppds."
  msgstr ""
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
  #, fuzzy
  msgid "Printer ppd selection."
  msgstr "Impostazioni Unix"
  
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:157
+#: plugins/admin/systems/class_terminalService.inc:71
+msgid "unknown"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_terminalService.inc:105
+#: plugins/admin/systems/class_terminalService.inc:106
+#, fuzzy
+msgid "bit"
+msgstr "scrivere"
+
+#: plugins/admin/systems/class_workstationService.inc:138
+#: plugins/admin/systems/class_terminalService.inc:158
+msgid "show chooser"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:139
+#: plugins/admin/systems/class_terminalService.inc:159
+msgid "direct"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:142
+#: plugins/admin/systems/class_terminalService.inc:162
+msgid "load balanced"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:145
+#: plugins/admin/systems/class_terminalService.inc:165
+msgid "Windows RDP"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:146
+#: plugins/admin/systems/class_terminalService.inc:166
+msgid "ICA client"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_terminalService.inc:221
+#, fuzzy
+msgid "Bit"
+msgstr "scrivere"
+
+#: plugins/admin/systems/class_workstationService.inc:314
+#: plugins/admin/systems/class_terminalService.inc:316
+msgid "Choose the phone located at the current terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:380
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_terminalService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:395
+msgid "Please specify a valid VSync range."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:395
+#: plugins/admin/systems/class_workstationService.inc:400
+#: plugins/admin/systems/class_terminalService.inc:404
+#: plugins/admin/systems/class_terminalService.inc:409
+msgid "Please specify a valid HSync range."
+msgstr ""
+
  #: plugins/admin/systems/class_workstationService.inc:443
  #, fuzzy, php-format
  msgid "Saving of system workstation/service with dn '%s' failed."
  msgstr "Stampante"
  
+#: plugins/admin/systems/class_workstationService.inc:451
+#: plugins/admin/systems/class_terminalService.inc:466
+#, fuzzy
+msgid "Service"
+msgstr "Servizi"
+
  #: plugins/admin/systems/class_workstationService.inc:452
  #, fuzzy
  msgid "Workstation service"
  msgstr "server"
  
+#: plugins/admin/systems/class_workstationService.inc:460
+#: plugins/admin/systems/class_terminalService.inc:475
+#, fuzzy
+msgid "Monitor"
+msgstr "Dimensione quota"
+
+#: plugins/admin/systems/class_workstationService.inc:461
+#: plugins/admin/systems/class_terminalService.inc:479
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Server"
+
+#: plugins/admin/systems/class_workstationService.inc:462
+#: plugins/admin/systems/class_terminalService.inc:480
+msgid "Gfx resolution"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:463
+#: plugins/admin/systems/class_terminalService.inc:481
+msgid "Gfx color depth"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:464
+#: plugins/admin/systems/class_terminalService.inc:482
+msgid "Hsync"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:465
+#: plugins/admin/systems/class_terminalService.inc:483
+msgid "Vsync"
+msgstr ""
+
  #: plugins/admin/systems/class_workstationService.inc:466
  #, fuzzy
  msgid "Use DDC"
  msgstr "Utenti"
  
+#: plugins/admin/systems/class_workstationService.inc:467
+#: plugins/admin/systems/class_terminalService.inc:487
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "disabilitato"
+
+#: plugins/admin/systems/class_workstationService.inc:468
+#: plugins/admin/systems/class_terminalService.inc:491
+msgid "Keyboard model"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:469
+#: plugins/admin/systems/class_terminalService.inc:492
+msgid "Keyboard layout"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:470
+#: plugins/admin/systems/class_terminalService.inc:493
+msgid "Keyboard variant"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:471
+#: plugins/admin/systems/class_terminalService.inc:494
+#, fuzzy
+msgid "Mouse type"
+msgstr "Tipo"
+
+#: plugins/admin/systems/class_workstationService.inc:472
+#: plugins/admin/systems/class_terminalService.inc:495
+#, fuzzy
+msgid "Mouse port"
+msgstr "Monitoraggio"
+
+#: plugins/admin/systems/class_workstationService.inc:473
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:76
+#: plugins/admin/systems/class_terminalService.inc:496
+#: plugins/gofon/phoneaccount/generic.tpl:30
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Dispositivo telefonico"
+
  #: plugins/admin/systems/workstationService.tpl:4
  #: plugins/admin/systems/terminalService.tpl:4
  msgid "Keyboard"
@@ -10239,41 +10188,42 @@ msgid "Display device"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:167
+#: plugins/admin/systems/terminalService.tpl:147
  msgid "Use DDC for automatic detection"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:170
-#: plugins/admin/systems/terminalService.tpl:142
+#: plugins/admin/systems/terminalService.tpl:150
  msgid "HSync"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:175
-#: plugins/admin/systems/terminalService.tpl:146
+#: plugins/admin/systems/terminalService.tpl:154
  msgid "Horizontal refresh frequency for installed monitor"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:181
-#: plugins/admin/systems/terminalService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:158
  msgid "VSync"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:186
-#: plugins/admin/systems/terminalService.tpl:154
+#: plugins/admin/systems/terminalService.tpl:162
  msgid "Vertical refresh frequency for installed monitor"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:201
-#: plugins/admin/systems/terminalService.tpl:237
+#: plugins/admin/systems/terminalService.tpl:245
  msgid "Scan device"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:204
-#: plugins/admin/systems/terminalService.tpl:239
+#: plugins/admin/systems/terminalService.tpl:247
  msgid "Select to start SANE scan service on terminal"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:207
-#: plugins/admin/systems/terminalService.tpl:241
+#: plugins/admin/systems/terminalService.tpl:249
  msgid "Provide scan services"
  msgstr ""
  
@@ -10316,17 +10266,17 @@ msgstr "Scegli il tuo numero di telefono personale"
  msgid "set"
  msgstr "reset"
  
-#: plugins/admin/systems/workstationStartup.tpl:137
+#: plugins/admin/systems/workstationStartup.tpl:141
  #: plugins/admin/systems/terminalStartup.tpl:66
  msgid "Kernel modules (format: name parameters)"
  msgstr ""
  
-#: plugins/admin/systems/workstationStartup.tpl:140
+#: plugins/admin/systems/workstationStartup.tpl:144
  #: plugins/admin/systems/terminalStartup.tpl:69
  msgid "Add additional modules to load on startup"
  msgstr ""
  
-#: plugins/admin/systems/workstationStartup.tpl:176
+#: plugins/admin/systems/workstationStartup.tpl:180
  #: plugins/admin/systems/terminalStartup.tpl:105
  #, fuzzy
  msgid "Mountpoint"
@@ -10356,67 +10306,77 @@ msgstr ""
  msgid "use debug mode for startup"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:169
+#: plugins/admin/systems/terminalService.tpl:173
+#: plugins/admin/systems/class_terminalService.inc:477
+msgid "Remote desktop"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:177
  msgid "Connect method"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:172
+#: plugins/admin/systems/terminalService.tpl:180
  msgid "Choose method to connect to terminal server"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:180
+#: plugins/admin/systems/terminalService.tpl:188
  msgid "Terminal server"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:183
+#: plugins/admin/systems/terminalService.tpl:191
  msgid "Select specific terminal server to use"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:191
+#: plugins/admin/systems/terminalService.tpl:199
  msgid "Font server"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:194
+#: plugins/admin/systems/terminalService.tpl:202
  msgid "Select specific font server to use"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:211
+#: plugins/admin/systems/terminalService.tpl:219
  msgid "Print device"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:213
+#: plugins/admin/systems/terminalService.tpl:221
  msgid "Select to start IPP based printing service on terminal"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:215
+#: plugins/admin/systems/terminalService.tpl:223
  msgid "Provide print services"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:224
+#: plugins/admin/systems/terminalService.tpl:229
+#: plugins/admin/systems/class_terminalService.inc:486
+msgid "Spool server"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:232
  msgid "Select NFS filesystem to place spool files on"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:249
+#: plugins/admin/systems/terminalService.tpl:257
  msgid "Select scanner driver to use"
  msgstr ""
  
  #: plugins/admin/systems/servRepositorySetup.tpl:1
-#: plugins/admin/systems/class_servRepository.inc:349
+#: plugins/admin/systems/class_servRepository.inc:365
  #: plugins/admin/fai/faiPackage.tpl:33
  #, fuzzy
  msgid "Repository"
  msgstr "Riprova"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:364
+#: plugins/admin/systems/class_servRepository.inc:380
  #, fuzzy
  msgid "Parent server"
  msgstr "server"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:39
-#: plugins/admin/systems/class_servRepository.inc:239
-#: plugins/admin/systems/class_servRepository.inc:262
-#: plugins/admin/systems/class_servRepository.inc:363
+#: plugins/admin/systems/class_servRepository.inc:253
+#: plugins/admin/systems/class_servRepository.inc:276
+#: plugins/admin/systems/class_servRepository.inc:379
  #, fuzzy
  msgid "Sections"
  msgstr "Azione"
@@ -10437,34 +10397,39 @@ msgid ""
  "Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
  msgstr "Impossibile connettersi al server del database!"
  
-#: plugins/admin/systems/class_servRepository.inc:35
-#: plugins/admin/systems/class_servRepository.inc:339
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:44
+#: plugins/admin/systems/class_servRepository.inc:355
+#: plugins/admin/systems/class_servRepository.inc:366
  #, fuzzy
  msgid "Repository service"
  msgstr "server"
  
-#: plugins/admin/systems/class_servRepository.inc:138
+#: plugins/admin/systems/class_servRepository.inc:94
+#: plugins/admin/fai/class_faiSummaryTab.inc:175
+msgid "You can't use this plugin until FAI is activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:152
  #, php-format
  msgid ""
  "You can't delete this release, it is still used by these workstations [%s]. "
  "Please solve this dependencies first, to keep data base consistency."
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:172
+#: plugins/admin/systems/class_servRepository.inc:186
  #, php-format
  msgid ""
  "Be careful editing this release, it is still used by these workstations [%s]."
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:212
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
  #: plugins/admin/fai/class_faiManagement.inc:343
  #, fuzzy
  msgid "This name is already in use."
  msgstr "L'indirizzo principale inserito è già in uso."
  
-#: plugins/admin/systems/class_servRepository.inc:359
+#: plugins/admin/systems/class_servRepository.inc:375
  #: plugins/admin/systems/class_goGlpiServer.inc:92
  #: plugins/admin/systems/class_goCupsServer.inc:71
  #: plugins/admin/systems/class_serverService.inc:8
@@ -10476,7 +10441,7 @@ msgstr "L'indirizzo principale inserito è già in uso."
  msgid "Start"
  msgstr "Avvio"
  
-#: plugins/admin/systems/class_servRepository.inc:360
+#: plugins/admin/systems/class_servRepository.inc:376
  #: plugins/admin/systems/class_goGlpiServer.inc:93
  #: plugins/admin/systems/class_goCupsServer.inc:72
  #: plugins/admin/systems/class_serverService.inc:7
@@ -10488,7 +10453,7 @@ msgstr "Avvio"
  msgid "Stop"
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:361
+#: plugins/admin/systems/class_servRepository.inc:377
  #: plugins/admin/systems/class_goGlpiServer.inc:94
  #: plugins/admin/systems/class_goCupsServer.inc:73
  #: plugins/admin/systems/class_serverService.inc:9
@@ -10500,12 +10465,12 @@ msgstr ""
  msgid "Restart"
  msgstr "Riprova"
  
-#: plugins/admin/systems/class_servRepository.inc:362
+#: plugins/admin/systems/class_servRepository.inc:378
  #, fuzzy
  msgid "Releases"
  msgstr "Rimuovi"
  
-#: plugins/admin/systems/class_servRepository.inc:365
+#: plugins/admin/systems/class_servRepository.inc:381
  msgid "Url"
  msgstr ""
  
@@ -10608,13 +10573,8 @@ msgstr "Espressioni regolare per selezionare il nome del gruppo"
  msgid "Use"
  msgstr "Utenti"
  
-#: plugins/admin/systems/goFaxServer.tpl:1
-#, fuzzy
-msgid "FAX database information"
-msgstr "Informazioni organizzazione"
-
-#: plugins/admin/systems/goFaxServer.tpl:4
-msgid "FAX DB user"
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
  msgstr ""
  
  #: plugins/admin/systems/class_glpiAccount.inc:147
@@ -10741,7 +10701,7 @@ msgid "Attachment"
  msgstr "Argomenti"
  
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:136
  msgid "File"
  msgstr ""
  
@@ -10760,6 +10720,37 @@ msgstr "Tipo"
  msgid "use"
  msgstr "utenti"
  
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+msgid "Go to root department"
+msgstr "Vai al dipartimento base"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:194
+msgid "Go up one department"
+msgstr "Sali di dipartimento"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+msgid "Go to users department"
+msgstr "Vai agli utenti del dipartimento"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+#: include/class_MultiSelectWindow.inc:204
+msgid "Home"
+msgstr "Home"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: include/class_MultiSelectWindow.inc:209
+msgid "Reload list"
+msgstr ""
+
  #: plugins/admin/systems/glpiSelectUser.tpl:23
  msgid ""
  "This dialog allows you to select a user as technical responsible person."
@@ -10917,7 +10908,7 @@ msgid "Add/Edit network interface"
  msgstr "Mostra stampanti di rete"
  
  #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:532
+#: plugins/admin/systems/class_termDNS.inc:537
  #, fuzzy
  msgid "MAC address"
  msgstr "Indirizzo principale"
@@ -11009,7 +11000,7 @@ msgid "New processor"
  msgstr "Nuova password"
  
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "P"
  msgstr ""
  
@@ -11158,7 +11149,8 @@ msgid "Upload wasn't successfull."
  msgstr ""
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
  msgstr ""
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:138
@@ -11322,75 +11314,75 @@ msgstr ""
  msgid "Cartridges"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:137
  #, fuzzy, php-format
  msgid ""
  "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
  msgstr "Impossibile connettersi al server del database!"
  
-#: plugins/admin/systems/class_termDNS.inc:311
+#: plugins/admin/systems/class_termDNS.inc:319
  #, fuzzy
  msgid "The required field 'IP-address' is not set."
  msgstr "Il campo 'Indirizzo principale' non è stao inserito"
  
-#: plugins/admin/systems/class_termDNS.inc:318
+#: plugins/admin/systems/class_termDNS.inc:323
  msgid "Wrong IP format in field IP-address."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:324
+#: plugins/admin/systems/class_termDNS.inc:330
  #, fuzzy
  msgid "The required field 'MAC-address' is not set."
  msgstr "Il campo 'Indirizzo principale' non è stao inserito"
  
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_termDNS.inc:333
  msgid ""
  "The given macaddress is invalid. There must be 6 2byte segments seperated by "
  "':'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:351
+#: plugins/admin/systems/class_termDNS.inc:353
  #, php-format
  msgid "Found duplicate value for record type '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:359
+#: plugins/admin/systems/class_termDNS.inc:361
  #, php-format
  msgid "Found more than one entry for the uniqe record type '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:370
+#: plugins/admin/systems/class_termDNS.inc:372
  #, php-format
  msgid ""
  "The device IP '%s' is added as 'A Record', this will be done automatically, "
  "please remove the record."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:377
+#: plugins/admin/systems/class_termDNS.inc:379
  #: plugins/admin/systems/class_servDNSeditZone.inc:409
  #, php-format
  msgid "Only lowercase is allowed, please check your '%ss'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:463
  #, fuzzy, php-format
  msgid "Saving of terminal/dns account with dn '%s' failed."
  msgstr "Rimuovi le estensioni di posta"
  
-#: plugins/admin/systems/class_termDNS.inc:522
+#: plugins/admin/systems/class_termDNS.inc:527
  msgid "DNS"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:528
  #, fuzzy
  msgid "DNS settings"
  msgstr "Impostazioni Samba"
  
-#: plugins/admin/systems/class_termDNS.inc:531
+#: plugins/admin/systems/class_termDNS.inc:536
  #, fuzzy
  msgid "IP address"
  msgstr "Indirizzo principale"
  
-#: plugins/admin/systems/class_termDNS.inc:540
+#: plugins/admin/systems/class_termDNS.inc:545
  #, fuzzy
  msgid "DNS records"
  msgstr "Directory"
@@ -11495,7 +11487,7 @@ msgstr "Gruppo di oggetti"
  
  #: plugins/admin/systems/class_servDNSeditZone.inc:290
  #: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:371
  #, fuzzy
  msgid "Down"
  msgstr "Dominio"
@@ -11587,42 +11579,37 @@ msgid ""
  "our zone editing dialog."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:206
  #, fuzzy, php-format
  msgid "Entry name '%s' contains invalid characters."
  msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
  #, fuzzy, php-format
  msgid "Can not rename '%s' to '%s',the destination name already exists."
  msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:221
  #, fuzzy, php-format
  msgid "Can not create '%s',the destination name already exists."
  msgstr "Il valore specificato come '%s' contiene dei caratteri invalidi!"
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
  #, php-format
  msgid "The name '%s' is used more than once."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
  #, php-format
  msgid "The record type '%s' is a unique type and can't be defined twice."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:260
  #, php-format
  msgid "There is an empty '%s' for host '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:268
  #, php-format
  msgid "There is a duplicate entry in '%s' for '%s'."
  msgstr ""
@@ -11727,111 +11714,107 @@ msgstr "Mostra dispositiva di rete"
  msgid "Display systems of user"
  msgstr "Mostra l'indirizzo dell'utente"
  
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:148
  #, fuzzy
  msgid "New Terminal template"
  msgstr "Terminal Server"
  
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:154
  #, fuzzy
  msgid "New Workstation template"
  msgstr "Mostra workstation"
  
-#: plugins/admin/systems/class_divListSystem.inc:140
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:160
  #, fuzzy
  msgid "New Server"
  msgstr "Server"
  
-#: plugins/admin/systems/class_divListSystem.inc:142
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:166
  #, fuzzy
  msgid "New Printer"
  msgstr "Stampante"
  
-#: plugins/admin/systems/class_divListSystem.inc:144
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:172
  #, fuzzy
  msgid "New Phone"
  msgstr "Telefono"
  
-#: plugins/admin/systems/class_divListSystem.inc:146
-#: plugins/admin/systems/class_divListSystem.inc:147
+#: plugins/admin/systems/class_divListSystem.inc:178
  msgid "New Component"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:165
+#: plugins/admin/systems/class_divListSystem.inc:203
  #, fuzzy
  msgid "Cups Server"
  msgstr "Server"
  
-#: plugins/admin/systems/class_divListSystem.inc:166
+#: plugins/admin/systems/class_divListSystem.inc:204
  msgid "Log Db"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:167
+#: plugins/admin/systems/class_divListSystem.inc:205
  #, fuzzy
  msgid "Syslog Server"
  msgstr "Mostra server"
  
-#: plugins/admin/systems/class_divListSystem.inc:168
+#: plugins/admin/systems/class_divListSystem.inc:206
  #, fuzzy
  msgid "Mail Server"
  msgstr "Server"
  
-#: plugins/admin/systems/class_divListSystem.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:207
  #, fuzzy
  msgid "Imap Server"
  msgstr "Server"
  
-#: plugins/admin/systems/class_divListSystem.inc:170
+#: plugins/admin/systems/class_divListSystem.inc:208
  #, fuzzy
  msgid "Nfs Server"
  msgstr "Server"
  
-#: plugins/admin/systems/class_divListSystem.inc:171
+#: plugins/admin/systems/class_divListSystem.inc:209
  #, fuzzy
  msgid "Kerberos Server"
  msgstr "Kerberos"
  
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:210
  #, fuzzy
  msgid "Asterisk Server"
  msgstr "Terminal Server"
  
-#: plugins/admin/systems/class_divListSystem.inc:173
+#: plugins/admin/systems/class_divListSystem.inc:211
  #, fuzzy
  msgid "Fax Server"
  msgstr "Server"
  
-#: plugins/admin/systems/class_divListSystem.inc:174
+#: plugins/admin/systems/class_divListSystem.inc:212
  #, fuzzy
  msgid "Ldap Server"
  msgstr "Server"
  
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/acl/class_divListACL.inc:123
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/acl/class_divListACL.inc:128
  #, fuzzy
  msgid "Edit system"
  msgstr "Lista dei sistemi"
  
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/acl/class_divListACL.inc:126
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/acl/class_divListACL.inc:132
  #, fuzzy
  msgid "Delete system"
  msgstr "Rimuovi"
  
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_divListSystem.inc:308
  #, fuzzy
  msgid "Set root       password"
  msgstr "Cambia password"
  
-#: plugins/admin/systems/class_divListSystem.inc:229
+#: plugins/admin/systems/class_divListSystem.inc:315
  #, fuzzy
  msgid "Create CD"
  msgstr "Creare"
  
-#: plugins/admin/systems/class_divListSystem.inc:230
+#: plugins/admin/systems/class_divListSystem.inc:316
  #, fuzzy
  msgid "Create FAI CD"
  msgstr "Gruppo di oggetti"
@@ -11861,6 +11844,10 @@ msgstr "L'indirizzo principale inserito è già in uso."
  msgid "Cups"
  msgstr "gruppi"
  
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr ""
+
  #: plugins/admin/systems/goLdapServer.tpl:1
  #: plugins/admin/systems/class_goLdapServer.inc:28
  #, fuzzy
@@ -11961,6 +11948,16 @@ msgstr "Modifica contatto"
  msgid "Remove service"
  msgstr "Elimina contatto"
  
+#: plugins/admin/systems/class_goTerminalServer.inc:31
+#: plugins/admin/systems/class_goTerminalServer.inc:54
+#: plugins/admin/systems/class_goTerminalServer.inc:117
+#: plugins/admin/systems/class_goTerminalServer.inc:118
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#: plugins/admin/systems/class_terminalService.inc:467
+#, fuzzy
+msgid "Terminal service"
+msgstr "Terminal Server"
+
  #: plugins/admin/systems/class_goTerminalServer.inc:78
  #, fuzzy, php-format
  msgid "Saving server services/terminalServer with dn '%s' failed."
@@ -11975,6 +11972,12 @@ msgstr ""
  msgid "Temporary disable login"
  msgstr ""
  
+#: plugins/admin/systems/class_goTerminalServer.inc:127
+#: plugins/admin/systems/goTerminalServer.tpl:12
+#: plugins/admin/systems/class_terminalService.inc:478
+msgid "Font path"
+msgstr ""
+
  #: plugins/admin/systems/class_serverService.inc:288
  msgid "Can't set status while this server is not saved."
  msgstr ""
@@ -12705,6 +12708,43 @@ msgid ""
  "Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
  msgstr ""
  
+#: plugins/admin/systems/class_terminalService.inc:157
+msgid "default"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:457
+#, fuzzy, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr "Informazioni organizzazione"
+
+#: plugins/admin/systems/class_terminalService.inc:476
+#: plugins/admin/ogroups/class_phonequeue.inc:748
+#, fuzzy
+msgid "Method"
+msgstr "metodo"
+
+#: plugins/admin/systems/class_terminalService.inc:484
+msgid "Auto-Sync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:485
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Nome della stampante"
+
+#: plugins/admin/systems/class_terminalService.inc:488
+#, fuzzy
+msgid "Scanner model"
+msgstr "disabilitato"
+
+#: plugins/admin/systems/class_terminalService.inc:489
+msgid "Haeh ? "
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:490
+msgid "..."
+msgstr ""
+
  #: plugins/admin/ogroups/termgroup.tpl:2
  msgid ""
  "Actions you choose here influence all systems in this object group. "
@@ -12726,8 +12766,8 @@ msgstr "Oggetti membri"
  msgid "Phone queue"
  msgstr "Numero di telefono"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:88
-#: plugins/admin/ogroups/class_termgroup.inc:383
+#: plugins/admin/ogroups/tabs_ogroups.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:382
  #, fuzzy
  msgid "System"
  msgstr "Sistemi"
@@ -12736,21 +12776,25 @@ msgstr "Sistemi"
  msgid "Terminals"
  msgstr "Terminali"
  
-#: plugins/admin/ogroups/class_termgroup.inc:114
+#: plugins/admin/ogroups/class_termgroup.inc:108
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_termgroup.inc:113
  msgid "There must be at least one NTP server selected."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:168
+#: plugins/admin/ogroups/class_termgroup.inc:167
  #, php-format
  msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:376
+#: plugins/admin/ogroups/class_termgroup.inc:375
  #, fuzzy
  msgid "Saving workstation failed"
  msgstr "Nome applicazione"
  
-#: plugins/admin/ogroups/class_termgroup.inc:384
+#: plugins/admin/ogroups/class_termgroup.inc:383
  #, fuzzy
  msgid "System group"
  msgstr "Accesso ai sistemi"
@@ -12812,18 +12856,18 @@ msgid "Display objects of department"
  msgstr ""
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:715
+#: plugins/admin/ogroups/class_ogroup.inc:698
  #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
  msgid "Object groups"
  msgstr "Gruppi di oggetti"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:159
+#: plugins/admin/ogroups/class_ogroupManagement.inc:154
  #, php-format
  msgid "You're about to delete the object group '%s'."
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:165
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:160
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
  msgid "You are not allowed to delete this object group!"
  msgstr ""
  
@@ -12831,78 +12875,78 @@ msgstr ""
  msgid "This 'dn' is no object group."
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:290
  msgid "too many different objects!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:292
  msgid "users"
  msgstr "utenti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:295
+#: plugins/admin/ogroups/class_ogroup.inc:293
  msgid "groups"
  msgstr "gruppi"
  
-#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:294
  msgid "applications"
  msgstr "applicazioni"
  
-#: plugins/admin/ogroups/class_ogroup.inc:297
+#: plugins/admin/ogroups/class_ogroup.inc:295
  msgid "departments"
  msgstr "dipartimenti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:296
  msgid "servers"
  msgstr "server"
  
-#: plugins/admin/ogroups/class_ogroup.inc:299
+#: plugins/admin/ogroups/class_ogroup.inc:297
  msgid "workstations"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:298
  msgid "terminals"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:299
  msgid "phones"
  msgstr "telefoni"
  
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:300
  msgid "printers"
  msgstr "stampanti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:309
+#: plugins/admin/ogroups/class_ogroup.inc:307
  msgid "and"
  msgstr "e"
  
-#: plugins/admin/ogroups/class_ogroup.inc:462
+#: plugins/admin/ogroups/class_ogroup.inc:444
  msgid "Non existing dn:"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:604
+#: plugins/admin/ogroups/class_ogroup.inc:586
  msgid "There is already an object with this cn."
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:618
+#: plugins/admin/ogroups/class_ogroup.inc:601
  msgid "You can combine two different object types at maximum only!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:667
+#: plugins/admin/ogroups/class_ogroup.inc:650
  #, fuzzy, php-format
  msgid "Saving of object group/generic with dn '%s' failed."
  msgstr "Account Kolab"
  
-#: plugins/admin/ogroups/class_ogroup.inc:680
+#: plugins/admin/ogroups/class_ogroup.inc:663
  #, fuzzy, php-format
  msgid "Removing of object group/generic with dn '%s' failed."
  msgstr "Elimina estensioni Unix"
  
-#: plugins/admin/ogroups/class_ogroup.inc:710
+#: plugins/admin/ogroups/class_ogroup.inc:693
  #, fuzzy
  msgid "Object group generic"
  msgstr "Gruppo di oggetti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:721
+#: plugins/admin/ogroups/class_ogroup.inc:704
  #, fuzzy
  msgid "Member"
  msgstr "Membri"
@@ -13163,7 +13207,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:307
  #, php-format
  msgid ""
  "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13175,9 +13219,9 @@ msgstr ""
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:97
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:317
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/macro/class_gofonMacro.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
+#: plugins/gofon/macro/class_gofonMacro.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:318
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:434
  #, fuzzy, php-format
  msgid "Can't select database %s on %s."
  msgstr "Impossibile selezionare il database!"
@@ -13193,8 +13237,8 @@ msgstr "Impossibile selezionare il database!"
  #: plugins/admin/ogroups/class_phonequeue.inc:537
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1185
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:474
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:476
  #, php-format
  msgid "The specified telephonenumber '%s' is already assigned to '%s'."
  msgstr ""
@@ -13208,8 +13252,8 @@ msgstr "Rimuovi le estensioni di posta"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:90
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1067
-#: plugins/gofon/macro/class_gofonMacro.inc:234
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:423
  #, php-format
  msgid ""
  "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13380,17 +13424,17 @@ msgstr "Mostra gruppi che contengono stampanti"
  msgid "Show groups containing phones"
  msgstr "Mostra gruppi che contengono stampanti"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
  #, fuzzy
  msgid "Create new object group"
  msgstr "Gruppo di oggetti"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:207
  #, fuzzy
  msgid "You are not allowed to remove this entry."
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:218
+#: plugins/admin/ogroups/class_divListOGroup.inc:222
  #: plugins/generic/references/class_reference.inc:50
  msgid "Object group"
  msgstr "Gruppo di oggetti"
@@ -13405,17 +13449,32 @@ msgstr "Inserisci la URI del server LDAP"
  msgid "ACLs"
  msgstr "ACL"
  
-#: plugins/admin/acl/class_aclManagement.inc:159
+#: plugins/admin/acl/class_aclManagement.inc:122
+#, fuzzy
+msgid "You are not allowed to edit this acl."
+msgstr "Non hai il permesso di cambiare la tua password."
+
+#: plugins/admin/acl/class_aclManagement.inc:167
  #, fuzzy, php-format
  msgid "You're about to delete the acl %s."
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: plugins/admin/acl/class_aclManagement.inc:165
-#: plugins/admin/acl/class_aclManagement.inc:191
+#: plugins/admin/acl/class_aclManagement.inc:173
+#: plugins/admin/acl/class_aclManagement.inc:198
  #, fuzzy
  msgid "You are not allowed to delete this acl!"
  msgstr "Non hai il permesso di cambiare la tua password."
  
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430
+#, fuzzy
+msgid "Access control list"
+msgstr "Opzioni di accesso"
+
+#: plugins/admin/acl/class_aclManagement.inc:433
+msgid "I don't know Jack"
+msgstr ""
+
  #: plugins/admin/acl/class_divListACL.inc:31
  #, fuzzy
  msgid "List of acl"
@@ -13430,35 +13489,15 @@ msgstr "Lista dei gruppi"
  msgid "This menu allows you to edit and delete selected acls."
  msgstr ""
  
-#: plugins/admin/acl/class_divListACL.inc:61
+#: plugins/admin/acl/class_divListACL.inc:60
  #, fuzzy
  msgid "Display acls matching"
  msgstr "Mosra gruppi corrispondenti a"
  
-#: plugins/admin/acl/class_divListACL.inc:109
+#: plugins/admin/acl/class_divListACL.inc:115
  msgid "Acl"
  msgstr ""
  
-#: plugins/admin/acl/class_divListACL.inc:153
-#, fuzzy
-msgid "Select to display users"
-msgstr "Seleziona per vedere gli utenti template"
-
-#: plugins/admin/acl/class_divListACL.inc:153
-#, fuzzy
-msgid "Display user"
-msgstr "Mostra il nome"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-#, fuzzy
-msgid "Select to display departments"
-msgstr "Selezione un dipartimento"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-#, fuzzy
-msgid "Display departments"
-msgstr "Mostra utenti del dipartimento"
-
  #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
  #, fuzzy
  msgid "ACL management"
@@ -13486,35 +13525,37 @@ msgstr ""
  msgid "Fully Automatic Installation"
  msgstr ""
  
-#: plugins/admin/fai/class_faiScript.inc:422
+#: plugins/admin/fai/class_faiScript.inc:433
  #, fuzzy, php-format
  msgid "Creating of FAI/script with dn '%s' failed."
  msgstr "Gruppo di oggetti"
  
-#: plugins/admin/fai/class_faiScript.inc:519
+#: plugins/admin/fai/class_faiScript.inc:530
  #: plugins/admin/fai/class_faiHookEntry.inc:191
  #, fuzzy
  msgid "FAI script"
  msgstr "Mostra stampanti"
  
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
+#: plugins/admin/fai/class_faiPackage.inc:539
+#: plugins/admin/fai/class_faiPackage.inc:542
  #, fuzzy
  msgid "Readonly"
  msgstr "leggere"
  
-#: plugins/admin/fai/class_faiTemplate.inc:401
+#: plugins/admin/fai/class_faiTemplate.inc:414
  #, fuzzy, php-format
  msgid "Saving of FAI/template with dn '%s' failed."
  msgstr "Lista dei dipartimenti"
  
-#: plugins/admin/fai/class_faiTemplate.inc:487
+#: plugins/admin/fai/class_faiTemplate.inc:500
  #, fuzzy
  msgid "FAI template"
  msgstr "Nuovo template"
  
  #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:853
+#: plugins/admin/fai/class_faiManagement.inc:863
  #, fuzzy
  msgid "FAI"
  msgstr "FAX"
@@ -13560,18 +13601,18 @@ msgstr "Il valore specificato per l'UID non è valido."
  msgid "You are not allowed to create a new branch."
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: plugins/admin/fai/class_faiManagement.inc:506
-#: plugins/admin/fai/class_faiManagement.inc:522
+#: plugins/admin/fai/class_faiManagement.inc:516
+#: plugins/admin/fai/class_faiManagement.inc:532
  #, fuzzy, php-format
  msgid "You are not allowed to create a new '%s' object."
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: plugins/admin/fai/class_faiManagement.inc:847
+#: plugins/admin/fai/class_faiManagement.inc:857
  #, fuzzy
  msgid "FAI releases"
  msgstr "Scegli il tuo numero di telefono personale"
  
-#: plugins/admin/fai/class_faiManagement.inc:848
+#: plugins/admin/fai/class_faiManagement.inc:858
  #, fuzzy
  msgid "FAI release management"
  msgstr "Riferimenti"
@@ -13596,11 +13637,11 @@ msgstr "Mostra telefoni"
  msgid "Choosen packages"
  msgstr "Mostra telefoni"
  
-#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:674
  msgid "Configure"
  msgstr "Configura"
  
-#: plugins/admin/fai/faiPackage.tpl:80
+#: plugins/admin/fai/faiPackage.tpl:87
  msgid "Toggle remove flag"
  msgstr ""
  
@@ -13797,7 +13838,7 @@ msgstr ""
  #: plugins/admin/fai/class_faiProfile.inc:298
  #: plugins/admin/fai/class_faiPartitionTable.inc:520
  #: plugins/admin/fai/class_faiProfileEntry.inc:140
-#: plugins/admin/fai/class_faiSummaryTab.inc:45
+#: plugins/admin/fai/class_faiSummaryTab.inc:48
  msgid "Partition table"
  msgstr ""
  
@@ -13850,136 +13891,141 @@ msgstr "Mostra errori PHP"
  
  #: plugins/admin/fai/class_faiHook.inc:535
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #, fuzzy
  msgid "Read only"
  msgstr "leggere"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  #, fuzzy
  msgid "primary"
  msgstr "Gruppo primario"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  #, fuzzy
  msgid "logical"
  msgstr "Aggiungi localmente"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
  #, fuzzy
  msgid "FS type"
  msgstr "Tipo"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
-#: plugins/admin/fai/class_faiSummaryTab.inc:317
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:468
+#: plugins/admin/fai/class_faiSummaryTab.inc:344
  #, fuzzy
  msgid "Mount point"
  msgstr "Monitoraggio"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
-#: plugins/admin/fai/class_faiSummaryTab.inc:316
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:343
  #, fuzzy
  msgid "Size in MB"
  msgstr "Connesso:"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
-#: plugins/admin/fai/class_faiSummaryTab.inc:315
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:470
+#: plugins/admin/fai/class_faiSummaryTab.inc:342
  #, fuzzy
  msgid "Mount options"
  msgstr "Opzioni di posta"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
  #, fuzzy
  msgid "FS option"
  msgstr "Opzioni"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
  #, fuzzy
  msgid "Preserve"
  msgstr "server"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:368
+#, fuzzy
+msgid "Please specify a valid disc name."
+msgstr "Prego inserire un numero di telefono valido!"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
  #, php-format
  msgid "please enter a unique mount point for partition %s"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
  #, fuzzy, php-format
  msgid "Please enter a valid mount point for partition %s."
  msgstr "Inserire un nome cartella valido per il campo 'Home directory'."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:401
  #, php-format
  msgid ""
  "File system type 'swap' is already used, change file system type for "
  "partition %s."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:405
  msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:411
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:415
  #, fuzzy, php-format
  msgid "Please enter a valid partition size for partition %s."
  msgstr "Inserire un nome cartella valido per il campo 'Home directory'."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:412
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:421
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:423
  #, fuzzy, php-format
  msgid "Please enter a valid range for partition %s."
  msgstr "Inserire un nome cartella valido per il campo 'Home directory'."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:428
  #, fuzzy, php-format
  msgid "Please enter a range for partition size for partition %s."
  msgstr "Inserire un nome cartella valido per il campo 'Home directory'."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:434
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:443
  msgid ""
  "You have more than 3 primary partition table entries in your configuration, "
  "please check your configuration twice."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:446
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
  #, fuzzy
  msgid "Partition table entry"
  msgstr "Destinazione"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
  #, fuzzy
  msgid "FAI partition table entry"
  msgstr "Stampante"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:465
  #, fuzzy
  msgid "Partition type"
  msgstr "Destinazione"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:466
  #, fuzzy
  msgid "Partition no."
  msgstr "Partizioni"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:467
  #, fuzzy
  msgid "File system type"
  msgstr "Sistemi"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:469
  #, fuzzy
  msgid "Partition size"
  msgstr "Partizioni"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:471
  #, fuzzy
  msgid "File system options"
  msgstr "Informazioni organizzazione"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:472
  #, fuzzy
  msgid "Partition flags"
  msgstr "Partizioni"
@@ -14195,12 +14241,12 @@ msgstr "Scegli il tuo numero di telefono personale"
  msgid "A new class name."
  msgstr "Applicazioni disponibili"
  
-#: plugins/admin/fai/class_faiVariable.inc:334
+#: plugins/admin/fai/class_faiVariable.inc:330
  #, fuzzy, php-format
  msgid "Saving of FAI/variable with dn '%s' failed."
  msgstr "Stampante"
  
-#: plugins/admin/fai/class_faiVariable.inc:413
+#: plugins/admin/fai/class_faiVariable.inc:409
  #, fuzzy
  msgid "FAI variable"
  msgstr "Mostra il nome"
@@ -14290,7 +14336,7 @@ msgid "Destination path"
  msgstr "Destinazione"
  
  #: plugins/admin/fai/faiTemplateEntry.tpl:74
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:577
  #: plugins/gofon/conference/class_divListConferences.inc:53
  msgid "Owner"
  msgstr ""
@@ -14444,39 +14490,40 @@ msgid ""
  "to get your data back."
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:41
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
  #, fuzzy
  msgid "Scripts"
  msgstr "Script path"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:46
+#: plugins/admin/fai/class_faiSummaryTab.inc:49
  msgid "Package list"
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:86
+msgid ""
+"Unknown type of FAI source information. This is not a profile, workstation "
+"nor a ogroup."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:217
  msgid "This object has no FAI classes assigned."
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:203
+#: plugins/admin/fai/class_faiSummaryTab.inc:230
  #, fuzzy
  msgid "Open"
  msgstr "Opzioni"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:312
+#: plugins/admin/fai/class_faiSummaryTab.inc:339
  #, fuzzy
  msgid "No."
  msgstr "nessuno"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:314
+#: plugins/admin/fai/class_faiSummaryTab.inc:341
  #, fuzzy
  msgid "FS options"
  msgstr "Opzioni"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:553
-#, fuzzy
-msgid "Viewable"
-msgstr "Variabili"
-
  #: plugins/admin/fai/branch_selector.tpl:21
  #, fuzzy
  msgid "Create new branch"
@@ -14577,101 +14624,101 @@ msgstr "Mostra workstation"
  msgid "Show partitions"
  msgstr "Mostra workstation"
  
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  #, fuzzy
  msgid "New profile"
  msgstr "Riferimenti"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  #, fuzzy
  msgid "New partition table"
  msgstr "Stampante"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "PT"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  #, fuzzy
  msgid "New scripts"
  msgstr "Mostra stampanti"
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "S"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  #, fuzzy
  msgid "New hooks"
  msgstr "Mostra telefoni"
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "H"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  #, fuzzy
  msgid "New variables"
  msgstr "Mostra terminali"
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "V"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "New templates "
  msgstr "Nuovo template"
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "I"
  msgstr "Unix"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  #, fuzzy
  msgid "New package list"
  msgstr "Liste di blocco"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "PK"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:242
-#: plugins/admin/fai/class_divListFai.inc:245
+#: plugins/admin/fai/class_divListFai.inc:240
+#: plugins/admin/fai/class_divListFai.inc:243
  #, fuzzy
  msgid "Edit class"
  msgstr "classe"
  
-#: plugins/admin/fai/class_divListFai.inc:253
+#: plugins/admin/fai/class_divListFai.inc:251
  #, fuzzy
  msgid "Delete class"
  msgstr "Rimuovi"
  
-#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/generic.tpl:12
  #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:180
  #, fuzzy
  msgid "Mime type"
  msgstr "Tipo"
  
-#: plugins/admin/mimetypes/generic.tpl:17
+#: plugins/admin/mimetypes/generic.tpl:16
  #: plugins/admin/mimetypes/paste_generic.tpl:16
  #, fuzzy
  msgid "Please enter a name for the mime type here"
  msgstr "Prego inserire un numero di telefono valido!"
  
-#: plugins/admin/mimetypes/generic.tpl:23
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:673
+#: plugins/admin/mimetypes/generic.tpl:22
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:681
  #, fuzzy
  msgid "Mime group"
  msgstr "Gruppo primario"
  
-#: plugins/admin/mimetypes/generic.tpl:27
+#: plugins/admin/mimetypes/generic.tpl:26
  msgid "Categorize this mime type"
  msgstr ""
  
-#: plugins/admin/mimetypes/generic.tpl:39
+#: plugins/admin/mimetypes/generic.tpl:38
  #, fuzzy
  msgid "Please specify a description"
  msgstr "Prego inserire un numero di telefono valido!"
@@ -14690,7 +14737,7 @@ msgid "Left click"
  msgstr ""
  
  #: plugins/admin/mimetypes/generic.tpl:99
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:679
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:687
  #, fuzzy
  msgid "File patterns"
  msgstr "Filtri"
@@ -14732,63 +14779,58 @@ msgstr ""
  msgid "Ask whether to save to local disk"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:461
  #, php-format
  msgid "Saving of mime type/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:452
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:470
  #, fuzzy, php-format
  msgid "Removing of mime type/generic with dn '%s' failed."
  msgstr "Imposta dipartimento"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:464
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:482
  #, fuzzy, php-format
  msgid "Removing mime type from objectgroup '%s' failed"
  msgstr "Mostra gruppi di applicazioni"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:474
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:492
  #, fuzzy
  msgid "Please specify a valid name for this mime type."
  msgstr "Specificare una dimenzione valida per le mail da rigettare."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:477
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:495
  #, fuzzy
  msgid "Please specify at least one file pattern."
  msgstr "Specificare una dimenzione valida per le mail da rigettare."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:490
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:508
  #, fuzzy
  msgid "There's already a mime type with this 'Name'."
  msgstr "Prego inserire un numero di telefono valido!"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:498
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:516
  #, fuzzy
  msgid "There's already an mime with this 'Name'."
  msgstr "Prego inserire un numero di telefono valido!"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:510
-#, fuzzy
-msgid "You have no permissions to create a mime type on this 'Base'."
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
  #, fuzzy
  msgid "Mime type generic"
  msgstr "Tipo"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
  #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
  #, fuzzy
  msgid "Mime types"
  msgstr "Tipo"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:685
  #, fuzzy
  msgid "Left click action"
  msgstr "Crea estensioni per le applicazioni"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:688
  #, fuzzy
  msgid "Embedded applications"
  msgstr "Applicazioni in uso"
@@ -14798,13 +14840,13 @@ msgstr "Applicazioni in uso"
  msgid "Manage mime types"
  msgstr "Sistemi"
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:276
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:278
  #, php-format
  msgid "You're about to delete the mime type '%s'."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:282
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:311
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:313
  #, fuzzy
  msgid "You are not allowed to delete this mime type!"
  msgstr "Non hai il permesso di cambiare la tua password."
@@ -14841,7 +14883,7 @@ msgstr "Tipo"
  msgid "Display mime types matching"
  msgstr "Mostra utenti che corrispondono a"
  
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:140
  #, fuzzy
  msgid "Create new mime type"
  msgstr "Nuovo template"
@@ -14880,7 +14922,7 @@ msgstr "non definito"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:658
  #: plugins/gofon/macro/class_gofonMacro.inc:95
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:286
  msgid ""
  "There is currently no asterisk server defined. Possibly you are missing a "
  "server that handles the asterisk management (goFonServer). Your settings "
@@ -15001,23 +15043,28 @@ msgstr "Elimina estensioni Unix"
  msgid "Phone account settings"
  msgstr "Opzioni di posta dell'identità"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1237
+#, fuzzy
+msgid "GOfon reports"
+msgstr "Rapporti telefono"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:576
  #, fuzzy
  msgid "Telephone number"
  msgstr "Numero di telefono"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1242
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
  #, fuzzy
  msgid "Macro settings"
  msgstr "Opzioni di posta dell'identità"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1246
  #, fuzzy
  msgid "Telephone pin"
  msgstr "Telefono"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1247
  msgid "Voicemail pin"
  msgstr ""
  
@@ -15062,7 +15109,7 @@ msgid "Regular expression for matching macro names"
  msgstr "Espressioni regolare per selezionare il nome del gruppo"
  
  #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
-#: plugins/gofon/macro/class_gofonMacro.inc:483
+#: plugins/gofon/macro/class_gofonMacro.inc:496
  #, fuzzy
  msgid "Macro name"
  msgstr "Nome gruppo"
@@ -15085,13 +15132,13 @@ msgstr "Nome gruppo"
  msgid "Phone macros"
  msgstr "Macro telefiche"
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:207
  #, php-format
  msgid "You're about to delete the macro '%s'."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:214
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:213
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
  #, fuzzy
  msgid "You are not allowed to delete this macro!"
  msgstr "Non hai il permesso di cambiare la tua password."
@@ -15102,84 +15149,89 @@ msgstr "Non hai il permesso di cambiare la tua password."
  msgid "This 'dn' is no phone macro."
  msgstr "Questa identità non possiede estensioni telefoniche"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:185
+#: plugins/gofon/macro/class_gofonMacro.inc:183
  msgid ""
  "This macro ist still in use. To delete this Macro ensure that nobody has "
  "selected this Macro."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: plugins/gofon/macro/class_gofonMacro.inc:190
+#: plugins/gofon/macro/class_gofonMacro.inc:205
  #: plugins/gofon/macro/class_gofonMacroParameters.inc:402
  #, fuzzy, php-format
  msgid "Removing of goFonMacro/generic account with dn '%s' failed."
  msgstr "Rimuovi le estensioni di posta"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:220
+#: plugins/gofon/macro/class_gofonMacro.inc:218
  msgid ""
  "There is no mysql extension available in your php setup, can't save any "
  "changes to asterisk db."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:290
+#: plugins/gofon/macro/class_gofonMacro.inc:288
  #, php-format
  msgid "Unable to parse macro contents on line: %s"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:308
+#: plugins/gofon/macro/class_gofonMacro.inc:306
  #, php-format
  msgid "Can't perform SELECT query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:317
-#: plugins/gofon/macro/class_gofonMacro.inc:325
+#: plugins/gofon/macro/class_gofonMacro.inc:315
+#: plugins/gofon/macro/class_gofonMacro.inc:323
  #, php-format
  msgid "Can't perform DELETE query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:339
+#: plugins/gofon/macro/class_gofonMacro.inc:337
  #, php-format
  msgid "Can't perform INSERT query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:405
+#: plugins/gofon/macro/class_gofonMacro.inc:417
  #, php-format
  msgid "The given cn '%s' already exists."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:422
  msgid "You must specify the 'Display Name' in order to save this macro"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:414
+#: plugins/gofon/macro/class_gofonMacro.inc:426
  msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:418
+#: plugins/gofon/macro/class_gofonMacro.inc:430
  msgid "Makro length must be lower than 100 lines"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:423
+#: plugins/gofon/macro/class_gofonMacro.inc:435
  #, fuzzy
  msgid "Please choose a valid  base."
  msgstr "Prego inserire un numero di telefono valido!"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:478
  #, fuzzy, php-format
  msgid "Saving of goFonMacro/generic account with dn '%s' failed."
  msgstr "Crea estensioni di posta"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/macro/class_gofonMacro.inc:487
  #, fuzzy
  msgid "Asterisk macro management"
  msgstr "Riferimenti"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:487
+#: plugins/gofon/macro/class_gofonMacro.inc:492
  #, fuzzy
-msgid "Macro content"
+msgid "GOfon macro"
+msgstr "Rapporti telefono"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:500
+#, fuzzy
+msgid "Macro content and parameter"
  msgstr "Nome gruppo"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:488
+#: plugins/gofon/macro/class_gofonMacro.inc:501
  msgid "Visibility flag"
  msgstr ""
  
@@ -15242,38 +15294,36 @@ msgstr "Nome gruppo"
  msgid "Visible"
  msgstr "disabilitato"
  
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  #, fuzzy
  msgid "Create new phone macro"
  msgstr "Crea estensioni telefoniche"
  
-#: plugins/gofon/macro/class_divListMacros.inc:132
-#: plugins/gofon/macro/class_divListMacros.inc:160
-#, fuzzy
-msgid "Edit macro"
-msgstr "Modifica contatto"
-
-#: plugins/gofon/macro/class_divListMacros.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:168
-#, fuzzy
-msgid "Delete macro"
-msgstr "Rimuovi"
-
-#: plugins/gofon/macro/class_divListMacros.inc:137
+#: plugins/gofon/macro/class_divListMacros.inc:124
  #, fuzzy
  msgid "Macro"
  msgstr "Nome gruppo"
  
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  #, fuzzy
  msgid "visible"
  msgstr "Pubblico"
  
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  #, fuzzy
  msgid "invisible"
  msgstr "Pubblico"
  
+#: plugins/gofon/macro/class_divListMacros.inc:147
+#, fuzzy
+msgid "Edit macro"
+msgstr "Modifica contatto"
+
+#: plugins/gofon/macro/class_divListMacros.inc:155
+#, fuzzy
+msgid "Delete macro"
+msgstr "Rimuovi"
+
  #: plugins/gofon/conference/headpage.tpl:6
  #: plugins/gofon/conference/class_divListConferences.inc:31
  #: plugins/gofon/conference/class_divListConferences.inc:32
@@ -15318,7 +15368,7 @@ msgid "Lifetime (in days)"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:137
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:566
  #, fuzzy
  msgid "Preset PIN"
  msgstr "presente"
@@ -15329,7 +15379,7 @@ msgid "PIN"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:157
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
  #, fuzzy
  msgid "Record conference"
  msgstr "Riferimenti"
@@ -15339,7 +15389,7 @@ msgid "Sound file format"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:568
  msgid "Play music on hold"
  msgstr ""
  
@@ -15370,86 +15420,87 @@ msgstr "Dirigenza"
  msgid "Removing of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:252
  msgid ""
  "You have specified a conference 'without PIN' ... please leave the PIN "
  "fields empty."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
  #, fuzzy
  msgid "Please enter a PIN."
  msgstr "Inserisci la URI del server LDAP"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:260
  #, fuzzy
  msgid "Please enter a name for the conference."
  msgstr "Prego inserire un numero di telefono valido!"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:251
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:264
  msgid "Only numeric chars are allowed in Number field."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:268
  msgid "Only numbers are allowed in Lifetime."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:298
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:408
  msgid ""
  "Can't save any changes to asterisk database, there is currently no mysql "
  "extension available in your php setup."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
  #, php-format
  msgid "Saving of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
-#: plugins/gofon/conference/class_divListConferences.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_divListConferences.inc:198
  msgid "Conference"
  msgstr "Conferenza"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:552
  #, fuzzy
  msgid "Phone conference management"
  msgstr "Riferimenti"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
-msgid "GOfon"
-msgstr ""
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#, fuzzy
+msgid "GOfon conference"
+msgstr "Conferenze telefoniche"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
  #, fuzzy
  msgid "Conference PIN"
  msgstr "Conferenza"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:569
  #, fuzzy
  msgid "Activate menu"
  msgstr "Attiva la risposta automatica"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:570
  msgid "Announce user activity"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:571
  #, fuzzy
  msgid "Count user"
  msgstr "Paese"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:572
  #, fuzzy
  msgid "Conference type"
  msgstr "Riferimenti"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:574
  #, fuzzy
  msgid "Format"
  msgstr "Informazioni"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:575
  msgid "Lifetime"
  msgstr ""
  
@@ -15467,44 +15518,44 @@ msgstr "Nome - Numero"
  msgid "Regular expression for matching conference names"
  msgstr "Espressioni regolare per selezionare il nome del gruppo"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  msgid "Create new conference"
  msgstr "Crea nuova conferenza"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  #, fuzzy
  msgid "New conference"
  msgstr "Nuova conferenza"
  
-#: plugins/gofon/conference/class_divListConferences.inc:196
+#: plugins/gofon/conference/class_divListConferences.inc:192
  #: include/class_pluglist.inc:145 include/class_pluglist.inc:146
  #: include/class_pluglist.inc:245
  msgid "Unknown"
  msgstr ""
  
  #: plugins/gofon/fonreports/contents.tpl:31
-#: plugins/gofon/fonreports/class_fonreport.inc:399
+#: plugins/gofon/fonreports/class_fonreport.inc:400
  msgid "Source"
  msgstr "Sorgente"
  
  #: plugins/gofon/fonreports/contents.tpl:32
-#: plugins/gofon/fonreports/class_fonreport.inc:400
+#: plugins/gofon/fonreports/class_fonreport.inc:401
  msgid "Destination"
  msgstr "Destinazione"
  
  #: plugins/gofon/fonreports/contents.tpl:33
-#: plugins/gofon/fonreports/class_fonreport.inc:401
+#: plugins/gofon/fonreports/class_fonreport.inc:402
  msgid "Channel"
  msgstr ""
  
  #: plugins/gofon/fonreports/contents.tpl:36
-#: plugins/gofon/fonreports/class_fonreport.inc:404
+#: plugins/gofon/fonreports/class_fonreport.inc:405
  msgid "Duration"
  msgstr "Durata"
  
  #: plugins/gofon/fonreports/main.inc:16
-#: plugins/gofon/fonreports/class_fonreport.inc:389
  #: plugins/gofon/fonreports/class_fonreport.inc:390
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  msgid "Phone reports"
  msgstr "Rapporti telefono"
  
@@ -15526,12 +15577,12 @@ msgstr "Impossibile selezionare il database!"
  msgid "Query for phone database failed!"
  msgstr ""
  
-#: plugins/gofon/fonreports/class_fonreport.inc:402
+#: plugins/gofon/fonreports/class_fonreport.inc:403
  #, fuzzy
  msgid "Application called"
  msgstr "Nome applicazione"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:403
+#: plugins/gofon/fonreports/class_fonreport.inc:404
  #, fuzzy
  msgid "Disposition"
  msgstr "Disconnessione "
@@ -15584,7 +15635,7 @@ msgstr "Benvenuto %s!"
  msgid "Generating this page caused the PHP interpreter to raise some errors!"
  msgstr ""
  
-#: include/php_setup.inc:71 html/main.php:388
+#: include/php_setup.inc:71
  msgid "Toggle information"
  msgstr ""
  
@@ -15608,15 +15659,15 @@ msgstr "statico"
  msgid "method"
  msgstr "metodo"
  
-#: include/php_setup.inc:129
+#: include/php_setup.inc:135
  msgid "Trace"
  msgstr ""
  
-#: include/php_setup.inc:130
+#: include/php_setup.inc:136
  msgid "Line"
  msgstr ""
  
-#: include/php_setup.inc:131
+#: include/php_setup.inc:137
  msgid "Arguments"
  msgstr "Argomenti"
  
@@ -15691,7 +15742,7 @@ msgstr ""
  msgid "incomplete"
  msgstr "incompleto"
  
-#: include/functions.inc:1046 include/functions.inc:1233
+#: include/functions.inc:1046 include/functions.inc:1202
  msgid "LDAP error:"
  msgstr "Errore LDAP"
  
@@ -15734,19 +15785,19 @@ msgstr ""
  "Stai per modificare il record LDAP '%s' che sembra essere in uso da '%s'. "
  "Contatta la persona interessata."
  
-#: include/functions.inc:1415
+#: include/functions.inc:1384
  msgid "Entries per page"
  msgstr ""
  
-#: include/functions.inc:1443
+#: include/functions.inc:1412
  msgid "Apply filter"
  msgstr ""
  
-#: include/functions.inc:1717
+#: include/functions.inc:1686
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr ""
  
-#: include/functions.inc:1760
+#: include/functions.inc:1729
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "versione di sviluppo di GOsa (Rev %s)"
@@ -15755,51 +15806,51 @@ msgstr "versione di sviluppo di GOsa (Rev %s)"
  msgid "Warning: Account has an invalid mailserver string!"
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:53
+#: include/class_mail-methods-cyrus.inc:58
  msgid ""
  "Warning: IMAP Server cannot be reached! If you save this account, some mail "
  "settings will not be stored on your server!"
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:151
+#: include/class_mail-methods-cyrus.inc:156
  #, php-format
  msgid "Can't create IMAP mailbox. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:170
+#: include/class_mail-methods-cyrus.inc:175
  #, php-format
  msgid "Can't write IMAP quota. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:196
+#: include/class_mail-methods-cyrus.inc:201
  msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:219
  msgid "Warning: imap_getacl is not available, can't get imap permissions!"
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_mail-methods-cyrus.inc:241
  #, php-format
  msgid "Can't remove IMAP mailbox. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:264
+#: include/class_mail-methods-cyrus.inc:269
  #, php-format
  msgid "Can't log into SIEVE server. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:277
+#: include/class_mail-methods-cyrus.inc:282
  #, php-format
  msgid "Can't get sieve script. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:348
+#: include/class_mail-methods-cyrus.inc:353
  #, php-format
  msgid "Can't send sieve script. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:352
+#: include/class_mail-methods-cyrus.inc:357
  #, php-format
  msgid "Can't activate GOsa sieve script. Server says '%s'."
  msgstr ""
@@ -15836,36 +15887,36 @@ msgstr ""
  msgid "Unknown FAIstate %s"
  msgstr ""
  
-#: include/class_ldap.inc:705
+#: include/class_ldap.inc:707
  #, php-format
  msgid ""
  "Autocreation of type '%s' is currently not supported. Please report to the "
  "GOsa team."
  msgstr ""
  
-#: include/class_ldap.inc:774
+#: include/class_ldap.inc:776
  #, php-format
  msgid "while operating on '%s' using LDAP server '%s'"
  msgstr ""
  
-#: include/class_ldap.inc:776
+#: include/class_ldap.inc:778
  #, fuzzy, php-format
  msgid "while operating on LDAP server %s"
  msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
  
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1000
  #, php-format
  msgid ""
  "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
  "in line %s"
  msgstr ""
  
-#: include/class_ldap.inc:1027
+#: include/class_ldap.inc:1029
  #, php-format
  msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
  msgstr ""
  
-#: include/class_ldap.inc:1155
+#: include/class_ldap.inc:1157
  #, fuzzy, php-format
  msgid "Ldap import with dn '%s' failed."
  msgstr "Imposta dipartimento"
@@ -15879,86 +15930,81 @@ msgstr ""
  msgid "References"
  msgstr "Riferimenti"
  
-#: include/class_plugin.inc:420
+#: include/class_plugin.inc:421
  #, php-format
  msgid ""
  "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
  msgstr ""
  
-#: include/class_plugin.inc:601
+#: include/class_plugin.inc:602
  #, php-format
  msgid ""
  "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
  msgstr ""
  
-#: include/class_plugin.inc:635 include/class_password-methods.inc:183
+#: include/class_plugin.inc:636 include/class_password-methods.inc:183
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
  msgstr ""
  
-#: include/class_plugin.inc:669
+#: include/class_plugin.inc:670
  #, php-format
  msgid ""
  "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
  msgstr ""
  
-#: include/class_plugin.inc:977
+#: include/class_plugin.inc:978
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr ""
  
-#: include/class_plugin.inc:984
+#: include/class_plugin.inc:985
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr ""
  
-#: include/class_plugin.inc:998 include/class_plugin.inc:1027
+#: include/class_plugin.inc:999 include/class_plugin.inc:1028
  #, php-format
  msgid "Handle object tagging with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1014
+#: include/class_plugin.inc:1015
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr ""
  
-#: include/class_plugin.inc:1075 include/class_plugin.inc:1121
-#: include/class_plugin.inc:1122
+#: include/class_plugin.inc:1076 include/class_plugin.inc:1122
+#: include/class_plugin.inc:1123
  #, fuzzy, php-format
  msgid "Saving object snapshot with dn '%s' failed."
  msgstr "Account Kolab"
  
-#: include/class_plugin.inc:1137
-#, fuzzy
-msgid "You are not allowed to delete this snapshot!"
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: include/class_plugin.inc:1153
+#: include/class_plugin.inc:1149
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1165
+#: include/class_plugin.inc:1161
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable(s) '%s' is "
  "not configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1197
+#: include/class_plugin.inc:1193
  #, php-format
  msgid "Method get available snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1253
+#: include/class_plugin.inc:1249
  #, php-format
  msgid "Method get deleted snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1317 include/class_plugin.inc:1331
+#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
  #, fuzzy, php-format
  msgid "Restore snapshot with dn '%s' failed."
  msgstr "Elimina estensioni per le applicazioni"
@@ -16053,7 +16099,7 @@ msgid "Can't bind to LDAP. Please contact the system administrator."
  msgstr ""
  "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
  
-#: include/class_config.inc:472
+#: include/class_config.inc:477
  msgid "SID and/or RIDBASE missing in your configuration!"
  msgstr ""
  
@@ -16547,7 +16593,7 @@ msgid ""
  "reachable for GOsa."
  msgstr ""
  
-#: include/functions_setup.inc:784
+#: include/functions_setup.inc:792
  #, php-format
  msgid ""
  "You're missing the required attribute '%s' from this formular. Please "
@@ -16575,15 +16621,12 @@ msgstr ""
  msgid "Can't log into LDAP server. Reason was: %s."
  msgstr "Accesso al server LDAP fallito. La ragione è: %s."
  
-#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:252
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1092
+#, fuzzy
  msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr ""
-"Manca un utente amministrativo per GOsa, non sarai in grado di amministrare "
-"niente!"
+"User and/or group could not be created, please check your configuration "
+"twice !"
+msgstr "Impossibile connettersi al server del database!"
  
  #: include/functions_helpviewer.inc:43
  #, php-format
@@ -16648,103 +16691,108 @@ msgstr ""
  msgid "Use ACL defined in role"
  msgstr ""
  
-#: include/class_acl.inc:370
+#: include/class_acl.inc:372
  #, fuzzy
  msgid "Edit ACL"
  msgstr "Modifica"
  
-#: include/class_acl.inc:371
+#: include/class_acl.inc:373
  #, fuzzy
  msgid "Delete ACL"
  msgstr "Rimuovi"
  
-#: include/class_acl.inc:408
+#: include/class_acl.inc:410
  #, fuzzy
  msgid "No ACL settings for this category"
  msgstr "Nome descrittivo del gruppo"
  
-#: include/class_acl.inc:410
+#: include/class_acl.inc:412
  #, php-format
  msgid "Contains ACLs for these objects: %s"
  msgstr ""
  
-#: include/class_acl.inc:415
+#: include/class_acl.inc:417
  #, fuzzy
  msgid "Edit categories ACLs"
  msgstr "classe"
  
-#: include/class_acl.inc:416
+#: include/class_acl.inc:418
  msgid "Clear categories ACLs"
  msgstr ""
  
-#: include/class_acl.inc:455
+#: include/class_acl.inc:457
  #, php-format
  msgid "Edit ACL for '%s', scope is '%s'"
  msgstr ""
  
-#: include/class_acl.inc:465
+#: include/class_acl.inc:467
  msgid "All objects in current subtree"
  msgstr ""
  
-#: include/class_acl.inc:525 include/class_acl.inc:532
+#: include/class_acl.inc:557 include/class_acl.inc:564
  #, fuzzy
  msgid "Show/Hide Advanced Settings"
  msgstr "Opzioni di posta avanzate"
  
-#: include/class_acl.inc:550
+#: include/class_acl.inc:582
  #, fuzzy
  msgid "Create objects"
  msgstr "Gruppo di oggetti"
  
-#: include/class_acl.inc:551
+#: include/class_acl.inc:583
  #, fuzzy
  msgid "Move objects"
  msgstr "Oggetti membri"
  
-#: include/class_acl.inc:552
+#: include/class_acl.inc:584
  #, fuzzy
  msgid "Remove objects"
  msgstr "Oggetti membri"
  
-#: include/class_acl.inc:554 include/class_acl.inc:560
+#: include/class_acl.inc:586 include/class_acl.inc:592
  msgid "Modifyable by owner"
  msgstr ""
  
-#: include/class_acl.inc:557
+#: include/class_acl.inc:589
  #, fuzzy
  msgid "Move object"
  msgstr "Oggetti membri"
  
-#: include/class_acl.inc:558
+#: include/class_acl.inc:590
  #, fuzzy
  msgid "Remove object"
  msgstr "Oggetti membri"
  
-#: include/class_acl.inc:686
+#: include/class_acl.inc:602
+#, fuzzy
+msgid "Complete object"
+msgstr "Gruppo di oggetti"
+
+#: include/class_acl.inc:718
  #, php-format
  msgid "Unkown ACL type '%s'. Don't know how to handle it."
  msgstr ""
  
-#: include/class_acl.inc:726
+#: include/class_acl.inc:758
  #, php-format
  msgid "Unknown entry '%s'!"
  msgstr ""
  
-#: include/class_acl.inc:787
+#: include/class_acl.inc:819
  #, fuzzy, php-format
  msgid "Contains settings for these objects: %s"
  msgstr "Nome descrittivo del gruppo"
  
-#: include/class_acl.inc:795
+#: include/class_acl.inc:827
  #, fuzzy
  msgid "Members:"
  msgstr "Membri"
  
-#: include/class_acl.inc:801
+#: include/class_acl.inc:833
  msgid "ACL is valid for all users"
  msgstr ""
  
-#: include/class_acl.inc:909
+#: include/class_acl.inc:941
  #, fuzzy, php-format
  msgid "Saving ACLs with dn '%s' failed."
  msgstr "Nome applicazione"
@@ -16754,32 +16802,32 @@ msgstr "Nome applicazione"
  msgid "This package has no debconf options."
  msgstr "Questa identità non possiede estensioni telefoniche"
  
-#: include/class_MultiSelectWindow.inc:400
+#: include/class_MultiSelectWindow.inc:458
  msgid ""
  "Error: The requested subtree has an inconsistent DN encoding, check your "
  "LDAP!"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:504
+#: include/class_MultiSelectWindow.inc:567
  msgid "Restore snapshopts of already deleted objects"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:505
+#: include/class_MultiSelectWindow.inc:568
  #, fuzzy
  msgid "Restore"
  msgstr "Riprova"
  
-#: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:106
+#: include/class_MultiSelectWindow.inc:586
+#: include/class_SnapShotDialog.inc:113
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  #, fuzzy
  msgid "Create snapshot"
  msgstr "Crea estensioni di posta"
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "Gruppo di oggetti"
@@ -16796,46 +16844,57 @@ msgid ""
  "zone."
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:153
+#: include/functions_dns.inc:607
  #, php-format
-msgid "You are going to copy the entry '%s'."
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:217
+#: include/class_CopyPasteHandler.inc:147
+#, fuzzy, php-format
+msgid "You are going to paste the cutted entry '%s'."
+msgstr "Non hai il permesso di cambiare la tua password."
+
+#: include/class_CopyPasteHandler.inc:174
+#, fuzzy, php-format
+msgid "You are going to paste the copied entry '%s'."
+msgstr "Non hai il permesso di cambiare la tua password."
+
+#: include/class_CopyPasteHandler.inc:238
  #, fuzzy
  msgid "Paste"
  msgstr "Data"
  
-#: include/class_CopyPasteHandler.inc:219
+#: include/class_CopyPasteHandler.inc:240
  #, fuzzy
  msgid "Can't paste"
  msgstr "Crea estensioni telefoniche"
  
-#: include/functions_FAI.inc:363
+#: include/functions_FAI.inc:361
  #, php-format
  msgid "Error, following objects should be equal '%s' and '%s'"
  msgstr ""
  
-#: include/functions_FAI.inc:470
+#: include/functions_FAI.inc:468
  #, php-format
  msgid "Release management failed, can't save '%s'"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:53
+#: include/class_SnapShotDialog.inc:63
  #, php-format
  msgid "You're about to delete the snapshot '%s'."
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:108
+#: include/class_SnapShotDialog.inc:115
  #, fuzzy
  msgid "Remove snapshot"
  msgstr "Crea estensioni di posta"
  
-#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
+#: include/class_SnapShotDialog.inc:117 include/class_SnapShotDialog.inc:137
  msgid "Y-m-d, H:i:s"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:142
+#: include/class_SnapShotDialog.inc:149
  #, fuzzy
  msgid "Please specify a valid description for this snapshot."
  msgstr "Specificare una dimenzione valida per le mail da rigettare."
@@ -16876,30 +16935,24 @@ msgid ""
  "please check existence and rights of this directory!"
  msgstr ""
  
-#: html/main.php:170
+#: html/main.php:172
  msgid ""
  "FATAL: Register globals is on. GOsa will refuse to login unless this is "
  "fixed by an administrator."
  msgstr ""
  
-#: html/main.php:212
+#: html/main.php:214
  msgid "Warning: memory is getting low - please increase the memory_limit!"
  msgstr ""
  
-#: html/main.php:349
-#, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
-msgstr ""
-
-#: html/main.php:364
+#: html/main.php:353
  #, fuzzy
  msgid "Your password is about to expire, please change your password"
  msgstr "Non hai il permesso di cambiare la tua password."
  
-#: html/main.php:388
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
+#: html/main.php:361
+#, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
  msgstr ""
  
  #: html/getkiosk.php:25
@@ -16912,11 +16965,11 @@ msgstr ""
  msgid "Can't read file '%s', check permissions."
  msgstr "Rimuovi"
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Session will not be encrypted."
  msgstr ""
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Enter SSL session"
  msgstr ""
  
@@ -16936,30 +16989,38 @@ msgid ""
  "make sure, that this is possible."
  msgstr ""
  
-#: html/index.php:232
+#: html/index.php:231
  msgid ""
  "Your ldap setup contains old schema definitions. Please re-run the setup."
  msgstr ""
  
-#: html/index.php:260
+#: html/index.php:250 ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+"Manca un utente amministrativo per GOsa, non sarai in grado di amministrare "
+"niente!"
+
+#: html/index.php:258
  msgid "Please specify a valid username!"
  msgstr ""
  
-#: html/index.php:262
+#: html/index.php:260
  msgid "Please specify your password!"
  msgstr ""
  
-#: html/index.php:269
+#: html/index.php:267
  msgid "Please check the username/password combination."
  msgstr ""
  
-#: html/index.php:293
+#: html/index.php:291
  #, fuzzy
  msgid "Account locked. Please contact your system administrator."
  msgstr ""
  "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
  
-#: html/index.php:345
+#: html/index.php:343
  msgid ""
  "Your browser has cookies disabled. Please enable cookies and reload this "
  "page before logging in!"
@@ -17098,7 +17159,7 @@ msgid ""
  "and let me use filters instead"
  msgstr ""
  
-#: ihtml/themes/default/login.tpl:14
+#: ihtml/themes/default/login.tpl:15
  #, fuzzy
  msgid "Please use your username and password to log in"
  msgstr "Usa il tuo <i>nome utente</i> e <i>password</i> per connetterti"
@@ -17461,14 +17522,24 @@ msgstr ""
  msgid "Copy & paste wizard"
  msgstr ""
  
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:7
  msgid ""
  "Some values need to be unique in the complete directory while some "
  "combinations make no sense. GOsa shows the relevant attributes. Please "
  "maintain the values below to fullfill the policies."
  msgstr ""
  
-#: ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/copyPasteDialog.tpl:9
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:10
+msgid ""
+"Or if you copy or cut an entry within GOsa and delete the source object, you "
+"may get errors while pasting this object again!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:26
  #, fuzzy
  msgid "Operation complete"
  msgstr "incompleto"
@@ -17516,35 +17587,94 @@ msgid ""
  "replace the existing object after pressing the restore button."
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:23
+#: ihtml/themes/default/snapshotdialog.tpl:9
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only nescessary to open and save them again (goFon), "
+"but some entries must be recreated manually (glpi)."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:12
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:29
  msgid "There is no snapshot available that could be restored"
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:25
+#: ihtml/themes/default/snapshotdialog.tpl:31
  msgid "Choose a snapshot and click the folder image, to restore the snapshot"
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:43
+#: ihtml/themes/default/snapshotdialog.tpl:49
  #, fuzzy
  msgid "Creating object snapshots"
  msgstr "Gruppo di oggetti"
  
-#: ihtml/themes/default/snapshotdialog.tpl:46
+#: ihtml/themes/default/snapshotdialog.tpl:52
  msgid ""
  "This procedure will create a snapshot of the selected object. It will be "
  "stored inside a special branch of your directory system and can be restored "
  "later on."
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:61
+#: ihtml/themes/default/snapshotdialog.tpl:55
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:70
  #, fuzzy
  msgid "Timestamp"
  msgstr "Timeout"
  
-#: ihtml/themes/default/snapshotdialog.tpl:70
+#: ihtml/themes/default/snapshotdialog.tpl:79
  msgid "Reason for generating this snapshot"
  msgstr ""
  
+#, fuzzy
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
+#, fuzzy
+#~ msgid "You have no permissions to move this user to the specified 'Base'."
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
+#, fuzzy
+#~ msgid "Go to users home department"
+#~ msgstr "Mostra utenti del dipartimento"
+
+#, fuzzy
+#~ msgid "Select to display users"
+#~ msgstr "Seleziona per vedere gli utenti template"
+
+#, fuzzy
+#~ msgid "Display user"
+#~ msgstr "Mostra il nome"
+
+#, fuzzy
+#~ msgid "Select to display departments"
+#~ msgstr "Selezione un dipartimento"
+
+#, fuzzy
+#~ msgid "Display departments"
+#~ msgstr "Mostra utenti del dipartimento"
+
+#, fuzzy
+#~ msgid "Viewable"
+#~ msgstr "Variabili"
+
+#, fuzzy
+#~ msgid "You have no permissions to create a mime type on this 'Base'."
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
+#, fuzzy
+#~ msgid "You are not allowed to delete this snapshot!"
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
  #, fuzzy
  #~ msgid "This zoneName is already in use"
  #~ msgstr "L'indirizzo principale inserito è già in uso."
@@ -18263,10 +18393,6 @@ msgstr ""
  #~ "There is no value for 'KDE_APPLICATIONS_MENU' specified in your gosa.conf."
  #~ msgstr "Il metodo di posta '%s' non è definito in gosa.conf"
  
-#, fuzzy
-#~ msgid "Can change password"
-#~ msgstr "Cambia la password"
-
  #, fuzzy
  #~ msgid "Home drive"
  #~ msgstr "Server"
diff --git a/locale/messages.po b/locale/messages.po

index 8bfccaf657df8071d458583894d79bcd9aa032db..db08401f3b4cc079ff3b9fa9bff62af58face712 100644 (file)
--- a/locale/messages.po
+++ b/locale/messages.po
@@ -3,16 +3,14 @@
  # This file is distributed under the same license as the PACKAGE package.
  # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
  #
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/admin/systems/class_terminalService.inc:452
-#: plugins/admin/systems/class_terminalService.inc:453
-#: include/class_plugin.inc:115 include/class_plugin.inc:116
+#: plugins/personal/generic/class_user.inc:1360 include/class_plugin.inc:115
+#: include/class_plugin.inc:116
  #, fuzzy
  msgid ""
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-17 12:33+0100\n"
+"POT-Creation-Date: 2006-12-18 11:18+0100\n"
  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
  "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -20,7 +18,24 @@ msgstr ""
  "Content-Type: text/plain; charset=CHARSET\n"
  "Content-Transfer-Encoding: 8bit\n"
  
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1373
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1011
+#: plugins/personal/password/class_password.inc:16
+#: plugins/personal/posix/class_posixAccount.inc:1313
+#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/connectivity/class_phpgwAccount.inc:147
+#: plugins/personal/connectivity/class_kolabAccount.inc:451
+#: plugins/personal/connectivity/class_webdavAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:223
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:954
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#: plugins/personal/connectivity/class_intranetAccount.inc:180
+#: plugins/personal/connectivity/class_pptpAccount.inc:163
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/personal/environment/class_environment.inc:1274
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#: plugins/personal/netatalk/class_netatalk.inc:359
  msgid "My account"
  msgstr ""
  
@@ -28,8 +43,8 @@ msgstr ""
  msgid "Administration"
  msgstr ""
  
-#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:788
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
  msgid "Addons"
  msgstr ""
  
@@ -41,28 +56,28 @@ msgstr ""
  #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
  #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
  #: plugins/personal/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1368
+#: plugins/personal/generic/class_user.inc:1367
  #: plugins/gofax/blocklists/generic.tpl:1
  #: plugins/gofax/faxaccount/generic.tpl:6
  #: plugins/gofax/faxaccount/paste_generic.tpl:4
  #: plugins/admin/groups/mail.tpl:7
-#: plugins/admin/groups/class_groupGeneric.inc:884
-#: plugins/admin/applications/class_applicationGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:531
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#: plugins/admin/applications/class_applicationGeneric.inc:523
+#: plugins/admin/departments/class_departmentGeneric.inc:575
  #: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/class_servGeneric.inc:334
-#: plugins/admin/systems/class_workstationGeneric.inc:504
+#: plugins/admin/systems/class_servGeneric.inc:347
+#: plugins/admin/systems/class_workstationGeneric.inc:526
  #: plugins/admin/systems/servkolab.tpl:6 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/class_printGeneric.inc:854
-#: plugins/admin/systems/class_componentGeneric.inc:257
-#: plugins/admin/systems/class_phoneGeneric.inc:425
+#: plugins/admin/systems/class_printGeneric.inc:858
+#: plugins/admin/systems/class_componentGeneric.inc:259
+#: plugins/admin/systems/class_phoneGeneric.inc:430
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
  #: plugins/admin/systems/servdnseditzone.tpl:1
  #: plugins/admin/systems/goMailServer.tpl:1
  #: plugins/admin/systems/goImapServer.tpl:1
  #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:709
+#: plugins/admin/ogroups/class_ogroup.inc:692
  #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
  #: plugins/admin/fai/faiPartitionTable.tpl:4
  #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
@@ -73,9 +88,9 @@ msgstr ""
  #: plugins/admin/fai/faiHookEntry.tpl:5
  #: plugins/admin/fai/faiTemplateEntry.tpl:3
  #: plugins/admin/mimetypes/generic.tpl:4
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:671
  #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_gofonMacro.inc:486
  #: plugins/generic/references/class_reference.inc:20
  msgid "Generic"
  msgstr ""
@@ -87,30 +102,30 @@ msgstr ""
  #: contrib/gosa.conf:82 contrib/gosa.conf:98
  #: plugins/personal/environment/class_environment.inc:12
  #: plugins/personal/environment/class_environment.inc:1269
-#: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/groups/class_divListGroup.inc:188
+#: plugins/admin/users/class_divListUsers.inc:177
  msgid "Environment"
  msgstr ""
  
  #: contrib/gosa.conf:83 contrib/gosa.conf:100
  #: plugins/personal/mail/class_mailAccount.inc:22
  #: plugins/personal/mail/class_mailAccount.inc:1006
-#: plugins/admin/groups/class_groupMail.inc:1066
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:191
-#: plugins/admin/ogroups/tabs_ogroups.inc:76
+#: plugins/admin/groups/class_groupMail.inc:1073
+#: plugins/admin/groups/class_divListGroup.inc:180
+#: plugins/admin/users/class_divListUsers.inc:179
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
  #: plugins/admin/ogroups/tabs_ogroups.inc:184
  #: plugins/admin/ogroups/paste_mail.tpl:4
  #: plugins/admin/ogroups/class_mailogroup.inc:167
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/admin/ogroups/class_divListOGroup.inc:171
  #: plugins/generic/references/class_reference.inc:24
  msgid "Mail"
  msgstr ""
  
  #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
  #: plugins/personal/samba/class_sambaAccount.inc:1041
-#: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/groups/class_divListGroup.inc:182
+#: plugins/admin/users/class_divListUsers.inc:185
  #: plugins/generic/references/class_reference.inc:26
  #: plugins/generic/references/class_reference.inc:28
  msgid "Samba"
@@ -118,7 +133,7 @@ msgstr ""
  
  #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
  #: plugins/personal/netatalk/class_netatalk.inc:355
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:187
  msgid "Netatalk"
  msgstr ""
  
@@ -129,15 +144,14 @@ msgstr ""
  
  #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
  #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:581
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:586
  #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:807
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
  #: plugins/gofax/faxaccount/paste_generic.tpl:8
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:183
  #: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/class_departmentGeneric.inc:550
+#: plugins/admin/departments/class_departmentGeneric.inc:594
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Fax"
@@ -150,12 +164,12 @@ msgstr ""
  #: plugins/addons/addressbook/address_edit.tpl:221
  #: plugins/addons/addressbook/address_info.tpl:67
  #: plugins/addons/addressbook/address_info.tpl:163
-#: plugins/admin/groups/class_divListGroup.inc:178
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/groups/class_divListGroup.inc:186
+#: plugins/admin/users/class_divListUsers.inc:181
  #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:818
+#: plugins/admin/systems/class_systemManagement.inc:1003
  #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/ogroups/class_ogroupManagement.inc:351
  #: plugins/admin/ogroups/class_phonequeue.inc:718
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1231
@@ -175,9 +189,9 @@ msgstr ""
  msgid "Applications"
  msgstr ""
  
-#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:92
  #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:240
+#: plugins/admin/systems/class_servRepository.inc:254
  #: plugins/admin/ogroups/phonequeue.tpl:43
  #: plugins/gofon/conference/generic.tpl:121
  msgid "Options"
@@ -191,21 +205,21 @@ msgstr ""
  
  #: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
  #: plugins/admin/systems/class_terminalStartup.inc:442
-#: plugins/admin/systems/class_workstationStartup.inc:1109
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: plugins/admin/systems/class_workstationStartup.inc:1154
+#: plugins/admin/ogroups/tabs_ogroups.inc:96
  msgid "Startup"
  msgstr ""
  
  #: contrib/gosa.conf:120 contrib/gosa.conf:136
-#: plugins/admin/ogroups/tabs_ogroups.inc:103
+#: plugins/admin/ogroups/tabs_ogroups.inc:99
  msgid "Devices"
  msgstr ""
  
  #: contrib/gosa.conf:121 contrib/gosa.conf:137
  #: plugins/personal/environment/environment.tpl:235
-#: plugins/admin/systems/class_systemManagement.inc:827
-#: plugins/admin/systems/class_printGeneric.inc:860
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/systems/class_systemManagement.inc:1012
+#: plugins/admin/systems/class_printGeneric.inc:864
+#: plugins/admin/ogroups/class_ogroupManagement.inc:354
  #: plugins/generic/references/class_reference.inc:52
  msgid "Printer"
  msgstr ""
@@ -224,16 +238,16 @@ msgstr ""
  #: plugins/admin/fai/faiPackageEntry.tpl:22
  #: plugins/gofon/macro/headpage.tpl:20
  #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:64
+#: ihtml/themes/default/MultiSelectWindow.tpl:27
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
  msgid "Information"
  msgstr ""
  
  #: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:385
  #: plugins/admin/systems/class_goFaxServer.inc:85
  #: plugins/admin/systems/class_servKolab.inc:375
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:366
  #: plugins/admin/systems/class_goGlpiServer.inc:84
  #: plugins/admin/systems/class_goCupsServer.inc:64
  #: plugins/admin/systems/class_goTerminalServer.inc:118
@@ -252,7 +266,6 @@ msgid "Services"
  msgstr ""
  
  #: contrib/gosa.conf:129 contrib/gosa.conf:139
-#: plugins/admin/fai/class_faiSummaryTab.inc:546
  msgid "FAI summary"
  msgstr ""
  
@@ -279,7 +292,7 @@ msgstr ""
  #: plugins/addons/ldapmanager/contentcsv.tpl:112
  #: plugins/addons/ldapmanager/contentimport.tpl:50
  #: plugins/addons/notifications/contents.tpl:52
-#: plugins/admin/applications/generic.tpl:132
+#: plugins/admin/applications/generic.tpl:135
  msgid "Import"
  msgstr ""
  
@@ -292,33 +305,32 @@ msgid "Partitions"
  msgstr ""
  
  #: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:518
+#: plugins/admin/applications/generic.tpl:130
+#: plugins/admin/fai/class_faiScript.inc:529
  #: plugins/admin/fai/faiScriptEntry.tpl:56
  #: plugins/admin/fai/faiHookEntry.tpl:56
  msgid "Script"
  msgstr ""
  
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:45
  msgid "Hooks"
  msgstr ""
  
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:46
  msgid "Variables"
  msgstr ""
  
-#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:47
  msgid "Templates"
  msgstr ""
  
  #: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
-#: plugins/admin/fai/class_faiSummaryTab.inc:47
+#: plugins/admin/fai/class_faiSummaryTab.inc:50
  msgid "Profiles"
  msgstr ""
  
-#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:103
  #: plugins/admin/acl/class_divListACL.inc:49
-#: plugins/admin/fai/class_faiSummaryTab.inc:545
  msgid "Summary"
  msgstr ""
  
@@ -373,7 +385,7 @@ msgstr ""
  #: plugins/personal/environment/hotplugDialog.tpl:24
  #: plugins/personal/environment/selectPrinterDialog.tpl:24
  #: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:62
+#: plugins/addons/addressbook/contents.tpl:65
  #: plugins/addons/godfs/contents.tpl:31
  #: plugins/admin/groups/mail_locals.tpl:22
  #: plugins/admin/groups/group_objects.tpl:20
@@ -389,8 +401,8 @@ msgstr ""
  #: plugins/admin/fai/faiPackageEntry.tpl:32
  #: plugins/gofon/macro/headpage.tpl:29
  #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:75
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:78
  msgid "Filters"
  msgstr ""
  
@@ -404,7 +416,7 @@ msgstr ""
  #: plugins/personal/samba/samba3_workstations.tpl:27
  #: plugins/personal/environment/selectPrinterDialog.tpl:34
  #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:84
+#: plugins/addons/addressbook/contents.tpl:87
  #: plugins/admin/groups/mail_locals.tpl:33
  #: plugins/admin/groups/group_objects.tpl:40
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
@@ -455,22 +467,22 @@ msgstr ""
  #: plugins/admin/groups/mail.tpl:135 plugins/admin/groups/mail_locals.tpl:66
  #: plugins/admin/groups/generic.tpl:137
  #: plugins/admin/groups/application.tpl:39
-#: plugins/admin/groups/class_groupMail.inc:591
+#: plugins/admin/groups/class_groupMail.inc:598
  #: plugins/admin/groups/group_objects.tpl:55
  #: plugins/admin/groups/paste_mail.tpl:30
  #: plugins/admin/groups/paste_mail.tpl:41
  #: plugins/admin/systems/terminal.tpl:117
+#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/workstation.tpl:94
  #: plugins/admin/systems/glpiPrinter.tpl:115
  #: plugins/admin/systems/glpiPrinter.tpl:149
  #: plugins/admin/systems/servdns.tpl:6 plugins/admin/systems/glpi.tpl:125
-#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/phonesettings.tpl:207
  #: plugins/admin/systems/phonesettings.tpl:230
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:124
-#: plugins/admin/systems/workstationStartup.tpl:150
-#: plugins/admin/systems/workstationStartup.tpl:179
+#: plugins/admin/systems/workstationStartup.tpl:127
+#: plugins/admin/systems/workstationStartup.tpl:154
+#: plugins/admin/systems/workstationStartup.tpl:183
  #: plugins/admin/systems/terminalStartup.tpl:79
  #: plugins/admin/systems/terminalStartup.tpl:108
  #: plugins/admin/systems/servRepositorySetup.tpl:47
@@ -478,12 +490,12 @@ msgstr ""
  #: plugins/admin/systems/glpiManufacturer.tpl:6
  #: plugins/admin/systems/glpi_edit_os.tpl:8
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:472
-#: plugins/admin/systems/class_termDNS.inc:492
+#: plugins/admin/systems/class_termDNS.inc:477
+#: plugins/admin/systems/class_termDNS.inc:497
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
  #: plugins/admin/systems/servdnseditzone.tpl:106
  #: plugins/admin/systems/class_servDNSeditZone.inc:486
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:392
  #: plugins/admin/systems/goShareServer.tpl:14
  #: plugins/admin/systems/goMailServer.tpl:70
  #: plugins/admin/systems/goMailServer.tpl:101
@@ -496,7 +508,7 @@ msgstr ""
  #: plugins/admin/ogroups/ogroup_objects.tpl:54
  #: plugins/admin/ogroups/phonequeue.tpl:33
  #: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
-#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPackage.tpl:78
  #: plugins/admin/fai/faiPartitionTable.tpl:48
  #: plugins/admin/fai/faiPartitionTable.tpl:50
  #: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
@@ -545,15 +557,17 @@ msgstr ""
  #: plugins/admin/applications/remove.tpl:15
  #: plugins/admin/applications/class_applicationManagement.inc:352
  #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:506
+#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/departments/dep_move_confirm.tpl:17
+#: plugins/admin/systems/goNtpServer.tpl:31
+#: plugins/admin/systems/class_systemManagement.inc:654
  #: plugins/admin/systems/servdns.tpl:23
-#: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/servkolab.tpl:247 plugins/admin/systems/gencd.tpl:11
  #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/goNtpServer.tpl:32
-#: plugins/admin/systems/goKrbServer.tpl:33
+#: plugins/admin/systems/goKrbServer.tpl:32
+#: plugins/admin/systems/goFonServer.tpl:41
  #: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:140
-#: plugins/admin/systems/goFonServer.tpl:42
+#: plugins/admin/systems/goFaxServer.tpl:25
  #: plugins/admin/systems/remove_glpi.tpl:16
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
  #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -561,7 +575,7 @@ msgstr ""
  #: plugins/admin/systems/servRepository.tpl:68
  #: plugins/admin/systems/glpi_edit_type.tpl:29
  #: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/goFaxServer.tpl:26
+#: plugins/admin/systems/remove_ppd.tpl:14
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
  #: plugins/admin/systems/glpiSelectUser.tpl:51
  #: plugins/admin/systems/glpi_devices.tpl:761
@@ -574,26 +588,27 @@ msgstr ""
  #: plugins/admin/systems/SelectDeviceType.tpl:45
  #: plugins/admin/systems/class_baseSelectDialog.inc:43
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/ServiceAddDialog.tpl:31
-#: plugins/admin/systems/goLdapServer.tpl:12
-#: plugins/admin/systems/goShareServer.tpl:32
-#: plugins/admin/systems/goMailServer.tpl:224
-#: plugins/admin/systems/goImapServer.tpl:119
-#: plugins/admin/systems/goSyslogServer.tpl:8
-#: plugins/admin/systems/goGlpiServer.tpl:35
-#: plugins/admin/systems/goCupsServer.tpl:8
-#: plugins/admin/systems/goTerminalServer.tpl:26
-#: plugins/admin/systems/goLogDBServer.tpl:26
-#: plugins/admin/systems/goSpamServer.tpl:128
-#: plugins/admin/systems/goSpamServerRule.tpl:24
-#: plugins/admin/systems/goVirusServer.tpl:171
+#: plugins/admin/systems/ServiceAddDialog.tpl:30
+#: plugins/admin/systems/goLdapServer.tpl:11
+#: plugins/admin/systems/goShareServer.tpl:31
+#: plugins/admin/systems/goMailServer.tpl:223
+#: plugins/admin/systems/goImapServer.tpl:118
+#: plugins/admin/systems/goSyslogServer.tpl:7
+#: plugins/admin/systems/goGlpiServer.tpl:34
+#: plugins/admin/systems/goCupsServer.tpl:7
+#: plugins/admin/systems/goTerminalServer.tpl:25
+#: plugins/admin/systems/goLogDBServer.tpl:25
+#: plugins/admin/systems/goSpamServer.tpl:127
+#: plugins/admin/systems/goSpamServerRule.tpl:23
+#: plugins/admin/systems/goVirusServer.tpl:170
  #: plugins/admin/systems/class_goService.inc:34
  #: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:307
+#: plugins/admin/ogroups/class_ogroupManagement.inc:302
  #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:619
-#: plugins/admin/fai/class_faiManagement.inc:624
-#: plugins/admin/fai/class_faiManagement.inc:630
+#: plugins/admin/acl/class_aclManagement.inc:289
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/fai/class_faiManagement.inc:634
+#: plugins/admin/fai/class_faiManagement.inc:640
  #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
  #: plugins/admin/fai/faiScriptEntry.tpl:83
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:40
@@ -605,17 +620,17 @@ msgstr ""
  #: plugins/admin/fai/faiPackageNew.tpl:51
  #: plugins/admin/fai/faiNewBranch.tpl:20
  #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
  #: plugins/admin/mimetypes/remove.tpl:15
  #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
  #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:256
  #: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
  #: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
-#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:38
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:89
  msgid "Cancel"
  msgstr ""
  
@@ -627,11 +642,11 @@ msgstr ""
  
  #: plugins/personal/mail/generic.tpl:15
  #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:18
-#: plugins/admin/systems/class_servGeneric.inc:340
-#: plugins/admin/systems/class_systemManagement.inc:819
+#: plugins/admin/systems/class_servGeneric.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:1004
  #: plugins/admin/systems/servnfs.tpl:39
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:355
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
  #: plugins/generic/references/class_reference.inc:44
  msgid "Server"
  msgstr ""
@@ -646,14 +661,14 @@ msgstr ""
  
  #: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:38
  #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:515
+#: plugins/admin/systems/class_printGeneric.inc:516
  msgid "not defined"
  msgstr ""
  
  #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/personal/mail/class_mailAccount.inc:1019
  #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1077
+#: plugins/admin/groups/class_groupMail.inc:1084
  msgid "Quota size"
  msgstr ""
  
@@ -692,22 +707,23 @@ msgstr ""
  #: plugins/admin/applications/remove.tpl:13
  #: plugins/admin/departments/remove.tpl:14
  #: plugins/admin/systems/terminal.tpl:121
+#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/printer.tpl:102 plugins/admin/systems/printer.tpl:126
  #: plugins/admin/systems/workstation.tpl:98
  #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/remove_glpi.tpl:14
  #: plugins/admin/systems/phonesettings.tpl:210
  #: plugins/admin/systems/phonesettings.tpl:233
-#: plugins/admin/systems/workstationStartup.tpl:125
-#: plugins/admin/systems/workstationStartup.tpl:153
+#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:157
  #: plugins/admin/systems/terminalStartup.tpl:82
  #: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/remove_ppd.tpl:12
  #: plugins/admin/systems/glpi_edit_os.tpl:10
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
  #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:486
+#: plugins/admin/systems/class_termDNS.inc:491
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
  #: plugins/admin/systems/class_servDNSeditZone.inc:292
  #: plugins/admin/systems/class_servDNSeditZone.inc:480
@@ -777,7 +793,7 @@ msgid "MB"
  msgstr ""
  
  #: plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1022
  msgid "Vacation message"
  msgstr ""
  
@@ -806,7 +822,7 @@ msgid "User is only allowed to send and receive local mails"
  msgstr ""
  
  #: plugins/personal/mail/generic.tpl:190
-#: plugins/personal/mail/class_mailAccount.inc:1036
+#: plugins/personal/mail/class_mailAccount.inc:1037
  msgid "Use custom sieve script"
  msgstr ""
  
@@ -824,13 +840,14 @@ msgstr ""
  #: plugins/admin/groups/class_groupManagement.inc:329
  #: plugins/admin/users/class_userManagement.inc:651
  #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:500
-#: plugins/admin/ogroups/class_ogroupManagement.inc:301
-#: plugins/admin/fai/class_faiManagement.inc:613
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
+#: plugins/admin/systems/class_systemManagement.inc:648
+#: plugins/admin/ogroups/class_ogroupManagement.inc:296
+#: plugins/admin/acl/class_aclManagement.inc:280
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:339
  #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:250
  msgid "Ok"
  msgstr ""
  
@@ -1009,35 +1026,35 @@ msgid ""
  msgstr ""
  
  #: plugins/personal/mail/class_mailAccount.inc:781
-#: plugins/admin/groups/class_groupMail.inc:880
+#: plugins/admin/groups/class_groupMail.inc:887
  msgid "The required field 'Primary address' is not set."
  msgstr ""
  
  #: plugins/personal/mail/class_mailAccount.inc:785
  #: plugins/personal/mail/class_mailAccount.inc:789
-#: plugins/addons/addressbook/class_addressbook.inc:694
+#: plugins/addons/addressbook/class_addressbook.inc:696
  #: plugins/admin/ogroups/class_mailogroup.inc:79
  msgid "Please enter a valid email address in 'Primary address' field."
  msgstr ""
  
  #: plugins/personal/mail/class_mailAccount.inc:795
-#: plugins/admin/groups/class_groupMail.inc:889
+#: plugins/admin/groups/class_groupMail.inc:896
  #: plugins/admin/ogroups/class_mailogroup.inc:86
  msgid "The primary address you've entered is already in use."
  msgstr ""
  
  #: plugins/personal/mail/class_mailAccount.inc:801
-#: plugins/admin/groups/class_groupMail.inc:895
+#: plugins/admin/groups/class_groupMail.inc:902
  msgid "Value in 'Quota size' is not valid."
  msgstr ""
  
  #: plugins/personal/mail/class_mailAccount.inc:810
-#: plugins/admin/groups/class_groupMail.inc:904
+#: plugins/admin/groups/class_groupMail.inc:911
  msgid "Please specify a vaild mail size for mails to be rejected."
  msgstr ""
  
  #: plugins/personal/mail/class_mailAccount.inc:820
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
  msgid "You need to set the maximum mail size in order to reject anything."
  msgstr ""
  
@@ -1065,60 +1082,64 @@ msgid ""
  "methods."
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1012
+msgid "Mail account"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1017
  #: plugins/personal/nagios/nagios.tpl:17
-#: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/addons/addressbook/class_addressbook.inc:797
-#: plugins/admin/groups/class_groupMail.inc:1074
-#: plugins/admin/systems/class_servDNS.inc:394
+#: plugins/personal/nagios/class_nagiosAccount.inc:273
+#: plugins/addons/addressbook/class_addressbook.inc:799
+#: plugins/admin/groups/class_groupMail.inc:1081
+#: plugins/admin/systems/class_servDNS.inc:396
  #: plugins/admin/systems/servdnseditzone.tpl:51
  #: plugins/admin/ogroups/class_mailogroup.inc:175 html/getxls.php:225
  msgid "Mail address"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1017
-#: plugins/admin/groups/class_groupMail.inc:1078
+#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/admin/groups/class_groupMail.inc:1085
  msgid "Mail server"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1021
  msgid "Add vacation information"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1024
  msgid "Use spam filter"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1025
  msgid "Spam level"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1026
  msgid "Spam mail box"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1028
  msgid "Reject due to mailsize"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:1029
  msgid "Mail max size"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1030
-#: plugins/personal/mail/class_mailAccount.inc:1035
+#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1036
  msgid "Forwarding address"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1032
  msgid "Local delivery"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1032
+#: plugins/personal/mail/class_mailAccount.inc:1033
  msgid "No delivery to own mailbox "
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1034
  msgid "Mail alternative addresses"
  msgstr ""
  
@@ -1181,8 +1202,9 @@ msgstr ""
  #: plugins/addons/ldapmanager/contentexport.tpl:66
  #: plugins/addons/ldapmanager/contentexportxls.tpl:69
  #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1452
+#: plugins/admin/departments/dep_iframe.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:145
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1421
  #: ihtml/themes/default/setup_useradmin.tpl:40
  #: ihtml/themes/default/setup_step4.tpl:114
  #: ihtml/themes/default/setup_step2.tpl:12
@@ -1192,13 +1214,14 @@ msgid "Back"
  msgstr ""
  
  #: plugins/personal/password/class_password.inc:5
+#: plugins/personal/password/class_password.inc:17
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/admin/systems/class_goFaxServer.inc:94
  #: plugins/admin/systems/goKrbServer.tpl:20
  #: plugins/admin/systems/goFonServer.tpl:12
-#: plugins/admin/systems/class_goGlpiServer.inc:98
  #: plugins/admin/systems/goFaxServer.tpl:12
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_goGlpiServer.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:308
  #: plugins/admin/systems/goImapServer.tpl:34
  #: plugins/admin/systems/class_goFonServer.inc:107
  #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1211,7 +1234,7 @@ msgid "Password"
  msgstr ""
  
  #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/generic/class_user.inc:1378
  msgid "User password"
  msgstr ""
  
@@ -1258,12 +1281,12 @@ msgid "External password changer reported a problem: "
  msgstr ""
  
  #: plugins/personal/password/main.inc:123
-#: plugins/admin/users/class_divListUsers.inc:261
+#: plugins/admin/users/class_divListUsers.inc:249
  msgid "Change password"
  msgstr ""
  
  #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1327
+#: plugins/personal/posix/class_posixAccount.inc:1320
  #: plugins/personal/posix/paste_generic.tpl:8
  #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
  #: plugins/personal/samba/class_sambaAccount.inc:645
@@ -1271,7 +1294,7 @@ msgid "Home directory"
  msgstr ""
  
  #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1328
+#: plugins/personal/posix/class_posixAccount.inc:1321
  msgid "Shell"
  msgstr ""
  
@@ -1280,10 +1303,10 @@ msgid "Primary group"
  msgstr ""
  
  #: plugins/personal/posix/generic.tpl:35
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:235
  #: plugins/gofax/faxreports/contents.tpl:32
  #: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/class_faxreport.inc:482
+#: plugins/gofax/faxreports/class_faxreport.inc:487
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
  #: plugins/gofon/fonreports/contents.tpl:35
  msgid "Status"
@@ -1301,7 +1324,7 @@ msgstr ""
  
  #: plugins/personal/posix/generic.tpl:62
  #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:894
  msgid "GID"
  msgstr ""
  
@@ -1344,7 +1367,7 @@ msgstr ""
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -1401,95 +1424,95 @@ msgstr ""
  msgid "UNIX"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:135
  msgid "expired"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:137
  msgid "grace time active"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:140
  msgid "active, password not changable"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:143
+#: plugins/personal/posix/class_posixAccount.inc:142
  msgid "active, password expired"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:144
  msgid "active"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:156
-#: plugins/personal/posix/class_posixAccount.inc:1010
+#: plugins/personal/posix/class_posixAccount.inc:155
+#: plugins/personal/posix/class_posixAccount.inc:1002
  msgid "Group of user"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:191
+#: plugins/personal/posix/class_posixAccount.inc:190
  msgid "unconfigured"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:208
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:791
+#: plugins/personal/posix/class_posixAccount.inc:201
+#: plugins/admin/systems/class_workstationStartup.inc:825
  #: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:196
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
  msgid "automatic"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:254
+#: plugins/personal/posix/class_posixAccount.inc:247
  msgid "This account has no unix extensions."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:274
-#: plugins/personal/posix/class_posixAccount.inc:277
+#: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
  msgid "Remove posix account"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:268
  msgid ""
  "This account has unix features enabled. To disable them, you'll need to "
  "remove the samba / environment account first."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:278
+#: plugins/personal/posix/class_posixAccount.inc:271
  msgid ""
  "This account has posix features enabled. You can disable them by clicking "
  "below."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:274
  msgid "Create posix account"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:282
+#: plugins/personal/posix/class_posixAccount.inc:275
  msgid ""
  "This account has posix features disabled. You can enable them by clicking "
  "below."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:442
+#: plugins/personal/posix/class_posixAccount.inc:435
  #, php-format
  msgid "Password can't be changed up to %s days after last change"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:439
  #, php-format
  msgid "Password must be changed after %s days"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:443
  #, php-format
  msgid "Disable account after %s days of inactivity after password expiery"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:454
+#: plugins/personal/posix/class_posixAccount.inc:447
  #, php-format
  msgid "Warn user %s days before password expiery"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1498,7 +1521,7 @@ msgstr ""
  msgid "January"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1507,7 +1530,7 @@ msgstr ""
  msgid "February"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1516,7 +1539,7 @@ msgstr ""
  msgid "March"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1525,7 +1548,7 @@ msgstr ""
  msgid "April"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1534,7 +1557,7 @@ msgstr ""
  msgid "May"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1543,7 +1566,7 @@ msgstr ""
  msgid "June"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1552,7 +1575,7 @@ msgstr ""
  msgid "July"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1561,7 +1584,7 @@ msgstr ""
  msgid "August"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1570,7 +1593,7 @@ msgstr ""
  msgid "September"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1579,7 +1602,7 @@ msgstr ""
  msgid "October"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1588,7 +1611,7 @@ msgstr ""
  msgid "November"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1597,142 +1620,146 @@ msgstr ""
  msgid "December"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  #: plugins/personal/samba/class_sambaAccount.inc:468
-#: plugins/admin/systems/class_terminalGeneric.inc:97
+#: plugins/admin/systems/class_terminalGeneric.inc:104
  #: ihtml/themes/default/setup_step4.tpl:91
  msgid "disabled"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  msgid "full access"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:576
+#: plugins/personal/posix/class_posixAccount.inc:568
  msgid "allow access to these hosts"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:622
+#: plugins/personal/posix/class_posixAccount.inc:614
  #, php-format
  msgid "Removing of user/posix account with dn '%s' failed."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:770
+#: plugins/personal/posix/class_posixAccount.inc:762
  msgid "Failed: overriding lock"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:859
+#: plugins/personal/posix/class_posixAccount.inc:851
  #, php-format
  msgid "Saving of user/posix account with dn '%s' failed."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:924
+#: plugins/personal/posix/class_posixAccount.inc:916
  msgid "The required field 'Home directory' is not set."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:919
  msgid "Please enter a valid path in 'Home directory' field."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:927
  msgid "Value specified as 'UID' is not valid."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:930
  msgid "Value specified as 'UID' is too small."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/admin/groups/class_groupGeneric.inc:797
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:791
  msgid "Value specified as 'GID' is not valid."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:945
-#: plugins/admin/groups/class_groupGeneric.inc:800
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:794
  msgid "Value specified as 'GID' is too small."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:953
+#: plugins/personal/posix/class_posixAccount.inc:945
  msgid "Value specified as 'shadowMin' is not valid."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:958
+#: plugins/personal/posix/class_posixAccount.inc:950
  msgid "Value specified as 'shadowMax' is not valid."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:955
  msgid "Value specified as 'shadowWarning' is not valid."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:966
+#: plugins/personal/posix/class_posixAccount.inc:958
  msgid "'shadowWarning' without 'shadowMax' makes no sense."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:969
+#: plugins/personal/posix/class_posixAccount.inc:961
  msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:972
+#: plugins/personal/posix/class_posixAccount.inc:964
  msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:977
+#: plugins/personal/posix/class_posixAccount.inc:969
  msgid "Value specified as 'shadowInactive' is not valid."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:980
+#: plugins/personal/posix/class_posixAccount.inc:972
  msgid "'shadowInactive' without 'shadowMax' makes no sense."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:985
+#: plugins/personal/posix/class_posixAccount.inc:977
  msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1148
-#: plugins/admin/groups/class_groupGeneric.inc:836
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:830
  msgid "Too many users, can't allocate a free ID!"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1317
+#: plugins/personal/posix/class_posixAccount.inc:1309
  msgid "POSIX account"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1329
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:100
+#: plugins/personal/posix/class_posixAccount.inc:1314
+msgid "Posix Account"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:1322
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:100
  #: html/getxls.php:135 html/getxls.php:158 html/getxls.php:347
  #: html/getxls.php:364
  msgid "User ID"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1330
+#: plugins/personal/posix/class_posixAccount.inc:1323
  msgid "Group ID"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1332
+#: plugins/personal/posix/class_posixAccount.inc:1325
  msgid "Force password change on login"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1333
+#: plugins/personal/posix/class_posixAccount.inc:1326
  msgid "Shadow min"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1334
+#: plugins/personal/posix/class_posixAccount.inc:1327
  msgid "Shadow max"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1335
+#: plugins/personal/posix/class_posixAccount.inc:1328
  msgid "Shadow warning"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1336
+#: plugins/personal/posix/class_posixAccount.inc:1329
  msgid "Shadow inactive"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1337
+#: plugins/personal/posix/class_posixAccount.inc:1330
  msgid "Shadow expire"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:1338
+#: plugins/personal/posix/class_posixAccount.inc:1331
  msgid "System trust model"
  msgstr ""
  
@@ -1763,7 +1790,7 @@ msgid "Allow user to change password from client"
  msgstr ""
  
  #: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1056
  msgid "Login from windows client requires no password"
  msgstr ""
  
@@ -1772,7 +1799,7 @@ msgid "Temporary disable samba account"
  msgstr ""
  
  #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1069
+#: plugins/personal/samba/class_sambaAccount.inc:1070
  msgid "Domain"
  msgstr ""
  
@@ -1781,12 +1808,12 @@ msgid "Terminal Server"
  msgstr ""
  
  #: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1052
  msgid "Allow login on terminal server"
  msgstr ""
  
  #: plugins/personal/samba/samba3.tpl:131
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1053
  msgid "Inherit client config"
  msgstr ""
  
@@ -1851,17 +1878,17 @@ msgid "Reconnect if disconnected"
  msgstr ""
  
  #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1057
  msgid "Lock samba account"
  msgstr ""
  
  #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1062
+#: plugins/personal/samba/class_sambaAccount.inc:1063
  msgid "Limit Logon Time"
  msgstr ""
  
  #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1063
+#: plugins/personal/samba/class_sambaAccount.inc:1064
  msgid "Limit Logoff Time"
  msgstr ""
  
@@ -1988,35 +2015,39 @@ msgstr ""
  msgid "Saving of user/samba account with dn '%s' failed."
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1047
+msgid "Samba account"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1055
  msgid "Allow user to change password"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1059
+#: plugins/personal/samba/class_sambaAccount.inc:1060
  msgid "Account expires"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1060
+#: plugins/personal/samba/class_sambaAccount.inc:1061
  msgid "Password expires"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1065
+#: plugins/personal/samba/class_sambaAccount.inc:1066
  msgid "Generic home directory"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1066
+#: plugins/personal/samba/class_sambaAccount.inc:1067
  msgid "Generic samba home drive"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1067
+#: plugins/personal/samba/class_sambaAccount.inc:1068
  msgid "Generic script path"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1068
+#: plugins/personal/samba/class_sambaAccount.inc:1069
  msgid "Generic profile path"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1070
+#: plugins/personal/samba/class_sambaAccount.inc:1071
  msgid "Allow connection from"
  msgstr ""
  
@@ -2032,222 +2063,213 @@ msgstr ""
  msgid "This account has no valid GOsa extensions."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:335
  msgid "The specified file has not been uploaded via HTTP POST! Aborted."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:432
  msgid "Please enter a valid serial number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:471
+#: plugins/personal/generic/class_user.inc:476
  msgid ""
  "(Some types of certificates are currently not supported and may be displayed "
  "as 'invalid'.)"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:481
+#: plugins/personal/generic/class_user.inc:486
  #, php-format
  msgid "Certificate is valid from %s to %s and is currently %s."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:484
+#: plugins/personal/generic/class_user.inc:489
  msgid "valid"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:485
+#: plugins/personal/generic/class_user.inc:490
  msgid "invalid"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:490
+#: plugins/personal/generic/class_user.inc:495
  msgid "No certificate installed"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:579
+#: plugins/personal/generic/class_user.inc:582
  #, php-format
  msgid "Removing of user/generic account with dn '%s' failed."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:611
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:982
  msgid "Kerberos database communication failed"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:625
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:628
+#: plugins/personal/generic/class_user.inc:999
  msgid "Can't remove user from kerberos database."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:682
-#: plugins/admin/systems/class_printGeneric.inc:625
+#: plugins/personal/generic/class_user.inc:684
  #, php-format
  msgid "You are not allowed to move this object to '%s'."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:935
  #, php-format
  msgid "Saving of user/generic account with dn '%s' failed."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1008
+#: plugins/personal/generic/class_user.inc:1010
  msgid "Can't add user to kerberos database."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1049
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1052
-msgid "You have no permissions to move this user to the specified 'Base'."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1058
-#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/personal/generic/class_user.inc:1057
+#: plugins/addons/addressbook/class_addressbook.inc:653
  #: plugins/admin/users/class_userManagement.inc:471
  #: plugins/admin/users/class_userManagement.inc:549
  msgid "The required field 'Name' is not set."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1067
+#: plugins/personal/generic/class_user.inc:1066
  msgid "There's already a person with this 'Login' in the database."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/personal/generic/class_user.inc:1072
+#: plugins/addons/addressbook/class_addressbook.inc:657
  #: plugins/admin/users/class_userManagement.inc:474
  #: plugins/admin/users/class_userManagement.inc:552
  msgid "The required field 'Given name' is not set."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1075
  msgid "The required field 'Login' is not set."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1082
  msgid ""
  "There's already a person with this 'Name'/'Given name' combination in the "
  "database."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1090
+#: plugins/personal/generic/class_user.inc:1089
  msgid ""
  "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1093
+#: plugins/personal/generic/class_user.inc:1092
  msgid "The field 'Homepage' contains an invalid URL definition."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1096
-#: plugins/personal/generic/class_user.inc:1121
-#: plugins/addons/addressbook/class_addressbook.inc:661
-#: plugins/addons/addressbook/class_addressbook.inc:689
-#: plugins/admin/departments/class_departmentGeneric.inc:249
+#: plugins/personal/generic/class_user.inc:1095
+#: plugins/personal/generic/class_user.inc:1120
+#: plugins/addons/addressbook/class_addressbook.inc:663
+#: plugins/addons/addressbook/class_addressbook.inc:691
+#: plugins/admin/departments/class_departmentGeneric.inc:269
  msgid "The field 'Name' contains invalid characters."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1099
-#: plugins/personal/generic/class_user.inc:1118
-#: plugins/addons/addressbook/class_addressbook.inc:664
-#: plugins/addons/addressbook/class_addressbook.inc:686
+#: plugins/personal/generic/class_user.inc:1098
+#: plugins/personal/generic/class_user.inc:1117
+#: plugins/addons/addressbook/class_addressbook.inc:666
+#: plugins/addons/addressbook/class_addressbook.inc:688
  msgid "The field 'Given name' contains invalid characters."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1104
-#: plugins/addons/addressbook/class_addressbook.inc:669
-#: plugins/addons/addressbook/class_addressbook.inc:672
-#: plugins/admin/departments/class_departmentGeneric.inc:252
+#: plugins/personal/generic/class_user.inc:1103
+#: plugins/addons/addressbook/class_addressbook.inc:671
+#: plugins/addons/addressbook/class_addressbook.inc:674
+#: plugins/admin/departments/class_departmentGeneric.inc:272
  msgid "The field 'Phone' contains an invalid phone number."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1107
-#: plugins/addons/addressbook/class_addressbook.inc:675
-#: plugins/admin/departments/class_departmentGeneric.inc:255
+#: plugins/personal/generic/class_user.inc:1106
+#: plugins/addons/addressbook/class_addressbook.inc:677
+#: plugins/admin/departments/class_departmentGeneric.inc:275
  msgid "The field 'Fax' contains an invalid phone number."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1110
-#: plugins/addons/addressbook/class_addressbook.inc:678
+#: plugins/personal/generic/class_user.inc:1109
+#: plugins/addons/addressbook/class_addressbook.inc:680
  msgid "The field 'Mobile' contains an invalid phone number."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1113
-#: plugins/addons/addressbook/class_addressbook.inc:681
+#: plugins/personal/generic/class_user.inc:1112
+#: plugins/addons/addressbook/class_addressbook.inc:683
  msgid "The field 'Pager' contains an invalid phone number."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1222
+#: plugins/personal/generic/class_user.inc:1221
  msgid "Could not open specified certificate!"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1353
+#: plugins/personal/generic/class_user.inc:1352
  #: plugins/personal/generic/generic.tpl:442
  msgid "Unit"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1354
+#: plugins/personal/generic/class_user.inc:1353
  #: plugins/personal/generic/generic.tpl:467
  msgid "House identifier"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/class_user.inc:1354
  #: plugins/personal/generic/generic.tpl:384
  msgid "Vocation"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1355
  #: plugins/personal/generic/generic.tpl:511
  msgid "Last delivery"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1357
+#: plugins/personal/generic/class_user.inc:1356
  #: plugins/personal/generic/generic.tpl:433
  msgid "Person locality"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1358
+#: plugins/personal/generic/class_user.inc:1357
  #: plugins/personal/generic/generic.tpl:392
  msgid "Unit description"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1359
+#: plugins/personal/generic/class_user.inc:1358
  #: plugins/personal/generic/generic.tpl:401
  msgid "Subject area"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/class_user.inc:1359
  #: plugins/personal/generic/generic.tpl:410
  msgid "Functional title"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/class_user.inc:1361
  #: plugins/personal/generic/generic.tpl:520
  msgid "Public visible"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1363
+#: plugins/personal/generic/class_user.inc:1362
  #: plugins/personal/generic/generic.tpl:451
  msgid "Street"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1363
  #: plugins/personal/generic/generic.tpl:419
  msgid "Role"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/class_user.inc:1364
  #: plugins/personal/generic/generic.tpl:459
  #: plugins/addons/addressbook/address_edit.tpl:179
  #: plugins/addons/addressbook/address_info.tpl:133 html/getxls.php:227
  msgid "Postal code"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1369
+#: plugins/personal/generic/class_user.inc:1368
  msgid "Generic user settings"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:1373
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/users/class_userManagement.inc:28
  #: plugins/admin/systems/printer.tpl:91
@@ -2257,206 +2279,207 @@ msgstr ""
  msgid "Users"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1378
+#: plugins/personal/generic/class_user.inc:1377
  #: plugins/personal/generic/generic.tpl:143
  #: plugins/gofax/blocklists/generic.tpl:17
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:598
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
  #: plugins/addons/godfs/class_dfsManagment.inc:217
  #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:894
-#: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/groups/class_groupGeneric.inc:888
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:129
  #: plugins/admin/applications/generic.tpl:42
-#: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:134
+#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/class_divListApplication.inc:144
  #: plugins/admin/departments/generic.tpl:35
-#: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:107
+#: plugins/admin/departments/class_departmentGeneric.inc:586
+#: plugins/admin/departments/class_divListDepartment.inc:100
  #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:22
  #: plugins/admin/systems/phone.tpl:17 plugins/admin/systems/printer.tpl:27
  #: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/class_terminalGeneric.inc:513
-#: plugins/admin/systems/class_servGeneric.inc:346
-#: plugins/admin/systems/class_workstationGeneric.inc:515
+#: plugins/admin/systems/class_terminalGeneric.inc:553
+#: plugins/admin/systems/class_servGeneric.inc:359
+#: plugins/admin/systems/class_workstationGeneric.inc:537
  #: plugins/admin/systems/wingeneric.tpl:13
  #: plugins/admin/systems/component.tpl:17
-#: plugins/admin/systems/class_printGeneric.inc:864
-#: plugins/admin/systems/class_componentGeneric.inc:267
-#: plugins/admin/systems/class_glpiSelectUser.inc:167
+#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_componentGeneric.inc:269
+#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_glpiSelectUser.inc:181
  #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:148
+#: plugins/admin/systems/class_divListSystem.inc:187
  #: plugins/admin/systems/goLdapServer.tpl:2
  #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:719
-#: plugins/admin/ogroups/class_divListOGroup.inc:145
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_divListOGroup.inc:149
+#: plugins/admin/acl/class_divListACL.inc:98
+#: plugins/admin/fai/class_divListFai.inc:171
  #: plugins/admin/mimetypes/generic.tpl:44
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:683
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:153
  #: plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/class_gofonMacro.inc:484
-#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/macro/class_gofonMacro.inc:497
+#: plugins/gofon/macro/class_divListMacros.inc:106
  #: plugins/gofon/conference/generic.tpl:49
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
-#: plugins/gofon/conference/class_divListConferences.inc:119
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_divListConferences.inc:114
  msgid "Base"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/addons/addressbook/class_addressbook.inc:792 html/getxls.php:301
  msgid "Surename"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/addons/addressbook/class_addressbook.inc:611
-#: plugins/addons/addressbook/class_addressbook.inc:791 html/getxls.php:86
+#: plugins/personal/generic/class_user.inc:1380
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/addressbook/class_addressbook.inc:793 html/getxls.php:86
  #: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
  msgid "Given name"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/addons/addressbook/class_addressbook.inc:796
+#: plugins/personal/generic/class_user.inc:1381
+#: plugins/addons/addressbook/class_addressbook.inc:798
  msgid "User identification"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1383
+#: plugins/personal/generic/class_user.inc:1382
  #: plugins/personal/generic/generic.tpl:73
  #: plugins/addons/addressbook/address_edit.tpl:60
  #: plugins/addons/addressbook/address_info.tpl:40
  msgid "Personal title"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1384
+#: plugins/personal/generic/class_user.inc:1383
  #: plugins/personal/generic/generic.tpl:83
  msgid "Academic title"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
+#: plugins/personal/generic/class_user.inc:1384
+#: plugins/addons/addressbook/class_addressbook.inc:809 html/getxls.php:224
  msgid "Home postal address"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1386
-#: plugins/addons/addressbook/class_addressbook.inc:795
+#: plugins/personal/generic/class_user.inc:1385
+#: plugins/addons/addressbook/class_addressbook.inc:797
  msgid "Home phone number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1387
+#: plugins/personal/generic/class_user.inc:1386
  #: plugins/personal/generic/generic.tpl:183
  msgid "Homepage"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1388
+#: plugins/personal/generic/class_user.inc:1387
  #: plugins/personal/generic/generic.tpl:250
-#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
+#: plugins/addons/addressbook/class_addressbook.inc:801 html/getxls.php:299
  msgid "Organization"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1389
+#: plugins/personal/generic/class_user.inc:1388
  #: plugins/personal/generic/generic.tpl:258
  #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
  #: plugins/addons/addressbook/address_edit.tpl:155
-#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/class_addressbook.inc:802
  #: plugins/addons/addressbook/address_info.tpl:117
  #: plugins/admin/users/class_divListUsers.inc:56
  #: plugins/admin/applications/class_divListApplication.inc:51
-#: plugins/admin/ogroups/class_ogroupManagement.inc:354
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
  #: plugins/gofon/macro/class_divListMacros.inc:52
  #: plugins/generic/references/class_reference.inc:38
  msgid "Department"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1390
+#: plugins/personal/generic/class_user.inc:1389
  #: plugins/personal/generic/generic.tpl:93
  msgid "Date of birth"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1391
+#: plugins/personal/generic/class_user.inc:1390
  msgid "Gender"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1392
+#: plugins/personal/generic/class_user.inc:1391
  msgid "Preferred language"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1392
  msgid "Department number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1394
+#: plugins/personal/generic/class_user.inc:1393
  msgid "Employee number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:1394
  #: plugins/personal/generic/generic.tpl:282
  msgid "Employee type"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:1395
  #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/class_addressbook.inc:801
+#: plugins/addons/addressbook/class_addressbook.inc:803
  #: plugins/addons/godfs/generic.tpl:34
  #: plugins/admin/departments/generic.tpl:56
  #: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: plugins/admin/departments/class_departmentGeneric.inc:587
  #: plugins/admin/systems/workstation.tpl:19
-#: plugins/admin/systems/class_workstationGeneric.inc:514
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_workstationGeneric.inc:536
+#: plugins/admin/systems/class_printGeneric.inc:870
  #: plugins/admin/systems/class_glpiAccount.inc:782
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
  msgid "Location"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1397
+#: plugins/personal/generic/class_user.inc:1396
  #: plugins/personal/generic/generic.tpl:360
-#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:806
  #: plugins/admin/departments/generic.tpl:60
-#: plugins/admin/departments/class_departmentGeneric.inc:547
+#: plugins/admin/departments/class_departmentGeneric.inc:591
  #: html/getxls.php:228 html/getxls.php:301
  msgid "State"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1397
  #: plugins/personal/generic/paste_generic.tpl:47
  msgid "User picture"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1398
  msgid "Room number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1400
-#: plugins/addons/addressbook/class_addressbook.inc:792
+#: plugins/personal/generic/class_user.inc:1399
+#: plugins/addons/addressbook/class_addressbook.inc:794
  msgid "Telefon number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1401
-#: plugins/addons/addressbook/class_addressbook.inc:794
+#: plugins/personal/generic/class_user.inc:1400
+#: plugins/addons/addressbook/class_addressbook.inc:796
  msgid "Mobile number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1402
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/nagios/class_nagiosAccount.inc:272
  msgid "Pager number"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1402
  msgid "User certificates"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1405
-#: plugins/addons/addressbook/class_addressbook.inc:802
-#: plugins/addons/addressbook/class_addressbook.inc:803 html/getxls.php:226
+#: plugins/personal/generic/class_user.inc:1404
+#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:805 html/getxls.php:226
  #: html/getxls.php:298 html/getxls.php:300
  msgid "Postal address"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1406
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:820
-#: plugins/addons/addressbook/class_addressbook.inc:793
+#: plugins/personal/generic/class_user.inc:1405
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
+#: plugins/addons/addressbook/class_addressbook.inc:795
  msgid "Fax number"
  msgstr ""
  
@@ -2530,7 +2553,7 @@ msgstr ""
  #: plugins/admin/systems/workstation.tpl:35
  #: plugins/admin/systems/wingeneric.tpl:18
  #: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:36
+#: plugins/admin/mimetypes/generic.tpl:53 plugins/gofon/macro/generic.tpl:36
  #: plugins/gofon/conference/generic.tpl:56
  #: plugins/gofon/conference/generic.tpl:62
  msgid "Select a base"
@@ -2543,7 +2566,7 @@ msgstr ""
  #: plugins/addons/addressbook/address_info.tpl:59
  #: plugins/addons/addressbook/address_info.tpl:155
  #: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/class_departmentGeneric.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:592
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
  msgid "Address"
  msgstr ""
@@ -2601,7 +2624,7 @@ msgstr ""
  #: plugins/personal/generic/generic.tpl:326
  #: plugins/personal/nagios/nagios.tpl:79
  #: plugins/addons/addressbook/address_edit.tpl:246
-#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/class_addressbook.inc:800
  #: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
  #: html/getxls.php:300
  msgid "Pager"
@@ -2620,6 +2643,7 @@ msgstr ""
  
  #: plugins/personal/generic/generic_picture.tpl:27
  #: plugins/personal/generic/paste_generic.tpl:52
+#: plugins/admin/applications/generic.tpl:81
  msgid "Remove picture"
  msgstr ""
  
@@ -2627,37 +2651,38 @@ msgstr ""
  #: plugins/personal/generic/generic_certs.tpl:91
  #: plugins/personal/environment/hotplugDialogNew.tpl:53
  #: plugins/addons/addressbook/address_edit.tpl:264
-#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/departments/dep_move_confirm.tpl:15
+#: plugins/admin/systems/goNtpServer.tpl:29
  #: plugins/admin/systems/servdns.tpl:21
-#: plugins/admin/systems/servkolab.tpl:246
-#: plugins/admin/systems/goNtpServer.tpl:30
-#: plugins/admin/systems/goKrbServer.tpl:31
+#: plugins/admin/systems/servkolab.tpl:245
+#: plugins/admin/systems/goKrbServer.tpl:30
+#: plugins/admin/systems/goFonServer.tpl:39
  #: plugins/admin/systems/servnfs.tpl:139
-#: plugins/admin/systems/goFonServer.tpl:40
+#: plugins/admin/systems/goFaxServer.tpl:23
  #: plugins/admin/systems/servRepository.tpl:66
-#: plugins/admin/systems/goFaxServer.tpl:24
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
  #: plugins/admin/systems/glpi_devices.tpl:760
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
  #: plugins/admin/systems/servdnseditzone.tpl:119
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/goLdapServer.tpl:10
-#: plugins/admin/systems/goShareServer.tpl:30
-#: plugins/admin/systems/goMailServer.tpl:222
-#: plugins/admin/systems/goImapServer.tpl:117
-#: plugins/admin/systems/goSyslogServer.tpl:6
-#: plugins/admin/systems/goGlpiServer.tpl:33
-#: plugins/admin/systems/goCupsServer.tpl:6
-#: plugins/admin/systems/goTerminalServer.tpl:24
-#: plugins/admin/systems/goLogDBServer.tpl:24
-#: plugins/admin/systems/goSpamServer.tpl:126
-#: plugins/admin/systems/goSpamServerRule.tpl:22
-#: plugins/admin/systems/goVirusServer.tpl:169
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:29
+#: plugins/admin/systems/goMailServer.tpl:221
+#: plugins/admin/systems/goImapServer.tpl:116
+#: plugins/admin/systems/goSyslogServer.tpl:5
+#: plugins/admin/systems/goGlpiServer.tpl:32
+#: plugins/admin/systems/goCupsServer.tpl:5
+#: plugins/admin/systems/goTerminalServer.tpl:23
+#: plugins/admin/systems/goLogDBServer.tpl:23
+#: plugins/admin/systems/goSpamServer.tpl:125
+#: plugins/admin/systems/goSpamServerRule.tpl:21
+#: plugins/admin/systems/goVirusServer.tpl:168
  #: plugins/admin/systems/class_goService.inc:33
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:38
  #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/default/copyPasteDialog.tpl:19
  msgid "Save"
  msgstr ""
  
@@ -2679,21 +2704,21 @@ msgstr ""
  #: plugins/personal/connectivity/class_kolabAccount.inc:258
  #: plugins/personal/environment/environment.tpl:159
  #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:597
+#: plugins/admin/groups/class_groupMail.inc:604
  #: plugins/admin/applications/class_applicationParameters.inc:124
  #: plugins/admin/systems/printer.tpl:71
  #: plugins/admin/systems/glpiPrinter.tpl:152
  #: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:182
+#: plugins/admin/systems/workstationStartup.tpl:186
  #: plugins/admin/systems/terminalStartup.tpl:111
  #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:393
  #: plugins/admin/systems/goMailServer.tpl:73
  #: plugins/admin/systems/goMailServer.tpl:104
  #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:78
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
+#: plugins/admin/fai/faiPackage.tpl:81
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:293
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:295
  msgid "Remove"
  msgstr ""
  
@@ -2722,6 +2747,7 @@ msgid "Set new password"
  msgstr ""
  
  #: plugins/personal/connectivity/pureftpd.tpl:4
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
  msgid "FTP account"
  msgstr ""
  
@@ -2777,6 +2803,7 @@ msgstr ""
  
  #: plugins/personal/connectivity/proxy.tpl:23
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
+#: plugins/personal/connectivity/class_proxyAccount.inc:297
  msgid "Proxy account"
  msgstr ""
  
@@ -2789,7 +2816,7 @@ msgid "Limit proxy access to working time"
  msgstr ""
  
  #: plugins/personal/connectivity/proxy.tpl:84
-#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
  msgid "Restrict proxy usage by quota"
  msgstr ""
  
@@ -2825,19 +2852,24 @@ msgstr ""
  #: plugins/personal/connectivity/class_pureftpdAccount.inc:219
  #: plugins/personal/connectivity/class_oxchangeAccount.inc:950
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
  #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
  #: plugins/personal/connectivity/class_opengwAccount.inc:310
  msgid "Connectivity addon"
  msgstr ""
  
+#: plugins/personal/connectivity/class_phpgwAccount.inc:148
+msgid "PHPgroupware"
+msgstr ""
+
  #: plugins/personal/connectivity/phpgw.tpl:3
  msgid "PHPGroupware account"
  msgstr ""
  
  #: plugins/personal/connectivity/kolab.tpl:3
  #: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/class_kolabAccount.inc:452
  msgid "Kolab account"
  msgstr ""
  
@@ -2848,7 +2880,7 @@ msgid ""
  msgstr ""
  
  #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:459
+#: plugins/personal/connectivity/class_kolabAccount.inc:460
  msgid "Delegations"
  msgstr ""
  
@@ -2880,7 +2912,7 @@ msgid "days"
  msgstr ""
  
  #: plugins/personal/connectivity/kolab.tpl:93
-#: plugins/personal/connectivity/class_kolabAccount.inc:460
+#: plugins/personal/connectivity/class_kolabAccount.inc:461
  msgid "Invitation policy"
  msgstr ""
  
@@ -2957,15 +2989,15 @@ msgstr ""
  msgid "Kolab account settings"
  msgstr ""
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:456
+#: plugins/personal/connectivity/class_kolabAccount.inc:457
  msgid "Free busy future"
  msgstr ""
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:457
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
  msgid "Mail size restriction"
  msgstr ""
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:458
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
  msgid "Free busy information"
  msgstr ""
  
@@ -2985,6 +3017,7 @@ msgid "Saving of user/webDAV account with dn '%s' failed."
  msgstr ""
  
  #: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_webdavAccount.inc:147
  #: plugins/personal/connectivity/webdav.tpl:3
  msgid "WebDAV account"
  msgstr ""
@@ -3036,27 +3069,27 @@ msgstr ""
  msgid "Pure ftp account"
  msgstr ""
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
  msgid "Quota files"
  msgstr ""
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
  msgid "Upload ratio"
  msgstr ""
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
  msgid "Quota MBytes"
  msgstr ""
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
  msgid "Download ratio"
  msgstr ""
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
  msgid "Upload bandwith"
  msgstr ""
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
  msgid "Download bandwith"
  msgstr ""
  
@@ -3149,19 +3182,24 @@ msgstr ""
  msgid "Open xchange account settings"
  msgstr ""
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:959
-msgid "OXAppointmentDays"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
+msgid "OpenExchange account"
  msgstr ""
  
  #: plugins/personal/connectivity/class_oxchangeAccount.inc:960
-msgid "OXTaskDays"
+msgid "OXAppointmentDays"
  msgstr ""
  
  #: plugins/personal/connectivity/class_oxchangeAccount.inc:961
+msgid "OXTaskDays"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:962
  msgid "OXTimeZone"
  msgstr ""
  
  #: plugins/personal/connectivity/intranet.tpl:3
+#: plugins/personal/connectivity/class_intranetAccount.inc:181
  msgid "Intranet account"
  msgstr ""
  
@@ -3221,16 +3259,17 @@ msgstr ""
  msgid "Saving of user/proxy account with dn '%s' failed."
  msgstr ""
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:301
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
  msgid "Filter unwanted content"
  msgstr ""
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
  msgid "Limit proxy access"
  msgstr ""
  
  #: plugins/personal/connectivity/pptp.tpl:3
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_pptpAccount.inc:164
  msgid "PPTP account"
  msgstr ""
  
@@ -3249,7 +3288,7 @@ msgstr ""
  msgid "Saving of user/intranet account with dn '%s' failed."
  msgstr ""
  
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  msgid "Intranet account settings"
  msgstr ""
  
@@ -3274,29 +3313,30 @@ msgstr ""
  
  #: plugins/personal/connectivity/opengw.tpl:1
  #: plugins/personal/connectivity/class_opengwAccount.inc:309
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
  msgid "Opengroupware"
  msgstr ""
  
  #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:319
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
  msgid "Location team"
  msgstr ""
  
  #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:320
+#: plugins/personal/connectivity/class_opengwAccount.inc:321
  msgid "Template user"
  msgstr ""
  
  #: plugins/personal/connectivity/opengw.tpl:33
-#: plugins/personal/connectivity/class_opengwAccount.inc:321
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/ogroups/class_termgroup.inc:42
+#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/admin/systems/class_servGeneric.inc:53
+#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/ogroups/class_termgroup.inc:41
  msgid "Locked"
  msgstr ""
  
  #: plugins/personal/connectivity/opengw.tpl:48
-#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/personal/connectivity/class_opengwAccount.inc:323
  msgid "Teams"
  msgstr ""
  
@@ -3326,6 +3366,10 @@ msgstr ""
  msgid "PHP Schedule it settings"
  msgstr ""
  
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:149
+msgid "PHP schedule it"
+msgstr ""
+
  #: plugins/personal/connectivity/class_opengwAccount.inc:6
  msgid "Opengroupware account"
  msgstr ""
@@ -3383,7 +3427,7 @@ msgid "Profil quota"
  msgstr ""
  
  #: plugins/personal/environment/environment.tpl:73
-#: plugins/personal/environment/class_environment.inc:1282
+#: plugins/personal/environment/class_environment.inc:1285
  msgid "Cache profile localy"
  msgstr ""
  
@@ -3392,7 +3436,7 @@ msgid "Kiosk profile settings"
  msgstr ""
  
  #: plugins/personal/environment/environment.tpl:85
-#: plugins/personal/environment/class_environment.inc:1288
+#: plugins/personal/environment/class_environment.inc:1291
  msgid "Kiosk profile"
  msgstr ""
  
@@ -3401,22 +3445,22 @@ msgid "Manage"
  msgstr ""
  
  #: plugins/personal/environment/environment.tpl:105
-#: plugins/personal/environment/class_environment.inc:1281
+#: plugins/personal/environment/class_environment.inc:1284
  msgid "Resolution changeable during session"
  msgstr ""
  
  #: plugins/personal/environment/environment.tpl:110
-#: plugins/personal/environment/class_environment.inc:1287
+#: plugins/personal/environment/class_environment.inc:1290
  #: plugins/admin/systems/workstationService.tpl:122
  #: plugins/admin/systems/terminalService.tpl:108
  msgid "Resolution"
  msgstr ""
  
  #: plugins/personal/environment/environment.tpl:133
-#: plugins/personal/environment/class_environment.inc:1293
+#: plugins/personal/environment/class_environment.inc:1296
  #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1123
-#: plugins/admin/systems/workstationStartup.tpl:158
+#: plugins/admin/systems/class_workstationStartup.inc:1168
+#: plugins/admin/systems/workstationStartup.tpl:162
  #: plugins/admin/systems/terminalStartup.tpl:87
  #: plugins/admin/systems/goShareServer.tpl:1
  msgid "Shares"
@@ -3445,7 +3489,7 @@ msgid "Logon script management"
  msgstr ""
  
  #: plugins/personal/environment/environment.tpl:203
-#: plugins/personal/environment/class_environment.inc:1292
+#: plugins/personal/environment/class_environment.inc:1295
  msgid "Hotplug devices"
  msgstr ""
  
@@ -3455,7 +3499,7 @@ msgstr ""
  
  #: plugins/personal/environment/environment.tpl:219
  #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "New"
  msgstr ""
  
@@ -3508,7 +3552,7 @@ msgid "Please select an entry or press cancel."
  msgstr ""
  
  #: plugins/personal/environment/class_selectPrinterDialog.inc:102
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:140
  msgid "Please select a printer or press cancel."
  msgstr ""
  
@@ -3547,8 +3591,8 @@ msgid "auto"
  msgstr ""
  
  #: plugins/personal/environment/class_environment.inc:230
-#: plugins/admin/systems/class_terminalService.inc:95
  #: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_terminalService.inc:97
  #, php-format
  msgid ""
  "You have specified an external resolution hook which can't be read, please "
@@ -3611,7 +3655,7 @@ msgstr ""
  #: plugins/personal/environment/class_environment.inc:591
  #: plugins/personal/environment/class_environment.inc:604
  #: plugins/admin/systems/class_terminalStartup.inc:203
-#: plugins/admin/systems/class_workstationStartup.inc:616
+#: plugins/admin/systems/class_workstationStartup.inc:645
  msgid "You must specify a valid mount point."
  msgstr ""
  
@@ -3674,27 +3718,29 @@ msgid "Administrator"
  msgstr ""
  
  #: plugins/personal/environment/class_environment.inc:1243
-#: plugins/personal/environment/class_environment.inc:1290
+#: plugins/personal/environment/class_environment.inc:1293
  msgid "Default printer"
  msgstr ""
  
  #: plugins/personal/environment/class_environment.inc:1270
+#: plugins/personal/environment/class_environment.inc:1275
+#: plugins/personal/environment/class_environment.inc:1277
  msgid "Environment settings"
  msgstr ""
  
-#: plugins/personal/environment/class_environment.inc:1277
+#: plugins/personal/environment/class_environment.inc:1280
  msgid "Command to extend the list of possible screen resolutions"
  msgstr ""
  
-#: plugins/personal/environment/class_environment.inc:1284
+#: plugins/personal/environment/class_environment.inc:1287
  msgid "Profile quota"
  msgstr ""
  
-#: plugins/personal/environment/class_environment.inc:1285
+#: plugins/personal/environment/class_environment.inc:1288
  msgid "Profile server"
  msgstr ""
  
-#: plugins/personal/environment/class_environment.inc:1291
+#: plugins/personal/environment/class_environment.inc:1294
  #: plugins/personal/environment/logonManagement.tpl:56
  msgid "Logon script"
  msgstr ""
@@ -3740,31 +3786,31 @@ msgstr ""
  #: plugins/personal/environment/logonManagement.tpl:17
  #: plugins/personal/environment/hotplugDialogNew.tpl:17
  #: plugins/gofax/blocklists/generic.tpl:51
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:597
  #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
  #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:889
  #: plugins/admin/applications/generic.tpl:33
-#: plugins/admin/applications/class_applicationGeneric.inc:525
+#: plugins/admin/applications/class_applicationGeneric.inc:534
  #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/departments/class_departmentGeneric.inc:540
-#: plugins/admin/systems/class_winGeneric.inc:260
+#: plugins/admin/departments/class_departmentGeneric.inc:584
+#: plugins/admin/systems/class_winGeneric.inc:281
  #: plugins/admin/systems/server.tpl:14 plugins/admin/systems/phone.tpl:34
  #: plugins/admin/systems/printer.tpl:16
-#: plugins/admin/systems/class_servGeneric.inc:344
+#: plugins/admin/systems/class_servGeneric.inc:357
  #: plugins/admin/systems/wingeneric.tpl:25
  #: plugins/admin/systems/component.tpl:35
-#: plugins/admin/systems/class_printGeneric.inc:865
-#: plugins/admin/systems/class_componentGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_componentGeneric.inc:270
  #: plugins/admin/systems/servnfs.tpl:19
-#: plugins/admin/systems/class_phoneGeneric.inc:435
+#: plugins/admin/systems/class_phoneGeneric.inc:441
  #: plugins/admin/systems/class_goMailServer.inc:695
  #: plugins/admin/systems/class_goShareServer.inc:372
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:720
+#: plugins/admin/ogroups/class_ogroup.inc:703
  #: plugins/admin/fai/faiVariable.tpl:21
-#: plugins/admin/fai/class_faiScript.inc:527
-#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/class_faiScript.inc:538
+#: plugins/admin/fai/class_faiTemplate.inc:508
  #: plugins/admin/fai/faiPackage.tpl:21
  #: plugins/admin/fai/faiPartitionTable.tpl:21
  #: plugins/admin/fai/class_faiScriptEntry.inc:180
@@ -3772,7 +3818,7 @@ msgstr ""
  #: plugins/admin/fai/class_faiPackage.inc:537
  #: plugins/admin/fai/class_faiProfile.inc:452
  #: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:21
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:464
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:13
  #: plugins/admin/fai/faiScript.tpl:21
  #: plugins/admin/fai/class_faiVariableEntry.inc:143
@@ -3781,16 +3827,16 @@ msgstr ""
  #: plugins/admin/fai/class_faiPartitionTable.inc:529
  #: plugins/admin/fai/class_faiHookEntry.inc:189
  #: plugins/admin/fai/faiHookEntry.tpl:19
-#: plugins/admin/fai/class_faiVariable.inc:421
+#: plugins/admin/fai/class_faiVariable.inc:417
  #: plugins/admin/fai/class_faiTemplateEntry.inc:248
  #: plugins/admin/fai/faiTemplateEntry.tpl:13
-#: plugins/admin/mimetypes/generic.tpl:35
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:674
+#: plugins/admin/mimetypes/generic.tpl:34
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:682
  #: plugins/admin/mimetypes/paste_generic.tpl:21
  #: plugins/gofon/macro/generic.tpl:49
-#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/macro/class_gofonMacro.inc:498
  #: plugins/gofon/conference/generic.tpl:78
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
  #: plugins/generic/references/contents.tpl:11 html/getxls.php:158
  #: html/getxls.php:287
  msgid "Description"
@@ -3822,11 +3868,11 @@ msgstr ""
  #: plugins/admin/groups/application_options.tpl:11
  #: plugins/admin/users/class_userManagement.inc:654
  #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:503
+#: plugins/admin/systems/class_systemManagement.inc:651
  #: plugins/admin/systems/printerPPDDialog.tpl:22
  #: plugins/admin/systems/servRepositorySetup.tpl:54
-#: plugins/admin/ogroups/class_ogroupManagement.inc:304
-#: plugins/admin/fai/class_faiManagement.inc:616
+#: plugins/admin/ogroups/class_ogroupManagement.inc:299
+#: plugins/admin/fai/class_faiManagement.inc:626
  #: plugins/admin/fai/faiProfileEntry.tpl:70
  #: plugins/admin/fai/faiScriptEntry.tpl:82
  #: plugins/admin/fai/faiVariableEntry.tpl:54
@@ -3835,9 +3881,9 @@ msgstr ""
  #: plugins/admin/fai/faiPackageEntry.tpl:56
  #: plugins/admin/fai/faiPackageConfiguration.tpl:6
  #: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:340
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:342
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:260
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:253
  #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
  #: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
  msgid "Apply"
@@ -3922,7 +3968,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
-#: plugins/admin/fai/class_faiSummaryTab.inc:209
+#: plugins/admin/fai/class_faiSummaryTab.inc:236
  #: include/class_MultiSelectWindow.inc:81
  msgid "Close"
  msgstr ""
@@ -3932,37 +3978,37 @@ msgid "Nagios Account"
  msgstr ""
  
  #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
  msgid "Alias"
  msgstr ""
  
  #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:276
+#: plugins/personal/nagios/class_nagiosAccount.inc:277
  msgid "Host notification period"
  msgstr ""
  
  #: plugins/personal/nagios/nagios.tpl:40
-#: plugins/personal/nagios/class_nagiosAccount.inc:280
+#: plugins/personal/nagios/class_nagiosAccount.inc:281
  msgid "Service notification period"
  msgstr ""
  
  #: plugins/personal/nagios/nagios.tpl:53
-#: plugins/personal/nagios/class_nagiosAccount.inc:279
+#: plugins/personal/nagios/class_nagiosAccount.inc:280
  msgid "Service notification options"
  msgstr ""
  
  #: plugins/personal/nagios/nagios.tpl:66
-#: plugins/personal/nagios/class_nagiosAccount.inc:275
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
  msgid "Host notification options"
  msgstr ""
  
  #: plugins/personal/nagios/nagios.tpl:90
-#: plugins/personal/nagios/class_nagiosAccount.inc:278
+#: plugins/personal/nagios/class_nagiosAccount.inc:279
  msgid "Service notification commands"
  msgstr ""
  
  #: plugins/personal/nagios/nagios.tpl:100
-#: plugins/personal/nagios/class_nagiosAccount.inc:274
+#: plugins/personal/nagios/class_nagiosAccount.inc:275
  msgid "Host notification commands"
  msgstr ""
  
@@ -4049,31 +4095,35 @@ msgstr ""
  msgid "Nagios account settings"
  msgstr ""
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:282
-msgid "View all hosts"
+#: plugins/personal/nagios/class_nagiosAccount.inc:265
+msgid "Nagios account"
  msgstr ""
  
  #: plugins/personal/nagios/class_nagiosAccount.inc:283
+msgid "View all hosts"
+msgstr ""
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:284
  msgid "View all services"
  msgstr ""
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:285
+#: plugins/personal/nagios/class_nagiosAccount.inc:286
  msgid "Trigger system commands"
  msgstr ""
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:286
+#: plugins/personal/nagios/class_nagiosAccount.inc:287
  msgid "Trigger all host commands"
  msgstr ""
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:287
+#: plugins/personal/nagios/class_nagiosAccount.inc:288
  msgid "Trigger all service commands"
  msgstr ""
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:289
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
  msgid "View configuration information"
  msgstr ""
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:290
+#: plugins/personal/nagios/class_nagiosAccount.inc:291
  msgid "View system informations"
  msgstr ""
  
@@ -4082,7 +4132,7 @@ msgid "Nagios settings"
  msgstr ""
  
  #: plugins/personal/netatalk/netatalk.tpl:4
-#: plugins/personal/netatalk/class_netatalk.inc:365
+#: plugins/personal/netatalk/class_netatalk.inc:366
  msgid "Share"
  msgstr ""
  
@@ -4139,7 +4189,11 @@ msgstr ""
  msgid "Removing of user/netatalk account with dn '%s' failed."
  msgstr ""
  
-#: plugins/personal/netatalk/class_netatalk.inc:364
+#: plugins/personal/netatalk/class_netatalk.inc:360
+msgid "Netatalk account"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:365
  msgid "User home path"
  msgstr ""
  
@@ -4172,9 +4226,9 @@ msgstr ""
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
  #: plugins/admin/systems/class_goShareServer.inc:373
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
-#: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiSummaryTab.inc:345
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:136
  msgid "Type"
  msgstr ""
  
@@ -4197,13 +4251,15 @@ msgstr ""
  #: plugins/gofax/blocklists/remove.tpl:2
  #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
  #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/systems/remove_ppd.tpl:2
  #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
  #: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
  #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
  #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:339 html/index.php:345
+#: html/index.php:49 html/index.php:337 html/index.php:343
  #: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/remove.tpl:2
  msgid "Warning"
@@ -4230,76 +4286,73 @@ msgid "Blocklist management"
  msgstr ""
  
  #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
  msgid "FAX Blocklists"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:168
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:167
  #, php-format
  msgid "You're about to delete the blocklist '%s'."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:185
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:184
  msgid "You have no permission to remove this blocklist."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:200
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:199
  msgid "Please specify a valid phone number."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "send"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "receive"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:435
  #, php-format
  msgid "Removing of blocklist with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:477
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:482
-#: plugins/admin/departments/class_departmentGeneric.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:487
+#: plugins/admin/departments/class_departmentGeneric.inc:258
  msgid "Required field 'Name' is not set."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:490
  msgid "Required field 'Name' contains invalid characters"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:497
  msgid "Specified name is already used."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:547
  #, php-format
  msgid "Saving of blocklist with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
-msgid "Fax Blocklists"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
+msgid "Fax blocklists"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:596
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/addressbook/address_info.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:893
-#: plugins/admin/applications/class_applicationGeneric.inc:523
-#: plugins/admin/applications/class_applicationGeneric.inc:527
-#: plugins/admin/systems/class_terminalGeneric.inc:514
-#: plugins/admin/systems/class_servGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:863
-#: plugins/admin/systems/class_componentGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:887
+#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/systems/class_terminalGeneric.inc:554
+#: plugins/admin/systems/class_servGeneric.inc:356
+#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_componentGeneric.inc:268
  #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_phoneGeneric.inc:434
-#: plugins/admin/systems/class_servRepository.inc:358
+#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_servRepository.inc:374
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:105
@@ -4319,10 +4372,10 @@ msgstr ""
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
  #: plugins/admin/systems/class_goShareServer.inc:370
  #: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:701
  #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
  #: plugins/admin/fai/faiPackage.tpl:9
  #: plugins/admin/fai/faiPartitionTable.tpl:9
  #: plugins/admin/fai/class_faiScriptEntry.inc:179
@@ -4330,7 +4383,7 @@ msgstr ""
  #: plugins/admin/fai/class_faiPackage.inc:536
  #: plugins/admin/fai/class_faiProfile.inc:451
  #: plugins/admin/fai/class_faiHook.inc:535 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:454
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
  #: plugins/admin/fai/faiScript.tpl:9
  #: plugins/admin/fai/class_faiVariableEntry.inc:142
@@ -4339,22 +4392,22 @@ msgstr ""
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
  #: plugins/admin/fai/class_faiHookEntry.inc:188
  #: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #: plugins/admin/fai/class_faiTemplateEntry.inc:247
  #: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:313
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
+#: plugins/admin/fai/class_faiSummaryTab.inc:340
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
  #: plugins/gofon/macro/parameter.tpl:6
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
  #: html/getxls.php:223 html/getxls.php:290
  msgid "Name"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:599
  msgid "Blocklist"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:600
  msgid "Blocklist type"
  msgstr ""
  
@@ -4417,7 +4470,7 @@ msgstr ""
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -4428,242 +4481,107 @@ msgstr ""
  msgid "Regular expression for matching list names"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Go to root department"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Root"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-msgid "Go up one department"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-#: include/class_acl.inc:368
-msgid "Up"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Go to users department"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
+msgid "Create new blocklist"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/fai/class_divListFai.inc:139
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Home"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
+msgid "New Blocklist"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/fai/class_divListFai.inc:141
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/conference/class_divListConferences.inc:103
-msgid "Reload list"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+msgid "Submit department"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
  #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
  #: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:142
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:103
-#: plugins/gofon/conference/class_divListConferences.inc:121
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+#: include/class_MultiSelectWindow.inc:209
  msgid "Submit"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
-msgid "Create new blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
-msgid "New Blocklist"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:121
-msgid "Submit department"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/users/class_divListUsers.inc:255
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:243
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
  #: plugins/admin/systems/glpiPrinter.tpl:18
  #: plugins/admin/systems/glpiPrinter.tpl:32 plugins/admin/systems/glpi.tpl:18
  #: plugins/admin/systems/glpi.tpl:32 plugins/admin/systems/glpi.tpl:46
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/acl/class_divListACL.inc:122
-#: plugins/admin/fai/class_faiScript.inc:283
-#: plugins/admin/fai/class_faiScript.inc:285
-#: plugins/admin/fai/class_faiTemplate.inc:257
-#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/acl/class_divListACL.inc:127
+#: plugins/admin/fai/class_faiScript.inc:293
+#: plugins/admin/fai/class_faiScript.inc:295
+#: plugins/admin/fai/class_faiTemplate.inc:270
+#: plugins/admin/fai/class_faiTemplate.inc:272
  #: plugins/admin/fai/class_faiHook.inc:294
  #: plugins/admin/fai/class_faiHook.inc:296
-#: plugins/admin/fai/class_divListFai.inc:241
-#: plugins/admin/fai/class_divListFai.inc:244
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/macro/class_divListMacros.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:159
-#: plugins/gofon/conference/class_divListConferences.inc:159
-#: include/class_acl.inc:370 include/class_acl.inc:415
+#: plugins/admin/fai/class_divListFai.inc:239
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/macro/class_divListMacros.inc:146
+#: plugins/gofon/conference/class_divListConferences.inc:155
+#: include/class_acl.inc:372 include/class_acl.inc:417
  msgid "edit"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/users/class_divListUsers.inc:256
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/users/class_divListUsers.inc:244
  msgid "Edit user"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:274
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/acl/class_divListACL.inc:125
-#: plugins/admin/fai/class_faiScript.inc:287
-#: plugins/admin/fai/class_faiTemplate.inc:261
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/addons/mailqueue/contents.tpl:94
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/users/class_divListUsers.inc:262
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/acl/class_divListACL.inc:131
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:274
  #: plugins/admin/fai/class_faiHook.inc:298
-#: plugins/admin/fai/class_divListFai.inc:252
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/macro/class_divListMacros.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:167
-#: plugins/gofon/conference/class_divListConferences.inc:169
-#: include/class_acl.inc:371 include/class_acl.inc:416
+#: plugins/admin/fai/class_divListFai.inc:250
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/macro/class_divListMacros.inc:154
+#: plugins/gofon/conference/class_divListConferences.inc:165
+#: include/class_acl.inc:373 include/class_acl.inc:418
  msgid "delete"
  msgstr ""
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/admin/users/class_divListUsers.inc:263
  msgid "Delete user"
  msgstr ""
  
@@ -4673,7 +4591,7 @@ msgid "Fax number for GOfax to trigger on"
  msgstr ""
  
  #: plugins/gofax/faxaccount/generic.tpl:21
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
  #: plugins/admin/ogroups/phonequeue.tpl:47
  #: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
  #: html/getxls.php:281
@@ -4685,7 +4603,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
  msgstr ""
  
  #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:831
  msgid "Delivery format"
  msgstr ""
  
@@ -4706,12 +4624,12 @@ msgid "Deliver fax as mail to"
  msgstr ""
  
  #: plugins/gofax/faxaccount/generic.tpl:70
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
  msgid "Deliver fax as mail"
  msgstr ""
  
  #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:830
  msgid "Deliver fax to printer"
  msgstr ""
  
@@ -4778,90 +4696,90 @@ msgstr ""
  msgid "FAX"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
  msgid "This account has no fax extensions."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
  msgid "Remove fax account"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
  msgid ""
  "This account has fax features enabled. You can disable them by clicking "
  "below."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
  msgid "Create fax account"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:159
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
  msgid ""
  "This account has fax features disabled. You can enable them by clicking "
  "below."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:222
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:229
  msgid "You're trying to add an invalid phone number."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:512
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:438
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:519
  #: plugins/admin/groups/class_groupApplication.inc:674
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
  msgid "back"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:617
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
  #, php-format
  msgid "Removing of user/fax account with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:632
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
  msgid "The required field 'Fax' is not set."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
  msgid "Please enter a valid telephone number in the 'Fax' field."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
  msgid "Mail delivery is checked, but no address has been specified."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:646
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
  msgid "The mail address you've entered is invalid."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
  msgid ""
  "Deliver fax to printer, is only possible if valid printer is given. Please "
  "correct your choice."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:737
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:744
  #, php-format
  msgid "Saving of user/fax account with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:808
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
  msgid "Fax account settings"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
  msgid "Enable/Disable fax"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
  msgid "Receive blocklist"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
  msgid "Send blocklist"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
  msgid "Alternate fax number"
  msgstr ""
  
@@ -4876,7 +4794,7 @@ msgid "Filter"
  msgstr ""
  
  #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:109
  #: plugins/addons/logview/contents.tpl:47
  #: plugins/addons/mailqueue/contents.tpl:11
  #: plugins/gofon/fonreports/contents.tpl:6
@@ -4915,17 +4833,17 @@ msgstr ""
  
  #: plugins/gofax/faxreports/contents.tpl:30
  #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:842
-#: plugins/admin/ogroups/class_ogroupManagement.inc:351
+#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/ogroups/class_ogroupManagement.inc:346
  #: plugins/admin/fai/faiTemplateEntry.tpl:110
  msgid "User"
  msgstr ""
  
  #: plugins/gofax/faxreports/contents.tpl:31
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #: plugins/addons/logview/contents.tpl:84
  #: plugins/gofon/fonreports/contents.tpl:30
-#: plugins/gofon/fonreports/class_fonreport.inc:398
+#: plugins/gofon/fonreports/class_fonreport.inc:399
  msgid "Date"
  msgstr ""
  
@@ -4966,22 +4884,22 @@ msgid "Date / Time"
  msgstr ""
  
  #: plugins/gofax/faxreports/detail.tpl:29
-#: plugins/gofax/faxreports/class_faxreport.inc:484
+#: plugins/gofax/faxreports/class_faxreport.inc:489
  msgid "Sender MSN"
  msgstr ""
  
  #: plugins/gofax/faxreports/detail.tpl:33
-#: plugins/gofax/faxreports/class_faxreport.inc:483
+#: plugins/gofax/faxreports/class_faxreport.inc:488
  msgid "Sender ID"
  msgstr ""
  
  #: plugins/gofax/faxreports/detail.tpl:37
-#: plugins/gofax/faxreports/class_faxreport.inc:486
+#: plugins/gofax/faxreports/class_faxreport.inc:491
  msgid "Receiver MSN"
  msgstr ""
  
  #: plugins/gofax/faxreports/detail.tpl:41
-#: plugins/gofax/faxreports/class_faxreport.inc:485
+#: plugins/gofax/faxreports/class_faxreport.inc:490
  msgid "Receiver ID"
  msgstr ""
  
@@ -4990,7 +4908,7 @@ msgid "Status message"
  msgstr ""
  
  #: plugins/gofax/faxreports/detail.tpl:53
-#: plugins/gofax/faxreports/class_faxreport.inc:489
+#: plugins/gofax/faxreports/class_faxreport.inc:494
  msgid "Transfer time"
  msgstr ""
  
@@ -5002,83 +4920,88 @@ msgstr ""
  msgid "FAX Reports"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:108
  msgid ""
  "No fax extension defined in your server configuration, no reports can be "
  "shown!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: plugins/gofax/faxreports/class_faxreport.inc:111
  #: plugins/addons/logview/class_logview.inc:75
  #: plugins/gofon/fonreports/class_fonreport.inc:163
  msgid "There is no mysql extension available, please check your php setup."
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:117
+#: plugins/gofax/faxreports/class_faxreport.inc:118
  msgid "Can't connect to fax database, no reports can be shown!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:121
+#: plugins/gofax/faxreports/class_faxreport.inc:122
  msgid "Can't select fax database for report generation!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:126
+#: plugins/gofax/faxreports/class_faxreport.inc:127
  msgid "Can't query fax table 'faxlog' for report generation!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:149
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:150
+#: plugins/gofax/faxreports/class_faxreport.inc:290
  msgid "Query for fax database failed!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:158
-#: plugins/gofax/faxreports/class_faxreport.inc:168
+#: plugins/gofax/faxreports/class_faxreport.inc:159
+#: plugins/gofax/faxreports/class_faxreport.inc:169
  msgid "You have no permission to retrieve informations about this fax id!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:196
-#: plugins/gofax/faxreports/class_faxreport.inc:311
-#: plugins/gofon/fonreports/class_fonreport.inc:221
+#: plugins/gofax/faxreports/class_faxreport.inc:200
+#: plugins/gofax/faxreports/class_faxreport.inc:315
+#: plugins/gofon/fonreports/class_fonreport.inc:223
  msgid "Y-M-D"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  msgid "Insufficient permissions to view this attribute"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/admin/groups/class_groupApplication.inc:427
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  msgid "Insufficient permissions"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:469
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:473
+#: plugins/gofax/faxreports/class_faxreport.inc:474
  msgid "Fax report"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:474
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  msgid "All entries are readonly"
  msgstr ""
  
  #: plugins/gofax/faxreports/class_faxreport.inc:479
+msgid "Fax reports"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:484
  msgid "Detailed view"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:480
+#: plugins/gofax/faxreports/class_faxreport.inc:485
  msgid "Fax ID"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  msgid "Time"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:487
+#: plugins/gofax/faxreports/class_faxreport.inc:492
  msgid "Number of pages"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:488
+#: plugins/gofax/faxreports/class_faxreport.inc:493
  msgid "Status Message"
  msgstr ""
  
@@ -5103,44 +5026,44 @@ msgstr ""
  msgid "Add entry"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:54
  #: plugins/admin/groups/class_groupApplication.inc:756
  msgid "Edit entry"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:55
+#: plugins/addons/addressbook/contents.tpl:58
  msgid "Remove entry"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Select to see regular users"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Show organizational entries"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Select to see users in addressbook"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Show addressbook entries"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:81
+#: plugins/addons/addressbook/contents.tpl:84
  msgid "Display results for department"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:94
+#: plugins/addons/addressbook/contents.tpl:97
  msgid "Match object"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:97
+#: plugins/addons/addressbook/contents.tpl:100
  msgid "Choose the object that will be searched in"
  msgstr ""
  
-#: plugins/addons/addressbook/contents.tpl:109
+#: plugins/addons/addressbook/contents.tpl:112
  msgid "Search string"
  msgstr ""
  
@@ -5149,10 +5072,10 @@ msgid "Dial connection..."
  msgstr ""
  
  #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:427
-#: plugins/addons/addressbook/class_addressbook.inc:434
-#: plugins/addons/addressbook/class_addressbook.inc:438
-#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/addons/addressbook/class_addressbook.inc:429
+#: plugins/addons/addressbook/class_addressbook.inc:436
+#: plugins/addons/addressbook/class_addressbook.inc:440
+#: plugins/addons/addressbook/class_addressbook.inc:553
  msgid "Dial"
  msgstr ""
  
@@ -5173,7 +5096,7 @@ msgid "Personal"
  msgstr ""
  
  #: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/class_addressbook.inc:807
  #: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
  #: html/getxls.php:298
  msgid "Initials"
@@ -5203,75 +5126,75 @@ msgstr ""
  
  #: plugins/addons/addressbook/address_edit.tpl:191
  #: plugins/addons/addressbook/address_info.tpl:141
-#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_departmentGeneric.inc:585
  msgid "Country"
  msgstr ""
  
-#: plugins/addons/addressbook/main.inc:35
+#: plugins/addons/addressbook/main.inc:36
  msgid "Address book"
  msgstr ""
  
  #: plugins/addons/addressbook/class_addressbook.inc:6
-#: plugins/addons/addressbook/class_addressbook.inc:781
-#: plugins/addons/addressbook/class_addressbook.inc:787
+#: plugins/addons/addressbook/class_addressbook.inc:783
+#: plugins/addons/addressbook/class_addressbook.inc:789
  msgid "Addressbook"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:172
+#: plugins/addons/addressbook/class_addressbook.inc:173
  #, php-format
  msgid "Dial from %s to %s now?"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:176
+#: plugins/addons/addressbook/class_addressbook.inc:177
  msgid ""
  "You have no personal phone number set. Please change that in order to "
  "perform direct dials."
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:202
-#: plugins/addons/addressbook/class_addressbook.inc:751
+#: plugins/addons/addressbook/class_addressbook.inc:203
+#: plugins/addons/addressbook/class_addressbook.inc:753
  #, php-format
  msgid "Removing of addressbook entry '%s' failed."
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:209
-#: plugins/addons/addressbook/class_addressbook.inc:318
+#: plugins/addons/addressbook/class_addressbook.inc:210
+#: plugins/addons/addressbook/class_addressbook.inc:319
  msgid "You are not allowed to delete this entry!"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:312
+#: plugins/addons/addressbook/class_addressbook.inc:313
  #, php-format
  msgid "You're about to delete the entry %s."
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:444
+#: plugins/addons/addressbook/class_addressbook.inc:446
  #, php-format
  msgid "Save contact for %s as vcard"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: plugins/addons/addressbook/class_addressbook.inc:452
  #, php-format
  msgid "Send mail to %s"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:565
  msgid "global addressbook"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/addons/addressbook/class_addressbook.inc:568
  msgid "user database"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/addons/addressbook/class_addressbook.inc:572
  #, php-format
  msgid "Contact stored in '%s'"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/addons/addressbook/class_addressbook.inc:574
  msgid "Creating new entry in"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/logview/class_logview.inc:112
  #: plugins/addons/logview/class_logview.inc:133
  #: plugins/addons/mailqueue/class_mailqueue.inc:306
@@ -5279,32 +5202,32 @@ msgstr ""
  msgid "All"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Work phone"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Cell phone"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:223
  msgid "Home phone"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:704
  msgid ""
  "Cannot create a unique DN for your entry. Please fill more formular fields."
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:782
+#: plugins/addons/addressbook/class_addressbook.inc:784
  msgid "Addressbook entry acls"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:806 html/getxls.php:301
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:301
  msgid "Title"
  msgstr ""
  
-#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: plugins/addons/addressbook/class_addressbook.inc:810 html/getxls.php:169
  #: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
  msgid "Common name"
  msgstr ""
@@ -5487,12 +5410,12 @@ msgid "CSV import"
  msgstr ""
  
  #: plugins/addons/ldapmanager/class_export.inc:77
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:91
  msgid "Error while exporting the requested entries!"
  msgstr ""
  
  #: plugins/addons/ldapmanager/class_export.inc:89
-#: plugins/addons/ldapmanager/class_exportxls.inc:102
+#: plugins/addons/ldapmanager/class_exportxls.inc:104
  #, php-format
  msgid "You are not allowed to export the given ldap entry (%s)"
  msgstr ""
@@ -5707,40 +5630,40 @@ msgstr ""
  msgid "Active"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/addons/mailqueue/contents.tpl:94
  msgid "Delete this message"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "unhold"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "Release message"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  msgid "hold"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  #: plugins/addons/mailqueue/class_mailqueue.inc:398
  msgid "Hold message"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "requeue"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "Requeue this message"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  msgid "header"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  msgid "Display header from this message"
  msgstr ""
  
@@ -5899,16 +5822,35 @@ msgstr ""
  msgid "Go up one dfsshare"
  msgstr ""
  
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:370
+#: include/class_MultiSelectWindow.inc:194
+#: include/class_MultiSelectWindow.inc:196
+msgid "Up"
+msgstr ""
+
  #: plugins/addons/godfs/class_dfsManagment.inc:214
  msgid "Go to dfs root"
  msgstr ""
  
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+#: include/class_MultiSelectWindow.inc:188
+msgid "Root"
+msgstr ""
+
  #: plugins/addons/godfs/class_dfsManagment.inc:215
  msgid "Create new dfsshare"
  msgstr ""
  
  #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:22
+#: ihtml/themes/default/copyPasteDialog.tpl:28
  msgid "Finish"
  msgstr ""
  
@@ -5958,7 +5900,7 @@ msgstr ""
  
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:890 include/class_acl.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:884 include/class_acl.inc:164
  #: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
  msgid "Groups"
  msgstr ""
@@ -5972,12 +5914,12 @@ msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
  msgstr ""
  
  #: plugins/addons/notifications/class_msgplug.inc:116
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/systems/class_terminalGeneric.inc:207
-#: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/systems/class_workstationGeneric.inc:161
-#: plugins/admin/ogroups/class_termgroup.inc:210
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_servGeneric.inc:92
+#: plugins/admin/systems/class_workstationGeneric.inc:167
+#: plugins/admin/ogroups/class_termgroup.inc:209
  #, php-format
  msgid "Execution of '%s' failed!"
  msgstr ""
@@ -6032,19 +5974,19 @@ msgstr ""
  
  #: plugins/addons/notifications/contents.tpl:74
  #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:433
-#: plugins/admin/departments/class_departmentGeneric.inc:518
+#: plugins/admin/departments/class_departmentGeneric.inc:469
+#: plugins/admin/departments/class_departmentGeneric.inc:561
  #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/ServiceAddDialog.tpl:29
-#: plugins/admin/fai/class_faiManagement.inc:447
-#: plugins/admin/fai/class_faiManagement.inc:623
-#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/systems/ServiceAddDialog.tpl:28
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/admin/fai/class_faiManagement.inc:633
+#: plugins/admin/fai/class_faiManagement.inc:639
  #: plugins/admin/fai/faiPackageNew.tpl:50
  #: ihtml/themes/default/setup_introduction.tpl:12
  #: ihtml/themes/default/setup_useradmin.tpl:41
  #: ihtml/themes/default/setup_step2.tpl:13
  #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/default/snapshotdialog.tpl:78
+#: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr ""
  
@@ -6157,96 +6099,90 @@ msgstr ""
  msgid "This 'dn' is no group."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Samba group"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain admins"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain users"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:328
+#: plugins/admin/groups/class_groupGeneric.inc:319
  msgid "Domain guests"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:324
  #, php-format
  msgid "Special group (%d)"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:446
+#: plugins/admin/groups/class_groupGeneric.inc:437
  msgid "! unknown id"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:483
+#: plugins/admin/groups/class_groupGeneric.inc:474
  #, php-format
  msgid ""
  "Your search method returned more than '%s' users, only '%s' users are shown."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/admin/groups/class_groupGeneric.inc:720
+#: plugins/admin/groups/class_groupGeneric.inc:503
+#: plugins/admin/groups/class_groupGeneric.inc:718
  #, php-format
  msgid "Removing of groups/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:630
+#: plugins/admin/groups/class_groupGeneric.inc:628
  #, php-format
  msgid "No configured SID found for '%s'."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:635
+#: plugins/admin/groups/class_groupGeneric.inc:633
  #, php-format
  msgid "No configured RIDBASE found for '%s'."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:746
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/ogroups/class_ogroup.inc:608
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:756
+#: plugins/admin/groups/class_groupGeneric.inc:750
  msgid ""
  "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:767
-#: plugins/admin/groups/class_groupGeneric.inc:781
-#: plugins/admin/groups/class_groupGeneric.inc:788
+#: plugins/admin/groups/class_groupGeneric.inc:761
+#: plugins/admin/groups/class_groupGeneric.inc:775
+#: plugins/admin/groups/class_groupGeneric.inc:782
  msgid "Value specified as 'Name' is already used."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:885
+#: plugins/admin/groups/class_groupGeneric.inc:879
  msgid "Generic group settings"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:891
  msgid "Phone pickup group"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:892
  msgid "Nagios group"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:901
+#: plugins/admin/groups/class_groupGeneric.inc:895
  msgid "Group member"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:902
+#: plugins/admin/groups/class_groupGeneric.inc:896
  msgid "Samba group type"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:903
+#: plugins/admin/groups/class_groupGeneric.inc:897
  msgid "Samba domain name"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:904
+#: plugins/admin/groups/class_groupGeneric.inc:898
  msgid "Samba SID"
  msgstr ""
  
@@ -6270,8 +6206,8 @@ msgstr ""
  msgid "Available applications"
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:565
-#: include/class_acl.inc:656
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:597
+#: include/class_acl.inc:688
  msgid "read"
  msgstr ""
  
@@ -6287,8 +6223,8 @@ msgstr ""
  msgid "append"
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:566
-#: include/class_acl.inc:658
+#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:598
+#: include/class_acl.inc:690
  msgid "write"
  msgstr ""
  
@@ -6312,44 +6248,44 @@ msgstr ""
  msgid "to the list of forwarders."
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:672
+#: plugins/admin/groups/class_groupMail.inc:679
  #, php-format
  msgid "Removing of groups/mail with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/groups/class_groupMail.inc:861
  #, php-format
  msgid "Saving of groups/mail with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/admin/groups/class_groupMail.inc:890
  msgid "Please enter a valid email addres in 'Primary address' field."
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:916
+#: plugins/admin/groups/class_groupMail.inc:923
  msgid ""
  "Please choose valid permission settings. Default permission can't be emtpy."
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:920
+#: plugins/admin/groups/class_groupMail.inc:927
  msgid "Please select a valid mail server."
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:1067
+#: plugins/admin/groups/class_groupMail.inc:1074
  msgid "Group mail"
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:1075
+#: plugins/admin/groups/class_groupMail.inc:1082
  msgid "Alternate addresses"
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:1076
+#: plugins/admin/groups/class_groupMail.inc:1083
  msgid "Forwarding addresses"
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:1079
+#: plugins/admin/groups/class_groupMail.inc:1086
  #: plugins/admin/systems/printer.tpl:82
-#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_printGeneric.inc:873
  msgid "Permissions"
  msgstr ""
  
@@ -6414,7 +6350,9 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/groups/class_groupApplication.inc:426
-#: include/class_tabs.inc:303
+#: plugins/admin/acl/class_aclManagement.inc:424
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430 include/class_tabs.inc:303
  msgid "ACL"
  msgstr ""
  
@@ -6441,7 +6379,7 @@ msgid "The selected application has no options."
  msgstr ""
  
  #: plugins/admin/groups/class_groupApplication.inc:682
-#: plugins/admin/departments/class_divListDepartment.inc:154
+#: plugins/admin/departments/class_divListDepartment.inc:147
  msgid "department"
  msgstr ""
  
@@ -6513,11 +6451,11 @@ msgid "Group applications"
  msgstr ""
  
  #: plugins/admin/groups/class_groupApplication.inc:1173
-#: plugins/admin/groups/class_divListGroup.inc:176
-#: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:353
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
+#: plugins/admin/groups/class_divListGroup.inc:184
+#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/ogroups/class_ogroupManagement.inc:348
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:684
  #: plugins/gofon/fonreports/contents.tpl:34
  #: plugins/generic/references/class_reference.inc:42
  msgid "Application"
@@ -6527,7 +6465,7 @@ msgstr ""
  #: plugins/admin/systems/workstationStartup.tpl:53
  #: plugins/admin/systems/workstationStartup.tpl:87
  #: plugins/admin/systems/servRepositorySetup.tpl:19
-#: plugins/admin/systems/class_servRepository.inc:238
+#: plugins/admin/systems/class_servRepository.inc:252
  #: plugins/admin/fai/faiPackage.tpl:37
  #: plugins/admin/fai/class_faiPackage.inc:542
  #: plugins/admin/fai/faiPackageNew.tpl:21
@@ -6610,58 +6548,58 @@ msgstr ""
  msgid "Create new group"
  msgstr ""
  
-#: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:175
  msgid "Posix"
  msgstr ""
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  msgid "cut"
  msgstr ""
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  msgid "Cut this entry"
  msgstr ""
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "copy"
  msgstr ""
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
-msgid "Copy this entry"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:206
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
  #: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
  #: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/conference/class_divListConferences.inc:159
-msgid "Edit this entry"
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
+msgid "Copy this entry"
  msgstr ""
  
  #: plugins/admin/groups/class_divListGroup.inc:215
  #: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/conference/class_divListConferences.inc:169
+#: plugins/admin/departments/class_divListDepartment.inc:126
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/conference/class_divListConferences.inc:155
+msgid "Edit this entry"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/conference/class_divListConferences.inc:165
  msgid "Delete this entry"
  msgstr ""
  
@@ -6704,7 +6642,7 @@ msgstr ""
  #: plugins/admin/users/class_userManagement.inc:449
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
  #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:288
  msgid "none"
  msgstr ""
  
@@ -6728,8 +6666,8 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:812
-#: plugins/admin/fai/class_faiTemplate.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:997
+#: plugins/admin/fai/class_faiTemplate.inc:499
  msgid "Template"
  msgstr ""
  
@@ -6805,109 +6743,109 @@ msgstr ""
  msgid "Show proxy users"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  msgid "Create new user"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  msgid "New user"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "Create new template"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "New template"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:173
  msgid "GOsa"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:174
  msgid "Edit generic properties"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:176
  msgid "Edit UNIX properties"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:178
  msgid "Edit environment properties"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:180
  msgid "Edit mail properties"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:182
  msgid "Edit phone properties"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:184
  msgid "Edit fax properies"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:186
  msgid "Edit samba properties"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:200
+#: plugins/admin/users/class_divListUsers.inc:188
  msgid "Edit netatalk properties"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:201
+#: plugins/admin/users/class_divListUsers.inc:189
  msgid "Create user from template"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/users/class_divListUsers.inc:190
  msgid "Create user with this template"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:260
+#: plugins/admin/users/class_divListUsers.inc:248
  msgid "password"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:264
+#: plugins/admin/users/class_divListUsers.inc:252
  msgid "You are not allowed to change the password for this user."
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:266
  msgid "You are not allowed to remove this user."
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:297
+#: plugins/admin/users/class_divListUsers.inc:285
  msgid "Online"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:304
+#: plugins/admin/users/class_divListUsers.inc:292
  msgid "Offline"
  msgstr ""
  
  #: plugins/admin/applications/generic.tpl:7
  #: plugins/admin/applications/generic.tpl:10
-#: plugins/admin/applications/class_applicationGeneric.inc:486
+#: plugins/admin/applications/class_applicationGeneric.inc:495
  #: plugins/admin/applications/class_divListApplication.inc:51
  msgid "Application name"
  msgstr ""
  
  #: plugins/admin/applications/generic.tpl:15
  #: plugins/gofon/macro/generic.tpl:14
-#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: plugins/gofon/macro/class_gofonMacro.inc:499 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Display name"
  msgstr ""
  
  #: plugins/admin/applications/generic.tpl:19
-#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/applications/class_applicationGeneric.inc:500
  msgid "Application name to be displayed (i.e. below icons)"
  msgstr ""
  
  #: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/applications/class_applicationGeneric.inc:526
-#: plugins/admin/systems/terminal.tpl:149 plugins/admin/systems/server.tpl:73
-#: plugins/admin/systems/workstation.tpl:124
+#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/systems/terminal.tpl:153 plugins/admin/systems/server.tpl:74
+#: plugins/admin/systems/workstation.tpl:127
  #: plugins/admin/systems/goMailServer.tpl:215
  #: plugins/admin/systems/goImapServer.tpl:110
  #: plugins/admin/ogroups/termgroup.tpl:101
@@ -6925,9 +6863,9 @@ msgid "Choose subtree to place application in"
  msgstr ""
  
  #: plugins/admin/applications/generic.tpl:66
-#: plugins/admin/applications/class_applicationGeneric.inc:528
+#: plugins/admin/applications/class_applicationGeneric.inc:537
  #: plugins/admin/mimetypes/generic.tpl:67
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:678
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:686
  msgid "Icon"
  msgstr ""
  
@@ -6940,41 +6878,45 @@ msgstr ""
  msgid "Reload picture from LDAP"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:96
-#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/generic.tpl:81
+msgid "Remove picture from LDAP"
+msgstr ""
+
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/applications/class_applicationGeneric.inc:541
  msgid "Only executable for members"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:101
-#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/applications/generic.tpl:104
+#: plugins/admin/applications/class_applicationGeneric.inc:545
  msgid "Replace user configuration on startup"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:107
-#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/generic.tpl:110
+#: plugins/admin/applications/class_applicationGeneric.inc:542
  msgid "Place icon on members desktop"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:112
-#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/applications/generic.tpl:115
+#: plugins/admin/applications/class_applicationGeneric.inc:544
  msgid "Place entry in members startmenu"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:117
-#: plugins/admin/applications/class_applicationGeneric.inc:534
+#: plugins/admin/applications/generic.tpl:120
+#: plugins/admin/applications/class_applicationGeneric.inc:543
  msgid "Place entry in members launch bar"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:135
+#: plugins/admin/applications/generic.tpl:138
  #: plugins/admin/systems/printerPPDDialog.tpl:11
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
  #: plugins/admin/fai/faiTemplateEntry.tpl:49
  msgid "Upload"
  msgstr ""
  
-#: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:297
-#: plugins/admin/fai/class_faiTemplate.inc:271
+#: plugins/admin/applications/generic.tpl:140
+#: plugins/admin/fai/class_faiScript.inc:307
+#: plugins/admin/fai/class_faiTemplate.inc:284
  #: plugins/admin/fai/class_faiScriptEntry.inc:89
  #: plugins/admin/fai/class_faiHook.inc:308
  #: plugins/admin/fai/class_faiHookEntry.inc:84
@@ -6999,7 +6941,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/applications/class_applicationParameters.inc:98
-#: plugins/admin/fai/class_faiVariable.inc:412
+#: plugins/admin/fai/class_faiVariable.inc:408
  msgid "Variable"
  msgstr ""
  
@@ -7052,72 +6994,68 @@ msgstr ""
  msgid "no example"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:132
+#: plugins/admin/applications/class_applicationGeneric.inc:126
  msgid "This 'dn' is no application."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:228
+#: plugins/admin/applications/class_applicationGeneric.inc:227
  #, php-format
  msgid "Removing of application with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:240
+#: plugins/admin/applications/class_applicationGeneric.inc:239
  #, php-format
  msgid "Removing application from objectgroup '%s' failed"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:247
+#: plugins/admin/applications/class_applicationGeneric.inc:246
  #, php-format
  msgid "Removing application from group '%s' failed"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:289
+#: plugins/admin/applications/class_applicationGeneric.inc:297
  msgid "The specified picture has not been uploaded correctly."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:372
  msgid "Specified execute path must start with '/'."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:375
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr ""
-
-#: plugins/admin/applications/class_applicationGeneric.inc:380
+#: plugins/admin/applications/class_applicationGeneric.inc:389
  msgid "Required field 'Name' is not filled."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:384
+#: plugins/admin/applications/class_applicationGeneric.inc:393
  msgid "Invalid character in application name. Only a-z 0-9 are allowed."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:388
+#: plugins/admin/applications/class_applicationGeneric.inc:397
  msgid "Required field 'Execute' is not filled."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:403
-#: plugins/admin/applications/class_applicationGeneric.inc:411
+#: plugins/admin/applications/class_applicationGeneric.inc:412
+#: plugins/admin/applications/class_applicationGeneric.inc:420
  msgid "There's already an application with this 'Name'."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:457
+#: plugins/admin/applications/class_applicationGeneric.inc:466
  #, php-format
  msgid "Saving of application with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:482
+#: plugins/admin/applications/class_applicationGeneric.inc:491
  msgid "Application settings"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:515
+#: plugins/admin/applications/class_applicationGeneric.inc:524
  msgid "Application generic"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_applicationGeneric.inc:538
  msgid "Flag"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:530
+#: plugins/admin/applications/class_applicationGeneric.inc:539
  msgid "Script content"
  msgstr ""
  
@@ -7146,13 +7084,13 @@ msgid ""
  "working with a large number of applications."
  msgstr ""
  
-#: plugins/admin/applications/class_divListApplication.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
  msgid "new"
  msgstr ""
  
-#: plugins/admin/applications/class_divListApplication.inc:129
+#: plugins/admin/applications/class_divListApplication.inc:131
  msgid "Create new application"
  msgstr ""
  
@@ -7168,6 +7106,18 @@ msgstr ""
  msgid "Current release"
  msgstr ""
  
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested operation"
+msgstr ""
+
+#: plugins/admin/departments/dep_iframe.tpl:7
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
  #: plugins/admin/departments/generic.tpl:8
  msgid "Name of department"
  msgstr ""
@@ -7182,7 +7132,7 @@ msgid "Descriptive text for department"
  msgstr ""
  
  #: plugins/admin/departments/generic.tpl:24
-#: plugins/admin/departments/class_departmentGeneric.inc:546
+#: plugins/admin/departments/class_departmentGeneric.inc:590
  msgid "Category"
  msgstr ""
  
@@ -7215,12 +7165,12 @@ msgstr ""
  msgid "Base facsimile telephone number of this subtree"
  msgstr ""
  
-#: plugins/admin/departments/generic.tpl:109
-#: plugins/admin/departments/class_departmentGeneric.inc:549
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/class_departmentGeneric.inc:593
  msgid "Administrative settings"
  msgstr ""
  
-#: plugins/admin/departments/generic.tpl:111
+#: plugins/admin/departments/generic.tpl:119
  msgid "Tag department as an independent administrative unit"
  msgstr ""
  
@@ -7249,94 +7199,71 @@ msgid ""
  "'Delete' to continue or 'Cancel' to abort."
  msgstr ""
  
-#: plugins/admin/departments/dep_iframe.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
-msgid "Processing the requested operation"
-msgstr ""
-
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-
-#: plugins/admin/departments/dep_iframe.tpl:8
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
  #: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
  msgid "Department management"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:175
+#: plugins/admin/departments/class_departmentGeneric.inc:190
  #, php-format
  msgid "Removing of department with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:224
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:231
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:251
+#: plugins/admin/departments/class_departmentGeneric.inc:253
  msgid "Department with that 'Name' already exists."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:241
+#: plugins/admin/departments/class_departmentGeneric.inc:261
  msgid "Required field 'Description' is not set."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:245
+#: plugins/admin/departments/class_departmentGeneric.inc:265
  #, php-format
  msgid ""
  "The field 'Name' contains the reserved word '%s'. Please choose another name."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:297
+#: plugins/admin/departments/class_departmentGeneric.inc:319
  msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:343
+#: plugins/admin/departments/class_departmentGeneric.inc:368
  #, php-format
  msgid "Saving of department with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:385
+#: plugins/admin/departments/class_departmentGeneric.inc:421
  #, php-format
  msgid "Tagging '%s'."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:506
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:499
-#: include/class_ldap.inc:458 include/class_acl.inc:523
-#: include/class_acl.inc:530 include/class_acl.inc:537
-#: include/class_acl.inc:543 ihtml/themes/default/snapshotdialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:53
+#: plugins/admin/departments/class_departmentGeneric.inc:542
+#: include/class_ldap.inc:458 include/class_acl.inc:555
+#: include/class_acl.inc:562 include/class_acl.inc:569
+#: include/class_acl.inc:575 ihtml/themes/default/snapshotdialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:502
+#: plugins/admin/departments/class_departmentGeneric.inc:545
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:532
-#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: plugins/admin/departments/class_departmentGeneric.inc:581
  #: plugins/admin/departments/class_departmentManagement.inc:25
  #: plugins/admin/systems/class_glpiSelectUser.inc:112
  #: plugins/admin/ogroups/class_divListOGroup.inc:58
  msgid "Departments"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:544
+#: plugins/admin/departments/class_departmentGeneric.inc:588
  #: plugins/admin/systems/workstationService.tpl:89
  #: plugins/admin/systems/terminalService.tpl:79
  #: plugins/gofon/phoneaccount/generic.tpl:32
@@ -7345,23 +7272,24 @@ msgstr ""
  msgid "Telephone"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:545
+#: plugins/admin/departments/class_departmentGeneric.inc:589
  #: plugins/admin/departments/class_divListDepartment.inc:41
  msgid "Department name"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
+#: plugins/admin/departments/class_departmentManagement.inc:160
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:134
  #, php-format
  msgid "You're about to delete the whole LDAP subtree placed under '%s'."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:175
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:153
+#: plugins/admin/departments/class_departmentManagement.inc:165
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:155
  msgid "You have no permission to remove this department."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:352
  msgid ".."
  msgstr ""
  
@@ -7382,19 +7310,34 @@ msgid "Regular expression for matching department names"
  msgstr ""
  
  #: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/fai/class_divListFai.inc:139
-msgid "Go to users home department"
+msgid "Create new department"
  msgstr ""
  
-#: plugins/admin/departments/class_divListDepartment.inc:101
-msgid "Create new department"
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+msgid "You are currently moving/renaming this department."
  msgstr ""
  
-#: plugins/admin/systems/network.tpl:1
-msgid "Network\tsettings"
+#: plugins/admin/departments/dep_move_confirm.tpl:5
+msgid ""
+"Modifying a departments naming attribute 'ou' or base may corrupt acls and "
+"snapshot entries for all entire objects."
  msgstr ""
  
-#: plugins/admin/systems/network.tpl:9
+#: plugins/admin/departments/dep_move_confirm.tpl:8
+msgid "GOsa can NOT fix this for you, yet."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:11
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:1
+msgid "Network\tsettings"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:9
  msgid "IP-address"
  msgstr ""
  
@@ -7411,7 +7354,7 @@ msgid "Enable DNS for this device"
  msgstr ""
  
  #: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/class_servDNS.inc:396
+#: plugins/admin/systems/class_servDNS.inc:398
  #: plugins/admin/systems/servdnseditzone.tpl:67
  #: plugins/admin/fai/faiPackageNew.tpl:31
  #: plugins/gofon/phoneaccount/generic.tpl:84
@@ -7424,8 +7367,8 @@ msgstr ""
  
  #: plugins/admin/systems/network.tpl:77
  #: plugins/admin/systems/class_servDNS.inc:168
-#: plugins/admin/systems/class_servDNS.inc:399
-#: plugins/admin/systems/class_termDNS.inc:542
+#: plugins/admin/systems/class_servDNS.inc:401
+#: plugins/admin/systems/class_termDNS.inc:547
  #: plugins/admin/systems/servdnseditzone.tpl:85
  msgid "TTL"
  msgstr ""
@@ -7440,10 +7383,10 @@ msgid "present"
  msgstr ""
  
  #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:252
  #: plugins/admin/systems/class_terminalStartup.inc:161
-#: plugins/admin/systems/class_terminalGeneric.inc:242
-#: plugins/admin/systems/class_workstationStartup.inc:471
+#: plugins/admin/systems/class_terminalGeneric.inc:256
+#: plugins/admin/systems/class_workstationStartup.inc:498
+#: plugins/admin/systems/class_terminalService.inc:261
  msgid "This 'dn' has no terminal features."
  msgstr ""
  
@@ -7476,6 +7419,92 @@ msgstr ""
  msgid "offline"
  msgstr ""
  
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
+#: plugins/admin/systems/workstation.tpl:44
+#: plugins/admin/systems/class_terminalGeneric.inc:548
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:390
+msgid "Mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:50
+msgid "Select terminal mode"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:47
+#: plugins/admin/systems/workstation.tpl:54
+#: plugins/admin/systems/class_workstationGeneric.inc:539
+#: plugins/admin/ogroups/termgroup.tpl:58
+#: plugins/admin/ogroups/class_termgroup.inc:391
+msgid "Syslog server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:50
+#: plugins/admin/systems/workstation.tpl:57
+#: plugins/admin/ogroups/termgroup.tpl:61
+msgid "Choose server to use for logging"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:66
+#: plugins/admin/systems/class_terminalGeneric.inc:549
+msgid "Root server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Select NFS root filesystem to use"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/class_terminalGeneric.inc:550
+msgid "Swap server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:79
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:98
+#: plugins/admin/systems/workstation.tpl:75
+msgid "Inherit time server attributes"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:80
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:106
+#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/ogroups/termgroup.tpl:17
+msgid "Choose server to use for synchronizing time"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:140 plugins/admin/systems/server.tpl:62
+#: plugins/admin/systems/workstation.tpl:115
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:47
+#: plugins/admin/ogroups/termgroup.tpl:88
+msgid "Action"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:145
+#: plugins/admin/systems/workstation.tpl:120
+#: plugins/admin/ogroups/termgroup.tpl:93
+msgid "Select action to execute for this terminal"
+msgstr ""
+
  #: plugins/admin/systems/info.tpl:1
  msgid "System information"
  msgstr ""
@@ -7582,47 +7611,46 @@ msgstr ""
  msgid "This 'dn' has no network features."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_winGeneric.inc:145
  #, php-format
  msgid "Removing of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_componentGeneric.inc:179
+#: plugins/admin/systems/class_winGeneric.inc:195
  msgid "You have no permissions to create a component on this 'Base'."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:184
-#: plugins/admin/systems/class_terminalGeneric.inc:400
-#: plugins/admin/systems/class_servGeneric.inc:261
-#: plugins/admin/systems/class_workstationGeneric.inc:400
-#: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/systems/class_componentGeneric.inc:189
-#: plugins/admin/systems/class_phoneGeneric.inc:333
+#: plugins/admin/systems/class_winGeneric.inc:205
+#: plugins/admin/systems/class_terminalGeneric.inc:434
+#: plugins/admin/systems/class_servGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:414
+#: plugins/admin/systems/class_printGeneric.inc:673
+#: plugins/admin/systems/class_componentGeneric.inc:191
+#: plugins/admin/systems/class_phoneGeneric.inc:338
  #, php-format
  msgid "There is already an entry '%s' in the base choosen by you"
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:239
+#: plugins/admin/systems/class_winGeneric.inc:260
  #, php-format
  msgid "Saving of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:250
+#: plugins/admin/systems/class_winGeneric.inc:271
  msgid "Win generic"
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:251
+#: plugins/admin/systems/class_winGeneric.inc:272
  msgid "Windows workstation generic"
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:256
+#: plugins/admin/systems/class_winGeneric.inc:277
  msgid "Win workstation"
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:259
+#: plugins/admin/systems/class_winGeneric.inc:280
  #: plugins/admin/systems/workstation.tpl:10
-#: plugins/admin/systems/class_workstationGeneric.inc:513
+#: plugins/admin/systems/class_workstationGeneric.inc:535
  msgid "Workstation name"
  msgstr ""
  
@@ -7630,122 +7658,20 @@ msgstr ""
  msgid "System management"
  msgstr ""
  
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
-#: plugins/admin/systems/workstation.tpl:44
-#: plugins/admin/systems/class_terminalGeneric.inc:508
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/ogroups/termgroup.tpl:47
-#: plugins/admin/ogroups/class_termgroup.inc:391
-msgid "Mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
-#: plugins/admin/systems/workstation.tpl:47
-#: plugins/admin/ogroups/termgroup.tpl:50
-msgid "Select terminal mode"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:47
-#: plugins/admin/systems/workstation.tpl:54
-#: plugins/admin/systems/class_workstationGeneric.inc:517
-#: plugins/admin/ogroups/termgroup.tpl:58
-#: plugins/admin/ogroups/class_termgroup.inc:392
-msgid "Syslog server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:50
-#: plugins/admin/systems/workstation.tpl:57
-#: plugins/admin/ogroups/termgroup.tpl:61
-msgid "Choose server to use for logging"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:66
-#: plugins/admin/systems/class_terminalGeneric.inc:509
-msgid "Root server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:69
-msgid "Select NFS root filesystem to use"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/class_terminalGeneric.inc:510
-msgid "Swap server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:79
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:98
-#: plugins/admin/systems/workstation.tpl:75
-msgid "Inherit time server attributes"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:106
-#: plugins/admin/systems/workstation.tpl:83
-#: plugins/admin/ogroups/termgroup.tpl:17
-msgid "Choose server to use for synchronizing time"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:136 plugins/admin/systems/server.tpl:61
-#: plugins/admin/systems/workstation.tpl:112
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:47
-#: plugins/admin/ogroups/termgroup.tpl:88
-msgid "Action"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:141
-#: plugins/admin/systems/workstation.tpl:117
-#: plugins/admin/ogroups/termgroup.tpl:93
-msgid "Select action to execute for this terminal"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:69
-#: plugins/admin/systems/class_workstationService.inc:92
-#: plugins/admin/systems/workstationService.tpl:157
-msgid "unknown"
+#: plugins/admin/systems/goNtpServer.tpl:2
+msgid "Time server"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
-#: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:214
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
  #: plugins/admin/systems/class_terminalStartup.inc:39
  #: plugins/admin/systems/class_terminalStartup.inc:121
  #: plugins/admin/systems/class_terminalStartup.inc:141
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_terminalGeneric.inc:298
-#: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_workstationStartup.inc:268
-#: plugins/admin/systems/class_workstationStartup.inc:285
-#: plugins/admin/systems/class_workstationStartup.inc:289
-#: plugins/admin/systems/class_workstationStartup.inc:790
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:312
+#: plugins/admin/systems/class_workstationStartup.inc:316
+#: plugins/admin/systems/class_workstationStartup.inc:824
  #: plugins/admin/systems/class_workstationService.inc:201
  #: plugins/admin/systems/class_workstationService.inc:204
  #: plugins/admin/systems/class_workstationService.inc:207
@@ -7760,192 +7686,25 @@ msgstr ""
  #: plugins/admin/systems/class_workstationService.inc:233
  #: plugins/admin/systems/class_workstationService.inc:234
  #: plugins/admin/systems/class_workstationService.inc:235
-msgid "inherited"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:101
+#: plugins/admin/systems/class_terminalService.inc:74
  #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:95
-#: plugins/admin/systems/class_workstationService.inc:96
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "bit"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:155
-msgid "default"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:156
-#: plugins/admin/systems/class_workstationService.inc:138
-msgid "show chooser"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:157
-#: plugins/admin/systems/class_workstationService.inc:139
-msgid "direct"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:160
-#: plugins/admin/systems/class_workstationService.inc:142
-msgid "load balanced"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:163
-#: plugins/admin/systems/class_workstationService.inc:145
-msgid "Windows RDP"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:164
-#: plugins/admin/systems/class_workstationService.inc:146
-msgid "ICA client"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_workstationService.inc:204
-msgid "Bit"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:307
-#: plugins/admin/systems/class_workstationService.inc:314
-msgid "Choose the phone located at the current terminal"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:370
-#: plugins/admin/systems/class_terminalService.inc:375
-#: plugins/admin/systems/class_workstationService.inc:380
-#: plugins/admin/systems/class_workstationService.inc:385
-msgid "Please specify a valid VSync range."
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:385
-#: plugins/admin/systems/class_terminalService.inc:390
-#: plugins/admin/systems/class_workstationService.inc:395
-#: plugins/admin/systems/class_workstationService.inc:400
-msgid "Please specify a valid HSync range."
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:421
-#, php-format
-msgid "Saving of object system terminal/service with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:430
-#: plugins/admin/systems/class_workstationService.inc:451
-msgid "Service"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:431
-#: plugins/admin/systems/class_goTerminalServer.inc:31
-#: plugins/admin/systems/class_goTerminalServer.inc:54
-#: plugins/admin/systems/class_goTerminalServer.inc:117
-#: plugins/admin/systems/class_goTerminalServer.inc:118
-#: plugins/admin/systems/goTerminalServer.tpl:1
-msgid "Terminal service"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:439
-#: plugins/admin/systems/class_workstationService.inc:460
-msgid "Monitor"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:440
-#: plugins/admin/ogroups/class_phonequeue.inc:748
-msgid "Method"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:441
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Remote desktop"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:442
-#: plugins/admin/systems/class_goTerminalServer.inc:127
-#: plugins/admin/systems/goTerminalServer.tpl:12
-msgid "Font path"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:443
-#: plugins/admin/systems/class_workstationService.inc:461
-msgid "Gfx driver"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:444
-#: plugins/admin/systems/class_workstationService.inc:462
-msgid "Gfx resolution"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:445
-#: plugins/admin/systems/class_workstationService.inc:463
-msgid "Gfx color depth"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:446
-#: plugins/admin/systems/class_workstationService.inc:464
-msgid "Hsync"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:447
-#: plugins/admin/systems/class_workstationService.inc:465
-msgid "Vsync"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:448
-msgid "Printer service enabled"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:449
-#: plugins/admin/systems/terminalService.tpl:221
-msgid "Spool server"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:450
-#: plugins/admin/systems/class_workstationService.inc:467
-msgid "Scanner enabled"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:451
-msgid "Scanner model"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:454
-#: plugins/admin/systems/class_workstationService.inc:468
-msgid "Keyboard model"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:455
-#: plugins/admin/systems/class_workstationService.inc:469
-msgid "Keyboard layout"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:456
-#: plugins/admin/systems/class_workstationService.inc:470
-msgid "Keyboard variant"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:457
-#: plugins/admin/systems/class_workstationService.inc:471
-msgid "Mouse type"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:458
-#: plugins/admin/systems/class_workstationService.inc:472
-msgid "Mouse port"
-msgstr ""
-
-#: plugins/admin/systems/class_terminalService.inc:459
-#: plugins/admin/systems/class_workstationService.inc:473
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:76
-#: plugins/gofon/phoneaccount/generic.tpl:30
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
+#: plugins/admin/systems/class_terminalService.inc:108
+#: plugins/admin/systems/class_terminalService.inc:118
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:121
+#: plugins/admin/systems/class_terminalService.inc:125
+#: plugins/admin/systems/class_terminalService.inc:218
+#: plugins/admin/systems/class_terminalService.inc:221
+#: plugins/admin/systems/class_terminalService.inc:224
+#: plugins/admin/systems/class_terminalService.inc:227
+#: plugins/admin/systems/class_terminalService.inc:230
+#: plugins/admin/systems/class_terminalService.inc:233
+#: plugins/admin/systems/class_terminalService.inc:236
+msgid "inherited"
  msgstr ""
  
  #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:310
+#: plugins/admin/systems/class_workstationStartup.inc:337
  #, php-format
  msgid ""
  "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -7962,24 +7721,24 @@ msgid "Terminal startup"
  msgstr ""
  
  #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1163
  msgid "Ldap server"
  msgstr ""
  
  #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1122
+#: plugins/admin/systems/class_workstationStartup.inc:1167
  msgid "Kernel modules"
  msgstr ""
  
  #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1119
+#: plugins/admin/systems/class_workstationStartup.inc:1164
  #: plugins/admin/systems/workstationStartup.tpl:8
  #: plugins/admin/systems/terminalStartup.tpl:8
  msgid "Boot kernel"
  msgstr ""
  
  #: plugins/admin/systems/class_terminalStartup.inc:455
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1165
  msgid "Kernel parameter"
  msgstr ""
  
@@ -7987,7 +7746,7 @@ msgstr ""
  msgid "Server name"
  msgstr ""
  
-#: plugins/admin/systems/server.tpl:66
+#: plugins/admin/systems/server.tpl:67
  msgid "Select action to execute for this server"
  msgstr ""
  
@@ -8074,7 +7833,7 @@ msgid "Supported interfaces"
  msgstr ""
  
  #: plugins/admin/systems/glpiPrinter.tpl:48
-#: plugins/admin/systems/class_servDNS.inc:395
+#: plugins/admin/systems/class_servDNS.inc:397
  msgid "Serial"
  msgstr ""
  
@@ -8114,196 +7873,193 @@ msgstr ""
  msgid "Installed cartridges"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:98
+#: plugins/admin/systems/class_terminalGeneric.inc:105
  msgid "text"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:106
  msgid "graphic"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:173
+#: plugins/admin/systems/class_terminalGeneric.inc:181
  #, php-format
  msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:179
+#: plugins/admin/systems/class_terminalGeneric.inc:188
  msgid "No WAKECMD definition found in your gosa.conf"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:191
+#: plugins/admin/systems/class_terminalGeneric.inc:200
  msgid "No REBOOTCMD definition found in your gosa.conf"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:203
+#: plugins/admin/systems/class_terminalGeneric.inc:212
  msgid "No HALTCMD definition found in your gosa.conf"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:280
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:294
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Switch off"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:281
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:295
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Reboot"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:282
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_servGeneric.inc:186
-#: plugins/admin/systems/class_workstationGeneric.inc:282
-#: plugins/admin/systems/class_workstationGeneric.inc:288
-#: plugins/admin/ogroups/class_termgroup.inc:301
+#: plugins/admin/systems/class_terminalGeneric.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:190
+#: plugins/admin/systems/class_servGeneric.inc:196
+#: plugins/admin/systems/class_workstationGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:295
+#: plugins/admin/ogroups/class_termgroup.inc:300
  msgid "Memory test"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:283
-#: plugins/admin/systems/class_terminalGeneric.inc:287
-#: plugins/admin/systems/class_servGeneric.inc:181
-#: plugins/admin/systems/class_servGeneric.inc:187
-#: plugins/admin/systems/class_workstationGeneric.inc:283
-#: plugins/admin/systems/class_workstationGeneric.inc:289
-#: plugins/admin/ogroups/class_termgroup.inc:302
+#: plugins/admin/systems/class_terminalGeneric.inc:297
+#: plugins/admin/systems/class_terminalGeneric.inc:301
+#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_servGeneric.inc:197
+#: plugins/admin/systems/class_workstationGeneric.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:296
+#: plugins/admin/ogroups/class_termgroup.inc:301
  msgid "System analysis"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:285
-#: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/systems/class_terminalGeneric.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_workstationGeneric.inc:292
  msgid "Wake up"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:333
+#: plugins/admin/systems/class_terminalGeneric.inc:348
  #, php-format
  msgid "Removing of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:383
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_terminalGeneric.inc:387
+#: plugins/admin/systems/class_terminalGeneric.inc:415
  msgid "The required field 'Terminal name' is not set."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:410
-#: plugins/admin/systems/class_workstationGeneric.inc:410
+#: plugins/admin/systems/class_terminalGeneric.inc:444
+#: plugins/admin/systems/class_workstationGeneric.inc:424
  msgid ""
  "There must be at least one NTP server selected, or the inherit mode "
  "activated."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:488
+#: plugins/admin/systems/class_terminalGeneric.inc:528
  #, php-format
  msgid "Saving of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:499
-#: plugins/admin/systems/class_terminalGeneric.inc:505
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: plugins/admin/systems/class_terminalGeneric.inc:539
+#: plugins/admin/systems/class_terminalGeneric.inc:545
+#: plugins/admin/systems/class_systemManagement.inc:998
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/admin/ogroups/class_ogroupManagement.inc:353
  msgid "Terminal"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:500
+#: plugins/admin/systems/class_terminalGeneric.inc:540
  msgid "Terminal generic"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: plugins/admin/systems/class_terminalGeneric.inc:551
  msgid "Syslog server enabled"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: plugins/admin/systems/class_terminalGeneric.inc:552
  msgid "Ntp server settings"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:515
-#: plugins/admin/systems/class_servGeneric.inc:347
-#: plugins/admin/systems/class_workstationGeneric.inc:519
-#: plugins/admin/ogroups/class_termgroup.inc:393
+#: plugins/admin/systems/class_terminalGeneric.inc:555
+#: plugins/admin/systems/class_workstationGeneric.inc:541
+msgid "Root password"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:556
+#: plugins/admin/systems/class_servGeneric.inc:360
+#: plugins/admin/systems/class_workstationGeneric.inc:542
+#: plugins/admin/ogroups/class_termgroup.inc:392
  msgid "Action flag"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:41
+#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/ogroups/class_termgroup.inc:40
  msgid "Activated"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_servGeneric.inc:79
  msgid "This 'dn' has no server features."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#: plugins/admin/ogroups/class_termgroup.inc:206
+#: plugins/admin/systems/class_servGeneric.inc:87
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/ogroups/class_termgroup.inc:205
  msgid "No ACTIONCMD definition found in your gosa.conf"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:125
  #, php-format
  msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:176
-#: plugins/admin/systems/class_workstationGeneric.inc:278
-#: plugins/admin/ogroups/class_termgroup.inc:297
+#: plugins/admin/systems/class_servGeneric.inc:186
+#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/ogroups/class_termgroup.inc:296
  msgid "Instant update"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:177
-#: plugins/admin/systems/class_servGeneric.inc:185
-#: plugins/admin/systems/class_workstationGeneric.inc:279
-#: plugins/admin/systems/class_workstationGeneric.inc:287
-#: plugins/admin/ogroups/class_termgroup.inc:298
+#: plugins/admin/systems/class_servGeneric.inc:187
+#: plugins/admin/systems/class_servGeneric.inc:195
+#: plugins/admin/systems/class_workstationGeneric.inc:286
+#: plugins/admin/systems/class_workstationGeneric.inc:294
+#: plugins/admin/ogroups/class_termgroup.inc:297
  msgid "Scheduled update"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_servGeneric.inc:184
-#: plugins/admin/systems/class_workstationGeneric.inc:280
-#: plugins/admin/systems/class_workstationGeneric.inc:286
-#: plugins/admin/ogroups/class_termgroup.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:188
+#: plugins/admin/systems/class_servGeneric.inc:194
+#: plugins/admin/systems/class_workstationGeneric.inc:287
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/ogroups/class_termgroup.inc:298
  msgid "Reinstall"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:179
-#: plugins/admin/systems/class_workstationGeneric.inc:281
-#: plugins/admin/ogroups/class_termgroup.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:189
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:299
  msgid "Rescan hardware"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:207
+#: plugins/admin/systems/class_servGeneric.inc:218
  #, php-format
  msgid "Removing of system server/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:245
+#: plugins/admin/systems/class_servGeneric.inc:263
  msgid "The required field 'Server name' is not set."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:250
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_servGeneric.inc:319
+#: plugins/admin/systems/class_servGeneric.inc:332
  #, php-format
  msgid "Saving of system server/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:335
+#: plugins/admin/systems/class_servGeneric.inc:348
  msgid "Server generic"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:345
-#: plugins/admin/systems/class_workstationGeneric.inc:516
+#: plugins/admin/systems/class_servGeneric.inc:358
+#: plugins/admin/systems/class_workstationGeneric.inc:538
  msgid "Goto mode"
  msgstr ""
  
@@ -8327,50 +8083,45 @@ msgid ""
  "below."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:191
-#: plugins/admin/ogroups/class_termgroup.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:198
+#: plugins/admin/ogroups/class_termgroup.inc:248
  #, php-format
  msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:209
  msgid "This 'dn' has no workstation features."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:324
+#: plugins/admin/systems/class_workstationGeneric.inc:332
  #, php-format
  msgid "Removing of system workstation/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/ogroups/class_termgroup.inc:109
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:387
+#: plugins/admin/systems/class_workstationGeneric.inc:396
  msgid "The required field 'Workstation name' is not set."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:477
-#: plugins/admin/systems/class_workstationGeneric.inc:495
+#: plugins/admin/systems/class_workstationGeneric.inc:491
+#: plugins/admin/systems/class_workstationGeneric.inc:517
  #, php-format
  msgid "Saving of system workstation/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:505
+#: plugins/admin/systems/class_workstationGeneric.inc:527
  msgid "Workstation generic"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:814
+#: plugins/admin/systems/class_workstationGeneric.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:999
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/admin/ogroups/class_ogroupManagement.inc:352
  #: plugins/generic/references/class_reference.inc:48
  msgid "Workstation"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationGeneric.inc:518
-#: plugins/admin/ogroups/class_termgroup.inc:394
+#: plugins/admin/systems/class_workstationGeneric.inc:540
+#: plugins/admin/ogroups/class_termgroup.inc:393
  msgid "Ntp server"
  msgstr ""
  
@@ -8378,93 +8129,111 @@ msgstr ""
  msgid "Systems"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:222
+#: plugins/admin/systems/class_systemManagement.inc:191
+msgid "Creating the image failed. Please see the report below."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:200
+#, php-format
+msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:257
+msgid "You are not allowed to create a new object of this type."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:308
  msgid "You can't edit this object type yet!"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:247
+#: plugins/admin/systems/class_systemManagement.inc:336
+#: plugins/admin/systems/class_systemManagement.inc:402
+msgid "You are not allowed to change the password for this object."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:348
  msgid "Passwords entered as new and repeated do not match!"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:264
-msgid "You are not allowed to set this systems password!"
+#: plugins/admin/systems/class_systemManagement.inc:405
+msgid "Can't detect object to change password."
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:318
+#: plugins/admin/systems/class_systemManagement.inc:467
  #, php-format
  msgid "You're about to delete all information about the component at '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:324
-#: plugins/admin/systems/class_systemManagement.inc:385
+#: plugins/admin/systems/class_systemManagement.inc:473
+#: plugins/admin/systems/class_systemManagement.inc:533
  #: plugins/admin/fai/class_faiManagement.inc:168
  #: plugins/admin/fai/class_faiManagement.inc:221
  msgid "You are not allowed to delete this component!"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:837
  msgid "New terminal"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:654
+#: plugins/admin/systems/class_systemManagement.inc:839
  msgid "New workstation"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:656
+#: plugins/admin/systems/class_systemManagement.inc:841
  msgid "New Device"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:675
+#: plugins/admin/systems/class_systemManagement.inc:860
  msgid "Terminal template for"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:691
+#: plugins/admin/systems/class_systemManagement.inc:876
  msgid "Workstation template for"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:811
+#: plugins/admin/systems/class_systemManagement.inc:996
  msgid "New System from incoming"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:815
+#: plugins/admin/systems/class_systemManagement.inc:1000
  msgid "Workstation is installing"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:816
+#: plugins/admin/systems/class_systemManagement.inc:1001
  msgid "Workstation is waiting for action"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:817
+#: plugins/admin/systems/class_systemManagement.inc:1002
  msgid "Workstation installation failed"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:820
+#: plugins/admin/systems/class_systemManagement.inc:1005
  msgid "Server is installing"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:821
+#: plugins/admin/systems/class_systemManagement.inc:1006
  msgid "Server is waiting for action"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:822
+#: plugins/admin/systems/class_systemManagement.inc:1007
  msgid "Server installation failed"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:823
+#: plugins/admin/systems/class_systemManagement.inc:1008
  msgid "Winstation"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:824
+#: plugins/admin/systems/class_systemManagement.inc:1009
  msgid "Network Device"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:825
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_systemManagement.inc:1010
+#: plugins/admin/systems/class_divListSystem.inc:148
  msgid "New Terminal"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:826
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_systemManagement.inc:1011
+#: plugins/admin/systems/class_divListSystem.inc:154
  msgid "New Workstation"
  msgstr ""
  
@@ -8572,9 +8341,9 @@ msgid "Accept mail from other domains over non-authenticated SMTP"
  msgstr ""
  
  #: plugins/admin/systems/class_servDNS.inc:34
-#: plugins/admin/systems/class_servDNS.inc:353
-#: plugins/admin/systems/class_servDNS.inc:382
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:355
+#: plugins/admin/systems/class_servDNS.inc:384
+#: plugins/admin/systems/class_servDNS.inc:385
  msgid "DNS service"
  msgstr ""
  
@@ -8601,7 +8370,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/systems/class_servDNS.inc:167
-#: plugins/admin/systems/class_servDNS.inc:392
+#: plugins/admin/systems/class_servDNS.inc:394
  msgid "Reverse zone"
  msgstr ""
  
@@ -8610,44 +8379,44 @@ msgstr ""
  msgid "Class"
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:231
+#: plugins/admin/systems/class_servDNS.inc:233
  #, php-format
  msgid ""
  "Can't delete the selected zone, because it is still in use by these entry/"
  "entries '%s'"
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:290
+#: plugins/admin/systems/class_servDNS.inc:292
  #, php-format
  msgid "Updating of system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:299
+#: plugins/admin/systems/class_servDNS.inc:301
  #, php-format
  msgid "Removing of system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:320
+#: plugins/admin/systems/class_servDNS.inc:322
  #, php-format
  msgid "Saving of system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:344
+#: plugins/admin/systems/class_servDNS.inc:346
  #, php-format
  msgid "Set status flag for system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:391
-#: plugins/admin/systems/class_termDNS.inc:541
+#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_termDNS.inc:546
  #: plugins/admin/systems/servdnseditzone.tpl:7
  msgid "Zone name"
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_servDNS.inc:395
  msgid "Primary dns server"
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:397
+#: plugins/admin/systems/class_servDNS.inc:399
  #: plugins/admin/systems/servdnseditzone.tpl:73
  #: plugins/admin/ogroups/phonequeue.tpl:70
  #: plugins/admin/ogroups/class_phonequeue.inc:751
@@ -8655,12 +8424,12 @@ msgstr ""
  msgid "Retry"
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:398
+#: plugins/admin/systems/class_servDNS.inc:400
  #: plugins/admin/systems/servdnseditzone.tpl:79
  msgid "Expire"
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:400
+#: plugins/admin/systems/class_servDNS.inc:402
  #: plugins/admin/systems/servdnseditzone.tpl:24
  msgid "Zone records"
  msgstr ""
@@ -8844,149 +8613,149 @@ msgstr ""
  msgid "kolabFreeBusyFuture"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:110
+#: plugins/admin/systems/class_printGeneric.inc:111
  #, php-format
  msgid "Can't extract a valid base out of object dn, setting base to '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:257
-#: plugins/admin/systems/class_printGeneric.inc:265
-#: plugins/admin/systems/class_printGeneric.inc:270
-#: plugins/admin/systems/class_printGeneric.inc:327
-#: plugins/admin/systems/class_printGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:260
+#: plugins/admin/systems/class_printGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:273
+#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:341
  msgid "Add printer extension"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:258
+#: plugins/admin/systems/class_printGeneric.inc:261
  msgid ""
  "Could not intialize printer tab, parameter parent was missing while "
  "construction."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:266
+#: plugins/admin/systems/class_printGeneric.inc:269
  msgid "This is a workstation template, printer tab is disabled."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:271
+#: plugins/admin/systems/class_printGeneric.inc:274
  msgid "This is a terminal template, printer tab is disabled."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:320
+#: plugins/admin/systems/class_printGeneric.inc:315
  msgid "This 'dn' has no printer features."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:328
+#: plugins/admin/systems/class_printGeneric.inc:323
  msgid ""
  "This object has printer extension disabled. You can't enable it while 'cn' "
  "is not present in entry. Possibly you are currently creating a new terminal "
  "template"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:335
-#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:330
+#: plugins/admin/systems/class_printGeneric.inc:333
  msgid "Remove printer extension"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:336
+#: plugins/admin/systems/class_printGeneric.inc:331
  msgid ""
  "This workstation has printer extension enabled.You can disable it by "
  "clicking below."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:339
+#: plugins/admin/systems/class_printGeneric.inc:334
  msgid ""
  "This terminal has printer extension enabled. You can disable it by clicking "
  "below."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:344
+#: plugins/admin/systems/class_printGeneric.inc:339
  msgid ""
  "This workstation has printer extension disabled. You can enable it by "
  "clicking below."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:347
+#: plugins/admin/systems/class_printGeneric.inc:342
  msgid ""
  "This terminal has printer extension disabled. You can enable it by clicking "
  "below."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:510
+#: plugins/admin/systems/class_printGeneric.inc:511
  #, php-format
  msgid "Your currently selected PPD file '%s' doesn't exist."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:518
+#: plugins/admin/systems/class_printGeneric.inc:519
  msgid "can't get ppd informations."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:531
+#: plugins/admin/systems/class_printGeneric.inc:532
  #, php-format
  msgid "This printer belongs to terminal %s. You can't rename this printer."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:533
+#: plugins/admin/systems/class_printGeneric.inc:534
  #, php-format
  msgid "This printer belongs to workstation %s. You can't rename this printer."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:588
+#: plugins/admin/systems/class_printGeneric.inc:589
  #, php-format
  msgid "Removing of system print/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:814
+#: plugins/admin/systems/class_printGeneric.inc:818
  #, php-format
  msgid "Saving of system print/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:837
-#: plugins/admin/systems/class_printGeneric.inc:839
-#: plugins/admin/ogroups/class_ogroupManagement.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:841
+#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
  #: plugins/admin/fai/faiTemplateEntry.tpl:85
  #: plugins/admin/fai/faiTemplateEntry.tpl:127
  #: plugins/generic/references/class_reference.inc:36
  msgid "Group"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:855
+#: plugins/admin/systems/class_printGeneric.inc:859
  msgid "Print generic"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_printGeneric.inc:871
  msgid "LabeledURL"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_printGeneric.inc:872
  msgid "Printer PPD"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:885
+#: plugins/admin/systems/class_printGeneric.inc:889
  #, php-format
  msgid ""
  "You are not allowed to remove the given object '%s' from the list of members "
  "of printer '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:902
+#: plugins/admin/systems/class_printGeneric.inc:906
  #, php-format
  msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:907
+#: plugins/admin/systems/class_printGeneric.inc:911
  #, php-format
  msgid ""
  "You are not allowed to add the given object '%s' to the list of members of '%"
  "s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:942
+#: plugins/admin/systems/class_printGeneric.inc:946
  #, php-format
  msgid "Can't add '%s' to the list of members, it is already used."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:953
+#: plugins/admin/systems/class_printGeneric.inc:957
  #, php-format
  msgid "Can't add '%s' to list of members, it is not reachable."
  msgstr ""
@@ -9006,42 +8775,38 @@ msgstr ""
  msgid "Changing the password impinges on authentification only."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:127
+#: plugins/admin/systems/class_componentGeneric.inc:125
  #, php-format
  msgid "Removing of system component/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_componentGeneric.inc:172
  msgid "The required field 'Component name' is not set."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:170
-#: plugins/admin/systems/class_phoneGeneric.inc:307
+#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_phoneGeneric.inc:317
  msgid "The required field IP address is empty."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:173
-#: plugins/admin/systems/class_phoneGeneric.inc:310
+#: plugins/admin/systems/class_componentGeneric.inc:180
+#: plugins/admin/systems/class_phoneGeneric.inc:320
  msgid "The field IP address contains an invalid address."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:247
+#: plugins/admin/systems/class_componentGeneric.inc:249
  #, php-format
  msgid "Saving of system component/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:258
+#: plugins/admin/systems/class_componentGeneric.inc:260
  msgid "Component generic"
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:263
+#: plugins/admin/systems/class_componentGeneric.inc:265
  msgid "Network device"
  msgstr ""
  
-#: plugins/admin/systems/goNtpServer.tpl:2
-msgid "Time server"
-msgstr ""
-
  #: plugins/admin/systems/goKrbServer.tpl:1
  msgid "Kerberos kadmin access"
  msgstr ""
@@ -9056,6 +8821,22 @@ msgstr ""
  msgid "Admin user"
  msgstr ""
  
+#: plugins/admin/systems/goFonServer.tpl:1
+msgid "VoIP database information"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:20
+msgid "Country dial prefix"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:28
+msgid "Local dial prefix"
+msgstr ""
+
  #: plugins/admin/systems/chooser.tpl:1
  msgid "Choose the kind of system component you want to create"
  msgstr ""
@@ -9124,20 +8905,12 @@ msgstr ""
  msgid "Option"
  msgstr ""
  
-#: plugins/admin/systems/goFonServer.tpl:1
-msgid "VoIP database information"
-msgstr ""
-
-#: plugins/admin/systems/goFonServer.tpl:4
-msgid "Asterisk DB user"
-msgstr ""
-
-#: plugins/admin/systems/goFonServer.tpl:20
-msgid "Country dial prefix"
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
  msgstr ""
  
-#: plugins/admin/systems/goFonServer.tpl:28
-msgid "Local dial prefix"
+#: plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
  msgstr ""
  
  #: plugins/admin/systems/remove_glpi.tpl:10
@@ -9152,12 +8925,12 @@ msgid "This 'dn' has no phone features."
  msgstr ""
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  msgid "yes"
  msgstr ""
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  msgid "no"
  msgstr ""
  
@@ -9181,87 +8954,84 @@ msgstr ""
  msgid "Removing of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:315
+#: plugins/admin/systems/class_phoneGeneric.inc:325
  msgid "The required field 'Phone name' is not set."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:318
+#: plugins/admin/systems/class_phoneGeneric.inc:328
  msgid "The 'Phone name' '0' is reserved and cannot be used."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:323
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:413
+#: plugins/admin/systems/class_phoneGeneric.inc:418
  #, php-format
  msgid "Saving of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:426
+#: plugins/admin/systems/class_phoneGeneric.inc:431
  msgid "Phone generic"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:431
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
  msgid "Phone hardware"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/admin/systems/class_phoneGeneric.inc:442
  msgid "SIP Mode"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:437
+#: plugins/admin/systems/class_phoneGeneric.inc:443
  msgid "SIP DTMF mode"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:438
+#: plugins/admin/systems/class_phoneGeneric.inc:444
  msgid "SIP Default ip"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_phoneGeneric.inc:445
  msgid "SIP Qualify"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_phoneGeneric.inc:446
  msgid "IAX authentication type"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:441
+#: plugins/admin/systems/class_phoneGeneric.inc:447
  msgid "IAX secret"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:442
+#: plugins/admin/systems/class_phoneGeneric.inc:448
  msgid "IAX account code"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:443
+#: plugins/admin/systems/class_phoneGeneric.inc:449
  msgid "IAX trunk lines"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:444
+#: plugins/admin/systems/class_phoneGeneric.inc:450
  msgid "IAX permit settings"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:445
+#: plugins/admin/systems/class_phoneGeneric.inc:451
  msgid "IAX deny settings"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:446
+#: plugins/admin/systems/class_phoneGeneric.inc:452
  msgid "CAPI MSN"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:447
+#: plugins/admin/systems/class_phoneGeneric.inc:453
  msgid "Hardware type"
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#, php-format
+msgid "The file '%s/encodings' does not exist, can't get supported charsets."
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:49
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#, php-format
+msgid "Can't read '%s/encodings', please check permissions."
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:178
@@ -9292,34 +9062,34 @@ msgstr ""
  msgid "Option contains invalid characters."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:402
+#: plugins/admin/systems/class_workstationStartup.inc:429
  msgid ""
  "There are packages in your configuration, which can't be resolved with "
  "current server/release settings."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:447
+#: plugins/admin/systems/class_workstationStartup.inc:474
  msgid "Please select a 'FAI server' or remove the 'FAI classes'."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:509
+#: plugins/admin/systems/class_workstationStartup.inc:537
  msgid ""
  "There is already a profile in your selection that contain partition table "
  "configurations."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:721
+#: plugins/admin/systems/class_workstationStartup.inc:754
  msgid "Not available in current setup"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:897
  #, php-format
  msgid ""
  "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
  "Server was reset to 'auto'."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:879
+#: plugins/admin/systems/class_workstationStartup.inc:913
  #, php-format
  msgid ""
  "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9327,18 +9097,18 @@ msgid ""
  "reset to 'auto'."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1040
+#: plugins/admin/systems/class_workstationStartup.inc:1085
  #, php-format
  msgid "Saving of system workstation/startup with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1090
+#: plugins/admin/systems/class_workstationStartup.inc:1135
  #, php-format
  msgid ""
  "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/class_workstationStartup.inc:1137
  #: plugins/admin/systems/class_servRepositorySetup.inc:203
  #, php-format
  msgid ""
@@ -9346,25 +9116,25 @@ msgid ""
  "empty string."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1155
  msgid "System startup"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: plugins/admin/systems/class_workstationStartup.inc:1170
  #: plugins/admin/fai/class_faiProfile.inc:453
  #: plugins/admin/fai/faiProfile.tpl:36
  msgid "FAI classes"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1126
+#: plugins/admin/systems/class_workstationStartup.inc:1171
  msgid "Debian mirror"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1127
+#: plugins/admin/systems/class_workstationStartup.inc:1172
  msgid "Debian release"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1129
+#: plugins/admin/systems/class_workstationStartup.inc:1174
  msgid "FAI status flag"
  msgstr ""
  
@@ -9530,13 +9300,13 @@ msgstr ""
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:462
  #: plugins/admin/systems/class_printerPPDDialog.inc:465
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:289
  msgid "True"
  msgstr ""
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:463
  #: plugins/admin/systems/class_printerPPDDialog.inc:466
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:286
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:287
  msgid "False"
  msgstr ""
  
@@ -9545,7 +9315,23 @@ msgstr ""
  msgid "Unsupported ppd type '%s' used for '%s' "
  msgstr ""
  
-#: plugins/admin/systems/class_printerPPDDialog.inc:485
+#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#, php-format
+msgid "Removing old ppd file '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#, php-format
+msgid "Removing old ppd file '%s' failed. File is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#, php-format
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:502
  msgid ""
  "Please select a valid ppd file or use 'Cancel' to go back to printer "
  "configuration."
@@ -9558,7 +9344,7 @@ msgstr ""
  #: plugins/admin/systems/printerPPDDialog.tpl:5
  #: plugins/admin/systems/workstationService.tpl:7
  #: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:246
+#: plugins/admin/systems/terminalService.tpl:254
  #: plugins/admin/systems/class_glpiAccount.inc:784
  msgid "Model"
  msgstr ""
@@ -9593,28 +9379,184 @@ msgstr ""
  msgid "Regular expression for matching object names"
  msgstr ""
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#, php-format
+msgid "You're about to delete the ppd file '%s' at '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#, php-format
+msgid "Could not found specified ppd file '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+msgid ""
+"Something went wrong while trying to remove the ppd file from server, "
+"possibly we have no write access."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
  #, php-format
  msgid "Selected vendor '%s' does not exists in our list of ppds."
  msgstr ""
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
  msgid "Printer ppd selection."
  msgstr ""
  
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:157
+#: plugins/admin/systems/class_terminalService.inc:71
+msgid "unknown"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_terminalService.inc:105
+#: plugins/admin/systems/class_terminalService.inc:106
+msgid "bit"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:138
+#: plugins/admin/systems/class_terminalService.inc:158
+msgid "show chooser"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:139
+#: plugins/admin/systems/class_terminalService.inc:159
+msgid "direct"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:142
+#: plugins/admin/systems/class_terminalService.inc:162
+msgid "load balanced"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:145
+#: plugins/admin/systems/class_terminalService.inc:165
+msgid "Windows RDP"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:146
+#: plugins/admin/systems/class_terminalService.inc:166
+msgid "ICA client"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_terminalService.inc:221
+msgid "Bit"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:314
+#: plugins/admin/systems/class_terminalService.inc:316
+msgid "Choose the phone located at the current terminal"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:380
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_terminalService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:395
+msgid "Please specify a valid VSync range."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:395
+#: plugins/admin/systems/class_workstationService.inc:400
+#: plugins/admin/systems/class_terminalService.inc:404
+#: plugins/admin/systems/class_terminalService.inc:409
+msgid "Please specify a valid HSync range."
+msgstr ""
+
  #: plugins/admin/systems/class_workstationService.inc:443
  #, php-format
  msgid "Saving of system workstation/service with dn '%s' failed."
  msgstr ""
  
+#: plugins/admin/systems/class_workstationService.inc:451
+#: plugins/admin/systems/class_terminalService.inc:466
+msgid "Service"
+msgstr ""
+
  #: plugins/admin/systems/class_workstationService.inc:452
  msgid "Workstation service"
  msgstr ""
  
+#: plugins/admin/systems/class_workstationService.inc:460
+#: plugins/admin/systems/class_terminalService.inc:475
+msgid "Monitor"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:461
+#: plugins/admin/systems/class_terminalService.inc:479
+msgid "Gfx driver"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:462
+#: plugins/admin/systems/class_terminalService.inc:480
+msgid "Gfx resolution"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:463
+#: plugins/admin/systems/class_terminalService.inc:481
+msgid "Gfx color depth"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:464
+#: plugins/admin/systems/class_terminalService.inc:482
+msgid "Hsync"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:465
+#: plugins/admin/systems/class_terminalService.inc:483
+msgid "Vsync"
+msgstr ""
+
  #: plugins/admin/systems/class_workstationService.inc:466
  msgid "Use DDC"
  msgstr ""
  
+#: plugins/admin/systems/class_workstationService.inc:467
+#: plugins/admin/systems/class_terminalService.inc:487
+msgid "Scanner enabled"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:468
+#: plugins/admin/systems/class_terminalService.inc:491
+msgid "Keyboard model"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:469
+#: plugins/admin/systems/class_terminalService.inc:492
+msgid "Keyboard layout"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:470
+#: plugins/admin/systems/class_terminalService.inc:493
+msgid "Keyboard variant"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:471
+#: plugins/admin/systems/class_terminalService.inc:494
+msgid "Mouse type"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:472
+#: plugins/admin/systems/class_terminalService.inc:495
+msgid "Mouse port"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationService.inc:473
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:76
+#: plugins/admin/systems/class_terminalService.inc:496
+#: plugins/gofon/phoneaccount/generic.tpl:30
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr ""
+
  #: plugins/admin/systems/workstationService.tpl:4
  #: plugins/admin/systems/terminalService.tpl:4
  msgid "Keyboard"
@@ -9691,41 +9633,42 @@ msgid "Display device"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:167
+#: plugins/admin/systems/terminalService.tpl:147
  msgid "Use DDC for automatic detection"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:170
-#: plugins/admin/systems/terminalService.tpl:142
+#: plugins/admin/systems/terminalService.tpl:150
  msgid "HSync"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:175
-#: plugins/admin/systems/terminalService.tpl:146
+#: plugins/admin/systems/terminalService.tpl:154
  msgid "Horizontal refresh frequency for installed monitor"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:181
-#: plugins/admin/systems/terminalService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:158
  msgid "VSync"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:186
-#: plugins/admin/systems/terminalService.tpl:154
+#: plugins/admin/systems/terminalService.tpl:162
  msgid "Vertical refresh frequency for installed monitor"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:201
-#: plugins/admin/systems/terminalService.tpl:237
+#: plugins/admin/systems/terminalService.tpl:245
  msgid "Scan device"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:204
-#: plugins/admin/systems/terminalService.tpl:239
+#: plugins/admin/systems/terminalService.tpl:247
  msgid "Select to start SANE scan service on terminal"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:207
-#: plugins/admin/systems/terminalService.tpl:241
+#: plugins/admin/systems/terminalService.tpl:249
  msgid "Provide scan services"
  msgstr ""
  
@@ -9765,17 +9708,17 @@ msgstr ""
  msgid "set"
  msgstr ""
  
-#: plugins/admin/systems/workstationStartup.tpl:137
+#: plugins/admin/systems/workstationStartup.tpl:141
  #: plugins/admin/systems/terminalStartup.tpl:66
  msgid "Kernel modules (format: name parameters)"
  msgstr ""
  
-#: plugins/admin/systems/workstationStartup.tpl:140
+#: plugins/admin/systems/workstationStartup.tpl:144
  #: plugins/admin/systems/terminalStartup.tpl:69
  msgid "Add additional modules to load on startup"
  msgstr ""
  
-#: plugins/admin/systems/workstationStartup.tpl:176
+#: plugins/admin/systems/workstationStartup.tpl:180
  #: plugins/admin/systems/terminalStartup.tpl:105
  msgid "Mountpoint"
  msgstr ""
@@ -9804,65 +9747,75 @@ msgstr ""
  msgid "use debug mode for startup"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:169
+#: plugins/admin/systems/terminalService.tpl:173
+#: plugins/admin/systems/class_terminalService.inc:477
+msgid "Remote desktop"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:177
  msgid "Connect method"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:172
+#: plugins/admin/systems/terminalService.tpl:180
  msgid "Choose method to connect to terminal server"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:180
+#: plugins/admin/systems/terminalService.tpl:188
  msgid "Terminal server"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:183
+#: plugins/admin/systems/terminalService.tpl:191
  msgid "Select specific terminal server to use"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:191
+#: plugins/admin/systems/terminalService.tpl:199
  msgid "Font server"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:194
+#: plugins/admin/systems/terminalService.tpl:202
  msgid "Select specific font server to use"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:211
+#: plugins/admin/systems/terminalService.tpl:219
  msgid "Print device"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:213
+#: plugins/admin/systems/terminalService.tpl:221
  msgid "Select to start IPP based printing service on terminal"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:215
+#: plugins/admin/systems/terminalService.tpl:223
  msgid "Provide print services"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:224
+#: plugins/admin/systems/terminalService.tpl:229
+#: plugins/admin/systems/class_terminalService.inc:486
+msgid "Spool server"
+msgstr ""
+
+#: plugins/admin/systems/terminalService.tpl:232
  msgid "Select NFS filesystem to place spool files on"
  msgstr ""
  
-#: plugins/admin/systems/terminalService.tpl:249
+#: plugins/admin/systems/terminalService.tpl:257
  msgid "Select scanner driver to use"
  msgstr ""
  
  #: plugins/admin/systems/servRepositorySetup.tpl:1
-#: plugins/admin/systems/class_servRepository.inc:349
+#: plugins/admin/systems/class_servRepository.inc:365
  #: plugins/admin/fai/faiPackage.tpl:33
  msgid "Repository"
  msgstr ""
  
  #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:364
+#: plugins/admin/systems/class_servRepository.inc:380
  msgid "Parent server"
  msgstr ""
  
  #: plugins/admin/systems/servRepositorySetup.tpl:39
-#: plugins/admin/systems/class_servRepository.inc:239
-#: plugins/admin/systems/class_servRepository.inc:262
-#: plugins/admin/systems/class_servRepository.inc:363
+#: plugins/admin/systems/class_servRepository.inc:253
+#: plugins/admin/systems/class_servRepository.inc:276
+#: plugins/admin/systems/class_servRepository.inc:379
  msgid "Sections"
  msgstr ""
  
@@ -9880,32 +9833,37 @@ msgid ""
  "Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:35
-#: plugins/admin/systems/class_servRepository.inc:339
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:44
+#: plugins/admin/systems/class_servRepository.inc:355
+#: plugins/admin/systems/class_servRepository.inc:366
  msgid "Repository service"
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:138
+#: plugins/admin/systems/class_servRepository.inc:94
+#: plugins/admin/fai/class_faiSummaryTab.inc:175
+msgid "You can't use this plugin until FAI is activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:152
  #, php-format
  msgid ""
  "You can't delete this release, it is still used by these workstations [%s]. "
  "Please solve this dependencies first, to keep data base consistency."
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:172
+#: plugins/admin/systems/class_servRepository.inc:186
  #, php-format
  msgid ""
  "Be careful editing this release, it is still used by these workstations [%s]."
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:212
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
  #: plugins/admin/fai/class_faiManagement.inc:343
  msgid "This name is already in use."
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:359
+#: plugins/admin/systems/class_servRepository.inc:375
  #: plugins/admin/systems/class_goGlpiServer.inc:92
  #: plugins/admin/systems/class_goCupsServer.inc:71
  #: plugins/admin/systems/class_serverService.inc:8
@@ -9916,7 +9874,7 @@ msgstr ""
  msgid "Start"
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:360
+#: plugins/admin/systems/class_servRepository.inc:376
  #: plugins/admin/systems/class_goGlpiServer.inc:93
  #: plugins/admin/systems/class_goCupsServer.inc:72
  #: plugins/admin/systems/class_serverService.inc:7
@@ -9928,7 +9886,7 @@ msgstr ""
  msgid "Stop"
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:361
+#: plugins/admin/systems/class_servRepository.inc:377
  #: plugins/admin/systems/class_goGlpiServer.inc:94
  #: plugins/admin/systems/class_goCupsServer.inc:73
  #: plugins/admin/systems/class_serverService.inc:9
@@ -9939,11 +9897,11 @@ msgstr ""
  msgid "Restart"
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:362
+#: plugins/admin/systems/class_servRepository.inc:378
  msgid "Releases"
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:365
+#: plugins/admin/systems/class_servRepository.inc:381
  msgid "Url"
  msgstr ""
  
@@ -10032,12 +9990,8 @@ msgstr ""
  msgid "Use"
  msgstr ""
  
-#: plugins/admin/systems/goFaxServer.tpl:1
-msgid "FAX database information"
-msgstr ""
-
-#: plugins/admin/systems/goFaxServer.tpl:4
-msgid "FAX DB user"
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
  msgstr ""
  
  #: plugins/admin/systems/class_glpiAccount.inc:147
@@ -10153,7 +10107,7 @@ msgid "Attachment"
  msgstr ""
  
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:136
  msgid "File"
  msgstr ""
  
@@ -10169,6 +10123,37 @@ msgstr ""
  msgid "use"
  msgstr ""
  
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+msgid "Go to root department"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:194
+msgid "Go up one department"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+msgid "Go to users department"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+#: include/class_MultiSelectWindow.inc:204
+msgid "Home"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: include/class_MultiSelectWindow.inc:209
+msgid "Reload list"
+msgstr ""
+
  #: plugins/admin/systems/glpiSelectUser.tpl:23
  msgid ""
  "This dialog allows you to select a user as technical responsible person."
@@ -10308,7 +10293,7 @@ msgid "Add/Edit network interface"
  msgstr ""
  
  #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:532
+#: plugins/admin/systems/class_termDNS.inc:537
  msgid "MAC address"
  msgstr ""
  
@@ -10388,7 +10373,7 @@ msgid "New processor"
  msgstr ""
  
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "P"
  msgstr ""
  
@@ -10521,7 +10506,8 @@ msgid "Upload wasn't successfull."
  msgstr ""
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
  msgstr ""
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:138
@@ -10668,71 +10654,71 @@ msgstr ""
  msgid "Cartridges"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:137
  #, php-format
  msgid ""
  "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:311
+#: plugins/admin/systems/class_termDNS.inc:319
  msgid "The required field 'IP-address' is not set."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:318
+#: plugins/admin/systems/class_termDNS.inc:323
  msgid "Wrong IP format in field IP-address."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:324
+#: plugins/admin/systems/class_termDNS.inc:330
  msgid "The required field 'MAC-address' is not set."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_termDNS.inc:333
  msgid ""
  "The given macaddress is invalid. There must be 6 2byte segments seperated by "
  "':'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:351
+#: plugins/admin/systems/class_termDNS.inc:353
  #, php-format
  msgid "Found duplicate value for record type '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:359
+#: plugins/admin/systems/class_termDNS.inc:361
  #, php-format
  msgid "Found more than one entry for the uniqe record type '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:370
+#: plugins/admin/systems/class_termDNS.inc:372
  #, php-format
  msgid ""
  "The device IP '%s' is added as 'A Record', this will be done automatically, "
  "please remove the record."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:377
+#: plugins/admin/systems/class_termDNS.inc:379
  #: plugins/admin/systems/class_servDNSeditZone.inc:409
  #, php-format
  msgid "Only lowercase is allowed, please check your '%ss'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:463
  #, php-format
  msgid "Saving of terminal/dns account with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:522
+#: plugins/admin/systems/class_termDNS.inc:527
  msgid "DNS"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:528
  msgid "DNS settings"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:531
+#: plugins/admin/systems/class_termDNS.inc:536
  msgid "IP address"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:540
+#: plugins/admin/systems/class_termDNS.inc:545
  msgid "DNS records"
  msgstr ""
  
@@ -10825,7 +10811,7 @@ msgstr ""
  
  #: plugins/admin/systems/class_servDNSeditZone.inc:290
  #: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:371
  msgid "Down"
  msgstr ""
  
@@ -10909,42 +10895,37 @@ msgid ""
  "our zone editing dialog."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:206
  #, php-format
  msgid "Entry name '%s' contains invalid characters."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
  #, php-format
  msgid "Can not rename '%s' to '%s',the destination name already exists."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:221
  #, php-format
  msgid "Can not create '%s',the destination name already exists."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
  #, php-format
  msgid "The name '%s' is used more than once."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
  #, php-format
  msgid "The record type '%s' is a unique type and can't be defined twice."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:260
  #, php-format
  msgid "There is an empty '%s' for host '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:268
  #, php-format
  msgid "There is a duplicate entry in '%s' for '%s'."
  msgstr ""
@@ -11046,93 +11027,89 @@ msgstr ""
  msgid "Display systems of user"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:148
  msgid "New Terminal template"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:154
  msgid "New Workstation template"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:140
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:160
  msgid "New Server"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:142
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:166
  msgid "New Printer"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:144
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:172
  msgid "New Phone"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:146
-#: plugins/admin/systems/class_divListSystem.inc:147
+#: plugins/admin/systems/class_divListSystem.inc:178
  msgid "New Component"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:165
+#: plugins/admin/systems/class_divListSystem.inc:203
  msgid "Cups Server"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:166
+#: plugins/admin/systems/class_divListSystem.inc:204
  msgid "Log Db"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:167
+#: plugins/admin/systems/class_divListSystem.inc:205
  msgid "Syslog Server"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:168
+#: plugins/admin/systems/class_divListSystem.inc:206
  msgid "Mail Server"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:207
  msgid "Imap Server"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:170
+#: plugins/admin/systems/class_divListSystem.inc:208
  msgid "Nfs Server"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:171
+#: plugins/admin/systems/class_divListSystem.inc:209
  msgid "Kerberos Server"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:210
  msgid "Asterisk Server"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:173
+#: plugins/admin/systems/class_divListSystem.inc:211
  msgid "Fax Server"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:174
+#: plugins/admin/systems/class_divListSystem.inc:212
  msgid "Ldap Server"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/acl/class_divListACL.inc:123
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/acl/class_divListACL.inc:128
  msgid "Edit system"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/acl/class_divListACL.inc:126
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/acl/class_divListACL.inc:132
  msgid "Delete system"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_divListSystem.inc:308
  msgid "Set root       password"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:229
+#: plugins/admin/systems/class_divListSystem.inc:315
  msgid "Create CD"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:230
+#: plugins/admin/systems/class_divListSystem.inc:316
  msgid "Create FAI CD"
  msgstr ""
  
@@ -11158,6 +11135,10 @@ msgstr ""
  msgid "Cups"
  msgstr ""
  
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr ""
+
  #: plugins/admin/systems/goLdapServer.tpl:1
  #: plugins/admin/systems/class_goLdapServer.inc:28
  msgid "LDAP service"
@@ -11240,6 +11221,15 @@ msgstr ""
  msgid "Remove service"
  msgstr ""
  
+#: plugins/admin/systems/class_goTerminalServer.inc:31
+#: plugins/admin/systems/class_goTerminalServer.inc:54
+#: plugins/admin/systems/class_goTerminalServer.inc:117
+#: plugins/admin/systems/class_goTerminalServer.inc:118
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#: plugins/admin/systems/class_terminalService.inc:467
+msgid "Terminal service"
+msgstr ""
+
  #: plugins/admin/systems/class_goTerminalServer.inc:78
  #, php-format
  msgid "Saving server services/terminalServer with dn '%s' failed."
@@ -11254,6 +11244,12 @@ msgstr ""
  msgid "Temporary disable login"
  msgstr ""
  
+#: plugins/admin/systems/class_goTerminalServer.inc:127
+#: plugins/admin/systems/goTerminalServer.tpl:12
+#: plugins/admin/systems/class_terminalService.inc:478
+msgid "Font path"
+msgstr ""
+
  #: plugins/admin/systems/class_serverService.inc:288
  msgid "Can't set status while this server is not saved."
  msgstr ""
@@ -11928,6 +11924,40 @@ msgid ""
  "Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
  msgstr ""
  
+#: plugins/admin/systems/class_terminalService.inc:157
+msgid "default"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:457
+#, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:476
+#: plugins/admin/ogroups/class_phonequeue.inc:748
+msgid "Method"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:484
+msgid "Auto-Sync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:485
+msgid "Printer service enabled"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:488
+msgid "Scanner model"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:489
+msgid "Haeh ? "
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:490
+msgid "..."
+msgstr ""
+
  #: plugins/admin/ogroups/termgroup.tpl:2
  msgid ""
  "Actions you choose here influence all systems in this object group. "
@@ -11948,8 +11978,8 @@ msgstr ""
  msgid "Phone queue"
  msgstr ""
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:88
-#: plugins/admin/ogroups/class_termgroup.inc:383
+#: plugins/admin/ogroups/tabs_ogroups.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:382
  msgid "System"
  msgstr ""
  
@@ -11957,20 +11987,24 @@ msgstr ""
  msgid "Terminals"
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:114
+#: plugins/admin/ogroups/class_termgroup.inc:108
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr ""
+
+#: plugins/admin/ogroups/class_termgroup.inc:113
  msgid "There must be at least one NTP server selected."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:168
+#: plugins/admin/ogroups/class_termgroup.inc:167
  #, php-format
  msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:376
+#: plugins/admin/ogroups/class_termgroup.inc:375
  msgid "Saving workstation failed"
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:384
+#: plugins/admin/ogroups/class_termgroup.inc:383
  msgid "System group"
  msgstr ""
  
@@ -12031,18 +12065,18 @@ msgid "Display objects of department"
  msgstr ""
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:715
+#: plugins/admin/ogroups/class_ogroup.inc:698
  #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
  msgid "Object groups"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:159
+#: plugins/admin/ogroups/class_ogroupManagement.inc:154
  #, php-format
  msgid "You're about to delete the object group '%s'."
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:165
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:160
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
  msgid "You are not allowed to delete this object group!"
  msgstr ""
  
@@ -12050,77 +12084,77 @@ msgstr ""
  msgid "This 'dn' is no object group."
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:290
  msgid "too many different objects!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:292
  msgid "users"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:295
+#: plugins/admin/ogroups/class_ogroup.inc:293
  msgid "groups"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:294
  msgid "applications"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:297
+#: plugins/admin/ogroups/class_ogroup.inc:295
  msgid "departments"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:296
  msgid "servers"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:299
+#: plugins/admin/ogroups/class_ogroup.inc:297
  msgid "workstations"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:298
  msgid "terminals"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:299
  msgid "phones"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:300
  msgid "printers"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:309
+#: plugins/admin/ogroups/class_ogroup.inc:307
  msgid "and"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:462
+#: plugins/admin/ogroups/class_ogroup.inc:444
  msgid "Non existing dn:"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:604
+#: plugins/admin/ogroups/class_ogroup.inc:586
  msgid "There is already an object with this cn."
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:618
+#: plugins/admin/ogroups/class_ogroup.inc:601
  msgid "You can combine two different object types at maximum only!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:667
+#: plugins/admin/ogroups/class_ogroup.inc:650
  #, php-format
  msgid "Saving of object group/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:680
+#: plugins/admin/ogroups/class_ogroup.inc:663
  #, php-format
  msgid "Removing of object group/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:710
+#: plugins/admin/ogroups/class_ogroup.inc:693
  msgid "Object group generic"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:721
+#: plugins/admin/ogroups/class_ogroup.inc:704
  msgid "Member"
  msgstr ""
  
@@ -12362,7 +12396,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:307
  #, php-format
  msgid ""
  "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -12374,9 +12408,9 @@ msgstr ""
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:97
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:317
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/macro/class_gofonMacro.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
+#: plugins/gofon/macro/class_gofonMacro.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:318
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:434
  #, php-format
  msgid "Can't select database %s on %s."
  msgstr ""
@@ -12392,8 +12426,8 @@ msgstr ""
  #: plugins/admin/ogroups/class_phonequeue.inc:537
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1185
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:474
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:476
  #, php-format
  msgid "The specified telephonenumber '%s' is already assigned to '%s'."
  msgstr ""
@@ -12407,8 +12441,8 @@ msgstr ""
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:90
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1067
-#: plugins/gofon/macro/class_gofonMacro.inc:234
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:423
  #, php-format
  msgid ""
  "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -12556,15 +12590,15 @@ msgstr ""
  msgid "Show groups containing phones"
  msgstr ""
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
  msgid "Create new object group"
  msgstr ""
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:207
  msgid "You are not allowed to remove this entry."
  msgstr ""
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:218
+#: plugins/admin/ogroups/class_divListOGroup.inc:222
  #: plugins/generic/references/class_reference.inc:50
  msgid "Object group"
  msgstr ""
@@ -12577,16 +12611,29 @@ msgstr ""
  msgid "ACLs"
  msgstr ""
  
-#: plugins/admin/acl/class_aclManagement.inc:159
+#: plugins/admin/acl/class_aclManagement.inc:122
+msgid "You are not allowed to edit this acl."
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:167
  #, php-format
  msgid "You're about to delete the acl %s."
  msgstr ""
  
-#: plugins/admin/acl/class_aclManagement.inc:165
-#: plugins/admin/acl/class_aclManagement.inc:191
+#: plugins/admin/acl/class_aclManagement.inc:173
+#: plugins/admin/acl/class_aclManagement.inc:198
  msgid "You are not allowed to delete this acl!"
  msgstr ""
  
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430
+msgid "Access control list"
+msgstr ""
+
+#: plugins/admin/acl/class_aclManagement.inc:433
+msgid "I don't know Jack"
+msgstr ""
+
  #: plugins/admin/acl/class_divListACL.inc:31
  msgid "List of acl"
  msgstr ""
@@ -12599,30 +12646,14 @@ msgstr ""
  msgid "This menu allows you to edit and delete selected acls."
  msgstr ""
  
-#: plugins/admin/acl/class_divListACL.inc:61
+#: plugins/admin/acl/class_divListACL.inc:60
  msgid "Display acls matching"
  msgstr ""
  
-#: plugins/admin/acl/class_divListACL.inc:109
+#: plugins/admin/acl/class_divListACL.inc:115
  msgid "Acl"
  msgstr ""
  
-#: plugins/admin/acl/class_divListACL.inc:153
-msgid "Select to display users"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:153
-msgid "Display user"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:155
-msgid "Select to display departments"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:155
-msgid "Display departments"
-msgstr ""
-
  #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
  msgid "ACL management"
  msgstr ""
@@ -12647,32 +12678,34 @@ msgstr ""
  msgid "Fully Automatic Installation"
  msgstr ""
  
-#: plugins/admin/fai/class_faiScript.inc:422
+#: plugins/admin/fai/class_faiScript.inc:433
  #, php-format
  msgid "Creating of FAI/script with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/fai/class_faiScript.inc:519
+#: plugins/admin/fai/class_faiScript.inc:530
  #: plugins/admin/fai/class_faiHookEntry.inc:191
  msgid "FAI script"
  msgstr ""
  
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
+#: plugins/admin/fai/class_faiPackage.inc:539
+#: plugins/admin/fai/class_faiPackage.inc:542
  msgid "Readonly"
  msgstr ""
  
-#: plugins/admin/fai/class_faiTemplate.inc:401
+#: plugins/admin/fai/class_faiTemplate.inc:414
  #, php-format
  msgid "Saving of FAI/template with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/fai/class_faiTemplate.inc:487
+#: plugins/admin/fai/class_faiTemplate.inc:500
  msgid "FAI template"
  msgstr ""
  
  #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:853
+#: plugins/admin/fai/class_faiManagement.inc:863
  msgid "FAI"
  msgstr ""
  
@@ -12713,17 +12746,17 @@ msgstr ""
  msgid "You are not allowed to create a new branch."
  msgstr ""
  
-#: plugins/admin/fai/class_faiManagement.inc:506
-#: plugins/admin/fai/class_faiManagement.inc:522
+#: plugins/admin/fai/class_faiManagement.inc:516
+#: plugins/admin/fai/class_faiManagement.inc:532
  #, php-format
  msgid "You are not allowed to create a new '%s' object."
  msgstr ""
  
-#: plugins/admin/fai/class_faiManagement.inc:847
+#: plugins/admin/fai/class_faiManagement.inc:857
  msgid "FAI releases"
  msgstr ""
  
-#: plugins/admin/fai/class_faiManagement.inc:848
+#: plugins/admin/fai/class_faiManagement.inc:858
  msgid "FAI release management"
  msgstr ""
  
@@ -12743,11 +12776,11 @@ msgstr ""
  msgid "Choosen packages"
  msgstr ""
  
-#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:674
  msgid "Configure"
  msgstr ""
  
-#: plugins/admin/fai/faiPackage.tpl:80
+#: plugins/admin/fai/faiPackage.tpl:87
  msgid "Toggle remove flag"
  msgstr ""
  
@@ -12922,7 +12955,7 @@ msgstr ""
  #: plugins/admin/fai/class_faiProfile.inc:298
  #: plugins/admin/fai/class_faiPartitionTable.inc:520
  #: plugins/admin/fai/class_faiProfileEntry.inc:140
-#: plugins/admin/fai/class_faiSummaryTab.inc:45
+#: plugins/admin/fai/class_faiSummaryTab.inc:48
  msgid "Partition table"
  msgstr ""
  
@@ -12971,120 +13004,124 @@ msgstr ""
  
  #: plugins/admin/fai/class_faiHook.inc:535
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  msgid "Read only"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  msgid "primary"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  msgid "logical"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
  msgid "FS type"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
-#: plugins/admin/fai/class_faiSummaryTab.inc:317
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:468
+#: plugins/admin/fai/class_faiSummaryTab.inc:344
  msgid "Mount point"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
-#: plugins/admin/fai/class_faiSummaryTab.inc:316
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:343
  msgid "Size in MB"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
-#: plugins/admin/fai/class_faiSummaryTab.inc:315
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:470
+#: plugins/admin/fai/class_faiSummaryTab.inc:342
  msgid "Mount options"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
  msgid "FS option"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
  msgid "Preserve"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:368
+msgid "Please specify a valid disc name."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
  #, php-format
  msgid "please enter a unique mount point for partition %s"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
  #, php-format
  msgid "Please enter a valid mount point for partition %s."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:401
  #, php-format
  msgid ""
  "File system type 'swap' is already used, change file system type for "
  "partition %s."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:405
  msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:411
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:415
  #, php-format
  msgid "Please enter a valid partition size for partition %s."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:412
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:421
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:423
  #, php-format
  msgid "Please enter a valid range for partition %s."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:428
  #, php-format
  msgid "Please enter a range for partition size for partition %s."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:434
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:443
  msgid ""
  "You have more than 3 primary partition table entries in your configuration, "
  "please check your configuration twice."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:446
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
  msgid "Partition table entry"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
  msgid "FAI partition table entry"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:465
  msgid "Partition type"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:466
  msgid "Partition no."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:467
  msgid "File system type"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:469
  msgid "Partition size"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:471
  msgid "File system options"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:472
  msgid "Partition flags"
  msgstr ""
  
@@ -13272,12 +13309,12 @@ msgstr ""
  msgid "A new class name."
  msgstr ""
  
-#: plugins/admin/fai/class_faiVariable.inc:334
+#: plugins/admin/fai/class_faiVariable.inc:330
  #, php-format
  msgid "Saving of FAI/variable with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/fai/class_faiVariable.inc:413
+#: plugins/admin/fai/class_faiVariable.inc:409
  msgid "FAI variable"
  msgstr ""
  
@@ -13351,7 +13388,7 @@ msgid "Destination path"
  msgstr ""
  
  #: plugins/admin/fai/faiTemplateEntry.tpl:74
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:577
  #: plugins/gofon/conference/class_divListConferences.inc:53
  msgid "Owner"
  msgstr ""
@@ -13491,34 +13528,36 @@ msgid ""
  "to get your data back."
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:41
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
  msgid "Scripts"
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:46
+#: plugins/admin/fai/class_faiSummaryTab.inc:49
  msgid "Package list"
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:86
+msgid ""
+"Unknown type of FAI source information. This is not a profile, workstation "
+"nor a ogroup."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:217
  msgid "This object has no FAI classes assigned."
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:203
+#: plugins/admin/fai/class_faiSummaryTab.inc:230
  msgid "Open"
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:312
+#: plugins/admin/fai/class_faiSummaryTab.inc:339
  msgid "No."
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:314
+#: plugins/admin/fai/class_faiSummaryTab.inc:341
  msgid "FS options"
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:553
-msgid "Viewable"
-msgstr ""
-
  #: plugins/admin/fai/branch_selector.tpl:21
  msgid "Create new branch"
  msgstr ""
@@ -13603,88 +13642,88 @@ msgstr ""
  msgid "Show partitions"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "New profile"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "New partition table"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "PT"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "New scripts"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "S"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "New hooks"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "H"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "New variables"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "V"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  msgid "New templates "
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  msgid "I"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "New package list"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "PK"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:242
-#: plugins/admin/fai/class_divListFai.inc:245
+#: plugins/admin/fai/class_divListFai.inc:240
+#: plugins/admin/fai/class_divListFai.inc:243
  msgid "Edit class"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:253
+#: plugins/admin/fai/class_divListFai.inc:251
  msgid "Delete class"
  msgstr ""
  
-#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/generic.tpl:12
  #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:180
  msgid "Mime type"
  msgstr ""
  
-#: plugins/admin/mimetypes/generic.tpl:17
+#: plugins/admin/mimetypes/generic.tpl:16
  #: plugins/admin/mimetypes/paste_generic.tpl:16
  msgid "Please enter a name for the mime type here"
  msgstr ""
  
-#: plugins/admin/mimetypes/generic.tpl:23
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:673
+#: plugins/admin/mimetypes/generic.tpl:22
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:681
  msgid "Mime group"
  msgstr ""
  
-#: plugins/admin/mimetypes/generic.tpl:27
+#: plugins/admin/mimetypes/generic.tpl:26
  msgid "Categorize this mime type"
  msgstr ""
  
-#: plugins/admin/mimetypes/generic.tpl:39
+#: plugins/admin/mimetypes/generic.tpl:38
  msgid "Please specify a description"
  msgstr ""
  
@@ -13701,7 +13740,7 @@ msgid "Left click"
  msgstr ""
  
  #: plugins/admin/mimetypes/generic.tpl:99
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:679
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:687
  msgid "File patterns"
  msgstr ""
  
@@ -13739,55 +13778,51 @@ msgstr ""
  msgid "Ask whether to save to local disk"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:461
  #, php-format
  msgid "Saving of mime type/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:452
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:470
  #, php-format
  msgid "Removing of mime type/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:464
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:482
  #, php-format
  msgid "Removing mime type from objectgroup '%s' failed"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:474
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:492
  msgid "Please specify a valid name for this mime type."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:477
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:495
  msgid "Please specify at least one file pattern."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:490
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:508
  msgid "There's already a mime type with this 'Name'."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:498
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:516
  msgid "There's already an mime with this 'Name'."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:510
-msgid "You have no permissions to create a mime type on this 'Base'."
-msgstr ""
-
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
  msgid "Mime type generic"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
  #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
  msgid "Mime types"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:685
  msgid "Left click action"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:688
  msgid "Embedded applications"
  msgstr ""
  
@@ -13795,13 +13830,13 @@ msgstr ""
  msgid "Manage mime types"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:276
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:278
  #, php-format
  msgid "You're about to delete the mime type '%s'."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:282
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:311
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:313
  msgid "You are not allowed to delete this mime type!"
  msgstr ""
  
@@ -13829,7 +13864,7 @@ msgstr ""
  msgid "Display mime types matching"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:140
  msgid "Create new mime type"
  msgstr ""
  
@@ -13863,7 +13898,7 @@ msgstr ""
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:658
  #: plugins/gofon/macro/class_gofonMacro.inc:95
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:286
  msgid ""
  "There is currently no asterisk server defined. Possibly you are missing a "
  "server that handles the asterisk management (goFonServer). Your settings "
@@ -13982,20 +14017,24 @@ msgstr ""
  msgid "Phone account settings"
  msgstr ""
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1237
+msgid "GOfon reports"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:576
  msgid "Telephone number"
  msgstr ""
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1242
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
  msgid "Macro settings"
  msgstr ""
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1246
  msgid "Telephone pin"
  msgstr ""
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1247
  msgid "Voicemail pin"
  msgstr ""
  
@@ -14032,7 +14071,7 @@ msgid "Regular expression for matching macro names"
  msgstr ""
  
  #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
-#: plugins/gofon/macro/class_gofonMacro.inc:483
+#: plugins/gofon/macro/class_gofonMacro.inc:496
  msgid "Macro name"
  msgstr ""
  
@@ -14052,13 +14091,13 @@ msgstr ""
  msgid "Phone macros"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:207
  #, php-format
  msgid "You're about to delete the macro '%s'."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:214
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:213
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
  msgid "You are not allowed to delete this macro!"
  msgstr ""
  
@@ -14067,81 +14106,85 @@ msgstr ""
  msgid "This 'dn' is no phone macro."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:185
+#: plugins/gofon/macro/class_gofonMacro.inc:183
  msgid ""
  "This macro ist still in use. To delete this Macro ensure that nobody has "
  "selected this Macro."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: plugins/gofon/macro/class_gofonMacro.inc:190
+#: plugins/gofon/macro/class_gofonMacro.inc:205
  #: plugins/gofon/macro/class_gofonMacroParameters.inc:402
  #, php-format
  msgid "Removing of goFonMacro/generic account with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:220
+#: plugins/gofon/macro/class_gofonMacro.inc:218
  msgid ""
  "There is no mysql extension available in your php setup, can't save any "
  "changes to asterisk db."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:290
+#: plugins/gofon/macro/class_gofonMacro.inc:288
  #, php-format
  msgid "Unable to parse macro contents on line: %s"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:308
+#: plugins/gofon/macro/class_gofonMacro.inc:306
  #, php-format
  msgid "Can't perform SELECT query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:317
-#: plugins/gofon/macro/class_gofonMacro.inc:325
+#: plugins/gofon/macro/class_gofonMacro.inc:315
+#: plugins/gofon/macro/class_gofonMacro.inc:323
  #, php-format
  msgid "Can't perform DELETE query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:339
+#: plugins/gofon/macro/class_gofonMacro.inc:337
  #, php-format
  msgid "Can't perform INSERT query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:405
+#: plugins/gofon/macro/class_gofonMacro.inc:417
  #, php-format
  msgid "The given cn '%s' already exists."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:422
  msgid "You must specify the 'Display Name' in order to save this macro"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:414
+#: plugins/gofon/macro/class_gofonMacro.inc:426
  msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:418
+#: plugins/gofon/macro/class_gofonMacro.inc:430
  msgid "Makro length must be lower than 100 lines"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:423
+#: plugins/gofon/macro/class_gofonMacro.inc:435
  msgid "Please choose a valid  base."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:478
  #, php-format
  msgid "Saving of goFonMacro/generic account with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/macro/class_gofonMacro.inc:487
  msgid "Asterisk macro management"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:487
-msgid "Macro content"
+#: plugins/gofon/macro/class_gofonMacro.inc:492
+msgid "GOfon macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:500
+msgid "Macro content and parameter"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:488
+#: plugins/gofon/macro/class_gofonMacro.inc:501
  msgid "Visibility flag"
  msgstr ""
  
@@ -14197,30 +14240,28 @@ msgstr ""
  msgid "Visible"
  msgstr ""
  
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "Create new phone macro"
  msgstr ""
  
-#: plugins/gofon/macro/class_divListMacros.inc:132
-#: plugins/gofon/macro/class_divListMacros.inc:160
-msgid "Edit macro"
+#: plugins/gofon/macro/class_divListMacros.inc:124
+msgid "Macro"
  msgstr ""
  
-#: plugins/gofon/macro/class_divListMacros.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:168
-msgid "Delete macro"
+#: plugins/gofon/macro/class_divListMacros.inc:125
+msgid "visible"
  msgstr ""
  
-#: plugins/gofon/macro/class_divListMacros.inc:137
-msgid "Macro"
+#: plugins/gofon/macro/class_divListMacros.inc:126
+msgid "invisible"
  msgstr ""
  
-#: plugins/gofon/macro/class_divListMacros.inc:138
-msgid "visible"
+#: plugins/gofon/macro/class_divListMacros.inc:147
+msgid "Edit macro"
  msgstr ""
  
-#: plugins/gofon/macro/class_divListMacros.inc:139
-msgid "invisible"
+#: plugins/gofon/macro/class_divListMacros.inc:155
+msgid "Delete macro"
  msgstr ""
  
  #: plugins/gofon/conference/headpage.tpl:6
@@ -14258,7 +14299,7 @@ msgid "Lifetime (in days)"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:137
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:566
  msgid "Preset PIN"
  msgstr ""
  
@@ -14268,7 +14309,7 @@ msgid "PIN"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:157
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
  msgid "Record conference"
  msgstr ""
  
@@ -14277,7 +14318,7 @@ msgid "Sound file format"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:568
  msgid "Play music on hold"
  msgstr ""
  
@@ -14306,78 +14347,78 @@ msgstr ""
  msgid "Removing of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:252
  msgid ""
  "You have specified a conference 'without PIN' ... please leave the PIN "
  "fields empty."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
  msgid "Please enter a PIN."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:260
  msgid "Please enter a name for the conference."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:251
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:264
  msgid "Only numeric chars are allowed in Number field."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:268
  msgid "Only numbers are allowed in Lifetime."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:298
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:408
  msgid ""
  "Can't save any changes to asterisk database, there is currently no mysql "
  "extension available in your php setup."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
  #, php-format
  msgid "Saving of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
-#: plugins/gofon/conference/class_divListConferences.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_divListConferences.inc:198
  msgid "Conference"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:552
  msgid "Phone conference management"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
-msgid "GOfon"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+msgid "GOfon conference"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
  msgid "Conference PIN"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:569
  msgid "Activate menu"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:570
  msgid "Announce user activity"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:571
  msgid "Count user"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:572
  msgid "Conference type"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:574
  msgid "Format"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:575
  msgid "Lifetime"
  msgstr ""
  
@@ -14393,43 +14434,43 @@ msgstr ""
  msgid "Regular expression for matching conference names"
  msgstr ""
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  msgid "Create new conference"
  msgstr ""
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  msgid "New conference"
  msgstr ""
  
-#: plugins/gofon/conference/class_divListConferences.inc:196
+#: plugins/gofon/conference/class_divListConferences.inc:192
  #: include/class_pluglist.inc:145 include/class_pluglist.inc:146
  #: include/class_pluglist.inc:245
  msgid "Unknown"
  msgstr ""
  
  #: plugins/gofon/fonreports/contents.tpl:31
-#: plugins/gofon/fonreports/class_fonreport.inc:399
+#: plugins/gofon/fonreports/class_fonreport.inc:400
  msgid "Source"
  msgstr ""
  
  #: plugins/gofon/fonreports/contents.tpl:32
-#: plugins/gofon/fonreports/class_fonreport.inc:400
+#: plugins/gofon/fonreports/class_fonreport.inc:401
  msgid "Destination"
  msgstr ""
  
  #: plugins/gofon/fonreports/contents.tpl:33
-#: plugins/gofon/fonreports/class_fonreport.inc:401
+#: plugins/gofon/fonreports/class_fonreport.inc:402
  msgid "Channel"
  msgstr ""
  
  #: plugins/gofon/fonreports/contents.tpl:36
-#: plugins/gofon/fonreports/class_fonreport.inc:404
+#: plugins/gofon/fonreports/class_fonreport.inc:405
  msgid "Duration"
  msgstr ""
  
  #: plugins/gofon/fonreports/main.inc:16
-#: plugins/gofon/fonreports/class_fonreport.inc:389
  #: plugins/gofon/fonreports/class_fonreport.inc:390
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  msgid "Phone reports"
  msgstr ""
  
@@ -14450,11 +14491,11 @@ msgstr ""
  msgid "Query for phone database failed!"
  msgstr ""
  
-#: plugins/gofon/fonreports/class_fonreport.inc:402
+#: plugins/gofon/fonreports/class_fonreport.inc:403
  msgid "Application called"
  msgstr ""
  
-#: plugins/gofon/fonreports/class_fonreport.inc:403
+#: plugins/gofon/fonreports/class_fonreport.inc:404
  msgid "Disposition"
  msgstr ""
  
@@ -14500,7 +14541,7 @@ msgstr ""
  msgid "Generating this page caused the PHP interpreter to raise some errors!"
  msgstr ""
  
-#: include/php_setup.inc:71 html/main.php:388
+#: include/php_setup.inc:71
  msgid "Toggle information"
  msgstr ""
  
@@ -14524,15 +14565,15 @@ msgstr ""
  msgid "method"
  msgstr ""
  
-#: include/php_setup.inc:129
+#: include/php_setup.inc:135
  msgid "Trace"
  msgstr ""
  
-#: include/php_setup.inc:130
+#: include/php_setup.inc:136
  msgid "Line"
  msgstr ""
  
-#: include/php_setup.inc:131
+#: include/php_setup.inc:137
  msgid "Arguments"
  msgstr ""
  
@@ -14607,7 +14648,7 @@ msgstr ""
  msgid "incomplete"
  msgstr ""
  
-#: include/functions.inc:1046 include/functions.inc:1233
+#: include/functions.inc:1046 include/functions.inc:1202
  msgid "LDAP error:"
  msgstr ""
  
@@ -14646,19 +14687,19 @@ msgid ""
  "Please contact the person in order to clarify proceedings."
  msgstr ""
  
-#: include/functions.inc:1415
+#: include/functions.inc:1384
  msgid "Entries per page"
  msgstr ""
  
-#: include/functions.inc:1443
+#: include/functions.inc:1412
  msgid "Apply filter"
  msgstr ""
  
-#: include/functions.inc:1717
+#: include/functions.inc:1686
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr ""
  
-#: include/functions.inc:1760
+#: include/functions.inc:1729
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr ""
@@ -14667,51 +14708,51 @@ msgstr ""
  msgid "Warning: Account has an invalid mailserver string!"
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:53
+#: include/class_mail-methods-cyrus.inc:58
  msgid ""
  "Warning: IMAP Server cannot be reached! If you save this account, some mail "
  "settings will not be stored on your server!"
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:151
+#: include/class_mail-methods-cyrus.inc:156
  #, php-format
  msgid "Can't create IMAP mailbox. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:170
+#: include/class_mail-methods-cyrus.inc:175
  #, php-format
  msgid "Can't write IMAP quota. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:196
+#: include/class_mail-methods-cyrus.inc:201
  msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:219
  msgid "Warning: imap_getacl is not available, can't get imap permissions!"
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_mail-methods-cyrus.inc:241
  #, php-format
  msgid "Can't remove IMAP mailbox. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:264
+#: include/class_mail-methods-cyrus.inc:269
  #, php-format
  msgid "Can't log into SIEVE server. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:277
+#: include/class_mail-methods-cyrus.inc:282
  #, php-format
  msgid "Can't get sieve script. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:348
+#: include/class_mail-methods-cyrus.inc:353
  #, php-format
  msgid "Can't send sieve script. Server says '%s'."
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:352
+#: include/class_mail-methods-cyrus.inc:357
  #, php-format
  msgid "Can't activate GOsa sieve script. Server says '%s'."
  msgstr ""
@@ -14748,36 +14789,36 @@ msgstr ""
  msgid "Unknown FAIstate %s"
  msgstr ""
  
-#: include/class_ldap.inc:705
+#: include/class_ldap.inc:707
  #, php-format
  msgid ""
  "Autocreation of type '%s' is currently not supported. Please report to the "
  "GOsa team."
  msgstr ""
  
-#: include/class_ldap.inc:774
+#: include/class_ldap.inc:776
  #, php-format
  msgid "while operating on '%s' using LDAP server '%s'"
  msgstr ""
  
-#: include/class_ldap.inc:776
+#: include/class_ldap.inc:778
  #, php-format
  msgid "while operating on LDAP server %s"
  msgstr ""
  
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1000
  #, php-format
  msgid ""
  "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
  "in line %s"
  msgstr ""
  
-#: include/class_ldap.inc:1027
+#: include/class_ldap.inc:1029
  #, php-format
  msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
  msgstr ""
  
-#: include/class_ldap.inc:1155
+#: include/class_ldap.inc:1157
  #, php-format
  msgid "Ldap import with dn '%s' failed."
  msgstr ""
@@ -14791,85 +14832,81 @@ msgstr ""
  msgid "References"
  msgstr ""
  
-#: include/class_plugin.inc:420
+#: include/class_plugin.inc:421
  #, php-format
  msgid ""
  "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
  msgstr ""
  
-#: include/class_plugin.inc:601
+#: include/class_plugin.inc:602
  #, php-format
  msgid ""
  "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
  msgstr ""
  
-#: include/class_plugin.inc:635 include/class_password-methods.inc:183
+#: include/class_plugin.inc:636 include/class_password-methods.inc:183
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
  msgstr ""
  
-#: include/class_plugin.inc:669
+#: include/class_plugin.inc:670
  #, php-format
  msgid ""
  "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
  msgstr ""
  
-#: include/class_plugin.inc:977
+#: include/class_plugin.inc:978
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr ""
  
-#: include/class_plugin.inc:984
+#: include/class_plugin.inc:985
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr ""
  
-#: include/class_plugin.inc:998 include/class_plugin.inc:1027
+#: include/class_plugin.inc:999 include/class_plugin.inc:1028
  #, php-format
  msgid "Handle object tagging with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1014
+#: include/class_plugin.inc:1015
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr ""
  
-#: include/class_plugin.inc:1075 include/class_plugin.inc:1121
-#: include/class_plugin.inc:1122
+#: include/class_plugin.inc:1076 include/class_plugin.inc:1122
+#: include/class_plugin.inc:1123
  #, php-format
  msgid "Saving object snapshot with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1137
-msgid "You are not allowed to delete this snapshot!"
-msgstr ""
-
-#: include/class_plugin.inc:1153
+#: include/class_plugin.inc:1149
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1165
+#: include/class_plugin.inc:1161
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable(s) '%s' is "
  "not configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1197
+#: include/class_plugin.inc:1193
  #, php-format
  msgid "Method get available snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1253
+#: include/class_plugin.inc:1249
  #, php-format
  msgid "Method get deleted snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1317 include/class_plugin.inc:1331
+#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
  #, php-format
  msgid "Restore snapshot with dn '%s' failed."
  msgstr ""
@@ -14961,7 +14998,7 @@ msgstr ""
  msgid "Can't bind to LDAP. Please contact the system administrator."
  msgstr ""
  
-#: include/class_config.inc:472
+#: include/class_config.inc:477
  msgid "SID and/or RIDBASE missing in your configuration!"
  msgstr ""
  
@@ -15409,7 +15446,7 @@ msgid ""
  "reachable for GOsa."
  msgstr ""
  
-#: include/functions_setup.inc:784
+#: include/functions_setup.inc:792
  #, php-format
  msgid ""
  "You're missing the required attribute '%s' from this formular. Please "
@@ -15437,12 +15474,10 @@ msgstr ""
  msgid "Can't log into LDAP server. Reason was: %s."
  msgstr ""
  
-#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:252
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1092
  msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
+"User and/or group could not be created, please check your configuration "
+"twice !"
  msgstr ""
  
  #: include/functions_helpviewer.inc:43
@@ -15504,92 +15539,96 @@ msgstr ""
  msgid "Use ACL defined in role"
  msgstr ""
  
-#: include/class_acl.inc:370
+#: include/class_acl.inc:372
  msgid "Edit ACL"
  msgstr ""
  
-#: include/class_acl.inc:371
+#: include/class_acl.inc:373
  msgid "Delete ACL"
  msgstr ""
  
-#: include/class_acl.inc:408
+#: include/class_acl.inc:410
  msgid "No ACL settings for this category"
  msgstr ""
  
-#: include/class_acl.inc:410
+#: include/class_acl.inc:412
  #, php-format
  msgid "Contains ACLs for these objects: %s"
  msgstr ""
  
-#: include/class_acl.inc:415
+#: include/class_acl.inc:417
  msgid "Edit categories ACLs"
  msgstr ""
  
-#: include/class_acl.inc:416
+#: include/class_acl.inc:418
  msgid "Clear categories ACLs"
  msgstr ""
  
-#: include/class_acl.inc:455
+#: include/class_acl.inc:457
  #, php-format
  msgid "Edit ACL for '%s', scope is '%s'"
  msgstr ""
  
-#: include/class_acl.inc:465
+#: include/class_acl.inc:467
  msgid "All objects in current subtree"
  msgstr ""
  
-#: include/class_acl.inc:525 include/class_acl.inc:532
+#: include/class_acl.inc:557 include/class_acl.inc:564
  msgid "Show/Hide Advanced Settings"
  msgstr ""
  
-#: include/class_acl.inc:550
+#: include/class_acl.inc:582
  msgid "Create objects"
  msgstr ""
  
-#: include/class_acl.inc:551
+#: include/class_acl.inc:583
  msgid "Move objects"
  msgstr ""
  
-#: include/class_acl.inc:552
+#: include/class_acl.inc:584
  msgid "Remove objects"
  msgstr ""
  
-#: include/class_acl.inc:554 include/class_acl.inc:560
+#: include/class_acl.inc:586 include/class_acl.inc:592
  msgid "Modifyable by owner"
  msgstr ""
  
-#: include/class_acl.inc:557
+#: include/class_acl.inc:589
  msgid "Move object"
  msgstr ""
  
-#: include/class_acl.inc:558
+#: include/class_acl.inc:590
  msgid "Remove object"
  msgstr ""
  
-#: include/class_acl.inc:686
+#: include/class_acl.inc:602
+msgid "Complete object"
+msgstr ""
+
+#: include/class_acl.inc:718
  #, php-format
  msgid "Unkown ACL type '%s'. Don't know how to handle it."
  msgstr ""
  
-#: include/class_acl.inc:726
+#: include/class_acl.inc:758
  #, php-format
  msgid "Unknown entry '%s'!"
  msgstr ""
  
-#: include/class_acl.inc:787
+#: include/class_acl.inc:819
  #, php-format
  msgid "Contains settings for these objects: %s"
  msgstr ""
  
-#: include/class_acl.inc:795
+#: include/class_acl.inc:827
  msgid "Members:"
  msgstr ""
  
-#: include/class_acl.inc:801
+#: include/class_acl.inc:833
  msgid "ACL is valid for all users"
  msgstr ""
  
-#: include/class_acl.inc:909
+#: include/class_acl.inc:941
  #, php-format
  msgid "Saving ACLs with dn '%s' failed."
  msgstr ""
@@ -15598,30 +15637,30 @@ msgstr ""
  msgid "This package has no debconf options."
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:400
+#: include/class_MultiSelectWindow.inc:458
  msgid ""
  "Error: The requested subtree has an inconsistent DN encoding, check your "
  "LDAP!"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:504
+#: include/class_MultiSelectWindow.inc:567
  msgid "Restore snapshopts of already deleted objects"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:505
+#: include/class_MultiSelectWindow.inc:568
  msgid "Restore"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:106
+#: include/class_MultiSelectWindow.inc:586
+#: include/class_SnapShotDialog.inc:113
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  msgid "Create snapshot"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  msgid "Create a new snapshot from this object"
  msgstr ""
  
@@ -15637,43 +15676,54 @@ msgid ""
  "zone."
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:153
+#: include/functions_dns.inc:607
+#, php-format
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:147
+#, php-format
+msgid "You are going to paste the cutted entry '%s'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:174
  #, php-format
-msgid "You are going to copy the entry '%s'."
+msgid "You are going to paste the copied entry '%s'."
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:217
+#: include/class_CopyPasteHandler.inc:238
  msgid "Paste"
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:219
+#: include/class_CopyPasteHandler.inc:240
  msgid "Can't paste"
  msgstr ""
  
-#: include/functions_FAI.inc:363
+#: include/functions_FAI.inc:361
  #, php-format
  msgid "Error, following objects should be equal '%s' and '%s'"
  msgstr ""
  
-#: include/functions_FAI.inc:470
+#: include/functions_FAI.inc:468
  #, php-format
  msgid "Release management failed, can't save '%s'"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:53
+#: include/class_SnapShotDialog.inc:63
  #, php-format
  msgid "You're about to delete the snapshot '%s'."
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:108
+#: include/class_SnapShotDialog.inc:115
  msgid "Remove snapshot"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
+#: include/class_SnapShotDialog.inc:117 include/class_SnapShotDialog.inc:137
  msgid "Y-m-d, H:i:s"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:142
+#: include/class_SnapShotDialog.inc:149
  msgid "Please specify a valid description for this snapshot."
  msgstr ""
  
@@ -15713,29 +15763,23 @@ msgid ""
  "please check existence and rights of this directory!"
  msgstr ""
  
-#: html/main.php:170
+#: html/main.php:172
  msgid ""
  "FATAL: Register globals is on. GOsa will refuse to login unless this is "
  "fixed by an administrator."
  msgstr ""
  
-#: html/main.php:212
+#: html/main.php:214
  msgid "Warning: memory is getting low - please increase the memory_limit!"
  msgstr ""
  
-#: html/main.php:349
-#, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
-msgstr ""
-
-#: html/main.php:364
+#: html/main.php:353
  msgid "Your password is about to expire, please change your password"
  msgstr ""
  
-#: html/main.php:388
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
+#: html/main.php:361
+#, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
  msgstr ""
  
  #: html/getkiosk.php:25
@@ -15748,11 +15792,11 @@ msgstr ""
  msgid "Can't read file '%s', check permissions."
  msgstr ""
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Session will not be encrypted."
  msgstr ""
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Enter SSL session"
  msgstr ""
  
@@ -15772,28 +15816,34 @@ msgid ""
  "make sure, that this is possible."
  msgstr ""
  
-#: html/index.php:232
+#: html/index.php:231
  msgid ""
  "Your ldap setup contains old schema definitions. Please re-run the setup."
  msgstr ""
  
-#: html/index.php:260
+#: html/index.php:250 ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+
+#: html/index.php:258
  msgid "Please specify a valid username!"
  msgstr ""
  
-#: html/index.php:262
+#: html/index.php:260
  msgid "Please specify your password!"
  msgstr ""
  
-#: html/index.php:269
+#: html/index.php:267
  msgid "Please check the username/password combination."
  msgstr ""
  
-#: html/index.php:293
+#: html/index.php:291
  msgid "Account locked. Please contact your system administrator."
  msgstr ""
  
-#: html/index.php:345
+#: html/index.php:343
  msgid ""
  "Your browser has cookies disabled. Please enable cookies and reload this "
  "page before logging in!"
@@ -15930,7 +15980,7 @@ msgid ""
  "and let me use filters instead"
  msgstr ""
  
-#: ihtml/themes/default/login.tpl:14
+#: ihtml/themes/default/login.tpl:15
  msgid "Please use your username and password to log in"
  msgstr ""
  
@@ -16251,14 +16301,24 @@ msgstr ""
  msgid "Copy & paste wizard"
  msgstr ""
  
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:7
  msgid ""
  "Some values need to be unique in the complete directory while some "
  "combinations make no sense. GOsa shows the relevant attributes. Please "
  "maintain the values below to fullfill the policies."
  msgstr ""
  
-#: ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/copyPasteDialog.tpl:9
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:10
+msgid ""
+"Or if you copy or cut an entry within GOsa and delete the source object, you "
+"may get errors while pasting this object again!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:26
  msgid "Operation complete"
  msgstr ""
  
@@ -16299,29 +16359,48 @@ msgid ""
  "replace the existing object after pressing the restore button."
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:23
+#: ihtml/themes/default/snapshotdialog.tpl:9
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only nescessary to open and save them again (goFon), "
+"but some entries must be recreated manually (glpi)."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:12
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:29
  msgid "There is no snapshot available that could be restored"
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:25
+#: ihtml/themes/default/snapshotdialog.tpl:31
  msgid "Choose a snapshot and click the folder image, to restore the snapshot"
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:43
+#: ihtml/themes/default/snapshotdialog.tpl:49
  msgid "Creating object snapshots"
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:46
+#: ihtml/themes/default/snapshotdialog.tpl:52
  msgid ""
  "This procedure will create a snapshot of the selected object. It will be "
  "stored inside a special branch of your directory system and can be restored "
  "later on."
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:61
-msgid "Timestamp"
+#: ihtml/themes/default/snapshotdialog.tpl:55
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
  msgstr ""
  
  #: ihtml/themes/default/snapshotdialog.tpl:70
+msgid "Timestamp"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:79
  msgid "Reason for generating this snapshot"
  msgstr ""
diff --git a/locale/nl/LC_MESSAGES/messages.po b/locale/nl/LC_MESSAGES/messages.po

index ca6fed834609c400beb94f7973a08daa8f3997ad..e16cb7eb7c18f9c481c624907c896da316ee4328 100644 (file)
--- a/locale/nl/LC_MESSAGES/messages.po
+++ b/locale/nl/LC_MESSAGES/messages.po
@@ -7,15 +7,13 @@
  #
  # Translator:
  # Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>, 2005.
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/admin/systems/class_terminalService.inc:452
-#: plugins/admin/systems/class_terminalService.inc:453
-#: include/class_plugin.inc:115 include/class_plugin.inc:116
+#: plugins/personal/generic/class_user.inc:1360 include/class_plugin.inc:115
+#: include/class_plugin.inc:116
  msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-17 12:33+0100\n"
+"POT-Creation-Date: 2006-12-18 11:18+0100\n"
  "PO-Revision-Date: 2006-06-02 16:58+0100\n"
  "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
  "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -23,7 +21,24 @@ msgstr ""
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
  
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1373
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1011
+#: plugins/personal/password/class_password.inc:16
+#: plugins/personal/posix/class_posixAccount.inc:1313
+#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/connectivity/class_phpgwAccount.inc:147
+#: plugins/personal/connectivity/class_kolabAccount.inc:451
+#: plugins/personal/connectivity/class_webdavAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:223
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:954
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#: plugins/personal/connectivity/class_intranetAccount.inc:180
+#: plugins/personal/connectivity/class_pptpAccount.inc:163
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/personal/environment/class_environment.inc:1274
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#: plugins/personal/netatalk/class_netatalk.inc:359
  msgid "My account"
  msgstr "Mijn account"
  
@@ -31,8 +46,8 @@ msgstr "Mijn account"
  msgid "Administration"
  msgstr "Beheer"
  
-#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:788
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
  msgid "Addons"
  msgstr "Plugins"
  
@@ -44,28 +59,28 @@ msgstr "Plugins"
  #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
  #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
  #: plugins/personal/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1368
+#: plugins/personal/generic/class_user.inc:1367
  #: plugins/gofax/blocklists/generic.tpl:1
  #: plugins/gofax/faxaccount/generic.tpl:6
  #: plugins/gofax/faxaccount/paste_generic.tpl:4
  #: plugins/admin/groups/mail.tpl:7
-#: plugins/admin/groups/class_groupGeneric.inc:884
-#: plugins/admin/applications/class_applicationGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:531
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#: plugins/admin/applications/class_applicationGeneric.inc:523
+#: plugins/admin/departments/class_departmentGeneric.inc:575
  #: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/class_servGeneric.inc:334
-#: plugins/admin/systems/class_workstationGeneric.inc:504
+#: plugins/admin/systems/class_servGeneric.inc:347
+#: plugins/admin/systems/class_workstationGeneric.inc:526
  #: plugins/admin/systems/servkolab.tpl:6 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/class_printGeneric.inc:854
-#: plugins/admin/systems/class_componentGeneric.inc:257
-#: plugins/admin/systems/class_phoneGeneric.inc:425
+#: plugins/admin/systems/class_printGeneric.inc:858
+#: plugins/admin/systems/class_componentGeneric.inc:259
+#: plugins/admin/systems/class_phoneGeneric.inc:430
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
  #: plugins/admin/systems/servdnseditzone.tpl:1
  #: plugins/admin/systems/goMailServer.tpl:1
  #: plugins/admin/systems/goImapServer.tpl:1
  #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:709
+#: plugins/admin/ogroups/class_ogroup.inc:692
  #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
  #: plugins/admin/fai/faiPartitionTable.tpl:4
  #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
@@ -76,9 +91,9 @@ msgstr "Plugins"
  #: plugins/admin/fai/faiHookEntry.tpl:5
  #: plugins/admin/fai/faiTemplateEntry.tpl:3
  #: plugins/admin/mimetypes/generic.tpl:4
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:671
  #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_gofonMacro.inc:486
  #: plugins/generic/references/class_reference.inc:20
  msgid "Generic"
  msgstr "Algemeen"
@@ -90,30 +105,30 @@ msgstr "Unix"
  #: contrib/gosa.conf:82 contrib/gosa.conf:98
  #: plugins/personal/environment/class_environment.inc:12
  #: plugins/personal/environment/class_environment.inc:1269
-#: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/groups/class_divListGroup.inc:188
+#: plugins/admin/users/class_divListUsers.inc:177
  msgid "Environment"
  msgstr "Omgeving"
  
  #: contrib/gosa.conf:83 contrib/gosa.conf:100
  #: plugins/personal/mail/class_mailAccount.inc:22
  #: plugins/personal/mail/class_mailAccount.inc:1006
-#: plugins/admin/groups/class_groupMail.inc:1066
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:191
-#: plugins/admin/ogroups/tabs_ogroups.inc:76
+#: plugins/admin/groups/class_groupMail.inc:1073
+#: plugins/admin/groups/class_divListGroup.inc:180
+#: plugins/admin/users/class_divListUsers.inc:179
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
  #: plugins/admin/ogroups/tabs_ogroups.inc:184
  #: plugins/admin/ogroups/paste_mail.tpl:4
  #: plugins/admin/ogroups/class_mailogroup.inc:167
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/admin/ogroups/class_divListOGroup.inc:171
  #: plugins/generic/references/class_reference.inc:24
  msgid "Mail"
  msgstr "E-mail"
  
  #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
  #: plugins/personal/samba/class_sambaAccount.inc:1041
-#: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/groups/class_divListGroup.inc:182
+#: plugins/admin/users/class_divListUsers.inc:185
  #: plugins/generic/references/class_reference.inc:26
  #: plugins/generic/references/class_reference.inc:28
  msgid "Samba"
@@ -121,7 +136,7 @@ msgstr "Samba"
  
  #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
  #: plugins/personal/netatalk/class_netatalk.inc:355
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:187
  msgid "Netatalk"
  msgstr "Netatalk"
  
@@ -132,15 +147,14 @@ msgstr "Verbindingen"
  
  #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
  #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:581
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:586
  #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:807
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
  #: plugins/gofax/faxaccount/paste_generic.tpl:8
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:183
  #: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/class_departmentGeneric.inc:550
+#: plugins/admin/departments/class_departmentGeneric.inc:594
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Fax"
@@ -153,12 +167,12 @@ msgstr "Fax"
  #: plugins/addons/addressbook/address_edit.tpl:221
  #: plugins/addons/addressbook/address_info.tpl:67
  #: plugins/addons/addressbook/address_info.tpl:163
-#: plugins/admin/groups/class_divListGroup.inc:178
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/groups/class_divListGroup.inc:186
+#: plugins/admin/users/class_divListUsers.inc:181
  #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:818
+#: plugins/admin/systems/class_systemManagement.inc:1003
  #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/ogroups/class_ogroupManagement.inc:351
  #: plugins/admin/ogroups/class_phonequeue.inc:718
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1231
@@ -178,9 +192,9 @@ msgstr "Nagios"
  msgid "Applications"
  msgstr "Programma's"
  
-#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:92
  #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:240
+#: plugins/admin/systems/class_servRepository.inc:254
  #: plugins/admin/ogroups/phonequeue.tpl:43
  #: plugins/gofon/conference/generic.tpl:121
  msgid "Options"
@@ -194,21 +208,21 @@ msgstr "Parameters"
  
  #: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
  #: plugins/admin/systems/class_terminalStartup.inc:442
-#: plugins/admin/systems/class_workstationStartup.inc:1109
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: plugins/admin/systems/class_workstationStartup.inc:1154
+#: plugins/admin/ogroups/tabs_ogroups.inc:96
  msgid "Startup"
  msgstr "Opstarten"
  
  #: contrib/gosa.conf:120 contrib/gosa.conf:136
-#: plugins/admin/ogroups/tabs_ogroups.inc:103
+#: plugins/admin/ogroups/tabs_ogroups.inc:99
  msgid "Devices"
  msgstr "Apparaten"
  
  #: contrib/gosa.conf:121 contrib/gosa.conf:137
  #: plugins/personal/environment/environment.tpl:235
-#: plugins/admin/systems/class_systemManagement.inc:827
-#: plugins/admin/systems/class_printGeneric.inc:860
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/systems/class_systemManagement.inc:1012
+#: plugins/admin/systems/class_printGeneric.inc:864
+#: plugins/admin/ogroups/class_ogroupManagement.inc:354
  #: plugins/generic/references/class_reference.inc:52
  msgid "Printer"
  msgstr "Printer"
@@ -227,16 +241,16 @@ msgstr "Printer"
  #: plugins/admin/fai/faiPackageEntry.tpl:22
  #: plugins/gofon/macro/headpage.tpl:20
  #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:64
+#: ihtml/themes/default/MultiSelectWindow.tpl:27
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
  msgid "Information"
  msgstr "Informatie"
  
  #: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:385
  #: plugins/admin/systems/class_goFaxServer.inc:85
  #: plugins/admin/systems/class_servKolab.inc:375
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:366
  #: plugins/admin/systems/class_goGlpiServer.inc:84
  #: plugins/admin/systems/class_goCupsServer.inc:64
  #: plugins/admin/systems/class_goTerminalServer.inc:118
@@ -255,7 +269,6 @@ msgid "Services"
  msgstr "Services"
  
  #: contrib/gosa.conf:129 contrib/gosa.conf:139
-#: plugins/admin/fai/class_faiSummaryTab.inc:546
  msgid "FAI summary"
  msgstr "FAI samenvatting"
  
@@ -282,7 +295,7 @@ msgstr "Excel Export"
  #: plugins/addons/ldapmanager/contentcsv.tpl:112
  #: plugins/addons/ldapmanager/contentimport.tpl:50
  #: plugins/addons/notifications/contents.tpl:52
-#: plugins/admin/applications/generic.tpl:132
+#: plugins/admin/applications/generic.tpl:135
  msgid "Import"
  msgstr "Importeren"
  
@@ -295,33 +308,32 @@ msgid "Partitions"
  msgstr "Partities"
  
  #: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:518
+#: plugins/admin/applications/generic.tpl:130
+#: plugins/admin/fai/class_faiScript.inc:529
  #: plugins/admin/fai/faiScriptEntry.tpl:56
  #: plugins/admin/fai/faiHookEntry.tpl:56
  msgid "Script"
  msgstr "Script"
  
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:45
  msgid "Hooks"
  msgstr "Inhakers"
  
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:46
  msgid "Variables"
  msgstr "Variabelen"
  
-#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:47
  msgid "Templates"
  msgstr "Sjablonen"
  
  #: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
-#: plugins/admin/fai/class_faiSummaryTab.inc:47
+#: plugins/admin/fai/class_faiSummaryTab.inc:50
  msgid "Profiles"
  msgstr "Profielen"
  
-#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:103
  #: plugins/admin/acl/class_divListACL.inc:49
-#: plugins/admin/fai/class_faiSummaryTab.inc:545
  msgid "Summary"
  msgstr "Samenvatting"
  
@@ -376,7 +388,7 @@ msgstr "Selecteer de toe te voegen adressen"
  #: plugins/personal/environment/hotplugDialog.tpl:24
  #: plugins/personal/environment/selectPrinterDialog.tpl:24
  #: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:62
+#: plugins/addons/addressbook/contents.tpl:65
  #: plugins/addons/godfs/contents.tpl:31
  #: plugins/admin/groups/mail_locals.tpl:22
  #: plugins/admin/groups/group_objects.tpl:20
@@ -392,8 +404,8 @@ msgstr "Selecteer de toe te voegen adressen"
  #: plugins/admin/fai/faiPackageEntry.tpl:32
  #: plugins/gofon/macro/headpage.tpl:29
  #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:75
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:78
  msgid "Filters"
  msgstr "Filters"
  
@@ -408,7 +420,7 @@ msgstr "Selecteer om afdelingen te zien"
  #: plugins/personal/samba/samba3_workstations.tpl:27
  #: plugins/personal/environment/selectPrinterDialog.tpl:34
  #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:84
+#: plugins/addons/addressbook/contents.tpl:87
  #: plugins/admin/groups/mail_locals.tpl:33
  #: plugins/admin/groups/group_objects.tpl:40
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
@@ -459,22 +471,22 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
  #: plugins/admin/groups/mail.tpl:135 plugins/admin/groups/mail_locals.tpl:66
  #: plugins/admin/groups/generic.tpl:137
  #: plugins/admin/groups/application.tpl:39
-#: plugins/admin/groups/class_groupMail.inc:591
+#: plugins/admin/groups/class_groupMail.inc:598
  #: plugins/admin/groups/group_objects.tpl:55
  #: plugins/admin/groups/paste_mail.tpl:30
  #: plugins/admin/groups/paste_mail.tpl:41
  #: plugins/admin/systems/terminal.tpl:117
+#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/workstation.tpl:94
  #: plugins/admin/systems/glpiPrinter.tpl:115
  #: plugins/admin/systems/glpiPrinter.tpl:149
  #: plugins/admin/systems/servdns.tpl:6 plugins/admin/systems/glpi.tpl:125
-#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/phonesettings.tpl:207
  #: plugins/admin/systems/phonesettings.tpl:230
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:124
-#: plugins/admin/systems/workstationStartup.tpl:150
-#: plugins/admin/systems/workstationStartup.tpl:179
+#: plugins/admin/systems/workstationStartup.tpl:127
+#: plugins/admin/systems/workstationStartup.tpl:154
+#: plugins/admin/systems/workstationStartup.tpl:183
  #: plugins/admin/systems/terminalStartup.tpl:79
  #: plugins/admin/systems/terminalStartup.tpl:108
  #: plugins/admin/systems/servRepositorySetup.tpl:47
@@ -482,12 +494,12 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
  #: plugins/admin/systems/glpiManufacturer.tpl:6
  #: plugins/admin/systems/glpi_edit_os.tpl:8
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:472
-#: plugins/admin/systems/class_termDNS.inc:492
+#: plugins/admin/systems/class_termDNS.inc:477
+#: plugins/admin/systems/class_termDNS.inc:497
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
  #: plugins/admin/systems/servdnseditzone.tpl:106
  #: plugins/admin/systems/class_servDNSeditZone.inc:486
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:392
  #: plugins/admin/systems/goShareServer.tpl:14
  #: plugins/admin/systems/goMailServer.tpl:70
  #: plugins/admin/systems/goMailServer.tpl:101
@@ -500,7 +512,7 @@ msgstr "Gebruikersnaam van wie de adressen getoond worden"
  #: plugins/admin/ogroups/ogroup_objects.tpl:54
  #: plugins/admin/ogroups/phonequeue.tpl:33
  #: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
-#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPackage.tpl:78
  #: plugins/admin/fai/faiPartitionTable.tpl:48
  #: plugins/admin/fai/faiPartitionTable.tpl:50
  #: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
@@ -549,15 +561,17 @@ msgstr "Toevoegen"
  #: plugins/admin/applications/remove.tpl:15
  #: plugins/admin/applications/class_applicationManagement.inc:352
  #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:506
+#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/departments/dep_move_confirm.tpl:17
+#: plugins/admin/systems/goNtpServer.tpl:31
+#: plugins/admin/systems/class_systemManagement.inc:654
  #: plugins/admin/systems/servdns.tpl:23
-#: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/servkolab.tpl:247 plugins/admin/systems/gencd.tpl:11
  #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/goNtpServer.tpl:32
-#: plugins/admin/systems/goKrbServer.tpl:33
+#: plugins/admin/systems/goKrbServer.tpl:32
+#: plugins/admin/systems/goFonServer.tpl:41
  #: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:140
-#: plugins/admin/systems/goFonServer.tpl:42
+#: plugins/admin/systems/goFaxServer.tpl:25
  #: plugins/admin/systems/remove_glpi.tpl:16
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
  #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -565,7 +579,7 @@ msgstr "Toevoegen"
  #: plugins/admin/systems/servRepository.tpl:68
  #: plugins/admin/systems/glpi_edit_type.tpl:29
  #: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/goFaxServer.tpl:26
+#: plugins/admin/systems/remove_ppd.tpl:14
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
  #: plugins/admin/systems/glpiSelectUser.tpl:51
  #: plugins/admin/systems/glpi_devices.tpl:761
@@ -578,26 +592,27 @@ msgstr "Toevoegen"
  #: plugins/admin/systems/SelectDeviceType.tpl:45
  #: plugins/admin/systems/class_baseSelectDialog.inc:43
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/ServiceAddDialog.tpl:31
-#: plugins/admin/systems/goLdapServer.tpl:12
-#: plugins/admin/systems/goShareServer.tpl:32
-#: plugins/admin/systems/goMailServer.tpl:224
-#: plugins/admin/systems/goImapServer.tpl:119
-#: plugins/admin/systems/goSyslogServer.tpl:8
-#: plugins/admin/systems/goGlpiServer.tpl:35
-#: plugins/admin/systems/goCupsServer.tpl:8
-#: plugins/admin/systems/goTerminalServer.tpl:26
-#: plugins/admin/systems/goLogDBServer.tpl:26
-#: plugins/admin/systems/goSpamServer.tpl:128
-#: plugins/admin/systems/goSpamServerRule.tpl:24
-#: plugins/admin/systems/goVirusServer.tpl:171
+#: plugins/admin/systems/ServiceAddDialog.tpl:30
+#: plugins/admin/systems/goLdapServer.tpl:11
+#: plugins/admin/systems/goShareServer.tpl:31
+#: plugins/admin/systems/goMailServer.tpl:223
+#: plugins/admin/systems/goImapServer.tpl:118
+#: plugins/admin/systems/goSyslogServer.tpl:7
+#: plugins/admin/systems/goGlpiServer.tpl:34
+#: plugins/admin/systems/goCupsServer.tpl:7
+#: plugins/admin/systems/goTerminalServer.tpl:25
+#: plugins/admin/systems/goLogDBServer.tpl:25
+#: plugins/admin/systems/goSpamServer.tpl:127
+#: plugins/admin/systems/goSpamServerRule.tpl:23
+#: plugins/admin/systems/goVirusServer.tpl:170
  #: plugins/admin/systems/class_goService.inc:34
  #: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:307
+#: plugins/admin/ogroups/class_ogroupManagement.inc:302
  #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:619
-#: plugins/admin/fai/class_faiManagement.inc:624
-#: plugins/admin/fai/class_faiManagement.inc:630
+#: plugins/admin/acl/class_aclManagement.inc:289
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/fai/class_faiManagement.inc:634
+#: plugins/admin/fai/class_faiManagement.inc:640
  #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
  #: plugins/admin/fai/faiScriptEntry.tpl:83
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:40
@@ -609,17 +624,17 @@ msgstr "Toevoegen"
  #: plugins/admin/fai/faiPackageNew.tpl:51
  #: plugins/admin/fai/faiNewBranch.tpl:20
  #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
  #: plugins/admin/mimetypes/remove.tpl:15
  #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
  #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:256
  #: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
  #: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
-#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:38
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:89
  msgid "Cancel"
  msgstr "Annuleren"
  
@@ -631,11 +646,11 @@ msgstr "Primair adres"
  
  #: plugins/personal/mail/generic.tpl:15
  #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:18
-#: plugins/admin/systems/class_servGeneric.inc:340
-#: plugins/admin/systems/class_systemManagement.inc:819
+#: plugins/admin/systems/class_servGeneric.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:1004
  #: plugins/admin/systems/servnfs.tpl:39
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:355
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
  #: plugins/generic/references/class_reference.inc:44
  msgid "Server"
  msgstr "Server"
@@ -650,14 +665,14 @@ msgstr "Quota gebruik"
  
  #: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:38
  #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:515
+#: plugins/admin/systems/class_printGeneric.inc:516
  msgid "not defined"
  msgstr "niet gedefiniëerd"
  
  #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/personal/mail/class_mailAccount.inc:1019
  #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1077
+#: plugins/admin/groups/class_groupMail.inc:1084
  msgid "Quota size"
  msgstr "Quota grootte"
  
@@ -696,22 +711,23 @@ msgstr "Lijst met alternatieve E-mail adressen"
  #: plugins/admin/applications/remove.tpl:13
  #: plugins/admin/departments/remove.tpl:14
  #: plugins/admin/systems/terminal.tpl:121
+#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/printer.tpl:102 plugins/admin/systems/printer.tpl:126
  #: plugins/admin/systems/workstation.tpl:98
  #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/remove_glpi.tpl:14
  #: plugins/admin/systems/phonesettings.tpl:210
  #: plugins/admin/systems/phonesettings.tpl:233
-#: plugins/admin/systems/workstationStartup.tpl:125
-#: plugins/admin/systems/workstationStartup.tpl:153
+#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:157
  #: plugins/admin/systems/terminalStartup.tpl:82
  #: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/remove_ppd.tpl:12
  #: plugins/admin/systems/glpi_edit_os.tpl:10
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
  #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:486
+#: plugins/admin/systems/class_termDNS.inc:491
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
  #: plugins/admin/systems/class_servDNSeditZone.inc:292
  #: plugins/admin/systems/class_servDNSeditZone.inc:480
@@ -783,7 +799,7 @@ msgid "MB"
  msgstr "MB"
  
  #: plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1022
  msgid "Vacation message"
  msgstr "Afwezigheidsbericht"
  
@@ -814,7 +830,7 @@ msgid "User is only allowed to send and receive local mails"
  msgstr "De gebruiker mag alleen lokale E-mails versturen en ontvangen"
  
  #: plugins/personal/mail/generic.tpl:190
-#: plugins/personal/mail/class_mailAccount.inc:1036
+#: plugins/personal/mail/class_mailAccount.inc:1037
  msgid "Use custom sieve script"
  msgstr "Gebruik een eigen sieve script"
  
@@ -832,13 +848,14 @@ msgstr "schakelt alle E-mail opties uit!"
  #: plugins/admin/groups/class_groupManagement.inc:329
  #: plugins/admin/users/class_userManagement.inc:651
  #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:500
-#: plugins/admin/ogroups/class_ogroupManagement.inc:301
-#: plugins/admin/fai/class_faiManagement.inc:613
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
+#: plugins/admin/systems/class_systemManagement.inc:648
+#: plugins/admin/ogroups/class_ogroupManagement.inc:296
+#: plugins/admin/acl/class_aclManagement.inc:280
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:339
  #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:250
  msgid "Ok"
  msgstr ""
  
@@ -1031,35 +1048,35 @@ msgstr ""
  "systeem instellingen."
  
  #: plugins/personal/mail/class_mailAccount.inc:781
-#: plugins/admin/groups/class_groupMail.inc:880
+#: plugins/admin/groups/class_groupMail.inc:887
  msgid "The required field 'Primary address' is not set."
  msgstr "Het vereiste veld 'Primair adres' is leeg."
  
  #: plugins/personal/mail/class_mailAccount.inc:785
  #: plugins/personal/mail/class_mailAccount.inc:789
-#: plugins/addons/addressbook/class_addressbook.inc:694
+#: plugins/addons/addressbook/class_addressbook.inc:696
  #: plugins/admin/ogroups/class_mailogroup.inc:79
  msgid "Please enter a valid email address in 'Primary address' field."
  msgstr "Geef a.u.b. een geldig E-mail adres voor het 'Primair adres' op."
  
  #: plugins/personal/mail/class_mailAccount.inc:795
-#: plugins/admin/groups/class_groupMail.inc:889
+#: plugins/admin/groups/class_groupMail.inc:896
  #: plugins/admin/ogroups/class_mailogroup.inc:86
  msgid "The primary address you've entered is already in use."
  msgstr "Het primaire adres dat u opgegeven heeft wordt al gebruikt."
  
  #: plugins/personal/mail/class_mailAccount.inc:801
-#: plugins/admin/groups/class_groupMail.inc:895
+#: plugins/admin/groups/class_groupMail.inc:902
  msgid "Value in 'Quota size' is not valid."
  msgstr "De waarde opgegeven bij 'Quota grootte' is niet geldig."
  
  #: plugins/personal/mail/class_mailAccount.inc:810
-#: plugins/admin/groups/class_groupMail.inc:904
+#: plugins/admin/groups/class_groupMail.inc:911
  msgid "Please specify a vaild mail size for mails to be rejected."
  msgstr "Geef a.u.b. een geldige E-mail grootte op voor af te wijzen E-mails."
  
  #: plugins/personal/mail/class_mailAccount.inc:820
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
  msgid "You need to set the maximum mail size in order to reject anything."
  msgstr ""
  "U moet de maximale E-mail grootte instellen om uberhaupt iets af te kunnen "
@@ -1094,68 +1111,73 @@ msgstr ""
  "Verwijder a.u.b. eerst het mail account, zodat kolab haar verwijder "
  "procedure kan starten."
  
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1012
+#, fuzzy
+msgid "Mail account"
+msgstr "Mijn account"
+
+#: plugins/personal/mail/class_mailAccount.inc:1017
  #: plugins/personal/nagios/nagios.tpl:17
-#: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/addons/addressbook/class_addressbook.inc:797
-#: plugins/admin/groups/class_groupMail.inc:1074
-#: plugins/admin/systems/class_servDNS.inc:394
+#: plugins/personal/nagios/class_nagiosAccount.inc:273
+#: plugins/addons/addressbook/class_addressbook.inc:799
+#: plugins/admin/groups/class_groupMail.inc:1081
+#: plugins/admin/systems/class_servDNS.inc:396
  #: plugins/admin/systems/servdnseditzone.tpl:51
  #: plugins/admin/ogroups/class_mailogroup.inc:175 html/getxls.php:225
  msgid "Mail address"
  msgstr "E-mail adres"
  
-#: plugins/personal/mail/class_mailAccount.inc:1017
-#: plugins/admin/groups/class_groupMail.inc:1078
+#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/admin/groups/class_groupMail.inc:1085
  msgid "Mail server"
  msgstr "Mail server"
  
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1021
  #, fuzzy
  msgid "Add vacation information"
  msgstr "Organisatie informatie"
  
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1024
  msgid "Use spam filter"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1025
  #, fuzzy
  msgid "Spam level"
  msgstr "Log prioriteit"
  
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1026
  #, fuzzy
  msgid "Spam mail box"
  msgstr "E-mail grootte"
  
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1028
  #, fuzzy
  msgid "Reject due to mailsize"
  msgstr "Wijs E-mail af indien groter dan"
  
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:1029
  #, fuzzy
  msgid "Mail max size"
  msgstr "E-mail grootte"
  
-#: plugins/personal/mail/class_mailAccount.inc:1030
-#: plugins/personal/mail/class_mailAccount.inc:1035
+#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1036
  #, fuzzy
  msgid "Forwarding address"
  msgstr "Primair adres"
  
-#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1032
  #, fuzzy
  msgid "Local delivery"
  msgstr "Laatste levering"
  
-#: plugins/personal/mail/class_mailAccount.inc:1032
+#: plugins/personal/mail/class_mailAccount.inc:1033
  #, fuzzy
  msgid "No delivery to own mailbox "
  msgstr "Geen aflevering in eigen mailbox"
  
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1034
  #, fuzzy
  msgid "Mail alternative addresses"
  msgstr "Alternatieve adressen"
@@ -1226,8 +1248,9 @@ msgstr ""
  #: plugins/addons/ldapmanager/contentexport.tpl:66
  #: plugins/addons/ldapmanager/contentexportxls.tpl:69
  #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1452
+#: plugins/admin/departments/dep_iframe.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:145
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1421
  #: ihtml/themes/default/setup_useradmin.tpl:40
  #: ihtml/themes/default/setup_step4.tpl:114
  #: ihtml/themes/default/setup_step2.tpl:12
@@ -1237,13 +1260,14 @@ msgid "Back"
  msgstr "Terug"
  
  #: plugins/personal/password/class_password.inc:5
+#: plugins/personal/password/class_password.inc:17
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/admin/systems/class_goFaxServer.inc:94
  #: plugins/admin/systems/goKrbServer.tpl:20
  #: plugins/admin/systems/goFonServer.tpl:12
-#: plugins/admin/systems/class_goGlpiServer.inc:98
  #: plugins/admin/systems/goFaxServer.tpl:12
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_goGlpiServer.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:308
  #: plugins/admin/systems/goImapServer.tpl:34
  #: plugins/admin/systems/class_goFonServer.inc:107
  #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1256,7 +1280,7 @@ msgid "Password"
  msgstr "Wachtwoord"
  
  #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/generic/class_user.inc:1378
  #, fuzzy
  msgid "User password"
  msgstr "Wachtwoord wissen"
@@ -1309,12 +1333,12 @@ msgid "External password changer reported a problem: "
  msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
  
  #: plugins/personal/password/main.inc:123
-#: plugins/admin/users/class_divListUsers.inc:261
+#: plugins/admin/users/class_divListUsers.inc:249
  msgid "Change password"
  msgstr "Verander wachtwoord"
  
  #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1327
+#: plugins/personal/posix/class_posixAccount.inc:1320
  #: plugins/personal/posix/paste_generic.tpl:8
  #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
  #: plugins/personal/samba/class_sambaAccount.inc:645
@@ -1322,7 +1346,7 @@ msgid "Home directory"
  msgstr "Persoonlijke map"
  
  #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1328
+#: plugins/personal/posix/class_posixAccount.inc:1321
  msgid "Shell"
  msgstr "Shell"
  
@@ -1331,10 +1355,10 @@ msgid "Primary group"
  msgstr "Primaire groep"
  
  #: plugins/personal/posix/generic.tpl:35
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:235
  #: plugins/gofax/faxreports/contents.tpl:32
  #: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/class_faxreport.inc:482
+#: plugins/gofax/faxreports/class_faxreport.inc:487
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
  #: plugins/gofon/fonreports/contents.tpl:35
  msgid "Status"
@@ -1352,7 +1376,7 @@ msgstr "UID"
  
  #: plugins/personal/posix/generic.tpl:62
  #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:894
  msgid "GID"
  msgstr "GID"
  
@@ -1395,7 +1419,7 @@ msgstr "Toon groepen van afdeling"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -1452,53 +1476,53 @@ msgstr "Unix instellingen"
  msgid "UNIX"
  msgstr "Unix"
  
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:135
  msgid "expired"
  msgstr "verlopen"
  
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:137
  msgid "grace time active"
  msgstr "gratie tijd actief"
  
-#: plugins/personal/posix/class_posixAccount.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:140
  msgid "active, password not changable"
  msgstr "actief, wachtwoord onveranderbaar"
  
-#: plugins/personal/posix/class_posixAccount.inc:143
+#: plugins/personal/posix/class_posixAccount.inc:142
  msgid "active, password expired"
  msgstr "actief, wachtwoord verlopen"
  
-#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:144
  msgid "active"
  msgstr "actief"
  
-#: plugins/personal/posix/class_posixAccount.inc:156
-#: plugins/personal/posix/class_posixAccount.inc:1010
+#: plugins/personal/posix/class_posixAccount.inc:155
+#: plugins/personal/posix/class_posixAccount.inc:1002
  msgid "Group of user"
  msgstr "Gebruikersgroep"
  
-#: plugins/personal/posix/class_posixAccount.inc:191
+#: plugins/personal/posix/class_posixAccount.inc:190
  msgid "unconfigured"
  msgstr "niet geconfigureerd"
  
-#: plugins/personal/posix/class_posixAccount.inc:208
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:791
+#: plugins/personal/posix/class_posixAccount.inc:201
+#: plugins/admin/systems/class_workstationStartup.inc:825
  #: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:196
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
  msgid "automatic"
  msgstr "automatisch"
  
-#: plugins/personal/posix/class_posixAccount.inc:254
+#: plugins/personal/posix/class_posixAccount.inc:247
  msgid "This account has no unix extensions."
  msgstr "Dit account heeft geen Unix mogelijkheden."
  
-#: plugins/personal/posix/class_posixAccount.inc:274
-#: plugins/personal/posix/class_posixAccount.inc:277
+#: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
  msgid "Remove posix account"
  msgstr "Verwijder POSIX account"
  
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:268
  msgid ""
  "This account has unix features enabled. To disable them, you'll need to "
  "remove the samba / environment account first."
@@ -1506,7 +1530,7 @@ msgstr ""
  "Dit account heeft Unix mogelijkheden ingeschakeld. Om deze te verwijderen "
  "moet u eerst het samba / omgevings account verwijderen."
  
-#: plugins/personal/posix/class_posixAccount.inc:278
+#: plugins/personal/posix/class_posixAccount.inc:271
  msgid ""
  "This account has posix features enabled. You can disable them by clicking "
  "below."
@@ -1514,11 +1538,11 @@ msgstr ""
  "Dit account heeft POSIX mogelijkheden ingeschakeld. U kunt deze uitschakelen "
  "door de knop hieronder te gebruiken."
  
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:274
  msgid "Create posix account"
  msgstr "POSIX account aanmaken"
  
-#: plugins/personal/posix/class_posixAccount.inc:282
+#: plugins/personal/posix/class_posixAccount.inc:275
  msgid ""
  "This account has posix features disabled. You can enable them by clicking "
  "below."
@@ -1526,30 +1550,30 @@ msgstr ""
  "Dit account heeft POSIX mogelijkheden uitgeschakeld. U kunt deze inschakelen "
  "door de knop hieronder te gebruiken."
  
-#: plugins/personal/posix/class_posixAccount.inc:442
+#: plugins/personal/posix/class_posixAccount.inc:435
  #, php-format
  msgid "Password can't be changed up to %s days after last change"
  msgstr ""
  "Het wachtwoord kan pas %s dag(en) na de laatste wijziging gewijzigd worden"
  
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:439
  #, php-format
  msgid "Password must be changed after %s days"
  msgstr "Het wachtwoord moet na %s dag(en) gewijzigd worden"
  
-#: plugins/personal/posix/class_posixAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:443
  #, php-format
  msgid "Disable account after %s days of inactivity after password expiery"
  msgstr ""
  "Blokkeer het account na %s dag(en) inactiviteit nadat het wachtwoord "
  "verlopen is"
  
-#: plugins/personal/posix/class_posixAccount.inc:454
+#: plugins/personal/posix/class_posixAccount.inc:447
  #, php-format
  msgid "Warn user %s days before password expiery"
  msgstr "Waarschuw de gebruiker %s dagen voordat het wachtwoord verloopt"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1558,7 +1582,7 @@ msgstr "Waarschuw de gebruiker %s dagen voordat het wachtwoord verloopt"
  msgid "January"
  msgstr "Januari"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1567,7 +1591,7 @@ msgstr "Januari"
  msgid "February"
  msgstr "Februari"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1576,7 +1600,7 @@ msgstr "Februari"
  msgid "March"
  msgstr "Maart"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1585,7 +1609,7 @@ msgstr "Maart"
  msgid "April"
  msgstr "April"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1594,7 +1618,7 @@ msgstr "April"
  msgid "May"
  msgstr "Mei"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1603,7 +1627,7 @@ msgstr "Mei"
  msgid "June"
  msgstr "Juni"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1612,7 +1636,7 @@ msgstr "Juni"
  msgid "July"
  msgstr "Juli"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1621,7 +1645,7 @@ msgstr "Juli"
  msgid "August"
  msgstr "Augustus"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1630,7 +1654,7 @@ msgstr "Augustus"
  msgid "September"
  msgstr "September"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1639,7 +1663,7 @@ msgstr "September"
  msgid "October"
  msgstr "Oktober"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1648,7 +1672,7 @@ msgstr "Oktober"
  msgid "November"
  msgstr "November"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1657,154 +1681,159 @@ msgstr "November"
  msgid "December"
  msgstr "December"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  #: plugins/personal/samba/class_sambaAccount.inc:468
-#: plugins/admin/systems/class_terminalGeneric.inc:97
+#: plugins/admin/systems/class_terminalGeneric.inc:104
  #: ihtml/themes/default/setup_step4.tpl:91
  msgid "disabled"
  msgstr "gedeactiveerd"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  msgid "full access"
  msgstr "volledige toegang"
  
-#: plugins/personal/posix/class_posixAccount.inc:576
+#: plugins/personal/posix/class_posixAccount.inc:568
  msgid "allow access to these hosts"
  msgstr "sta toegang op deze computers toe"
  
-#: plugins/personal/posix/class_posixAccount.inc:622
+#: plugins/personal/posix/class_posixAccount.inc:614
  #, fuzzy, php-format
  msgid "Removing of user/posix account with dn '%s' failed."
  msgstr "Het verwijderen van het proxy account is mislukt"
  
-#: plugins/personal/posix/class_posixAccount.inc:770
+#: plugins/personal/posix/class_posixAccount.inc:762
  msgid "Failed: overriding lock"
  msgstr "Mislukt: Blokkering wordt overschreven"
  
-#: plugins/personal/posix/class_posixAccount.inc:859
+#: plugins/personal/posix/class_posixAccount.inc:851
  #, fuzzy, php-format
  msgid "Saving of user/posix account with dn '%s' failed."
  msgstr "Het opslaan van het Open-Xchange account is mislukt"
  
-#: plugins/personal/posix/class_posixAccount.inc:924
+#: plugins/personal/posix/class_posixAccount.inc:916
  msgid "The required field 'Home directory' is not set."
  msgstr "Het vereiste veld 'Persoonlijke map' is leeg."
  
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:919
  msgid "Please enter a valid path in 'Home directory' field."
  msgstr "Geef a.u.b. een geldige map op in het 'Persoonlijke map' veld."
  
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:927
  msgid "Value specified as 'UID' is not valid."
  msgstr "De opgegeven 'UID' waarde is niet correct."
  
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:930
  msgid "Value specified as 'UID' is too small."
  msgstr "De opgegeven 'UID' waarde is te klein."
  
-#: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/admin/groups/class_groupGeneric.inc:797
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:791
  msgid "Value specified as 'GID' is not valid."
  msgstr "De opgegeven 'GID' waarde is niet geldig."
  
-#: plugins/personal/posix/class_posixAccount.inc:945
-#: plugins/admin/groups/class_groupGeneric.inc:800
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:794
  msgid "Value specified as 'GID' is too small."
  msgstr "De opgegeven 'GID' waarde is te klein."
  
-#: plugins/personal/posix/class_posixAccount.inc:953
+#: plugins/personal/posix/class_posixAccount.inc:945
  msgid "Value specified as 'shadowMin' is not valid."
  msgstr "De opgegeven 'shadowMin' waarde is niet geldig."
  
-#: plugins/personal/posix/class_posixAccount.inc:958
+#: plugins/personal/posix/class_posixAccount.inc:950
  msgid "Value specified as 'shadowMax' is not valid."
  msgstr "De opgegeven 'shadowMax' waarde is niet geldig."
  
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:955
  msgid "Value specified as 'shadowWarning' is not valid."
  msgstr "De opgegeven 'shadowWarning' waarde is niet geldig."
  
-#: plugins/personal/posix/class_posixAccount.inc:966
+#: plugins/personal/posix/class_posixAccount.inc:958
  msgid "'shadowWarning' without 'shadowMax' makes no sense."
  msgstr "'shadowWarning' zonder 'shadowMax' is niet logisch."
  
-#: plugins/personal/posix/class_posixAccount.inc:969
+#: plugins/personal/posix/class_posixAccount.inc:961
  msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
  msgstr ""
  "De waarde opgegeven voor 'shadowWarning' moet kleiner zijn dan 'shadowMax'."
  
-#: plugins/personal/posix/class_posixAccount.inc:972
+#: plugins/personal/posix/class_posixAccount.inc:964
  msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
  msgstr ""
  "De waarde opgegeven voor 'shadowWarning' moet groter dan 'shadowMin' zijn."
  
-#: plugins/personal/posix/class_posixAccount.inc:977
+#: plugins/personal/posix/class_posixAccount.inc:969
  msgid "Value specified as 'shadowInactive' is not valid."
  msgstr "De waarde opgegeven voor 'shadowInactive' is niet geldig."
  
-#: plugins/personal/posix/class_posixAccount.inc:980
+#: plugins/personal/posix/class_posixAccount.inc:972
  msgid "'shadowInactive' without 'shadowMax' makes no sense."
  msgstr "'shadowInactive' zonder 'shadowMax' is niet logisch."
  
-#: plugins/personal/posix/class_posixAccount.inc:985
+#: plugins/personal/posix/class_posixAccount.inc:977
  msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
  msgstr ""
  "De waarde opgegeven voor 'shadowMin' moet kleiner zijn dan 'shadowMax'."
  
-#: plugins/personal/posix/class_posixAccount.inc:1148
-#: plugins/admin/groups/class_groupGeneric.inc:836
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:830
  msgid "Too many users, can't allocate a free ID!"
  msgstr ""
  "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
  
-#: plugins/personal/posix/class_posixAccount.inc:1317
+#: plugins/personal/posix/class_posixAccount.inc:1309
  #, fuzzy
  msgid "POSIX account"
  msgstr "GLPI account"
  
-#: plugins/personal/posix/class_posixAccount.inc:1329
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:100
+#: plugins/personal/posix/class_posixAccount.inc:1314
+#, fuzzy
+msgid "Posix Account"
+msgstr "Proxy account"
+
+#: plugins/personal/posix/class_posixAccount.inc:1322
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:100
  #: html/getxls.php:135 html/getxls.php:158 html/getxls.php:347
  #: html/getxls.php:364
  msgid "User ID"
  msgstr "Gebruikers ID"
  
-#: plugins/personal/posix/class_posixAccount.inc:1330
+#: plugins/personal/posix/class_posixAccount.inc:1323
  #, fuzzy
  msgid "Group ID"
  msgstr "Groep"
  
-#: plugins/personal/posix/class_posixAccount.inc:1332
+#: plugins/personal/posix/class_posixAccount.inc:1325
  #, fuzzy
  msgid "Force password change on login"
  msgstr "Het veranderen van het wachtwoord is niet toegestaan"
  
-#: plugins/personal/posix/class_posixAccount.inc:1333
+#: plugins/personal/posix/class_posixAccount.inc:1326
  #, fuzzy
  msgid "Shadow min"
  msgstr "Schaduwen van andere sessie"
  
-#: plugins/personal/posix/class_posixAccount.inc:1334
+#: plugins/personal/posix/class_posixAccount.inc:1327
  #, fuzzy
  msgid "Shadow max"
  msgstr "Schaduwen van andere sessie"
  
-#: plugins/personal/posix/class_posixAccount.inc:1335
+#: plugins/personal/posix/class_posixAccount.inc:1328
  #, fuzzy
  msgid "Shadow warning"
  msgstr "Schaduwen van andere sessie"
  
-#: plugins/personal/posix/class_posixAccount.inc:1336
+#: plugins/personal/posix/class_posixAccount.inc:1329
  #, fuzzy
  msgid "Shadow inactive"
  msgstr "Schaduwen van andere sessie"
  
-#: plugins/personal/posix/class_posixAccount.inc:1337
+#: plugins/personal/posix/class_posixAccount.inc:1330
  #, fuzzy
  msgid "Shadow expire"
  msgstr "Toon personen"
  
-#: plugins/personal/posix/class_posixAccount.inc:1338
+#: plugins/personal/posix/class_posixAccount.inc:1331
  #, fuzzy
  msgid "System trust model"
  msgstr "Systeem vertrouwen"
@@ -1836,7 +1865,7 @@ msgid "Allow user to change password from client"
  msgstr "Gebruiker mag zijn wachtwoord vanaf een werkstation wijzigen"
  
  #: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1056
  msgid "Login from windows client requires no password"
  msgstr "Inloggen op Windows werkstation zonder wachtwoord toestaan"
  
@@ -1845,7 +1874,7 @@ msgid "Temporary disable samba account"
  msgstr "Schakel het Samba/Windows account tijdelijk uit"
  
  #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1069
+#: plugins/personal/samba/class_sambaAccount.inc:1070
  msgid "Domain"
  msgstr "Domein"
  
@@ -1854,12 +1883,12 @@ msgid "Terminal Server"
  msgstr "Terminal Server"
  
  #: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1052
  msgid "Allow login on terminal server"
  msgstr "Sta inloggen op de Terminal Server toe"
  
  #: plugins/personal/samba/samba3.tpl:131
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1053
  msgid "Inherit client config"
  msgstr "Client configuratie voor initieel programma overnemen"
  
@@ -1924,17 +1953,17 @@ msgid "Reconnect if disconnected"
  msgstr "Herstel sessie indien verbroken"
  
  #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1057
  msgid "Lock samba account"
  msgstr "Blokkeer het Samba/Windows account"
  
  #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1062
+#: plugins/personal/samba/class_sambaAccount.inc:1063
  msgid "Limit Logon Time"
  msgstr "Stel laatste inlogtijd in op"
  
  #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1063
+#: plugins/personal/samba/class_sambaAccount.inc:1064
  msgid "Limit Logoff Time"
  msgstr "Stel laatste uitlogtijd in op"
  
@@ -2074,41 +2103,46 @@ msgstr ""
  msgid "Saving of user/samba account with dn '%s' failed."
  msgstr "Het opslaan van het Samba account is mislukt"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1047
+#, fuzzy
+msgid "Samba account"
+msgstr "Blokkeer het Samba/Windows account"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1055
  #, fuzzy
  msgid "Allow user to change password"
  msgstr "Gebruiker mag zijn wachtwoord vanaf een werkstation wijzigen"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1059
+#: plugins/personal/samba/class_sambaAccount.inc:1060
  #, fuzzy
  msgid "Account expires"
  msgstr "Het account verloopt op"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1060
+#: plugins/personal/samba/class_sambaAccount.inc:1061
  #, fuzzy
  msgid "Password expires"
  msgstr "Wachtwoord verloopt op"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1065
+#: plugins/personal/samba/class_sambaAccount.inc:1066
  #, fuzzy
  msgid "Generic home directory"
  msgstr "Persoonlijke map"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1066
+#: plugins/personal/samba/class_sambaAccount.inc:1067
  msgid "Generic samba home drive"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1067
+#: plugins/personal/samba/class_sambaAccount.inc:1068
  #, fuzzy
  msgid "Generic script path"
  msgstr "Inlogscript"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1068
+#: plugins/personal/samba/class_sambaAccount.inc:1069
  #, fuzzy
  msgid "Generic profile path"
  msgstr "Profielpad"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1070
+#: plugins/personal/samba/class_sambaAccount.inc:1071
  #, fuzzy
  msgid "Allow connection from"
  msgstr "Sta alleen verbindingen vanaf deze werkstations toe"
@@ -2125,103 +2159,90 @@ msgstr "man"
  msgid "This account has no valid GOsa extensions."
  msgstr "Dit account heeft geen geldige GOsa extensies."
  
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:335
  msgid "The specified file has not been uploaded via HTTP POST! Aborted."
  msgstr ""
  "Het opgegeven bestand is niet opgestuurd via HTTP POST! Aktie afgebroken."
  
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:432
  msgid "Please enter a valid serial number"
  msgstr "Geef a.u.b. een geldig serienummer op"
  
-#: plugins/personal/generic/class_user.inc:471
+#: plugins/personal/generic/class_user.inc:476
  msgid ""
  "(Some types of certificates are currently not supported and may be displayed "
  "as 'invalid'.)"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:481
+#: plugins/personal/generic/class_user.inc:486
  #, php-format
  msgid "Certificate is valid from %s to %s and is currently %s."
  msgstr "Certificaat is geldig van '%s' tot '%s' en de huidige status is '%s'."
  
-#: plugins/personal/generic/class_user.inc:484
+#: plugins/personal/generic/class_user.inc:489
  msgid "valid"
  msgstr "geldig"
  
-#: plugins/personal/generic/class_user.inc:485
+#: plugins/personal/generic/class_user.inc:490
  msgid "invalid"
  msgstr "ongeldig"
  
-#: plugins/personal/generic/class_user.inc:490
+#: plugins/personal/generic/class_user.inc:495
  msgid "No certificate installed"
  msgstr "Geen certificaat geinstalleerd"
  
-#: plugins/personal/generic/class_user.inc:579
+#: plugins/personal/generic/class_user.inc:582
  #, fuzzy, php-format
  msgid "Removing of user/generic account with dn '%s' failed."
  msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
  
-#: plugins/personal/generic/class_user.inc:611
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:982
  msgid "Kerberos database communication failed"
  msgstr "Kerberos database communicatie is mislukt"
  
-#: plugins/personal/generic/class_user.inc:625
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:628
+#: plugins/personal/generic/class_user.inc:999
  msgid "Can't remove user from kerberos database."
  msgstr "Kan de gebruiker niet verwijderen uit de kerberos database."
  
-#: plugins/personal/generic/class_user.inc:682
-#: plugins/admin/systems/class_printGeneric.inc:625
+#: plugins/personal/generic/class_user.inc:684
  #, fuzzy, php-format
  msgid "You are not allowed to move this object to '%s'."
  msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
  
-#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:935
  #, fuzzy, php-format
  msgid "Saving of user/generic account with dn '%s' failed."
  msgstr "Het opslaan van het algemene gerbuikers account is mislukt"
  
-#: plugins/personal/generic/class_user.inc:1008
+#: plugins/personal/generic/class_user.inc:1010
  msgid "Can't add user to kerberos database."
  msgstr "Kan de gebruiker niet toevoegen aan de kerberos database."
  
-#: plugins/personal/generic/class_user.inc:1049
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een gebruiker aan te maken onder deze 'Basis'."
-
-#: plugins/personal/generic/class_user.inc:1052
-#, fuzzy
-msgid "You have no permissions to move this user to the specified 'Base'."
-msgstr ""
-"U heeft geen toestemming om een gebruiker te verplaatsen vanuit de originale "
-"'Basis'."
-
-#: plugins/personal/generic/class_user.inc:1058
-#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/personal/generic/class_user.inc:1057
+#: plugins/addons/addressbook/class_addressbook.inc:653
  #: plugins/admin/users/class_userManagement.inc:471
  #: plugins/admin/users/class_userManagement.inc:549
  msgid "The required field 'Name' is not set."
  msgstr "Het vereiste veld '(Achter)naam' is leeg."
  
-#: plugins/personal/generic/class_user.inc:1067
+#: plugins/personal/generic/class_user.inc:1066
  msgid "There's already a person with this 'Login' in the database."
  msgstr "Er bestaat al een account met deze 'Inlog naam' in de database."
  
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/personal/generic/class_user.inc:1072
+#: plugins/addons/addressbook/class_addressbook.inc:657
  #: plugins/admin/users/class_userManagement.inc:474
  #: plugins/admin/users/class_userManagement.inc:552
  msgid "The required field 'Given name' is not set."
  msgstr "Het vereiste veld 'Voornaam' is leeg."
  
-#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1075
  msgid "The required field 'Login' is not set."
  msgstr "Het vereiste veld 'Inlog naam' is leeg."
  
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1082
  msgid ""
  "There's already a person with this 'Name'/'Given name' combination in the "
  "database."
@@ -2229,7 +2250,7 @@ msgstr ""
  "Er bestaat al een persoon met deze '(Achter)naam'/'Voornaam' combinatie in "
  "de database."
  
-#: plugins/personal/generic/class_user.inc:1090
+#: plugins/personal/generic/class_user.inc:1089
  msgid ""
  "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
@@ -2237,120 +2258,120 @@ msgstr ""
  "Het veld 'Inlog naam' bevat ongeldige karakters. Kleine letters, nummers en "
  "liggende streepjes zijn toegestaan."
  
-#: plugins/personal/generic/class_user.inc:1093
+#: plugins/personal/generic/class_user.inc:1092
  msgid "The field 'Homepage' contains an invalid URL definition."
  msgstr "Het veld 'Website' bevat een ongeldige URL."
  
-#: plugins/personal/generic/class_user.inc:1096
-#: plugins/personal/generic/class_user.inc:1121
-#: plugins/addons/addressbook/class_addressbook.inc:661
-#: plugins/addons/addressbook/class_addressbook.inc:689
-#: plugins/admin/departments/class_departmentGeneric.inc:249
+#: plugins/personal/generic/class_user.inc:1095
+#: plugins/personal/generic/class_user.inc:1120
+#: plugins/addons/addressbook/class_addressbook.inc:663
+#: plugins/addons/addressbook/class_addressbook.inc:691
+#: plugins/admin/departments/class_departmentGeneric.inc:269
  msgid "The field 'Name' contains invalid characters."
  msgstr "Het veld 'Naam' bevat ongeldige karakters."
  
-#: plugins/personal/generic/class_user.inc:1099
-#: plugins/personal/generic/class_user.inc:1118
-#: plugins/addons/addressbook/class_addressbook.inc:664
-#: plugins/addons/addressbook/class_addressbook.inc:686
+#: plugins/personal/generic/class_user.inc:1098
+#: plugins/personal/generic/class_user.inc:1117
+#: plugins/addons/addressbook/class_addressbook.inc:666
+#: plugins/addons/addressbook/class_addressbook.inc:688
  msgid "The field 'Given name' contains invalid characters."
  msgstr "Het veld 'Voornaam' bevat ongeldige karakters."
  
-#: plugins/personal/generic/class_user.inc:1104
-#: plugins/addons/addressbook/class_addressbook.inc:669
-#: plugins/addons/addressbook/class_addressbook.inc:672
-#: plugins/admin/departments/class_departmentGeneric.inc:252
+#: plugins/personal/generic/class_user.inc:1103
+#: plugins/addons/addressbook/class_addressbook.inc:671
+#: plugins/addons/addressbook/class_addressbook.inc:674
+#: plugins/admin/departments/class_departmentGeneric.inc:272
  msgid "The field 'Phone' contains an invalid phone number."
  msgstr "Het veld 'Telefoon' bevat een ongeldig telefoonnummer."
  
-#: plugins/personal/generic/class_user.inc:1107
-#: plugins/addons/addressbook/class_addressbook.inc:675
-#: plugins/admin/departments/class_departmentGeneric.inc:255
+#: plugins/personal/generic/class_user.inc:1106
+#: plugins/addons/addressbook/class_addressbook.inc:677
+#: plugins/admin/departments/class_departmentGeneric.inc:275
  msgid "The field 'Fax' contains an invalid phone number."
  msgstr "Het veld 'Fax' bevat een ongeldig Faxnummer."
  
-#: plugins/personal/generic/class_user.inc:1110
-#: plugins/addons/addressbook/class_addressbook.inc:678
+#: plugins/personal/generic/class_user.inc:1109
+#: plugins/addons/addressbook/class_addressbook.inc:680
  msgid "The field 'Mobile' contains an invalid phone number."
  msgstr "Het veld 'GSM' bevat een ongeldig telefoonnummer"
  
-#: plugins/personal/generic/class_user.inc:1113
-#: plugins/addons/addressbook/class_addressbook.inc:681
+#: plugins/personal/generic/class_user.inc:1112
+#: plugins/addons/addressbook/class_addressbook.inc:683
  msgid "The field 'Pager' contains an invalid phone number."
  msgstr "Het veld 'Pieper' bevat een ongeldig telefoonnummer."
  
-#: plugins/personal/generic/class_user.inc:1222
+#: plugins/personal/generic/class_user.inc:1221
  msgid "Could not open specified certificate!"
  msgstr "Het opgegeven certificaat kon geopend worden!"
  
-#: plugins/personal/generic/class_user.inc:1353
+#: plugins/personal/generic/class_user.inc:1352
  #: plugins/personal/generic/generic.tpl:442
  msgid "Unit"
  msgstr "Eenheid"
  
-#: plugins/personal/generic/class_user.inc:1354
+#: plugins/personal/generic/class_user.inc:1353
  #: plugins/personal/generic/generic.tpl:467
  msgid "House identifier"
  msgstr "Huis identificatie"
  
-#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/class_user.inc:1354
  #: plugins/personal/generic/generic.tpl:384
  msgid "Vocation"
  msgstr "Beroep"
  
-#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1355
  #: plugins/personal/generic/generic.tpl:511
  msgid "Last delivery"
  msgstr "Laatste levering"
  
-#: plugins/personal/generic/class_user.inc:1357
+#: plugins/personal/generic/class_user.inc:1356
  #: plugins/personal/generic/generic.tpl:433
  msgid "Person locality"
  msgstr "Werkplaats"
  
-#: plugins/personal/generic/class_user.inc:1358
+#: plugins/personal/generic/class_user.inc:1357
  #: plugins/personal/generic/generic.tpl:392
  msgid "Unit description"
  msgstr "Eenheid omschrijving"
  
-#: plugins/personal/generic/class_user.inc:1359
+#: plugins/personal/generic/class_user.inc:1358
  #: plugins/personal/generic/generic.tpl:401
  msgid "Subject area"
  msgstr "Werkgebied"
  
-#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/class_user.inc:1359
  #: plugins/personal/generic/generic.tpl:410
  msgid "Functional title"
  msgstr "Functionele titel"
  
-#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/class_user.inc:1361
  #: plugins/personal/generic/generic.tpl:520
  msgid "Public visible"
  msgstr "Publiek zichtbaar"
  
-#: plugins/personal/generic/class_user.inc:1363
+#: plugins/personal/generic/class_user.inc:1362
  #: plugins/personal/generic/generic.tpl:451
  msgid "Street"
  msgstr "Straat"
  
-#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1363
  #: plugins/personal/generic/generic.tpl:419
  msgid "Role"
  msgstr "Funktie"
  
-#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/class_user.inc:1364
  #: plugins/personal/generic/generic.tpl:459
  #: plugins/addons/addressbook/address_edit.tpl:179
  #: plugins/addons/addressbook/address_info.tpl:133 html/getxls.php:227
  msgid "Postal code"
  msgstr "Postcode"
  
-#: plugins/personal/generic/class_user.inc:1369
+#: plugins/personal/generic/class_user.inc:1368
  #, fuzzy
  msgid "Generic user settings"
  msgstr "Algemene wachtrij instellingen"
  
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:1373
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/users/class_userManagement.inc:28
  #: plugins/admin/systems/printer.tpl:91
@@ -2360,217 +2381,218 @@ msgstr "Algemene wachtrij instellingen"
  msgid "Users"
  msgstr "Gebruikers"
  
-#: plugins/personal/generic/class_user.inc:1378
+#: plugins/personal/generic/class_user.inc:1377
  #: plugins/personal/generic/generic.tpl:143
  #: plugins/gofax/blocklists/generic.tpl:17
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:598
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
  #: plugins/addons/godfs/class_dfsManagment.inc:217
  #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:894
-#: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/groups/class_groupGeneric.inc:888
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:129
  #: plugins/admin/applications/generic.tpl:42
-#: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:134
+#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/class_divListApplication.inc:144
  #: plugins/admin/departments/generic.tpl:35
-#: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:107
+#: plugins/admin/departments/class_departmentGeneric.inc:586
+#: plugins/admin/departments/class_divListDepartment.inc:100
  #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:22
  #: plugins/admin/systems/phone.tpl:17 plugins/admin/systems/printer.tpl:27
  #: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/class_terminalGeneric.inc:513
-#: plugins/admin/systems/class_servGeneric.inc:346
-#: plugins/admin/systems/class_workstationGeneric.inc:515
+#: plugins/admin/systems/class_terminalGeneric.inc:553
+#: plugins/admin/systems/class_servGeneric.inc:359
+#: plugins/admin/systems/class_workstationGeneric.inc:537
  #: plugins/admin/systems/wingeneric.tpl:13
  #: plugins/admin/systems/component.tpl:17
-#: plugins/admin/systems/class_printGeneric.inc:864
-#: plugins/admin/systems/class_componentGeneric.inc:267
-#: plugins/admin/systems/class_glpiSelectUser.inc:167
+#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_componentGeneric.inc:269
+#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_glpiSelectUser.inc:181
  #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:148
+#: plugins/admin/systems/class_divListSystem.inc:187
  #: plugins/admin/systems/goLdapServer.tpl:2
  #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:719
-#: plugins/admin/ogroups/class_divListOGroup.inc:145
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_divListOGroup.inc:149
+#: plugins/admin/acl/class_divListACL.inc:98
+#: plugins/admin/fai/class_divListFai.inc:171
  #: plugins/admin/mimetypes/generic.tpl:44
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:683
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:153
  #: plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/class_gofonMacro.inc:484
-#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/macro/class_gofonMacro.inc:497
+#: plugins/gofon/macro/class_divListMacros.inc:106
  #: plugins/gofon/conference/generic.tpl:49
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
-#: plugins/gofon/conference/class_divListConferences.inc:119
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_divListConferences.inc:114
  msgid "Base"
  msgstr "Basis"
  
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/addons/addressbook/class_addressbook.inc:792 html/getxls.php:301
  msgid "Surename"
  msgstr "Achternaam"
  
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/addons/addressbook/class_addressbook.inc:611
-#: plugins/addons/addressbook/class_addressbook.inc:791 html/getxls.php:86
+#: plugins/personal/generic/class_user.inc:1380
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/addressbook/class_addressbook.inc:793 html/getxls.php:86
  #: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
  msgid "Given name"
  msgstr "Naam"
  
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/addons/addressbook/class_addressbook.inc:796
+#: plugins/personal/generic/class_user.inc:1381
+#: plugins/addons/addressbook/class_addressbook.inc:798
  #, fuzzy
  msgid "User identification"
  msgstr "Gebruikersinformatie"
  
-#: plugins/personal/generic/class_user.inc:1383
+#: plugins/personal/generic/class_user.inc:1382
  #: plugins/personal/generic/generic.tpl:73
  #: plugins/addons/addressbook/address_edit.tpl:60
  #: plugins/addons/addressbook/address_info.tpl:40
  msgid "Personal title"
  msgstr "Aanhef"
  
-#: plugins/personal/generic/class_user.inc:1384
+#: plugins/personal/generic/class_user.inc:1383
  #: plugins/personal/generic/generic.tpl:83
  msgid "Academic title"
  msgstr "Academische titel"
  
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
+#: plugins/personal/generic/class_user.inc:1384
+#: plugins/addons/addressbook/class_addressbook.inc:809 html/getxls.php:224
  msgid "Home postal address"
  msgstr "Adres thuis"
  
-#: plugins/personal/generic/class_user.inc:1386
-#: plugins/addons/addressbook/class_addressbook.inc:795
+#: plugins/personal/generic/class_user.inc:1385
+#: plugins/addons/addressbook/class_addressbook.inc:797
  #, fuzzy
  msgid "Home phone number"
  msgstr "Telefoonnummer"
  
-#: plugins/personal/generic/class_user.inc:1387
+#: plugins/personal/generic/class_user.inc:1386
  #: plugins/personal/generic/generic.tpl:183
  msgid "Homepage"
  msgstr "Homepage"
  
-#: plugins/personal/generic/class_user.inc:1388
+#: plugins/personal/generic/class_user.inc:1387
  #: plugins/personal/generic/generic.tpl:250
-#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
+#: plugins/addons/addressbook/class_addressbook.inc:801 html/getxls.php:299
  msgid "Organization"
  msgstr "Organisatie"
  
-#: plugins/personal/generic/class_user.inc:1389
+#: plugins/personal/generic/class_user.inc:1388
  #: plugins/personal/generic/generic.tpl:258
  #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
  #: plugins/addons/addressbook/address_edit.tpl:155
-#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/class_addressbook.inc:802
  #: plugins/addons/addressbook/address_info.tpl:117
  #: plugins/admin/users/class_divListUsers.inc:56
  #: plugins/admin/applications/class_divListApplication.inc:51
-#: plugins/admin/ogroups/class_ogroupManagement.inc:354
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
  #: plugins/gofon/macro/class_divListMacros.inc:52
  #: plugins/generic/references/class_reference.inc:38
  msgid "Department"
  msgstr "Afdeling"
  
-#: plugins/personal/generic/class_user.inc:1390
+#: plugins/personal/generic/class_user.inc:1389
  #: plugins/personal/generic/generic.tpl:93
  msgid "Date of birth"
  msgstr "Geboortedatum"
  
-#: plugins/personal/generic/class_user.inc:1391
+#: plugins/personal/generic/class_user.inc:1390
  #, fuzzy
  msgid "Gender"
  msgstr "Afzender"
  
-#: plugins/personal/generic/class_user.inc:1392
+#: plugins/personal/generic/class_user.inc:1391
  #, fuzzy
  msgid "Preferred language"
  msgstr "Voorkeurstaal"
  
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1392
  #, fuzzy
  msgid "Department number"
  msgstr "Afdelingnaam"
  
-#: plugins/personal/generic/class_user.inc:1394
+#: plugins/personal/generic/class_user.inc:1393
  #, fuzzy
  msgid "Employee number"
  msgstr "Functie"
  
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:1394
  #: plugins/personal/generic/generic.tpl:282
  msgid "Employee type"
  msgstr "Functie"
  
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:1395
  #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/class_addressbook.inc:801
+#: plugins/addons/addressbook/class_addressbook.inc:803
  #: plugins/addons/godfs/generic.tpl:34
  #: plugins/admin/departments/generic.tpl:56
  #: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: plugins/admin/departments/class_departmentGeneric.inc:587
  #: plugins/admin/systems/workstation.tpl:19
-#: plugins/admin/systems/class_workstationGeneric.inc:514
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_workstationGeneric.inc:536
+#: plugins/admin/systems/class_printGeneric.inc:870
  #: plugins/admin/systems/class_glpiAccount.inc:782
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
  msgid "Location"
  msgstr "Plaats"
  
-#: plugins/personal/generic/class_user.inc:1397
+#: plugins/personal/generic/class_user.inc:1396
  #: plugins/personal/generic/generic.tpl:360
-#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:806
  #: plugins/admin/departments/generic.tpl:60
-#: plugins/admin/departments/class_departmentGeneric.inc:547
+#: plugins/admin/departments/class_departmentGeneric.inc:591
  #: html/getxls.php:228 html/getxls.php:301
  msgid "State"
  msgstr "Provincie"
  
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1397
  #: plugins/personal/generic/paste_generic.tpl:47
  msgid "User picture"
  msgstr "Persoonlijk plaatje"
  
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1398
  #, fuzzy
  msgid "Room number"
  msgstr "Telefoonnummer"
  
-#: plugins/personal/generic/class_user.inc:1400
-#: plugins/addons/addressbook/class_addressbook.inc:792
+#: plugins/personal/generic/class_user.inc:1399
+#: plugins/addons/addressbook/class_addressbook.inc:794
  #, fuzzy
  msgid "Telefon number"
  msgstr "Telefoonnummer"
  
-#: plugins/personal/generic/class_user.inc:1401
-#: plugins/addons/addressbook/class_addressbook.inc:794
+#: plugins/personal/generic/class_user.inc:1400
+#: plugins/addons/addressbook/class_addressbook.inc:796
  #, fuzzy
  msgid "Mobile number"
  msgstr "GSM nummer"
  
-#: plugins/personal/generic/class_user.inc:1402
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/nagios/class_nagiosAccount.inc:272
  #, fuzzy
  msgid "Pager number"
  msgstr "Telefoonnummer"
  
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1402
  #, fuzzy
  msgid "User certificates"
  msgstr "Standaard certificaat"
  
-#: plugins/personal/generic/class_user.inc:1405
-#: plugins/addons/addressbook/class_addressbook.inc:802
-#: plugins/addons/addressbook/class_addressbook.inc:803 html/getxls.php:226
+#: plugins/personal/generic/class_user.inc:1404
+#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:805 html/getxls.php:226
  #: html/getxls.php:298 html/getxls.php:300
  msgid "Postal address"
  msgstr "Adres thuis"
  
-#: plugins/personal/generic/class_user.inc:1406
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:820
-#: plugins/addons/addressbook/class_addressbook.inc:793
+#: plugins/personal/generic/class_user.inc:1405
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
+#: plugins/addons/addressbook/class_addressbook.inc:795
  #, fuzzy
  msgid "Fax number"
  msgstr "Serienummer"
@@ -2645,7 +2667,7 @@ msgstr "Kies de subtree waaronder de gebruiker geplaatst wordt"
  #: plugins/admin/systems/workstation.tpl:35
  #: plugins/admin/systems/wingeneric.tpl:18
  #: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:36
+#: plugins/admin/mimetypes/generic.tpl:53 plugins/gofon/macro/generic.tpl:36
  #: plugins/gofon/conference/generic.tpl:56
  #: plugins/gofon/conference/generic.tpl:62
  msgid "Select a base"
@@ -2658,7 +2680,7 @@ msgstr "Selecteer een basis"
  #: plugins/addons/addressbook/address_info.tpl:59
  #: plugins/addons/addressbook/address_info.tpl:155
  #: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/class_departmentGeneric.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:592
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
  msgid "Address"
  msgstr "Adres"
@@ -2716,7 +2738,7 @@ msgstr "GSM"
  #: plugins/personal/generic/generic.tpl:326
  #: plugins/personal/nagios/nagios.tpl:79
  #: plugins/addons/addressbook/address_edit.tpl:246
-#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/class_addressbook.inc:800
  #: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
  #: html/getxls.php:300
  msgid "Pager"
@@ -2738,6 +2760,7 @@ msgstr ""
  
  #: plugins/personal/generic/generic_picture.tpl:27
  #: plugins/personal/generic/paste_generic.tpl:52
+#: plugins/admin/applications/generic.tpl:81
  msgid "Remove picture"
  msgstr "Plaatje verwijderen"
  
@@ -2745,37 +2768,38 @@ msgstr "Plaatje verwijderen"
  #: plugins/personal/generic/generic_certs.tpl:91
  #: plugins/personal/environment/hotplugDialogNew.tpl:53
  #: plugins/addons/addressbook/address_edit.tpl:264
-#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/departments/dep_move_confirm.tpl:15
+#: plugins/admin/systems/goNtpServer.tpl:29
  #: plugins/admin/systems/servdns.tpl:21
-#: plugins/admin/systems/servkolab.tpl:246
-#: plugins/admin/systems/goNtpServer.tpl:30
-#: plugins/admin/systems/goKrbServer.tpl:31
+#: plugins/admin/systems/servkolab.tpl:245
+#: plugins/admin/systems/goKrbServer.tpl:30
+#: plugins/admin/systems/goFonServer.tpl:39
  #: plugins/admin/systems/servnfs.tpl:139
-#: plugins/admin/systems/goFonServer.tpl:40
+#: plugins/admin/systems/goFaxServer.tpl:23
  #: plugins/admin/systems/servRepository.tpl:66
-#: plugins/admin/systems/goFaxServer.tpl:24
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
  #: plugins/admin/systems/glpi_devices.tpl:760
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
  #: plugins/admin/systems/servdnseditzone.tpl:119
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/goLdapServer.tpl:10
-#: plugins/admin/systems/goShareServer.tpl:30
-#: plugins/admin/systems/goMailServer.tpl:222
-#: plugins/admin/systems/goImapServer.tpl:117
-#: plugins/admin/systems/goSyslogServer.tpl:6
-#: plugins/admin/systems/goGlpiServer.tpl:33
-#: plugins/admin/systems/goCupsServer.tpl:6
-#: plugins/admin/systems/goTerminalServer.tpl:24
-#: plugins/admin/systems/goLogDBServer.tpl:24
-#: plugins/admin/systems/goSpamServer.tpl:126
-#: plugins/admin/systems/goSpamServerRule.tpl:22
-#: plugins/admin/systems/goVirusServer.tpl:169
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:29
+#: plugins/admin/systems/goMailServer.tpl:221
+#: plugins/admin/systems/goImapServer.tpl:116
+#: plugins/admin/systems/goSyslogServer.tpl:5
+#: plugins/admin/systems/goGlpiServer.tpl:32
+#: plugins/admin/systems/goCupsServer.tpl:5
+#: plugins/admin/systems/goTerminalServer.tpl:23
+#: plugins/admin/systems/goLogDBServer.tpl:23
+#: plugins/admin/systems/goSpamServer.tpl:125
+#: plugins/admin/systems/goSpamServerRule.tpl:21
+#: plugins/admin/systems/goVirusServer.tpl:168
  #: plugins/admin/systems/class_goService.inc:33
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:38
  #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/default/copyPasteDialog.tpl:19
  msgid "Save"
  msgstr "Opslaan"
  
@@ -2797,21 +2821,21 @@ msgstr "Standaard certificaat"
  #: plugins/personal/connectivity/class_kolabAccount.inc:258
  #: plugins/personal/environment/environment.tpl:159
  #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:597
+#: plugins/admin/groups/class_groupMail.inc:604
  #: plugins/admin/applications/class_applicationParameters.inc:124
  #: plugins/admin/systems/printer.tpl:71
  #: plugins/admin/systems/glpiPrinter.tpl:152
  #: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:182
+#: plugins/admin/systems/workstationStartup.tpl:186
  #: plugins/admin/systems/terminalStartup.tpl:111
  #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:393
  #: plugins/admin/systems/goMailServer.tpl:73
  #: plugins/admin/systems/goMailServer.tpl:104
  #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:78
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
+#: plugins/admin/fai/faiPackage.tpl:81
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:293
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:295
  msgid "Remove"
  msgstr "Verwijderen"
  
@@ -2840,6 +2864,7 @@ msgid "Set new password"
  msgstr "Nieuw wachtwoord instellen"
  
  #: plugins/personal/connectivity/pureftpd.tpl:4
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
  msgid "FTP account"
  msgstr "FTP account"
  
@@ -2895,6 +2920,7 @@ msgstr "Schakel FTP toegang tijdelijk uit"
  
  #: plugins/personal/connectivity/proxy.tpl:23
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
+#: plugins/personal/connectivity/class_proxyAccount.inc:297
  msgid "Proxy account"
  msgstr "Proxy account"
  
@@ -2909,7 +2935,7 @@ msgid "Limit proxy access to working time"
  msgstr "Beperk proxy gebruik tot tijd"
  
  #: plugins/personal/connectivity/proxy.tpl:84
-#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
  msgid "Restrict proxy usage by quota"
  msgstr "Beperk proxy gebruik met quota"
  
@@ -2946,7 +2972,7 @@ msgstr "Groep instellingen"
  #: plugins/personal/connectivity/class_pureftpdAccount.inc:219
  #: plugins/personal/connectivity/class_oxchangeAccount.inc:950
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
  #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
  #: plugins/personal/connectivity/class_opengwAccount.inc:310
@@ -2954,12 +2980,18 @@ msgstr "Groep instellingen"
  msgid "Connectivity addon"
  msgstr "Verbindingen"
  
+#: plugins/personal/connectivity/class_phpgwAccount.inc:148
+#, fuzzy
+msgid "PHPgroupware"
+msgstr "PHPGroupware"
+
  #: plugins/personal/connectivity/phpgw.tpl:3
  msgid "PHPGroupware account"
  msgstr "PHPGroupware account"
  
  #: plugins/personal/connectivity/kolab.tpl:3
  #: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/class_kolabAccount.inc:452
  msgid "Kolab account"
  msgstr "Kolab account"
  
@@ -2972,7 +3004,7 @@ msgstr ""
  "mail account toevoegd."
  
  #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:459
+#: plugins/personal/connectivity/class_kolabAccount.inc:460
  msgid "Delegations"
  msgstr "Delegaties"
  
@@ -3004,7 +3036,7 @@ msgid "days"
  msgstr "dagen"
  
  #: plugins/personal/connectivity/kolab.tpl:93
-#: plugins/personal/connectivity/class_kolabAccount.inc:460
+#: plugins/personal/connectivity/class_kolabAccount.inc:461
  msgid "Invitation policy"
  msgstr "Uitnodigingsbeleid"
  
@@ -3085,16 +3117,16 @@ msgstr "Het opslaan van het Kolab account is mislukt"
  msgid "Kolab account settings"
  msgstr "Kolab account"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:456
+#: plugins/personal/connectivity/class_kolabAccount.inc:457
  msgid "Free busy future"
  msgstr ""
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:457
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
  #, fuzzy
  msgid "Mail size restriction"
  msgstr "Mail distributielijst"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:458
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
  #, fuzzy
  msgid "Free busy information"
  msgstr "Free Busy informatie"
@@ -3115,6 +3147,7 @@ msgid "Saving of user/webDAV account with dn '%s' failed."
  msgstr "Het opslaan van het webDAV account is mislukt"
  
  #: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_webdavAccount.inc:147
  #: plugins/personal/connectivity/webdav.tpl:3
  msgid "WebDAV account"
  msgstr "WebDAV Account"
@@ -3172,32 +3205,32 @@ msgstr "FS type"
  msgid "Pure ftp account"
  msgstr "Fax account aanmaken"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
  #, fuzzy
  msgid "Quota files"
  msgstr "Quota grootte"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
  #, fuzzy
  msgid "Upload ratio"
  msgstr "Uploaden"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
  #, fuzzy
  msgid "Quota MBytes"
  msgstr "Quota grootte"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
  #, fuzzy
  msgid "Download ratio"
  msgstr "Systeem configuratie"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
  #, fuzzy
  msgid "Upload bandwith"
  msgstr "Verstuur bandbreedte"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
  #, fuzzy
  msgid "Download bandwith"
  msgstr "Ontvangst bandbreedte"
@@ -3297,22 +3330,28 @@ msgstr "Open-Xchange"
  msgid "Open xchange account settings"
  msgstr "Open-Xchange account"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:959
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
+#, fuzzy
+msgid "OpenExchange account"
+msgstr "Open-Xchange account"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
  #, fuzzy
  msgid "OXAppointmentDays"
  msgstr "Afspraken"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
  #, fuzzy
  msgid "OXTaskDays"
  msgstr "Taken"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:962
  #, fuzzy
  msgid "OXTimeZone"
  msgstr "Tijdzone"
  
  #: plugins/personal/connectivity/intranet.tpl:3
+#: plugins/personal/connectivity/class_intranetAccount.inc:181
  msgid "Intranet account"
  msgstr "Intranet account"
  
@@ -3372,17 +3411,18 @@ msgstr "De nummerieke waarde opgegeven voor Quota Instellingen is niet geldig."
  msgid "Saving of user/proxy account with dn '%s' failed."
  msgstr "Het opslaan van het proxy account is mislukt"
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:301
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
  msgid "Filter unwanted content"
  msgstr ""
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
  #, fuzzy
  msgid "Limit proxy access"
  msgstr "Beperk proxy gebruik tot tijd"
  
  #: plugins/personal/connectivity/pptp.tpl:3
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_pptpAccount.inc:164
  msgid "PPTP account"
  msgstr "PPTP account"
  
@@ -3401,7 +3441,7 @@ msgstr "Het verwijderen van het intranet account is mislukt"
  msgid "Saving of user/intranet account with dn '%s' failed."
  msgstr "Het opslaan van het intranet account is mislukt"
  
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #, fuzzy
  msgid "Intranet account settings"
  msgstr "Intranet account"
@@ -3427,29 +3467,30 @@ msgstr "Het opslaan van het PPTP account is mislukt"
  
  #: plugins/personal/connectivity/opengw.tpl:1
  #: plugins/personal/connectivity/class_opengwAccount.inc:309
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
  msgid "Opengroupware"
  msgstr "OpenGroupware"
  
  #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:319
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
  msgid "Location team"
  msgstr "Teamlocatie"
  
  #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:320
+#: plugins/personal/connectivity/class_opengwAccount.inc:321
  msgid "Template user"
  msgstr "Sjabloongebruiker"
  
  #: plugins/personal/connectivity/opengw.tpl:33
-#: plugins/personal/connectivity/class_opengwAccount.inc:321
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/ogroups/class_termgroup.inc:42
+#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/admin/systems/class_servGeneric.inc:53
+#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/ogroups/class_termgroup.inc:41
  msgid "Locked"
  msgstr "Geblokkeerd"
  
  #: plugins/personal/connectivity/opengw.tpl:48
-#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/personal/connectivity/class_opengwAccount.inc:323
  msgid "Teams"
  msgstr "Teams"
  
@@ -3481,6 +3522,11 @@ msgstr "PHPScheduleIt"
  msgid "PHP Schedule it settings"
  msgstr "PHPScheduleIt"
  
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:149
+#, fuzzy
+msgid "PHP schedule it"
+msgstr "PHPScheduleIt"
+
  #: plugins/personal/connectivity/class_opengwAccount.inc:6
  msgid "Opengroupware account"
  msgstr "OpenGroupware account"
@@ -3545,7 +3591,7 @@ msgid "Profil quota"
  msgstr "Profiel quota"
  
  #: plugins/personal/environment/environment.tpl:73
-#: plugins/personal/environment/class_environment.inc:1282
+#: plugins/personal/environment/class_environment.inc:1285
  msgid "Cache profile localy"
  msgstr "Profiel lokaal cachen"
  
@@ -3554,7 +3600,7 @@ msgid "Kiosk profile settings"
  msgstr "Kiosk profiel instellingen"
  
  #: plugins/personal/environment/environment.tpl:85
-#: plugins/personal/environment/class_environment.inc:1288
+#: plugins/personal/environment/class_environment.inc:1291
  msgid "Kiosk profile"
  msgstr "Kiosk profiel"
  
@@ -3563,22 +3609,22 @@ msgid "Manage"
  msgstr "Beheer"
  
  #: plugins/personal/environment/environment.tpl:105
-#: plugins/personal/environment/class_environment.inc:1281
+#: plugins/personal/environment/class_environment.inc:1284
  msgid "Resolution changeable during session"
  msgstr "Resolutie is binnen de sessie te veranderen"
  
  #: plugins/personal/environment/environment.tpl:110
-#: plugins/personal/environment/class_environment.inc:1287
+#: plugins/personal/environment/class_environment.inc:1290
  #: plugins/admin/systems/workstationService.tpl:122
  #: plugins/admin/systems/terminalService.tpl:108
  msgid "Resolution"
  msgstr "Resolutie"
  
  #: plugins/personal/environment/environment.tpl:133
-#: plugins/personal/environment/class_environment.inc:1293
+#: plugins/personal/environment/class_environment.inc:1296
  #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1123
-#: plugins/admin/systems/workstationStartup.tpl:158
+#: plugins/admin/systems/class_workstationStartup.inc:1168
+#: plugins/admin/systems/workstationStartup.tpl:162
  #: plugins/admin/systems/terminalStartup.tpl:87
  #: plugins/admin/systems/goShareServer.tpl:1
  msgid "Shares"
@@ -3607,7 +3653,7 @@ msgid "Logon script management"
  msgstr "Login script beheer"
  
  #: plugins/personal/environment/environment.tpl:203
-#: plugins/personal/environment/class_environment.inc:1292
+#: plugins/personal/environment/class_environment.inc:1295
  msgid "Hotplug devices"
  msgstr "Hotplug apparaten"
  
@@ -3617,7 +3663,7 @@ msgstr "Hotplug apparaat instellingen"
  
  #: plugins/personal/environment/environment.tpl:219
  #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "New"
  msgstr "Nieuw"
  
@@ -3673,7 +3719,7 @@ msgid "Please select an entry or press cancel."
  msgstr "Selecteer a.u.b. een regel of druk op annuleren."
  
  #: plugins/personal/environment/class_selectPrinterDialog.inc:102
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:140
  msgid "Please select a printer or press cancel."
  msgstr "Selecteer a.u.b. een printer of druk annuleren in"
  
@@ -3712,8 +3758,8 @@ msgid "auto"
  msgstr "auto"
  
  #: plugins/personal/environment/class_environment.inc:230
-#: plugins/admin/systems/class_terminalService.inc:95
  #: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_terminalService.inc:97
  #, php-format
  msgid ""
  "You have specified an external resolution hook which can't be read, please "
@@ -3789,7 +3835,7 @@ msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
  #: plugins/personal/environment/class_environment.inc:591
  #: plugins/personal/environment/class_environment.inc:604
  #: plugins/admin/systems/class_terminalStartup.inc:203
-#: plugins/admin/systems/class_workstationStartup.inc:616
+#: plugins/admin/systems/class_workstationStartup.inc:645
  msgid "You must specify a valid mount point."
  msgstr "U moet een geldig mountpunt opgeven."
  
@@ -3859,30 +3905,32 @@ msgid "Administrator"
  msgstr "Beheerder"
  
  #: plugins/personal/environment/class_environment.inc:1243
-#: plugins/personal/environment/class_environment.inc:1290
+#: plugins/personal/environment/class_environment.inc:1293
  msgid "Default printer"
  msgstr "Standaard printer"
  
  #: plugins/personal/environment/class_environment.inc:1270
+#: plugins/personal/environment/class_environment.inc:1275
+#: plugins/personal/environment/class_environment.inc:1277
  #, fuzzy
  msgid "Environment settings"
  msgstr "Gebruikersomgeving instellingen"
  
-#: plugins/personal/environment/class_environment.inc:1277
+#: plugins/personal/environment/class_environment.inc:1280
  msgid "Command to extend the list of possible screen resolutions"
  msgstr ""
  
-#: plugins/personal/environment/class_environment.inc:1284
+#: plugins/personal/environment/class_environment.inc:1287
  #, fuzzy
  msgid "Profile quota"
  msgstr "Profiel quota"
  
-#: plugins/personal/environment/class_environment.inc:1285
+#: plugins/personal/environment/class_environment.inc:1288
  #, fuzzy
  msgid "Profile server"
  msgstr "Bestandserver"
  
-#: plugins/personal/environment/class_environment.inc:1291
+#: plugins/personal/environment/class_environment.inc:1294
  #: plugins/personal/environment/logonManagement.tpl:56
  msgid "Logon script"
  msgstr "Login script"
@@ -3928,31 +3976,31 @@ msgstr "Scriptnaam"
  #: plugins/personal/environment/logonManagement.tpl:17
  #: plugins/personal/environment/hotplugDialogNew.tpl:17
  #: plugins/gofax/blocklists/generic.tpl:51
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:597
  #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
  #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:889
  #: plugins/admin/applications/generic.tpl:33
-#: plugins/admin/applications/class_applicationGeneric.inc:525
+#: plugins/admin/applications/class_applicationGeneric.inc:534
  #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/departments/class_departmentGeneric.inc:540
-#: plugins/admin/systems/class_winGeneric.inc:260
+#: plugins/admin/departments/class_departmentGeneric.inc:584
+#: plugins/admin/systems/class_winGeneric.inc:281
  #: plugins/admin/systems/server.tpl:14 plugins/admin/systems/phone.tpl:34
  #: plugins/admin/systems/printer.tpl:16
-#: plugins/admin/systems/class_servGeneric.inc:344
+#: plugins/admin/systems/class_servGeneric.inc:357
  #: plugins/admin/systems/wingeneric.tpl:25
  #: plugins/admin/systems/component.tpl:35
-#: plugins/admin/systems/class_printGeneric.inc:865
-#: plugins/admin/systems/class_componentGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_componentGeneric.inc:270
  #: plugins/admin/systems/servnfs.tpl:19
-#: plugins/admin/systems/class_phoneGeneric.inc:435
+#: plugins/admin/systems/class_phoneGeneric.inc:441
  #: plugins/admin/systems/class_goMailServer.inc:695
  #: plugins/admin/systems/class_goShareServer.inc:372
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:720
+#: plugins/admin/ogroups/class_ogroup.inc:703
  #: plugins/admin/fai/faiVariable.tpl:21
-#: plugins/admin/fai/class_faiScript.inc:527
-#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/class_faiScript.inc:538
+#: plugins/admin/fai/class_faiTemplate.inc:508
  #: plugins/admin/fai/faiPackage.tpl:21
  #: plugins/admin/fai/faiPartitionTable.tpl:21
  #: plugins/admin/fai/class_faiScriptEntry.inc:180
@@ -3960,7 +4008,7 @@ msgstr "Scriptnaam"
  #: plugins/admin/fai/class_faiPackage.inc:537
  #: plugins/admin/fai/class_faiProfile.inc:452
  #: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:21
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:464
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:13
  #: plugins/admin/fai/faiScript.tpl:21
  #: plugins/admin/fai/class_faiVariableEntry.inc:143
@@ -3969,16 +4017,16 @@ msgstr "Scriptnaam"
  #: plugins/admin/fai/class_faiPartitionTable.inc:529
  #: plugins/admin/fai/class_faiHookEntry.inc:189
  #: plugins/admin/fai/faiHookEntry.tpl:19
-#: plugins/admin/fai/class_faiVariable.inc:421
+#: plugins/admin/fai/class_faiVariable.inc:417
  #: plugins/admin/fai/class_faiTemplateEntry.inc:248
  #: plugins/admin/fai/faiTemplateEntry.tpl:13
-#: plugins/admin/mimetypes/generic.tpl:35
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:674
+#: plugins/admin/mimetypes/generic.tpl:34
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:682
  #: plugins/admin/mimetypes/paste_generic.tpl:21
  #: plugins/gofon/macro/generic.tpl:49
-#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/macro/class_gofonMacro.inc:498
  #: plugins/gofon/conference/generic.tpl:78
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
  #: plugins/generic/references/contents.tpl:11 html/getxls.php:158
  #: html/getxls.php:287
  msgid "Description"
@@ -4010,11 +4058,11 @@ msgstr "Script kan vervangen worden door gebruiker"
  #: plugins/admin/groups/application_options.tpl:11
  #: plugins/admin/users/class_userManagement.inc:654
  #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:503
+#: plugins/admin/systems/class_systemManagement.inc:651
  #: plugins/admin/systems/printerPPDDialog.tpl:22
  #: plugins/admin/systems/servRepositorySetup.tpl:54
-#: plugins/admin/ogroups/class_ogroupManagement.inc:304
-#: plugins/admin/fai/class_faiManagement.inc:616
+#: plugins/admin/ogroups/class_ogroupManagement.inc:299
+#: plugins/admin/fai/class_faiManagement.inc:626
  #: plugins/admin/fai/faiProfileEntry.tpl:70
  #: plugins/admin/fai/faiScriptEntry.tpl:82
  #: plugins/admin/fai/faiVariableEntry.tpl:54
@@ -4023,9 +4071,9 @@ msgstr "Script kan vervangen worden door gebruiker"
  #: plugins/admin/fai/faiPackageEntry.tpl:56
  #: plugins/admin/fai/faiPackageConfiguration.tpl:6
  #: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:340
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:342
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:260
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:253
  #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
  #: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
  msgid "Apply"
@@ -4115,7 +4163,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
-#: plugins/admin/fai/class_faiSummaryTab.inc:209
+#: plugins/admin/fai/class_faiSummaryTab.inc:236
  #: include/class_MultiSelectWindow.inc:81
  msgid "Close"
  msgstr "Sluiten"
@@ -4125,37 +4173,37 @@ msgid "Nagios Account"
  msgstr "Nagios account"
  
  #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
  msgid "Alias"
  msgstr "Alias"
  
  #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:276
+#: plugins/personal/nagios/class_nagiosAccount.inc:277
  msgid "Host notification period"
  msgstr "Host notificatie periode"
  
  #: plugins/personal/nagios/nagios.tpl:40
-#: plugins/personal/nagios/class_nagiosAccount.inc:280
+#: plugins/personal/nagios/class_nagiosAccount.inc:281
  msgid "Service notification period"
  msgstr "Service notificatie periode"
  
  #: plugins/personal/nagios/nagios.tpl:53
-#: plugins/personal/nagios/class_nagiosAccount.inc:279
+#: plugins/personal/nagios/class_nagiosAccount.inc:280
  msgid "Service notification options"
  msgstr "Service notificatie opties"
  
  #: plugins/personal/nagios/nagios.tpl:66
-#: plugins/personal/nagios/class_nagiosAccount.inc:275
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
  msgid "Host notification options"
  msgstr "Host notificatie opties"
  
  #: plugins/personal/nagios/nagios.tpl:90
-#: plugins/personal/nagios/class_nagiosAccount.inc:278
+#: plugins/personal/nagios/class_nagiosAccount.inc:279
  msgid "Service notification commands"
  msgstr "Service notificatie commando's"
  
  #: plugins/personal/nagios/nagios.tpl:100
-#: plugins/personal/nagios/class_nagiosAccount.inc:274
+#: plugins/personal/nagios/class_nagiosAccount.inc:275
  msgid "Host notification commands"
  msgstr "Host notificatie commando's"
  
@@ -4247,37 +4295,42 @@ msgstr "Het verwijderen van het Nagios account is mislukt"
  msgid "Nagios account settings"
  msgstr "Nagios instellingen"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:282
+#: plugins/personal/nagios/class_nagiosAccount.inc:265
+#, fuzzy
+msgid "Nagios account"
+msgstr "Nagios account"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:283
  #, fuzzy
  msgid "View all hosts"
  msgstr "alle hosts bekijken"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:283
+#: plugins/personal/nagios/class_nagiosAccount.inc:284
  #, fuzzy
  msgid "View all services"
  msgstr "alle services bekijken"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:285
+#: plugins/personal/nagios/class_nagiosAccount.inc:286
  #, fuzzy
  msgid "Trigger system commands"
  msgstr "systeem commando's activeren"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:286
+#: plugins/personal/nagios/class_nagiosAccount.inc:287
  #, fuzzy
  msgid "Trigger all host commands"
  msgstr "alle host commando's activeren"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:287
+#: plugins/personal/nagios/class_nagiosAccount.inc:288
  #, fuzzy
  msgid "Trigger all service commands"
  msgstr "alle service commando's activeren"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:289
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
  #, fuzzy
  msgid "View configuration information"
  msgstr "configuratie informatie bekijken"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:290
+#: plugins/personal/nagios/class_nagiosAccount.inc:291
  #, fuzzy
  msgid "View system informations"
  msgstr "systeem informatie bekijken"
@@ -4287,7 +4340,7 @@ msgid "Nagios settings"
  msgstr "Nagios instellingen"
  
  #: plugins/personal/netatalk/netatalk.tpl:4
-#: plugins/personal/netatalk/class_netatalk.inc:365
+#: plugins/personal/netatalk/class_netatalk.inc:366
  msgid "Share"
  msgstr "Share"
  
@@ -4348,7 +4401,12 @@ msgstr "Het opslaan van het Netatalk account is mislukt"
  msgid "Removing of user/netatalk account with dn '%s' failed."
  msgstr "Het verwijderen van het Netatalk account is mislukt"
  
-#: plugins/personal/netatalk/class_netatalk.inc:364
+#: plugins/personal/netatalk/class_netatalk.inc:360
+#, fuzzy
+msgid "Netatalk account"
+msgstr "Netatalk account beheren"
+
+#: plugins/personal/netatalk/class_netatalk.inc:365
  #, fuzzy
  msgid "User home path"
  msgstr "Profielpad"
@@ -4382,9 +4440,9 @@ msgstr "Selecteer de subtree waaronder deze groep geplaatst wordt"
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
  #: plugins/admin/systems/class_goShareServer.inc:373
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
-#: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiSummaryTab.inc:345
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:136
  msgid "Type"
  msgstr "Type"
  
@@ -4407,13 +4465,15 @@ msgstr "Nummers kunnen ook wildcards (*?) bevatten."
  #: plugins/gofax/blocklists/remove.tpl:2
  #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
  #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/systems/remove_ppd.tpl:2
  #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
  #: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
  #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
  #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:339 html/index.php:345
+#: html/index.php:49 html/index.php:337 html/index.php:343
  #: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/remove.tpl:2
  msgid "Warning"
@@ -4444,78 +4504,74 @@ msgid "Blocklist management"
  msgstr "Blokkeerlijst beheer"
  
  #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
  msgid "FAX Blocklists"
  msgstr "Fax blokkades"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:168
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:167
  #, php-format
  msgid "You're about to delete the blocklist '%s'."
  msgstr "U staat op het punt blokkeerlijst '%s' te verwijderen."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:185
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:184
  msgid "You have no permission to remove this blocklist."
  msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:200
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:199
  msgid "Please specify a valid phone number."
  msgstr "Geef a.u.b. een geldig telefoonnummer op."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "send"
  msgstr "versturen"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "receive"
  msgstr "ontvangen"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:435
  #, fuzzy, php-format
  msgid "Removing of blocklist with dn '%s' failed."
  msgstr "Het verwijderen van het blokeerlijst object is mislukt"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:477
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr ""
-"U heeft geen toestemming een blokkeerlijst aan te maken onder deze 'basis'."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:482
-#: plugins/admin/departments/class_departmentGeneric.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:487
+#: plugins/admin/departments/class_departmentGeneric.inc:258
  msgid "Required field 'Name' is not set."
  msgstr "Vereist veld 'Naam' is leeg."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:490
  msgid "Required field 'Name' contains invalid characters"
  msgstr "Vereist veld 'Naam' bevat ongeldige karakters"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:497
  msgid "Specified name is already used."
  msgstr "De opgegeven naam wordt al gebruikt."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:547
  #, fuzzy, php-format
  msgid "Saving of blocklist with dn '%s' failed."
  msgstr "Het opslaan van het blokkeerlijst object is mislukt"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
  #, fuzzy
-msgid "Fax Blocklists"
+msgid "Fax blocklists"
  msgstr "Fax blokkades"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:596
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/addressbook/address_info.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:893
-#: plugins/admin/applications/class_applicationGeneric.inc:523
-#: plugins/admin/applications/class_applicationGeneric.inc:527
-#: plugins/admin/systems/class_terminalGeneric.inc:514
-#: plugins/admin/systems/class_servGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:863
-#: plugins/admin/systems/class_componentGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:887
+#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/systems/class_terminalGeneric.inc:554
+#: plugins/admin/systems/class_servGeneric.inc:356
+#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_componentGeneric.inc:268
  #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_phoneGeneric.inc:434
-#: plugins/admin/systems/class_servRepository.inc:358
+#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_servRepository.inc:374
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:105
@@ -4535,10 +4591,10 @@ msgstr "Fax blokkades"
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
  #: plugins/admin/systems/class_goShareServer.inc:370
  #: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:701
  #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
  #: plugins/admin/fai/faiPackage.tpl:9
  #: plugins/admin/fai/faiPartitionTable.tpl:9
  #: plugins/admin/fai/class_faiScriptEntry.inc:179
@@ -4546,7 +4602,7 @@ msgstr "Fax blokkades"
  #: plugins/admin/fai/class_faiPackage.inc:536
  #: plugins/admin/fai/class_faiProfile.inc:451
  #: plugins/admin/fai/class_faiHook.inc:535 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:454
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
  #: plugins/admin/fai/faiScript.tpl:9
  #: plugins/admin/fai/class_faiVariableEntry.inc:142
@@ -4555,23 +4611,23 @@ msgstr "Fax blokkades"
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
  #: plugins/admin/fai/class_faiHookEntry.inc:188
  #: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #: plugins/admin/fai/class_faiTemplateEntry.inc:247
  #: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:313
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
+#: plugins/admin/fai/class_faiSummaryTab.inc:340
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
  #: plugins/gofon/macro/parameter.tpl:6
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
  #: html/getxls.php:223 html/getxls.php:290
  msgid "Name"
  msgstr "Naam"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:599
  #, fuzzy
  msgid "Blocklist"
  msgstr "Blokkeerlijsten"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:600
  #, fuzzy
  msgid "Blocklist type"
  msgstr "Blokkeerlijst naam"
@@ -4638,7 +4694,7 @@ msgstr "Toon ontvangst blokkeerlijsten"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -4649,242 +4705,107 @@ msgstr "Selecteer om binnen subonderdelen te zoeken"
  msgid "Regular expression for matching list names"
  msgstr "Reguliere expressie voor overeenkomende lijstnamen"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Go to root department"
-msgstr "Ga naar basis afdelingen"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Root"
-msgstr "Basis"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-msgid "Go up one department"
-msgstr "Ga een afdeling omhoog"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-#: include/class_acl.inc:368
-msgid "Up"
-msgstr "Omhoog"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Go to users department"
-msgstr "Ga naar gebruikers afdeling"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/fai/class_divListFai.inc:139
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Home"
-msgstr "Home"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/fai/class_divListFai.inc:141
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/conference/class_divListConferences.inc:103
-msgid "Reload list"
-msgstr "Lijst herladen"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:142
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:103
-#: plugins/gofon/conference/class_divListConferences.inc:121
-msgid "Submit"
-msgstr "Verwerk"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  msgid "Create new blocklist"
  msgstr "Nieuwe blokkeerlijst aanmaken"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  msgid "New Blocklist"
  msgstr "Nieuwe blokkeerlijst"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
  #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:121
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
  msgid "Submit department"
  msgstr "Verwerk afdeling"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/users/class_divListUsers.inc:255
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+#: include/class_MultiSelectWindow.inc:209
+msgid "Submit"
+msgstr "Verwerk"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:243
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
  #: plugins/admin/systems/glpiPrinter.tpl:18
  #: plugins/admin/systems/glpiPrinter.tpl:32 plugins/admin/systems/glpi.tpl:18
  #: plugins/admin/systems/glpi.tpl:32 plugins/admin/systems/glpi.tpl:46
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/acl/class_divListACL.inc:122
-#: plugins/admin/fai/class_faiScript.inc:283
-#: plugins/admin/fai/class_faiScript.inc:285
-#: plugins/admin/fai/class_faiTemplate.inc:257
-#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/acl/class_divListACL.inc:127
+#: plugins/admin/fai/class_faiScript.inc:293
+#: plugins/admin/fai/class_faiScript.inc:295
+#: plugins/admin/fai/class_faiTemplate.inc:270
+#: plugins/admin/fai/class_faiTemplate.inc:272
  #: plugins/admin/fai/class_faiHook.inc:294
  #: plugins/admin/fai/class_faiHook.inc:296
-#: plugins/admin/fai/class_divListFai.inc:241
-#: plugins/admin/fai/class_divListFai.inc:244
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/macro/class_divListMacros.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:159
-#: plugins/gofon/conference/class_divListConferences.inc:159
-#: include/class_acl.inc:370 include/class_acl.inc:415
+#: plugins/admin/fai/class_divListFai.inc:239
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/macro/class_divListMacros.inc:146
+#: plugins/gofon/conference/class_divListConferences.inc:155
+#: include/class_acl.inc:372 include/class_acl.inc:417
  msgid "edit"
  msgstr "Bewerk"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/users/class_divListUsers.inc:256
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/users/class_divListUsers.inc:244
  msgid "Edit user"
  msgstr "Bewerk gebruiker"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:274
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/acl/class_divListACL.inc:125
-#: plugins/admin/fai/class_faiScript.inc:287
-#: plugins/admin/fai/class_faiTemplate.inc:261
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/addons/mailqueue/contents.tpl:94
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/users/class_divListUsers.inc:262
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/acl/class_divListACL.inc:131
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:274
  #: plugins/admin/fai/class_faiHook.inc:298
-#: plugins/admin/fai/class_divListFai.inc:252
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/macro/class_divListMacros.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:167
-#: plugins/gofon/conference/class_divListConferences.inc:169
-#: include/class_acl.inc:371 include/class_acl.inc:416
+#: plugins/admin/fai/class_divListFai.inc:250
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/macro/class_divListMacros.inc:154
+#: plugins/gofon/conference/class_divListConferences.inc:165
+#: include/class_acl.inc:373 include/class_acl.inc:418
  msgid "delete"
  msgstr "Verwijder"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/admin/users/class_divListUsers.inc:263
  msgid "Delete user"
  msgstr "Verwijder gebruiker"
  
@@ -4894,7 +4815,7 @@ msgid "Fax number for GOfax to trigger on"
  msgstr "Fax nummer waarop GOfax moet reageren"
  
  #: plugins/gofax/faxaccount/generic.tpl:21
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
  #: plugins/admin/ogroups/phonequeue.tpl:47
  #: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
  #: html/getxls.php:281
@@ -4906,7 +4827,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
  msgstr "Specificeer de GOfax communicatie taal voor de Fax naar E-mail gateway"
  
  #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:831
  msgid "Delivery format"
  msgstr "Aflever formaat"
  
@@ -4927,12 +4848,12 @@ msgid "Deliver fax as mail to"
  msgstr "Lever Fax als E-mail af aan"
  
  #: plugins/gofax/faxaccount/generic.tpl:70
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
  msgid "Deliver fax as mail"
  msgstr "Lever Fax als E-mail af"
  
  #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:830
  msgid "Deliver fax to printer"
  msgstr "Lever Fax af op printer"
  
@@ -4999,15 +4920,15 @@ msgstr "Fax instellingen"
  msgid "FAX"
  msgstr "Fax"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
  msgid "This account has no fax extensions."
  msgstr "Dit account heeft geen Fax mogelijkheden."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
  msgid "Remove fax account"
  msgstr "Fax account verwijderen"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
  msgid ""
  "This account has fax features enabled. You can disable them by clicking "
  "below."
@@ -5015,11 +4936,11 @@ msgstr ""
  "Dit account heeft Fax mogelijkheden ingeschakeld. U kunt deze uitschakelen "
  "door de knop hieronder te gebruiken."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
  msgid "Create fax account"
  msgstr "Fax account aanmaken"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:159
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
  msgid ""
  "This account has fax features disabled. You can enable them by clicking "
  "below."
@@ -5027,39 +4948,39 @@ msgstr ""
  "Dit account heeft Fax mogelijkheden uitgeschakeld. U kunt deze inschakelen "
  "door de knop hieronder te gebruiken."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:222
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:229
  msgid "You're trying to add an invalid phone number."
  msgstr "U probeert een ongeldig telefoonnummer toe te voegen."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:512
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:438
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:519
  #: plugins/admin/groups/class_groupApplication.inc:674
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
  msgid "back"
  msgstr "terug"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:617
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
  #, fuzzy, php-format
  msgid "Removing of user/fax account with dn '%s' failed."
  msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:632
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
  msgid "The required field 'Fax' is not set."
  msgstr "Het vereiste veld 'Fax' is leeg."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
  msgid "Please enter a valid telephone number in the 'Fax' field."
  msgstr "Voer a.u.b. een geldig Fax nummer bij het 'Fax' veld in."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
  msgid "Mail delivery is checked, but no address has been specified."
  msgstr "E-mail aflevering staat aan, alleen is er geen adres opgegeven."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:646
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
  msgid "The mail address you've entered is invalid."
  msgstr "Het E-mail adres dat u opgegeven heeft is ongeldig."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
  msgid ""
  "Deliver fax to printer, is only possible if valid printer is given. Please "
  "correct your choice."
@@ -5067,31 +4988,31 @@ msgstr ""
  "Fax afleveren op een printer is alleen mogelijk indien een geldige printer "
  "is opgegeven. Corrigeer uw keuze a.u.b."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:737
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:744
  #, fuzzy, php-format
  msgid "Saving of user/fax account with dn '%s' failed."
  msgstr "Het opslaan van het algemene gerbuikers account is mislukt"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:808
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
  #, fuzzy
  msgid "Fax account settings"
  msgstr "Samba Instellingen"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
  msgid "Enable/Disable fax"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
  #, fuzzy
  msgid "Receive blocklist"
  msgstr "Toon ontvangst blokkeerlijsten"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
  #, fuzzy
  msgid "Send blocklist"
  msgstr "Toon verstuur blokkeerlijsten"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
  #, fuzzy
  msgid "Alternate fax number"
  msgstr "Alternatieve Fax nummers"
@@ -5108,7 +5029,7 @@ msgid "Filter"
  msgstr "Filter"
  
  #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:109
  #: plugins/addons/logview/contents.tpl:47
  #: plugins/addons/mailqueue/contents.tpl:11
  #: plugins/gofon/fonreports/contents.tpl:6
@@ -5147,17 +5068,17 @@ msgstr "Zoeken"
  
  #: plugins/gofax/faxreports/contents.tpl:30
  #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:842
-#: plugins/admin/ogroups/class_ogroupManagement.inc:351
+#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/ogroups/class_ogroupManagement.inc:346
  #: plugins/admin/fai/faiTemplateEntry.tpl:110
  msgid "User"
  msgstr "Gebruiker"
  
  #: plugins/gofax/faxreports/contents.tpl:31
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #: plugins/addons/logview/contents.tpl:84
  #: plugins/gofon/fonreports/contents.tpl:30
-#: plugins/gofon/fonreports/class_fonreport.inc:398
+#: plugins/gofon/fonreports/class_fonreport.inc:399
  msgid "Date"
  msgstr "Datum"
  
@@ -5198,22 +5119,22 @@ msgid "Date / Time"
  msgstr "Datum / Tijd"
  
  #: plugins/gofax/faxreports/detail.tpl:29
-#: plugins/gofax/faxreports/class_faxreport.inc:484
+#: plugins/gofax/faxreports/class_faxreport.inc:489
  msgid "Sender MSN"
  msgstr "Afzender MSN"
  
  #: plugins/gofax/faxreports/detail.tpl:33
-#: plugins/gofax/faxreports/class_faxreport.inc:483
+#: plugins/gofax/faxreports/class_faxreport.inc:488
  msgid "Sender ID"
  msgstr "Afzender ID"
  
  #: plugins/gofax/faxreports/detail.tpl:37
-#: plugins/gofax/faxreports/class_faxreport.inc:486
+#: plugins/gofax/faxreports/class_faxreport.inc:491
  msgid "Receiver MSN"
  msgstr "Ontvanger MSN"
  
  #: plugins/gofax/faxreports/detail.tpl:41
-#: plugins/gofax/faxreports/class_faxreport.inc:485
+#: plugins/gofax/faxreports/class_faxreport.inc:490
  msgid "Receiver ID"
  msgstr "Ontvanger ID"
  
@@ -5222,7 +5143,7 @@ msgid "Status message"
  msgstr "Status bericht"
  
  #: plugins/gofax/faxreports/detail.tpl:53
-#: plugins/gofax/faxreports/class_faxreport.inc:489
+#: plugins/gofax/faxreports/class_faxreport.inc:494
  msgid "Transfer time"
  msgstr "Overdrachtstijd"
  
@@ -5234,95 +5155,101 @@ msgstr "Fax rapporten"
  msgid "FAX Reports"
  msgstr "Fax rapporten"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:108
  msgid ""
  "No fax extension defined in your server configuration, no reports can be "
  "shown!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: plugins/gofax/faxreports/class_faxreport.inc:111
  #: plugins/addons/logview/class_logview.inc:75
  #: plugins/gofon/fonreports/class_fonreport.inc:163
  msgid "There is no mysql extension available, please check your php setup."
  msgstr ""
  "Er is geen MySQL extensie beschikbaar. Controleer uw PHP installatie a.u.b."
  
-#: plugins/gofax/faxreports/class_faxreport.inc:117
+#: plugins/gofax/faxreports/class_faxreport.inc:118
  msgid "Can't connect to fax database, no reports can be shown!"
  msgstr ""
  "Kan niet verbinden met de Fax database. Rapporten kunnen niet getoond worden!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:121
+#: plugins/gofax/faxreports/class_faxreport.inc:122
  msgid "Can't select fax database for report generation!"
  msgstr "Kan de Fax database voor rapportage niet selecteren!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:126
+#: plugins/gofax/faxreports/class_faxreport.inc:127
  #, fuzzy
  msgid "Can't query fax table 'faxlog' for report generation!"
  msgstr "Kan de Fax database voor rapportage niet selecteren!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:149
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:150
+#: plugins/gofax/faxreports/class_faxreport.inc:290
  msgid "Query for fax database failed!"
  msgstr "De zoekopdracht op de Fax database is mislukt!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:158
-#: plugins/gofax/faxreports/class_faxreport.inc:168
+#: plugins/gofax/faxreports/class_faxreport.inc:159
+#: plugins/gofax/faxreports/class_faxreport.inc:169
  msgid "You have no permission to retrieve informations about this fax id!"
  msgstr "U heeft geen toestemming om informatie over dit Fax ID op te vragen!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:196
-#: plugins/gofax/faxreports/class_faxreport.inc:311
-#: plugins/gofon/fonreports/class_fonreport.inc:221
+#: plugins/gofax/faxreports/class_faxreport.inc:200
+#: plugins/gofax/faxreports/class_faxreport.inc:315
+#: plugins/gofon/fonreports/class_fonreport.inc:223
  msgid "Y-M-D"
  msgstr "J-M-D"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions to view this attribute"
  msgstr ""
  "Onvoldoende permissies. Kan attribuut '%s' in goFonMacro niet veranderen."
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/admin/groups/class_groupApplication.inc:427
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions"
  msgstr "Rechten"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:469
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:473
+#: plugins/gofax/faxreports/class_faxreport.inc:474
  #, fuzzy
  msgid "Fax report"
  msgstr "Fax rapporten"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:474
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  #, fuzzy
  msgid "All entries are readonly"
  msgstr "Alle velden zijn aanpasbaar"
  
  #: plugins/gofax/faxreports/class_faxreport.inc:479
  #, fuzzy
+msgid "Fax reports"
+msgstr "Fax rapporten"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:484
+#, fuzzy
  msgid "Detailed view"
  msgstr "Geinstalleerde apparaten"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:480
+#: plugins/gofax/faxreports/class_faxreport.inc:485
  #, fuzzy
  msgid "Fax ID"
  msgstr "Fax ID"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #, fuzzy
  msgid "Time"
  msgstr "MIME"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:487
+#: plugins/gofax/faxreports/class_faxreport.inc:492
  #, fuzzy
  msgid "Number of pages"
  msgstr "Naam van de afdeling"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:488
+#: plugins/gofax/faxreports/class_faxreport.inc:493
  #, fuzzy
  msgid "Status Message"
  msgstr "Status bericht"
@@ -5352,44 +5279,44 @@ msgstr ""
  msgid "Add entry"
  msgstr "Record toevoegen"
  
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:54
  #: plugins/admin/groups/class_groupApplication.inc:756
  msgid "Edit entry"
  msgstr "Invoer bewerken"
  
-#: plugins/addons/addressbook/contents.tpl:55
+#: plugins/addons/addressbook/contents.tpl:58
  msgid "Remove entry"
  msgstr "Record verwijderen"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Select to see regular users"
  msgstr "Selecteer om gewone gebruikers te tonen"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Show organizational entries"
  msgstr "Toon gebruikers binnen de organisatie"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Select to see users in addressbook"
  msgstr "Selecteer om gebruikers in het adresboek te zien"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Show addressbook entries"
  msgstr "Toon adresboek records"
  
-#: plugins/addons/addressbook/contents.tpl:81
+#: plugins/addons/addressbook/contents.tpl:84
  msgid "Display results for department"
  msgstr "Toon resultaten voor afdeling"
  
-#: plugins/addons/addressbook/contents.tpl:94
+#: plugins/addons/addressbook/contents.tpl:97
  msgid "Match object"
  msgstr "Zoek op"
  
-#: plugins/addons/addressbook/contents.tpl:97
+#: plugins/addons/addressbook/contents.tpl:100
  msgid "Choose the object that will be searched in"
  msgstr "Selecteer het object waarbinnen gezocht zal worden"
  
-#: plugins/addons/addressbook/contents.tpl:109
+#: plugins/addons/addressbook/contents.tpl:112
  msgid "Search string"
  msgstr "Zoekstring"
  
@@ -5398,10 +5325,10 @@ msgid "Dial connection..."
  msgstr "Bel..."
  
  #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:427
-#: plugins/addons/addressbook/class_addressbook.inc:434
-#: plugins/addons/addressbook/class_addressbook.inc:438
-#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/addons/addressbook/class_addressbook.inc:429
+#: plugins/addons/addressbook/class_addressbook.inc:436
+#: plugins/addons/addressbook/class_addressbook.inc:440
+#: plugins/addons/addressbook/class_addressbook.inc:553
  msgid "Dial"
  msgstr "Kies"
  
@@ -5425,7 +5352,7 @@ msgid "Personal"
  msgstr "Persoonlijk"
  
  #: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/class_addressbook.inc:807
  #: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
  #: html/getxls.php:298
  msgid "Initials"
@@ -5455,26 +5382,26 @@ msgstr "Plaats"
  
  #: plugins/addons/addressbook/address_edit.tpl:191
  #: plugins/addons/addressbook/address_info.tpl:141
-#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_departmentGeneric.inc:585
  msgid "Country"
  msgstr "Land"
  
-#: plugins/addons/addressbook/main.inc:35
+#: plugins/addons/addressbook/main.inc:36
  msgid "Address book"
  msgstr "Adresboek"
  
  #: plugins/addons/addressbook/class_addressbook.inc:6
-#: plugins/addons/addressbook/class_addressbook.inc:781
-#: plugins/addons/addressbook/class_addressbook.inc:787
+#: plugins/addons/addressbook/class_addressbook.inc:783
+#: plugins/addons/addressbook/class_addressbook.inc:789
  msgid "Addressbook"
  msgstr "Adresboek"
  
-#: plugins/addons/addressbook/class_addressbook.inc:172
+#: plugins/addons/addressbook/class_addressbook.inc:173
  #, php-format
  msgid "Dial from %s to %s now?"
  msgstr "Nu van %s naar %s bellen?"
  
-#: plugins/addons/addressbook/class_addressbook.inc:176
+#: plugins/addons/addressbook/class_addressbook.inc:177
  msgid ""
  "You have no personal phone number set. Please change that in order to "
  "perform direct dials."
@@ -5482,50 +5409,50 @@ msgstr ""
  "U heeft geen privé telefoonnummer opgegeven. Verander dit a.u.b. om direkt "
  "te kunnen kiezen"
  
-#: plugins/addons/addressbook/class_addressbook.inc:202
-#: plugins/addons/addressbook/class_addressbook.inc:751
+#: plugins/addons/addressbook/class_addressbook.inc:203
+#: plugins/addons/addressbook/class_addressbook.inc:753
  #, fuzzy, php-format
  msgid "Removing of addressbook entry '%s' failed."
  msgstr "Het verwijderen van de adresboek invoer is mislukt"
  
-#: plugins/addons/addressbook/class_addressbook.inc:209
-#: plugins/addons/addressbook/class_addressbook.inc:318
+#: plugins/addons/addressbook/class_addressbook.inc:210
+#: plugins/addons/addressbook/class_addressbook.inc:319
  msgid "You are not allowed to delete this entry!"
  msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
  
-#: plugins/addons/addressbook/class_addressbook.inc:312
+#: plugins/addons/addressbook/class_addressbook.inc:313
  #, php-format
  msgid "You're about to delete the entry %s."
  msgstr "U staat op het punt de invoer %s te verwijderen."
  
-#: plugins/addons/addressbook/class_addressbook.inc:444
+#: plugins/addons/addressbook/class_addressbook.inc:446
  #, php-format
  msgid "Save contact for %s as vcard"
  msgstr "Sla contact voor %s op als vcard"
  
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: plugins/addons/addressbook/class_addressbook.inc:452
  #, php-format
  msgid "Send mail to %s"
  msgstr "Stuur E-mail naar %s"
  
-#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:565
  msgid "global addressbook"
  msgstr "globaal adresboek"
  
-#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/addons/addressbook/class_addressbook.inc:568
  msgid "user database"
  msgstr "gebruiker database"
  
-#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/addons/addressbook/class_addressbook.inc:572
  #, php-format
  msgid "Contact stored in '%s'"
  msgstr "Contact opgeslagen in '%s'"
  
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/addons/addressbook/class_addressbook.inc:574
  msgid "Creating new entry in"
  msgstr "Maak record aan in"
  
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/logview/class_logview.inc:112
  #: plugins/addons/logview/class_logview.inc:133
  #: plugins/addons/mailqueue/class_mailqueue.inc:306
@@ -5533,35 +5460,35 @@ msgstr "Maak record aan in"
  msgid "All"
  msgstr "Alle"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Work phone"
  msgstr "Telefoon Werk"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Cell phone"
  msgstr "GSM"
  
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:223
  msgid "Home phone"
  msgstr "Telefoon Privé"
  
-#: plugins/addons/addressbook/class_addressbook.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:704
  msgid ""
  "Cannot create a unique DN for your entry. Please fill more formular fields."
  msgstr ""
  "Kan geen unieke DN aanmaken voor uw invoer. Vul a.u.b. meer formulier velden "
  "in."
  
-#: plugins/addons/addressbook/class_addressbook.inc:782
+#: plugins/addons/addressbook/class_addressbook.inc:784
  #, fuzzy
  msgid "Addressbook entry acls"
  msgstr "Het opslaan van de adresboek invoer is mislukt"
  
-#: plugins/addons/addressbook/class_addressbook.inc:806 html/getxls.php:301
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:301
  msgid "Title"
  msgstr "Titel"
  
-#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: plugins/addons/addressbook/class_addressbook.inc:810 html/getxls.php:169
  #: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
  msgid "Common name"
  msgstr "Algemene naam"
@@ -5762,12 +5689,12 @@ msgid "CSV import"
  msgstr "CSV import"
  
  #: plugins/addons/ldapmanager/class_export.inc:77
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:91
  msgid "Error while exporting the requested entries!"
  msgstr "Fout bij het exporteren van de gevraagde gegevens!"
  
  #: plugins/addons/ldapmanager/class_export.inc:89
-#: plugins/addons/ldapmanager/class_exportxls.inc:102
+#: plugins/addons/ldapmanager/class_exportxls.inc:104
  #, fuzzy, php-format
  msgid "You are not allowed to export the given ldap entry (%s)"
  msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
@@ -5991,40 +5918,40 @@ msgstr "Fout"
  msgid "Active"
  msgstr "Actief"
  
-#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/addons/mailqueue/contents.tpl:94
  msgid "Delete this message"
  msgstr "Verwijder dit bericht"
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "unhold"
  msgstr "uit wachtstand"
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "Release message"
  msgstr "Bericht vrijgeven"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  msgid "hold"
  msgstr "wachtstand"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  #: plugins/addons/mailqueue/class_mailqueue.inc:398
  msgid "Hold message"
  msgstr "Bericht in wachtstand plaatsen"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "requeue"
  msgstr "herplaatsen"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "Requeue this message"
  msgstr "Herplaats dit bericht"
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  msgid "header"
  msgstr "header"
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  msgid "Display header from this message"
  msgstr "Toon de header van dit bericht"
  
@@ -6200,16 +6127,35 @@ msgstr "Geen DFS regels gevonden"
  msgid "Go up one dfsshare"
  msgstr "Ga een DFS share omhoog"
  
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:370
+#: include/class_MultiSelectWindow.inc:194
+#: include/class_MultiSelectWindow.inc:196
+msgid "Up"
+msgstr "Omhoog"
+
  #: plugins/addons/godfs/class_dfsManagment.inc:214
  msgid "Go to dfs root"
  msgstr "Ga naar DFS root"
  
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+#: include/class_MultiSelectWindow.inc:188
+msgid "Root"
+msgstr "Basis"
+
  #: plugins/addons/godfs/class_dfsManagment.inc:215
  msgid "Create new dfsshare"
  msgstr "Maak een nieuwe DFS share aan"
  
  #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:22
+#: ihtml/themes/default/copyPasteDialog.tpl:28
  msgid "Finish"
  msgstr "Opslaan"
  
@@ -6260,7 +6206,7 @@ msgstr "Beroep"
  
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:890 include/class_acl.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:884 include/class_acl.inc:164
  #: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
  msgid "Groups"
  msgstr "Groepen"
@@ -6277,12 +6223,12 @@ msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
  msgstr "Es is geen ACTIONCMD definitie in uw gosa.conf gedefiniëerd"
  
  #: plugins/addons/notifications/class_msgplug.inc:116
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/systems/class_terminalGeneric.inc:207
-#: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/systems/class_workstationGeneric.inc:161
-#: plugins/admin/ogroups/class_termgroup.inc:210
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_servGeneric.inc:92
+#: plugins/admin/systems/class_workstationGeneric.inc:167
+#: plugins/admin/ogroups/class_termgroup.inc:209
  #, php-format
  msgid "Execution of '%s' failed!"
  msgstr "Uitvoer van '%s' is mislukt!"
@@ -6344,19 +6290,19 @@ msgstr ""
  
  #: plugins/addons/notifications/contents.tpl:74
  #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:433
-#: plugins/admin/departments/class_departmentGeneric.inc:518
+#: plugins/admin/departments/class_departmentGeneric.inc:469
+#: plugins/admin/departments/class_departmentGeneric.inc:561
  #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/ServiceAddDialog.tpl:29
-#: plugins/admin/fai/class_faiManagement.inc:447
-#: plugins/admin/fai/class_faiManagement.inc:623
-#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/systems/ServiceAddDialog.tpl:28
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/admin/fai/class_faiManagement.inc:633
+#: plugins/admin/fai/class_faiManagement.inc:639
  #: plugins/admin/fai/faiPackageNew.tpl:50
  #: ihtml/themes/default/setup_introduction.tpl:12
  #: ihtml/themes/default/setup_useradmin.tpl:41
  #: ihtml/themes/default/setup_step2.tpl:13
  #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/default/snapshotdialog.tpl:78
+#: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Doorgaan"
  
@@ -6475,32 +6421,32 @@ msgstr ""
  msgid "This 'dn' is no group."
  msgstr "Deze 'dn' is geen groep."
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Samba group"
  msgstr "Samba groep"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain admins"
  msgstr "Windows beheerders"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain users"
  msgstr "Windows gebruikers"
  
-#: plugins/admin/groups/class_groupGeneric.inc:328
+#: plugins/admin/groups/class_groupGeneric.inc:319
  msgid "Domain guests"
  msgstr "Windows gasten"
  
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:324
  #, php-format
  msgid "Special group (%d)"
  msgstr "Speciale groep (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:446
+#: plugins/admin/groups/class_groupGeneric.inc:437
  msgid "! unknown id"
  msgstr "! onbekend id"
  
-#: plugins/admin/groups/class_groupGeneric.inc:483
+#: plugins/admin/groups/class_groupGeneric.inc:474
  #, php-format
  msgid ""
  "Your search method returned more than '%s' users, only '%s' users are shown."
@@ -6508,29 +6454,23 @@ msgstr ""
  "Uw zoekopdracht gaf meer dan '%s' gebruikers terug. Slechts '%s' gebruikers "
  "worden getoond."
  
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/admin/groups/class_groupGeneric.inc:720
+#: plugins/admin/groups/class_groupGeneric.inc:503
+#: plugins/admin/groups/class_groupGeneric.inc:718
  #, fuzzy, php-format
  msgid "Removing of groups/generic with dn '%s' failed."
  msgstr "Het verwijderen van het programma van groep '%s' is mislukt"
  
-#: plugins/admin/groups/class_groupGeneric.inc:630
+#: plugins/admin/groups/class_groupGeneric.inc:628
  #, php-format
  msgid "No configured SID found for '%s'."
  msgstr "Er kon geen geconfigureerde SID gevonden worden voor '%s'."
  
-#: plugins/admin/groups/class_groupGeneric.inc:635
+#: plugins/admin/groups/class_groupGeneric.inc:633
  #, php-format
  msgid "No configured RIDBASE found for '%s'."
  msgstr "Er kon geen geconfigureerde RIDBASE gevonden worden voor '%s'."
  
-#: plugins/admin/groups/class_groupGeneric.inc:746
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/ogroups/class_ogroup.inc:608
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "U heeft geen toestemming een groep aan te maken onder deze 'Basis'."
-
-#: plugins/admin/groups/class_groupGeneric.inc:756
+#: plugins/admin/groups/class_groupGeneric.inc:750
  msgid ""
  "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
@@ -6538,43 +6478,43 @@ msgstr ""
  "Het veld 'Naam' bevat ongeldige karakters. Kleine letters, cijfers en "
  "liggende streepjes zijn toegestaan."
  
-#: plugins/admin/groups/class_groupGeneric.inc:767
-#: plugins/admin/groups/class_groupGeneric.inc:781
-#: plugins/admin/groups/class_groupGeneric.inc:788
+#: plugins/admin/groups/class_groupGeneric.inc:761
+#: plugins/admin/groups/class_groupGeneric.inc:775
+#: plugins/admin/groups/class_groupGeneric.inc:782
  msgid "Value specified as 'Name' is already used."
  msgstr "De waarde die opgegeven is voor de naam wordt al gebruikt."
  
-#: plugins/admin/groups/class_groupGeneric.inc:885
+#: plugins/admin/groups/class_groupGeneric.inc:879
  #, fuzzy
  msgid "Generic group settings"
  msgstr "Algemene wachtrij instellingen"
  
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:891
  #, fuzzy
  msgid "Phone pickup group"
  msgstr "Leden zitten in een telefoon beantwoordgroep"
  
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, fuzzy
  msgid "Nagios group"
  msgstr "Nagios account"
  
-#: plugins/admin/groups/class_groupGeneric.inc:901
+#: plugins/admin/groups/class_groupGeneric.inc:895
  #, fuzzy
  msgid "Group member"
  msgstr "Groepsleden"
  
-#: plugins/admin/groups/class_groupGeneric.inc:902
+#: plugins/admin/groups/class_groupGeneric.inc:896
  #, fuzzy
  msgid "Samba group type"
  msgstr "Samba groep"
  
-#: plugins/admin/groups/class_groupGeneric.inc:903
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Samba home"
  
-#: plugins/admin/groups/class_groupGeneric.inc:904
+#: plugins/admin/groups/class_groupGeneric.inc:898
  #, fuzzy
  msgid "Samba SID"
  msgstr "Samba"
@@ -6599,8 +6539,8 @@ msgstr "Categorie toevoegen"
  msgid "Available applications"
  msgstr "Beschikbare programma's"
  
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:565
-#: include/class_acl.inc:656
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:597
+#: include/class_acl.inc:688
  msgid "read"
  msgstr "alleen lezen"
  
@@ -6616,8 +6556,8 @@ msgstr "alleen afleveren"
  msgid "append"
  msgstr "afleveren, lezen & kopieren"
  
-#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:566
-#: include/class_acl.inc:658
+#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:598
+#: include/class_acl.inc:690
  msgid "write"
  msgstr "afleveren, lezen & schrijven"
  
@@ -6642,49 +6582,49 @@ msgstr "U probeert een ongeldig E-mail adres toe te voegen"
  msgid "to the list of forwarders."
  msgstr "aan de lijst met doorstuur adressen."
  
-#: plugins/admin/groups/class_groupMail.inc:672
+#: plugins/admin/groups/class_groupMail.inc:679
  #, fuzzy, php-format
  msgid "Removing of groups/mail with dn '%s' failed."
  msgstr "Het verwijderen van de groeps E-mail instellingen is mislukt"
  
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/groups/class_groupMail.inc:861
  #, fuzzy, php-format
  msgid "Saving of groups/mail with dn '%s' failed."
  msgstr "Het opslaan van de groep E-mail instellingen is mislukt"
  
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/admin/groups/class_groupMail.inc:890
  msgid "Please enter a valid email addres in 'Primary address' field."
  msgstr "Geef a.u.b. een geldig email adres op in het 'Primair adres' veld."
  
-#: plugins/admin/groups/class_groupMail.inc:916
+#: plugins/admin/groups/class_groupMail.inc:923
  msgid ""
  "Please choose valid permission settings. Default permission can't be emtpy."
  msgstr ""
  "Kies a.u.b. geldige permissie instellingen. Standaard permissies kunnen niet "
  "leeg zijn."
  
-#: plugins/admin/groups/class_groupMail.inc:920
+#: plugins/admin/groups/class_groupMail.inc:927
  msgid "Please select a valid mail server."
  msgstr "Selecteer a.u.b. een geldig mailserver"
  
-#: plugins/admin/groups/class_groupMail.inc:1067
+#: plugins/admin/groups/class_groupMail.inc:1074
  #, fuzzy
  msgid "Group mail"
  msgstr "Groepnaam"
  
-#: plugins/admin/groups/class_groupMail.inc:1075
+#: plugins/admin/groups/class_groupMail.inc:1082
  #, fuzzy
  msgid "Alternate addresses"
  msgstr "Alternatieve adressen"
  
-#: plugins/admin/groups/class_groupMail.inc:1076
+#: plugins/admin/groups/class_groupMail.inc:1083
  #, fuzzy
  msgid "Forwarding addresses"
  msgstr "Primair adres"
  
-#: plugins/admin/groups/class_groupMail.inc:1079
+#: plugins/admin/groups/class_groupMail.inc:1086
  #: plugins/admin/systems/printer.tpl:82
-#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_printGeneric.inc:873
  msgid "Permissions"
  msgstr "Rechten"
  
@@ -6753,7 +6693,9 @@ msgstr ""
  "inschakelen door de knop hieronder te gebruiken."
  
  #: plugins/admin/groups/class_groupApplication.inc:426
-#: include/class_tabs.inc:303
+#: plugins/admin/acl/class_aclManagement.inc:424
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430 include/class_tabs.inc:303
  msgid "ACL"
  msgstr "Rechten"
  
@@ -6781,7 +6723,7 @@ msgid "The selected application has no options."
  msgstr "Het geselecteerde programma heeft geen opties."
  
  #: plugins/admin/groups/class_groupApplication.inc:682
-#: plugins/admin/departments/class_divListDepartment.inc:154
+#: plugins/admin/departments/class_divListDepartment.inc:147
  msgid "department"
  msgstr "afdeling"
  
@@ -6856,11 +6798,11 @@ msgid "Group applications"
  msgstr "Toon programma's"
  
  #: plugins/admin/groups/class_groupApplication.inc:1173
-#: plugins/admin/groups/class_divListGroup.inc:176
-#: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:353
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
+#: plugins/admin/groups/class_divListGroup.inc:184
+#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/ogroups/class_ogroupManagement.inc:348
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:684
  #: plugins/gofon/fonreports/contents.tpl:34
  #: plugins/generic/references/class_reference.inc:42
  msgid "Application"
@@ -6870,7 +6812,7 @@ msgstr "Programma"
  #: plugins/admin/systems/workstationStartup.tpl:53
  #: plugins/admin/systems/workstationStartup.tpl:87
  #: plugins/admin/systems/servRepositorySetup.tpl:19
-#: plugins/admin/systems/class_servRepository.inc:238
+#: plugins/admin/systems/class_servRepository.inc:252
  #: plugins/admin/fai/faiPackage.tpl:37
  #: plugins/admin/fai/class_faiPackage.inc:542
  #: plugins/admin/fai/faiPackageNew.tpl:21
@@ -6959,58 +6901,58 @@ msgstr "Toon functionele groepen"
  msgid "Create new group"
  msgstr "Nieuwe groep aanmaken"
  
-#: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:175
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  msgid "cut"
  msgstr "knippen"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  msgid "Cut this entry"
  msgstr "Deze invoer knippen"
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "copy"
  msgstr "kopieer"
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "Copy this entry"
  msgstr "Deze invoer kopieren"
  
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/conference/class_divListConferences.inc:159
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/conference/class_divListConferences.inc:155
  msgid "Edit this entry"
  msgstr "Bewerk deze invoer"
  
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/conference/class_divListConferences.inc:169
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/conference/class_divListConferences.inc:165
  msgid "Delete this entry"
  msgstr "Verwijder deze invoer"
  
@@ -7060,7 +7002,7 @@ msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
  #: plugins/admin/users/class_userManagement.inc:449
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
  #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:288
  msgid "none"
  msgstr "geen"
  
@@ -7088,8 +7030,8 @@ msgstr ""
  "gebruik van sjablonen over te slaan."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:812
-#: plugins/admin/fai/class_faiTemplate.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:997
+#: plugins/admin/fai/class_faiTemplate.inc:499
  msgid "Template"
  msgstr "Sjabloon"
  
@@ -7168,111 +7110,111 @@ msgstr "Selecteer om gebruikers te zien die Proxy instellingen hebben"
  msgid "Show proxy users"
  msgstr "Toon Proxy gebruikers"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  msgid "Create new user"
  msgstr "Maak nieuwe gebruiker aan"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  msgid "New user"
  msgstr "Nieuwe gebruiker"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "Create new template"
  msgstr "Maak nieuw sjabloon"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "New template"
  msgstr "Nieuw sjabloon"
  
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:173
  msgid "GOsa"
  msgstr "GOsa"
  
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:174
  msgid "Edit generic properties"
  msgstr "Bewerk algemene eigenschappen"
  
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:176
  msgid "Edit UNIX properties"
  msgstr "Bewerk UNIX eigenschappen"
  
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:178
  msgid "Edit environment properties"
  msgstr "Bewerk omgeving eigenschappen"
  
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:180
  msgid "Edit mail properties"
  msgstr "Bewerk E-mail eigenschappen"
  
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:182
  msgid "Edit phone properties"
  msgstr "Bewerk telefoon eigenschappen"
  
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:184
  msgid "Edit fax properies"
  msgstr "Bewerk Fax eigenschappen"
  
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:186
  msgid "Edit samba properties"
  msgstr "Bewerk Samba eigenschappen"
  
-#: plugins/admin/users/class_divListUsers.inc:200
+#: plugins/admin/users/class_divListUsers.inc:188
  msgid "Edit netatalk properties"
  msgstr "Bewerk Netatalk eigenschappen"
  
-#: plugins/admin/users/class_divListUsers.inc:201
+#: plugins/admin/users/class_divListUsers.inc:189
  msgid "Create user from template"
  msgstr "Maak gebruiker aan vanuit sjabloon"
  
-#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/users/class_divListUsers.inc:190
  msgid "Create user with this template"
  msgstr "Maak gebruiker aan met dit sjabloon"
  
-#: plugins/admin/users/class_divListUsers.inc:260
+#: plugins/admin/users/class_divListUsers.inc:248
  msgid "password"
  msgstr "wachtwoord"
  
-#: plugins/admin/users/class_divListUsers.inc:264
+#: plugins/admin/users/class_divListUsers.inc:252
  #, fuzzy
  msgid "You are not allowed to change the password for this user."
  msgstr "U heeft momenteel geen toestemming om uw wachtwoord te veranderen"
  
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:266
  #, fuzzy
  msgid "You are not allowed to remove this user."
  msgstr "U heeft geen toestemming om deze gebruiker te verwijderen!"
  
-#: plugins/admin/users/class_divListUsers.inc:297
+#: plugins/admin/users/class_divListUsers.inc:285
  msgid "Online"
  msgstr "Online"
  
-#: plugins/admin/users/class_divListUsers.inc:304
+#: plugins/admin/users/class_divListUsers.inc:292
  msgid "Offline"
  msgstr "Offline"
  
  #: plugins/admin/applications/generic.tpl:7
  #: plugins/admin/applications/generic.tpl:10
-#: plugins/admin/applications/class_applicationGeneric.inc:486
+#: plugins/admin/applications/class_applicationGeneric.inc:495
  #: plugins/admin/applications/class_divListApplication.inc:51
  msgid "Application name"
  msgstr "Programmanaam"
  
  #: plugins/admin/applications/generic.tpl:15
  #: plugins/gofon/macro/generic.tpl:14
-#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: plugins/gofon/macro/class_gofonMacro.inc:499 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Display name"
  msgstr "Getoonde naam"
  
  #: plugins/admin/applications/generic.tpl:19
-#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/applications/class_applicationGeneric.inc:500
  msgid "Application name to be displayed (i.e. below icons)"
  msgstr "Te tonen programma naam (bv. onder iconen)"
  
  #: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/applications/class_applicationGeneric.inc:526
-#: plugins/admin/systems/terminal.tpl:149 plugins/admin/systems/server.tpl:73
-#: plugins/admin/systems/workstation.tpl:124
+#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/systems/terminal.tpl:153 plugins/admin/systems/server.tpl:74
+#: plugins/admin/systems/workstation.tpl:127
  #: plugins/admin/systems/goMailServer.tpl:215
  #: plugins/admin/systems/goImapServer.tpl:110
  #: plugins/admin/ogroups/termgroup.tpl:101
@@ -7290,9 +7232,9 @@ msgid "Choose subtree to place application in"
  msgstr "Selecteer de subtree waaronder het programma geplaatst zal worden."
  
  #: plugins/admin/applications/generic.tpl:66
-#: plugins/admin/applications/class_applicationGeneric.inc:528
+#: plugins/admin/applications/class_applicationGeneric.inc:537
  #: plugins/admin/mimetypes/generic.tpl:67
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:678
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:686
  msgid "Icon"
  msgstr "Icoon"
  
@@ -7305,41 +7247,46 @@ msgstr "Bijwerken"
  msgid "Reload picture from LDAP"
  msgstr "Herlaad plaatje vanuit LDAP"
  
-#: plugins/admin/applications/generic.tpl:96
-#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/generic.tpl:81
+#, fuzzy
+msgid "Remove picture from LDAP"
+msgstr "Herlaad plaatje vanuit LDAP"
+
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/applications/class_applicationGeneric.inc:541
  msgid "Only executable for members"
  msgstr "Alleen uitvoerbaar voor groepsleden"
  
-#: plugins/admin/applications/generic.tpl:101
-#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/applications/generic.tpl:104
+#: plugins/admin/applications/class_applicationGeneric.inc:545
  msgid "Replace user configuration on startup"
  msgstr "Vervang gebruikers configuratie bij opstarten"
  
-#: plugins/admin/applications/generic.tpl:107
-#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/generic.tpl:110
+#: plugins/admin/applications/class_applicationGeneric.inc:542
  msgid "Place icon on members desktop"
  msgstr "Plaats icoon op de desktop van groepsleden"
  
-#: plugins/admin/applications/generic.tpl:112
-#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/applications/generic.tpl:115
+#: plugins/admin/applications/class_applicationGeneric.inc:544
  msgid "Place entry in members startmenu"
  msgstr "Plaats programma in het startmenu van groepsleden"
  
-#: plugins/admin/applications/generic.tpl:117
-#: plugins/admin/applications/class_applicationGeneric.inc:534
+#: plugins/admin/applications/generic.tpl:120
+#: plugins/admin/applications/class_applicationGeneric.inc:543
  msgid "Place entry in members launch bar"
  msgstr "Plaats invoer in snelstartbalk van groepsleden"
  
-#: plugins/admin/applications/generic.tpl:135
+#: plugins/admin/applications/generic.tpl:138
  #: plugins/admin/systems/printerPPDDialog.tpl:11
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
  #: plugins/admin/fai/faiTemplateEntry.tpl:49
  msgid "Upload"
  msgstr "Uploaden"
  
-#: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:297
-#: plugins/admin/fai/class_faiTemplate.inc:271
+#: plugins/admin/applications/generic.tpl:140
+#: plugins/admin/fai/class_faiScript.inc:307
+#: plugins/admin/fai/class_faiTemplate.inc:284
  #: plugins/admin/fai/class_faiScriptEntry.inc:89
  #: plugins/admin/fai/class_faiHook.inc:308
  #: plugins/admin/fai/class_faiHookEntry.inc:84
@@ -7368,7 +7315,7 @@ msgstr ""
  "knop hieronder te gebruiken."
  
  #: plugins/admin/applications/class_applicationParameters.inc:98
-#: plugins/admin/fai/class_faiVariable.inc:412
+#: plugins/admin/fai/class_faiVariable.inc:408
  msgid "Variable"
  msgstr "Variabele"
  
@@ -7426,74 +7373,69 @@ msgstr "Programma beheer"
  msgid "no example"
  msgstr "geen voorbeeld"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:132
+#: plugins/admin/applications/class_applicationGeneric.inc:126
  msgid "This 'dn' is no application."
  msgstr "Deze 'dn' is geen programma."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:228
+#: plugins/admin/applications/class_applicationGeneric.inc:227
  #, fuzzy, php-format
  msgid "Removing of application with dn '%s' failed."
  msgstr "Het verwijderen van het programma van groep '%s' is mislukt"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:240
+#: plugins/admin/applications/class_applicationGeneric.inc:239
  #, php-format
  msgid "Removing application from objectgroup '%s' failed"
  msgstr "Het verwijderen van het programma van objectgroep '%s' is mislukt"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:247
+#: plugins/admin/applications/class_applicationGeneric.inc:246
  #, php-format
  msgid "Removing application from group '%s' failed"
  msgstr "Het verwijderen van het programma van groep '%s' is mislukt"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:289
+#: plugins/admin/applications/class_applicationGeneric.inc:297
  msgid "The specified picture has not been uploaded correctly."
  msgstr "Het opgegeven plaatje is niet correct ge-upload"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:372
  msgid "Specified execute path must start with '/'."
  msgstr "Het opgegeven uitvoerpad moet met een '/' starten."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:375
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr ""
-"U heeft geen toestemming een programma aan te maken onder deze 'Basis'."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:380
+#: plugins/admin/applications/class_applicationGeneric.inc:389
  msgid "Required field 'Name' is not filled."
  msgstr "Vereiste veld 'Naam' is leeg."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:384
+#: plugins/admin/applications/class_applicationGeneric.inc:393
  msgid "Invalid character in application name. Only a-z 0-9 are allowed."
  msgstr "Ongeldig karakter in programmanaam. Alleen a-Z 0-9 zijn toegestaan."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:388
+#: plugins/admin/applications/class_applicationGeneric.inc:397
  msgid "Required field 'Execute' is not filled."
  msgstr "Vereist veld 'Uitvoeren' is leeg."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:403
-#: plugins/admin/applications/class_applicationGeneric.inc:411
+#: plugins/admin/applications/class_applicationGeneric.inc:412
+#: plugins/admin/applications/class_applicationGeneric.inc:420
  msgid "There's already an application with this 'Name'."
  msgstr "Er is al een programma met deze 'Naam'."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:457
+#: plugins/admin/applications/class_applicationGeneric.inc:466
  #, fuzzy, php-format
  msgid "Saving of application with dn '%s' failed."
  msgstr "Het opslaan van het programma is mislukt"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:482
+#: plugins/admin/applications/class_applicationGeneric.inc:491
  msgid "Application settings"
  msgstr "Programma instellingen"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:515
+#: plugins/admin/applications/class_applicationGeneric.inc:524
  #, fuzzy
  msgid "Application generic"
  msgstr "Programmanaam"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_applicationGeneric.inc:538
  msgid "Flag"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:530
+#: plugins/admin/applications/class_applicationGeneric.inc:539
  #, fuzzy
  msgid "Script content"
  msgstr "Variabele inhoud"
@@ -7526,13 +7468,13 @@ msgstr ""
  "bewerken of verwijderen. Indien u veel programma's heeft is het aan te raden "
  "de selectie mogelijkheden te gebruiken."
  
-#: plugins/admin/applications/class_divListApplication.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
  msgid "new"
  msgstr "nieuw"
  
-#: plugins/admin/applications/class_divListApplication.inc:129
+#: plugins/admin/applications/class_divListApplication.inc:131
  msgid "Create new application"
  msgstr "Nieuw programma aanmaken"
  
@@ -7548,6 +7490,20 @@ msgstr "Aftakkingen"
  msgid "Current release"
  msgstr "Huidige uitgave"
  
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested operation"
+msgstr "Bezig met verwerken van de gevraagde opdracht"
+
+#: plugins/admin/departments/dep_iframe.tpl:7
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+"Uw browser heeft geen ondersteuning voor frames. Gebruik a.u.b. deze link om "
+"de gewenste opdracht uit te voeren."
+
  #: plugins/admin/departments/generic.tpl:8
  msgid "Name of department"
  msgstr "Naam van de afdeling"
@@ -7562,7 +7518,7 @@ msgid "Descriptive text for department"
  msgstr "Omschrijving voor de afdeling"
  
  #: plugins/admin/departments/generic.tpl:24
-#: plugins/admin/departments/class_departmentGeneric.inc:546
+#: plugins/admin/departments/class_departmentGeneric.inc:590
  msgid "Category"
  msgstr "Categorie"
  
@@ -7595,12 +7551,12 @@ msgstr "Basis telefoonnummer van deze subtree"
  msgid "Base facsimile telephone number of this subtree"
  msgstr "Basis Fax nummer van deze subtree"
  
-#: plugins/admin/departments/generic.tpl:109
-#: plugins/admin/departments/class_departmentGeneric.inc:549
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/class_departmentGeneric.inc:593
  msgid "Administrative settings"
  msgstr "Administratieve instellingen"
  
-#: plugins/admin/departments/generic.tpl:111
+#: plugins/admin/departments/generic.tpl:119
  msgid "Tag department as an independent administrative unit"
  msgstr "Markeer de afdeling als een onafhankelijke administratieve eenheid"
  
@@ -7637,54 +7593,25 @@ msgstr ""
  "alvorens u doorgaat. Indien u dat gedaan heeft drukt u op 'Verwijderen' om "
  "door te gaan of op 'Annuleren' om te annuleren."
  
-#: plugins/admin/departments/dep_iframe.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
-msgid "Processing the requested operation"
-msgstr "Bezig met verwerken van de gevraagde opdracht"
-
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-"Zodra de verplaats bewerking beeindigd is, kunt u naar het einde van de "
-"pagina gaan en op de 'Doorgaan' knop drukken om door te gaan met de afdeling "
-"beheer dialoog."
+#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
+msgid "Department management"
+msgstr "Afdeling beheer"
  
-#: plugins/admin/departments/dep_iframe.tpl:8
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-"Uw browser heeft geen ondersteuning voor frames. Gebruik a.u.b. deze link om "
-"de gewenste opdracht uit te voeren."
-
-#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
-msgid "Department management"
-msgstr "Afdeling beheer"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:175
+#: plugins/admin/departments/class_departmentGeneric.inc:190
  #, fuzzy, php-format
  msgid "Removing of department with dn '%s' failed."
  msgstr "Het verwijderen van de afdeling is mislukt"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:224
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een afdeling aan te maken onder deze 'Basis'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:231
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:251
+#: plugins/admin/departments/class_departmentGeneric.inc:253
  msgid "Department with that 'Name' already exists."
  msgstr "Er bestaat al een afdeling met deze 'Naam'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:241
+#: plugins/admin/departments/class_departmentGeneric.inc:261
  msgid "Required field 'Description' is not set."
  msgstr "Vereist veld 'Omschrijving' is leeg."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:245
+#: plugins/admin/departments/class_departmentGeneric.inc:265
  #, php-format
  msgid ""
  "The field 'Name' contains the reserved word '%s'. Please choose another name."
@@ -7692,49 +7619,49 @@ msgstr ""
  "Het veld 'Naam' bevat het gereserveerde woord '%s'. Kies a.u.b. een andere "
  "naam."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:297
+#: plugins/admin/departments/class_departmentGeneric.inc:319
  msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
  msgstr ""
  "Fatale fout: Kon geen ongebruikte markering vinden om de administratieve "
  "eenheid te markeren!"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:343
+#: plugins/admin/departments/class_departmentGeneric.inc:368
  #, fuzzy, php-format
  msgid "Saving of department with dn '%s' failed."
  msgstr "Het opslaan van de afdeling is mislukt"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:385
+#: plugins/admin/departments/class_departmentGeneric.inc:421
  #, php-format
  msgid "Tagging '%s'."
  msgstr "Markeren van '%s'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:506
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr "Verplaatsen van %s naar %s"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:499
-#: include/class_ldap.inc:458 include/class_acl.inc:523
-#: include/class_acl.inc:530 include/class_acl.inc:537
-#: include/class_acl.inc:543 ihtml/themes/default/snapshotdialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:53
+#: plugins/admin/departments/class_departmentGeneric.inc:542
+#: include/class_ldap.inc:458 include/class_acl.inc:555
+#: include/class_acl.inc:562 include/class_acl.inc:569
+#: include/class_acl.inc:575 ihtml/themes/default/snapshotdialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
  msgstr "Object"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:502
+#: plugins/admin/departments/class_departmentGeneric.inc:545
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr "Kopieren van %s is mislukt. Bewerking afgebroken."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:532
-#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: plugins/admin/departments/class_departmentGeneric.inc:581
  #: plugins/admin/departments/class_departmentManagement.inc:25
  #: plugins/admin/systems/class_glpiSelectUser.inc:112
  #: plugins/admin/ogroups/class_divListOGroup.inc:58
  msgid "Departments"
  msgstr "Afdelingen"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:544
+#: plugins/admin/departments/class_departmentGeneric.inc:588
  #: plugins/admin/systems/workstationService.tpl:89
  #: plugins/admin/systems/terminalService.tpl:79
  #: plugins/gofon/phoneaccount/generic.tpl:32
@@ -7743,23 +7670,24 @@ msgstr "Afdelingen"
  msgid "Telephone"
  msgstr "Telefoon"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:545
+#: plugins/admin/departments/class_departmentGeneric.inc:589
  #: plugins/admin/departments/class_divListDepartment.inc:41
  msgid "Department name"
  msgstr "Afdelingnaam"
  
-#: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
+#: plugins/admin/departments/class_departmentManagement.inc:160
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:134
  #, php-format
  msgid "You're about to delete the whole LDAP subtree placed under '%s'."
  msgstr "U staat op het punt de hele LDAP subtree onder '%s' te verwijderen."
  
-#: plugins/admin/departments/class_departmentManagement.inc:175
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:153
+#: plugins/admin/departments/class_departmentManagement.inc:165
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:155
  msgid "You have no permission to remove this department."
  msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
  
-#: plugins/admin/departments/class_departmentManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:352
  msgid ".."
  msgstr ".."
  
@@ -7784,14 +7712,30 @@ msgid "Regular expression for matching department names"
  msgstr "Reguliere expressie voor overeenkomende afdelingen"
  
  #: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/fai/class_divListFai.inc:139
-msgid "Go to users home department"
-msgstr "Ga naar de afdeling van de gebruiker"
-
-#: plugins/admin/departments/class_divListDepartment.inc:101
  msgid "Create new department"
  msgstr "Nieuwe afdeling aanmaken"
  
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#, fuzzy
+msgid "You are currently moving/renaming this department."
+msgstr "U heeft geen toestemming om deze afdeling te verwijderen."
+
+#: plugins/admin/departments/dep_move_confirm.tpl:5
+msgid ""
+"Modifying a departments naming attribute 'ou' or base may corrupt acls and "
+"snapshot entries for all entire objects."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:8
+msgid "GOsa can NOT fix this for you, yet."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:11
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
+msgstr ""
+
  #: plugins/admin/systems/network.tpl:1
  msgid "Network\tsettings"
  msgstr "Netwerk\tinstellingen"
@@ -7813,7 +7757,7 @@ msgid "Enable DNS for this device"
  msgstr "DNS voor dit apparaat activeren"
  
  #: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/class_servDNS.inc:396
+#: plugins/admin/systems/class_servDNS.inc:398
  #: plugins/admin/systems/servdnseditzone.tpl:67
  #: plugins/admin/fai/faiPackageNew.tpl:31
  #: plugins/gofon/phoneaccount/generic.tpl:84
@@ -7826,8 +7770,8 @@ msgstr "Zone"
  
  #: plugins/admin/systems/network.tpl:77
  #: plugins/admin/systems/class_servDNS.inc:168
-#: plugins/admin/systems/class_servDNS.inc:399
-#: plugins/admin/systems/class_termDNS.inc:542
+#: plugins/admin/systems/class_servDNS.inc:401
+#: plugins/admin/systems/class_termDNS.inc:547
  #: plugins/admin/systems/servdnseditzone.tpl:85
  msgid "TTL"
  msgstr "TTL"
@@ -7842,10 +7786,10 @@ msgid "present"
  msgstr "aanwezig"
  
  #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:252
  #: plugins/admin/systems/class_terminalStartup.inc:161
-#: plugins/admin/systems/class_terminalGeneric.inc:242
-#: plugins/admin/systems/class_workstationStartup.inc:471
+#: plugins/admin/systems/class_terminalGeneric.inc:256
+#: plugins/admin/systems/class_workstationStartup.inc:498
+#: plugins/admin/systems/class_terminalService.inc:261
  msgid "This 'dn' has no terminal features."
  msgstr "Deze 'dn' heeft geen terminal mogelijkheden."
  
@@ -7882,164 +7826,6 @@ msgstr "draait niet"
  msgid "offline"
  msgstr "offline"
  
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
-msgstr "Systeem informatie"
-
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
-msgstr "Processor"
-
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
-msgstr "Geheugen"
-
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
-msgstr "Hardware Adres (MAC)"
-
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
-msgstr "USB ondersteuning"
-
-#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
-msgid "System status"
-msgstr "Systeem status"
-
-#: plugins/admin/systems/info.tpl:23
-msgid "Inventory number"
-msgstr "Inventaris nummer"
-
-#: plugins/admin/systems/info.tpl:27
-msgid "Last login"
-msgstr "Laatste aanmelding"
-
-#: plugins/admin/systems/info.tpl:38
-msgid "Network devices"
-msgstr "Netwerk apparaten"
-
-#: plugins/admin/systems/info.tpl:47
-msgid "IDE devices"
-msgstr "IDE apparaten"
-
-#: plugins/admin/systems/info.tpl:56
-msgid "SCSI devices"
-msgstr "SCSI apparaten"
-
-#: plugins/admin/systems/info.tpl:64
-msgid "Floppy device"
-msgstr "Diskdrive"
-
-#: plugins/admin/systems/info.tpl:68
-msgid "CDROM device"
-msgstr "CDROM speler"
-
-#: plugins/admin/systems/info.tpl:73
-#: plugins/admin/systems/workstationService.tpl:107
-#: plugins/admin/systems/terminalService.tpl:95
-msgid "Graphic device"
-msgstr "Grafische kaart"
-
-#: plugins/admin/systems/info.tpl:77
-msgid "Audio device"
-msgstr "Geluidskaart"
-
-#: plugins/admin/systems/info.tpl:93
-msgid "Up since"
-msgstr "Staat aan sinds"
-
-#: plugins/admin/systems/info.tpl:96
-msgid "CPU load"
-msgstr "Processor belasting"
-
-#: plugins/admin/systems/info.tpl:99
-msgid "Memory usage"
-msgstr "Geheugen gebruik"
-
-#: plugins/admin/systems/info.tpl:102
-msgid "Swap usage"
-msgstr "Swap gebruik"
-
-#: plugins/admin/systems/info.tpl:116
-msgid "SSH service"
-msgstr "SSH service"
-
-#: plugins/admin/systems/info.tpl:119
-#: plugins/admin/systems/class_goCupsServer.inc:28
-#: plugins/admin/systems/class_goCupsServer.inc:43
-#: plugins/admin/systems/class_goCupsServer.inc:64
-msgid "Print service"
-msgstr "Print service"
-
-#: plugins/admin/systems/info.tpl:122
-msgid "Scan service"
-msgstr "Scan service"
-
-#: plugins/admin/systems/info.tpl:125
-msgid "Sound service"
-msgstr "Audio service"
-
-#: plugins/admin/systems/info.tpl:128
-msgid "GUI"
-msgstr "GUI"
-
-#: plugins/admin/systems/class_winGeneric.inc:87
-#: plugins/admin/systems/class_componentGeneric.inc:50
-msgid "This 'dn' has no network features."
-msgstr "Deze 'dn' heeft geen netwerk mogelijkheden."
-
-#: plugins/admin/systems/class_winGeneric.inc:139
-#, php-format
-msgid "Removing of system wingeneric/generic with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_componentGeneric.inc:179
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een component aan te maken onder deze 'Basis'."
-
-#: plugins/admin/systems/class_winGeneric.inc:184
-#: plugins/admin/systems/class_terminalGeneric.inc:400
-#: plugins/admin/systems/class_servGeneric.inc:261
-#: plugins/admin/systems/class_workstationGeneric.inc:400
-#: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/systems/class_componentGeneric.inc:189
-#: plugins/admin/systems/class_phoneGeneric.inc:333
-#, 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"
-
-#: plugins/admin/systems/class_winGeneric.inc:239
-#, php-format
-msgid "Saving of system wingeneric/generic with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_winGeneric.inc:250
-#, fuzzy
-msgid "Win generic"
-msgstr "Print Service"
-
-#: plugins/admin/systems/class_winGeneric.inc:251
-#, fuzzy
-msgid "Windows workstation generic"
-msgstr "Werkstation naam"
-
-#: plugins/admin/systems/class_winGeneric.inc:256
-#, fuzzy
-msgid "Win workstation"
-msgstr "Windows werkstation"
-
-#: plugins/admin/systems/class_winGeneric.inc:259
-#: plugins/admin/systems/workstation.tpl:10
-#: plugins/admin/systems/class_workstationGeneric.inc:513
-msgid "Workstation name"
-msgstr "Werkstation naam"
-
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Systeembeheer"
-
  #: plugins/admin/systems/terminal.tpl:8
  msgid "Terminal template"
  msgstr "Terminal sjabloon"
@@ -8050,10 +7836,10 @@ msgstr "Terminal naam"
  
  #: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
  #: plugins/admin/systems/workstation.tpl:44
-#: plugins/admin/systems/class_terminalGeneric.inc:508
+#: plugins/admin/systems/class_terminalGeneric.inc:548
  #: plugins/admin/systems/phonesettings.tpl:25
  #: plugins/admin/ogroups/termgroup.tpl:47
-#: plugins/admin/ogroups/class_termgroup.inc:391
+#: plugins/admin/ogroups/class_termgroup.inc:390
  msgid "Mode"
  msgstr "Modus"
  
@@ -8065,9 +7851,9 @@ msgstr "Selecteer terminal modus"
  
  #: plugins/admin/systems/terminal.tpl:47
  #: plugins/admin/systems/workstation.tpl:54
-#: plugins/admin/systems/class_workstationGeneric.inc:517
+#: plugins/admin/systems/class_workstationGeneric.inc:539
  #: plugins/admin/ogroups/termgroup.tpl:58
-#: plugins/admin/ogroups/class_termgroup.inc:392
+#: plugins/admin/ogroups/class_termgroup.inc:391
  msgid "Syslog server"
  msgstr "Syslog server"
  
@@ -8078,7 +7864,7 @@ msgid "Choose server to use for logging"
  msgstr "Selecteer de server die gebruikt wordt voor log doeleinden"
  
  #: plugins/admin/systems/terminal.tpl:66
-#: plugins/admin/systems/class_terminalGeneric.inc:509
+#: plugins/admin/systems/class_terminalGeneric.inc:549
  msgid "Root server"
  msgstr "Root server"
  
@@ -8087,7 +7873,7 @@ msgid "Select NFS root filesystem to use"
  msgstr "Selecteer het te gebruiken NFS root bestandssysteem"
  
  #: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/class_terminalGeneric.inc:510
+#: plugins/admin/systems/class_terminalGeneric.inc:550
  msgid "Swap server"
  msgstr "Swap server"
  
@@ -8112,267 +7898,225 @@ msgstr "NTP tijdserver"
  msgid "Choose server to use for synchronizing time"
  msgstr "Selecteer de server die gebruikt wordt voor tijdsynchronisatie"
  
-#: plugins/admin/systems/terminal.tpl:136 plugins/admin/systems/server.tpl:61
-#: plugins/admin/systems/workstation.tpl:112
+#: plugins/admin/systems/terminal.tpl:140 plugins/admin/systems/server.tpl:62
+#: plugins/admin/systems/workstation.tpl:115
  #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
  #: plugins/admin/systems/class_baseSelectDialog.inc:47
  #: plugins/admin/ogroups/termgroup.tpl:88
  msgid "Action"
  msgstr "Actie"
  
-#: plugins/admin/systems/terminal.tpl:141
-#: plugins/admin/systems/workstation.tpl:117
+#: plugins/admin/systems/terminal.tpl:145
+#: plugins/admin/systems/workstation.tpl:120
  #: plugins/admin/ogroups/termgroup.tpl:93
  msgid "Select action to execute for this terminal"
  msgstr "Selecteer de voor deze terminal uit te voeren actie"
  
-#: plugins/admin/systems/class_terminalService.inc:69
-#: plugins/admin/systems/class_workstationService.inc:92
-#: plugins/admin/systems/workstationService.tpl:157
-msgid "unknown"
-msgstr "onbekend"
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
+msgstr "Systeem informatie"
  
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
-#: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:214
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
-#: plugins/admin/systems/class_terminalStartup.inc:39
-#: plugins/admin/systems/class_terminalStartup.inc:121
-#: plugins/admin/systems/class_terminalStartup.inc:141
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_terminalGeneric.inc:298
-#: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_workstationStartup.inc:268
-#: plugins/admin/systems/class_workstationStartup.inc:285
-#: plugins/admin/systems/class_workstationStartup.inc:289
-#: plugins/admin/systems/class_workstationStartup.inc:790
-#: plugins/admin/systems/class_workstationService.inc:201
-#: plugins/admin/systems/class_workstationService.inc:204
-#: plugins/admin/systems/class_workstationService.inc:207
-#: plugins/admin/systems/class_workstationService.inc:210
-#: plugins/admin/systems/class_workstationService.inc:213
-#: plugins/admin/systems/class_workstationService.inc:216
-#: plugins/admin/systems/class_workstationService.inc:219
-#: plugins/admin/systems/class_workstationService.inc:229
-#: plugins/admin/systems/class_workstationService.inc:230
-#: plugins/admin/systems/class_workstationService.inc:231
-#: plugins/admin/systems/class_workstationService.inc:232
-#: plugins/admin/systems/class_workstationService.inc:233
-#: plugins/admin/systems/class_workstationService.inc:234
-#: plugins/admin/systems/class_workstationService.inc:235
-msgid "inherited"
-msgstr "overerfd"
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
+msgstr "Processor"
  
-#: plugins/admin/systems/class_terminalService.inc:101
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:95
-#: plugins/admin/systems/class_workstationService.inc:96
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "bit"
-msgstr "bit"
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
+msgstr "Geheugen"
  
-#: plugins/admin/systems/class_terminalService.inc:155
-msgid "default"
-msgstr "standaard"
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
+msgstr "Hardware Adres (MAC)"
  
-#: plugins/admin/systems/class_terminalService.inc:156
-#: plugins/admin/systems/class_workstationService.inc:138
-msgid "show chooser"
-msgstr "toon keuze-mogelijkheid"
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
+msgstr "USB ondersteuning"
  
-#: plugins/admin/systems/class_terminalService.inc:157
-#: plugins/admin/systems/class_workstationService.inc:139
-msgid "direct"
-msgstr "direkt"
+#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
+msgid "System status"
+msgstr "Systeem status"
  
-#: plugins/admin/systems/class_terminalService.inc:160
-#: plugins/admin/systems/class_workstationService.inc:142
-msgid "load balanced"
-msgstr "load balanced"
+#: plugins/admin/systems/info.tpl:23
+msgid "Inventory number"
+msgstr "Inventaris nummer"
  
-#: plugins/admin/systems/class_terminalService.inc:163
-#: plugins/admin/systems/class_workstationService.inc:145
-msgid "Windows RDP"
-msgstr "Windows RDP"
+#: plugins/admin/systems/info.tpl:27
+msgid "Last login"
+msgstr "Laatste aanmelding"
  
-#: plugins/admin/systems/class_terminalService.inc:164
-#: plugins/admin/systems/class_workstationService.inc:146
-msgid "ICA client"
-msgstr "ICA client"
+#: plugins/admin/systems/info.tpl:38
+msgid "Network devices"
+msgstr "Netwerk apparaten"
  
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_workstationService.inc:204
-msgid "Bit"
-msgstr "Bit"
+#: plugins/admin/systems/info.tpl:47
+msgid "IDE devices"
+msgstr "IDE apparaten"
  
-#: plugins/admin/systems/class_terminalService.inc:307
-#: plugins/admin/systems/class_workstationService.inc:314
-msgid "Choose the phone located at the current terminal"
-msgstr "Selecteer de telefoon die zich bij de huidige terminal bevindt."
+#: plugins/admin/systems/info.tpl:56
+msgid "SCSI devices"
+msgstr "SCSI apparaten"
  
-#: plugins/admin/systems/class_terminalService.inc:370
-#: plugins/admin/systems/class_terminalService.inc:375
-#: plugins/admin/systems/class_workstationService.inc:380
-#: plugins/admin/systems/class_workstationService.inc:385
-msgid "Please specify a valid VSync range."
-msgstr "Geef a.u.b. een geldig VSync bereik op."
+#: plugins/admin/systems/info.tpl:64
+msgid "Floppy device"
+msgstr "Diskdrive"
  
-#: plugins/admin/systems/class_terminalService.inc:385
-#: plugins/admin/systems/class_terminalService.inc:390
-#: plugins/admin/systems/class_workstationService.inc:395
-#: plugins/admin/systems/class_workstationService.inc:400
-msgid "Please specify a valid HSync range."
-msgstr "Geef a.u.b. een geldig HSync bereik op."
+#: plugins/admin/systems/info.tpl:68
+msgid "CDROM device"
+msgstr "CDROM speler"
  
-#: plugins/admin/systems/class_terminalService.inc:421
-#, fuzzy, php-format
-msgid "Saving of object system terminal/service with dn '%s' failed."
-msgstr "Het opslaan van terminal service informatie is mislukt"
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/workstationService.tpl:107
+#: plugins/admin/systems/terminalService.tpl:95
+msgid "Graphic device"
+msgstr "Grafische kaart"
  
-#: plugins/admin/systems/class_terminalService.inc:430
-#: plugins/admin/systems/class_workstationService.inc:451
-#, fuzzy
-msgid "Service"
-msgstr "Services"
+#: plugins/admin/systems/info.tpl:77
+msgid "Audio device"
+msgstr "Geluidskaart"
  
-#: plugins/admin/systems/class_terminalService.inc:431
-#: plugins/admin/systems/class_goTerminalServer.inc:31
-#: plugins/admin/systems/class_goTerminalServer.inc:54
-#: plugins/admin/systems/class_goTerminalServer.inc:117
-#: plugins/admin/systems/class_goTerminalServer.inc:118
-#: plugins/admin/systems/goTerminalServer.tpl:1
-#, fuzzy
-msgid "Terminal service"
-msgstr "Terminal Service"
+#: plugins/admin/systems/info.tpl:93
+msgid "Up since"
+msgstr "Staat aan sinds"
  
-#: plugins/admin/systems/class_terminalService.inc:439
-#: plugins/admin/systems/class_workstationService.inc:460
-#, fuzzy
-msgid "Monitor"
-msgstr "Monitor grootte"
+#: plugins/admin/systems/info.tpl:96
+msgid "CPU load"
+msgstr "Processor belasting"
  
-#: plugins/admin/systems/class_terminalService.inc:440
-#: plugins/admin/ogroups/class_phonequeue.inc:748
-#, fuzzy
-msgid "Method"
-msgstr "methode"
+#: plugins/admin/systems/info.tpl:99
+msgid "Memory usage"
+msgstr "Geheugen gebruik"
  
-#: plugins/admin/systems/class_terminalService.inc:441
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Remote desktop"
-msgstr "Remote desktop"
+#: plugins/admin/systems/info.tpl:102
+msgid "Swap usage"
+msgstr "Swap gebruik"
  
-#: plugins/admin/systems/class_terminalService.inc:442
-#: plugins/admin/systems/class_goTerminalServer.inc:127
-#: plugins/admin/systems/goTerminalServer.tpl:12
-msgid "Font path"
-msgstr "Fontpad"
+#: plugins/admin/systems/info.tpl:116
+msgid "SSH service"
+msgstr "SSH service"
  
-#: plugins/admin/systems/class_terminalService.inc:443
-#: plugins/admin/systems/class_workstationService.inc:461
-#, fuzzy
-msgid "Gfx driver"
-msgstr "Nieuw stuurprogramma"
+#: plugins/admin/systems/info.tpl:119
+#: plugins/admin/systems/class_goCupsServer.inc:28
+#: plugins/admin/systems/class_goCupsServer.inc:43
+#: plugins/admin/systems/class_goCupsServer.inc:64
+msgid "Print service"
+msgstr "Print service"
  
-#: plugins/admin/systems/class_terminalService.inc:444
-#: plugins/admin/systems/class_workstationService.inc:462
-#, fuzzy
-msgid "Gfx resolution"
-msgstr "Resolutie"
+#: plugins/admin/systems/info.tpl:122
+msgid "Scan service"
+msgstr "Scan service"
  
-#: plugins/admin/systems/class_terminalService.inc:445
-#: plugins/admin/systems/class_workstationService.inc:463
-#, fuzzy
-msgid "Gfx color depth"
-msgstr "Kleurdiepte"
+#: plugins/admin/systems/info.tpl:125
+msgid "Sound service"
+msgstr "Audio service"
  
-#: plugins/admin/systems/class_terminalService.inc:446
-#: plugins/admin/systems/class_workstationService.inc:464
-#, fuzzy
-msgid "Hsync"
-msgstr "HSync"
+#: plugins/admin/systems/info.tpl:128
+msgid "GUI"
+msgstr "GUI"
  
-#: plugins/admin/systems/class_terminalService.inc:447
-#: plugins/admin/systems/class_workstationService.inc:465
-#, fuzzy
-msgid "Vsync"
-msgstr "VSync"
+#: plugins/admin/systems/class_winGeneric.inc:87
+#: plugins/admin/systems/class_componentGeneric.inc:50
+msgid "This 'dn' has no network features."
+msgstr "Deze 'dn' heeft geen netwerk mogelijkheden."
  
-#: plugins/admin/systems/class_terminalService.inc:448
-#, fuzzy
-msgid "Printer service enabled"
-msgstr "Print service"
+#: plugins/admin/systems/class_winGeneric.inc:145
+#, php-format
+msgid "Removing of system wingeneric/generic with dn '%s' failed."
+msgstr ""
  
-#: plugins/admin/systems/class_terminalService.inc:449
-#: plugins/admin/systems/terminalService.tpl:221
-msgid "Spool server"
-msgstr "Spool server"
+#: plugins/admin/systems/class_winGeneric.inc:195
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr ""
+"U heeft geen toestemming om een component aan te maken onder deze 'Basis'."
  
-#: plugins/admin/systems/class_terminalService.inc:450
-#: plugins/admin/systems/class_workstationService.inc:467
-#, fuzzy
-msgid "Scanner enabled"
-msgstr "gedeactiveerd"
+#: plugins/admin/systems/class_winGeneric.inc:205
+#: plugins/admin/systems/class_terminalGeneric.inc:434
+#: plugins/admin/systems/class_servGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:414
+#: plugins/admin/systems/class_printGeneric.inc:673
+#: plugins/admin/systems/class_componentGeneric.inc:191
+#: plugins/admin/systems/class_phoneGeneric.inc:338
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "Er is al een invoer '%s' onder de basis die u gekozen heeft"
  
-#: plugins/admin/systems/class_terminalService.inc:451
-#, fuzzy
-msgid "Scanner model"
-msgstr "gedeactiveerd"
+#: plugins/admin/systems/class_winGeneric.inc:260
+#, php-format
+msgid "Saving of system wingeneric/generic with dn '%s' failed."
+msgstr ""
  
-#: plugins/admin/systems/class_terminalService.inc:454
-#: plugins/admin/systems/class_workstationService.inc:468
+#: plugins/admin/systems/class_winGeneric.inc:271
  #, fuzzy
-msgid "Keyboard model"
-msgstr "Kies toetsenbord model"
+msgid "Win generic"
+msgstr "Print Service"
  
-#: plugins/admin/systems/class_terminalService.inc:455
-#: plugins/admin/systems/class_workstationService.inc:469
+#: plugins/admin/systems/class_winGeneric.inc:272
  #, fuzzy
-msgid "Keyboard layout"
-msgstr "Kies toetsenbord indeling"
+msgid "Windows workstation generic"
+msgstr "Werkstation naam"
  
-#: plugins/admin/systems/class_terminalService.inc:456
-#: plugins/admin/systems/class_workstationService.inc:470
+#: plugins/admin/systems/class_winGeneric.inc:277
  #, fuzzy
-msgid "Keyboard variant"
-msgstr "Kies toetsenbord variant"
+msgid "Win workstation"
+msgstr "Windows werkstation"
  
-#: plugins/admin/systems/class_terminalService.inc:457
-#: plugins/admin/systems/class_workstationService.inc:471
-#, fuzzy
-msgid "Mouse type"
-msgstr "MIME-type"
+#: plugins/admin/systems/class_winGeneric.inc:280
+#: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:535
+msgid "Workstation name"
+msgstr "Werkstation naam"
  
-#: plugins/admin/systems/class_terminalService.inc:458
-#: plugins/admin/systems/class_workstationService.inc:472
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Systeembeheer"
+
+#: plugins/admin/systems/goNtpServer.tpl:2
  #, fuzzy
-msgid "Mouse port"
-msgstr "Koppelpunt"
+msgid "Time server"
+msgstr "Tijd Service"
  
-#: plugins/admin/systems/class_terminalService.inc:459
-#: plugins/admin/systems/class_workstationService.inc:473
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:76
-#: plugins/gofon/phoneaccount/generic.tpl:30
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Telefoon hardware"
+#: plugins/admin/systems/class_terminalStartup.inc:39
+#: plugins/admin/systems/class_terminalStartup.inc:121
+#: plugins/admin/systems/class_terminalStartup.inc:141
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:312
+#: plugins/admin/systems/class_workstationStartup.inc:316
+#: plugins/admin/systems/class_workstationStartup.inc:824
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_workstationService.inc:207
+#: plugins/admin/systems/class_workstationService.inc:210
+#: plugins/admin/systems/class_workstationService.inc:213
+#: plugins/admin/systems/class_workstationService.inc:216
+#: plugins/admin/systems/class_workstationService.inc:219
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_terminalService.inc:74
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:108
+#: plugins/admin/systems/class_terminalService.inc:118
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:121
+#: plugins/admin/systems/class_terminalService.inc:125
+#: plugins/admin/systems/class_terminalService.inc:218
+#: plugins/admin/systems/class_terminalService.inc:221
+#: plugins/admin/systems/class_terminalService.inc:224
+#: plugins/admin/systems/class_terminalService.inc:227
+#: plugins/admin/systems/class_terminalService.inc:230
+#: plugins/admin/systems/class_terminalService.inc:233
+#: plugins/admin/systems/class_terminalService.inc:236
+msgid "inherited"
+msgstr "overerfd"
  
  #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:310
+#: plugins/admin/systems/class_workstationStartup.inc:337
  #, php-format
  msgid ""
  "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -8392,26 +8136,26 @@ msgid "Terminal startup"
  msgstr "Terminal sjabloon"
  
  #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1163
  #, fuzzy
  msgid "Ldap server"
  msgstr "Ldap server"
  
  #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1122
+#: plugins/admin/systems/class_workstationStartup.inc:1167
  #, fuzzy
  msgid "Kernel modules"
  msgstr "Controleer parameter"
  
  #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1119
+#: plugins/admin/systems/class_workstationStartup.inc:1164
  #: plugins/admin/systems/workstationStartup.tpl:8
  #: plugins/admin/systems/terminalStartup.tpl:8
  msgid "Boot kernel"
  msgstr "Boot kernel"
  
  #: plugins/admin/systems/class_terminalStartup.inc:455
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1165
  #, fuzzy
  msgid "Kernel parameter"
  msgstr "Controleer parameter"
@@ -8420,7 +8164,7 @@ msgstr "Controleer parameter"
  msgid "Server name"
  msgstr "Servernaam"
  
-#: plugins/admin/systems/server.tpl:66
+#: plugins/admin/systems/server.tpl:67
  msgid "Select action to execute for this server"
  msgstr "Selecteer de voor deze server uit te voeren actie"
  
@@ -8507,7 +8251,7 @@ msgid "Supported interfaces"
  msgstr "Ondersteunde interfaces"
  
  #: plugins/admin/systems/glpiPrinter.tpl:48
-#: plugins/admin/systems/class_servDNS.inc:395
+#: plugins/admin/systems/class_servDNS.inc:397
  msgid "Serial"
  msgstr "Serieel"
  
@@ -8547,88 +8291,82 @@ msgstr "Bijlagen"
  msgid "Installed cartridges"
  msgstr "Geinstalleerde cartridges"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:98
+#: plugins/admin/systems/class_terminalGeneric.inc:105
  msgid "text"
  msgstr "tekst"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:106
  msgid "graphic"
  msgstr "grafisch"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:173
+#: plugins/admin/systems/class_terminalGeneric.inc:181
  #, php-format
  msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:179
+#: plugins/admin/systems/class_terminalGeneric.inc:188
  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:191
+#: plugins/admin/systems/class_terminalGeneric.inc:200
  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:203
+#: plugins/admin/systems/class_terminalGeneric.inc:212
  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:280
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:294
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Switch off"
  msgstr "Uitschakelen"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:281
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:295
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Reboot"
  msgstr "Herstarten"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:282
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_servGeneric.inc:186
-#: plugins/admin/systems/class_workstationGeneric.inc:282
-#: plugins/admin/systems/class_workstationGeneric.inc:288
-#: plugins/admin/ogroups/class_termgroup.inc:301
+#: plugins/admin/systems/class_terminalGeneric.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:190
+#: plugins/admin/systems/class_servGeneric.inc:196
+#: plugins/admin/systems/class_workstationGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:295
+#: plugins/admin/ogroups/class_termgroup.inc:300
  msgid "Memory test"
  msgstr "Geheugentest"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:283
-#: plugins/admin/systems/class_terminalGeneric.inc:287
-#: plugins/admin/systems/class_servGeneric.inc:181
-#: plugins/admin/systems/class_servGeneric.inc:187
-#: plugins/admin/systems/class_workstationGeneric.inc:283
-#: plugins/admin/systems/class_workstationGeneric.inc:289
-#: plugins/admin/ogroups/class_termgroup.inc:302
+#: plugins/admin/systems/class_terminalGeneric.inc:297
+#: plugins/admin/systems/class_terminalGeneric.inc:301
+#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_servGeneric.inc:197
+#: plugins/admin/systems/class_workstationGeneric.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:296
+#: plugins/admin/ogroups/class_termgroup.inc:301
  msgid "System analysis"
  msgstr "Systeem analyse"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:285
-#: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/systems/class_terminalGeneric.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_workstationGeneric.inc:292
  msgid "Wake up"
  msgstr "Aanzetten"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:333
+#: plugins/admin/systems/class_terminalGeneric.inc:348
  #, php-format
  msgid "Removing of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:383
-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:387
+#: plugins/admin/systems/class_terminalGeneric.inc:415
  msgid "The required field 'Terminal name' is not set."
  msgstr "Het vereiste veld 'Terminal naam' is leeg."
  
-#: plugins/admin/systems/class_terminalGeneric.inc:410
-#: plugins/admin/systems/class_workstationGeneric.inc:410
+#: plugins/admin/systems/class_terminalGeneric.inc:444
+#: plugins/admin/systems/class_workstationGeneric.inc:424
  msgid ""
  "There must be at least one NTP server selected, or the inherit mode "
  "activated."
@@ -8636,117 +8374,118 @@ msgstr ""
  "Er moet tenminste een NTP server geselecteerd zijn of de overervings mode "
  "moet geactiveerd zijn."
  
-#: plugins/admin/systems/class_terminalGeneric.inc:488
+#: plugins/admin/systems/class_terminalGeneric.inc:528
  #, php-format
  msgid "Saving of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:499
-#: plugins/admin/systems/class_terminalGeneric.inc:505
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: plugins/admin/systems/class_terminalGeneric.inc:539
+#: plugins/admin/systems/class_terminalGeneric.inc:545
+#: plugins/admin/systems/class_systemManagement.inc:998
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/admin/ogroups/class_ogroupManagement.inc:353
  msgid "Terminal"
  msgstr "Terminal"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:500
+#: plugins/admin/systems/class_terminalGeneric.inc:540
  #, fuzzy
  msgid "Terminal generic"
  msgstr "Terminal Service"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: plugins/admin/systems/class_terminalGeneric.inc:551
  #, fuzzy
  msgid "Syslog server enabled"
  msgstr "Syslog server"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: plugins/admin/systems/class_terminalGeneric.inc:552
  #, fuzzy
  msgid "Ntp server settings"
  msgstr "Gebruikersinstellingen"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:515
-#: plugins/admin/systems/class_servGeneric.inc:347
-#: plugins/admin/systems/class_workstationGeneric.inc:519
-#: plugins/admin/ogroups/class_termgroup.inc:393
+#: plugins/admin/systems/class_terminalGeneric.inc:555
+#: plugins/admin/systems/class_workstationGeneric.inc:541
+#, fuzzy
+msgid "Root password"
+msgstr "Wachtwoord instellen"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:556
+#: plugins/admin/systems/class_servGeneric.inc:360
+#: plugins/admin/systems/class_workstationGeneric.inc:542
+#: plugins/admin/ogroups/class_termgroup.inc:392
  #, fuzzy
  msgid "Action flag"
  msgstr "Actie"
  
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:41
+#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/ogroups/class_termgroup.inc:40
  msgid "Activated"
  msgstr "Geactiveerd"
  
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_servGeneric.inc:79
  msgid "This 'dn' has no server features."
  msgstr "Deze 'dn' heeft geen server mogelijkheden."
  
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#: plugins/admin/ogroups/class_termgroup.inc:206
+#: plugins/admin/systems/class_servGeneric.inc:87
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/ogroups/class_termgroup.inc:205
  msgid "No ACTIONCMD definition found in your gosa.conf"
  msgstr "Es is geen ACTIONCMD definitie in uw gosa.conf gedefiniëerd"
  
-#: plugins/admin/systems/class_servGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:125
  #, php-format
  msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:176
-#: plugins/admin/systems/class_workstationGeneric.inc:278
-#: plugins/admin/ogroups/class_termgroup.inc:297
+#: plugins/admin/systems/class_servGeneric.inc:186
+#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/ogroups/class_termgroup.inc:296
  msgid "Instant update"
  msgstr "Onmiddelijk bijwerken"
  
-#: plugins/admin/systems/class_servGeneric.inc:177
-#: plugins/admin/systems/class_servGeneric.inc:185
-#: plugins/admin/systems/class_workstationGeneric.inc:279
-#: plugins/admin/systems/class_workstationGeneric.inc:287
-#: plugins/admin/ogroups/class_termgroup.inc:298
+#: plugins/admin/systems/class_servGeneric.inc:187
+#: plugins/admin/systems/class_servGeneric.inc:195
+#: plugins/admin/systems/class_workstationGeneric.inc:286
+#: plugins/admin/systems/class_workstationGeneric.inc:294
+#: plugins/admin/ogroups/class_termgroup.inc:297
  msgid "Scheduled update"
  msgstr "Geplande bijwerking"
  
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_servGeneric.inc:184
-#: plugins/admin/systems/class_workstationGeneric.inc:280
-#: plugins/admin/systems/class_workstationGeneric.inc:286
-#: plugins/admin/ogroups/class_termgroup.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:188
+#: plugins/admin/systems/class_servGeneric.inc:194
+#: plugins/admin/systems/class_workstationGeneric.inc:287
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/ogroups/class_termgroup.inc:298
  msgid "Reinstall"
  msgstr "Herinstalleer"
  
-#: plugins/admin/systems/class_servGeneric.inc:179
-#: plugins/admin/systems/class_workstationGeneric.inc:281
-#: plugins/admin/ogroups/class_termgroup.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:189
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:299
  msgid "Rescan hardware"
  msgstr "Hardware opnieuw scannen"
  
-#: plugins/admin/systems/class_servGeneric.inc:207
+#: plugins/admin/systems/class_servGeneric.inc:218
  #, fuzzy, php-format
  msgid "Removing of system server/generic with dn '%s' failed."
  msgstr "Het verwijder van telefoonmacro referenties is mislukt"
  
-#: plugins/admin/systems/class_servGeneric.inc:245
+#: plugins/admin/systems/class_servGeneric.inc:263
  msgid "The required field 'Server name' is not set."
  msgstr "Het vereiste veld 'Servernaam' is leeg."
  
-#: plugins/admin/systems/class_servGeneric.inc:250
-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'."
-
-#: plugins/admin/systems/class_servGeneric.inc:319
+#: plugins/admin/systems/class_servGeneric.inc:332
  #, php-format
  msgid "Saving of system server/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:335
+#: plugins/admin/systems/class_servGeneric.inc:348
  #, fuzzy
  msgid "Server generic"
  msgstr "Servernaam"
  
-#: plugins/admin/systems/class_servGeneric.inc:345
-#: plugins/admin/systems/class_workstationGeneric.inc:516
+#: plugins/admin/systems/class_servGeneric.inc:358
+#: plugins/admin/systems/class_workstationGeneric.inc:538
  #, fuzzy
  msgid "Goto mode"
  msgstr "naar map"
@@ -8775,52 +8514,46 @@ msgstr ""
  "Deze server heeft DHCP mogelijkheden uitgeschakeld. U kunt deze inschakelen "
  "door de knop hieronder te gebruiken."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:191
-#: plugins/admin/ogroups/class_termgroup.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:198
+#: plugins/admin/ogroups/class_termgroup.inc:248
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
  msgstr "Het opslaan van de werkstation opstart instellingen is mislukt"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:209
  msgid "This 'dn' has no workstation features."
  msgstr "Deze 'dn' heeft geen werkstation mogelijkheden."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:324
+#: plugins/admin/systems/class_workstationGeneric.inc:332
  #, fuzzy, php-format
  msgid "Removing of system workstation/generic with dn '%s' failed."
  msgstr "Het verwijderen van het Samba werkstation is mislukt"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/ogroups/class_termgroup.inc:109
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een werkstation aan te maken onder deze 'basis'"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:387
+#: plugins/admin/systems/class_workstationGeneric.inc:396
  msgid "The required field 'Workstation name' is not set."
  msgstr "Het vereiste veld 'Werkstation naam' is leeg."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:477
-#: plugins/admin/systems/class_workstationGeneric.inc:495
+#: plugins/admin/systems/class_workstationGeneric.inc:491
+#: plugins/admin/systems/class_workstationGeneric.inc:517
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic with dn '%s' failed."
  msgstr "Het opslaan van werkstations services is mislukt"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:505
+#: plugins/admin/systems/class_workstationGeneric.inc:527
  #, fuzzy
  msgid "Workstation generic"
  msgstr "Werkstation naam"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:814
+#: plugins/admin/systems/class_workstationGeneric.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:999
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/admin/ogroups/class_ogroupManagement.inc:352
  #: plugins/generic/references/class_reference.inc:48
  msgid "Workstation"
  msgstr "Werkstation"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:518
-#: plugins/admin/ogroups/class_termgroup.inc:394
+#: plugins/admin/systems/class_workstationGeneric.inc:540
+#: plugins/admin/ogroups/class_termgroup.inc:393
  #, fuzzy
  msgid "Ntp server"
  msgstr "NTP tijdserver"
@@ -8829,98 +8562,120 @@ msgstr "NTP tijdserver"
  msgid "Systems"
  msgstr "Systemen"
  
-#: plugins/admin/systems/class_systemManagement.inc:222
+#: plugins/admin/systems/class_systemManagement.inc:191
+msgid "Creating the image failed. Please see the report below."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:200
+#, fuzzy, php-format
+msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+msgstr ""
+"Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
+"bestaat niet."
+
+#: plugins/admin/systems/class_systemManagement.inc:257
+#, fuzzy
+msgid "You are not allowed to create a new object of this type."
+msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
+
+#: plugins/admin/systems/class_systemManagement.inc:308
  msgid "You can't edit this object type yet!"
  msgstr "U kunt dit object type nog niet bewerken!"
  
-#: plugins/admin/systems/class_systemManagement.inc:247
+#: plugins/admin/systems/class_systemManagement.inc:336
+#: plugins/admin/systems/class_systemManagement.inc:402
+#, fuzzy
+msgid "You are not allowed to change the password for this object."
+msgstr "U heeft momenteel geen toestemming om uw wachtwoord te veranderen"
+
+#: plugins/admin/systems/class_systemManagement.inc:348
  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:264
-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:405
+#, fuzzy
+msgid "Can't detect object to change password."
+msgstr "Kan de objectnaam niet detecteren"
  
-#: plugins/admin/systems/class_systemManagement.inc:318
+#: plugins/admin/systems/class_systemManagement.inc:467
  #, php-format
  msgid "You're about to delete all information about the component at '%s'."
  msgstr ""
  "U staat op het punt alle informatie over dit component op '%s' te "
  "verwijderen."
  
-#: plugins/admin/systems/class_systemManagement.inc:324
-#: plugins/admin/systems/class_systemManagement.inc:385
+#: plugins/admin/systems/class_systemManagement.inc:473
+#: plugins/admin/systems/class_systemManagement.inc:533
  #: plugins/admin/fai/class_faiManagement.inc:168
  #: plugins/admin/fai/class_faiManagement.inc:221
  msgid "You are not allowed to delete this component!"
  msgstr "U heeft geen toestemming om dit component te verwijderen!"
  
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:837
  msgid "New terminal"
  msgstr "Nieuwe terminal"
  
-#: plugins/admin/systems/class_systemManagement.inc:654
+#: plugins/admin/systems/class_systemManagement.inc:839
  msgid "New workstation"
  msgstr "Nieuw werkstation"
  
-#: plugins/admin/systems/class_systemManagement.inc:656
+#: plugins/admin/systems/class_systemManagement.inc:841
  msgid "New Device"
  msgstr "Nieuw apparaat"
  
-#: plugins/admin/systems/class_systemManagement.inc:675
+#: plugins/admin/systems/class_systemManagement.inc:860
  msgid "Terminal template for"
  msgstr "Terminal sjabloon voor"
  
-#: plugins/admin/systems/class_systemManagement.inc:691
+#: plugins/admin/systems/class_systemManagement.inc:876
  msgid "Workstation template for"
  msgstr "Werkstation sjabloon voor"
  
-#: plugins/admin/systems/class_systemManagement.inc:811
+#: plugins/admin/systems/class_systemManagement.inc:996
  msgid "New System from incoming"
  msgstr "Nieuw systeem uit inkomende wachtrij"
  
-#: plugins/admin/systems/class_systemManagement.inc:815
+#: plugins/admin/systems/class_systemManagement.inc:1000
  msgid "Workstation is installing"
  msgstr "Werkstation wordt momenteel geinstalleerd"
  
-#: plugins/admin/systems/class_systemManagement.inc:816
+#: plugins/admin/systems/class_systemManagement.inc:1001
  msgid "Workstation is waiting for action"
  msgstr "Werkstation wacht op gebruikersactie"
  
-#: plugins/admin/systems/class_systemManagement.inc:817
+#: plugins/admin/systems/class_systemManagement.inc:1002
  msgid "Workstation installation failed"
  msgstr "Werkstation installatie mislukt"
  
-#: plugins/admin/systems/class_systemManagement.inc:820
+#: plugins/admin/systems/class_systemManagement.inc:1005
  msgid "Server is installing"
  msgstr "Server wordt momenteel geinstalleerd"
  
-#: plugins/admin/systems/class_systemManagement.inc:821
+#: plugins/admin/systems/class_systemManagement.inc:1006
  msgid "Server is waiting for action"
  msgstr "Server wacht op gebruikersactie"
  
-#: plugins/admin/systems/class_systemManagement.inc:822
+#: plugins/admin/systems/class_systemManagement.inc:1007
  msgid "Server installation failed"
  msgstr "Server installatie mislukt"
  
-#: plugins/admin/systems/class_systemManagement.inc:823
+#: plugins/admin/systems/class_systemManagement.inc:1008
  msgid "Winstation"
  msgstr "Windows werkstation"
  
-#: plugins/admin/systems/class_systemManagement.inc:824
+#: plugins/admin/systems/class_systemManagement.inc:1009
  msgid "Network Device"
  msgstr "Netwerk apparaat"
  
-#: plugins/admin/systems/class_systemManagement.inc:825
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_systemManagement.inc:1010
+#: plugins/admin/systems/class_divListSystem.inc:148
  msgid "New Terminal"
  msgstr "Nieuwe terminal"
  
-#: plugins/admin/systems/class_systemManagement.inc:826
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_systemManagement.inc:1011
+#: plugins/admin/systems/class_divListSystem.inc:154
  msgid "New Workstation"
  msgstr "Nieuw werkstation"
  
@@ -9029,9 +8784,9 @@ msgid "Accept mail from other domains over non-authenticated SMTP"
  msgstr "Accepteer E-mail van andere domeinen over niet geauthenticeerde SMTP"
  
  #: plugins/admin/systems/class_servDNS.inc:34
-#: plugins/admin/systems/class_servDNS.inc:353
-#: plugins/admin/systems/class_servDNS.inc:382
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:355
+#: plugins/admin/systems/class_servDNS.inc:384
+#: plugins/admin/systems/class_servDNS.inc:385
  #, fuzzy
  msgid "DNS service"
  msgstr "Voeg DNS service toe"
@@ -9063,7 +8818,7 @@ msgstr ""
  "door de knop hieronder te gebruiken."
  
  #: plugins/admin/systems/class_servDNS.inc:167
-#: plugins/admin/systems/class_servDNS.inc:392
+#: plugins/admin/systems/class_servDNS.inc:394
  msgid "Reverse zone"
  msgstr "Reverse zone"
  
@@ -9072,7 +8827,7 @@ msgstr "Reverse zone"
  msgid "Class"
  msgstr "Klasse"
  
-#: plugins/admin/systems/class_servDNS.inc:231
+#: plugins/admin/systems/class_servDNS.inc:233
  #, php-format
  msgid ""
  "Can't delete the selected zone, because it is still in use by these entry/"
@@ -9081,38 +8836,38 @@ msgstr ""
  "Kan de geselecteerde zone niet verwijderen, aangezien deze nog gebruikt "
  "wordt door de volgende regel(s) '%s'"
  
-#: plugins/admin/systems/class_servDNS.inc:290
+#: plugins/admin/systems/class_servDNS.inc:292
  #, php-format
  msgid "Updating of system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:299
+#: plugins/admin/systems/class_servDNS.inc:301
  #, fuzzy, php-format
  msgid "Removing of system server/dns with dn '%s' failed."
  msgstr "Het verwijderen van de server is mislukt"
  
-#: plugins/admin/systems/class_servDNS.inc:320
+#: plugins/admin/systems/class_servDNS.inc:322
  #, fuzzy, php-format
  msgid "Saving of system server/dns with dn '%s' failed."
  msgstr "Het opslaan van de server db instellingen is mislukt"
  
-#: plugins/admin/systems/class_servDNS.inc:344
+#: plugins/admin/systems/class_servDNS.inc:346
  #, php-format
  msgid "Set status flag for system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:391
-#: plugins/admin/systems/class_termDNS.inc:541
+#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_termDNS.inc:546
  #: plugins/admin/systems/servdnseditzone.tpl:7
  msgid "Zone name"
  msgstr "Zone-naam"
  
-#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_servDNS.inc:395
  #, fuzzy
  msgid "Primary dns server"
  msgstr "Primaire DNS server voor deze zone"
  
-#: plugins/admin/systems/class_servDNS.inc:397
+#: plugins/admin/systems/class_servDNS.inc:399
  #: plugins/admin/systems/servdnseditzone.tpl:73
  #: plugins/admin/ogroups/phonequeue.tpl:70
  #: plugins/admin/ogroups/class_phonequeue.inc:751
@@ -9120,12 +8875,12 @@ msgstr "Primaire DNS server voor deze zone"
  msgid "Retry"
  msgstr "Opnieuw proberen"
  
-#: plugins/admin/systems/class_servDNS.inc:398
+#: plugins/admin/systems/class_servDNS.inc:400
  #: plugins/admin/systems/servdnseditzone.tpl:79
  msgid "Expire"
  msgstr "Vervaltijd"
  
-#: plugins/admin/systems/class_servDNS.inc:400
+#: plugins/admin/systems/class_servDNS.inc:402
  #: plugins/admin/systems/servdnseditzone.tpl:24
  msgid "Zone records"
  msgstr "Zone records"
@@ -9329,42 +9084,42 @@ msgstr "Sta ongeauthoriseerd downloaden van Free/Busy informatie toe"
  msgid "kolabFreeBusyFuture"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:110
+#: plugins/admin/systems/class_printGeneric.inc:111
  #, php-format
  msgid "Can't extract a valid base out of object dn, setting base to '%s'."
  msgstr ""
  "Kon geen geldige basis ophalen uit de dn van het object. Basis is ingesteld "
  "op '%s'."
  
-#: plugins/admin/systems/class_printGeneric.inc:257
-#: plugins/admin/systems/class_printGeneric.inc:265
-#: plugins/admin/systems/class_printGeneric.inc:270
-#: plugins/admin/systems/class_printGeneric.inc:327
-#: plugins/admin/systems/class_printGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:260
+#: plugins/admin/systems/class_printGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:273
+#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:341
  msgid "Add printer extension"
  msgstr "Voeg printer extensie toe"
  
-#: plugins/admin/systems/class_printGeneric.inc:258
+#: plugins/admin/systems/class_printGeneric.inc:261
  msgid ""
  "Could not intialize printer tab, parameter parent was missing while "
  "construction."
  msgstr ""
  "Kon de printertab niet initialiseren. Parameter parent ontbrak bij aanmaak."
  
-#: plugins/admin/systems/class_printGeneric.inc:266
+#: plugins/admin/systems/class_printGeneric.inc:269
  msgid "This is a workstation template, printer tab is disabled."
  msgstr "Dit is een werkstationsjabloon. Het printer tabblad is uitgeschakeld."
  
-#: plugins/admin/systems/class_printGeneric.inc:271
+#: plugins/admin/systems/class_printGeneric.inc:274
  msgid "This is a terminal template, printer tab is disabled."
  msgstr "Dit is een terminalsjabloon. Het printer tabblad is uitgeschakeld."
  
-#: plugins/admin/systems/class_printGeneric.inc:320
+#: plugins/admin/systems/class_printGeneric.inc:315
  msgid "This 'dn' has no printer features."
  msgstr "Deze 'dn' heeft geen printer mogelijkheden."
  
-#: plugins/admin/systems/class_printGeneric.inc:328
+#: plugins/admin/systems/class_printGeneric.inc:323
  msgid ""
  "This object has printer extension disabled. You can't enable it while 'cn' "
  "is not present in entry. Possibly you are currently creating a new terminal "
@@ -9374,12 +9129,12 @@ msgstr ""
  "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:335
-#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:330
+#: plugins/admin/systems/class_printGeneric.inc:333
  msgid "Remove printer extension"
  msgstr "Verwijder printer mogelijkheden"
  
-#: plugins/admin/systems/class_printGeneric.inc:336
+#: plugins/admin/systems/class_printGeneric.inc:331
  msgid ""
  "This workstation has printer extension enabled.You can disable it by "
  "clicking below."
@@ -9387,7 +9142,7 @@ msgstr ""
  "Dit werkstation heeft printer mogelijkheden ingeschakeld. U kunt deze "
  "uitschakelen door de knop hieronder te gebruiken."
  
-#: plugins/admin/systems/class_printGeneric.inc:339
+#: plugins/admin/systems/class_printGeneric.inc:334
  msgid ""
  "This terminal has printer extension enabled. You can disable it by clicking "
  "below."
@@ -9395,7 +9150,7 @@ msgstr ""
  "Deze terminal heeft printer mogelijkheden ingeschakeld. U kunt deze "
  "uitschakelen door de knop hieronder te gebruiken."
  
-#: plugins/admin/systems/class_printGeneric.inc:344
+#: plugins/admin/systems/class_printGeneric.inc:339
  msgid ""
  "This workstation has printer extension disabled. You can enable it by "
  "clicking below."
@@ -9403,7 +9158,7 @@ msgstr ""
  "Dit werkstation heeft printer mogelijkheden uitgeschakeld. U kunt deze "
  "inschakelen door de knop hieronder te gebruiken."
  
-#: plugins/admin/systems/class_printGeneric.inc:347
+#: plugins/admin/systems/class_printGeneric.inc:342
  msgid ""
  "This terminal has printer extension disabled. You can enable it by clicking "
  "below."
@@ -9411,85 +9166,85 @@ msgstr ""
  "Deze terminal heeft printer mogelijkheden uitgeschakeld. U kunt deze "
  "inschakelen door de knop hieronder te gebruiken."
  
-#: plugins/admin/systems/class_printGeneric.inc:510
+#: plugins/admin/systems/class_printGeneric.inc:511
  #, php-format
  msgid "Your currently selected PPD file '%s' doesn't exist."
  msgstr "Uw huidig geselecteerde PPD bestand '%s' bestaat niet."
  
-#: plugins/admin/systems/class_printGeneric.inc:518
+#: plugins/admin/systems/class_printGeneric.inc:519
  msgid "can't get ppd informations."
  msgstr "kan de PPD informatie niet ophalen"
  
-#: plugins/admin/systems/class_printGeneric.inc:531
+#: plugins/admin/systems/class_printGeneric.inc:532
  #, php-format
  msgid "This printer belongs to terminal %s. You can't rename this printer."
  msgstr ""
  "Deze printer behoort bij terminal %s. U kunt deze printer niet hernoemen."
  
-#: plugins/admin/systems/class_printGeneric.inc:533
+#: plugins/admin/systems/class_printGeneric.inc:534
  #, php-format
  msgid "This printer belongs to workstation %s. You can't rename this printer."
  msgstr ""
  "Deze printer behoort bij werkstation %s. U kunt deze printer niet hernoemen."
  
-#: plugins/admin/systems/class_printGeneric.inc:588
+#: plugins/admin/systems/class_printGeneric.inc:589
  #, fuzzy, php-format
  msgid "Removing of system print/generic with dn '%s' failed."
  msgstr "Het verwijderen van de printer is mislukt"
  
-#: plugins/admin/systems/class_printGeneric.inc:814
+#: plugins/admin/systems/class_printGeneric.inc:818
  #, php-format
  msgid "Saving of system print/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:837
-#: plugins/admin/systems/class_printGeneric.inc:839
-#: plugins/admin/ogroups/class_ogroupManagement.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:841
+#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
  #: plugins/admin/fai/faiTemplateEntry.tpl:85
  #: plugins/admin/fai/faiTemplateEntry.tpl:127
  #: plugins/generic/references/class_reference.inc:36
  msgid "Group"
  msgstr "Groep"
  
-#: plugins/admin/systems/class_printGeneric.inc:855
+#: plugins/admin/systems/class_printGeneric.inc:859
  #, fuzzy
  msgid "Print generic"
  msgstr "Print Service"
  
-#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_printGeneric.inc:871
  msgid "LabeledURL"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_printGeneric.inc:872
  #, fuzzy
  msgid "Printer PPD"
  msgstr "Printer"
  
-#: plugins/admin/systems/class_printGeneric.inc:885
+#: plugins/admin/systems/class_printGeneric.inc:889
  #, php-format
  msgid ""
  "You are not allowed to remove the given object '%s' from the list of members "
  "of printer '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:902
+#: plugins/admin/systems/class_printGeneric.inc:906
  #, php-format
  msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:907
+#: plugins/admin/systems/class_printGeneric.inc:911
  #, php-format
  msgid ""
  "You are not allowed to add the given object '%s' to the list of members of '%"
  "s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:942
+#: plugins/admin/systems/class_printGeneric.inc:946
  #, php-format
  msgid "Can't add '%s' to the list of members, it is already used."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:953
+#: plugins/admin/systems/class_printGeneric.inc:957
  #, php-format
  msgid "Can't add '%s' to list of members, it is not reachable."
  msgstr ""
@@ -9513,45 +9268,40 @@ msgid "Changing the password impinges on authentification only."
  msgstr ""
  "Het veranderen van het wachtwoord is alleen van toepassing op authenticatie."
  
-#: plugins/admin/systems/class_componentGeneric.inc:127
+#: plugins/admin/systems/class_componentGeneric.inc:125
  #, fuzzy, php-format
  msgid "Removing of system component/generic with dn '%s' failed."
  msgstr "Het verwijderen van een algemeen component is mislukt"
  
-#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_componentGeneric.inc:172
  msgid "The required field 'Component name' is not set."
  msgstr "Het vereiste veld 'Component naam' is leeg."
  
-#: plugins/admin/systems/class_componentGeneric.inc:170
-#: plugins/admin/systems/class_phoneGeneric.inc:307
+#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_phoneGeneric.inc:317
  msgid "The required field IP address is empty."
  msgstr "Het vereiste veld IP adres is leeg."
  
-#: plugins/admin/systems/class_componentGeneric.inc:173
-#: plugins/admin/systems/class_phoneGeneric.inc:310
+#: plugins/admin/systems/class_componentGeneric.inc:180
+#: plugins/admin/systems/class_phoneGeneric.inc:320
  msgid "The field IP address contains an invalid address."
  msgstr "Het veld IP adres bevat een ongeldig adres."
  
-#: plugins/admin/systems/class_componentGeneric.inc:247
+#: plugins/admin/systems/class_componentGeneric.inc:249
  #, php-format
  msgid "Saving of system component/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:258
+#: plugins/admin/systems/class_componentGeneric.inc:260
  #, fuzzy
  msgid "Component generic"
  msgstr "Nieuw component"
  
-#: plugins/admin/systems/class_componentGeneric.inc:263
+#: plugins/admin/systems/class_componentGeneric.inc:265
  #, fuzzy
  msgid "Network device"
  msgstr "Netwerk apparaten"
  
-#: plugins/admin/systems/goNtpServer.tpl:2
-#, fuzzy
-msgid "Time server"
-msgstr "Tijd Service"
-
  #: plugins/admin/systems/goKrbServer.tpl:1
  msgid "Kerberos kadmin access"
  msgstr "Kerberos kadmin toegang"
@@ -9566,6 +9316,23 @@ msgstr "Kerberos Realm"
  msgid "Admin user"
  msgstr "Beheerder"
  
+#: plugins/admin/systems/goFonServer.tpl:1
+#, fuzzy
+msgid "VoIP database information"
+msgstr "Informatie weergeven/verbergen"
+
+#: plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr "Asterisk DB gebruiker"
+
+#: plugins/admin/systems/goFonServer.tpl:20
+msgid "Country dial prefix"
+msgstr "Internationale telefoon prefix"
+
+#: plugins/admin/systems/goFonServer.tpl:28
+msgid "Local dial prefix"
+msgstr "Lokale telefoon prefix"
+
  #: plugins/admin/systems/chooser.tpl:1
  msgid "Choose the kind of system component you want to create"
  msgstr "Kies het type systeem component dat u wenst aan te maken"
@@ -9641,22 +9408,14 @@ msgstr "Karakterset"
  msgid "Option"
  msgstr "Optie"
  
-#: plugins/admin/systems/goFonServer.tpl:1
+#: plugins/admin/systems/goFaxServer.tpl:1
  #, fuzzy
-msgid "VoIP database information"
-msgstr "Informatie weergeven/verbergen"
-
-#: plugins/admin/systems/goFonServer.tpl:4
-msgid "Asterisk DB user"
-msgstr "Asterisk DB gebruiker"
-
-#: plugins/admin/systems/goFonServer.tpl:20
-msgid "Country dial prefix"
-msgstr "Internationale telefoon prefix"
+msgid "FAX database information"
+msgstr "Free Busy informatie"
  
-#: plugins/admin/systems/goFonServer.tpl:28
-msgid "Local dial prefix"
-msgstr "Lokale telefoon prefix"
+#: plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
+msgstr "FAX DB gebruiker"
  
  #: plugins/admin/systems/remove_glpi.tpl:10
  msgid ""
@@ -9673,12 +9432,12 @@ msgid "This 'dn' has no phone features."
  msgstr "Deze 'dn' heeft geen telefoon mogelijkheden."
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  msgid "yes"
  msgstr "ja"
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  msgid "no"
  msgstr "nee"
  
@@ -9704,101 +9463,97 @@ msgstr ""
  msgid "Removing of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:315
+#: plugins/admin/systems/class_phoneGeneric.inc:325
  msgid "The required field 'Phone name' is not set."
  msgstr "Het vereiste veld 'Telefoonnaam' is leeg."
  
-#: plugins/admin/systems/class_phoneGeneric.inc:318
+#: plugins/admin/systems/class_phoneGeneric.inc:328
  msgid "The 'Phone name' '0' is reserved and cannot be used."
  msgstr "De 'Telefoonnaam' '0' is gereserveerd en kan niet gebruikt worden."
  
-#: plugins/admin/systems/class_phoneGeneric.inc:323
-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_phoneGeneric.inc:413
+#: plugins/admin/systems/class_phoneGeneric.inc:418
  #, php-format
  msgid "Saving of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:426
+#: plugins/admin/systems/class_phoneGeneric.inc:431
  #, fuzzy
  msgid "Phone generic"
  msgstr "Telefoonnummer"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:431
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
  #, fuzzy
  msgid "Phone hardware"
  msgstr "Telefoon hardware"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/admin/systems/class_phoneGeneric.inc:442
  #, fuzzy
  msgid "SIP Mode"
  msgstr "Modus"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:437
+#: plugins/admin/systems/class_phoneGeneric.inc:443
  #, fuzzy
  msgid "SIP DTMF mode"
  msgstr "DTMF modus"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:438
+#: plugins/admin/systems/class_phoneGeneric.inc:444
  #, fuzzy
  msgid "SIP Default ip"
  msgstr "Standaard IP"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_phoneGeneric.inc:445
  msgid "SIP Qualify"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_phoneGeneric.inc:446
  #, fuzzy
  msgid "IAX authentication type"
  msgstr "Nagios authenticatie"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:441
+#: plugins/admin/systems/class_phoneGeneric.inc:447
  #, fuzzy
  msgid "IAX secret"
  msgstr "IMAP Service"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:442
+#: plugins/admin/systems/class_phoneGeneric.inc:448
  #, fuzzy
  msgid "IAX account code"
  msgstr "Account code"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:443
+#: plugins/admin/systems/class_phoneGeneric.inc:449
  #, fuzzy
  msgid "IAX trunk lines"
  msgstr "Trunk lijnen"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:444
+#: plugins/admin/systems/class_phoneGeneric.inc:450
  #, fuzzy
  msgid "IAX permit settings"
  msgstr "Fax instellingen"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:445
+#: plugins/admin/systems/class_phoneGeneric.inc:451
  #, fuzzy
  msgid "IAX deny settings"
  msgstr "Fax instellingen"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:446
+#: plugins/admin/systems/class_phoneGeneric.inc:452
  msgid "CAPI MSN"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:447
+#: plugins/admin/systems/class_phoneGeneric.inc:453
  msgid "Hardware type"
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#, fuzzy, php-format
+msgid "The file '%s/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:49
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#, fuzzy, php-format
+msgid "Can't read '%s/encodings', please check permissions."
  msgstr ""
  "Kan bestand '/etc/gosa/encodings' niet openen. Controlleer de "
  "bestandspermissies a.u.b."
@@ -9831,7 +9586,7 @@ msgstr "Het pad bevat ongeldige karakters."
  msgid "Option contains invalid characters."
  msgstr "De optie bevat ongeldige karakters."
  
-#: plugins/admin/systems/class_workstationStartup.inc:402
+#: plugins/admin/systems/class_workstationStartup.inc:429
  msgid ""
  "There are packages in your configuration, which can't be resolved with "
  "current server/release settings."
@@ -9839,11 +9594,11 @@ msgstr ""
  "Er bestaan pakketten in uw configuratie, die niet gekoppeld kunnen worden "
  "aan de huidige server/distributie instellingen."
  
-#: plugins/admin/systems/class_workstationStartup.inc:447
+#: plugins/admin/systems/class_workstationStartup.inc:474
  msgid "Please select a 'FAI server' or remove the 'FAI classes'."
  msgstr "Selecteer a.u.b. een 'FAI server' of  verwijder de 'FAI klasses'."
  
-#: plugins/admin/systems/class_workstationStartup.inc:509
+#: plugins/admin/systems/class_workstationStartup.inc:537
  msgid ""
  "There is already a profile in your selection that contain partition table "
  "configurations."
@@ -9851,11 +9606,11 @@ msgstr ""
  "Er bestaat al een profiel in uw selectie die partitietabel configuraties "
  "bevat."
  
-#: plugins/admin/systems/class_workstationStartup.inc:721
+#: plugins/admin/systems/class_workstationStartup.inc:754
  msgid "Not available in current setup"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:897
  #, php-format
  msgid ""
  "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
@@ -9864,7 +9619,7 @@ msgstr ""
  "Kon een of meer van de opgegeven FAI klasse(n) [%s] niet vinden op de FAI "
  "server '%s'. De server is teruggezet op 'auto'."
  
-#: plugins/admin/systems/class_workstationStartup.inc:879
+#: plugins/admin/systems/class_workstationStartup.inc:913
  #, fuzzy, php-format
  msgid ""
  "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9876,12 +9631,12 @@ msgstr ""
  "hernoemd zijn. Alle klassen zijn verwijderd van dit account. Druk op "
  "annuleren indien u deze wijzigingen niet wenst op te slaan."
  
-#: plugins/admin/systems/class_workstationStartup.inc:1040
+#: plugins/admin/systems/class_workstationStartup.inc:1085
  #, fuzzy, php-format
  msgid "Saving of system workstation/startup with dn '%s' failed."
  msgstr "Het opslaan van de werkstation opstart instellingen is mislukt"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1090
+#: plugins/admin/systems/class_workstationStartup.inc:1135
  #, php-format
  msgid ""
  "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
@@ -9889,7 +9644,7 @@ msgstr ""
  "Kan de opgegeven REPOSITORY_HOOK '%s' niet uitvoeren. Controleer uw gosa."
  "conf a.u.b."
  
-#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/class_workstationStartup.inc:1137
  #: plugins/admin/systems/class_servRepositorySetup.inc:203
  #, php-format
  msgid ""
@@ -9899,27 +9654,27 @@ msgstr ""
  "De in uw 'gosa.conf' opgegeven REPOSITORY_HOOK '%s' geeft een lege waarde "
  "terug."
  
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1155
  #, fuzzy
  msgid "System startup"
  msgstr "Systeem status"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: plugins/admin/systems/class_workstationStartup.inc:1170
  #: plugins/admin/fai/class_faiProfile.inc:453
  #: plugins/admin/fai/faiProfile.tpl:36
  msgid "FAI classes"
  msgstr "FAI klassen"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1126
+#: plugins/admin/systems/class_workstationStartup.inc:1171
  msgid "Debian mirror"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1127
+#: plugins/admin/systems/class_workstationStartup.inc:1172
  #, fuzzy
  msgid "Debian release"
  msgstr "Huidige uitgave"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1129
+#: plugins/admin/systems/class_workstationStartup.inc:1174
  msgid "FAI status flag"
  msgstr ""
  
@@ -10093,13 +9848,13 @@ msgstr "Sectie"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:462
  #: plugins/admin/systems/class_printerPPDDialog.inc:465
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:289
  msgid "True"
  msgstr "Ja"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:463
  #: plugins/admin/systems/class_printerPPDDialog.inc:466
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:286
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:287
  msgid "False"
  msgstr "Nee"
  
@@ -10108,7 +9863,25 @@ msgstr "Nee"
  msgid "Unsupported ppd type '%s' used for '%s' "
  msgstr "PPD type '%s', gebruikt voor '%s', wordt niet ondersteund "
  
-#: plugins/admin/systems/class_printerPPDDialog.inc:485
+#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#, fuzzy, php-format
+msgid "Removing old ppd file '%s' failed."
+msgstr "Het verwijderen van het FAI profiel is mislukt"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#, fuzzy, php-format
+msgid "Removing old ppd file '%s' failed. File is not accessible."
+msgstr ""
+"Kan nieuw ppd bestand niet aanmaken. Het bronbestand '%s' is niet "
+"toegankelijk."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#, php-format
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:502
  msgid ""
  "Please select a valid ppd file or use 'Cancel' to go back to printer "
  "configuration."
@@ -10121,7 +9894,7 @@ msgstr "Printer stuurprogramma"
  #: plugins/admin/systems/printerPPDDialog.tpl:5
  #: plugins/admin/systems/workstationService.tpl:7
  #: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:246
+#: plugins/admin/systems/terminalService.tpl:254
  #: plugins/admin/systems/class_glpiAccount.inc:784
  msgid "Model"
  msgstr "Model"
@@ -10156,30 +9929,199 @@ msgstr "Toon overeenkomende objecten"
  msgid "Regular expression for matching object names"
  msgstr "Reguliere expressie voor overeenkomende objectnamen"
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#, fuzzy, php-format
+msgid "You're about to delete the ppd file '%s' at '%s'."
+msgstr "U staat op het punt de programma '%s' te verwijderen."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#, fuzzy, php-format
+msgid "Could not found specified ppd file '%s'."
+msgstr "Het opgegeven certificaat kon geopend worden!"
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+msgid ""
+"Something went wrong while trying to remove the ppd file from server, "
+"possibly we have no write access."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
  #, php-format
  msgid "Selected vendor '%s' does not exists in our list of ppds."
  msgstr "De geselecteerde fabricant '%s' bestaat niet in onze lijst met ppds."
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
  msgid "Printer ppd selection."
  msgstr "Printer PPD selectie"
  
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:157
+#: plugins/admin/systems/class_terminalService.inc:71
+msgid "unknown"
+msgstr "onbekend"
+
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_terminalService.inc:105
+#: plugins/admin/systems/class_terminalService.inc:106
+msgid "bit"
+msgstr "bit"
+
+#: plugins/admin/systems/class_workstationService.inc:138
+#: plugins/admin/systems/class_terminalService.inc:158
+msgid "show chooser"
+msgstr "toon keuze-mogelijkheid"
+
+#: plugins/admin/systems/class_workstationService.inc:139
+#: plugins/admin/systems/class_terminalService.inc:159
+msgid "direct"
+msgstr "direkt"
+
+#: plugins/admin/systems/class_workstationService.inc:142
+#: plugins/admin/systems/class_terminalService.inc:162
+msgid "load balanced"
+msgstr "load balanced"
+
+#: plugins/admin/systems/class_workstationService.inc:145
+#: plugins/admin/systems/class_terminalService.inc:165
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_workstationService.inc:146
+#: plugins/admin/systems/class_terminalService.inc:166
+msgid "ICA client"
+msgstr "ICA client"
+
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_terminalService.inc:221
+msgid "Bit"
+msgstr "Bit"
+
+#: plugins/admin/systems/class_workstationService.inc:314
+#: plugins/admin/systems/class_terminalService.inc:316
+msgid "Choose the phone located at the current terminal"
+msgstr "Selecteer de telefoon die zich bij de huidige terminal bevindt."
+
+#: plugins/admin/systems/class_workstationService.inc:380
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_terminalService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:395
+msgid "Please specify a valid VSync range."
+msgstr "Geef a.u.b. een geldig VSync bereik op."
+
+#: plugins/admin/systems/class_workstationService.inc:395
+#: plugins/admin/systems/class_workstationService.inc:400
+#: plugins/admin/systems/class_terminalService.inc:404
+#: plugins/admin/systems/class_terminalService.inc:409
+msgid "Please specify a valid HSync range."
+msgstr "Geef a.u.b. een geldig HSync bereik op."
+
  #: plugins/admin/systems/class_workstationService.inc:443
  #, fuzzy, php-format
  msgid "Saving of system workstation/service with dn '%s' failed."
  msgstr "Het opslaan van werkstations services is mislukt"
  
+#: plugins/admin/systems/class_workstationService.inc:451
+#: plugins/admin/systems/class_terminalService.inc:466
+#, fuzzy
+msgid "Service"
+msgstr "Services"
+
  #: plugins/admin/systems/class_workstationService.inc:452
  #, fuzzy
  msgid "Workstation service"
  msgstr "Werkstation naam"
  
+#: plugins/admin/systems/class_workstationService.inc:460
+#: plugins/admin/systems/class_terminalService.inc:475
+#, fuzzy
+msgid "Monitor"
+msgstr "Monitor grootte"
+
+#: plugins/admin/systems/class_workstationService.inc:461
+#: plugins/admin/systems/class_terminalService.inc:479
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Nieuw stuurprogramma"
+
+#: plugins/admin/systems/class_workstationService.inc:462
+#: plugins/admin/systems/class_terminalService.inc:480
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Resolutie"
+
+#: plugins/admin/systems/class_workstationService.inc:463
+#: plugins/admin/systems/class_terminalService.inc:481
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Kleurdiepte"
+
+#: plugins/admin/systems/class_workstationService.inc:464
+#: plugins/admin/systems/class_terminalService.inc:482
+#, fuzzy
+msgid "Hsync"
+msgstr "HSync"
+
+#: plugins/admin/systems/class_workstationService.inc:465
+#: plugins/admin/systems/class_terminalService.inc:483
+#, fuzzy
+msgid "Vsync"
+msgstr "VSync"
+
  #: plugins/admin/systems/class_workstationService.inc:466
  #, fuzzy
  msgid "Use DDC"
  msgstr "Gebruikers ID"
  
+#: plugins/admin/systems/class_workstationService.inc:467
+#: plugins/admin/systems/class_terminalService.inc:487
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "gedeactiveerd"
+
+#: plugins/admin/systems/class_workstationService.inc:468
+#: plugins/admin/systems/class_terminalService.inc:491
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Kies toetsenbord model"
+
+#: plugins/admin/systems/class_workstationService.inc:469
+#: plugins/admin/systems/class_terminalService.inc:492
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Kies toetsenbord indeling"
+
+#: plugins/admin/systems/class_workstationService.inc:470
+#: plugins/admin/systems/class_terminalService.inc:493
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Kies toetsenbord variant"
+
+#: plugins/admin/systems/class_workstationService.inc:471
+#: plugins/admin/systems/class_terminalService.inc:494
+#, fuzzy
+msgid "Mouse type"
+msgstr "MIME-type"
+
+#: plugins/admin/systems/class_workstationService.inc:472
+#: plugins/admin/systems/class_terminalService.inc:495
+#, fuzzy
+msgid "Mouse port"
+msgstr "Koppelpunt"
+
+#: plugins/admin/systems/class_workstationService.inc:473
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:76
+#: plugins/admin/systems/class_terminalService.inc:496
+#: plugins/gofon/phoneaccount/generic.tpl:30
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Telefoon hardware"
+
  #: plugins/admin/systems/workstationService.tpl:4
  #: plugins/admin/systems/terminalService.tpl:4
  msgid "Keyboard"
@@ -10257,41 +10199,42 @@ msgid "Display device"
  msgstr "Scherm"
  
  #: plugins/admin/systems/workstationService.tpl:167
+#: plugins/admin/systems/terminalService.tpl:147
  msgid "Use DDC for automatic detection"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:170
-#: plugins/admin/systems/terminalService.tpl:142
+#: plugins/admin/systems/terminalService.tpl:150
  msgid "HSync"
  msgstr "HSync"
  
  #: plugins/admin/systems/workstationService.tpl:175
-#: plugins/admin/systems/terminalService.tpl:146
+#: plugins/admin/systems/terminalService.tpl:154
  msgid "Horizontal refresh frequency for installed monitor"
  msgstr "Horizontale ververs frequentie voor de geïnstalleerde monitor"
  
  #: plugins/admin/systems/workstationService.tpl:181
-#: plugins/admin/systems/terminalService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:158
  msgid "VSync"
  msgstr "VSync"
  
  #: plugins/admin/systems/workstationService.tpl:186
-#: plugins/admin/systems/terminalService.tpl:154
+#: plugins/admin/systems/terminalService.tpl:162
  msgid "Vertical refresh frequency for installed monitor"
  msgstr "Verticale ververs frequentie voor de geïnstalleerde monitor"
  
  #: plugins/admin/systems/workstationService.tpl:201
-#: plugins/admin/systems/terminalService.tpl:237
+#: plugins/admin/systems/terminalService.tpl:245
  msgid "Scan device"
  msgstr "Scanner"
  
  #: plugins/admin/systems/workstationService.tpl:204
-#: plugins/admin/systems/terminalService.tpl:239
+#: plugins/admin/systems/terminalService.tpl:247
  msgid "Select to start SANE scan service on terminal"
  msgstr "Selecteer om de SANE scan service te starten op de terminal"
  
  #: plugins/admin/systems/workstationService.tpl:207
-#: plugins/admin/systems/terminalService.tpl:241
+#: plugins/admin/systems/terminalService.tpl:249
  msgid "Provide scan services"
  msgstr "Lever scan diensten"
  
@@ -10333,17 +10276,17 @@ msgstr "Toegekende FAI klasses"
  msgid "set"
  msgstr "stel in"
  
-#: plugins/admin/systems/workstationStartup.tpl:137
+#: plugins/admin/systems/workstationStartup.tpl:141
  #: plugins/admin/systems/terminalStartup.tpl:66
  msgid "Kernel modules (format: name parameters)"
  msgstr "Kernel modules (formaat: naam parameters)"
  
-#: plugins/admin/systems/workstationStartup.tpl:140
+#: plugins/admin/systems/workstationStartup.tpl:144
  #: plugins/admin/systems/terminalStartup.tpl:69
  msgid "Add additional modules to load on startup"
  msgstr "Voeg additioneel te laden modules toe bij het opstarten"
  
-#: plugins/admin/systems/workstationStartup.tpl:176
+#: plugins/admin/systems/workstationStartup.tpl:180
  #: plugins/admin/systems/terminalStartup.tpl:105
  msgid "Mountpoint"
  msgstr "Koppelpunt"
@@ -10374,65 +10317,75 @@ msgstr "Selecteer om meer uitvoer te produceren tijdens opstarten"
  msgid "use debug mode for startup"
  msgstr "Gebruik debug modus bij boot"
  
-#: plugins/admin/systems/terminalService.tpl:169
+#: plugins/admin/systems/terminalService.tpl:173
+#: plugins/admin/systems/class_terminalService.inc:477
+msgid "Remote desktop"
+msgstr "Remote desktop"
+
+#: plugins/admin/systems/terminalService.tpl:177
  msgid "Connect method"
  msgstr "Verbindings methode"
  
-#: plugins/admin/systems/terminalService.tpl:172
+#: plugins/admin/systems/terminalService.tpl:180
  msgid "Choose method to connect to terminal server"
  msgstr "Kies de methode om te verbinden met de terminal server"
  
-#: plugins/admin/systems/terminalService.tpl:180
+#: plugins/admin/systems/terminalService.tpl:188
  msgid "Terminal server"
  msgstr "Terminal server"
  
-#: plugins/admin/systems/terminalService.tpl:183
+#: plugins/admin/systems/terminalService.tpl:191
  msgid "Select specific terminal server to use"
  msgstr "Selecteer de te gebruiken terminal server"
  
-#: plugins/admin/systems/terminalService.tpl:191
+#: plugins/admin/systems/terminalService.tpl:199
  msgid "Font server"
  msgstr "Font server"
  
-#: plugins/admin/systems/terminalService.tpl:194
+#: plugins/admin/systems/terminalService.tpl:202
  msgid "Select specific font server to use"
  msgstr "Selecteer de te gebruiken font server"
  
-#: plugins/admin/systems/terminalService.tpl:211
+#: plugins/admin/systems/terminalService.tpl:219
  msgid "Print device"
  msgstr "Printer"
  
-#: plugins/admin/systems/terminalService.tpl:213
+#: plugins/admin/systems/terminalService.tpl:221
  msgid "Select to start IPP based printing service on terminal"
  msgstr "Selecteer om de IPP gebaseerde print service te starten op de terminal"
  
-#: plugins/admin/systems/terminalService.tpl:215
+#: plugins/admin/systems/terminalService.tpl:223
  msgid "Provide print services"
  msgstr "Lever print diensten"
  
-#: plugins/admin/systems/terminalService.tpl:224
+#: plugins/admin/systems/terminalService.tpl:229
+#: plugins/admin/systems/class_terminalService.inc:486
+msgid "Spool server"
+msgstr "Spool server"
+
+#: plugins/admin/systems/terminalService.tpl:232
  msgid "Select NFS filesystem to place spool files on"
  msgstr "Selecteer NFS bestandssysteem waarop spool bestanden geplaatst worden"
  
-#: plugins/admin/systems/terminalService.tpl:249
+#: plugins/admin/systems/terminalService.tpl:257
  msgid "Select scanner driver to use"
  msgstr "Selecteer de te gebruiken scanner driver"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:1
-#: plugins/admin/systems/class_servRepository.inc:349
+#: plugins/admin/systems/class_servRepository.inc:365
  #: plugins/admin/fai/faiPackage.tpl:33
  msgid "Repository"
  msgstr "Verzamelplaats"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:364
+#: plugins/admin/systems/class_servRepository.inc:380
  msgid "Parent server"
  msgstr "Hoofd/Parent server"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:39
-#: plugins/admin/systems/class_servRepository.inc:239
-#: plugins/admin/systems/class_servRepository.inc:262
-#: plugins/admin/systems/class_servRepository.inc:363
+#: plugins/admin/systems/class_servRepository.inc:253
+#: plugins/admin/systems/class_servRepository.inc:276
+#: plugins/admin/systems/class_servRepository.inc:379
  msgid "Sections"
  msgstr "Secties"
  
@@ -10452,14 +10405,19 @@ msgstr ""
  "Kan de opgegeven REPOSITORY_HOOK '%s' niet uitvoeren. Controleer uw gosa."
  "conf a.u.b."
  
-#: plugins/admin/systems/class_servRepository.inc:35
-#: plugins/admin/systems/class_servRepository.inc:339
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:44
+#: plugins/admin/systems/class_servRepository.inc:355
+#: plugins/admin/systems/class_servRepository.inc:366
  #, fuzzy
  msgid "Repository service"
  msgstr "Print service"
  
-#: plugins/admin/systems/class_servRepository.inc:138
+#: plugins/admin/systems/class_servRepository.inc:94
+#: plugins/admin/fai/class_faiSummaryTab.inc:175
+msgid "You can't use this plugin until FAI is activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:152
  #, php-format
  msgid ""
  "You can't delete this release, it is still used by these workstations [%s]. "
@@ -10469,7 +10427,7 @@ msgstr ""
  "door de volgende werkstations [%s]. Los deze afhankelijkheden a.u.b. eerst "
  "op, om de database consistent te houden."
  
-#: plugins/admin/systems/class_servRepository.inc:172
+#: plugins/admin/systems/class_servRepository.inc:186
  #, php-format
  msgid ""
  "Be careful editing this release, it is still used by these workstations [%s]."
@@ -10477,13 +10435,13 @@ msgstr ""
  "Let op bij het bewerken van deze distributie. Deze wordt nog steeds gebruikt "
  "door de volgende werkstations [%s]."
  
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:212
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
  #: plugins/admin/fai/class_faiManagement.inc:343
  msgid "This name is already in use."
  msgstr "De opgegeven naam wordt al gebruikt."
  
-#: plugins/admin/systems/class_servRepository.inc:359
+#: plugins/admin/systems/class_servRepository.inc:375
  #: plugins/admin/systems/class_goGlpiServer.inc:92
  #: plugins/admin/systems/class_goCupsServer.inc:71
  #: plugins/admin/systems/class_serverService.inc:8
@@ -10495,7 +10453,7 @@ msgstr "De opgegeven naam wordt al gebruikt."
  msgid "Start"
  msgstr "Opstarten"
  
-#: plugins/admin/systems/class_servRepository.inc:360
+#: plugins/admin/systems/class_servRepository.inc:376
  #: plugins/admin/systems/class_goGlpiServer.inc:93
  #: plugins/admin/systems/class_goCupsServer.inc:72
  #: plugins/admin/systems/class_serverService.inc:7
@@ -10507,7 +10465,7 @@ msgstr "Opstarten"
  msgid "Stop"
  msgstr "Stop"
  
-#: plugins/admin/systems/class_servRepository.inc:361
+#: plugins/admin/systems/class_servRepository.inc:377
  #: plugins/admin/systems/class_goGlpiServer.inc:94
  #: plugins/admin/systems/class_goCupsServer.inc:73
  #: plugins/admin/systems/class_serverService.inc:9
@@ -10519,12 +10477,12 @@ msgstr "Stop"
  msgid "Restart"
  msgstr "Opnieuw proberen"
  
-#: plugins/admin/systems/class_servRepository.inc:362
+#: plugins/admin/systems/class_servRepository.inc:378
  #, fuzzy
  msgid "Releases"
  msgstr "Distributie versie"
  
-#: plugins/admin/systems/class_servRepository.inc:365
+#: plugins/admin/systems/class_servRepository.inc:381
  msgid "Url"
  msgstr ""
  
@@ -10621,14 +10579,9 @@ msgstr "Reguliere expressie voor overeenkomende apparaat namen"
  msgid "Use"
  msgstr "Gebruik"
  
-#: plugins/admin/systems/goFaxServer.tpl:1
-#, fuzzy
-msgid "FAX database information"
-msgstr "Free Busy informatie"
-
-#: plugins/admin/systems/goFaxServer.tpl:4
-msgid "FAX DB user"
-msgstr "FAX DB gebruiker"
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
+msgstr ""
  
  #: plugins/admin/systems/class_glpiAccount.inc:147
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:161
@@ -10765,7 +10718,7 @@ msgid "Attachment"
  msgstr "Bijlage"
  
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:136
  msgid "File"
  msgstr "Bestand"
  
@@ -10781,6 +10734,37 @@ msgstr "MIME-type"
  msgid "use"
  msgstr "gebruik"
  
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+msgid "Go to root department"
+msgstr "Ga naar basis afdelingen"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:194
+msgid "Go up one department"
+msgstr "Ga een afdeling omhoog"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+msgid "Go to users department"
+msgstr "Ga naar gebruikers afdeling"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+#: include/class_MultiSelectWindow.inc:204
+msgid "Home"
+msgstr "Home"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: include/class_MultiSelectWindow.inc:209
+msgid "Reload list"
+msgstr "Lijst herladen"
+
  #: plugins/admin/systems/glpiSelectUser.tpl:23
  msgid ""
  "This dialog allows you to select a user as technical responsible person."
@@ -10922,7 +10906,7 @@ msgid "Add/Edit network interface"
  msgstr "Netwerkkaart toevoegen/bewerken"
  
  #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:532
+#: plugins/admin/systems/class_termDNS.inc:537
  msgid "MAC address"
  msgstr "Hardware adres (MAC)"
  
@@ -11004,7 +10988,7 @@ msgid "New processor"
  msgstr "Nieuwe processor"
  
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "P"
  msgstr "PR"
  
@@ -11139,7 +11123,8 @@ msgid "Upload wasn't successfull."
  msgstr "Upload was niet succesvol"
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#, fuzzy, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
  msgstr ""
  "De directory '/etc/gosa/glpi/', om GLPI bestanden in te bewaren, ontbreekt. "
  
@@ -11307,7 +11292,7 @@ msgstr ""
  msgid "Cartridges"
  msgstr "Cartridges"
  
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:137
  #, php-format
  msgid ""
  "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
@@ -11315,19 +11300,19 @@ msgstr ""
  "Kan de opgegeven AUTO_NETWORK_HOOK '%s' niet uitvoeren. Controleer uw gosa."
  "conf a.u.b."
  
-#: plugins/admin/systems/class_termDNS.inc:311
+#: plugins/admin/systems/class_termDNS.inc:319
  msgid "The required field 'IP-address' is not set."
  msgstr "Het vereiste veld 'IP adres' is leeg."
  
-#: plugins/admin/systems/class_termDNS.inc:318
+#: plugins/admin/systems/class_termDNS.inc:323
  msgid "Wrong IP format in field IP-address."
  msgstr "Verkeerd IP formaat in het veld IP adres"
  
-#: plugins/admin/systems/class_termDNS.inc:324
+#: plugins/admin/systems/class_termDNS.inc:330
  msgid "The required field 'MAC-address' is not set."
  msgstr "Het vereiste veld 'Hardware adres (MAC)' is leeg."
  
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_termDNS.inc:333
  msgid ""
  "The given macaddress is invalid. There must be 6 2byte segments seperated by "
  "':'."
@@ -11335,17 +11320,17 @@ msgstr ""
  "Het opgegeven mac-adres is ongeldig. Deze moet bestaan uit 6 segmenten van 2 "
  "bytes, gescheiden door ':'"
  
-#: plugins/admin/systems/class_termDNS.inc:351
+#: plugins/admin/systems/class_termDNS.inc:353
  #, php-format
  msgid "Found duplicate value for record type '%s'."
  msgstr "Er is een dubbele waarde gevonden voor record type '%s'."
  
-#: plugins/admin/systems/class_termDNS.inc:359
+#: plugins/admin/systems/class_termDNS.inc:361
  #, php-format
  msgid "Found more than one entry for the uniqe record type '%s'."
  msgstr "Meer dan een regel gevonden voor uniek record type '%s'."
  
-#: plugins/admin/systems/class_termDNS.inc:370
+#: plugins/admin/systems/class_termDNS.inc:372
  #, php-format
  msgid ""
  "The device IP '%s' is added as 'A Record', this will be done automatically, "
@@ -11354,32 +11339,32 @@ msgstr ""
  "Het apparaat IP '%s' is toegevoegd als 'A Record'. Dit wordt automatisch "
  "afgehandeld door GOsa. Verwijder het record a.u.b."
  
-#: plugins/admin/systems/class_termDNS.inc:377
+#: plugins/admin/systems/class_termDNS.inc:379
  #: plugins/admin/systems/class_servDNSeditZone.inc:409
  #, php-format
  msgid "Only lowercase is allowed, please check your '%ss'."
  msgstr "Hoofdletters zijn niet toegestaan. Controleer uw '%ss'"
  
-#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:463
  #, fuzzy, php-format
  msgid "Saving of terminal/dns account with dn '%s' failed."
  msgstr "Het opslaan van het E-mail account is mislukt"
  
-#: plugins/admin/systems/class_termDNS.inc:522
+#: plugins/admin/systems/class_termDNS.inc:527
  msgid "DNS"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:528
  #, fuzzy
  msgid "DNS settings"
  msgstr "Samba Instellingen"
  
-#: plugins/admin/systems/class_termDNS.inc:531
+#: plugins/admin/systems/class_termDNS.inc:536
  #, fuzzy
  msgid "IP address"
  msgstr "IP adres"
  
-#: plugins/admin/systems/class_termDNS.inc:540
+#: plugins/admin/systems/class_termDNS.inc:545
  #, fuzzy
  msgid "DNS records"
  msgstr "DNS records"
@@ -11486,7 +11471,7 @@ msgstr "Selecteer een objectgroep"
  
  #: plugins/admin/systems/class_servDNSeditZone.inc:290
  #: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:371
  msgid "Down"
  msgstr "Omlaag"
  
@@ -11576,44 +11561,39 @@ msgstr ""
  "Kon '%s' niet hernoemen naar '%s'. Er is al een invoer met dezelfde naam in "
  "de zone bewerkings dialoog."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:206
  #, php-format
  msgid "Entry name '%s' contains invalid characters."
  msgstr "Invoerregel '%s' bevat ongeldige karakters."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
  #, php-format
  msgid "Can not rename '%s' to '%s',the destination name already exists."
  msgstr "Kan '%s' niet hernoemen naar '%s'. De gewenste naam bestaat al."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:221
  #, php-format
  msgid "Can not create '%s',the destination name already exists."
  msgstr "Kan '%s' niet aanmaken. De gewenste naam bestaat al."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
  #, php-format
  msgid "The name '%s' is used more than once."
  msgstr "De naam '%s' wordt meer dan een maal gebruikt."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
-msgstr "De hostnaam '%s' moet in kleine letters ingevoerd worden."
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
  #, php-format
  msgid "The record type '%s' is a unique type and can't be defined twice."
  msgstr ""
  "Het recordtype '%s' is een uniek type en kan dus ook niet tweemaal "
  "gedefinieerd worden."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:260
  #, php-format
  msgid "There is an empty '%s' for host '%s'."
  msgstr "Er is een lege '%s' voor host '%s'."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:268
  #, php-format
  msgid "There is a duplicate entry in '%s' for '%s'."
  msgstr "Er is een dubbele invoer in '%s' voor '%s'"
@@ -11724,94 +11704,90 @@ msgstr "Toon netwerk apparaten"
  msgid "Display systems of user"
  msgstr "Toon systemen van gebruiker"
  
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:148
  msgid "New Terminal template"
  msgstr "Nieuw terminal sjabloon"
  
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:154
  msgid "New Workstation template"
  msgstr "Nieuw werkstation sjabloon"
  
-#: plugins/admin/systems/class_divListSystem.inc:140
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:160
  msgid "New Server"
  msgstr "Nieuwe server"
  
-#: plugins/admin/systems/class_divListSystem.inc:142
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:166
  msgid "New Printer"
  msgstr "Nieuwe printer"
  
-#: plugins/admin/systems/class_divListSystem.inc:144
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:172
  msgid "New Phone"
  msgstr "Nieuwe telefoon"
  
-#: plugins/admin/systems/class_divListSystem.inc:146
-#: plugins/admin/systems/class_divListSystem.inc:147
+#: plugins/admin/systems/class_divListSystem.inc:178
  msgid "New Component"
  msgstr "Nieuw component"
  
-#: plugins/admin/systems/class_divListSystem.inc:165
+#: plugins/admin/systems/class_divListSystem.inc:203
  msgid "Cups Server"
  msgstr "Cups server"
  
-#: plugins/admin/systems/class_divListSystem.inc:166
+#: plugins/admin/systems/class_divListSystem.inc:204
  msgid "Log Db"
  msgstr "Log DB"
  
-#: plugins/admin/systems/class_divListSystem.inc:167
+#: plugins/admin/systems/class_divListSystem.inc:205
  msgid "Syslog Server"
  msgstr "Syslog server"
  
-#: plugins/admin/systems/class_divListSystem.inc:168
+#: plugins/admin/systems/class_divListSystem.inc:206
  msgid "Mail Server"
  msgstr "Mail server"
  
-#: plugins/admin/systems/class_divListSystem.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:207
  msgid "Imap Server"
  msgstr "Imap server"
  
-#: plugins/admin/systems/class_divListSystem.inc:170
+#: plugins/admin/systems/class_divListSystem.inc:208
  msgid "Nfs Server"
  msgstr "Nfs server"
  
-#: plugins/admin/systems/class_divListSystem.inc:171
+#: plugins/admin/systems/class_divListSystem.inc:209
  msgid "Kerberos Server"
  msgstr "Kerberos server"
  
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:210
  msgid "Asterisk Server"
  msgstr "Asterisk server"
  
-#: plugins/admin/systems/class_divListSystem.inc:173
+#: plugins/admin/systems/class_divListSystem.inc:211
  msgid "Fax Server"
  msgstr "Fax server"
  
-#: plugins/admin/systems/class_divListSystem.inc:174
+#: plugins/admin/systems/class_divListSystem.inc:212
  msgid "Ldap Server"
  msgstr "Ldap server"
  
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/acl/class_divListACL.inc:123
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/acl/class_divListACL.inc:128
  msgid "Edit system"
  msgstr "Bewerk systeem"
  
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/acl/class_divListACL.inc:126
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/acl/class_divListACL.inc:132
  msgid "Delete system"
  msgstr "Verwijder systeem"
  
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_divListSystem.inc:308
  msgid "Set root       password"
  msgstr "Stel root    wachtwoord in"
  
-#: plugins/admin/systems/class_divListSystem.inc:229
+#: plugins/admin/systems/class_divListSystem.inc:315
  #, fuzzy
  msgid "Create CD"
  msgstr "Aanmaken"
  
-#: plugins/admin/systems/class_divListSystem.inc:230
+#: plugins/admin/systems/class_divListSystem.inc:316
  #, fuzzy
  msgid "Create FAI CD"
  msgstr "Nieuw FAI object aanmaken"
@@ -11841,6 +11817,10 @@ msgstr "De opgegeven apparaat naam wordt al gebruikt."
  msgid "Cups"
  msgstr "omhoog"
  
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr ""
+
  #: plugins/admin/systems/goLdapServer.tpl:1
  #: plugins/admin/systems/class_goLdapServer.inc:28
  #, fuzzy
@@ -11945,6 +11925,16 @@ msgstr "Print service"
  msgid "Remove service"
  msgstr "Verwijder DNS service"
  
+#: plugins/admin/systems/class_goTerminalServer.inc:31
+#: plugins/admin/systems/class_goTerminalServer.inc:54
+#: plugins/admin/systems/class_goTerminalServer.inc:117
+#: plugins/admin/systems/class_goTerminalServer.inc:118
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#: plugins/admin/systems/class_terminalService.inc:467
+#, fuzzy
+msgid "Terminal service"
+msgstr "Terminal Service"
+
  #: plugins/admin/systems/class_goTerminalServer.inc:78
  #, fuzzy, php-format
  msgid "Saving server services/terminalServer with dn '%s' failed."
@@ -11959,6 +11949,12 @@ msgstr "Terminal server moet een fontpath hebben."
  msgid "Temporary disable login"
  msgstr "Schakel inlog mogelijkheid tijdelijk uit"
  
+#: plugins/admin/systems/class_goTerminalServer.inc:127
+#: plugins/admin/systems/goTerminalServer.tpl:12
+#: plugins/admin/systems/class_terminalService.inc:478
+msgid "Font path"
+msgstr "Fontpad"
+
  #: plugins/admin/systems/class_serverService.inc:288
  msgid "Can't set status while this server is not saved."
  msgstr ""
@@ -12690,18 +12686,56 @@ msgstr "Het opslaan van de printer is mislukt"
  msgid "Saving of server services/"
  msgstr "Sieve service"
  
-#: plugins/admin/systems/class_goService.inc:147
-#, fuzzy, php-format
-msgid "Set status flag for server services/"
-msgstr "Het opslaan van het server service object is mislukt"
+#: plugins/admin/systems/class_goService.inc:147
+#, fuzzy, php-format
+msgid "Set status flag for server services/"
+msgstr "Het opslaan van het server service object is mislukt"
+
+#: plugins/admin/systems/class_goService.inc:204
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
+"bestaat niet."
+
+#: plugins/admin/systems/class_terminalService.inc:157
+msgid "default"
+msgstr "standaard"
+
+#: plugins/admin/systems/class_terminalService.inc:457
+#, fuzzy, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr "Het opslaan van terminal service informatie is mislukt"
+
+#: plugins/admin/systems/class_terminalService.inc:476
+#: plugins/admin/ogroups/class_phonequeue.inc:748
+#, fuzzy
+msgid "Method"
+msgstr "methode"
+
+#: plugins/admin/systems/class_terminalService.inc:484
+msgid "Auto-Sync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:485
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Print service"
  
-#: plugins/admin/systems/class_goService.inc:204
-#, fuzzy, php-format
-msgid ""
-"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+#: plugins/admin/systems/class_terminalService.inc:488
+#, fuzzy
+msgid "Scanner model"
+msgstr "gedeactiveerd"
+
+#: plugins/admin/systems/class_terminalService.inc:489
+msgid "Haeh ? "
  msgstr ""
-"Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
-"bestaat niet."
+
+#: plugins/admin/systems/class_terminalService.inc:490
+#, fuzzy
+msgid "..."
+msgstr ".."
  
  #: plugins/admin/ogroups/termgroup.tpl:2
  msgid ""
@@ -12726,8 +12760,8 @@ msgstr "Lidmaatschap objecten"
  msgid "Phone queue"
  msgstr "Telefoonwachtrij"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:88
-#: plugins/admin/ogroups/class_termgroup.inc:383
+#: plugins/admin/ogroups/tabs_ogroups.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:382
  msgid "System"
  msgstr "Systeem"
  
@@ -12735,20 +12769,25 @@ msgstr "Systeem"
  msgid "Terminals"
  msgstr "Terminals"
  
-#: plugins/admin/ogroups/class_termgroup.inc:114
+#: plugins/admin/ogroups/class_termgroup.inc:108
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr ""
+"U heeft geen toestemming om een werkstation aan te maken onder deze 'basis'"
+
+#: plugins/admin/ogroups/class_termgroup.inc:113
  msgid "There must be at least one NTP server selected."
  msgstr "Er moet tenminste een NTP server geselecteerd zijn."
  
-#: plugins/admin/ogroups/class_termgroup.inc:168
+#: plugins/admin/ogroups/class_termgroup.inc:167
  #, php-format
  msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:376
+#: plugins/admin/ogroups/class_termgroup.inc:375
  msgid "Saving workstation failed"
  msgstr "Het opslaan van het werkstation is mislukt"
  
-#: plugins/admin/ogroups/class_termgroup.inc:384
+#: plugins/admin/ogroups/class_termgroup.inc:383
  #, fuzzy
  msgid "System group"
  msgstr "Systeem status"
@@ -12810,18 +12849,18 @@ msgid "Display objects of department"
  msgstr "Toon objecten van afdeling"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:715
+#: plugins/admin/ogroups/class_ogroup.inc:698
  #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
  msgid "Object groups"
  msgstr "Objectgroepen"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:159
+#: plugins/admin/ogroups/class_ogroupManagement.inc:154
  #, php-format
  msgid "You're about to delete the object group '%s'."
  msgstr "U staat op het punt de objectgroep '%s' te verwijderen."
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:165
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:160
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
  msgid "You are not allowed to delete this object group!"
  msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
  
@@ -12829,78 +12868,78 @@ msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
  msgid "This 'dn' is no object group."
  msgstr "Deze 'dn' is geen objectgroep."
  
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:290
  msgid "too many different objects!"
  msgstr "te veel verschillende object tpyes!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:292
  msgid "users"
  msgstr "gebruikers"
  
-#: plugins/admin/ogroups/class_ogroup.inc:295
+#: plugins/admin/ogroups/class_ogroup.inc:293
  msgid "groups"
  msgstr "groepen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:294
  msgid "applications"
  msgstr "programma's"
  
-#: plugins/admin/ogroups/class_ogroup.inc:297
+#: plugins/admin/ogroups/class_ogroup.inc:295
  msgid "departments"
  msgstr "afdelingen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:296
  msgid "servers"
  msgstr "servers"
  
-#: plugins/admin/ogroups/class_ogroup.inc:299
+#: plugins/admin/ogroups/class_ogroup.inc:297
  msgid "workstations"
  msgstr "werkstations"
  
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:298
  msgid "terminals"
  msgstr "terminals"
  
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:299
  msgid "phones"
  msgstr "telefoons"
  
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:300
  msgid "printers"
  msgstr "printers"
  
-#: plugins/admin/ogroups/class_ogroup.inc:309
+#: plugins/admin/ogroups/class_ogroup.inc:307
  msgid "and"
  msgstr "en"
  
-#: plugins/admin/ogroups/class_ogroup.inc:462
+#: plugins/admin/ogroups/class_ogroup.inc:444
  msgid "Non existing dn:"
  msgstr "Niet bestaande dn: "
  
-#: plugins/admin/ogroups/class_ogroup.inc:604
+#: plugins/admin/ogroups/class_ogroup.inc:586
  msgid "There is already an object with this cn."
  msgstr "Er bestaat al een object met deze cn."
  
-#: plugins/admin/ogroups/class_ogroup.inc:618
+#: plugins/admin/ogroups/class_ogroup.inc:601
  msgid "You can combine two different object types at maximum only!"
  msgstr "U kunt maximaal twee verschillende object types tegelijk combineren!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:667
+#: plugins/admin/ogroups/class_ogroup.inc:650
  #, fuzzy, php-format
  msgid "Saving of object group/generic with dn '%s' failed."
  msgstr "Het opslaan van de objectgroep is mislukt"
  
-#: plugins/admin/ogroups/class_ogroup.inc:680
+#: plugins/admin/ogroups/class_ogroup.inc:663
  #, fuzzy, php-format
  msgid "Removing of object group/generic with dn '%s' failed."
  msgstr "Het verwijderen van de objectgroep is mislukt"
  
-#: plugins/admin/ogroups/class_ogroup.inc:710
+#: plugins/admin/ogroups/class_ogroup.inc:693
  #, fuzzy
  msgid "Object group generic"
  msgstr "Objectgroep"
  
-#: plugins/admin/ogroups/class_ogroup.inc:721
+#: plugins/admin/ogroups/class_ogroup.inc:704
  #, fuzzy
  msgid "Member"
  msgstr "Groepsleden"
@@ -13157,7 +13196,7 @@ msgstr ""
  "niet opgeslagen worden."
  
  #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:307
  #, php-format
  msgid ""
  "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13171,9 +13210,9 @@ msgstr ""
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:97
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:317
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/macro/class_gofonMacro.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
+#: plugins/gofon/macro/class_gofonMacro.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:318
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:434
  #, php-format
  msgid "Can't select database %s on %s."
  msgstr "Kan de database %s op %s niet selecteren."
@@ -13189,8 +13228,8 @@ msgstr "Kan de database %s op Server %s niet verwijderen."
  #: plugins/admin/ogroups/class_phonequeue.inc:537
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1185
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:474
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:476
  #, php-format
  msgid "The specified telephonenumber '%s' is already assigned to '%s'."
  msgstr "Het opgegeven telefoonnummer '%s' is al toegekend aan '%s'."
@@ -13204,8 +13243,8 @@ msgstr "Het opslaan van E-mail objectgroep instellingen is mislukt"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:90
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1067
-#: plugins/gofon/macro/class_gofonMacro.inc:234
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:423
  #, php-format
  msgid ""
  "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13369,16 +13408,16 @@ msgstr "Selecteer om groepen die printers bevatten te tonen"
  msgid "Show groups containing phones"
  msgstr "Toon groepen die telefoons bevatten"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
  msgid "Create new object group"
  msgstr "Nieuwe objectgroep aanmaken"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:207
  #, fuzzy
  msgid "You are not allowed to remove this entry."
  msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:218
+#: plugins/admin/ogroups/class_divListOGroup.inc:222
  #: plugins/generic/references/class_reference.inc:50
  msgid "Object group"
  msgstr "Objectgroep"
@@ -13393,17 +13432,32 @@ msgstr "Geef a.u.b. een nieuwe naam op"
  msgid "ACLs"
  msgstr "Rechten"
  
-#: plugins/admin/acl/class_aclManagement.inc:159
+#: plugins/admin/acl/class_aclManagement.inc:122
+#, fuzzy
+msgid "You are not allowed to edit this acl."
+msgstr "U heeft geen toestemming om deze macro te verwijderen!"
+
+#: plugins/admin/acl/class_aclManagement.inc:167
  #, fuzzy, php-format
  msgid "You're about to delete the acl %s."
  msgstr "U staat op het punt de macro '%s' te verwijderen."
  
-#: plugins/admin/acl/class_aclManagement.inc:165
-#: plugins/admin/acl/class_aclManagement.inc:191
+#: plugins/admin/acl/class_aclManagement.inc:173
+#: plugins/admin/acl/class_aclManagement.inc:198
  #, fuzzy
  msgid "You are not allowed to delete this acl!"
  msgstr "U heeft geen toestemming om deze macro te verwijderen!"
  
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430
+#, fuzzy
+msgid "Access control list"
+msgstr "Toegangsopties"
+
+#: plugins/admin/acl/class_aclManagement.inc:433
+msgid "I don't know Jack"
+msgstr ""
+
  #: plugins/admin/acl/class_divListACL.inc:31
  #, fuzzy
  msgid "List of acl"
@@ -13421,36 +13475,16 @@ msgstr ""
  "Dit menu maakt het mogelijk om FAI klassen aan te maken, bewerken en "
  "verwijderen."
  
-#: plugins/admin/acl/class_divListACL.inc:61
+#: plugins/admin/acl/class_divListACL.inc:60
  #, fuzzy
  msgid "Display acls matching"
  msgstr "Toon overeenkomende macro's"
  
-#: plugins/admin/acl/class_divListACL.inc:109
+#: plugins/admin/acl/class_divListACL.inc:115
  #, fuzzy
  msgid "Acl"
  msgstr "Alle"
  
-#: plugins/admin/acl/class_divListACL.inc:153
-#, fuzzy
-msgid "Select to display users"
-msgstr "Selecteer om gewone gebruikers te tonen"
-
-#: plugins/admin/acl/class_divListACL.inc:153
-#, fuzzy
-msgid "Display user"
-msgstr "Getoonde naam"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-#, fuzzy
-msgid "Select to display departments"
-msgstr "Selecteer om afdelingen te zien"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-#, fuzzy
-msgid "Display departments"
-msgstr "Toon overeenkomende afdelingen"
-
  #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
  #, fuzzy
  msgid "ACL management"
@@ -13476,35 +13510,37 @@ msgstr "Kies een te bewerken of verwijderen variabele"
  msgid "Fully Automatic Installation"
  msgstr "Fully Automatic Installation"
  
-#: plugins/admin/fai/class_faiScript.inc:422
+#: plugins/admin/fai/class_faiScript.inc:433
  #, fuzzy, php-format
  msgid "Creating of FAI/script with dn '%s' failed."
  msgstr "Het aanmaken van de FAI script basis is mislukt"
  
-#: plugins/admin/fai/class_faiScript.inc:519
+#: plugins/admin/fai/class_faiScript.inc:530
  #: plugins/admin/fai/class_faiHookEntry.inc:191
  #, fuzzy
  msgid "FAI script"
  msgstr "Importeer script"
  
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
+#: plugins/admin/fai/class_faiPackage.inc:539
+#: plugins/admin/fai/class_faiPackage.inc:542
  #, fuzzy
  msgid "Readonly"
  msgstr "Lezen"
  
-#: plugins/admin/fai/class_faiTemplate.inc:401
+#: plugins/admin/fai/class_faiTemplate.inc:414
  #, fuzzy, php-format
  msgid "Saving of FAI/template with dn '%s' failed."
  msgstr "Het opslaan van de FAI sjabloon basis is mislukt"
  
-#: plugins/admin/fai/class_faiTemplate.inc:487
+#: plugins/admin/fai/class_faiTemplate.inc:500
  #, fuzzy
  msgid "FAI template"
  msgstr "Nieuw sjabloon"
  
  #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:853
+#: plugins/admin/fai/class_faiManagement.inc:863
  msgid "FAI"
  msgstr "FAI"
  
@@ -13549,18 +13585,18 @@ msgstr "De opgegeven bevriesnaam is ongeldig."
  msgid "You are not allowed to create a new branch."
  msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
  
-#: plugins/admin/fai/class_faiManagement.inc:506
-#: plugins/admin/fai/class_faiManagement.inc:522
+#: plugins/admin/fai/class_faiManagement.inc:516
+#: plugins/admin/fai/class_faiManagement.inc:532
  #, fuzzy, php-format
  msgid "You are not allowed to create a new '%s' object."
  msgstr "U heeft geen toestemming deze objectgroep te verwijderen!"
  
-#: plugins/admin/fai/class_faiManagement.inc:847
+#: plugins/admin/fai/class_faiManagement.inc:857
  #, fuzzy
  msgid "FAI releases"
  msgstr "FAI klassen"
  
-#: plugins/admin/fai/class_faiManagement.inc:848
+#: plugins/admin/fai/class_faiManagement.inc:858
  #, fuzzy
  msgid "FAI release management"
  msgstr "Blokkeerlijst beheer"
@@ -13582,11 +13618,11 @@ msgstr "Gebruikte pakketten"
  msgid "Choosen packages"
  msgstr "Gekozen pakketten"
  
-#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:674
  msgid "Configure"
  msgstr "Instellen"
  
-#: plugins/admin/fai/faiPackage.tpl:80
+#: plugins/admin/fai/faiPackage.tpl:87
  msgid "Toggle remove flag"
  msgstr "Verwijder markering omschakelen"
  
@@ -13772,7 +13808,7 @@ msgstr "Pakketbundel"
  #: plugins/admin/fai/class_faiProfile.inc:298
  #: plugins/admin/fai/class_faiPartitionTable.inc:520
  #: plugins/admin/fai/class_faiProfileEntry.inc:140
-#: plugins/admin/fai/class_faiSummaryTab.inc:45
+#: plugins/admin/fai/class_faiSummaryTab.inc:48
  msgid "Partition table"
  msgstr "Partitietabel"
  
@@ -13825,61 +13861,66 @@ msgstr "Toon FAI inhakers"
  
  #: plugins/admin/fai/class_faiHook.inc:535
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #, fuzzy
  msgid "Read only"
  msgstr "Lezen"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  #, fuzzy
  msgid "primary"
  msgstr "Primaire groep"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  #, fuzzy
  msgid "logical"
  msgstr "Lokaal toevoegen"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
  msgid "FS type"
  msgstr "FS type"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
-#: plugins/admin/fai/class_faiSummaryTab.inc:317
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:468
+#: plugins/admin/fai/class_faiSummaryTab.inc:344
  msgid "Mount point"
  msgstr "Koppelpunt"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
-#: plugins/admin/fai/class_faiSummaryTab.inc:316
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:343
  msgid "Size in MB"
  msgstr "Grootte in MB"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
-#: plugins/admin/fai/class_faiSummaryTab.inc:315
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:470
+#: plugins/admin/fai/class_faiSummaryTab.inc:342
  msgid "Mount options"
  msgstr "Koppelopties"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
  msgid "FS option"
  msgstr "FS opties"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
  msgid "Preserve"
  msgstr "Bewaar"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:368
+#, fuzzy
+msgid "Please specify a valid disc name."
+msgstr "Geef a.u.b. een geldige scriptnaam op."
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
  #, php-format
  msgid "please enter a unique mount point for partition %s"
  msgstr "Geef a.u.b. een uniek koppelpunt op voor partitie %s"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
  #, php-format
  msgid "Please enter a valid mount point for partition %s."
  msgstr "Geef a.u.b. een geldig koppelpunt op voor partitie %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:401
  #, php-format
  msgid ""
  "File system type 'swap' is already used, change file system type for "
@@ -13888,30 +13929,30 @@ msgstr ""
  "Bestandssysteem type 'swap' wordt al gebruikt. Verander bestandssysteem type "
  "voor partitie %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:405
  msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
  msgstr ""
  "Gebruik a.u.b. 'swap' als koppelpunt indien 'swap' gebruikt wordt als fs-"
  "type."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:411
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:415
  #, php-format
  msgid "Please enter a valid partition size for partition %s."
  msgstr "Geef a.u.b. een geldige partitie grootte op voor partitie %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:412
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:421
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:423
  #, php-format
  msgid "Please enter a valid range for partition %s."
  msgstr "Geef a.u.b. een geldig bereik op voor partitie %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:428
  #, php-format
  msgid "Please enter a range for partition size for partition %s."
  msgstr "Geef a.u.b. een bereik op voor de partitie grootte van partitie %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:434
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:443
  msgid ""
  "You have more than 3 primary partition table entries in your configuration, "
  "please check your configuration twice."
@@ -13919,42 +13960,42 @@ msgstr ""
  "U heeft meer dan 3 primaire partitietabel regels in uw configuratie. "
  "Controleer uw configuratie a.u.b. nogmaals."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:446
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
  #, fuzzy
  msgid "Partition table entry"
  msgstr "Partitietabel"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
  #, fuzzy
  msgid "FAI partition table entry"
  msgstr "Nieuwe partitietabel"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:465
  #, fuzzy
  msgid "Partition type"
  msgstr "Partitietabel"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:466
  #, fuzzy
  msgid "Partition no."
  msgstr "Partities"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:467
  #, fuzzy
  msgid "File system type"
  msgstr "Systeemtype"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:469
  #, fuzzy
  msgid "Partition size"
  msgstr "Partities"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:471
  #, fuzzy
  msgid "File system options"
  msgstr "systeem informatie bekijken"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:472
  #, fuzzy
  msgid "Partition flags"
  msgstr "Partities"
@@ -14158,12 +14199,12 @@ msgstr "Kies een klassenaam"
  msgid "A new class name."
  msgstr "Een nieuwe klassenaam."
  
-#: plugins/admin/fai/class_faiVariable.inc:334
+#: plugins/admin/fai/class_faiVariable.inc:330
  #, fuzzy, php-format
  msgid "Saving of FAI/variable with dn '%s' failed."
  msgstr "Het opslaan van de FAI variabele basis is mislukt"
  
-#: plugins/admin/fai/class_faiVariable.inc:413
+#: plugins/admin/fai/class_faiVariable.inc:409
  #, fuzzy
  msgid "FAI variable"
  msgstr "Toon FAI variabelen"
@@ -14244,7 +14285,7 @@ msgid "Destination path"
  msgstr "Doelpad"
  
  #: plugins/admin/fai/faiTemplateEntry.tpl:74
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:577
  #: plugins/gofon/conference/class_divListConferences.inc:53
  msgid "Owner"
  msgstr "Eigenaar"
@@ -14415,35 +14456,36 @@ msgstr ""
  "voor deze aftakkingen. Verzeker uzelf hiervan, aangezien er geen "
  "mogelijkheid voor GOsa is om deze informatie terug te halen."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:41
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
  msgid "Scripts"
  msgstr "Scripts"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:46
+#: plugins/admin/fai/class_faiSummaryTab.inc:49
  msgid "Package list"
  msgstr "Pakketlijst"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:86
+msgid ""
+"Unknown type of FAI source information. This is not a profile, workstation "
+"nor a ogroup."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:217
  msgid "This object has no FAI classes assigned."
  msgstr "Dit object heeft geen FAI klassen toegewezen gekregen."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:203
+#: plugins/admin/fai/class_faiSummaryTab.inc:230
  msgid "Open"
  msgstr "Open"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:312
+#: plugins/admin/fai/class_faiSummaryTab.inc:339
  msgid "No."
  msgstr "Aantal"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:314
+#: plugins/admin/fai/class_faiSummaryTab.inc:341
  msgid "FS options"
  msgstr "FS opties"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:553
-#, fuzzy
-msgid "Viewable"
-msgstr "Variabele"
-
  #: plugins/admin/fai/branch_selector.tpl:21
  msgid "Create new branch"
  msgstr "Maak nieuwe tak aan"
@@ -14531,94 +14573,94 @@ msgstr "Toon FAI partities"
  msgid "Show partitions"
  msgstr "Toon partities"
  
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "New profile"
  msgstr "Nieuw profiel"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "New partition table"
  msgstr "Nieuwe partitietabel"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "PT"
  msgstr "PT"
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "New scripts"
  msgstr "Nieuwe scripts"
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "S"
  msgstr "SC"
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "New hooks"
  msgstr "Nieuwe inhakers"
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "H"
  msgstr "H"
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "New variables"
  msgstr "Nieuwe variabelen"
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "V"
  msgstr "V"
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "New templates "
  msgstr "Nieuwe sjablonen"
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "I"
  msgstr "NI"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "New package list"
  msgstr "Nieuwe pakketlijst"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "PK"
  msgstr "PK"
  
-#: plugins/admin/fai/class_divListFai.inc:242
-#: plugins/admin/fai/class_divListFai.inc:245
+#: plugins/admin/fai/class_divListFai.inc:240
+#: plugins/admin/fai/class_divListFai.inc:243
  msgid "Edit class"
  msgstr "Bewerk klasse"
  
-#: plugins/admin/fai/class_divListFai.inc:253
+#: plugins/admin/fai/class_divListFai.inc:251
  msgid "Delete class"
  msgstr "Verwijder klasse"
  
-#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/generic.tpl:12
  #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:180
  #, fuzzy
  msgid "Mime type"
  msgstr "MIME-type"
  
-#: plugins/admin/mimetypes/generic.tpl:17
+#: plugins/admin/mimetypes/generic.tpl:16
  #: plugins/admin/mimetypes/paste_generic.tpl:16
  #, fuzzy
  msgid "Please enter a name for the mime type here"
  msgstr "Voer a.u.b. een naam voor de conferentie in."
  
-#: plugins/admin/mimetypes/generic.tpl:23
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:673
+#: plugins/admin/mimetypes/generic.tpl:22
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:681
  #, fuzzy
  msgid "Mime group"
  msgstr "Primaire groep"
  
-#: plugins/admin/mimetypes/generic.tpl:27
+#: plugins/admin/mimetypes/generic.tpl:26
  #, fuzzy
  msgid "Categorize this mime type"
  msgstr "Categorie voor deze subtree"
  
-#: plugins/admin/mimetypes/generic.tpl:39
+#: plugins/admin/mimetypes/generic.tpl:38
  #, fuzzy
  msgid "Please specify a description"
  msgstr "Geef a.u.b. een geldige scriptnaam op."
@@ -14637,7 +14679,7 @@ msgid "Left click"
  msgstr ""
  
  #: plugins/admin/mimetypes/generic.tpl:99
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:679
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:687
  #, fuzzy
  msgid "File patterns"
  msgstr "Filters"
@@ -14679,64 +14721,58 @@ msgstr ""
  msgid "Ask whether to save to local disk"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:461
  #, php-format
  msgid "Saving of mime type/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:452
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:470
  #, fuzzy, php-format
  msgid "Removing of mime type/generic with dn '%s' failed."
  msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:464
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:482
  #, fuzzy, php-format
  msgid "Removing mime type from objectgroup '%s' failed"
  msgstr "Het verwijderen van het programma van objectgroep '%s' is mislukt"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:474
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:492
  #, fuzzy
  msgid "Please specify a valid name for this mime type."
  msgstr "Geef a.u.b. een geldige naam op voor deze bijlage."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:477
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:495
  #, fuzzy
  msgid "Please specify at least one file pattern."
  msgstr "Geef a.u.b. een geldige naam op voor deze bijlage."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:490
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:508
  #, fuzzy
  msgid "There's already a mime type with this 'Name'."
  msgstr "Er is al een programma met deze 'Naam'."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:498
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:516
  #, fuzzy
  msgid "There's already an mime with this 'Name'."
  msgstr "Er is al een programma met deze 'Naam'."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:510
-#, fuzzy
-msgid "You have no permissions to create a mime type on this 'Base'."
-msgstr ""
-"U heeft geen toestemming om een telefoon aan te maken onder deze 'Basis'."
-
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
  #, fuzzy
  msgid "Mime type generic"
  msgstr "MIME-type"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
  #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
  #, fuzzy
  msgid "Mime types"
  msgstr "MIME-type"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:685
  #, fuzzy
  msgid "Left click action"
  msgstr "Programma's aanmaken"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:688
  #, fuzzy
  msgid "Embedded applications"
  msgstr "Gebruikte programma's"
@@ -14746,13 +14782,13 @@ msgstr "Gebruikte programma's"
  msgid "Manage mime types"
  msgstr "OS-types beheren"
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:276
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:278
  #, fuzzy, php-format
  msgid "You're about to delete the mime type '%s'."
  msgstr "U staat op het punt de invoer %s te verwijderen."
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:282
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:311
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:313
  #, fuzzy
  msgid "You are not allowed to delete this mime type!"
  msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
@@ -14789,7 +14825,7 @@ msgstr "MIME-type"
  msgid "Display mime types matching"
  msgstr "Toon de overeenkomende cartridgetypes"
  
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:140
  #, fuzzy
  msgid "Create new mime type"
  msgstr "Maak nieuw sjabloon"
@@ -14825,7 +14861,7 @@ msgstr "niet gedefiniëerd"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:658
  #: plugins/gofon/macro/class_gofonMacro.inc:95
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:286
  msgid ""
  "There is currently no asterisk server defined. Possibly you are missing a "
  "server that handles the asterisk management (goFonServer). Your settings "
@@ -14966,23 +15002,28 @@ msgstr "Het verwijderen van het telefoon account is mislukt"
  msgid "Phone account settings"
  msgstr "Telefoon instellingen"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1237
+#, fuzzy
+msgid "GOfon reports"
+msgstr "Tel. rapporten"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:576
  #, fuzzy
  msgid "Telephone number"
  msgstr "Telefoonnummer"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1242
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
  #, fuzzy
  msgid "Macro settings"
  msgstr "E-mail instellingen"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1246
  #, fuzzy
  msgid "Telephone pin"
  msgstr "Telefoon"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1247
  #, fuzzy
  msgid "Voicemail pin"
  msgstr "Voicemail PIN-code"
@@ -15023,7 +15064,7 @@ msgid "Regular expression for matching macro names"
  msgstr "Reguliere expressie voor overeenkomende macronamen"
  
  #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
-#: plugins/gofon/macro/class_gofonMacro.inc:483
+#: plugins/gofon/macro/class_gofonMacro.inc:496
  msgid "Macro name"
  msgstr "Macronaam"
  
@@ -15043,13 +15084,13 @@ msgstr "Macro tekst"
  msgid "Phone macros"
  msgstr "Tel. macro's"
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:207
  #, php-format
  msgid "You're about to delete the macro '%s'."
  msgstr "U staat op het punt de macro '%s' te verwijderen."
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:214
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:213
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
  msgid "You are not allowed to delete this macro!"
  msgstr "U heeft geen toestemming om deze macro te verwijderen!"
  
@@ -15058,7 +15099,7 @@ msgstr "U heeft geen toestemming om deze macro te verwijderen!"
  msgid "This 'dn' is no phone macro."
  msgstr "Deze 'dn' is geen telefoonmacro."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:185
+#: plugins/gofon/macro/class_gofonMacro.inc:183
  msgid ""
  "This macro ist still in use. To delete this Macro ensure that nobody has "
  "selected this Macro."
@@ -15066,14 +15107,14 @@ msgstr ""
  "Deze macro is nog steeds in gebruik. Verzeker uzelf ervan dat geen enkele "
  "gebruiker deze macro geselecteerd heeft."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: plugins/gofon/macro/class_gofonMacro.inc:190
+#: plugins/gofon/macro/class_gofonMacro.inc:205
  #: plugins/gofon/macro/class_gofonMacroParameters.inc:402
  #, fuzzy, php-format
  msgid "Removing of goFonMacro/generic account with dn '%s' failed."
  msgstr "Het verwijderen van het algemene gebruikers account is mislukt"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:220
+#: plugins/gofon/macro/class_gofonMacro.inc:218
  msgid ""
  "There is no mysql extension available in your php setup, can't save any "
  "changes to asterisk db."
@@ -15081,66 +15122,71 @@ msgstr ""
  "Kan geen veranderingen opslaan in de Asterisk database. Er is geen MySQL "
  "extensie beschikbaar. Controleer uw PHP installatie."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:290
+#: plugins/gofon/macro/class_gofonMacro.inc:288
  #, php-format
  msgid "Unable to parse macro contents on line: %s"
  msgstr "Kon de macro-inhoud op regel %s niet verwerken"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:308
+#: plugins/gofon/macro/class_gofonMacro.inc:306
  #, php-format
  msgid "Can't perform SELECT query in DB '%s'"
  msgstr "Kan SELECT zoekopdracht in DB '%s' niet uitvoeren"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:317
-#: plugins/gofon/macro/class_gofonMacro.inc:325
+#: plugins/gofon/macro/class_gofonMacro.inc:315
+#: plugins/gofon/macro/class_gofonMacro.inc:323
  #, php-format
  msgid "Can't perform DELETE query in DB '%s'"
  msgstr "Kan DELETE opdracht in DB '%s' niet uitvoeren"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:339
+#: plugins/gofon/macro/class_gofonMacro.inc:337
  #, php-format
  msgid "Can't perform INSERT query in DB '%s'"
  msgstr "Kan INSERT opdracht in DB '%s' niet uitvoeren"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:405
+#: plugins/gofon/macro/class_gofonMacro.inc:417
  #, php-format
  msgid "The given cn '%s' already exists."
  msgstr "De opgegeven cn '%s' bestaat al."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:422
  msgid "You must specify the 'Display Name' in order to save this macro"
  msgstr "U moet de 'Display Naam' opgeven om deze macro op te slaan"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:414
+#: plugins/gofon/macro/class_gofonMacro.inc:426
  msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
  msgstr ""
  "De opgegeven cn is te lang om een Macro invoer te maken. Maximaal 20 "
  "karakters."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:418
+#: plugins/gofon/macro/class_gofonMacro.inc:430
  msgid "Makro length must be lower than 100 lines"
  msgstr "De macro lengte moet minder dan 100 regels zijn"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:423
+#: plugins/gofon/macro/class_gofonMacro.inc:435
  msgid "Please choose a valid  base."
  msgstr "Geef a.u.b. een geldige basis op."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:478
  #, fuzzy, php-format
  msgid "Saving of goFonMacro/generic account with dn '%s' failed."
  msgstr "Het opslaan van het Open-Xchange account is mislukt"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/macro/class_gofonMacro.inc:487
  #, fuzzy
  msgid "Asterisk macro management"
  msgstr "Asterisk beheer"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:487
+#: plugins/gofon/macro/class_gofonMacro.inc:492
+#, fuzzy
+msgid "GOfon macro"
+msgstr "geen macro"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:500
  #, fuzzy
-msgid "Macro content"
+msgid "Macro content and parameter"
  msgstr "Macro tekst"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:488
+#: plugins/gofon/macro/class_gofonMacro.inc:501
  msgid "Visibility flag"
  msgstr ""
  
@@ -15200,34 +15246,32 @@ msgstr "Macronaam"
  msgid "Visible"
  msgstr "Zichtbaar"
  
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "Create new phone macro"
  msgstr "Nieuwe telefoonmacro aanmaken"
  
-#: plugins/gofon/macro/class_divListMacros.inc:132
-#: plugins/gofon/macro/class_divListMacros.inc:160
-#, fuzzy
-msgid "Edit macro"
-msgstr "Bewerk share"
-
-#: plugins/gofon/macro/class_divListMacros.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:168
-#, fuzzy
-msgid "Delete macro"
-msgstr "Verwijder gebruiker"
-
-#: plugins/gofon/macro/class_divListMacros.inc:137
+#: plugins/gofon/macro/class_divListMacros.inc:124
  msgid "Macro"
  msgstr "Macro"
  
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  msgid "visible"
  msgstr "zichtbaar"
  
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  msgid "invisible"
  msgstr "onzichtbaar"
  
+#: plugins/gofon/macro/class_divListMacros.inc:147
+#, fuzzy
+msgid "Edit macro"
+msgstr "Bewerk share"
+
+#: plugins/gofon/macro/class_divListMacros.inc:155
+#, fuzzy
+msgid "Delete macro"
+msgstr "Verwijder gebruiker"
+
  #: plugins/gofon/conference/headpage.tpl:6
  #: plugins/gofon/conference/class_divListConferences.inc:31
  #: plugins/gofon/conference/class_divListConferences.inc:32
@@ -15266,7 +15310,7 @@ msgid "Lifetime (in days)"
  msgstr "Geldigheidsduur (in dagen)"
  
  #: plugins/gofon/conference/generic.tpl:137
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:566
  msgid "Preset PIN"
  msgstr "Voorgedefinieerde PIN-code"
  
@@ -15276,7 +15320,7 @@ msgid "PIN"
  msgstr "PIN-code"
  
  #: plugins/gofon/conference/generic.tpl:157
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
  msgid "Record conference"
  msgstr "Conferentie opnemen"
  
@@ -15285,7 +15329,7 @@ msgid "Sound file format"
  msgstr "Geluidsbestand formaat"
  
  #: plugins/gofon/conference/generic.tpl:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:568
  msgid "Play music on hold"
  msgstr "Muziek afspelen bij wachtstand"
  
@@ -15314,7 +15358,7 @@ msgstr "Beheer"
  msgid "Removing of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:252
  msgid ""
  "You have specified a conference 'without PIN' ... please leave the PIN "
  "fields empty."
@@ -15322,24 +15366,24 @@ msgstr ""
  "U heeft een conferentie 'zonder PIN-code' gespecificeerd ... laat a.u.b. de "
  "PIN-code velden leeg."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
  msgid "Please enter a PIN."
  msgstr "Voer a.u.b. een PIN-code in."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:260
  msgid "Please enter a name for the conference."
  msgstr "Voer a.u.b. een naam voor de conferentie in."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:251
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:264
  msgid "Only numeric chars are allowed in Number field."
  msgstr "Alleen nummerieke karakters zijn toegestaan in het nummer veld."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:268
  msgid "Only numbers are allowed in Lifetime."
  msgstr "Alleen nummerieke waardes zijn toegestaan in geldigheidsduur"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:298
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:408
  msgid ""
  "Can't save any changes to asterisk database, there is currently no mysql "
  "extension available in your php setup."
@@ -15347,56 +15391,57 @@ msgstr ""
  "Kan geen veranderingen opslaan in de Asterisk database. Er is geen MySQL "
  "extensie beschikbaar. Controleer uw PHP installatie."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
  #, php-format
  msgid "Saving of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
-#: plugins/gofon/conference/class_divListConferences.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_divListConferences.inc:198
  msgid "Conference"
  msgstr "Conferentie"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:552
  #, fuzzy
  msgid "Phone conference management"
  msgstr "Conferentie beheer"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
-msgid "GOfon"
-msgstr ""
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#, fuzzy
+msgid "GOfon conference"
+msgstr "Tel. conferenties"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
  #, fuzzy
  msgid "Conference PIN"
  msgstr "Conferentie"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:569
  #, fuzzy
  msgid "Activate menu"
  msgstr "Activeer sessiemenu"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:570
  #, fuzzy
  msgid "Announce user activity"
  msgstr "Aankondigingsfrequentie"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:571
  #, fuzzy
  msgid "Count user"
  msgstr "Tel het aantal gebruikers"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:572
  #, fuzzy
  msgid "Conference type"
  msgstr "Conferentienaam"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:574
  #, fuzzy
  msgid "Format"
  msgstr "formaat"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:575
  #, fuzzy
  msgid "Lifetime"
  msgstr "Geldigheidsduur (in dagen)"
@@ -15413,43 +15458,43 @@ msgstr "Naam - nummer"
  msgid "Regular expression for matching conference names"
  msgstr "Reguliere expressie voor overeenkomende conferentie namen"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  msgid "Create new conference"
  msgstr "Maak nieuwe conferentie aan"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  msgid "New conference"
  msgstr "Nieuwe conferentie"
  
-#: plugins/gofon/conference/class_divListConferences.inc:196
+#: plugins/gofon/conference/class_divListConferences.inc:192
  #: include/class_pluglist.inc:145 include/class_pluglist.inc:146
  #: include/class_pluglist.inc:245
  msgid "Unknown"
  msgstr "Onbekend"
  
  #: plugins/gofon/fonreports/contents.tpl:31
-#: plugins/gofon/fonreports/class_fonreport.inc:399
+#: plugins/gofon/fonreports/class_fonreport.inc:400
  msgid "Source"
  msgstr "Bron"
  
  #: plugins/gofon/fonreports/contents.tpl:32
-#: plugins/gofon/fonreports/class_fonreport.inc:400
+#: plugins/gofon/fonreports/class_fonreport.inc:401
  msgid "Destination"
  msgstr "Doel"
  
  #: plugins/gofon/fonreports/contents.tpl:33
-#: plugins/gofon/fonreports/class_fonreport.inc:401
+#: plugins/gofon/fonreports/class_fonreport.inc:402
  msgid "Channel"
  msgstr "Kanaal"
  
  #: plugins/gofon/fonreports/contents.tpl:36
-#: plugins/gofon/fonreports/class_fonreport.inc:404
+#: plugins/gofon/fonreports/class_fonreport.inc:405
  msgid "Duration"
  msgstr "Tijdsduur"
  
  #: plugins/gofon/fonreports/main.inc:16
-#: plugins/gofon/fonreports/class_fonreport.inc:389
  #: plugins/gofon/fonreports/class_fonreport.inc:390
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  msgid "Phone reports"
  msgstr "Tel. rapporten"
  
@@ -15472,12 +15517,12 @@ msgstr "Kan de telefoondatabase voor rapportage niet selecteren!"
  msgid "Query for phone database failed!"
  msgstr "De zoekopdracht binnen de telefoon database is mislukt!"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:402
+#: plugins/gofon/fonreports/class_fonreport.inc:403
  #, fuzzy
  msgid "Application called"
  msgstr "Programmanaam"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:403
+#: plugins/gofon/fonreports/class_fonreport.inc:404
  #, fuzzy
  msgid "Disposition"
  msgstr "Max. verbrekingsduur"
@@ -15531,7 +15576,7 @@ msgid "Generating this page caused the PHP interpreter to raise some errors!"
  msgstr ""
  "Er is minimaal één PHP fout opgetreden bij het genereren van deze pagina!"
  
-#: include/php_setup.inc:71 html/main.php:388
+#: include/php_setup.inc:71
  msgid "Toggle information"
  msgstr "Informatie weergeven/verbergen"
  
@@ -15555,15 +15600,15 @@ msgstr "statisch"
  msgid "method"
  msgstr "methode"
  
-#: include/php_setup.inc:129
+#: include/php_setup.inc:135
  msgid "Trace"
  msgstr "Trace"
  
-#: include/php_setup.inc:130
+#: include/php_setup.inc:136
  msgid "Line"
  msgstr "Regel"
  
-#: include/php_setup.inc:131
+#: include/php_setup.inc:137
  msgid "Arguments"
  msgstr "Argumenten"
  
@@ -15651,7 +15696,7 @@ msgstr ""
  msgid "incomplete"
  msgstr "onvolledig"
  
-#: include/functions.inc:1046 include/functions.inc:1233
+#: include/functions.inc:1046 include/functions.inc:1202
  msgid "LDAP error:"
  msgstr "LDAP fout:"
  
@@ -15698,19 +15743,19 @@ msgstr ""
  "gebruiker '%s'. Neem a.u.b. contact op met deze persoon om eea kort te "
  "sluiten."
  
-#: include/functions.inc:1415
+#: include/functions.inc:1384
  msgid "Entries per page"
  msgstr "Regels per pagina"
  
-#: include/functions.inc:1443
+#: include/functions.inc:1412
  msgid "Apply filter"
  msgstr "Filter toepassen"
  
-#: include/functions.inc:1717
+#: include/functions.inc:1686
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1760
+#: include/functions.inc:1729
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "GOsa ontwikkelversie (Revisie %s)"
@@ -15719,7 +15764,7 @@ msgstr "GOsa ontwikkelversie (Revisie %s)"
  msgid "Warning: Account has an invalid mailserver string!"
  msgstr "Waarschuwing: Het account heeft een ongeldige mailserver string!"
  
-#: include/class_mail-methods-cyrus.inc:53
+#: include/class_mail-methods-cyrus.inc:58
  msgid ""
  "Warning: IMAP Server cannot be reached! If you save this account, some mail "
  "settings will not be stored on your server!"
@@ -15728,50 +15773,50 @@ msgstr ""
  "bewaart dan zullen sommige E-mail instellingen niet opgeslagen worden op de "
  "mail server!"
  
-#: include/class_mail-methods-cyrus.inc:151
+#: include/class_mail-methods-cyrus.inc:156
  #, php-format
  msgid "Can't create IMAP mailbox. Server says '%s'."
  msgstr "Kan de IMAP mailbox niet aanmaken. De IMAP server meldt: '%s'."
  
-#: include/class_mail-methods-cyrus.inc:170
+#: include/class_mail-methods-cyrus.inc:175
  #, php-format
  msgid "Can't write IMAP quota. Server says '%s'."
  msgstr ""
  "Kan de IMAP quota instellingen niet wegschrijven. De IMAP server meldt: '%s'."
  
-#: include/class_mail-methods-cyrus.inc:196
+#: include/class_mail-methods-cyrus.inc:201
  msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
  msgstr ""
  "Waarschuwing: De PHP functie 'imap_getacl' is niet voorhanden. "
  "Toegangsbeheer informatie kan niet veranderd worden."
  
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:219
  msgid "Warning: imap_getacl is not available, can't get imap permissions!"
  msgstr ""
  "Waarschuwing: De PHP functie 'imap_get_acl' is niet voorhanden. Imap rechten "
  "kunnen niet opgehaald worden!"
  
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_mail-methods-cyrus.inc:241
  #, php-format
  msgid "Can't remove IMAP mailbox. Server says '%s'."
  msgstr "Kan de IMAP mailbox niet verwijderen. De server meldt: '%s'."
  
-#: include/class_mail-methods-cyrus.inc:264
+#: include/class_mail-methods-cyrus.inc:269
  #, php-format
  msgid "Can't log into SIEVE server. Server says '%s'."
  msgstr "Kan niet op de SIEVE server inloggen. De server meldt: '%s'."
  
-#: include/class_mail-methods-cyrus.inc:277
+#: include/class_mail-methods-cyrus.inc:282
  #, php-format
  msgid "Can't get sieve script. Server says '%s'."
  msgstr "Kan het SIEVE script niet ophalen. De server meldt: '%s'."
  
-#: include/class_mail-methods-cyrus.inc:348
+#: include/class_mail-methods-cyrus.inc:353
  #, php-format
  msgid "Can't send sieve script. Server says '%s'."
  msgstr "Kan het SIEVE script niet versturen. De server meldt: '%s'."
  
-#: include/class_mail-methods-cyrus.inc:352
+#: include/class_mail-methods-cyrus.inc:357
  #, php-format
  msgid "Can't activate GOsa sieve script. Server says '%s'."
  msgstr "Kan het GOsa SIEVE script niet activeren. De server meldt: '%s'."
@@ -15812,7 +15857,7 @@ msgstr "Fout bij het ophalen van de bron dn - afgebroken!"
  msgid "Unknown FAIstate %s"
  msgstr "Onbekende FAI status %s"
  
-#: include/class_ldap.inc:705
+#: include/class_ldap.inc:707
  #, php-format
  msgid ""
  "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -15821,17 +15866,17 @@ msgstr ""
  "Automatische aanmaak van object type '%s' wordt momenteel niet ondersteund. "
  "Rapporteer dit a.u.b. aan het GOsa team."
  
-#: include/class_ldap.inc:774
+#: include/class_ldap.inc:776
  #, php-format
  msgid "while operating on '%s' using LDAP server '%s'"
  msgstr "bij het bewerken van '%s' op LDAP server '%s'"
  
-#: include/class_ldap.inc:776
+#: include/class_ldap.inc:778
  #, php-format
  msgid "while operating on LDAP server %s"
  msgstr "bij het bewerken van LDAP server %s"
  
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1000
  #, php-format
  msgid ""
  "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -15840,14 +15885,14 @@ 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:1027
+#: include/class_ldap.inc:1029
  #, php-format
  msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
  msgstr ""
  "Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. "
  "vanaf regel %s!"
  
-#: include/class_ldap.inc:1155
+#: include/class_ldap.inc:1157
  #, fuzzy, php-format
  msgid "Ldap import with dn '%s' failed."
  msgstr "Het opslaan van de printer is mislukt"
@@ -15861,7 +15906,7 @@ msgstr "Het verwijder proces is geannuleerd door plugin '%s': %s"
  msgid "References"
  msgstr "Referenties"
  
-#: include/class_plugin.inc:420
+#: include/class_plugin.inc:421
  #, php-format
  msgid ""
  "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
@@ -15869,7 +15914,7 @@ msgstr ""
  "Het commando '%s' dat gespecificeerd is als CHECK inhaker voor module '%s' "
  "bestaat niet."
  
-#: include/class_plugin.inc:601
+#: include/class_plugin.inc:602
  #, php-format
  msgid ""
  "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -15877,7 +15922,7 @@ msgstr ""
  "Het commando '%s' dat gespecificeerd is als POSTCREATE voor module '%s' "
  "bestaat niet."
  
-#: include/class_plugin.inc:635 include/class_password-methods.inc:183
+#: include/class_plugin.inc:636 include/class_password-methods.inc:183
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -15885,7 +15930,7 @@ msgstr ""
  "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
  "bestaat niet."
  
-#: include/class_plugin.inc:669
+#: include/class_plugin.inc:670
  #, php-format
  msgid ""
  "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -15893,62 +15938,57 @@ msgstr ""
  "Het commando '%s' dat gespecificeerd is als POSTREMOVE voor module '%s' "
  "bestaat niet."
  
-#: include/class_plugin.inc:977
+#: include/class_plugin.inc:978
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr "Object '%s' is al gemarkeerd"
  
-#: include/class_plugin.inc:984
+#: include/class_plugin.inc:985
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr "Toevoegen van markering (%s) aan object '%s'"
  
-#: include/class_plugin.inc:998 include/class_plugin.inc:1027
+#: include/class_plugin.inc:999 include/class_plugin.inc:1028
  #, fuzzy, php-format
  msgid "Handle object tagging with dn '%s' failed."
  msgstr "Het verwerken van object markeringen is mislukt"
  
-#: include/class_plugin.inc:1014
+#: include/class_plugin.inc:1015
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr "Verwijderen van markering van object '%s'"
  
-#: include/class_plugin.inc:1075 include/class_plugin.inc:1121
-#: include/class_plugin.inc:1122
+#: include/class_plugin.inc:1076 include/class_plugin.inc:1122
+#: include/class_plugin.inc:1123
  #, fuzzy, php-format
  msgid "Saving object snapshot with dn '%s' failed."
  msgstr "Het opslaan van de objectgroep is mislukt"
  
-#: include/class_plugin.inc:1137
-#, fuzzy
-msgid "You are not allowed to delete this snapshot!"
-msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
-
-#: include/class_plugin.inc:1153
+#: include/class_plugin.inc:1149
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1165
+#: include/class_plugin.inc:1161
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable(s) '%s' is "
  "not configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1197
+#: include/class_plugin.inc:1193
  #, php-format
  msgid "Method get available snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1253
+#: include/class_plugin.inc:1249
  #, php-format
  msgid "Method get deleted snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1317 include/class_plugin.inc:1331
+#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
  #, fuzzy, php-format
  msgid "Restore snapshot with dn '%s' failed."
  msgstr "Het verwijderen van de telefoon is mislukt"
@@ -16052,7 +16092,7 @@ msgstr ""
  "Kan niet verbinden met de LDAP server. Neem a.u.b. contact op met de "
  "systeembeheerder."
  
-#: include/class_config.inc:472
+#: include/class_config.inc:477
  msgid "SID and/or RIDBASE missing in your configuration!"
  msgstr "SID en/of RIDBASE ontbreken in uw configuratie!"
  
@@ -16593,7 +16633,7 @@ msgstr ""
  "De aanmelding op de LDAP server is mislukt! Controleer a.u.b. dat deze "
  "bereikbaar is voor GOsa."
  
-#: include/functions_setup.inc:784
+#: include/functions_setup.inc:792
  #, php-format
  msgid ""
  "You're missing the required attribute '%s' from this formular. Please "
@@ -16628,15 +16668,14 @@ msgstr ""
  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:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:252
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1092
+#, fuzzy
  msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
+"User and/or group could not be created, please check your configuration "
+"twice !"
  msgstr ""
-"Er is geen beheerders account voor GOsa. U zal niets kunnen beheren op dit "
-"moment!"
+"Kan niet verbinden met de opgegeven database. Controleer uw GLPI "
+"configuratie a.u.b."
  
  #: include/functions_helpviewer.inc:43
  #, php-format
@@ -16702,102 +16741,107 @@ msgstr ""
  msgid "Use ACL defined in role"
  msgstr ""
  
-#: include/class_acl.inc:370
+#: include/class_acl.inc:372
  #, fuzzy
  msgid "Edit ACL"
  msgstr "Bewerken"
  
-#: include/class_acl.inc:371
+#: include/class_acl.inc:373
  #, fuzzy
  msgid "Delete ACL"
  msgstr "Verwijderen"
  
-#: include/class_acl.inc:408
+#: include/class_acl.inc:410
  msgid "No ACL settings for this category"
  msgstr ""
  
-#: include/class_acl.inc:410
+#: include/class_acl.inc:412
  #, php-format
  msgid "Contains ACLs for these objects: %s"
  msgstr ""
  
-#: include/class_acl.inc:415
+#: include/class_acl.inc:417
  #, fuzzy
  msgid "Edit categories ACLs"
  msgstr "Bewerk klasse"
  
-#: include/class_acl.inc:416
+#: include/class_acl.inc:418
  msgid "Clear categories ACLs"
  msgstr ""
  
-#: include/class_acl.inc:455
+#: include/class_acl.inc:457
  #, php-format
  msgid "Edit ACL for '%s', scope is '%s'"
  msgstr ""
  
-#: include/class_acl.inc:465
+#: include/class_acl.inc:467
  msgid "All objects in current subtree"
  msgstr ""
  
-#: include/class_acl.inc:525 include/class_acl.inc:532
+#: include/class_acl.inc:557 include/class_acl.inc:564
  #, fuzzy
  msgid "Show/Hide Advanced Settings"
  msgstr "Geavanceerde telefoon instellingen"
  
-#: include/class_acl.inc:550
+#: include/class_acl.inc:582
  #, fuzzy
  msgid "Create objects"
  msgstr "Nieuw FAI object aanmaken"
  
-#: include/class_acl.inc:551
+#: include/class_acl.inc:583
  #, fuzzy
  msgid "Move objects"
  msgstr "Lidmaatschap objecten"
  
-#: include/class_acl.inc:552
+#: include/class_acl.inc:584
  #, fuzzy
  msgid "Remove objects"
  msgstr "Lidmaatschap objecten"
  
-#: include/class_acl.inc:554 include/class_acl.inc:560
+#: include/class_acl.inc:586 include/class_acl.inc:592
  msgid "Modifyable by owner"
  msgstr ""
  
-#: include/class_acl.inc:557
+#: include/class_acl.inc:589
  #, fuzzy
  msgid "Move object"
  msgstr "Lidmaatschap objecten"
  
-#: include/class_acl.inc:558
+#: include/class_acl.inc:590
  #, fuzzy
  msgid "Remove object"
  msgstr "Lidmaatschap objecten"
  
-#: include/class_acl.inc:686
+#: include/class_acl.inc:602
+#, fuzzy
+msgid "Complete object"
+msgstr "Nieuw FAI object aanmaken"
+
+#: include/class_acl.inc:718
  #, php-format
  msgid "Unkown ACL type '%s'. Don't know how to handle it."
  msgstr ""
  
-#: include/class_acl.inc:726
+#: include/class_acl.inc:758
  #, fuzzy, php-format
  msgid "Unknown entry '%s'!"
  msgstr "Onbekende FAI status %s"
  
-#: include/class_acl.inc:787
+#: include/class_acl.inc:819
  #, php-format
  msgid "Contains settings for these objects: %s"
  msgstr ""
  
-#: include/class_acl.inc:795
+#: include/class_acl.inc:827
  #, fuzzy
  msgid "Members:"
  msgstr "Groepsleden"
  
-#: include/class_acl.inc:801
+#: include/class_acl.inc:833
  msgid "ACL is valid for all users"
  msgstr ""
  
-#: include/class_acl.inc:909
+#: include/class_acl.inc:941
  #, fuzzy, php-format
  msgid "Saving ACLs with dn '%s' failed."
  msgstr "Het opslaan van de ACL informatie is mislukt"
@@ -16806,7 +16850,7 @@ msgstr "Het opslaan van de ACL informatie is mislukt"
  msgid "This package has no debconf options."
  msgstr "Dit pakket heeft geen debconf mogelijkheden."
  
-#: include/class_MultiSelectWindow.inc:400
+#: include/class_MultiSelectWindow.inc:458
  msgid ""
  "Error: The requested subtree has an inconsistent DN encoding, check your "
  "LDAP!"
@@ -16814,26 +16858,26 @@ msgstr ""
  "Fout: De opgevraagde subtree heeft een inconsistente DN codering. Controleer "
  "uw LDAP instellingen!"
  
-#: include/class_MultiSelectWindow.inc:504
+#: include/class_MultiSelectWindow.inc:567
  msgid "Restore snapshopts of already deleted objects"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:505
+#: include/class_MultiSelectWindow.inc:568
  #, fuzzy
  msgid "Restore"
  msgstr "Opnieuw proberen"
  
-#: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:106
+#: include/class_MultiSelectWindow.inc:586
+#: include/class_SnapShotDialog.inc:113
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  #, fuzzy
  msgid "Create snapshot"
  msgstr "Nagios account aanmaken"
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "Nieuw FAI object aanmaken"
@@ -16854,44 +16898,55 @@ msgstr ""
  "Er zijn meer dan een reverse zones voor dns zone '%s' gevonden. Het "
  "doornemen van deze zone is gestopt."
  
-#: include/class_CopyPasteHandler.inc:153
+#: include/functions_dns.inc:607
  #, php-format
-msgid "You are going to copy the entry '%s'."
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:147
+#, fuzzy, php-format
+msgid "You are going to paste the cutted entry '%s'."
+msgstr "U staat op het punt de invoer '%s' te kopieren."
+
+#: include/class_CopyPasteHandler.inc:174
+#, fuzzy, php-format
+msgid "You are going to paste the copied entry '%s'."
  msgstr "U staat op het punt de invoer '%s' te kopieren."
  
-#: include/class_CopyPasteHandler.inc:217
+#: include/class_CopyPasteHandler.inc:238
  msgid "Paste"
  msgstr "Plakken"
  
-#: include/class_CopyPasteHandler.inc:219
+#: include/class_CopyPasteHandler.inc:240
  msgid "Can't paste"
  msgstr "Plakken onmogelijk"
  
-#: include/functions_FAI.inc:363
+#: include/functions_FAI.inc:361
  #, php-format
  msgid "Error, following objects should be equal '%s' and '%s'"
  msgstr ""
  
-#: include/functions_FAI.inc:470
+#: include/functions_FAI.inc:468
  #, php-format
  msgid "Release management failed, can't save '%s'"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:53
+#: include/class_SnapShotDialog.inc:63
  #, fuzzy, php-format
  msgid "You're about to delete the snapshot '%s'."
  msgstr "U staat op het punt de macro '%s' te verwijderen."
  
-#: include/class_SnapShotDialog.inc:108
+#: include/class_SnapShotDialog.inc:115
  #, fuzzy
  msgid "Remove snapshot"
  msgstr "Nagios account aanmaken"
  
-#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
+#: include/class_SnapShotDialog.inc:117 include/class_SnapShotDialog.inc:137
  msgid "Y-m-d, H:i:s"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:142
+#: include/class_SnapShotDialog.inc:149
  #, fuzzy
  msgid "Please specify a valid description for this snapshot."
  msgstr "Geef a.u.b. een geldige naam op voor deze bijlage."
@@ -16938,7 +16993,7 @@ msgstr ""
  "toegankelijk! Controleer of deze directory bestaat en wat de rechten op deze "
  "directory zijn!"
  
-#: html/main.php:170
+#: html/main.php:172
  msgid ""
  "FATAL: Register globals is on. GOsa will refuse to login unless this is "
  "fixed by an administrator."
@@ -16946,28 +17001,20 @@ msgstr ""
  "FATAAL: 'Register globals' is geactiveerd in PHP. GOsa zal niemand laten "
  "inloggen totdat dit opgelost is door een systeembeheerder."
  
-#: html/main.php:212
+#: html/main.php:214
  msgid "Warning: memory is getting low - please increase the memory_limit!"
  msgstr ""
  "Waarschuwing: Geheugengebruik is te hoog - verhoog a.u.b. de 'memory_limit' "
  "in PHP!"
  
-#: html/main.php:349
-#, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
-msgstr "FATAAL: Kan geen enkele module defenities vinden voor module '%s'!"
-
-#: html/main.php:364
+#: html/main.php:353
  msgid "Your password is about to expire, please change your password"
  msgstr "Uw wachtwoord zal spoedig verlopen! Kies a.u.b. een nieuw wachtwoord."
  
-#: html/main.php:388
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
-msgstr ""
-"Bij het genereren van deze pagina zijn er fouten geconstateerd bij de W3C "
-"controle!"
+#: html/main.php:361
+#, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgstr "FATAAL: Kan geen enkele module defenities vinden voor module '%s'!"
  
  #: html/getkiosk.php:25
  #, php-format
@@ -16979,11 +17026,11 @@ msgstr "Kan '%s' niet openen. Het is mogelijk dat het bestand niet bestaat."
  msgid "Can't read file '%s', check permissions."
  msgstr "Kan bestand '%s' niet openen. Controleer de bestandspermissies a.u.b."
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Session will not be encrypted."
  msgstr "De sessie zal niet versleuteld zijn."
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Enter SSL session"
  msgstr "Gebruik een SSL sessie"
  
@@ -17006,31 +17053,39 @@ msgstr ""
  "GOsa kon geen informatie ophalen over geinstalleerde schema bestanden. Zorg "
  "er a.u.b. voor dat dit mogelijk is."
  
-#: html/index.php:232
+#: html/index.php:231
  msgid ""
  "Your ldap setup contains old schema definitions. Please re-run the setup."
  msgstr ""
  "Uw LDAP installatie bevat oude schema definities. Draai het installatie "
  "programma a.u.b. opnieuw."
  
-#: html/index.php:260
+#: html/index.php:250 ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+"Er is geen beheerders account voor GOsa. U zal niets kunnen beheren op dit "
+"moment!"
+
+#: html/index.php:258
  msgid "Please specify a valid username!"
  msgstr "Geef a.u.b. een geldige gebruikersnaam op!"
  
-#: html/index.php:262
+#: html/index.php:260
  msgid "Please specify your password!"
  msgstr "Geef a.u.b. uw wachtwoord op!"
  
-#: html/index.php:269
+#: html/index.php:267
  msgid "Please check the username/password combination."
  msgstr "Controleer a.u.b. de gebruikersnaam/wachtwoord combinatie."
  
-#: html/index.php:293
+#: html/index.php:291
  msgid "Account locked. Please contact your system administrator."
  msgstr ""
  "Account is geblokkeerd. Neem a.u.b. contact op met de systeembeheerder."
  
-#: html/index.php:345
+#: html/index.php:343
  msgid ""
  "Your browser has cookies disabled. Please enable cookies and reload this "
  "page before logging in!"
@@ -17181,7 +17236,7 @@ msgstr ""
  "Negeer deze fout en toon alle gegevens die passen binnen de gedefiniëerde "
  "grootte limiet en laat me daarvoor in de plaats filters gebruiken"
  
-#: ihtml/themes/default/login.tpl:14
+#: ihtml/themes/default/login.tpl:15
  #, fuzzy
  msgid "Please use your username and password to log in"
  msgstr "Voer uw <i>gebruikersnaam</i> en <i>wachtwoord</i> in"
@@ -17581,7 +17636,7 @@ msgstr ""
  msgid "Copy & paste wizard"
  msgstr "Kopieren &amp; plakken wizard"
  
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:7
  msgid ""
  "Some values need to be unique in the complete directory while some "
  "combinations make no sense. GOsa shows the relevant attributes. Please "
@@ -17591,7 +17646,17 @@ msgstr ""
  "combinaties geen zin hebben. GOsa toont de relevante attributen. Bewaar de "
  "waardes hieronder a.u.b. om aan deze vereisten te voldoen."
  
-#: ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/copyPasteDialog.tpl:9
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:10
+msgid ""
+"Or if you copy or cut an entry within GOsa and delete the source object, you "
+"may get errors while pasting this object again!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:26
  msgid "Operation complete"
  msgstr "Bewerking afgerond"
  
@@ -17633,37 +17698,150 @@ msgid ""
  "replace the existing object after pressing the restore button."
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:23
+#: ihtml/themes/default/snapshotdialog.tpl:9
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only nescessary to open and save them again (goFon), "
+"but some entries must be recreated manually (glpi)."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:12
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:29
  #, fuzzy
  msgid "There is no snapshot available that could be restored"
  msgstr ""
  "Er is geen MySQL extensie beschikbaar. Controleer uw PHP installatie a.u.b."
  
-#: ihtml/themes/default/snapshotdialog.tpl:25
+#: ihtml/themes/default/snapshotdialog.tpl:31
  msgid "Choose a snapshot and click the folder image, to restore the snapshot"
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:43
+#: ihtml/themes/default/snapshotdialog.tpl:49
  #, fuzzy
  msgid "Creating object snapshots"
  msgstr "Nieuwe objectgroep aanmaken"
  
-#: ihtml/themes/default/snapshotdialog.tpl:46
+#: ihtml/themes/default/snapshotdialog.tpl:52
  msgid ""
  "This procedure will create a snapshot of the selected object. It will be "
  "stored inside a special branch of your directory system and can be restored "
  "later on."
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:61
+#: ihtml/themes/default/snapshotdialog.tpl:55
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:70
  #, fuzzy
  msgid "Timestamp"
  msgstr "Timeout"
  
-#: ihtml/themes/default/snapshotdialog.tpl:70
+#: ihtml/themes/default/snapshotdialog.tpl:79
  msgid "Reason for generating this snapshot"
  msgstr ""
  
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr ""
+#~ "U heeft geen toestemming om een gebruiker aan te maken onder deze 'Basis'."
+
+#, fuzzy
+#~ msgid "You have no permissions to move this user to the specified 'Base'."
+#~ msgstr ""
+#~ "U heeft geen toestemming om een gebruiker te verplaatsen vanuit de "
+#~ "originale 'Basis'."
+
+#~ msgid "You have no permissions to create a blocklist on this 'Base'."
+#~ msgstr ""
+#~ "U heeft geen toestemming een blokkeerlijst aan te maken onder deze "
+#~ "'basis'."
+
+#~ 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'."
+
+#~ msgid "You have no permissions to create a application on this 'Base'."
+#~ msgstr ""
+#~ "U heeft geen toestemming een programma aan te maken onder deze 'Basis'."
+
+#~ msgid ""
+#~ "As soon as the move operation has finished, you can scroll down to end of "
+#~ "the page and press the 'Continue' button to continue with the department "
+#~ "management dialog."
+#~ msgstr ""
+#~ "Zodra de verplaats bewerking beeindigd is, kunt u naar het einde van de "
+#~ "pagina gaan en op de 'Doorgaan' knop drukken om door te gaan met de "
+#~ "afdeling beheer dialoog."
+
+#~ msgid "You have no permissions to create a department on this 'Base'."
+#~ msgstr ""
+#~ "U heeft geen toestemming om een afdeling aan te maken onder deze 'Basis'."
+
+#~ msgid "Go to users home department"
+#~ msgstr "Ga naar de afdeling van de gebruiker"
+
+#~ 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'"
+
+#~ 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'."
+
+#~ msgid "You are not allowed to set this systems password!"
+#~ msgstr ""
+#~ "U heeft geen toestemming om het wachtwoord van dit systeem in te stellen!"
+
+#~ 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'."
+
+#~ msgid "The host name '%s' should be written in lowercase."
+#~ msgstr "De hostnaam '%s' moet in kleine letters ingevoerd worden."
+
+#, fuzzy
+#~ msgid "Select to display users"
+#~ msgstr "Selecteer om gewone gebruikers te tonen"
+
+#, fuzzy
+#~ msgid "Display user"
+#~ msgstr "Getoonde naam"
+
+#, fuzzy
+#~ msgid "Select to display departments"
+#~ msgstr "Selecteer om afdelingen te zien"
+
+#, fuzzy
+#~ msgid "Display departments"
+#~ msgstr "Toon overeenkomende afdelingen"
+
+#, fuzzy
+#~ msgid "Viewable"
+#~ msgstr "Variabele"
+
+#, fuzzy
+#~ msgid "You have no permissions to create a mime type on this 'Base'."
+#~ msgstr ""
+#~ "U heeft geen toestemming om een telefoon aan te maken onder deze 'Basis'."
+
+#, fuzzy
+#~ msgid "You are not allowed to delete this snapshot!"
+#~ msgstr "U heeft geen toestemming om deze gegevens te verwijderen!"
+
+#~ msgid ""
+#~ "Generating this page caused the W3C          conformance checker to raise "
+#~ "some errors!"
+#~ msgstr ""
+#~ "Bij het genereren van deze pagina zijn er fouten geconstateerd bij de W3C "
+#~ "controle!"
+
  #~ msgid "you are not using any strange characters in the loginname."
  #~ msgstr "u geen vreemde karakters in de loginnaam gebruikt."
  
@@ -18202,9 +18380,6 @@ msgstr ""
  #~ msgid "Saving FAI hook failed"
  #~ msgstr "Het opslaan van de FAI inhaker is mislukt"
  
-#~ msgid "Removing FAI profile failed"
-#~ msgstr "Het verwijderen van het FAI profiel is mislukt"
-
  #~ msgid "Removing FAI partition table failed"
  #~ msgstr "Het verwijderen van de FAI partitietabel is mislukt"
  
diff --git a/locale/pl/LC_MESSAGES/messages.po b/locale/pl/LC_MESSAGES/messages.po

index 6a2484cdaecc75582fab3398b7abbecaaa176fd4..671b7898c59177b652434d9b5b411ecd34f64b80 100644 (file)
--- a/locale/pl/LC_MESSAGES/messages.po
+++ b/locale/pl/LC_MESSAGES/messages.po
@@ -1,12 +1,10 @@
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/admin/systems/class_terminalService.inc:452
-#: plugins/admin/systems/class_terminalService.inc:453
-#: include/class_plugin.inc:115 include/class_plugin.inc:116
+#: plugins/personal/generic/class_user.inc:1360 include/class_plugin.inc:115
+#: include/class_plugin.inc:116
  msgid ""
  msgstr ""
  "Project-Id-Version: polski\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-17 12:33+0100\n"
+"POT-Creation-Date: 2006-12-18 11:18+0100\n"
  "PO-Revision-Date: 2006-07-28 14:47+0100\n"
  "Last-Translator: Piotr Rybicki <meritus@innervision.pl>\n"
  "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -18,7 +16,24 @@ msgstr ""
  "X-Poedit-SourceCharset: iso-8859-2\n"
  "X-Poedit-Basepath: tedst\n"
  
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1373
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1011
+#: plugins/personal/password/class_password.inc:16
+#: plugins/personal/posix/class_posixAccount.inc:1313
+#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/connectivity/class_phpgwAccount.inc:147
+#: plugins/personal/connectivity/class_kolabAccount.inc:451
+#: plugins/personal/connectivity/class_webdavAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:223
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:954
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#: plugins/personal/connectivity/class_intranetAccount.inc:180
+#: plugins/personal/connectivity/class_pptpAccount.inc:163
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/personal/environment/class_environment.inc:1274
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#: plugins/personal/netatalk/class_netatalk.inc:359
  msgid "My account"
  msgstr "Moje konto "
  
@@ -26,8 +41,8 @@ msgstr "Moje konto "
  msgid "Administration"
  msgstr "Administracja"
  
-#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:788
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
  msgid "Addons"
  msgstr "Dodatki"
  
@@ -39,28 +54,28 @@ msgstr "Dodatki"
  #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
  #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
  #: plugins/personal/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1368
+#: plugins/personal/generic/class_user.inc:1367
  #: plugins/gofax/blocklists/generic.tpl:1
  #: plugins/gofax/faxaccount/generic.tpl:6
  #: plugins/gofax/faxaccount/paste_generic.tpl:4
  #: plugins/admin/groups/mail.tpl:7
-#: plugins/admin/groups/class_groupGeneric.inc:884
-#: plugins/admin/applications/class_applicationGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:531
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#: plugins/admin/applications/class_applicationGeneric.inc:523
+#: plugins/admin/departments/class_departmentGeneric.inc:575
  #: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/class_servGeneric.inc:334
-#: plugins/admin/systems/class_workstationGeneric.inc:504
+#: plugins/admin/systems/class_servGeneric.inc:347
+#: plugins/admin/systems/class_workstationGeneric.inc:526
  #: plugins/admin/systems/servkolab.tpl:6 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/class_printGeneric.inc:854
-#: plugins/admin/systems/class_componentGeneric.inc:257
-#: plugins/admin/systems/class_phoneGeneric.inc:425
+#: plugins/admin/systems/class_printGeneric.inc:858
+#: plugins/admin/systems/class_componentGeneric.inc:259
+#: plugins/admin/systems/class_phoneGeneric.inc:430
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
  #: plugins/admin/systems/servdnseditzone.tpl:1
  #: plugins/admin/systems/goMailServer.tpl:1
  #: plugins/admin/systems/goImapServer.tpl:1
  #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:709
+#: plugins/admin/ogroups/class_ogroup.inc:692
  #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
  #: plugins/admin/fai/faiPartitionTable.tpl:4
  #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
@@ -71,9 +86,9 @@ msgstr "Dodatki"
  #: plugins/admin/fai/faiHookEntry.tpl:5
  #: plugins/admin/fai/faiTemplateEntry.tpl:3
  #: plugins/admin/mimetypes/generic.tpl:4
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:671
  #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_gofonMacro.inc:486
  #: plugins/generic/references/class_reference.inc:20
  msgid "Generic"
  msgstr "Ogólne"
@@ -85,30 +100,30 @@ msgstr "Unix"
  #: contrib/gosa.conf:82 contrib/gosa.conf:98
  #: plugins/personal/environment/class_environment.inc:12
  #: plugins/personal/environment/class_environment.inc:1269
-#: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/groups/class_divListGroup.inc:188
+#: plugins/admin/users/class_divListUsers.inc:177
  msgid "Environment"
  msgstr "Środowisko"
  
  #: contrib/gosa.conf:83 contrib/gosa.conf:100
  #: plugins/personal/mail/class_mailAccount.inc:22
  #: plugins/personal/mail/class_mailAccount.inc:1006
-#: plugins/admin/groups/class_groupMail.inc:1066
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:191
-#: plugins/admin/ogroups/tabs_ogroups.inc:76
+#: plugins/admin/groups/class_groupMail.inc:1073
+#: plugins/admin/groups/class_divListGroup.inc:180
+#: plugins/admin/users/class_divListUsers.inc:179
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
  #: plugins/admin/ogroups/tabs_ogroups.inc:184
  #: plugins/admin/ogroups/paste_mail.tpl:4
  #: plugins/admin/ogroups/class_mailogroup.inc:167
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/admin/ogroups/class_divListOGroup.inc:171
  #: plugins/generic/references/class_reference.inc:24
  msgid "Mail"
  msgstr "Poczta"
  
  #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
  #: plugins/personal/samba/class_sambaAccount.inc:1041
-#: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/groups/class_divListGroup.inc:182
+#: plugins/admin/users/class_divListUsers.inc:185
  #: plugins/generic/references/class_reference.inc:26
  #: plugins/generic/references/class_reference.inc:28
  msgid "Samba"
@@ -116,7 +131,7 @@ msgstr "Samba"
  
  #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
  #: plugins/personal/netatalk/class_netatalk.inc:355
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:187
  msgid "Netatalk"
  msgstr "Netatalk"
  
@@ -127,15 +142,14 @@ msgstr "Połączenia"
  
  #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
  #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:581
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:586
  #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:807
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
  #: plugins/gofax/faxaccount/paste_generic.tpl:8
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:183
  #: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/class_departmentGeneric.inc:550
+#: plugins/admin/departments/class_departmentGeneric.inc:594
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Fax"
@@ -148,12 +162,12 @@ msgstr "Fax"
  #: plugins/addons/addressbook/address_edit.tpl:221
  #: plugins/addons/addressbook/address_info.tpl:67
  #: plugins/addons/addressbook/address_info.tpl:163
-#: plugins/admin/groups/class_divListGroup.inc:178
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/groups/class_divListGroup.inc:186
+#: plugins/admin/users/class_divListUsers.inc:181
  #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:818
+#: plugins/admin/systems/class_systemManagement.inc:1003
  #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/ogroups/class_ogroupManagement.inc:351
  #: plugins/admin/ogroups/class_phonequeue.inc:718
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1231
@@ -173,9 +187,9 @@ msgstr "Nagios"
  msgid "Applications"
  msgstr "Aplikacje"
  
-#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:92
  #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:240
+#: plugins/admin/systems/class_servRepository.inc:254
  #: plugins/admin/ogroups/phonequeue.tpl:43
  #: plugins/gofon/conference/generic.tpl:121
  msgid "Options"
@@ -189,21 +203,21 @@ msgstr "Parametr"
  
  #: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
  #: plugins/admin/systems/class_terminalStartup.inc:442
-#: plugins/admin/systems/class_workstationStartup.inc:1109
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: plugins/admin/systems/class_workstationStartup.inc:1154
+#: plugins/admin/ogroups/tabs_ogroups.inc:96
  msgid "Startup"
  msgstr "Startup"
  
  #: contrib/gosa.conf:120 contrib/gosa.conf:136
-#: plugins/admin/ogroups/tabs_ogroups.inc:103
+#: plugins/admin/ogroups/tabs_ogroups.inc:99
  msgid "Devices"
  msgstr "Urządzenia"
  
  #: contrib/gosa.conf:121 contrib/gosa.conf:137
  #: plugins/personal/environment/environment.tpl:235
-#: plugins/admin/systems/class_systemManagement.inc:827
-#: plugins/admin/systems/class_printGeneric.inc:860
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/systems/class_systemManagement.inc:1012
+#: plugins/admin/systems/class_printGeneric.inc:864
+#: plugins/admin/ogroups/class_ogroupManagement.inc:354
  #: plugins/generic/references/class_reference.inc:52
  msgid "Printer"
  msgstr "Drukarka"
@@ -222,16 +236,16 @@ msgstr "Drukarka"
  #: plugins/admin/fai/faiPackageEntry.tpl:22
  #: plugins/gofon/macro/headpage.tpl:20
  #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:64
+#: ihtml/themes/default/MultiSelectWindow.tpl:27
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
  msgid "Information"
  msgstr "Informacja"
  
  #: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:385
  #: plugins/admin/systems/class_goFaxServer.inc:85
  #: plugins/admin/systems/class_servKolab.inc:375
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:366
  #: plugins/admin/systems/class_goGlpiServer.inc:84
  #: plugins/admin/systems/class_goCupsServer.inc:64
  #: plugins/admin/systems/class_goTerminalServer.inc:118
@@ -250,7 +264,6 @@ msgid "Services"
  msgstr "Usługi"
  
  #: contrib/gosa.conf:129 contrib/gosa.conf:139
-#: plugins/admin/fai/class_faiSummaryTab.inc:546
  msgid "FAI summary"
  msgstr "Podsumowanie FAI"
  
@@ -277,7 +290,7 @@ msgstr "Export do Excela"
  #: plugins/addons/ldapmanager/contentcsv.tpl:112
  #: plugins/addons/ldapmanager/contentimport.tpl:50
  #: plugins/addons/notifications/contents.tpl:52
-#: plugins/admin/applications/generic.tpl:132
+#: plugins/admin/applications/generic.tpl:135
  msgid "Import"
  msgstr "Import"
  
@@ -290,33 +303,32 @@ msgid "Partitions"
  msgstr "Partycje"
  
  #: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:518
+#: plugins/admin/applications/generic.tpl:130
+#: plugins/admin/fai/class_faiScript.inc:529
  #: plugins/admin/fai/faiScriptEntry.tpl:56
  #: plugins/admin/fai/faiHookEntry.tpl:56
  msgid "Script"
  msgstr "Skrypt"
  
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:45
  msgid "Hooks"
  msgstr "Zaczepy"
  
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:46
  msgid "Variables"
  msgstr "Zmienie"
  
-#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:47
  msgid "Templates"
  msgstr "Szablony"
  
  #: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
-#: plugins/admin/fai/class_faiSummaryTab.inc:47
+#: plugins/admin/fai/class_faiSummaryTab.inc:50
  msgid "Profiles"
  msgstr "Profile"
  
-#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:103
  #: plugins/admin/acl/class_divListACL.inc:49
-#: plugins/admin/fai/class_faiSummaryTab.inc:545
  msgid "Summary"
  msgstr "Podsumowanie"
  
@@ -371,7 +383,7 @@ msgstr "Wybierz adresy do dodania"
  #: plugins/personal/environment/hotplugDialog.tpl:24
  #: plugins/personal/environment/selectPrinterDialog.tpl:24
  #: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:62
+#: plugins/addons/addressbook/contents.tpl:65
  #: plugins/addons/godfs/contents.tpl:31
  #: plugins/admin/groups/mail_locals.tpl:22
  #: plugins/admin/groups/group_objects.tpl:20
@@ -387,8 +399,8 @@ msgstr "Wybierz adresy do dodania"
  #: plugins/admin/fai/faiPackageEntry.tpl:32
  #: plugins/gofon/macro/headpage.tpl:29
  #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:75
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:78
  msgid "Filters"
  msgstr "Filtry"
  
@@ -403,7 +415,7 @@ msgstr "Wybierz aby zobaczyć departamenty"
  #: plugins/personal/samba/samba3_workstations.tpl:27
  #: plugins/personal/environment/selectPrinterDialog.tpl:34
  #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:84
+#: plugins/addons/addressbook/contents.tpl:87
  #: plugins/admin/groups/mail_locals.tpl:33
  #: plugins/admin/groups/group_objects.tpl:40
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
@@ -454,22 +466,22 @@ msgstr "Nazwa użytkownika którego adresy są pokazane"
  #: plugins/admin/groups/mail.tpl:135 plugins/admin/groups/mail_locals.tpl:66
  #: plugins/admin/groups/generic.tpl:137
  #: plugins/admin/groups/application.tpl:39
-#: plugins/admin/groups/class_groupMail.inc:591
+#: plugins/admin/groups/class_groupMail.inc:598
  #: plugins/admin/groups/group_objects.tpl:55
  #: plugins/admin/groups/paste_mail.tpl:30
  #: plugins/admin/groups/paste_mail.tpl:41
  #: plugins/admin/systems/terminal.tpl:117
+#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/workstation.tpl:94
  #: plugins/admin/systems/glpiPrinter.tpl:115
  #: plugins/admin/systems/glpiPrinter.tpl:149
  #: plugins/admin/systems/servdns.tpl:6 plugins/admin/systems/glpi.tpl:125
-#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/phonesettings.tpl:207
  #: plugins/admin/systems/phonesettings.tpl:230
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:124
-#: plugins/admin/systems/workstationStartup.tpl:150
-#: plugins/admin/systems/workstationStartup.tpl:179
+#: plugins/admin/systems/workstationStartup.tpl:127
+#: plugins/admin/systems/workstationStartup.tpl:154
+#: plugins/admin/systems/workstationStartup.tpl:183
  #: plugins/admin/systems/terminalStartup.tpl:79
  #: plugins/admin/systems/terminalStartup.tpl:108
  #: plugins/admin/systems/servRepositorySetup.tpl:47
@@ -477,12 +489,12 @@ msgstr "Nazwa użytkownika którego adresy są pokazane"
  #: plugins/admin/systems/glpiManufacturer.tpl:6
  #: plugins/admin/systems/glpi_edit_os.tpl:8
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:472
-#: plugins/admin/systems/class_termDNS.inc:492
+#: plugins/admin/systems/class_termDNS.inc:477
+#: plugins/admin/systems/class_termDNS.inc:497
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
  #: plugins/admin/systems/servdnseditzone.tpl:106
  #: plugins/admin/systems/class_servDNSeditZone.inc:486
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:392
  #: plugins/admin/systems/goShareServer.tpl:14
  #: plugins/admin/systems/goMailServer.tpl:70
  #: plugins/admin/systems/goMailServer.tpl:101
@@ -495,7 +507,7 @@ msgstr "Nazwa użytkownika którego adresy są pokazane"
  #: plugins/admin/ogroups/ogroup_objects.tpl:54
  #: plugins/admin/ogroups/phonequeue.tpl:33
  #: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
-#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPackage.tpl:78
  #: plugins/admin/fai/faiPartitionTable.tpl:48
  #: plugins/admin/fai/faiPartitionTable.tpl:50
  #: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
@@ -544,15 +556,17 @@ msgstr "Dodaj"
  #: plugins/admin/applications/remove.tpl:15
  #: plugins/admin/applications/class_applicationManagement.inc:352
  #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:506
+#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/departments/dep_move_confirm.tpl:17
+#: plugins/admin/systems/goNtpServer.tpl:31
+#: plugins/admin/systems/class_systemManagement.inc:654
  #: plugins/admin/systems/servdns.tpl:23
-#: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/servkolab.tpl:247 plugins/admin/systems/gencd.tpl:11
  #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/goNtpServer.tpl:32
-#: plugins/admin/systems/goKrbServer.tpl:33
+#: plugins/admin/systems/goKrbServer.tpl:32
+#: plugins/admin/systems/goFonServer.tpl:41
  #: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:140
-#: plugins/admin/systems/goFonServer.tpl:42
+#: plugins/admin/systems/goFaxServer.tpl:25
  #: plugins/admin/systems/remove_glpi.tpl:16
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
  #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -560,7 +574,7 @@ msgstr "Dodaj"
  #: plugins/admin/systems/servRepository.tpl:68
  #: plugins/admin/systems/glpi_edit_type.tpl:29
  #: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/goFaxServer.tpl:26
+#: plugins/admin/systems/remove_ppd.tpl:14
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
  #: plugins/admin/systems/glpiSelectUser.tpl:51
  #: plugins/admin/systems/glpi_devices.tpl:761
@@ -573,26 +587,27 @@ msgstr "Dodaj"
  #: plugins/admin/systems/SelectDeviceType.tpl:45
  #: plugins/admin/systems/class_baseSelectDialog.inc:43
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/ServiceAddDialog.tpl:31
-#: plugins/admin/systems/goLdapServer.tpl:12
-#: plugins/admin/systems/goShareServer.tpl:32
-#: plugins/admin/systems/goMailServer.tpl:224
-#: plugins/admin/systems/goImapServer.tpl:119
-#: plugins/admin/systems/goSyslogServer.tpl:8
-#: plugins/admin/systems/goGlpiServer.tpl:35
-#: plugins/admin/systems/goCupsServer.tpl:8
-#: plugins/admin/systems/goTerminalServer.tpl:26
-#: plugins/admin/systems/goLogDBServer.tpl:26
-#: plugins/admin/systems/goSpamServer.tpl:128
-#: plugins/admin/systems/goSpamServerRule.tpl:24
-#: plugins/admin/systems/goVirusServer.tpl:171
+#: plugins/admin/systems/ServiceAddDialog.tpl:30
+#: plugins/admin/systems/goLdapServer.tpl:11
+#: plugins/admin/systems/goShareServer.tpl:31
+#: plugins/admin/systems/goMailServer.tpl:223
+#: plugins/admin/systems/goImapServer.tpl:118
+#: plugins/admin/systems/goSyslogServer.tpl:7
+#: plugins/admin/systems/goGlpiServer.tpl:34
+#: plugins/admin/systems/goCupsServer.tpl:7
+#: plugins/admin/systems/goTerminalServer.tpl:25
+#: plugins/admin/systems/goLogDBServer.tpl:25
+#: plugins/admin/systems/goSpamServer.tpl:127
+#: plugins/admin/systems/goSpamServerRule.tpl:23
+#: plugins/admin/systems/goVirusServer.tpl:170
  #: plugins/admin/systems/class_goService.inc:34
  #: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:307
+#: plugins/admin/ogroups/class_ogroupManagement.inc:302
  #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:619
-#: plugins/admin/fai/class_faiManagement.inc:624
-#: plugins/admin/fai/class_faiManagement.inc:630
+#: plugins/admin/acl/class_aclManagement.inc:289
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/fai/class_faiManagement.inc:634
+#: plugins/admin/fai/class_faiManagement.inc:640
  #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
  #: plugins/admin/fai/faiScriptEntry.tpl:83
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:40
@@ -604,17 +619,17 @@ msgstr "Dodaj"
  #: plugins/admin/fai/faiPackageNew.tpl:51
  #: plugins/admin/fai/faiNewBranch.tpl:20
  #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
  #: plugins/admin/mimetypes/remove.tpl:15
  #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
  #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:256
  #: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
  #: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
-#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:38
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:89
  msgid "Cancel"
  msgstr "Anuluj"
  
@@ -626,11 +641,11 @@ msgstr "Adres podstawowy"
  
  #: plugins/personal/mail/generic.tpl:15
  #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:18
-#: plugins/admin/systems/class_servGeneric.inc:340
-#: plugins/admin/systems/class_systemManagement.inc:819
+#: plugins/admin/systems/class_servGeneric.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:1004
  #: plugins/admin/systems/servnfs.tpl:39
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:355
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
  #: plugins/generic/references/class_reference.inc:44
  msgid "Server"
  msgstr "Serwer"
@@ -645,14 +660,14 @@ msgstr "Użycie Quoty"
  
  #: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:38
  #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:515
+#: plugins/admin/systems/class_printGeneric.inc:516
  msgid "not defined"
  msgstr "nie zdefiniowane"
  
  #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/personal/mail/class_mailAccount.inc:1019
  #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1077
+#: plugins/admin/groups/class_groupMail.inc:1084
  msgid "Quota size"
  msgstr "Rozmiar Quoty"
  
@@ -691,22 +706,23 @@ msgstr "Lista alternatywnych adresów pocztowych"
  #: plugins/admin/applications/remove.tpl:13
  #: plugins/admin/departments/remove.tpl:14
  #: plugins/admin/systems/terminal.tpl:121
+#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/printer.tpl:102 plugins/admin/systems/printer.tpl:126
  #: plugins/admin/systems/workstation.tpl:98
  #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/remove_glpi.tpl:14
  #: plugins/admin/systems/phonesettings.tpl:210
  #: plugins/admin/systems/phonesettings.tpl:233
-#: plugins/admin/systems/workstationStartup.tpl:125
-#: plugins/admin/systems/workstationStartup.tpl:153
+#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:157
  #: plugins/admin/systems/terminalStartup.tpl:82
  #: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/remove_ppd.tpl:12
  #: plugins/admin/systems/glpi_edit_os.tpl:10
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
  #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:486
+#: plugins/admin/systems/class_termDNS.inc:491
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
  #: plugins/admin/systems/class_servDNSeditZone.inc:292
  #: plugins/admin/systems/class_servDNSeditZone.inc:480
@@ -776,7 +792,7 @@ msgid "MB"
  msgstr "MB"
  
  #: plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1022
  msgid "Vacation message"
  msgstr "Treść autorespondera"
  
@@ -806,7 +822,7 @@ msgid "User is only allowed to send and receive local mails"
  msgstr "Użytkownik może tylko wysyłać i odbierać lokalną pocztę"
  
  #: plugins/personal/mail/generic.tpl:190
-#: plugins/personal/mail/class_mailAccount.inc:1036
+#: plugins/personal/mail/class_mailAccount.inc:1037
  msgid "Use custom sieve script"
  msgstr "Użyj własnego skryptu SIEVE"
  
@@ -824,13 +840,14 @@ msgstr "Wyłącza wszystkie opcje poczty!"
  #: plugins/admin/groups/class_groupManagement.inc:329
  #: plugins/admin/users/class_userManagement.inc:651
  #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:500
-#: plugins/admin/ogroups/class_ogroupManagement.inc:301
-#: plugins/admin/fai/class_faiManagement.inc:613
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
+#: plugins/admin/systems/class_systemManagement.inc:648
+#: plugins/admin/ogroups/class_ogroupManagement.inc:296
+#: plugins/admin/acl/class_aclManagement.inc:280
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:339
  #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:250
  msgid "Ok"
  msgstr "Ok"
  
@@ -1013,35 +1030,35 @@ msgstr ""
  "Brak poprawnego serwera pocztowego, proszę go dodać w ustawieniach systemu."
  
  #: plugins/personal/mail/class_mailAccount.inc:781
-#: plugins/admin/groups/class_groupMail.inc:880
+#: plugins/admin/groups/class_groupMail.inc:887
  msgid "The required field 'Primary address' is not set."
  msgstr "Wymaganie pole 'Podstawowy adres' jest puste."
  
  #: plugins/personal/mail/class_mailAccount.inc:785
  #: plugins/personal/mail/class_mailAccount.inc:789
-#: plugins/addons/addressbook/class_addressbook.inc:694
+#: plugins/addons/addressbook/class_addressbook.inc:696
  #: plugins/admin/ogroups/class_mailogroup.inc:79
  msgid "Please enter a valid email address in 'Primary address' field."
  msgstr "Proszę podać prawidłowy adres email w polu 'Podstawowy adres'"
  
  #: plugins/personal/mail/class_mailAccount.inc:795
-#: plugins/admin/groups/class_groupMail.inc:889
+#: plugins/admin/groups/class_groupMail.inc:896
  #: plugins/admin/ogroups/class_mailogroup.inc:86
  msgid "The primary address you've entered is already in use."
  msgstr "Podstawowy adres który podano jest już w użyciu."
  
  #: plugins/personal/mail/class_mailAccount.inc:801
-#: plugins/admin/groups/class_groupMail.inc:895
+#: plugins/admin/groups/class_groupMail.inc:902
  msgid "Value in 'Quota size' is not valid."
  msgstr "Wartość 'Rozmiar Quota' jest nieprawidłowa"
  
  #: plugins/personal/mail/class_mailAccount.inc:810
-#: plugins/admin/groups/class_groupMail.inc:904
+#: plugins/admin/groups/class_groupMail.inc:911
  msgid "Please specify a vaild mail size for mails to be rejected."
  msgstr "Proszę podać prawidłowy rozmiar poczty która ma być odrzucana."
  
  #: plugins/personal/mail/class_mailAccount.inc:820
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
  msgid "You need to set the maximum mail size in order to reject anything."
  msgstr "Należy ustawić maksymalny rozmiar poczty aby odrzucać cokolwiek."
  
@@ -1071,61 +1088,66 @@ msgstr ""
  "Proszę najpierw usunąć konto pocztowe, aby umożliwić kolab usuwanie swoimi "
  "metodami."
  
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1012
+#, fuzzy
+msgid "Mail account"
+msgstr "Moje konto "
+
+#: plugins/personal/mail/class_mailAccount.inc:1017
  #: plugins/personal/nagios/nagios.tpl:17
-#: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/addons/addressbook/class_addressbook.inc:797
-#: plugins/admin/groups/class_groupMail.inc:1074
-#: plugins/admin/systems/class_servDNS.inc:394
+#: plugins/personal/nagios/class_nagiosAccount.inc:273
+#: plugins/addons/addressbook/class_addressbook.inc:799
+#: plugins/admin/groups/class_groupMail.inc:1081
+#: plugins/admin/systems/class_servDNS.inc:396
  #: plugins/admin/systems/servdnseditzone.tpl:51
  #: plugins/admin/ogroups/class_mailogroup.inc:175 html/getxls.php:225
  msgid "Mail address"
  msgstr "Adres email"
  
-#: plugins/personal/mail/class_mailAccount.inc:1017
-#: plugins/admin/groups/class_groupMail.inc:1078
+#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/admin/groups/class_groupMail.inc:1085
  msgid "Mail server"
  msgstr "Serwer pocztowy"
  
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1021
  msgid "Add vacation information"
  msgstr "Dodaj informacje autorespondera"
  
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1024
  msgid "Use spam filter"
  msgstr "Użyj filtra spamu"
  
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1025
  msgid "Spam level"
  msgstr "Poziom spamu"
  
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1026
  msgid "Spam mail box"
  msgstr "Skrzynpa spamowa"
  
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1028
  msgid "Reject due to mailsize"
  msgstr "Odrzuć z powodu rozmiaru wiadomości"
  
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:1029
  msgid "Mail max size"
  msgstr "Max rozmiar poczty"
  
-#: plugins/personal/mail/class_mailAccount.inc:1030
-#: plugins/personal/mail/class_mailAccount.inc:1035
+#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1036
  msgid "Forwarding address"
  msgstr "Adresy przekazywane"
  
-#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1032
  msgid "Local delivery"
  msgstr "Lokalne dostarczanie"
  
-#: plugins/personal/mail/class_mailAccount.inc:1032
+#: plugins/personal/mail/class_mailAccount.inc:1033
  #, fuzzy
  msgid "No delivery to own mailbox "
  msgstr "Nie dostarczaj do własnej skrzynki"
  
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1034
  msgid "Mail alternative addresses"
  msgstr "Adresy alternatywne"
  
@@ -1195,8 +1217,9 @@ msgstr ""
  #: plugins/addons/ldapmanager/contentexport.tpl:66
  #: plugins/addons/ldapmanager/contentexportxls.tpl:69
  #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1452
+#: plugins/admin/departments/dep_iframe.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:145
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1421
  #: ihtml/themes/default/setup_useradmin.tpl:40
  #: ihtml/themes/default/setup_step4.tpl:114
  #: ihtml/themes/default/setup_step2.tpl:12
@@ -1206,13 +1229,14 @@ msgid "Back"
  msgstr "Wróć"
  
  #: plugins/personal/password/class_password.inc:5
+#: plugins/personal/password/class_password.inc:17
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/admin/systems/class_goFaxServer.inc:94
  #: plugins/admin/systems/goKrbServer.tpl:20
  #: plugins/admin/systems/goFonServer.tpl:12
-#: plugins/admin/systems/class_goGlpiServer.inc:98
  #: plugins/admin/systems/goFaxServer.tpl:12
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_goGlpiServer.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:308
  #: plugins/admin/systems/goImapServer.tpl:34
  #: plugins/admin/systems/class_goFonServer.inc:107
  #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1225,7 +1249,7 @@ msgid "Password"
  msgstr "Hasło"
  
  #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/generic/class_user.inc:1378
  msgid "User password"
  msgstr "Hasło użytkownika"
  
@@ -1272,12 +1296,12 @@ msgid "External password changer reported a problem: "
  msgstr "Zewnętrzny program do zmiany hasła zgłosił następujący problem:"
  
  #: plugins/personal/password/main.inc:123
-#: plugins/admin/users/class_divListUsers.inc:261
+#: plugins/admin/users/class_divListUsers.inc:249
  msgid "Change password"
  msgstr "Zmień hasło"
  
  #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1327
+#: plugins/personal/posix/class_posixAccount.inc:1320
  #: plugins/personal/posix/paste_generic.tpl:8
  #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
  #: plugins/personal/samba/class_sambaAccount.inc:645
@@ -1285,7 +1309,7 @@ msgid "Home directory"
  msgstr "Katalog domowy"
  
  #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1328
+#: plugins/personal/posix/class_posixAccount.inc:1321
  msgid "Shell"
  msgstr "Shell"
  
@@ -1294,10 +1318,10 @@ msgid "Primary group"
  msgstr "Grupa podstawowa"
  
  #: plugins/personal/posix/generic.tpl:35
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:235
  #: plugins/gofax/faxreports/contents.tpl:32
  #: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/class_faxreport.inc:482
+#: plugins/gofax/faxreports/class_faxreport.inc:487
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
  #: plugins/gofon/fonreports/contents.tpl:35
  msgid "Status"
@@ -1315,7 +1339,7 @@ msgstr "UID"
  
  #: plugins/personal/posix/generic.tpl:62
  #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:894
  msgid "GID"
  msgstr "GID"
  
@@ -1358,7 +1382,7 @@ msgstr "Wyświetl grupy departamentu"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -1415,53 +1439,53 @@ msgstr "Ustawienia Unix"
  msgid "UNIX"
  msgstr "UNIX"
  
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:135
  msgid "expired"
  msgstr "wygasło"
  
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:137
  msgid "grace time active"
  msgstr "Czas prolongaty aktywny"
  
-#: plugins/personal/posix/class_posixAccount.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:140
  msgid "active, password not changable"
  msgstr "aktywne, hasło niezmienialne"
  
-#: plugins/personal/posix/class_posixAccount.inc:143
+#: plugins/personal/posix/class_posixAccount.inc:142
  msgid "active, password expired"
  msgstr "aktywne, hasło wygasło"
  
-#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:144
  msgid "active"
  msgstr "Aktywne"
  
-#: plugins/personal/posix/class_posixAccount.inc:156
-#: plugins/personal/posix/class_posixAccount.inc:1010
+#: plugins/personal/posix/class_posixAccount.inc:155
+#: plugins/personal/posix/class_posixAccount.inc:1002
  msgid "Group of user"
  msgstr "Grupa użytkownika"
  
-#: plugins/personal/posix/class_posixAccount.inc:191
+#: plugins/personal/posix/class_posixAccount.inc:190
  msgid "unconfigured"
  msgstr "nieskonfigurowane"
  
-#: plugins/personal/posix/class_posixAccount.inc:208
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:791
+#: plugins/personal/posix/class_posixAccount.inc:201
+#: plugins/admin/systems/class_workstationStartup.inc:825
  #: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:196
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
  msgid "automatic"
  msgstr "automatyczne"
  
-#: plugins/personal/posix/class_posixAccount.inc:254
+#: plugins/personal/posix/class_posixAccount.inc:247
  msgid "This account has no unix extensions."
  msgstr "To konto nie posiada rozszerzeń unix"
  
-#: plugins/personal/posix/class_posixAccount.inc:274
-#: plugins/personal/posix/class_posixAccount.inc:277
+#: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
  msgid "Remove posix account"
  msgstr "Usuń konto posixowe"
  
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:268
  msgid ""
  "This account has unix features enabled. To disable them, you'll need to "
  "remove the samba / environment account first."
@@ -1469,45 +1493,45 @@ msgstr ""
  "To konto posiada rozszerzenia unix, Aby je wyłączyć należy najpierw usunąć "
  "konto Samba/Środowisko."
  
-#: plugins/personal/posix/class_posixAccount.inc:278
+#: plugins/personal/posix/class_posixAccount.inc:271
  msgid ""
  "This account has posix features enabled. You can disable them by clicking "
  "below."
  msgstr ""
  "To konto posiada rozszerzenia posix. Można je wyłączyć klikająć poniżej."
  
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:274
  msgid "Create posix account"
  msgstr "Utwórz konto posixowe"
  
-#: plugins/personal/posix/class_posixAccount.inc:282
+#: plugins/personal/posix/class_posixAccount.inc:275
  msgid ""
  "This account has posix features disabled. You can enable them by clicking "
  "below."
  msgstr ""
  "To konto nie posiada rozszerzenia posix. Można je włączyć klikająć poniżej."
  
-#: plugins/personal/posix/class_posixAccount.inc:442
+#: plugins/personal/posix/class_posixAccount.inc:435
  #, php-format
  msgid "Password can't be changed up to %s days after last change"
  msgstr "Hasło nie może być zmienione do %s dni po ostatniej zmianie"
  
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:439
  #, php-format
  msgid "Password must be changed after %s days"
  msgstr "Hasło musi zostać zmienione po %s dniach"
  
-#: plugins/personal/posix/class_posixAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:443
  #, php-format
  msgid "Disable account after %s days of inactivity after password expiery"
  msgstr "Wyłącz konto po %s dniach nieaktywności po wygaśnięciu hasła"
  
-#: plugins/personal/posix/class_posixAccount.inc:454
+#: plugins/personal/posix/class_posixAccount.inc:447
  #, php-format
  msgid "Warn user %s days before password expiery"
  msgstr "Ostrzeż użytkownika na %s dni przed wygaśnięciem hasła"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1516,7 +1540,7 @@ msgstr "Ostrzeż użytkownika na %s dni przed wygaśnięciem hasła"
  msgid "January"
  msgstr "Styczeń"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1525,7 +1549,7 @@ msgstr "Styczeń"
  msgid "February"
  msgstr "Luty"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1534,7 +1558,7 @@ msgstr "Luty"
  msgid "March"
  msgstr "Marzec"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1543,7 +1567,7 @@ msgstr "Marzec"
  msgid "April"
  msgstr "Kwiecień"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1552,7 +1576,7 @@ msgstr "Kwiecień"
  msgid "May"
  msgstr "Maj"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1561,7 +1585,7 @@ msgstr "Maj"
  msgid "June"
  msgstr "Czerwiec"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1570,7 +1594,7 @@ msgstr "Czerwiec"
  msgid "July"
  msgstr "Lipiec"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1579,7 +1603,7 @@ msgstr "Lipiec"
  msgid "August"
  msgstr "Sierpień"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1588,7 +1612,7 @@ msgstr "Sierpień"
  msgid "September"
  msgstr "Wrzesień"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1597,7 +1621,7 @@ msgstr "Wrzesień"
  msgid "October"
  msgstr "Październik"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1606,7 +1630,7 @@ msgstr "Październik"
  msgid "November"
  msgstr "Listopad"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1615,144 +1639,149 @@ msgstr "Listopad"
  msgid "December"
  msgstr "Grudzień"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  #: plugins/personal/samba/class_sambaAccount.inc:468
-#: plugins/admin/systems/class_terminalGeneric.inc:97
+#: plugins/admin/systems/class_terminalGeneric.inc:104
  #: ihtml/themes/default/setup_step4.tpl:91
  msgid "disabled"
  msgstr "wyłączone"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  msgid "full access"
  msgstr "pełen dostęp"
  
-#: plugins/personal/posix/class_posixAccount.inc:576
+#: plugins/personal/posix/class_posixAccount.inc:568
  msgid "allow access to these hosts"
  msgstr "zezwól na dostęp do tych hostów"
  
-#: plugins/personal/posix/class_posixAccount.inc:622
+#: plugins/personal/posix/class_posixAccount.inc:614
  #, php-format
  msgid "Removing of user/posix account with dn '%s' failed."
  msgstr "Usuwanie konta posix z dn '%s' nieudane."
  
-#: plugins/personal/posix/class_posixAccount.inc:770
+#: plugins/personal/posix/class_posixAccount.inc:762
  msgid "Failed: overriding lock"
  msgstr "Niepowodzenie: nadpisuję blokadę"
  
-#: plugins/personal/posix/class_posixAccount.inc:859
+#: plugins/personal/posix/class_posixAccount.inc:851
  #, php-format
  msgid "Saving of user/posix account with dn '%s' failed."
  msgstr "Zapisywanie konta posix z dn '%s' nieudane."
  
-#: plugins/personal/posix/class_posixAccount.inc:924
+#: plugins/personal/posix/class_posixAccount.inc:916
  msgid "The required field 'Home directory' is not set."
  msgstr "Wymagane pole 'Katalog domowy' nie jest ustawione."
  
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:919
  msgid "Please enter a valid path in 'Home directory' field."
  msgstr "Proszę podać prawidłową ścieżkę w polu 'Katalog domowy'."
  
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:927
  msgid "Value specified as 'UID' is not valid."
  msgstr "Wartość podana jako 'UID' jest nieprawidłowa."
  
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:930
  msgid "Value specified as 'UID' is too small."
  msgstr "Wartość podana jako 'UID' jest za mała."
  
-#: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/admin/groups/class_groupGeneric.inc:797
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:791
  msgid "Value specified as 'GID' is not valid."
  msgstr "Wartość podana jako 'GID' jest nieprawidłowa."
  
-#: plugins/personal/posix/class_posixAccount.inc:945
-#: plugins/admin/groups/class_groupGeneric.inc:800
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:794
  msgid "Value specified as 'GID' is too small."
  msgstr "Wartość podana jako 'GID' jest za mała."
  
-#: plugins/personal/posix/class_posixAccount.inc:953
+#: plugins/personal/posix/class_posixAccount.inc:945
  msgid "Value specified as 'shadowMin' is not valid."
  msgstr "Wartość podana jako 'shadowMin' jest nieprawidłowa."
  
-#: plugins/personal/posix/class_posixAccount.inc:958
+#: plugins/personal/posix/class_posixAccount.inc:950
  msgid "Value specified as 'shadowMax' is not valid."
  msgstr "Wartość podana jako 'shadowMax' jest nieprawidłowa."
  
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:955
  msgid "Value specified as 'shadowWarning' is not valid."
  msgstr "Wartość podana jako 'shadowWarning' jest nieprawidłowa."
  
-#: plugins/personal/posix/class_posixAccount.inc:966
+#: plugins/personal/posix/class_posixAccount.inc:958
  msgid "'shadowWarning' without 'shadowMax' makes no sense."
  msgstr "'shadowWarning' bez 'shadowMax' nie ma sensu."
  
-#: plugins/personal/posix/class_posixAccount.inc:969
+#: plugins/personal/posix/class_posixAccount.inc:961
  msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
  msgstr ""
  "Wartość podana jako 'shadowWarning' powinna być mniejsza niż 'shadowMax'."
  
-#: plugins/personal/posix/class_posixAccount.inc:972
+#: plugins/personal/posix/class_posixAccount.inc:964
  msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
  msgstr ""
  "Wartość podana jako 'shadowWarning' powinna być większa niż 'shadowMin'."
  
-#: plugins/personal/posix/class_posixAccount.inc:977
+#: plugins/personal/posix/class_posixAccount.inc:969
  msgid "Value specified as 'shadowInactive' is not valid."
  msgstr "Wartość podana jako ;shadowInactive' jest nieprawidłowa."
  
-#: plugins/personal/posix/class_posixAccount.inc:980
+#: plugins/personal/posix/class_posixAccount.inc:972
  msgid "'shadowInactive' without 'shadowMax' makes no sense."
  msgstr "'shadowInactive' bez 'shadowMax' nie ma sensu."
  
-#: plugins/personal/posix/class_posixAccount.inc:985
+#: plugins/personal/posix/class_posixAccount.inc:977
  msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
  msgstr "Wartość podana jako 'shadowMin' powinna być mniejsza niż 'shadowMax'."
  
-#: plugins/personal/posix/class_posixAccount.inc:1148
-#: plugins/admin/groups/class_groupGeneric.inc:836
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:830
  msgid "Too many users, can't allocate a free ID!"
  msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
  
-#: plugins/personal/posix/class_posixAccount.inc:1317
+#: plugins/personal/posix/class_posixAccount.inc:1309
  msgid "POSIX account"
  msgstr "Konto POSIX"
  
-#: plugins/personal/posix/class_posixAccount.inc:1329
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:100
+#: plugins/personal/posix/class_posixAccount.inc:1314
+#, fuzzy
+msgid "Posix Account"
+msgstr "Konto Proxy"
+
+#: plugins/personal/posix/class_posixAccount.inc:1322
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:100
  #: html/getxls.php:135 html/getxls.php:158 html/getxls.php:347
  #: html/getxls.php:364
  msgid "User ID"
  msgstr "Identyfikator użytkownika"
  
-#: plugins/personal/posix/class_posixAccount.inc:1330
+#: plugins/personal/posix/class_posixAccount.inc:1323
  msgid "Group ID"
  msgstr "ID grupy"
  
-#: plugins/personal/posix/class_posixAccount.inc:1332
+#: plugins/personal/posix/class_posixAccount.inc:1325
  msgid "Force password change on login"
  msgstr "Wymuś zmianę hasła podczas logowania"
  
-#: plugins/personal/posix/class_posixAccount.inc:1333
+#: plugins/personal/posix/class_posixAccount.inc:1326
  msgid "Shadow min"
  msgstr "Shadow min"
  
-#: plugins/personal/posix/class_posixAccount.inc:1334
+#: plugins/personal/posix/class_posixAccount.inc:1327
  msgid "Shadow max"
  msgstr "Shadow max"
  
-#: plugins/personal/posix/class_posixAccount.inc:1335
+#: plugins/personal/posix/class_posixAccount.inc:1328
  msgid "Shadow warning"
  msgstr "Shadow ostrzeżenie"
  
-#: plugins/personal/posix/class_posixAccount.inc:1336
+#: plugins/personal/posix/class_posixAccount.inc:1329
  msgid "Shadow inactive"
  msgstr "Shadow nieaktywne"
  
-#: plugins/personal/posix/class_posixAccount.inc:1337
+#: plugins/personal/posix/class_posixAccount.inc:1330
  msgid "Shadow expire"
  msgstr "Shadow wygasa"
  
-#: plugins/personal/posix/class_posixAccount.inc:1338
+#: plugins/personal/posix/class_posixAccount.inc:1331
  msgid "System trust model"
  msgstr "Zaufanie do systemów"
  
@@ -1783,7 +1812,7 @@ msgid "Allow user to change password from client"
  msgstr "Zezwól użytkownikowi na zmianę hasła z klienta"
  
  #: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1056
  msgid "Login from windows client requires no password"
  msgstr "Logowanie z klienta windows nie wymaga hasła"
  
@@ -1792,7 +1821,7 @@ msgid "Temporary disable samba account"
  msgstr "Tymczasowo wyłącz konto samba"
  
  #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1069
+#: plugins/personal/samba/class_sambaAccount.inc:1070
  msgid "Domain"
  msgstr "Domena"
  
@@ -1801,12 +1830,12 @@ msgid "Terminal Server"
  msgstr "Terminal Server"
  
  #: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1052
  msgid "Allow login on terminal server"
  msgstr "Zezwól na logowanie do serwera terminali"
  
  #: plugins/personal/samba/samba3.tpl:131
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1053
  msgid "Inherit client config"
  msgstr "Odziedzicz konfigurację klienta"
  
@@ -1871,17 +1900,17 @@ msgid "Reconnect if disconnected"
  msgstr "Połącz jeśli rozłączono"
  
  #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1057
  msgid "Lock samba account"
  msgstr "Zablokuj konto samba"
  
  #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1062
+#: plugins/personal/samba/class_sambaAccount.inc:1063
  msgid "Limit Logon Time"
  msgstr "Ogranicz czas logowania"
  
  #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1063
+#: plugins/personal/samba/class_sambaAccount.inc:1064
  msgid "Limit Logoff Time"
  msgstr "Ogranicz czas wylogowania"
  
@@ -2019,35 +2048,40 @@ msgstr ""
  msgid "Saving of user/samba account with dn '%s' failed."
  msgstr "Zapisywanie konta Samba z dn '%s' nieudane."
  
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1047
+#, fuzzy
+msgid "Samba account"
+msgstr "Zablokuj konto samba"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1055
  msgid "Allow user to change password"
  msgstr "Zezwól użytkownikowi na zmianę hasła"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1059
+#: plugins/personal/samba/class_sambaAccount.inc:1060
  msgid "Account expires"
  msgstr "Konto wygasa"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1060
+#: plugins/personal/samba/class_sambaAccount.inc:1061
  msgid "Password expires"
  msgstr "Hasło wygasa"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1065
+#: plugins/personal/samba/class_sambaAccount.inc:1066
  msgid "Generic home directory"
  msgstr "Ogólny katalog domowy"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1066
+#: plugins/personal/samba/class_sambaAccount.inc:1067
  msgid "Generic samba home drive"
  msgstr "Podstawowy dysk domowy samba"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1067
+#: plugins/personal/samba/class_sambaAccount.inc:1068
  msgid "Generic script path"
  msgstr "Ogólna ścieżka do skryptu"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1068
+#: plugins/personal/samba/class_sambaAccount.inc:1069
  msgid "Generic profile path"
  msgstr "Ogólna ścieżka do profilu"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1070
+#: plugins/personal/samba/class_sambaAccount.inc:1071
  msgid "Allow connection from"
  msgstr "Zezwól na połączenia z"
  
@@ -2063,105 +2097,95 @@ msgstr "mężczyzna"
  msgid "This account has no valid GOsa extensions."
  msgstr "To konto nie posiada poprawnych rozszerzeń GOsa."
  
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:335
  msgid "The specified file has not been uploaded via HTTP POST! Aborted."
  msgstr "Podany plik nie został wgrany poprzez HTTP POST! Akcja anulowana."
  
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:432
  msgid "Please enter a valid serial number"
  msgstr "Proszę podać poprawny numer seryjny"
  
-#: plugins/personal/generic/class_user.inc:471
+#: plugins/personal/generic/class_user.inc:476
  msgid ""
  "(Some types of certificates are currently not supported and may be displayed "
  "as 'invalid'.)"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:481
+#: plugins/personal/generic/class_user.inc:486
  #, php-format
  msgid "Certificate is valid from %s to %s and is currently %s."
  msgstr "Certyfikat jest ważny od %s do %s i jest obecnie %s."
  
-#: plugins/personal/generic/class_user.inc:484
+#: plugins/personal/generic/class_user.inc:489
  msgid "valid"
  msgstr "prawidłowy"
  
-#: plugins/personal/generic/class_user.inc:485
+#: plugins/personal/generic/class_user.inc:490
  msgid "invalid"
  msgstr "nieprawidłowy"
  
-#: plugins/personal/generic/class_user.inc:490
+#: plugins/personal/generic/class_user.inc:495
  msgid "No certificate installed"
  msgstr "Brak zainstalowanych certyfikatów"
  
-#: plugins/personal/generic/class_user.inc:579
+#: plugins/personal/generic/class_user.inc:582
  #, fuzzy, php-format
  msgid "Removing of user/generic account with dn '%s' failed."
  msgstr "Usuwanie konta ogólnego użytkownika nieudane"
  
-#: plugins/personal/generic/class_user.inc:611
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:982
  msgid "Kerberos database communication failed"
  msgstr "Komunikacja z bazą Kerberos nieudana"
  
-#: plugins/personal/generic/class_user.inc:625
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:628
+#: plugins/personal/generic/class_user.inc:999
  msgid "Can't remove user from kerberos database."
  msgstr "Nie można usunąć użytkownika z bazy Kerberos."
  
-#: plugins/personal/generic/class_user.inc:682
-#: plugins/admin/systems/class_printGeneric.inc:625
+#: plugins/personal/generic/class_user.inc:684
  #, fuzzy, php-format
  msgid "You are not allowed to move this object to '%s'."
  msgstr "Brak uprawnień do usunięcia grupy obiektowej."
  
-#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:935
  #, fuzzy, php-format
  msgid "Saving of user/generic account with dn '%s' failed."
  msgstr "Zapisywanie konta ogólnego użytkownika nieudane"
  
-#: plugins/personal/generic/class_user.inc:1008
+#: plugins/personal/generic/class_user.inc:1010
  msgid "Can't add user to kerberos database."
  msgstr "nie można dodać użytkownika do bazy Kerberos."
  
-#: plugins/personal/generic/class_user.inc:1049
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "Brak uprawnień do tworzenia konta w tym 'Kontenerze'."
-
-#: plugins/personal/generic/class_user.inc:1052
-#, fuzzy
-msgid "You have no permissions to move this user to the specified 'Base'."
-msgstr "Brak uprawnień do przenoszenia konta z obecnego 'Kontenera'."
-
-#: plugins/personal/generic/class_user.inc:1058
-#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/personal/generic/class_user.inc:1057
+#: plugins/addons/addressbook/class_addressbook.inc:653
  #: plugins/admin/users/class_userManagement.inc:471
  #: plugins/admin/users/class_userManagement.inc:549
  msgid "The required field 'Name' is not set."
  msgstr "Wymagane pole 'Nazwa' jest puste."
  
-#: plugins/personal/generic/class_user.inc:1067
+#: plugins/personal/generic/class_user.inc:1066
  msgid "There's already a person with this 'Login' in the database."
  msgstr "Już istnieje osoba z takim samym loginem w bazie."
  
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/personal/generic/class_user.inc:1072
+#: plugins/addons/addressbook/class_addressbook.inc:657
  #: plugins/admin/users/class_userManagement.inc:474
  #: plugins/admin/users/class_userManagement.inc:552
  msgid "The required field 'Given name' is not set."
  msgstr "Wymagane pole 'Podana nazwa' jest puste."
  
-#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1075
  msgid "The required field 'Login' is not set."
  msgstr "Wymagane pole 'Login' jest puste."
  
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1082
  msgid ""
  "There's already a person with this 'Name'/'Given name' combination in the "
  "database."
  msgstr "Już istnieje osoba z tą 'Nazwą'/'Podaną nazwą' w bazie."
  
-#: plugins/personal/generic/class_user.inc:1090
+#: plugins/personal/generic/class_user.inc:1089
  msgid ""
  "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
@@ -2169,119 +2193,119 @@ msgstr ""
  "Pole 'Login' zawiera niedozwolone znaki. Tylko małe litery, liczny i "
  "myślniki są dozwolone."
  
-#: plugins/personal/generic/class_user.inc:1093
+#: plugins/personal/generic/class_user.inc:1092
  msgid "The field 'Homepage' contains an invalid URL definition."
  msgstr "Pole 'Strona WWW' zawiera niepoprawną definicję URL."
  
-#: plugins/personal/generic/class_user.inc:1096
-#: plugins/personal/generic/class_user.inc:1121
-#: plugins/addons/addressbook/class_addressbook.inc:661
-#: plugins/addons/addressbook/class_addressbook.inc:689
-#: plugins/admin/departments/class_departmentGeneric.inc:249
+#: plugins/personal/generic/class_user.inc:1095
+#: plugins/personal/generic/class_user.inc:1120
+#: plugins/addons/addressbook/class_addressbook.inc:663
+#: plugins/addons/addressbook/class_addressbook.inc:691
+#: plugins/admin/departments/class_departmentGeneric.inc:269
  msgid "The field 'Name' contains invalid characters."
  msgstr "Pole 'Nazwa' zawiera niedozwolone znaki."
  
-#: plugins/personal/generic/class_user.inc:1099
-#: plugins/personal/generic/class_user.inc:1118
-#: plugins/addons/addressbook/class_addressbook.inc:664
-#: plugins/addons/addressbook/class_addressbook.inc:686
+#: plugins/personal/generic/class_user.inc:1098
+#: plugins/personal/generic/class_user.inc:1117
+#: plugins/addons/addressbook/class_addressbook.inc:666
+#: plugins/addons/addressbook/class_addressbook.inc:688
  msgid "The field 'Given name' contains invalid characters."
  msgstr "Pole 'Podana nazwa' zawiera niedozwolone znaki."
  
-#: plugins/personal/generic/class_user.inc:1104
-#: plugins/addons/addressbook/class_addressbook.inc:669
-#: plugins/addons/addressbook/class_addressbook.inc:672
-#: plugins/admin/departments/class_departmentGeneric.inc:252
+#: plugins/personal/generic/class_user.inc:1103
+#: plugins/addons/addressbook/class_addressbook.inc:671
+#: plugins/addons/addressbook/class_addressbook.inc:674
+#: plugins/admin/departments/class_departmentGeneric.inc:272
  msgid "The field 'Phone' contains an invalid phone number."
  msgstr "Pole 'Telefon' zawiera nieprawidłowy numer telefonu."
  
-#: plugins/personal/generic/class_user.inc:1107
-#: plugins/addons/addressbook/class_addressbook.inc:675
-#: plugins/admin/departments/class_departmentGeneric.inc:255
+#: plugins/personal/generic/class_user.inc:1106
+#: plugins/addons/addressbook/class_addressbook.inc:677
+#: plugins/admin/departments/class_departmentGeneric.inc:275
  msgid "The field 'Fax' contains an invalid phone number."
  msgstr "Pole 'Fax' zawiera nieprawidłowy numer telefonu."
  
-#: plugins/personal/generic/class_user.inc:1110
-#: plugins/addons/addressbook/class_addressbook.inc:678
+#: plugins/personal/generic/class_user.inc:1109
+#: plugins/addons/addressbook/class_addressbook.inc:680
  msgid "The field 'Mobile' contains an invalid phone number."
  msgstr "Pole 'Komórka' zawiera nieprawidłowy numer telefonu."
  
-#: plugins/personal/generic/class_user.inc:1113
-#: plugins/addons/addressbook/class_addressbook.inc:681
+#: plugins/personal/generic/class_user.inc:1112
+#: plugins/addons/addressbook/class_addressbook.inc:683
  msgid "The field 'Pager' contains an invalid phone number."
  msgstr "Pole 'Pager' zawiera nieprawidłowy numer telefonu."
  
-#: plugins/personal/generic/class_user.inc:1222
+#: plugins/personal/generic/class_user.inc:1221
  msgid "Could not open specified certificate!"
  msgstr "Nie można otworzyć wybranego certyfikatu!"
  
-#: plugins/personal/generic/class_user.inc:1353
+#: plugins/personal/generic/class_user.inc:1352
  #: plugins/personal/generic/generic.tpl:442
  msgid "Unit"
  msgstr "Jednostka"
  
-#: plugins/personal/generic/class_user.inc:1354
+#: plugins/personal/generic/class_user.inc:1353
  #: plugins/personal/generic/generic.tpl:467
  msgid "House identifier"
  msgstr "Identyfikator budynku"
  
-#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/class_user.inc:1354
  #: plugins/personal/generic/generic.tpl:384
  msgid "Vocation"
  msgstr "Wywołanie"
  
-#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1355
  #: plugins/personal/generic/generic.tpl:511
  msgid "Last delivery"
  msgstr "Ostatnia dostawa"
  
-#: plugins/personal/generic/class_user.inc:1357
+#: plugins/personal/generic/class_user.inc:1356
  #: plugins/personal/generic/generic.tpl:433
  msgid "Person locality"
  msgstr "Lokalizacja osoby"
  
-#: plugins/personal/generic/class_user.inc:1358
+#: plugins/personal/generic/class_user.inc:1357
  #: plugins/personal/generic/generic.tpl:392
  msgid "Unit description"
  msgstr "Opis jednostki"
  
-#: plugins/personal/generic/class_user.inc:1359
+#: plugins/personal/generic/class_user.inc:1358
  #: plugins/personal/generic/generic.tpl:401
  msgid "Subject area"
  msgstr "Sektor"
  
-#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/class_user.inc:1359
  #: plugins/personal/generic/generic.tpl:410
  msgid "Functional title"
  msgstr "Tytuł funkcjonalny"
  
-#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/class_user.inc:1361
  #: plugins/personal/generic/generic.tpl:520
  msgid "Public visible"
  msgstr "Publicznie widoczne"
  
-#: plugins/personal/generic/class_user.inc:1363
+#: plugins/personal/generic/class_user.inc:1362
  #: plugins/personal/generic/generic.tpl:451
  msgid "Street"
  msgstr "Ulica"
  
-#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1363
  #: plugins/personal/generic/generic.tpl:419
  msgid "Role"
  msgstr "Pełniona funkcja"
  
-#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/class_user.inc:1364
  #: plugins/personal/generic/generic.tpl:459
  #: plugins/addons/addressbook/address_edit.tpl:179
  #: plugins/addons/addressbook/address_info.tpl:133 html/getxls.php:227
  msgid "Postal code"
  msgstr "Kod pocztowy"
  
-#: plugins/personal/generic/class_user.inc:1369
+#: plugins/personal/generic/class_user.inc:1368
  msgid "Generic user settings"
  msgstr "Ogólne ustawienia użytkownika"
  
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:1373
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/users/class_userManagement.inc:28
  #: plugins/admin/systems/printer.tpl:91
@@ -2291,206 +2315,207 @@ msgstr "Ogólne ustawienia użytkownika"
  msgid "Users"
  msgstr "Użytkownicy"
  
-#: plugins/personal/generic/class_user.inc:1378
+#: plugins/personal/generic/class_user.inc:1377
  #: plugins/personal/generic/generic.tpl:143
  #: plugins/gofax/blocklists/generic.tpl:17
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:598
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
  #: plugins/addons/godfs/class_dfsManagment.inc:217
  #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:894
-#: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/groups/class_groupGeneric.inc:888
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:129
  #: plugins/admin/applications/generic.tpl:42
-#: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:134
+#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/class_divListApplication.inc:144
  #: plugins/admin/departments/generic.tpl:35
-#: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:107
+#: plugins/admin/departments/class_departmentGeneric.inc:586
+#: plugins/admin/departments/class_divListDepartment.inc:100
  #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:22
  #: plugins/admin/systems/phone.tpl:17 plugins/admin/systems/printer.tpl:27
  #: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/class_terminalGeneric.inc:513
-#: plugins/admin/systems/class_servGeneric.inc:346
-#: plugins/admin/systems/class_workstationGeneric.inc:515
+#: plugins/admin/systems/class_terminalGeneric.inc:553
+#: plugins/admin/systems/class_servGeneric.inc:359
+#: plugins/admin/systems/class_workstationGeneric.inc:537
  #: plugins/admin/systems/wingeneric.tpl:13
  #: plugins/admin/systems/component.tpl:17
-#: plugins/admin/systems/class_printGeneric.inc:864
-#: plugins/admin/systems/class_componentGeneric.inc:267
-#: plugins/admin/systems/class_glpiSelectUser.inc:167
+#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_componentGeneric.inc:269
+#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_glpiSelectUser.inc:181
  #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:148
+#: plugins/admin/systems/class_divListSystem.inc:187
  #: plugins/admin/systems/goLdapServer.tpl:2
  #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:719
-#: plugins/admin/ogroups/class_divListOGroup.inc:145
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_divListOGroup.inc:149
+#: plugins/admin/acl/class_divListACL.inc:98
+#: plugins/admin/fai/class_divListFai.inc:171
  #: plugins/admin/mimetypes/generic.tpl:44
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:683
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:153
  #: plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/class_gofonMacro.inc:484
-#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/macro/class_gofonMacro.inc:497
+#: plugins/gofon/macro/class_divListMacros.inc:106
  #: plugins/gofon/conference/generic.tpl:49
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
-#: plugins/gofon/conference/class_divListConferences.inc:119
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_divListConferences.inc:114
  msgid "Base"
  msgstr "Kontener"
  
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/addons/addressbook/class_addressbook.inc:792 html/getxls.php:301
  msgid "Surename"
  msgstr "Nazwisko"
  
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/addons/addressbook/class_addressbook.inc:611
-#: plugins/addons/addressbook/class_addressbook.inc:791 html/getxls.php:86
+#: plugins/personal/generic/class_user.inc:1380
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/addressbook/class_addressbook.inc:793 html/getxls.php:86
  #: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
  msgid "Given name"
  msgstr "Imię"
  
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/addons/addressbook/class_addressbook.inc:796
+#: plugins/personal/generic/class_user.inc:1381
+#: plugins/addons/addressbook/class_addressbook.inc:798
  msgid "User identification"
  msgstr "Identyfikacja użytkownika"
  
-#: plugins/personal/generic/class_user.inc:1383
+#: plugins/personal/generic/class_user.inc:1382
  #: plugins/personal/generic/generic.tpl:73
  #: plugins/addons/addressbook/address_edit.tpl:60
  #: plugins/addons/addressbook/address_info.tpl:40
  msgid "Personal title"
  msgstr "Osobisty tytuł"
  
-#: plugins/personal/generic/class_user.inc:1384
+#: plugins/personal/generic/class_user.inc:1383
  #: plugins/personal/generic/generic.tpl:83
  msgid "Academic title"
  msgstr "Tytuł naukowy"
  
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
+#: plugins/personal/generic/class_user.inc:1384
+#: plugins/addons/addressbook/class_addressbook.inc:809 html/getxls.php:224
  msgid "Home postal address"
  msgstr "Adres domowy"
  
-#: plugins/personal/generic/class_user.inc:1386
-#: plugins/addons/addressbook/class_addressbook.inc:795
+#: plugins/personal/generic/class_user.inc:1385
+#: plugins/addons/addressbook/class_addressbook.inc:797
  msgid "Home phone number"
  msgstr "Numer telefonu domowego"
  
-#: plugins/personal/generic/class_user.inc:1387
+#: plugins/personal/generic/class_user.inc:1386
  #: plugins/personal/generic/generic.tpl:183
  msgid "Homepage"
  msgstr "Strona domowa"
  
-#: plugins/personal/generic/class_user.inc:1388
+#: plugins/personal/generic/class_user.inc:1387
  #: plugins/personal/generic/generic.tpl:250
-#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
+#: plugins/addons/addressbook/class_addressbook.inc:801 html/getxls.php:299
  msgid "Organization"
  msgstr "Organizacja"
  
-#: plugins/personal/generic/class_user.inc:1389
+#: plugins/personal/generic/class_user.inc:1388
  #: plugins/personal/generic/generic.tpl:258
  #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
  #: plugins/addons/addressbook/address_edit.tpl:155
-#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/class_addressbook.inc:802
  #: plugins/addons/addressbook/address_info.tpl:117
  #: plugins/admin/users/class_divListUsers.inc:56
  #: plugins/admin/applications/class_divListApplication.inc:51
-#: plugins/admin/ogroups/class_ogroupManagement.inc:354
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
  #: plugins/gofon/macro/class_divListMacros.inc:52
  #: plugins/generic/references/class_reference.inc:38
  msgid "Department"
  msgstr "Departament"
  
-#: plugins/personal/generic/class_user.inc:1390
+#: plugins/personal/generic/class_user.inc:1389
  #: plugins/personal/generic/generic.tpl:93
  msgid "Date of birth"
  msgstr "Data urodzenia"
  
-#: plugins/personal/generic/class_user.inc:1391
+#: plugins/personal/generic/class_user.inc:1390
  msgid "Gender"
  msgstr "Płeć"
  
-#: plugins/personal/generic/class_user.inc:1392
+#: plugins/personal/generic/class_user.inc:1391
  msgid "Preferred language"
  msgstr "Preferowany język"
  
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1392
  msgid "Department number"
  msgstr "Numer departamentu"
  
-#: plugins/personal/generic/class_user.inc:1394
+#: plugins/personal/generic/class_user.inc:1393
  msgid "Employee number"
  msgstr "Numer pracownika"
  
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:1394
  #: plugins/personal/generic/generic.tpl:282
  msgid "Employee type"
  msgstr "Typ pracownika"
  
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:1395
  #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/class_addressbook.inc:801
+#: plugins/addons/addressbook/class_addressbook.inc:803
  #: plugins/addons/godfs/generic.tpl:34
  #: plugins/admin/departments/generic.tpl:56
  #: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: plugins/admin/departments/class_departmentGeneric.inc:587
  #: plugins/admin/systems/workstation.tpl:19
-#: plugins/admin/systems/class_workstationGeneric.inc:514
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_workstationGeneric.inc:536
+#: plugins/admin/systems/class_printGeneric.inc:870
  #: plugins/admin/systems/class_glpiAccount.inc:782
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
  msgid "Location"
  msgstr "Lokalizacja"
  
-#: plugins/personal/generic/class_user.inc:1397
+#: plugins/personal/generic/class_user.inc:1396
  #: plugins/personal/generic/generic.tpl:360
-#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:806
  #: plugins/admin/departments/generic.tpl:60
-#: plugins/admin/departments/class_departmentGeneric.inc:547
+#: plugins/admin/departments/class_departmentGeneric.inc:591
  #: html/getxls.php:228 html/getxls.php:301
  msgid "State"
  msgstr "Stan"
  
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1397
  #: plugins/personal/generic/paste_generic.tpl:47
  msgid "User picture"
  msgstr "Zdjęcie użytkownika"
  
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1398
  msgid "Room number"
  msgstr "Numer pokoju"
  
-#: plugins/personal/generic/class_user.inc:1400
-#: plugins/addons/addressbook/class_addressbook.inc:792
+#: plugins/personal/generic/class_user.inc:1399
+#: plugins/addons/addressbook/class_addressbook.inc:794
  msgid "Telefon number"
  msgstr "Numer telefonu"
  
-#: plugins/personal/generic/class_user.inc:1401
-#: plugins/addons/addressbook/class_addressbook.inc:794
+#: plugins/personal/generic/class_user.inc:1400
+#: plugins/addons/addressbook/class_addressbook.inc:796
  msgid "Mobile number"
  msgstr "Telefon komórkowy"
  
-#: plugins/personal/generic/class_user.inc:1402
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/nagios/class_nagiosAccount.inc:272
  msgid "Pager number"
  msgstr "Numer pagera"
  
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1402
  msgid "User certificates"
  msgstr "Certyfikaty użytkownika"
  
-#: plugins/personal/generic/class_user.inc:1405
-#: plugins/addons/addressbook/class_addressbook.inc:802
-#: plugins/addons/addressbook/class_addressbook.inc:803 html/getxls.php:226
+#: plugins/personal/generic/class_user.inc:1404
+#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:805 html/getxls.php:226
  #: html/getxls.php:298 html/getxls.php:300
  msgid "Postal address"
  msgstr "Adres pocztowy"
  
-#: plugins/personal/generic/class_user.inc:1406
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:820
-#: plugins/addons/addressbook/class_addressbook.inc:793
+#: plugins/personal/generic/class_user.inc:1405
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
+#: plugins/addons/addressbook/class_addressbook.inc:795
  msgid "Fax number"
  msgstr "Numer fax"
  
@@ -2564,7 +2589,7 @@ msgstr "Wybierz poddrzewo do umieszczenia konta."
  #: plugins/admin/systems/workstation.tpl:35
  #: plugins/admin/systems/wingeneric.tpl:18
  #: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:36
+#: plugins/admin/mimetypes/generic.tpl:53 plugins/gofon/macro/generic.tpl:36
  #: plugins/gofon/conference/generic.tpl:56
  #: plugins/gofon/conference/generic.tpl:62
  msgid "Select a base"
@@ -2577,7 +2602,7 @@ msgstr "Wybierz bazę"
  #: plugins/addons/addressbook/address_info.tpl:59
  #: plugins/addons/addressbook/address_info.tpl:155
  #: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/class_departmentGeneric.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:592
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
  msgid "Address"
  msgstr "Adres"
@@ -2635,7 +2660,7 @@ msgstr "Komórka"
  #: plugins/personal/generic/generic.tpl:326
  #: plugins/personal/nagios/nagios.tpl:79
  #: plugins/addons/addressbook/address_edit.tpl:246
-#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/class_addressbook.inc:800
  #: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
  #: html/getxls.php:300
  msgid "Pager"
@@ -2656,6 +2681,7 @@ msgstr ""
  
  #: plugins/personal/generic/generic_picture.tpl:27
  #: plugins/personal/generic/paste_generic.tpl:52
+#: plugins/admin/applications/generic.tpl:81
  msgid "Remove picture"
  msgstr "Usuń obrazek"
  
@@ -2663,37 +2689,38 @@ msgstr "Usuń obrazek"
  #: plugins/personal/generic/generic_certs.tpl:91
  #: plugins/personal/environment/hotplugDialogNew.tpl:53
  #: plugins/addons/addressbook/address_edit.tpl:264
-#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/departments/dep_move_confirm.tpl:15
+#: plugins/admin/systems/goNtpServer.tpl:29
  #: plugins/admin/systems/servdns.tpl:21
-#: plugins/admin/systems/servkolab.tpl:246
-#: plugins/admin/systems/goNtpServer.tpl:30
-#: plugins/admin/systems/goKrbServer.tpl:31
+#: plugins/admin/systems/servkolab.tpl:245
+#: plugins/admin/systems/goKrbServer.tpl:30
+#: plugins/admin/systems/goFonServer.tpl:39
  #: plugins/admin/systems/servnfs.tpl:139
-#: plugins/admin/systems/goFonServer.tpl:40
+#: plugins/admin/systems/goFaxServer.tpl:23
  #: plugins/admin/systems/servRepository.tpl:66
-#: plugins/admin/systems/goFaxServer.tpl:24
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
  #: plugins/admin/systems/glpi_devices.tpl:760
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
  #: plugins/admin/systems/servdnseditzone.tpl:119
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/goLdapServer.tpl:10
-#: plugins/admin/systems/goShareServer.tpl:30
-#: plugins/admin/systems/goMailServer.tpl:222
-#: plugins/admin/systems/goImapServer.tpl:117
-#: plugins/admin/systems/goSyslogServer.tpl:6
-#: plugins/admin/systems/goGlpiServer.tpl:33
-#: plugins/admin/systems/goCupsServer.tpl:6
-#: plugins/admin/systems/goTerminalServer.tpl:24
-#: plugins/admin/systems/goLogDBServer.tpl:24
-#: plugins/admin/systems/goSpamServer.tpl:126
-#: plugins/admin/systems/goSpamServerRule.tpl:22
-#: plugins/admin/systems/goVirusServer.tpl:169
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:29
+#: plugins/admin/systems/goMailServer.tpl:221
+#: plugins/admin/systems/goImapServer.tpl:116
+#: plugins/admin/systems/goSyslogServer.tpl:5
+#: plugins/admin/systems/goGlpiServer.tpl:32
+#: plugins/admin/systems/goCupsServer.tpl:5
+#: plugins/admin/systems/goTerminalServer.tpl:23
+#: plugins/admin/systems/goLogDBServer.tpl:23
+#: plugins/admin/systems/goSpamServer.tpl:125
+#: plugins/admin/systems/goSpamServerRule.tpl:21
+#: plugins/admin/systems/goVirusServer.tpl:168
  #: plugins/admin/systems/class_goService.inc:33
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:38
  #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/default/copyPasteDialog.tpl:19
  msgid "Save"
  msgstr "Zapisz"
  
@@ -2715,21 +2742,21 @@ msgstr "Standardowy certyfikat"
  #: plugins/personal/connectivity/class_kolabAccount.inc:258
  #: plugins/personal/environment/environment.tpl:159
  #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:597
+#: plugins/admin/groups/class_groupMail.inc:604
  #: plugins/admin/applications/class_applicationParameters.inc:124
  #: plugins/admin/systems/printer.tpl:71
  #: plugins/admin/systems/glpiPrinter.tpl:152
  #: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:182
+#: plugins/admin/systems/workstationStartup.tpl:186
  #: plugins/admin/systems/terminalStartup.tpl:111
  #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:393
  #: plugins/admin/systems/goMailServer.tpl:73
  #: plugins/admin/systems/goMailServer.tpl:104
  #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:78
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
+#: plugins/admin/fai/faiPackage.tpl:81
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:293
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:295
  msgid "Remove"
  msgstr "Usuń"
  
@@ -2758,6 +2785,7 @@ msgid "Set new password"
  msgstr "Ustaw nowe hasło"
  
  #: plugins/personal/connectivity/pureftpd.tpl:4
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
  msgid "FTP account"
  msgstr "Konto FTP"
  
@@ -2813,6 +2841,7 @@ msgstr "Tymczasowo wyłącz dostęp do FTP"
  
  #: plugins/personal/connectivity/proxy.tpl:23
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
+#: plugins/personal/connectivity/class_proxyAccount.inc:297
  msgid "Proxy account"
  msgstr "Konto Proxy"
  
@@ -2825,7 +2854,7 @@ msgid "Limit proxy access to working time"
  msgstr "Ogranicz dostęp do proxy do czasu pracu"
  
  #: plugins/personal/connectivity/proxy.tpl:84
-#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
  msgid "Restrict proxy usage by quota"
  msgstr "Ogranicz użycie proxy mechanizmami quota"
  
@@ -2861,7 +2890,7 @@ msgstr "Ustawienia konta PHP GW"
  #: plugins/personal/connectivity/class_pureftpdAccount.inc:219
  #: plugins/personal/connectivity/class_oxchangeAccount.inc:950
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
  #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
  #: plugins/personal/connectivity/class_opengwAccount.inc:310
@@ -2869,12 +2898,18 @@ msgstr "Ustawienia konta PHP GW"
  msgid "Connectivity addon"
  msgstr "Konto połączeń"
  
+#: plugins/personal/connectivity/class_phpgwAccount.inc:148
+#, fuzzy
+msgid "PHPgroupware"
+msgstr "PHPGroupware"
+
  #: plugins/personal/connectivity/phpgw.tpl:3
  msgid "PHPGroupware account"
  msgstr "Konto PHPGroupware"
  
  #: plugins/personal/connectivity/kolab.tpl:3
  #: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/class_kolabAccount.inc:452
  msgid "Kolab account"
  msgstr "Konto Kolab"
  
@@ -2887,7 +2922,7 @@ msgstr ""
  "dodaniu konta pocztowego."
  
  #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:459
+#: plugins/personal/connectivity/class_kolabAccount.inc:460
  msgid "Delegations"
  msgstr "Delegacje"
  
@@ -2919,7 +2954,7 @@ msgid "days"
  msgstr "dni"
  
  #: plugins/personal/connectivity/kolab.tpl:93
-#: plugins/personal/connectivity/class_kolabAccount.inc:460
+#: plugins/personal/connectivity/class_kolabAccount.inc:461
  msgid "Invitation policy"
  msgstr "Polityka zapraszania"
  
@@ -2998,15 +3033,15 @@ msgstr "Zapisywanie konta Kolab nieudane"
  msgid "Kolab account settings"
  msgstr "Ustawienia konta Kolab"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:456
+#: plugins/personal/connectivity/class_kolabAccount.inc:457
  msgid "Free busy future"
  msgstr "Free busy przyszłość"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:457
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
  msgid "Mail size restriction"
  msgstr "Ograniczenia rozmiaru wiadomości"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:458
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
  msgid "Free busy information"
  msgstr "Informacja FreeBusy"
  
@@ -3026,6 +3061,7 @@ msgid "Saving of user/webDAV account with dn '%s' failed."
  msgstr "Zapisywanie konta webDAV z dn '%s' nieudane."
  
  #: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_webdavAccount.inc:147
  #: plugins/personal/connectivity/webdav.tpl:3
  msgid "WebDAV account"
  msgstr "Konto WebDAV"
@@ -3077,27 +3113,27 @@ msgstr "FTP"
  msgid "Pure ftp account"
  msgstr "Konto Pure-ftp"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
  msgid "Quota files"
  msgstr " Quota pliki"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
  msgid "Upload ratio"
  msgstr "Przepustowość wysyłania"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
  msgid "Quota MBytes"
  msgstr "Quota rozmiaru (MB)"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
  msgid "Download ratio"
  msgstr "Skala ściągania"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
  msgid "Upload bandwith"
  msgstr "Przepustowość wysyłania"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
  msgid "Download bandwith"
  msgstr "Przepustowość ściągania"
  
@@ -3194,22 +3230,28 @@ msgstr "Open xchange"
  msgid "Open xchange account settings"
  msgstr "Ustawienia konta Open xchange"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:959
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
+#, fuzzy
+msgid "OpenExchange account"
+msgstr "konto Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
  #, fuzzy
  msgid "OXAppointmentDays"
  msgstr "Dni spotkania"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
  #, fuzzy
  msgid "OXTaskDays"
  msgstr "Dni robocze"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:962
  #, fuzzy
  msgid "OXTimeZone"
  msgstr "Strefa czasowa użytkownika"
  
  #: plugins/personal/connectivity/intranet.tpl:3
+#: plugins/personal/connectivity/class_intranetAccount.inc:181
  msgid "Intranet account"
  msgstr "Konto Intranet"
  
@@ -3269,16 +3311,17 @@ msgstr "Wartość numeryczna dla ustawień Quoty jest nieprawidłowa."
  msgid "Saving of user/proxy account with dn '%s' failed."
  msgstr "Zapisywanie konta proxy nieudane"
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:301
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
  msgid "Filter unwanted content"
  msgstr "Filtruj niechcianą zawartość"
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
  msgid "Limit proxy access"
  msgstr "Ogranicz dostęp do proxy"
  
  #: plugins/personal/connectivity/pptp.tpl:3
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_pptpAccount.inc:164
  msgid "PPTP account"
  msgstr "Konto PPTP"
  
@@ -3297,7 +3340,7 @@ msgstr "Usuwanie konta intranet z dn '%s' nieudane."
  msgid "Saving of user/intranet account with dn '%s' failed."
  msgstr "Zapisywanie konta intranet z dn '%s' nieudane."
  
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  msgid "Intranet account settings"
  msgstr "Ustawienia konta Intranet"
  
@@ -3322,29 +3365,30 @@ msgstr "Zapisywanie konta PPTP z dn '%s' nieudane."
  
  #: plugins/personal/connectivity/opengw.tpl:1
  #: plugins/personal/connectivity/class_opengwAccount.inc:309
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
  msgid "Opengroupware"
  msgstr "Opengroupware"
  
  #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:319
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
  msgid "Location team"
  msgstr "Zespół lokacji"
  
  #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:320
+#: plugins/personal/connectivity/class_opengwAccount.inc:321
  msgid "Template user"
  msgstr "Szablon użytkownika"
  
  #: plugins/personal/connectivity/opengw.tpl:33
-#: plugins/personal/connectivity/class_opengwAccount.inc:321
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/ogroups/class_termgroup.inc:42
+#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/admin/systems/class_servGeneric.inc:53
+#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/ogroups/class_termgroup.inc:41
  msgid "Locked"
  msgstr "Zablokowane"
  
  #: plugins/personal/connectivity/opengw.tpl:48
-#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/personal/connectivity/class_opengwAccount.inc:323
  msgid "Teams"
  msgstr "Zespoły"
  
@@ -3374,6 +3418,11 @@ msgstr "PHP schedule it"
  msgid "PHP Schedule it settings"
  msgstr "Ustawienia PHP schedule it"
  
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:149
+#, fuzzy
+msgid "PHP schedule it"
+msgstr "PHP schedule it"
+
  #: plugins/personal/connectivity/class_opengwAccount.inc:6
  msgid "Opengroupware account"
  msgstr "Konto Opengroupware"
@@ -3437,7 +3486,7 @@ msgid "Profil quota"
  msgstr "Quota profili"
  
  #: plugins/personal/environment/environment.tpl:73
-#: plugins/personal/environment/class_environment.inc:1282
+#: plugins/personal/environment/class_environment.inc:1285
  msgid "Cache profile localy"
  msgstr "Buforu profil lokalnie"
  
@@ -3446,7 +3495,7 @@ msgid "Kiosk profile settings"
  msgstr "Ustawienia profilu Kiosk"
  
  #: plugins/personal/environment/environment.tpl:85
-#: plugins/personal/environment/class_environment.inc:1288
+#: plugins/personal/environment/class_environment.inc:1291
  msgid "Kiosk profile"
  msgstr "Profil Kiosk"
  
@@ -3455,22 +3504,22 @@ msgid "Manage"
  msgstr "Zarządzaj"
  
  #: plugins/personal/environment/environment.tpl:105
-#: plugins/personal/environment/class_environment.inc:1281
+#: plugins/personal/environment/class_environment.inc:1284
  msgid "Resolution changeable during session"
  msgstr "Rozdzielczość zmienialna podczas pracy"
  
  #: plugins/personal/environment/environment.tpl:110
-#: plugins/personal/environment/class_environment.inc:1287
+#: plugins/personal/environment/class_environment.inc:1290
  #: plugins/admin/systems/workstationService.tpl:122
  #: plugins/admin/systems/terminalService.tpl:108
  msgid "Resolution"
  msgstr "Rozdzielczość"
  
  #: plugins/personal/environment/environment.tpl:133
-#: plugins/personal/environment/class_environment.inc:1293
+#: plugins/personal/environment/class_environment.inc:1296
  #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1123
-#: plugins/admin/systems/workstationStartup.tpl:158
+#: plugins/admin/systems/class_workstationStartup.inc:1168
+#: plugins/admin/systems/workstationStartup.tpl:162
  #: plugins/admin/systems/terminalStartup.tpl:87
  #: plugins/admin/systems/goShareServer.tpl:1
  msgid "Shares"
@@ -3499,7 +3548,7 @@ msgid "Logon script management"
  msgstr "Zarządzanie skryptami logowania"
  
  #: plugins/personal/environment/environment.tpl:203
-#: plugins/personal/environment/class_environment.inc:1292
+#: plugins/personal/environment/class_environment.inc:1295
  msgid "Hotplug devices"
  msgstr "Urządzenia Hotplug"
  
@@ -3509,7 +3558,7 @@ msgstr "Ustawienia urządzeń Hotplug"
  
  #: plugins/personal/environment/environment.tpl:219
  #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "New"
  msgstr "Nowe"
  
@@ -3564,7 +3613,7 @@ msgid "Please select an entry or press cancel."
  msgstr "Proszę wybrać wpis lub nacisnąć Anuluj."
  
  #: plugins/personal/environment/class_selectPrinterDialog.inc:102
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:140
  msgid "Please select a printer or press cancel."
  msgstr "Proszę wybrać drukarkę lub nacisnąć Anuluj."
  
@@ -3603,8 +3652,8 @@ msgid "auto"
  msgstr "automatycznie"
  
  #: plugins/personal/environment/class_environment.inc:230
-#: plugins/admin/systems/class_terminalService.inc:95
  #: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_terminalService.inc:97
  #, php-format
  msgid ""
  "You have specified an external resolution hook which can't be read, please "
@@ -3675,7 +3724,7 @@ msgstr "Brak uprawnień do zapisywania skryptów logowania."
  #: plugins/personal/environment/class_environment.inc:591
  #: plugins/personal/environment/class_environment.inc:604
  #: plugins/admin/systems/class_terminalStartup.inc:203
-#: plugins/admin/systems/class_workstationStartup.inc:616
+#: plugins/admin/systems/class_workstationStartup.inc:645
  msgid "You must specify a valid mount point."
  msgstr "Musisz podać prawidłowy punkt montowania."
  
@@ -3744,27 +3793,29 @@ msgid "Administrator"
  msgstr "Administrator"
  
  #: plugins/personal/environment/class_environment.inc:1243
-#: plugins/personal/environment/class_environment.inc:1290
+#: plugins/personal/environment/class_environment.inc:1293
  msgid "Default printer"
  msgstr "Domyślna drukarka"
  
  #: plugins/personal/environment/class_environment.inc:1270
+#: plugins/personal/environment/class_environment.inc:1275
+#: plugins/personal/environment/class_environment.inc:1277
  msgid "Environment settings"
  msgstr "Ustawienia środowiska"
  
-#: plugins/personal/environment/class_environment.inc:1277
+#: plugins/personal/environment/class_environment.inc:1280
  msgid "Command to extend the list of possible screen resolutions"
  msgstr "Polecenie do rozszerzenia listy możliwych rozdzielczości ekranu"
  
-#: plugins/personal/environment/class_environment.inc:1284
+#: plugins/personal/environment/class_environment.inc:1287
  msgid "Profile quota"
  msgstr "Quota profilu"
  
-#: plugins/personal/environment/class_environment.inc:1285
+#: plugins/personal/environment/class_environment.inc:1288
  msgid "Profile server"
  msgstr "Serwer profili"
  
-#: plugins/personal/environment/class_environment.inc:1291
+#: plugins/personal/environment/class_environment.inc:1294
  #: plugins/personal/environment/logonManagement.tpl:56
  msgid "Logon script"
  msgstr "Skrypt logowania"
@@ -3810,31 +3861,31 @@ msgstr "Nazwa skryptu"
  #: plugins/personal/environment/logonManagement.tpl:17
  #: plugins/personal/environment/hotplugDialogNew.tpl:17
  #: plugins/gofax/blocklists/generic.tpl:51
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:597
  #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
  #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:889
  #: plugins/admin/applications/generic.tpl:33
-#: plugins/admin/applications/class_applicationGeneric.inc:525
+#: plugins/admin/applications/class_applicationGeneric.inc:534
  #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/departments/class_departmentGeneric.inc:540
-#: plugins/admin/systems/class_winGeneric.inc:260
+#: plugins/admin/departments/class_departmentGeneric.inc:584
+#: plugins/admin/systems/class_winGeneric.inc:281
  #: plugins/admin/systems/server.tpl:14 plugins/admin/systems/phone.tpl:34
  #: plugins/admin/systems/printer.tpl:16
-#: plugins/admin/systems/class_servGeneric.inc:344
+#: plugins/admin/systems/class_servGeneric.inc:357
  #: plugins/admin/systems/wingeneric.tpl:25
  #: plugins/admin/systems/component.tpl:35
-#: plugins/admin/systems/class_printGeneric.inc:865
-#: plugins/admin/systems/class_componentGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_componentGeneric.inc:270
  #: plugins/admin/systems/servnfs.tpl:19
-#: plugins/admin/systems/class_phoneGeneric.inc:435
+#: plugins/admin/systems/class_phoneGeneric.inc:441
  #: plugins/admin/systems/class_goMailServer.inc:695
  #: plugins/admin/systems/class_goShareServer.inc:372
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:720
+#: plugins/admin/ogroups/class_ogroup.inc:703
  #: plugins/admin/fai/faiVariable.tpl:21
-#: plugins/admin/fai/class_faiScript.inc:527
-#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/class_faiScript.inc:538
+#: plugins/admin/fai/class_faiTemplate.inc:508
  #: plugins/admin/fai/faiPackage.tpl:21
  #: plugins/admin/fai/faiPartitionTable.tpl:21
  #: plugins/admin/fai/class_faiScriptEntry.inc:180
@@ -3842,7 +3893,7 @@ msgstr "Nazwa skryptu"
  #: plugins/admin/fai/class_faiPackage.inc:537
  #: plugins/admin/fai/class_faiProfile.inc:452
  #: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:21
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:464
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:13
  #: plugins/admin/fai/faiScript.tpl:21
  #: plugins/admin/fai/class_faiVariableEntry.inc:143
@@ -3851,16 +3902,16 @@ msgstr "Nazwa skryptu"
  #: plugins/admin/fai/class_faiPartitionTable.inc:529
  #: plugins/admin/fai/class_faiHookEntry.inc:189
  #: plugins/admin/fai/faiHookEntry.tpl:19
-#: plugins/admin/fai/class_faiVariable.inc:421
+#: plugins/admin/fai/class_faiVariable.inc:417
  #: plugins/admin/fai/class_faiTemplateEntry.inc:248
  #: plugins/admin/fai/faiTemplateEntry.tpl:13
-#: plugins/admin/mimetypes/generic.tpl:35
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:674
+#: plugins/admin/mimetypes/generic.tpl:34
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:682
  #: plugins/admin/mimetypes/paste_generic.tpl:21
  #: plugins/gofon/macro/generic.tpl:49
-#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/macro/class_gofonMacro.inc:498
  #: plugins/gofon/conference/generic.tpl:78
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
  #: plugins/generic/references/contents.tpl:11 html/getxls.php:158
  #: html/getxls.php:287
  msgid "Description"
@@ -3892,11 +3943,11 @@ msgstr "Skrypt może być zmieniony przez użytkownika"
  #: plugins/admin/groups/application_options.tpl:11
  #: plugins/admin/users/class_userManagement.inc:654
  #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:503
+#: plugins/admin/systems/class_systemManagement.inc:651
  #: plugins/admin/systems/printerPPDDialog.tpl:22
  #: plugins/admin/systems/servRepositorySetup.tpl:54
-#: plugins/admin/ogroups/class_ogroupManagement.inc:304
-#: plugins/admin/fai/class_faiManagement.inc:616
+#: plugins/admin/ogroups/class_ogroupManagement.inc:299
+#: plugins/admin/fai/class_faiManagement.inc:626
  #: plugins/admin/fai/faiProfileEntry.tpl:70
  #: plugins/admin/fai/faiScriptEntry.tpl:82
  #: plugins/admin/fai/faiVariableEntry.tpl:54
@@ -3905,9 +3956,9 @@ msgstr "Skrypt może być zmieniony przez użytkownika"
  #: plugins/admin/fai/faiPackageEntry.tpl:56
  #: plugins/admin/fai/faiPackageConfiguration.tpl:6
  #: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:340
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:342
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:260
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:253
  #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
  #: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
  msgid "Apply"
@@ -3999,7 +4050,7 @@ msgstr "Przeglądaj"
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:81
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: plugins/admin/fai/class_faiSummaryTab.inc:209
+#: plugins/admin/fai/class_faiSummaryTab.inc:236
  #: include/class_MultiSelectWindow.inc:81
  msgid "Close"
  msgstr "Zamknij"
@@ -4009,37 +4060,37 @@ msgid "Nagios Account"
  msgstr "Konto Nagios"
  
  #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
  msgid "Alias"
  msgstr "Alias"
  
  #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:276
+#: plugins/personal/nagios/class_nagiosAccount.inc:277
  msgid "Host notification period"
  msgstr "Okres powiadamiania o hoście"
  
  #: plugins/personal/nagios/nagios.tpl:40
-#: plugins/personal/nagios/class_nagiosAccount.inc:280
+#: plugins/personal/nagios/class_nagiosAccount.inc:281
  msgid "Service notification period"
  msgstr "Okres powiadamiania o usłudze"
  
  #: plugins/personal/nagios/nagios.tpl:53
-#: plugins/personal/nagios/class_nagiosAccount.inc:279
+#: plugins/personal/nagios/class_nagiosAccount.inc:280
  msgid "Service notification options"
  msgstr "Opcje powiadamiania o usłudze"
  
  #: plugins/personal/nagios/nagios.tpl:66
-#: plugins/personal/nagios/class_nagiosAccount.inc:275
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
  msgid "Host notification options"
  msgstr "Opcje powiadamiania o hoście"
  
  #: plugins/personal/nagios/nagios.tpl:90
-#: plugins/personal/nagios/class_nagiosAccount.inc:278
+#: plugins/personal/nagios/class_nagiosAccount.inc:279
  msgid "Service notification commands"
  msgstr "Polecenia powiadamiania o usłudze"
  
  #: plugins/personal/nagios/nagios.tpl:100
-#: plugins/personal/nagios/class_nagiosAccount.inc:274
+#: plugins/personal/nagios/class_nagiosAccount.inc:275
  msgid "Host notification commands"
  msgstr "Polecenia powiadamiania o hoście"
  
@@ -4129,31 +4180,36 @@ msgstr "Usuwanie konta nagios z dn '%s' nieudane."
  msgid "Nagios account settings"
  msgstr "Ustawienia konta nagios"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:282
+#: plugins/personal/nagios/class_nagiosAccount.inc:265
+#, fuzzy
+msgid "Nagios account"
+msgstr "Konto Nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:283
  msgid "View all hosts"
  msgstr "Pokaż wszystkie hosty"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:283
+#: plugins/personal/nagios/class_nagiosAccount.inc:284
  msgid "View all services"
  msgstr "Pokaż wszystkie usługi"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:285
+#: plugins/personal/nagios/class_nagiosAccount.inc:286
  msgid "Trigger system commands"
  msgstr "Przełącz polecenia systemowe"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:286
+#: plugins/personal/nagios/class_nagiosAccount.inc:287
  msgid "Trigger all host commands"
  msgstr "Przełącz wszystkie polecenia hosta"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:287
+#: plugins/personal/nagios/class_nagiosAccount.inc:288
  msgid "Trigger all service commands"
  msgstr "Przełącz wszystkie polecenia usługi"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:289
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
  msgid "View configuration information"
  msgstr "Pokaż konfigurację"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:290
+#: plugins/personal/nagios/class_nagiosAccount.inc:291
  msgid "View system informations"
  msgstr "Pokaż informacje o systemie"
  
@@ -4162,7 +4218,7 @@ msgid "Nagios settings"
  msgstr "Ustawienia nagios"
  
  #: plugins/personal/netatalk/netatalk.tpl:4
-#: plugins/personal/netatalk/class_netatalk.inc:365
+#: plugins/personal/netatalk/class_netatalk.inc:366
  msgid "Share"
  msgstr "Udział"
  
@@ -4221,7 +4277,12 @@ msgstr "Zapisywanie konta netatalk z dn '%s' nieudane."
  msgid "Removing of user/netatalk account with dn '%s' failed."
  msgstr "Usuwanie konta netatalk z dn '%s' nieudane."
  
-#: plugins/personal/netatalk/class_netatalk.inc:364
+#: plugins/personal/netatalk/class_netatalk.inc:360
+#, fuzzy
+msgid "Netatalk account"
+msgstr "Zarządzaj kontem Netatalk"
+
+#: plugins/personal/netatalk/class_netatalk.inc:365
  #, fuzzy
  msgid "User home path"
  msgstr "Ścieżka do profilu"
@@ -4255,9 +4316,9 @@ msgstr "Wybierz poddrzewo do umieszczenia grupy"
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
  #: plugins/admin/systems/class_goShareServer.inc:373
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
-#: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiSummaryTab.inc:345
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:136
  msgid "Type"
  msgstr "Typ"
  
@@ -4280,13 +4341,15 @@ msgstr "Numery mogą również zawierać maski"
  #: plugins/gofax/blocklists/remove.tpl:2
  #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
  #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/systems/remove_ppd.tpl:2
  #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
  #: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
  #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
  #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:339 html/index.php:345
+#: html/index.php:49 html/index.php:337 html/index.php:343
  #: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/remove.tpl:2
  msgid "Warning"
@@ -4317,76 +4380,74 @@ msgid "Blocklist management"
  msgstr "Zarządzanie bloklistą"
  
  #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
  msgid "FAX Blocklists"
  msgstr "Bloklisty FAX"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:168
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:167
  #, php-format
  msgid "You're about to delete the blocklist '%s'."
  msgstr "Zamierzasz usunąć bloklistę '%s'."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:185
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:184
  msgid "You have no permission to remove this blocklist."
  msgstr "Brak uprawnień do usunięcia tej bloklisty."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:200
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:199
  msgid "Please specify a valid phone number."
  msgstr "Proszę podać prawidłowy numer telefonu."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "send"
  msgstr "wysyłanie"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "receive"
  msgstr "odbieranie"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:435
  #, php-format
  msgid "Removing of blocklist with dn '%s' failed."
  msgstr "Usuwanie bloklisty z dn '%s' nieudane."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:477
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr "Brak uprawnień do tworzenia bloklisty w tym miejscu."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:482
-#: plugins/admin/departments/class_departmentGeneric.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:487
+#: plugins/admin/departments/class_departmentGeneric.inc:258
  msgid "Required field 'Name' is not set."
  msgstr "Wymagane pole 'Nazwa' jest puste."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:490
  msgid "Required field 'Name' contains invalid characters"
  msgstr "Wymaganie pole 'Nazwa' zawiera niedozwolone znaki"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:497
  msgid "Specified name is already used."
  msgstr "Podana nazwa jest już używana."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:547
  #, php-format
  msgid "Saving of blocklist with dn '%s' failed."
  msgstr "Zapisywanie bloklisty z dn '%s' nieudane."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
-msgid "Fax Blocklists"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
+#, fuzzy
+msgid "Fax blocklists"
  msgstr "Bloklisty FAX"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:596
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/addressbook/address_info.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:893
-#: plugins/admin/applications/class_applicationGeneric.inc:523
-#: plugins/admin/applications/class_applicationGeneric.inc:527
-#: plugins/admin/systems/class_terminalGeneric.inc:514
-#: plugins/admin/systems/class_servGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:863
-#: plugins/admin/systems/class_componentGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:887
+#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/systems/class_terminalGeneric.inc:554
+#: plugins/admin/systems/class_servGeneric.inc:356
+#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_componentGeneric.inc:268
  #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_phoneGeneric.inc:434
-#: plugins/admin/systems/class_servRepository.inc:358
+#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_servRepository.inc:374
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:105
@@ -4406,10 +4467,10 @@ msgstr "Bloklisty FAX"
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
  #: plugins/admin/systems/class_goShareServer.inc:370
  #: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:701
  #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
  #: plugins/admin/fai/faiPackage.tpl:9
  #: plugins/admin/fai/faiPartitionTable.tpl:9
  #: plugins/admin/fai/class_faiScriptEntry.inc:179
@@ -4417,7 +4478,7 @@ msgstr "Bloklisty FAX"
  #: plugins/admin/fai/class_faiPackage.inc:536
  #: plugins/admin/fai/class_faiProfile.inc:451
  #: plugins/admin/fai/class_faiHook.inc:535 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:454
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
  #: plugins/admin/fai/faiScript.tpl:9
  #: plugins/admin/fai/class_faiVariableEntry.inc:142
@@ -4426,23 +4487,23 @@ msgstr "Bloklisty FAX"
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
  #: plugins/admin/fai/class_faiHookEntry.inc:188
  #: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #: plugins/admin/fai/class_faiTemplateEntry.inc:247
  #: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:313
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
+#: plugins/admin/fai/class_faiSummaryTab.inc:340
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
  #: plugins/gofon/macro/parameter.tpl:6
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
  #: html/getxls.php:223 html/getxls.php:290
  msgid "Name"
  msgstr "Imię"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:599
  #, fuzzy
  msgid "Blocklist"
  msgstr "Bloklisty"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:600
  msgid "Blocklist type"
  msgstr "Typ bloklisty"
  
@@ -4508,7 +4569,7 @@ msgstr "Pokaż bloklisty otrzymywania"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -4519,242 +4580,107 @@ msgstr "Zaznacz aby wyszukiwać wewnątrz poddrzew"
  msgid "Regular expression for matching list names"
  msgstr "Wyrażenie regularne do dopasowania nazw list"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Go to root department"
-msgstr "Idź do głównego departamentu"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-msgid "Root"
-msgstr "Główny"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-msgid "Go up one department"
-msgstr "Idź jeden departament wyżej"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-#: include/class_acl.inc:368
-msgid "Up"
-msgstr "Góra"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Go to users department"
-msgstr "Przejdź do departamentu użytkowników"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/fai/class_divListFai.inc:139
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-msgid "Home"
-msgstr "Katalog domowy"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/fai/class_divListFai.inc:141
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/conference/class_divListConferences.inc:103
-msgid "Reload list"
-msgstr "Przeładuj listę"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:142
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:103
-#: plugins/gofon/conference/class_divListConferences.inc:121
-msgid "Submit"
-msgstr "Wyślij"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  msgid "Create new blocklist"
  msgstr "Utwórz nową bloklistę"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  msgid "New Blocklist"
  msgstr "Nowa Bloklista"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
  #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:121
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
  msgid "Submit department"
  msgstr "Zatwierdź departament"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/users/class_divListUsers.inc:255
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+#: include/class_MultiSelectWindow.inc:209
+msgid "Submit"
+msgstr "Wyślij"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:243
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
  #: plugins/admin/systems/glpiPrinter.tpl:18
  #: plugins/admin/systems/glpiPrinter.tpl:32 plugins/admin/systems/glpi.tpl:18
  #: plugins/admin/systems/glpi.tpl:32 plugins/admin/systems/glpi.tpl:46
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/acl/class_divListACL.inc:122
-#: plugins/admin/fai/class_faiScript.inc:283
-#: plugins/admin/fai/class_faiScript.inc:285
-#: plugins/admin/fai/class_faiTemplate.inc:257
-#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/acl/class_divListACL.inc:127
+#: plugins/admin/fai/class_faiScript.inc:293
+#: plugins/admin/fai/class_faiScript.inc:295
+#: plugins/admin/fai/class_faiTemplate.inc:270
+#: plugins/admin/fai/class_faiTemplate.inc:272
  #: plugins/admin/fai/class_faiHook.inc:294
  #: plugins/admin/fai/class_faiHook.inc:296
-#: plugins/admin/fai/class_divListFai.inc:241
-#: plugins/admin/fai/class_divListFai.inc:244
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/macro/class_divListMacros.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:159
-#: plugins/gofon/conference/class_divListConferences.inc:159
-#: include/class_acl.inc:370 include/class_acl.inc:415
+#: plugins/admin/fai/class_divListFai.inc:239
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/macro/class_divListMacros.inc:146
+#: plugins/gofon/conference/class_divListConferences.inc:155
+#: include/class_acl.inc:372 include/class_acl.inc:417
  msgid "edit"
  msgstr "edytuj"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/users/class_divListUsers.inc:256
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/users/class_divListUsers.inc:244
  msgid "Edit user"
  msgstr "Edytuj użytkownika"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:274
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/acl/class_divListACL.inc:125
-#: plugins/admin/fai/class_faiScript.inc:287
-#: plugins/admin/fai/class_faiTemplate.inc:261
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/addons/mailqueue/contents.tpl:94
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/users/class_divListUsers.inc:262
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/acl/class_divListACL.inc:131
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:274
  #: plugins/admin/fai/class_faiHook.inc:298
-#: plugins/admin/fai/class_divListFai.inc:252
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/macro/class_divListMacros.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:167
-#: plugins/gofon/conference/class_divListConferences.inc:169
-#: include/class_acl.inc:371 include/class_acl.inc:416
+#: plugins/admin/fai/class_divListFai.inc:250
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/macro/class_divListMacros.inc:154
+#: plugins/gofon/conference/class_divListConferences.inc:165
+#: include/class_acl.inc:373 include/class_acl.inc:418
  msgid "delete"
  msgstr "Usuń"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/admin/users/class_divListUsers.inc:263
  msgid "Delete user"
  msgstr "Usuń użytkownika"
  
@@ -4764,7 +4690,7 @@ msgid "Fax number for GOfax to trigger on"
  msgstr "Numer faxu dla GOfax dla przełączenia"
  
  #: plugins/gofax/faxaccount/generic.tpl:21
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
  #: plugins/admin/ogroups/phonequeue.tpl:47
  #: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
  #: html/getxls.php:281
@@ -4776,7 +4702,7 @@ msgid "Specify the GOfax communication language for fax to mail gateway"
  msgstr "Podaj język komunikacji GOfax dla bramki fax2mail"
  
  #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:831
  msgid "Delivery format"
  msgstr "Format dostarczania"
  
@@ -4797,12 +4723,12 @@ msgid "Deliver fax as mail to"
  msgstr "Dostarcz fax jako pocztę do"
  
  #: plugins/gofax/faxaccount/generic.tpl:70
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
  msgid "Deliver fax as mail"
  msgstr "Dostarcz fax jako pocztę"
  
  #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:830
  msgid "Deliver fax to printer"
  msgstr "Dostarcz fax na drukarkę"
  
@@ -4869,63 +4795,63 @@ msgstr "Ustawienia FAX"
  msgid "FAX"
  msgstr "FAX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
  msgid "This account has no fax extensions."
  msgstr "To konto nie posiada rozszerzenia fax"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
  msgid "Remove fax account"
  msgstr "Usuń konto fax"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
  msgid ""
  "This account has fax features enabled. You can disable them by clicking "
  "below."
  msgstr "To konto ma włączone cechu fax. Można je wyłączyć klikając poniżej."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
  msgid "Create fax account"
  msgstr "Utwórz konto fax"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:159
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
  msgid ""
  "This account has fax features disabled. You can enable them by clicking "
  "below."
  msgstr "To konto ma wyłączone cechy faxu. Można je włączyć klikając poniżej."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:222
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:229
  msgid "You're trying to add an invalid phone number."
  msgstr "Nieprawidłowy numer telefonu."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:512
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:438
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:519
  #: plugins/admin/groups/class_groupApplication.inc:674
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
  msgid "back"
  msgstr "wróć"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:617
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
  #, php-format
  msgid "Removing of user/fax account with dn '%s' failed."
  msgstr "Usuwanie konta fax z dn '%s' nieudane."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:632
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
  msgid "The required field 'Fax' is not set."
  msgstr "Wymagane pole 'fax' jest puste."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
  msgid "Please enter a valid telephone number in the 'Fax' field."
  msgstr "Proszę podać prawidłowy numer telefonu w polu 'Fax'."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
  msgid "Mail delivery is checked, but no address has been specified."
  msgstr "Dostarczanie poczty jest włączone, ale nie podano adresu."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:646
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
  msgid "The mail address you've entered is invalid."
  msgstr "Adres email który podano jest nieprawidłowy."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
  msgid ""
  "Deliver fax to printer, is only possible if valid printer is given. Please "
  "correct your choice."
@@ -4933,28 +4859,28 @@ msgstr ""
  "Dostarczanie faxu do drukarki jest możliwe jedynie gdy istnieje prawidłowa "
  "drukarka. Proszę poprawić."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:737
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:744
  #, php-format
  msgid "Saving of user/fax account with dn '%s' failed."
  msgstr "Zapisywanie konta fax z dn '%s' nieudane."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:808
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
  msgid "Fax account settings"
  msgstr "Ustawienia konta fax"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
  msgid "Enable/Disable fax"
  msgstr "Włącz/Wyłącz fax"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
  msgid "Receive blocklist"
  msgstr "Bloklista otrzymywania"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
  msgid "Send blocklist"
  msgstr "Bloklista wysyłania"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
  #, fuzzy
  msgid "Alternate fax number"
  msgstr "Alternatywne numery faxu"
@@ -4971,7 +4897,7 @@ msgid "Filter"
  msgstr "Filtr"
  
  #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:109
  #: plugins/addons/logview/contents.tpl:47
  #: plugins/addons/mailqueue/contents.tpl:11
  #: plugins/gofon/fonreports/contents.tpl:6
@@ -5010,17 +4936,17 @@ msgstr "Szukaj"
  
  #: plugins/gofax/faxreports/contents.tpl:30
  #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:842
-#: plugins/admin/ogroups/class_ogroupManagement.inc:351
+#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/ogroups/class_ogroupManagement.inc:346
  #: plugins/admin/fai/faiTemplateEntry.tpl:110
  msgid "User"
  msgstr "Użytkownik"
  
  #: plugins/gofax/faxreports/contents.tpl:31
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #: plugins/addons/logview/contents.tpl:84
  #: plugins/gofon/fonreports/contents.tpl:30
-#: plugins/gofon/fonreports/class_fonreport.inc:398
+#: plugins/gofon/fonreports/class_fonreport.inc:399
  msgid "Date"
  msgstr "Data"
  
@@ -5061,22 +4987,22 @@ msgid "Date / Time"
  msgstr "Data/Czas"
  
  #: plugins/gofax/faxreports/detail.tpl:29
-#: plugins/gofax/faxreports/class_faxreport.inc:484
+#: plugins/gofax/faxreports/class_faxreport.inc:489
  msgid "Sender MSN"
  msgstr "MSN nadawcy"
  
  #: plugins/gofax/faxreports/detail.tpl:33
-#: plugins/gofax/faxreports/class_faxreport.inc:483
+#: plugins/gofax/faxreports/class_faxreport.inc:488
  msgid "Sender ID"
  msgstr "ID nadawcy"
  
  #: plugins/gofax/faxreports/detail.tpl:37
-#: plugins/gofax/faxreports/class_faxreport.inc:486
+#: plugins/gofax/faxreports/class_faxreport.inc:491
  msgid "Receiver MSN"
  msgstr "MSN odbiorcy"
  
  #: plugins/gofax/faxreports/detail.tpl:41
-#: plugins/gofax/faxreports/class_faxreport.inc:485
+#: plugins/gofax/faxreports/class_faxreport.inc:490
  msgid "Receiver ID"
  msgstr "ID odbiorcy"
  
@@ -5085,7 +5011,7 @@ msgid "Status message"
  msgstr "Informacja o statusie"
  
  #: plugins/gofax/faxreports/detail.tpl:53
-#: plugins/gofax/faxreports/class_faxreport.inc:489
+#: plugins/gofax/faxreports/class_faxreport.inc:494
  msgid "Transfer time"
  msgstr "Czas transferu"
  
@@ -5097,90 +5023,96 @@ msgstr "Raporty FAX"
  msgid "FAX Reports"
  msgstr "Raporty FAX"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:108
  msgid ""
  "No fax extension defined in your server configuration, no reports can be "
  "shown!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: plugins/gofax/faxreports/class_faxreport.inc:111
  #: plugins/addons/logview/class_logview.inc:75
  #: plugins/gofon/fonreports/class_fonreport.inc:163
  msgid "There is no mysql extension available, please check your php setup."
  msgstr "Brak rozszerzenia mysql, proszę sprawdzić ustawienia php."
  
-#: plugins/gofax/faxreports/class_faxreport.inc:117
+#: plugins/gofax/faxreports/class_faxreport.inc:118
  msgid "Can't connect to fax database, no reports can be shown!"
  msgstr "Nie można połączyć się z bazą fax, nie można pokazać żadnych raportów!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:121
+#: plugins/gofax/faxreports/class_faxreport.inc:122
  msgid "Can't select fax database for report generation!"
  msgstr "Nie można wybrać bazy fax aby generować raport!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:126
+#: plugins/gofax/faxreports/class_faxreport.inc:127
  #, fuzzy
  msgid "Can't query fax table 'faxlog' for report generation!"
  msgstr "Nie można wybrać bazy fax aby generować raport!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:149
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:150
+#: plugins/gofax/faxreports/class_faxreport.inc:290
  msgid "Query for fax database failed!"
  msgstr "Zapytanie do bazy fax nieudane!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:158
-#: plugins/gofax/faxreports/class_faxreport.inc:168
+#: plugins/gofax/faxreports/class_faxreport.inc:159
+#: plugins/gofax/faxreports/class_faxreport.inc:169
  msgid "You have no permission to retrieve informations about this fax id!"
  msgstr "Brak uprawnień do pobierania informacji o tym faxie!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:196
-#: plugins/gofax/faxreports/class_faxreport.inc:311
-#: plugins/gofon/fonreports/class_fonreport.inc:221
+#: plugins/gofax/faxreports/class_faxreport.inc:200
+#: plugins/gofax/faxreports/class_faxreport.inc:315
+#: plugins/gofon/fonreports/class_fonreport.inc:223
  msgid "Y-M-D"
  msgstr "R-M-D"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions to view this attribute"
  msgstr "Brak uprawnień do zmian atrybutu '%s' w goFonMacro."
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/admin/groups/class_groupApplication.inc:427
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions"
  msgstr "Uprawnienia pliku"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:469
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:473
+#: plugins/gofax/faxreports/class_faxreport.inc:474
  msgid "Fax report"
  msgstr "Raport FAX"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:474
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  #, fuzzy
  msgid "All entries are readonly"
  msgstr "Wszystkie pola są zapisywalne"
  
  #: plugins/gofax/faxreports/class_faxreport.inc:479
+#, fuzzy
+msgid "Fax reports"
+msgstr "Raport FAX"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:484
  msgid "Detailed view"
  msgstr "Widok szczegółowy"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:480
+#: plugins/gofax/faxreports/class_faxreport.inc:485
  #, fuzzy
  msgid "Fax ID"
  msgstr "FAX ID"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #, fuzzy
  msgid "Time"
  msgstr "Mime"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:487
+#: plugins/gofax/faxreports/class_faxreport.inc:492
  #, fuzzy
  msgid "Number of pages"
  msgstr "Nazwa departamentu"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:488
+#: plugins/gofax/faxreports/class_faxreport.inc:493
  #, fuzzy
  msgid "Status Message"
  msgstr "Informacja o statusie"
@@ -5209,44 +5141,44 @@ msgstr ""
  msgid "Add entry"
  msgstr "Dodaj pozycję"
  
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:54
  #: plugins/admin/groups/class_groupApplication.inc:756
  msgid "Edit entry"
  msgstr "Edycja pozycji"
  
-#: plugins/addons/addressbook/contents.tpl:55
+#: plugins/addons/addressbook/contents.tpl:58
  msgid "Remove entry"
  msgstr "Usuń pozycję"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Select to see regular users"
  msgstr "Wybierz aby zobaczyć zwykłych użytkowników"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Show organizational entries"
  msgstr "Pokaż elementy organizacyjne"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Select to see users in addressbook"
  msgstr "Wybierz aby zobaczyć użytkowników w książce adresowej"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Show addressbook entries"
  msgstr "Pokaż elementy książki adresowej"
  
-#: plugins/addons/addressbook/contents.tpl:81
+#: plugins/addons/addressbook/contents.tpl:84
  msgid "Display results for department"
  msgstr "Wyświetl wyniki dla departamentu"
  
-#: plugins/addons/addressbook/contents.tpl:94
+#: plugins/addons/addressbook/contents.tpl:97
  msgid "Match object"
  msgstr "Dopasuj obiekt"
  
-#: plugins/addons/addressbook/contents.tpl:97
+#: plugins/addons/addressbook/contents.tpl:100
  msgid "Choose the object that will be searched in"
  msgstr "Wybierz obiekt w którym będziesz przeszukiwać"
  
-#: plugins/addons/addressbook/contents.tpl:109
+#: plugins/addons/addressbook/contents.tpl:112
  msgid "Search string"
  msgstr "Poszukiwany napis"
  
@@ -5255,10 +5187,10 @@ msgid "Dial connection..."
  msgstr "Połączenie dzwonienia..."
  
  #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:427
-#: plugins/addons/addressbook/class_addressbook.inc:434
-#: plugins/addons/addressbook/class_addressbook.inc:438
-#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/addons/addressbook/class_addressbook.inc:429
+#: plugins/addons/addressbook/class_addressbook.inc:436
+#: plugins/addons/addressbook/class_addressbook.inc:440
+#: plugins/addons/addressbook/class_addressbook.inc:553
  msgid "Dial"
  msgstr "Dzwonienie"
  
@@ -5282,7 +5214,7 @@ msgid "Personal"
  msgstr "Osobiste"
  
  #: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/class_addressbook.inc:807
  #: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
  #: html/getxls.php:298
  msgid "Initials"
@@ -5312,26 +5244,26 @@ msgstr "Miasto"
  
  #: plugins/addons/addressbook/address_edit.tpl:191
  #: plugins/addons/addressbook/address_info.tpl:141
-#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_departmentGeneric.inc:585
  msgid "Country"
  msgstr "Kraj"
  
-#: plugins/addons/addressbook/main.inc:35
+#: plugins/addons/addressbook/main.inc:36
  msgid "Address book"
  msgstr "Książka adresowa"
  
  #: plugins/addons/addressbook/class_addressbook.inc:6
-#: plugins/addons/addressbook/class_addressbook.inc:781
-#: plugins/addons/addressbook/class_addressbook.inc:787
+#: plugins/addons/addressbook/class_addressbook.inc:783
+#: plugins/addons/addressbook/class_addressbook.inc:789
  msgid "Addressbook"
  msgstr "Książka adresowa"
  
-#: plugins/addons/addressbook/class_addressbook.inc:172
+#: plugins/addons/addressbook/class_addressbook.inc:173
  #, php-format
  msgid "Dial from %s to %s now?"
  msgstr "Zadzwonić teraz z '%s' do '%s'?"
  
-#: plugins/addons/addressbook/class_addressbook.inc:176
+#: plugins/addons/addressbook/class_addressbook.inc:177
  msgid ""
  "You have no personal phone number set. Please change that in order to "
  "perform direct dials."
@@ -5339,50 +5271,50 @@ msgstr ""
  "Brak ustawionego osobistego numeru telefonu. Proszę uzupełnić aby móc "
  "wykonywać bezpośrednie połączenia."
  
-#: plugins/addons/addressbook/class_addressbook.inc:202
-#: plugins/addons/addressbook/class_addressbook.inc:751
+#: plugins/addons/addressbook/class_addressbook.inc:203
+#: plugins/addons/addressbook/class_addressbook.inc:753
  #, php-format
  msgid "Removing of addressbook entry '%s' failed."
  msgstr "Usuwanie wpisu książki adresowej '%s' nieudane."
  
-#: plugins/addons/addressbook/class_addressbook.inc:209
-#: plugins/addons/addressbook/class_addressbook.inc:318
+#: plugins/addons/addressbook/class_addressbook.inc:210
+#: plugins/addons/addressbook/class_addressbook.inc:319
  msgid "You are not allowed to delete this entry!"
  msgstr "Brak uprawnień do usunięcia tego elementu!"
  
-#: plugins/addons/addressbook/class_addressbook.inc:312
+#: plugins/addons/addressbook/class_addressbook.inc:313
  #, php-format
  msgid "You're about to delete the entry %s."
  msgstr "Zamierzasz usunąć element %s."
  
-#: plugins/addons/addressbook/class_addressbook.inc:444
+#: plugins/addons/addressbook/class_addressbook.inc:446
  #, php-format
  msgid "Save contact for %s as vcard"
  msgstr "Zapisz kontakt dla %s jako wizytówka"
  
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: plugins/addons/addressbook/class_addressbook.inc:452
  #, php-format
  msgid "Send mail to %s"
  msgstr "Wyślij email do %s"
  
-#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:565
  msgid "global addressbook"
  msgstr "Globalna książka adresowa"
  
-#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/addons/addressbook/class_addressbook.inc:568
  msgid "user database"
  msgstr "użyj bazy"
  
-#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/addons/addressbook/class_addressbook.inc:572
  #, php-format
  msgid "Contact stored in '%s'"
  msgstr "Kontakt zachowany w '%s'"
  
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/addons/addressbook/class_addressbook.inc:574
  msgid "Creating new entry in"
  msgstr "Tworzenie nowego elementu w"
  
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/logview/class_logview.inc:112
  #: plugins/addons/logview/class_logview.inc:133
  #: plugins/addons/mailqueue/class_mailqueue.inc:306
@@ -5390,35 +5322,35 @@ msgstr "Tworzenie nowego elementu w"
  msgid "All"
  msgstr "Wszystkie"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Work phone"
  msgstr "Telefon do pracy"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Cell phone"
  msgstr "Numer telefonu komórkowego"
  
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:223
  msgid "Home phone"
  msgstr "Telefon domowy"
  
-#: plugins/addons/addressbook/class_addressbook.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:704
  msgid ""
  "Cannot create a unique DN for your entry. Please fill more formular fields."
  msgstr ""
  "Nie można utworzyć unikalnego DN dla tego elementu. Proszę wypełnić więcej "
  "pól formularza."
  
-#: plugins/addons/addressbook/class_addressbook.inc:782
+#: plugins/addons/addressbook/class_addressbook.inc:784
  #, fuzzy
  msgid "Addressbook entry acls"
  msgstr "Zapisywanie wpisu książki adresowej nieudane"
  
-#: plugins/addons/addressbook/class_addressbook.inc:806 html/getxls.php:301
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:301
  msgid "Title"
  msgstr "Tytuł"
  
-#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: plugins/addons/addressbook/class_addressbook.inc:810 html/getxls.php:169
  #: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
  msgid "Common name"
  msgstr "Nazwa potoczna"
@@ -5615,12 +5547,12 @@ msgid "CSV import"
  msgstr "import CVS"
  
  #: plugins/addons/ldapmanager/class_export.inc:77
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:91
  msgid "Error while exporting the requested entries!"
  msgstr "Błąd podczas eksportowania żądanych wpisów!"
  
  #: plugins/addons/ldapmanager/class_export.inc:89
-#: plugins/addons/ldapmanager/class_exportxls.inc:102
+#: plugins/addons/ldapmanager/class_exportxls.inc:104
  #, fuzzy, php-format
  msgid "You are not allowed to export the given ldap entry (%s)"
  msgstr "Brak uprawnień do usunięcia tego elementu!"
@@ -5842,40 +5774,40 @@ msgstr "Błąd"
  msgid "Active"
  msgstr "Aktywne"
  
-#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/addons/mailqueue/contents.tpl:94
  msgid "Delete this message"
  msgstr "Usuń tą wiadomosc"
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "unhold"
  msgstr "wznów"
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "Release message"
  msgstr "Wznów wiadomość"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  msgid "hold"
  msgstr "wstrzymaj"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  #: plugins/addons/mailqueue/class_mailqueue.inc:398
  msgid "Hold message"
  msgstr "Wstrzymaj wiadomość"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "requeue"
  msgstr "rekolejkuj"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "Requeue this message"
  msgstr "Rekolejkuj tą wiadomość"
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  msgid "header"
  msgstr "nagłówek"
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  msgid "Display header from this message"
  msgstr "Wyświetl nagłówek tej wiadomości"
  
@@ -6047,16 +5979,35 @@ msgstr "Nie znaleziono wpisów DFS"
  msgid "Go up one dfsshare"
  msgstr "Idź w górę jeden udział DFS"
  
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:370
+#: include/class_MultiSelectWindow.inc:194
+#: include/class_MultiSelectWindow.inc:196
+msgid "Up"
+msgstr "Góra"
+
  #: plugins/addons/godfs/class_dfsManagment.inc:214
  msgid "Go to dfs root"
  msgstr "Idź do głównego DFS"
  
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+#: include/class_MultiSelectWindow.inc:188
+msgid "Root"
+msgstr "Główny"
+
  #: plugins/addons/godfs/class_dfsManagment.inc:215
  msgid "Create new dfsshare"
  msgstr "Utwórz nowy udział DFS"
  
  #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:22
+#: ihtml/themes/default/copyPasteDialog.tpl:28
  msgid "Finish"
  msgstr "Zakończ"
  
@@ -6106,7 +6057,7 @@ msgstr "Powiadamiania"
  
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:890 include/class_acl.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:884 include/class_acl.inc:164
  #: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
  msgid "Groups"
  msgstr "Grupy"
@@ -6120,12 +6071,12 @@ msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
  msgstr "Brak definicji NOTIFY_COMMAND w pliku gosa.conf"
  
  #: plugins/addons/notifications/class_msgplug.inc:116
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/systems/class_terminalGeneric.inc:207
-#: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/systems/class_workstationGeneric.inc:161
-#: plugins/admin/ogroups/class_termgroup.inc:210
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_servGeneric.inc:92
+#: plugins/admin/systems/class_workstationGeneric.inc:167
+#: plugins/admin/ogroups/class_termgroup.inc:209
  #, php-format
  msgid "Execution of '%s' failed!"
  msgstr "Wykonanie '%s' nieudane"
@@ -6182,19 +6133,19 @@ msgstr ""
  
  #: plugins/addons/notifications/contents.tpl:74
  #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:433
-#: plugins/admin/departments/class_departmentGeneric.inc:518
+#: plugins/admin/departments/class_departmentGeneric.inc:469
+#: plugins/admin/departments/class_departmentGeneric.inc:561
  #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/ServiceAddDialog.tpl:29
-#: plugins/admin/fai/class_faiManagement.inc:447
-#: plugins/admin/fai/class_faiManagement.inc:623
-#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/systems/ServiceAddDialog.tpl:28
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/admin/fai/class_faiManagement.inc:633
+#: plugins/admin/fai/class_faiManagement.inc:639
  #: plugins/admin/fai/faiPackageNew.tpl:50
  #: ihtml/themes/default/setup_introduction.tpl:12
  #: ihtml/themes/default/setup_useradmin.tpl:41
  #: ihtml/themes/default/setup_step2.tpl:13
  #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/default/snapshotdialog.tpl:78
+#: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Kontynuuj"
  
@@ -6310,32 +6261,32 @@ msgstr ""
  msgid "This 'dn' is no group."
  msgstr "Podane 'dn' nie jest grupą."
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Samba group"
  msgstr "Grupa Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain admins"
  msgstr "Administratorzy domeny"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain users"
  msgstr "Użytkownicy domeny"
  
-#: plugins/admin/groups/class_groupGeneric.inc:328
+#: plugins/admin/groups/class_groupGeneric.inc:319
  msgid "Domain guests"
  msgstr "Goście domeny"
  
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:324
  #, php-format
  msgid "Special group (%d)"
  msgstr "Specjalna grupa (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:446
+#: plugins/admin/groups/class_groupGeneric.inc:437
  msgid "! unknown id"
  msgstr "! nieznane id"
  
-#: plugins/admin/groups/class_groupGeneric.inc:483
+#: plugins/admin/groups/class_groupGeneric.inc:474
  #, php-format
  msgid ""
  "Your search method returned more than '%s' users, only '%s' users are shown."
@@ -6343,29 +6294,23 @@ msgstr ""
  "Metoda wyszukiwania zwróciła więcej niż '%s' użytkowników, tylko '%s' jest "
  "pokazanych."
  
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/admin/groups/class_groupGeneric.inc:720
+#: plugins/admin/groups/class_groupGeneric.inc:503
+#: plugins/admin/groups/class_groupGeneric.inc:718
  #, php-format
  msgid "Removing of groups/generic with dn '%s' failed."
  msgstr "Usuwanie grupy z dn '%s' nieudane."
  
-#: plugins/admin/groups/class_groupGeneric.inc:630
+#: plugins/admin/groups/class_groupGeneric.inc:628
  #, php-format
  msgid "No configured SID found for '%s'."
  msgstr "Nie znaleziono skonfigurowanego SID dla '%s'."
  
-#: plugins/admin/groups/class_groupGeneric.inc:635
+#: plugins/admin/groups/class_groupGeneric.inc:633
  #, php-format
  msgid "No configured RIDBASE found for '%s'."
  msgstr "Nie znaleziono RIDBASE dla '%s'."
  
-#: plugins/admin/groups/class_groupGeneric.inc:746
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/ogroups/class_ogroup.inc:608
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "Brak uprawnień do tworzenia grupy w tej 'bazie'."
-
-#: plugins/admin/groups/class_groupGeneric.inc:756
+#: plugins/admin/groups/class_groupGeneric.inc:750
  msgid ""
  "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
@@ -6373,38 +6318,38 @@ msgstr ""
  "Pole 'Nazwa' zawiera niedozwolone znaki. Tylko małe litery, liczny i "
  "myślniki są dozwolone."
  
-#: plugins/admin/groups/class_groupGeneric.inc:767
-#: plugins/admin/groups/class_groupGeneric.inc:781
-#: plugins/admin/groups/class_groupGeneric.inc:788
+#: plugins/admin/groups/class_groupGeneric.inc:761
+#: plugins/admin/groups/class_groupGeneric.inc:775
+#: plugins/admin/groups/class_groupGeneric.inc:782
  msgid "Value specified as 'Name' is already used."
  msgstr "Wartość podana jako 'Nazwa' jest już użyta."
  
-#: plugins/admin/groups/class_groupGeneric.inc:885
+#: plugins/admin/groups/class_groupGeneric.inc:879
  msgid "Generic group settings"
  msgstr "Ogólne ustawienia grupy"
  
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:891
  msgid "Phone pickup group"
  msgstr "Grupie odbioru telefonu"
  
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:892
  msgid "Nagios group"
  msgstr "Grupa nagios"
  
-#: plugins/admin/groups/class_groupGeneric.inc:901
+#: plugins/admin/groups/class_groupGeneric.inc:895
  msgid "Group member"
  msgstr "Członek grupy"
  
-#: plugins/admin/groups/class_groupGeneric.inc:902
+#: plugins/admin/groups/class_groupGeneric.inc:896
  msgid "Samba group type"
  msgstr "Typ grupy Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:903
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Katalog domowy Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:904
+#: plugins/admin/groups/class_groupGeneric.inc:898
  msgid "Samba SID"
  msgstr "Samba SID"
  
@@ -6428,8 +6373,8 @@ msgstr "Dodaj kategorię"
  msgid "Available applications"
  msgstr "Dostępne aplikacje"
  
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:565
-#: include/class_acl.inc:656
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:597
+#: include/class_acl.inc:688
  msgid "read"
  msgstr "czytanie"
  
@@ -6445,8 +6390,8 @@ msgstr "wysyłanie zewnętrzne"
  msgid "append"
  msgstr "dołączanie"
  
-#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:566
-#: include/class_acl.inc:658
+#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:598
+#: include/class_acl.inc:690
  msgid "write"
  msgstr "zapisywanie"
  
@@ -6471,45 +6416,45 @@ msgstr "Próbujesz dodać nieprawidłowy adres email"
  msgid "to the list of forwarders."
  msgstr "do listy przekazywanych."
  
-#: plugins/admin/groups/class_groupMail.inc:672
+#: plugins/admin/groups/class_groupMail.inc:679
  #, fuzzy, php-format
  msgid "Removing of groups/mail with dn '%s' failed."
  msgstr "Usuwanie ustawień poczty grupy nieudane"
  
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/groups/class_groupMail.inc:861
  #, fuzzy, php-format
  msgid "Saving of groups/mail with dn '%s' failed."
  msgstr "Zapisywanie ustawień poczty grupy nieudane"
  
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/admin/groups/class_groupMail.inc:890
  msgid "Please enter a valid email addres in 'Primary address' field."
  msgstr "Proszę podać prawidłowy adres email w polu 'Podstawowy adres'."
  
-#: plugins/admin/groups/class_groupMail.inc:916
+#: plugins/admin/groups/class_groupMail.inc:923
  msgid ""
  "Please choose valid permission settings. Default permission can't be emtpy."
  msgstr ""
  "Proszę wybrać prawidłowe ustawienia. Domyślne ustawienia nie mogą być puste."
  
-#: plugins/admin/groups/class_groupMail.inc:920
+#: plugins/admin/groups/class_groupMail.inc:927
  msgid "Please select a valid mail server."
  msgstr "Proszę wybrać prawidłowy serwer pocztowy."
  
-#: plugins/admin/groups/class_groupMail.inc:1067
+#: plugins/admin/groups/class_groupMail.inc:1074
  msgid "Group mail"
  msgstr "Grupa poczta"
  
-#: plugins/admin/groups/class_groupMail.inc:1075
+#: plugins/admin/groups/class_groupMail.inc:1082
  msgid "Alternate addresses"
  msgstr "Adresy alternatywne"
  
-#: plugins/admin/groups/class_groupMail.inc:1076
+#: plugins/admin/groups/class_groupMail.inc:1083
  msgid "Forwarding addresses"
  msgstr "Adresy przekazywane"
  
-#: plugins/admin/groups/class_groupMail.inc:1079
+#: plugins/admin/groups/class_groupMail.inc:1086
  #: plugins/admin/systems/printer.tpl:82
-#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_printGeneric.inc:873
  msgid "Permissions"
  msgstr "Uprawnienia"
  
@@ -6576,7 +6521,9 @@ msgstr ""
  "Ta grupa ma wyłączone cechy aplikacji. Można je włączyć klikając poniżej."
  
  #: plugins/admin/groups/class_groupApplication.inc:426
-#: include/class_tabs.inc:303
+#: plugins/admin/acl/class_aclManagement.inc:424
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430 include/class_tabs.inc:303
  msgid "ACL"
  msgstr "ACL"
  
@@ -6603,7 +6550,7 @@ msgid "The selected application has no options."
  msgstr "Wybrana aplikacja nie posiada opcji."
  
  #: plugins/admin/groups/class_groupApplication.inc:682
-#: plugins/admin/departments/class_divListDepartment.inc:154
+#: plugins/admin/departments/class_divListDepartment.inc:147
  msgid "department"
  msgstr "departament"
  
@@ -6677,11 +6624,11 @@ msgid "Group applications"
  msgstr "Grupa aplikacje"
  
  #: plugins/admin/groups/class_groupApplication.inc:1173
-#: plugins/admin/groups/class_divListGroup.inc:176
-#: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:353
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
+#: plugins/admin/groups/class_divListGroup.inc:184
+#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/ogroups/class_ogroupManagement.inc:348
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:684
  #: plugins/gofon/fonreports/contents.tpl:34
  #: plugins/generic/references/class_reference.inc:42
  msgid "Application"
@@ -6691,7 +6638,7 @@ msgstr "Aplikacja"
  #: plugins/admin/systems/workstationStartup.tpl:53
  #: plugins/admin/systems/workstationStartup.tpl:87
  #: plugins/admin/systems/servRepositorySetup.tpl:19
-#: plugins/admin/systems/class_servRepository.inc:238
+#: plugins/admin/systems/class_servRepository.inc:252
  #: plugins/admin/fai/faiPackage.tpl:37
  #: plugins/admin/fai/class_faiPackage.inc:542
  #: plugins/admin/fai/faiPackageNew.tpl:21
@@ -6777,58 +6724,58 @@ msgstr "Pokaż grupy funkcjonalne"
  msgid "Create new group"
  msgstr "Utwórz nową grupę"
  
-#: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:175
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  msgid "cut"
  msgstr "wytnij"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  msgid "Cut this entry"
  msgstr "Wytnij ten obiekt"
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "copy"
  msgstr "kopiuj"
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "Copy this entry"
  msgstr "Kopiuj ten obiekt"
  
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/conference/class_divListConferences.inc:159
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/conference/class_divListConferences.inc:155
  msgid "Edit this entry"
  msgstr "Edytuj ten obiekt"
  
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/conference/class_divListConferences.inc:169
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/conference/class_divListConferences.inc:165
  msgid "Delete this entry"
  msgstr "Usuń ten obiekt"
  
@@ -6877,7 +6824,7 @@ msgstr "Brak uprawnień do usunięcia tego użytkownika!"
  #: plugins/admin/users/class_userManagement.inc:449
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
  #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:288
  msgid "none"
  msgstr "żaden"
  
@@ -6905,8 +6852,8 @@ msgstr ""
  "użycie szablonów."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:812
-#: plugins/admin/fai/class_faiTemplate.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:997
+#: plugins/admin/fai/class_faiTemplate.inc:499
  msgid "Template"
  msgstr "Szablon"
  
@@ -6985,111 +6932,111 @@ msgstr "Zaznacz aby zobaczyć użytkowników którzy posiadają ustawienia proxy
  msgid "Show proxy users"
  msgstr "Pokaż użytkowników proxy"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  msgid "Create new user"
  msgstr "Utwórz nowego użytkownika"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  msgid "New user"
  msgstr "Nowy użytkownik"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "Create new template"
  msgstr "Utwórz nowy szablon"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "New template"
  msgstr "Nowy szablon"
  
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:173
  msgid "GOsa"
  msgstr "GOsa"
  
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:174
  msgid "Edit generic properties"
  msgstr "Edytuj ogólne właściwości"
  
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:176
  msgid "Edit UNIX properties"
  msgstr "Edytuj właściwości UNIX"
  
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:178
  msgid "Edit environment properties"
  msgstr "Edytuj właściwości Środowiska"
  
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:180
  msgid "Edit mail properties"
  msgstr "Edytuj właściwości Poczty"
  
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:182
  msgid "Edit phone properties"
  msgstr "Edytuj właściwości Telefonu"
  
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:184
  msgid "Edit fax properies"
  msgstr "Edytuj właściwości Fax"
  
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:186
  msgid "Edit samba properties"
  msgstr "Edytuj właściwości Samba"
  
-#: plugins/admin/users/class_divListUsers.inc:200
+#: plugins/admin/users/class_divListUsers.inc:188
  msgid "Edit netatalk properties"
  msgstr "Edytuj właściwości Netatalk"
  
-#: plugins/admin/users/class_divListUsers.inc:201
+#: plugins/admin/users/class_divListUsers.inc:189
  msgid "Create user from template"
  msgstr "Utwórz użytkownika z szablonu"
  
-#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/users/class_divListUsers.inc:190
  msgid "Create user with this template"
  msgstr "Utwórz użytkownika z tego szablonu"
  
-#: plugins/admin/users/class_divListUsers.inc:260
+#: plugins/admin/users/class_divListUsers.inc:248
  msgid "password"
  msgstr "hasło"
  
-#: plugins/admin/users/class_divListUsers.inc:264
+#: plugins/admin/users/class_divListUsers.inc:252
  #, fuzzy
  msgid "You are not allowed to change the password for this user."
  msgstr "Brak uprawnień do zmiany własnego hasła w tym momencie"
  
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:266
  #, fuzzy
  msgid "You are not allowed to remove this user."
  msgstr "Brak uprawnień do usunięcia tego użytkownika!"
  
-#: plugins/admin/users/class_divListUsers.inc:297
+#: plugins/admin/users/class_divListUsers.inc:285
  msgid "Online"
  msgstr "Online"
  
-#: plugins/admin/users/class_divListUsers.inc:304
+#: plugins/admin/users/class_divListUsers.inc:292
  msgid "Offline"
  msgstr "Offline"
  
  #: plugins/admin/applications/generic.tpl:7
  #: plugins/admin/applications/generic.tpl:10
-#: plugins/admin/applications/class_applicationGeneric.inc:486
+#: plugins/admin/applications/class_applicationGeneric.inc:495
  #: plugins/admin/applications/class_divListApplication.inc:51
  msgid "Application name"
  msgstr "Nazwa aplikacji"
  
  #: plugins/admin/applications/generic.tpl:15
  #: plugins/gofon/macro/generic.tpl:14
-#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: plugins/gofon/macro/class_gofonMacro.inc:499 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Display name"
  msgstr "Wyświetl nazwę"
  
  #: plugins/admin/applications/generic.tpl:19
-#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/applications/class_applicationGeneric.inc:500
  msgid "Application name to be displayed (i.e. below icons)"
  msgstr "Wyświetlana nazwa aplikacji (pod ikoną)"
  
  #: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/applications/class_applicationGeneric.inc:526
-#: plugins/admin/systems/terminal.tpl:149 plugins/admin/systems/server.tpl:73
-#: plugins/admin/systems/workstation.tpl:124
+#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/systems/terminal.tpl:153 plugins/admin/systems/server.tpl:74
+#: plugins/admin/systems/workstation.tpl:127
  #: plugins/admin/systems/goMailServer.tpl:215
  #: plugins/admin/systems/goImapServer.tpl:110
  #: plugins/admin/ogroups/termgroup.tpl:101
@@ -7107,9 +7054,9 @@ msgid "Choose subtree to place application in"
  msgstr "Wybierz poddrzewo do umieszczenia aplikacji"
  
  #: plugins/admin/applications/generic.tpl:66
-#: plugins/admin/applications/class_applicationGeneric.inc:528
+#: plugins/admin/applications/class_applicationGeneric.inc:537
  #: plugins/admin/mimetypes/generic.tpl:67
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:678
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:686
  msgid "Icon"
  msgstr "Ikona"
  
@@ -7122,41 +7069,46 @@ msgstr "Aktualizuj"
  msgid "Reload picture from LDAP"
  msgstr "Przeładuj obrazek z LDAP"
  
-#: plugins/admin/applications/generic.tpl:96
-#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/generic.tpl:81
+#, fuzzy
+msgid "Remove picture from LDAP"
+msgstr "Przeładuj obrazek z LDAP"
+
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/applications/class_applicationGeneric.inc:541
  msgid "Only executable for members"
  msgstr "Tylko wykonywalne dla członków"
  
-#: plugins/admin/applications/generic.tpl:101
-#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/applications/generic.tpl:104
+#: plugins/admin/applications/class_applicationGeneric.inc:545
  msgid "Replace user configuration on startup"
  msgstr "Podmień konfigurację użytkownika na starcie"
  
-#: plugins/admin/applications/generic.tpl:107
-#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/generic.tpl:110
+#: plugins/admin/applications/class_applicationGeneric.inc:542
  msgid "Place icon on members desktop"
  msgstr "Utwórz ikonę na desktopie członka"
  
-#: plugins/admin/applications/generic.tpl:112
-#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/applications/generic.tpl:115
+#: plugins/admin/applications/class_applicationGeneric.inc:544
  msgid "Place entry in members startmenu"
  msgstr "Utwórz wpis w menu startowym członka"
  
-#: plugins/admin/applications/generic.tpl:117
-#: plugins/admin/applications/class_applicationGeneric.inc:534
+#: plugins/admin/applications/generic.tpl:120
+#: plugins/admin/applications/class_applicationGeneric.inc:543
  msgid "Place entry in members launch bar"
  msgstr "Utwórz wpis w pasku uruchamiania członka"
  
-#: plugins/admin/applications/generic.tpl:135
+#: plugins/admin/applications/generic.tpl:138
  #: plugins/admin/systems/printerPPDDialog.tpl:11
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
  #: plugins/admin/fai/faiTemplateEntry.tpl:49
  msgid "Upload"
  msgstr "Wgraj"
  
-#: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:297
-#: plugins/admin/fai/class_faiTemplate.inc:271
+#: plugins/admin/applications/generic.tpl:140
+#: plugins/admin/fai/class_faiScript.inc:307
+#: plugins/admin/fai/class_faiTemplate.inc:284
  #: plugins/admin/fai/class_faiScriptEntry.inc:89
  #: plugins/admin/fai/class_faiHook.inc:308
  #: plugins/admin/fai/class_faiHookEntry.inc:84
@@ -7183,7 +7135,7 @@ msgstr ""
  "Ta aplikacja ma wyłączone cechy opcji. Można je włączyć klikając poniżej."
  
  #: plugins/admin/applications/class_applicationParameters.inc:98
-#: plugins/admin/fai/class_faiVariable.inc:412
+#: plugins/admin/fai/class_faiVariable.inc:408
  msgid "Variable"
  msgstr "Zmienna"
  
@@ -7240,73 +7192,69 @@ msgstr "Zarządzanie aplikacją"
  msgid "no example"
  msgstr "brak przykładu"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:132
+#: plugins/admin/applications/class_applicationGeneric.inc:126
  msgid "This 'dn' is no application."
  msgstr "Ten 'dn' nie jest aplikacją."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:228
+#: plugins/admin/applications/class_applicationGeneric.inc:227
  #, fuzzy, php-format
  msgid "Removing of application with dn '%s' failed."
  msgstr "Usuwanie aplikacji z grupy '%s' nieudane"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:240
+#: plugins/admin/applications/class_applicationGeneric.inc:239
  #, php-format
  msgid "Removing application from objectgroup '%s' failed"
  msgstr "Usuwanie aplikacji z grupy obiektów '%s' nieudane"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:247
+#: plugins/admin/applications/class_applicationGeneric.inc:246
  #, php-format
  msgid "Removing application from group '%s' failed"
  msgstr "Usuwanie aplikacji z grupy '%s' nieudane"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:289
+#: plugins/admin/applications/class_applicationGeneric.inc:297
  msgid "The specified picture has not been uploaded correctly."
  msgstr "Podany obrazek nie został wgrany prawidłowo."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:372
  msgid "Specified execute path must start with '/'."
  msgstr "Podana ścieżka wykonania musi zaczynać się od '/'."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:375
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr "Brak uprawnień do tworzenia aplikacji w tej 'bazie'."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:380
+#: plugins/admin/applications/class_applicationGeneric.inc:389
  msgid "Required field 'Name' is not filled."
  msgstr "Wymagane pole 'Nazwa' nie jest wypełnione."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:384
+#: plugins/admin/applications/class_applicationGeneric.inc:393
  msgid "Invalid character in application name. Only a-z 0-9 are allowed."
  msgstr "Nieprawidłowe znaki w nazwie aplikacji. Dozwolone są tylko a-z 0-9."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:388
+#: plugins/admin/applications/class_applicationGeneric.inc:397
  msgid "Required field 'Execute' is not filled."
  msgstr "Wymagane pole 'Wykonanie' nie jest wypełnione."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:403
-#: plugins/admin/applications/class_applicationGeneric.inc:411
+#: plugins/admin/applications/class_applicationGeneric.inc:412
+#: plugins/admin/applications/class_applicationGeneric.inc:420
  msgid "There's already an application with this 'Name'."
  msgstr "Już istnieje aplikacja o takiej 'Nazwie'"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:457
+#: plugins/admin/applications/class_applicationGeneric.inc:466
  #, fuzzy, php-format
  msgid "Saving of application with dn '%s' failed."
  msgstr "Zapyisywanie aplikacji nieudane"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:482
+#: plugins/admin/applications/class_applicationGeneric.inc:491
  msgid "Application settings"
  msgstr "Ustawienia Aplikacji"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:515
+#: plugins/admin/applications/class_applicationGeneric.inc:524
  #, fuzzy
  msgid "Application generic"
  msgstr "Nazwa aplikacji"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_applicationGeneric.inc:538
  msgid "Flag"
  msgstr "Flaga"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:530
+#: plugins/admin/applications/class_applicationGeneric.inc:539
  msgid "Script content"
  msgstr "Zawartość skryptu"
  
@@ -7338,13 +7286,13 @@ msgstr ""
  "Posiadając dużą liczbę aplikacji, może okazać się wygodniejsze korzystanie z "
  "selektorów zakresu na górze."
  
-#: plugins/admin/applications/class_divListApplication.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
  msgid "new"
  msgstr "nowa"
  
-#: plugins/admin/applications/class_divListApplication.inc:129
+#: plugins/admin/applications/class_divListApplication.inc:131
  msgid "Create new application"
  msgstr "Utwórz nową aplikację"
  
@@ -7360,6 +7308,20 @@ msgstr "Gałęzie"
  msgid "Current release"
  msgstr "Obecne wydanie"
  
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested operation"
+msgstr "Przetwarzam zadaną operację"
+
+#: plugins/admin/departments/dep_iframe.tpl:7
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+"Twoja przeglądarka nie obsługuje iframes, proszę użyć tego linku aby wykonać "
+"żądaną operację."
+
  #: plugins/admin/departments/generic.tpl:8
  msgid "Name of department"
  msgstr "Nazwa departamentu"
@@ -7374,7 +7336,7 @@ msgid "Descriptive text for department"
  msgstr "Tekst opisujący departament"
  
  #: plugins/admin/departments/generic.tpl:24
-#: plugins/admin/departments/class_departmentGeneric.inc:546
+#: plugins/admin/departments/class_departmentGeneric.inc:590
  msgid "Category"
  msgstr "Kategoria"
  
@@ -7407,12 +7369,12 @@ msgstr "Bazowy numer telefonu tego poddrzewa"
  msgid "Base facsimile telephone number of this subtree"
  msgstr "Bazowy numer faxu tego poddrzewa"
  
-#: plugins/admin/departments/generic.tpl:109
-#: plugins/admin/departments/class_departmentGeneric.inc:549
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/class_departmentGeneric.inc:593
  msgid "Administrative settings"
  msgstr "Ustawienia administracyjne"
  
-#: plugins/admin/departments/generic.tpl:111
+#: plugins/admin/departments/generic.tpl:119
  msgid "Tag department as an independent administrative unit"
  msgstr "Zaznacz departament jako niezależną jednostkę administracyjną"
  
@@ -7447,102 +7409,74 @@ msgstr ""
  "Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa "
  "drzewa LDAP. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
  
-#: plugins/admin/departments/dep_iframe.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
-msgid "Processing the requested operation"
-msgstr "Przetwarzam zadaną operację"
+#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
+msgid "Department management"
+msgstr "Zarządzanie departamentem"
  
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-"Jak tylko operacja przenoszenia zakończy się, można przewinąć stronę na dół "
-"i nacisnąć przycisk 'Kontynuuj' aby przejść do dialogu zarządzania "
-"departamentami."
+#: plugins/admin/departments/class_departmentGeneric.inc:190
+#, php-format
+msgid "Removing of department with dn '%s' failed."
+msgstr "Usuwanie departamentu z dn '%s' nieudane."
  
-#: plugins/admin/departments/dep_iframe.tpl:8
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-"Twoja przeglądarka nie obsługuje iframes, proszę użyć tego linku aby wykonać "
-"żądaną operację."
-
-#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
-msgid "Department management"
-msgstr "Zarządzanie departamentem"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:175
-#, php-format
-msgid "Removing of department with dn '%s' failed."
-msgstr "Usuwanie departamentu z dn '%s' nieudane."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:224
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr "Brak uprawnień do tworzenia departamentu w tym miejscu."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:231
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:251
+#: plugins/admin/departments/class_departmentGeneric.inc:253
  msgid "Department with that 'Name' already exists."
  msgstr "Istnieje już departament o takiej nazwie."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:241
+#: plugins/admin/departments/class_departmentGeneric.inc:261
  msgid "Required field 'Description' is not set."
  msgstr "Wymagane pole 'Opis' nie jest wypełnione."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:245
+#: plugins/admin/departments/class_departmentGeneric.inc:265
  #, php-format
  msgid ""
  "The field 'Name' contains the reserved word '%s'. Please choose another name."
  msgstr ""
  "Pole 'Nazwa' zawiera zarezerwowane słow '%s'. Proszę wybrać inną nazwę."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:297
+#: plugins/admin/departments/class_departmentGeneric.inc:319
  msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
  msgstr ""
  "Błąd krytyczny: Nie można znaleźć nieużywnego znacznika dla jednostki "
  "administracyjnej!"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:343
+#: plugins/admin/departments/class_departmentGeneric.inc:368
  #, php-format
  msgid "Saving of department with dn '%s' failed."
  msgstr "Zapisywanie departamentu z dn '%s' nieudane."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:385
+#: plugins/admin/departments/class_departmentGeneric.inc:421
  #, php-format
  msgid "Tagging '%s'."
  msgstr "Zaznaczanie '%s'."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:506
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr "Przenoszenie '%s' do '%s'"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:499
-#: include/class_ldap.inc:458 include/class_acl.inc:523
-#: include/class_acl.inc:530 include/class_acl.inc:537
-#: include/class_acl.inc:543 ihtml/themes/default/snapshotdialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:53
+#: plugins/admin/departments/class_departmentGeneric.inc:542
+#: include/class_ldap.inc:458 include/class_acl.inc:555
+#: include/class_acl.inc:562 include/class_acl.inc:569
+#: include/class_acl.inc:575 ihtml/themes/default/snapshotdialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
  msgstr "Obiekt"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:502
+#: plugins/admin/departments/class_departmentGeneric.inc:545
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr "BŁĄD kopiowania %s, anulowanie operacji"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:532
-#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: plugins/admin/departments/class_departmentGeneric.inc:581
  #: plugins/admin/departments/class_departmentManagement.inc:25
  #: plugins/admin/systems/class_glpiSelectUser.inc:112
  #: plugins/admin/ogroups/class_divListOGroup.inc:58
  msgid "Departments"
  msgstr "Departamenty"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:544
+#: plugins/admin/departments/class_departmentGeneric.inc:588
  #: plugins/admin/systems/workstationService.tpl:89
  #: plugins/admin/systems/terminalService.tpl:79
  #: plugins/gofon/phoneaccount/generic.tpl:32
@@ -7551,23 +7485,24 @@ msgstr "Departamenty"
  msgid "Telephone"
  msgstr "Telefon"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:545
+#: plugins/admin/departments/class_departmentGeneric.inc:589
  #: plugins/admin/departments/class_divListDepartment.inc:41
  msgid "Department name"
  msgstr "Nazwa departamentu"
  
-#: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
+#: plugins/admin/departments/class_departmentManagement.inc:160
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:134
  #, php-format
  msgid "You're about to delete the whole LDAP subtree placed under '%s'."
  msgstr "Zamierzasz usunąć całe poddrzewo LDAP umieszczone pod '%s'."
  
-#: plugins/admin/departments/class_departmentManagement.inc:175
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:153
+#: plugins/admin/departments/class_departmentManagement.inc:165
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:155
  msgid "You have no permission to remove this department."
  msgstr "Brak uprawnień do usunięcia tego departamentu."
  
-#: plugins/admin/departments/class_departmentManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:352
  msgid ".."
  msgstr ".."
  
@@ -7591,14 +7526,30 @@ msgid "Regular expression for matching department names"
  msgstr "Wyrażenie regularne dla dopasowania nazw departamentów"
  
  #: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/fai/class_divListFai.inc:139
-msgid "Go to users home department"
-msgstr "Przejdź do domowego departamentu użytkowników"
-
-#: plugins/admin/departments/class_divListDepartment.inc:101
  msgid "Create new department"
  msgstr "Utwórz nowy departament"
  
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#, fuzzy
+msgid "You are currently moving/renaming this department."
+msgstr "Brak uprawnień do usunięcia tego departamentu."
+
+#: plugins/admin/departments/dep_move_confirm.tpl:5
+msgid ""
+"Modifying a departments naming attribute 'ou' or base may corrupt acls and "
+"snapshot entries for all entire objects."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:8
+msgid "GOsa can NOT fix this for you, yet."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:11
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
+msgstr ""
+
  #: plugins/admin/systems/network.tpl:1
  msgid "Network\tsettings"
  msgstr "Ustawienia sieci"
@@ -7620,7 +7571,7 @@ msgid "Enable DNS for this device"
  msgstr "Włącz DNS dla tego urządzenia."
  
  #: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/class_servDNS.inc:396
+#: plugins/admin/systems/class_servDNS.inc:398
  #: plugins/admin/systems/servdnseditzone.tpl:67
  #: plugins/admin/fai/faiPackageNew.tpl:31
  #: plugins/gofon/phoneaccount/generic.tpl:84
@@ -7633,8 +7584,8 @@ msgstr "Strefa"
  
  #: plugins/admin/systems/network.tpl:77
  #: plugins/admin/systems/class_servDNS.inc:168
-#: plugins/admin/systems/class_servDNS.inc:399
-#: plugins/admin/systems/class_termDNS.inc:542
+#: plugins/admin/systems/class_servDNS.inc:401
+#: plugins/admin/systems/class_termDNS.inc:547
  #: plugins/admin/systems/servdnseditzone.tpl:85
  msgid "TTL"
  msgstr "TTL"
@@ -7649,10 +7600,10 @@ msgid "present"
  msgstr "obecne"
  
  #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:252
  #: plugins/admin/systems/class_terminalStartup.inc:161
-#: plugins/admin/systems/class_terminalGeneric.inc:242
-#: plugins/admin/systems/class_workstationStartup.inc:471
+#: plugins/admin/systems/class_terminalGeneric.inc:256
+#: plugins/admin/systems/class_workstationStartup.inc:498
+#: plugins/admin/systems/class_terminalService.inc:261
  msgid "This 'dn' has no terminal features."
  msgstr "Ten 'dn' nie posiada cech terminala."
  
@@ -7686,6 +7637,92 @@ msgstr "nie działa"
  msgid "offline"
  msgstr "offline"
  
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr "Szablon terminala"
+
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr "Nazwa terminala"
+
+#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
+#: plugins/admin/systems/workstation.tpl:44
+#: plugins/admin/systems/class_terminalGeneric.inc:548
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:390
+msgid "Mode"
+msgstr "Tryb"
+
+#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:50
+msgid "Select terminal mode"
+msgstr "Proszę wybrać tryb terminala"
+
+#: plugins/admin/systems/terminal.tpl:47
+#: plugins/admin/systems/workstation.tpl:54
+#: plugins/admin/systems/class_workstationGeneric.inc:539
+#: plugins/admin/ogroups/termgroup.tpl:58
+#: plugins/admin/ogroups/class_termgroup.inc:391
+msgid "Syslog server"
+msgstr "Serwer Syslog"
+
+#: plugins/admin/systems/terminal.tpl:50
+#: plugins/admin/systems/workstation.tpl:57
+#: plugins/admin/ogroups/termgroup.tpl:61
+msgid "Choose server to use for logging"
+msgstr "Proszę wybrać serwer do logowania"
+
+#: plugins/admin/systems/terminal.tpl:66
+#: plugins/admin/systems/class_terminalGeneric.inc:549
+msgid "Root server"
+msgstr "Serwer NFS"
+
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Select NFS root filesystem to use"
+msgstr "Proszę wybrać główny system plików NFS"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/class_terminalGeneric.inc:550
+msgid "Swap server"
+msgstr "Serwer Swap"
+
+#: plugins/admin/systems/terminal.tpl:79
+msgid "Choose NFS filesystem to place swap files on"
+msgstr "Proszę wybrać system plików NFS dla plików swap"
+
+#: plugins/admin/systems/terminal.tpl:98
+#: plugins/admin/systems/workstation.tpl:75
+msgid "Inherit time server attributes"
+msgstr "Dziedzicz atrybuty serwera czasu"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:80
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr "Serwer NTP"
+
+#: plugins/admin/systems/terminal.tpl:106
+#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/ogroups/termgroup.tpl:17
+msgid "Choose server to use for synchronizing time"
+msgstr "Proszę wybrać serwer do synchronizacji czasu"
+
+#: plugins/admin/systems/terminal.tpl:140 plugins/admin/systems/server.tpl:62
+#: plugins/admin/systems/workstation.tpl:115
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:47
+#: plugins/admin/ogroups/termgroup.tpl:88
+msgid "Action"
+msgstr "Akcja"
+
+#: plugins/admin/systems/terminal.tpl:145
+#: plugins/admin/systems/workstation.tpl:120
+#: plugins/admin/ogroups/termgroup.tpl:93
+msgid "Select action to execute for this terminal"
+msgstr "Proszę wybrać akcję do wykonania dla tego terminala"
+
  #: plugins/admin/systems/info.tpl:1
  msgid "System information"
  msgstr "Informacja o systemie"
@@ -7792,50 +7829,49 @@ msgstr "GUI"
  msgid "This 'dn' has no network features."
  msgstr "Ten 'dn' nie posiada cech sieciowych."
  
-#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_winGeneric.inc:145
  #, php-format
  msgid "Removing of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_componentGeneric.inc:179
+#: plugins/admin/systems/class_winGeneric.inc:195
  msgid "You have no permissions to create a component on this 'Base'."
  msgstr "Brak uprawnień do tworzenia komponentów w tym elemencie."
  
-#: plugins/admin/systems/class_winGeneric.inc:184
-#: plugins/admin/systems/class_terminalGeneric.inc:400
-#: plugins/admin/systems/class_servGeneric.inc:261
-#: plugins/admin/systems/class_workstationGeneric.inc:400
-#: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/systems/class_componentGeneric.inc:189
-#: plugins/admin/systems/class_phoneGeneric.inc:333
+#: plugins/admin/systems/class_winGeneric.inc:205
+#: plugins/admin/systems/class_terminalGeneric.inc:434
+#: plugins/admin/systems/class_servGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:414
+#: plugins/admin/systems/class_printGeneric.inc:673
+#: plugins/admin/systems/class_componentGeneric.inc:191
+#: plugins/admin/systems/class_phoneGeneric.inc:338
  #, php-format
  msgid "There is already an entry '%s' in the base choosen by you"
  msgstr "Już istnieje wpis '%s' w wybranym elemencie"
  
-#: plugins/admin/systems/class_winGeneric.inc:239
+#: plugins/admin/systems/class_winGeneric.inc:260
  #, php-format
  msgid "Saving of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:250
+#: plugins/admin/systems/class_winGeneric.inc:271
  #, fuzzy
  msgid "Win generic"
  msgstr "Usługa drukowania"
  
-#: plugins/admin/systems/class_winGeneric.inc:251
+#: plugins/admin/systems/class_winGeneric.inc:272
  #, fuzzy
  msgid "Windows workstation generic"
  msgstr "Nazwa stacji roboczej"
  
-#: plugins/admin/systems/class_winGeneric.inc:256
+#: plugins/admin/systems/class_winGeneric.inc:277
  #, fuzzy
  msgid "Win workstation"
  msgstr "Stacja robocza Windows"
  
-#: plugins/admin/systems/class_winGeneric.inc:259
+#: plugins/admin/systems/class_winGeneric.inc:280
  #: plugins/admin/systems/workstation.tpl:10
-#: plugins/admin/systems/class_workstationGeneric.inc:513
+#: plugins/admin/systems/class_workstationGeneric.inc:535
  msgid "Workstation name"
  msgstr "Nazwa stacji roboczej"
  
@@ -7843,122 +7879,20 @@ msgstr "Nazwa stacji roboczej"
  msgid "System management"
  msgstr "Zarządzanie systemem"
  
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr "Szablon terminala"
-
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-msgstr "Nazwa terminala"
-
-#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
-#: plugins/admin/systems/workstation.tpl:44
-#: plugins/admin/systems/class_terminalGeneric.inc:508
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/ogroups/termgroup.tpl:47
-#: plugins/admin/ogroups/class_termgroup.inc:391
-msgid "Mode"
-msgstr "Tryb"
-
-#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
-#: plugins/admin/systems/workstation.tpl:47
-#: plugins/admin/ogroups/termgroup.tpl:50
-msgid "Select terminal mode"
-msgstr "Proszę wybrać tryb terminala"
-
-#: plugins/admin/systems/terminal.tpl:47
-#: plugins/admin/systems/workstation.tpl:54
-#: plugins/admin/systems/class_workstationGeneric.inc:517
-#: plugins/admin/ogroups/termgroup.tpl:58
-#: plugins/admin/ogroups/class_termgroup.inc:392
-msgid "Syslog server"
-msgstr "Serwer Syslog"
-
-#: plugins/admin/systems/terminal.tpl:50
-#: plugins/admin/systems/workstation.tpl:57
-#: plugins/admin/ogroups/termgroup.tpl:61
-msgid "Choose server to use for logging"
-msgstr "Proszę wybrać serwer do logowania"
-
-#: plugins/admin/systems/terminal.tpl:66
-#: plugins/admin/systems/class_terminalGeneric.inc:509
-msgid "Root server"
-msgstr "Serwer NFS"
-
-#: plugins/admin/systems/terminal.tpl:69
-msgid "Select NFS root filesystem to use"
-msgstr "Proszę wybrać główny system plików NFS"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/class_terminalGeneric.inc:510
-msgid "Swap server"
-msgstr "Serwer Swap"
-
-#: plugins/admin/systems/terminal.tpl:79
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Proszę wybrać system plików NFS dla plików swap"
-
-#: plugins/admin/systems/terminal.tpl:98
-#: plugins/admin/systems/workstation.tpl:75
-msgid "Inherit time server attributes"
-msgstr "Dziedzicz atrybuty serwera czasu"
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
-msgstr "Serwer NTP"
-
-#: plugins/admin/systems/terminal.tpl:106
-#: plugins/admin/systems/workstation.tpl:83
-#: plugins/admin/ogroups/termgroup.tpl:17
-msgid "Choose server to use for synchronizing time"
-msgstr "Proszę wybrać serwer do synchronizacji czasu"
-
-#: plugins/admin/systems/terminal.tpl:136 plugins/admin/systems/server.tpl:61
-#: plugins/admin/systems/workstation.tpl:112
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:47
-#: plugins/admin/ogroups/termgroup.tpl:88
-msgid "Action"
-msgstr "Akcja"
-
-#: plugins/admin/systems/terminal.tpl:141
-#: plugins/admin/systems/workstation.tpl:117
-#: plugins/admin/ogroups/termgroup.tpl:93
-msgid "Select action to execute for this terminal"
-msgstr "Proszę wybrać akcję do wykonania dla tego terminala"
-
-#: plugins/admin/systems/class_terminalService.inc:69
-#: plugins/admin/systems/class_workstationService.inc:92
-#: plugins/admin/systems/workstationService.tpl:157
-msgid "unknown"
-msgstr "nieznane"
+#: plugins/admin/systems/goNtpServer.tpl:2
+msgid "Time server"
+msgstr "Serwer czasu"
  
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
-#: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:214
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
  #: plugins/admin/systems/class_terminalStartup.inc:39
  #: plugins/admin/systems/class_terminalStartup.inc:121
  #: plugins/admin/systems/class_terminalStartup.inc:141
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_terminalGeneric.inc:298
-#: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_workstationStartup.inc:268
-#: plugins/admin/systems/class_workstationStartup.inc:285
-#: plugins/admin/systems/class_workstationStartup.inc:289
-#: plugins/admin/systems/class_workstationStartup.inc:790
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:312
+#: plugins/admin/systems/class_workstationStartup.inc:316
+#: plugins/admin/systems/class_workstationStartup.inc:824
  #: plugins/admin/systems/class_workstationService.inc:201
  #: plugins/admin/systems/class_workstationService.inc:204
  #: plugins/admin/systems/class_workstationService.inc:207
@@ -7973,192 +7907,25 @@ msgstr "nieznane"
  #: plugins/admin/systems/class_workstationService.inc:233
  #: plugins/admin/systems/class_workstationService.inc:234
  #: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_terminalService.inc:74
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:108
+#: plugins/admin/systems/class_terminalService.inc:118
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:121
+#: plugins/admin/systems/class_terminalService.inc:125
+#: plugins/admin/systems/class_terminalService.inc:218
+#: plugins/admin/systems/class_terminalService.inc:221
+#: plugins/admin/systems/class_terminalService.inc:224
+#: plugins/admin/systems/class_terminalService.inc:227
+#: plugins/admin/systems/class_terminalService.inc:230
+#: plugins/admin/systems/class_terminalService.inc:233
+#: plugins/admin/systems/class_terminalService.inc:236
  msgid "inherited"
  msgstr "odziedziczony"
  
-#: plugins/admin/systems/class_terminalService.inc:101
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:95
-#: plugins/admin/systems/class_workstationService.inc:96
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "bit"
-msgstr "bit"
-
-#: plugins/admin/systems/class_terminalService.inc:155
-msgid "default"
-msgstr "domyślny"
-
-#: plugins/admin/systems/class_terminalService.inc:156
-#: plugins/admin/systems/class_workstationService.inc:138
-msgid "show chooser"
-msgstr "pokaż wybor"
-
-#: plugins/admin/systems/class_terminalService.inc:157
-#: plugins/admin/systems/class_workstationService.inc:139
-msgid "direct"
-msgstr "bezpośredni"
-
-#: plugins/admin/systems/class_terminalService.inc:160
-#: plugins/admin/systems/class_workstationService.inc:142
-msgid "load balanced"
-msgstr "równoważone obciążenie"
-
-#: plugins/admin/systems/class_terminalService.inc:163
-#: plugins/admin/systems/class_workstationService.inc:145
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: plugins/admin/systems/class_terminalService.inc:164
-#: plugins/admin/systems/class_workstationService.inc:146
-msgid "ICA client"
-msgstr "Klient ICA"
-
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_workstationService.inc:204
-msgid "Bit"
-msgstr "Bit"
-
-#: plugins/admin/systems/class_terminalService.inc:307
-#: plugins/admin/systems/class_workstationService.inc:314
-msgid "Choose the phone located at the current terminal"
-msgstr "Wybierz telefon umieszczony przy obecnym terminalu"
-
-#: plugins/admin/systems/class_terminalService.inc:370
-#: plugins/admin/systems/class_terminalService.inc:375
-#: plugins/admin/systems/class_workstationService.inc:380
-#: plugins/admin/systems/class_workstationService.inc:385
-msgid "Please specify a valid VSync range."
-msgstr "Proszę podać prawidłowy parametr VSync"
-
-#: plugins/admin/systems/class_terminalService.inc:385
-#: plugins/admin/systems/class_terminalService.inc:390
-#: plugins/admin/systems/class_workstationService.inc:395
-#: plugins/admin/systems/class_workstationService.inc:400
-msgid "Please specify a valid HSync range."
-msgstr "Proszę podać prawidłowy parametr HSync."
-
-#: plugins/admin/systems/class_terminalService.inc:421
-#, fuzzy, php-format
-msgid "Saving of object system terminal/service with dn '%s' failed."
-msgstr "Zapisywanie ustawień usługi terminala nieudane"
-
-#: plugins/admin/systems/class_terminalService.inc:430
-#: plugins/admin/systems/class_workstationService.inc:451
-msgid "Service"
-msgstr "Usługa"
-
-#: plugins/admin/systems/class_terminalService.inc:431
-#: plugins/admin/systems/class_goTerminalServer.inc:31
-#: plugins/admin/systems/class_goTerminalServer.inc:54
-#: plugins/admin/systems/class_goTerminalServer.inc:117
-#: plugins/admin/systems/class_goTerminalServer.inc:118
-#: plugins/admin/systems/goTerminalServer.tpl:1
-msgid "Terminal service"
-msgstr "Usługa Terminali"
-
-#: plugins/admin/systems/class_terminalService.inc:439
-#: plugins/admin/systems/class_workstationService.inc:460
-msgid "Monitor"
-msgstr "Monitor"
-
-#: plugins/admin/systems/class_terminalService.inc:440
-#: plugins/admin/ogroups/class_phonequeue.inc:748
-msgid "Method"
-msgstr "Metoda"
-
-#: plugins/admin/systems/class_terminalService.inc:441
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Remote desktop"
-msgstr "Zdalny pulpit"
-
-#: plugins/admin/systems/class_terminalService.inc:442
-#: plugins/admin/systems/class_goTerminalServer.inc:127
-#: plugins/admin/systems/goTerminalServer.tpl:12
-msgid "Font path"
-msgstr "Ścieżka do fontów"
-
-#: plugins/admin/systems/class_terminalService.inc:443
-#: plugins/admin/systems/class_workstationService.inc:461
-msgid "Gfx driver"
-msgstr "Sterownik Gfx"
-
-#: plugins/admin/systems/class_terminalService.inc:444
-#: plugins/admin/systems/class_workstationService.inc:462
-msgid "Gfx resolution"
-msgstr "Rozdzielczość Gfx"
-
-#: plugins/admin/systems/class_terminalService.inc:445
-#: plugins/admin/systems/class_workstationService.inc:463
-msgid "Gfx color depth"
-msgstr "Głębia kolorów Gfx"
-
-#: plugins/admin/systems/class_terminalService.inc:446
-#: plugins/admin/systems/class_workstationService.inc:464
-msgid "Hsync"
-msgstr "HSync"
-
-#: plugins/admin/systems/class_terminalService.inc:447
-#: plugins/admin/systems/class_workstationService.inc:465
-msgid "Vsync"
-msgstr "VSync"
-
-#: plugins/admin/systems/class_terminalService.inc:448
-msgid "Printer service enabled"
-msgstr "Usługa drukowania włączona"
-
-#: plugins/admin/systems/class_terminalService.inc:449
-#: plugins/admin/systems/terminalService.tpl:221
-msgid "Spool server"
-msgstr "Serwer kolejkowania"
-
-#: plugins/admin/systems/class_terminalService.inc:450
-#: plugins/admin/systems/class_workstationService.inc:467
-msgid "Scanner enabled"
-msgstr "Skaner włączony"
-
-#: plugins/admin/systems/class_terminalService.inc:451
-msgid "Scanner model"
-msgstr "Model skanera"
-
-#: plugins/admin/systems/class_terminalService.inc:454
-#: plugins/admin/systems/class_workstationService.inc:468
-msgid "Keyboard model"
-msgstr "Model klawiatury"
-
-#: plugins/admin/systems/class_terminalService.inc:455
-#: plugins/admin/systems/class_workstationService.inc:469
-msgid "Keyboard layout"
-msgstr "Układ klawiatury"
-
-#: plugins/admin/systems/class_terminalService.inc:456
-#: plugins/admin/systems/class_workstationService.inc:470
-msgid "Keyboard variant"
-msgstr "Wariant klawiatury"
-
-#: plugins/admin/systems/class_terminalService.inc:457
-#: plugins/admin/systems/class_workstationService.inc:471
-msgid "Mouse type"
-msgstr "Typ myszy"
-
-#: plugins/admin/systems/class_terminalService.inc:458
-#: plugins/admin/systems/class_workstationService.inc:472
-msgid "Mouse port"
-msgstr "Port myszy"
-
-#: plugins/admin/systems/class_terminalService.inc:459
-#: plugins/admin/systems/class_workstationService.inc:473
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:76
-#: plugins/gofon/phoneaccount/generic.tpl:30
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Sprzęt telefoniczny"
-
  #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:310
+#: plugins/admin/systems/class_workstationStartup.inc:337
  #, php-format
  msgid ""
  "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -8177,25 +7944,25 @@ msgid "Terminal startup"
  msgstr "Szablon terminala"
  
  #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1163
  msgid "Ldap server"
  msgstr "Serwer Ldap"
  
  #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1122
+#: plugins/admin/systems/class_workstationStartup.inc:1167
  #, fuzzy
  msgid "Kernel modules"
  msgstr "Parametr kernela"
  
  #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1119
+#: plugins/admin/systems/class_workstationStartup.inc:1164
  #: plugins/admin/systems/workstationStartup.tpl:8
  #: plugins/admin/systems/terminalStartup.tpl:8
  msgid "Boot kernel"
  msgstr "Uruchamiane jądro"
  
  #: plugins/admin/systems/class_terminalStartup.inc:455
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1165
  msgid "Kernel parameter"
  msgstr "Parametr kernela"
  
@@ -8203,7 +7970,7 @@ msgstr "Parametr kernela"
  msgid "Server name"
  msgstr "Nazwa serwera"
  
-#: plugins/admin/systems/server.tpl:66
+#: plugins/admin/systems/server.tpl:67
  msgid "Select action to execute for this server"
  msgstr "Proszę wybrać akcję do wykonania dla tego serwera"
  
@@ -8290,7 +8057,7 @@ msgid "Supported interfaces"
  msgstr "Wspierane interfejsy"
  
  #: plugins/admin/systems/glpiPrinter.tpl:48
-#: plugins/admin/systems/class_servDNS.inc:395
+#: plugins/admin/systems/class_servDNS.inc:397
  msgid "Serial"
  msgstr "Szeregowy"
  
@@ -8330,86 +8097,82 @@ msgstr "Załączniki"
  msgid "Installed cartridges"
  msgstr "Zainstalowane kartridźe"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:98
+#: plugins/admin/systems/class_terminalGeneric.inc:105
  msgid "text"
  msgstr "tekst"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:106
  msgid "graphic"
  msgstr "grafika"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:173
+#: plugins/admin/systems/class_terminalGeneric.inc:181
  #, php-format
  msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:179
+#: plugins/admin/systems/class_terminalGeneric.inc:188
  msgid "No WAKECMD definition found in your gosa.conf"
  msgstr "Brak definicji WAKECMD w pliku gosa.conf"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:191
+#: plugins/admin/systems/class_terminalGeneric.inc:200
  msgid "No REBOOTCMD definition found in your gosa.conf"
  msgstr "Brak definicji REBOOTCMD w pliku gosa.conf"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:203
+#: plugins/admin/systems/class_terminalGeneric.inc:212
  msgid "No HALTCMD definition found in your gosa.conf"
  msgstr "Brak definicji HALTCMD w pliku gosa.conf"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:280
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:294
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Switch off"
  msgstr "Wyłącz"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:281
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:295
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Reboot"
  msgstr "Restartuj"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:282
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_servGeneric.inc:186
-#: plugins/admin/systems/class_workstationGeneric.inc:282
-#: plugins/admin/systems/class_workstationGeneric.inc:288
-#: plugins/admin/ogroups/class_termgroup.inc:301
+#: plugins/admin/systems/class_terminalGeneric.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:190
+#: plugins/admin/systems/class_servGeneric.inc:196
+#: plugins/admin/systems/class_workstationGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:295
+#: plugins/admin/ogroups/class_termgroup.inc:300
  msgid "Memory test"
  msgstr "Test pamięci"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:283
-#: plugins/admin/systems/class_terminalGeneric.inc:287
-#: plugins/admin/systems/class_servGeneric.inc:181
-#: plugins/admin/systems/class_servGeneric.inc:187
-#: plugins/admin/systems/class_workstationGeneric.inc:283
-#: plugins/admin/systems/class_workstationGeneric.inc:289
-#: plugins/admin/ogroups/class_termgroup.inc:302
+#: plugins/admin/systems/class_terminalGeneric.inc:297
+#: plugins/admin/systems/class_terminalGeneric.inc:301
+#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_servGeneric.inc:197
+#: plugins/admin/systems/class_workstationGeneric.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:296
+#: plugins/admin/ogroups/class_termgroup.inc:301
  msgid "System analysis"
  msgstr "Analiza systemu"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:285
-#: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/systems/class_terminalGeneric.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_workstationGeneric.inc:292
  msgid "Wake up"
  msgstr "Zbudź"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:333
+#: plugins/admin/systems/class_terminalGeneric.inc:348
  #, php-format
  msgid "Removing of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:383
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr "Brak uprawnień do tworzenia terminala w tej 'bazie'."
-
-#: plugins/admin/systems/class_terminalGeneric.inc:387
+#: plugins/admin/systems/class_terminalGeneric.inc:415
  msgid "The required field 'Terminal name' is not set."
  msgstr "Wymagane pole 'Nazwa terminala' nie jest wypełnione."
  
-#: plugins/admin/systems/class_terminalGeneric.inc:410
-#: plugins/admin/systems/class_workstationGeneric.inc:410
+#: plugins/admin/systems/class_terminalGeneric.inc:444
+#: plugins/admin/systems/class_workstationGeneric.inc:424
  msgid ""
  "There must be at least one NTP server selected, or the inherit mode "
  "activated."
@@ -8417,113 +8180,115 @@ msgstr ""
  "Musi być zaznaczony co najmniej jeden serwer NTP lub zaznaczony tryb "
  "dziedziczenia."
  
-#: plugins/admin/systems/class_terminalGeneric.inc:488
+#: plugins/admin/systems/class_terminalGeneric.inc:528
  #, php-format
  msgid "Saving of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:499
-#: plugins/admin/systems/class_terminalGeneric.inc:505
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: plugins/admin/systems/class_terminalGeneric.inc:539
+#: plugins/admin/systems/class_terminalGeneric.inc:545
+#: plugins/admin/systems/class_systemManagement.inc:998
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/admin/ogroups/class_ogroupManagement.inc:353
  msgid "Terminal"
  msgstr "Terminal"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:500
+#: plugins/admin/systems/class_terminalGeneric.inc:540
  #, fuzzy
  msgid "Terminal generic"
  msgstr "Usługa Terminali"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: plugins/admin/systems/class_terminalGeneric.inc:551
  msgid "Syslog server enabled"
  msgstr "Serwer Syslog włączony"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: plugins/admin/systems/class_terminalGeneric.inc:552
  msgid "Ntp server settings"
  msgstr "Ustawienia serwera ntp"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:515
-#: plugins/admin/systems/class_servGeneric.inc:347
-#: plugins/admin/systems/class_workstationGeneric.inc:519
-#: plugins/admin/ogroups/class_termgroup.inc:393
+#: plugins/admin/systems/class_terminalGeneric.inc:555
+#: plugins/admin/systems/class_workstationGeneric.inc:541
+#, fuzzy
+msgid "Root password"
+msgstr "Ustaw hasło"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:556
+#: plugins/admin/systems/class_servGeneric.inc:360
+#: plugins/admin/systems/class_workstationGeneric.inc:542
+#: plugins/admin/ogroups/class_termgroup.inc:392
  msgid "Action flag"
  msgstr "Flaga akcji"
  
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:41
+#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/ogroups/class_termgroup.inc:40
  msgid "Activated"
  msgstr "Aktywne"
  
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_servGeneric.inc:79
  msgid "This 'dn' has no server features."
  msgstr "Ten 'dn' nie posiada cech serwera."
  
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#: plugins/admin/ogroups/class_termgroup.inc:206
+#: plugins/admin/systems/class_servGeneric.inc:87
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/ogroups/class_termgroup.inc:205
  msgid "No ACTIONCMD definition found in your gosa.conf"
  msgstr "Brak definicji ACTIONCMD w pliku gosa.conf"
  
-#: plugins/admin/systems/class_servGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:125
  #, php-format
  msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:176
-#: plugins/admin/systems/class_workstationGeneric.inc:278
-#: plugins/admin/ogroups/class_termgroup.inc:297
+#: plugins/admin/systems/class_servGeneric.inc:186
+#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/ogroups/class_termgroup.inc:296
  msgid "Instant update"
  msgstr "Natychmiastowe uaktualnienie"
  
-#: plugins/admin/systems/class_servGeneric.inc:177
-#: plugins/admin/systems/class_servGeneric.inc:185
-#: plugins/admin/systems/class_workstationGeneric.inc:279
-#: plugins/admin/systems/class_workstationGeneric.inc:287
-#: plugins/admin/ogroups/class_termgroup.inc:298
+#: plugins/admin/systems/class_servGeneric.inc:187
+#: plugins/admin/systems/class_servGeneric.inc:195
+#: plugins/admin/systems/class_workstationGeneric.inc:286
+#: plugins/admin/systems/class_workstationGeneric.inc:294
+#: plugins/admin/ogroups/class_termgroup.inc:297
  msgid "Scheduled update"
  msgstr "Zaplanowana aktualizacja"
  
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_servGeneric.inc:184
-#: plugins/admin/systems/class_workstationGeneric.inc:280
-#: plugins/admin/systems/class_workstationGeneric.inc:286
-#: plugins/admin/ogroups/class_termgroup.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:188
+#: plugins/admin/systems/class_servGeneric.inc:194
+#: plugins/admin/systems/class_workstationGeneric.inc:287
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/ogroups/class_termgroup.inc:298
  msgid "Reinstall"
  msgstr "Przeinstaluj"
  
-#: plugins/admin/systems/class_servGeneric.inc:179
-#: plugins/admin/systems/class_workstationGeneric.inc:281
-#: plugins/admin/ogroups/class_termgroup.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:189
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:299
  msgid "Rescan hardware"
  msgstr "Przeskanuj sprzęt"
  
-#: plugins/admin/systems/class_servGeneric.inc:207
+#: plugins/admin/systems/class_servGeneric.inc:218
  #, fuzzy, php-format
  msgid "Removing of system server/generic with dn '%s' failed."
  msgstr "Usuwanie referencji makra telefonicznego nieudane"
  
-#: plugins/admin/systems/class_servGeneric.inc:245
+#: plugins/admin/systems/class_servGeneric.inc:263
  msgid "The required field 'Server name' is not set."
  msgstr "Wymagane pole 'Nazwa serwera' jest puste."
  
-#: plugins/admin/systems/class_servGeneric.inc:250
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr "Brak uprawnień do tworzenia serwera w tym elemencie."
-
-#: plugins/admin/systems/class_servGeneric.inc:319
+#: plugins/admin/systems/class_servGeneric.inc:332
  #, php-format
  msgid "Saving of system server/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:335
+#: plugins/admin/systems/class_servGeneric.inc:348
  #, fuzzy
  msgid "Server generic"
  msgstr "Nazwa serwera"
  
-#: plugins/admin/systems/class_servGeneric.inc:345
-#: plugins/admin/systems/class_workstationGeneric.inc:516
+#: plugins/admin/systems/class_servGeneric.inc:358
+#: plugins/admin/systems/class_workstationGeneric.inc:538
  #, fuzzy
  msgid "Goto mode"
  msgstr "do folferu"
@@ -8548,51 +8313,46 @@ msgid ""
  "below."
  msgstr "Ten serwer nie posiada cech DHCP. Można je włączyć klikając poniżej."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:191
-#: plugins/admin/ogroups/class_termgroup.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:198
+#: plugins/admin/ogroups/class_termgroup.inc:248
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
  msgstr "Zapisywanie ustawień uruchamiania stacji roboczej nieudane"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:209
  msgid "This 'dn' has no workstation features."
  msgstr "Ten 'dn' nie posiada cech stacji roboczej."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:324
+#: plugins/admin/systems/class_workstationGeneric.inc:332
  #, fuzzy, php-format
  msgid "Removing of system workstation/generic with dn '%s' failed."
  msgstr "Usuwanie stacji roboczej Samba nieudane"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/ogroups/class_termgroup.inc:109
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr "Brak uprawnień do tworzenia stacji roboczej w tej 'bazie'."
-
-#: plugins/admin/systems/class_workstationGeneric.inc:387
+#: plugins/admin/systems/class_workstationGeneric.inc:396
  msgid "The required field 'Workstation name' is not set."
  msgstr "Wymagane pole 'Nazwa stacji roboczej' jest puste."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:477
-#: plugins/admin/systems/class_workstationGeneric.inc:495
+#: plugins/admin/systems/class_workstationGeneric.inc:491
+#: plugins/admin/systems/class_workstationGeneric.inc:517
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic with dn '%s' failed."
  msgstr "Zapisywanie usług stacji roboczej nieudane"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:505
+#: plugins/admin/systems/class_workstationGeneric.inc:527
  #, fuzzy
  msgid "Workstation generic"
  msgstr "Nazwa stacji roboczej"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:814
+#: plugins/admin/systems/class_workstationGeneric.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:999
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/admin/ogroups/class_ogroupManagement.inc:352
  #: plugins/generic/references/class_reference.inc:48
  msgid "Workstation"
  msgstr "Stacja robocza"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:518
-#: plugins/admin/ogroups/class_termgroup.inc:394
+#: plugins/admin/systems/class_workstationGeneric.inc:540
+#: plugins/admin/ogroups/class_termgroup.inc:393
  msgid "Ntp server"
  msgstr "Serwer NTP"
  
@@ -8600,93 +8360,114 @@ msgstr "Serwer NTP"
  msgid "Systems"
  msgstr "Systemy"
  
-#: plugins/admin/systems/class_systemManagement.inc:222
+#: plugins/admin/systems/class_systemManagement.inc:191
+msgid "Creating the image failed. Please see the report below."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:200
+#, fuzzy, php-format
+msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+msgstr "Polecenie '%s', podane jako POSTMODIFY dla dodatku '%s' nie istnieje."
+
+#: plugins/admin/systems/class_systemManagement.inc:257
+#, fuzzy
+msgid "You are not allowed to create a new object of this type."
+msgstr "Brak uprawnień do usunięcia grupy obiektowej."
+
+#: plugins/admin/systems/class_systemManagement.inc:308
  msgid "You can't edit this object type yet!"
  msgstr "Nie można edytować tego typu obiektów (jeszcze)!"
  
-#: plugins/admin/systems/class_systemManagement.inc:247
+#: plugins/admin/systems/class_systemManagement.inc:336
+#: plugins/admin/systems/class_systemManagement.inc:402
+#, fuzzy
+msgid "You are not allowed to change the password for this object."
+msgstr "Brak uprawnień do zmiany własnego hasła w tym momencie"
+
+#: plugins/admin/systems/class_systemManagement.inc:348
  msgid "Passwords entered as new and repeated do not match!"
  msgstr "Hasła podane jako nowe i powtórzone nie zgadzają się!"
  
-#: plugins/admin/systems/class_systemManagement.inc:264
-msgid "You are not allowed to set this systems password!"
-msgstr "Brak uprawnień do ustalania tych haseł systemowych!"
+#: plugins/admin/systems/class_systemManagement.inc:405
+#, fuzzy
+msgid "Can't detect object to change password."
+msgstr "Nie można wykryć nazwy obiektu."
  
-#: plugins/admin/systems/class_systemManagement.inc:318
+#: plugins/admin/systems/class_systemManagement.inc:467
  #, php-format
  msgid "You're about to delete all information about the component at '%s'."
  msgstr "Zamierzasz usunąć wszystkie informacje o komponencie w '%s'."
  
-#: plugins/admin/systems/class_systemManagement.inc:324
-#: plugins/admin/systems/class_systemManagement.inc:385
+#: plugins/admin/systems/class_systemManagement.inc:473
+#: plugins/admin/systems/class_systemManagement.inc:533
  #: plugins/admin/fai/class_faiManagement.inc:168
  #: plugins/admin/fai/class_faiManagement.inc:221
  msgid "You are not allowed to delete this component!"
  msgstr "Brak uprawnień do usunięcia tego elementu!"
  
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:837
  msgid "New terminal"
  msgstr "Nowy terminal"
  
-#: plugins/admin/systems/class_systemManagement.inc:654
+#: plugins/admin/systems/class_systemManagement.inc:839
  msgid "New workstation"
  msgstr "Nowa stacja robocza"
  
-#: plugins/admin/systems/class_systemManagement.inc:656
+#: plugins/admin/systems/class_systemManagement.inc:841
  msgid "New Device"
  msgstr "Nowe urządzenie"
  
-#: plugins/admin/systems/class_systemManagement.inc:675
+#: plugins/admin/systems/class_systemManagement.inc:860
  msgid "Terminal template for"
  msgstr "Szablon terminala dla"
  
-#: plugins/admin/systems/class_systemManagement.inc:691
+#: plugins/admin/systems/class_systemManagement.inc:876
  msgid "Workstation template for"
  msgstr "Szablon stacji roboczej dla"
  
-#: plugins/admin/systems/class_systemManagement.inc:811
+#: plugins/admin/systems/class_systemManagement.inc:996
  msgid "New System from incoming"
  msgstr "Nowy system dla nadchodzących"
  
-#: plugins/admin/systems/class_systemManagement.inc:815
+#: plugins/admin/systems/class_systemManagement.inc:1000
  msgid "Workstation is installing"
  msgstr "Stacja robocza jest instalowana"
  
-#: plugins/admin/systems/class_systemManagement.inc:816
+#: plugins/admin/systems/class_systemManagement.inc:1001
  msgid "Workstation is waiting for action"
  msgstr "Stacja robocza czeka na użycie"
  
-#: plugins/admin/systems/class_systemManagement.inc:817
+#: plugins/admin/systems/class_systemManagement.inc:1002
  msgid "Workstation installation failed"
  msgstr "Instalacja stacji roboczej nieudana"
  
-#: plugins/admin/systems/class_systemManagement.inc:820
+#: plugins/admin/systems/class_systemManagement.inc:1005
  msgid "Server is installing"
  msgstr "Serwer jest instalowany"
  
-#: plugins/admin/systems/class_systemManagement.inc:821
+#: plugins/admin/systems/class_systemManagement.inc:1006
  msgid "Server is waiting for action"
  msgstr "Serwer czeka na użycie"
  
-#: plugins/admin/systems/class_systemManagement.inc:822
+#: plugins/admin/systems/class_systemManagement.inc:1007
  msgid "Server installation failed"
  msgstr "Instalacja serwera nieudana"
  
-#: plugins/admin/systems/class_systemManagement.inc:823
+#: plugins/admin/systems/class_systemManagement.inc:1008
  msgid "Winstation"
  msgstr "Stacja Windows"
  
-#: plugins/admin/systems/class_systemManagement.inc:824
+#: plugins/admin/systems/class_systemManagement.inc:1009
  msgid "Network Device"
  msgstr "Urządzenie sieciowe"
  
-#: plugins/admin/systems/class_systemManagement.inc:825
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_systemManagement.inc:1010
+#: plugins/admin/systems/class_divListSystem.inc:148
  msgid "New Terminal"
  msgstr "Nowy terminal"
  
-#: plugins/admin/systems/class_systemManagement.inc:826
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_systemManagement.inc:1011
+#: plugins/admin/systems/class_divListSystem.inc:154
  msgid "New Workstation"
  msgstr "Nowa stacja robocza"
  
@@ -8794,9 +8575,9 @@ msgid "Accept mail from other domains over non-authenticated SMTP"
  msgstr "Akceptuj pocztę z innych domen przez nie-autentykowane SMTP"
  
  #: plugins/admin/systems/class_servDNS.inc:34
-#: plugins/admin/systems/class_servDNS.inc:353
-#: plugins/admin/systems/class_servDNS.inc:382
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:355
+#: plugins/admin/systems/class_servDNS.inc:384
+#: plugins/admin/systems/class_servDNS.inc:385
  msgid "DNS service"
  msgstr "Usługa DNS"
  
@@ -8823,7 +8604,7 @@ msgid ""
  msgstr "Ten serwer nie posiada cech DNS. Można je włączyć klikając poniżej."
  
  #: plugins/admin/systems/class_servDNS.inc:167
-#: plugins/admin/systems/class_servDNS.inc:392
+#: plugins/admin/systems/class_servDNS.inc:394
  msgid "Reverse zone"
  msgstr "Strefa odwrotna"
  
@@ -8832,7 +8613,7 @@ msgstr "Strefa odwrotna"
  msgid "Class"
  msgstr "Klasa"
  
-#: plugins/admin/systems/class_servDNS.inc:231
+#: plugins/admin/systems/class_servDNS.inc:233
  #, php-format
  msgid ""
  "Can't delete the selected zone, because it is still in use by these entry/"
@@ -8841,37 +8622,37 @@ msgstr ""
  "Nie można usunąć wybranej strefy ponieważ jest używana przez te(n) element"
  "(y) '%s'"
  
-#: plugins/admin/systems/class_servDNS.inc:290
+#: plugins/admin/systems/class_servDNS.inc:292
  #, php-format
  msgid "Updating of system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:299
+#: plugins/admin/systems/class_servDNS.inc:301
  #, fuzzy, php-format
  msgid "Removing of system server/dns with dn '%s' failed."
  msgstr "Usuwanie serwera nieudane"
  
-#: plugins/admin/systems/class_servDNS.inc:320
+#: plugins/admin/systems/class_servDNS.inc:322
  #, fuzzy, php-format
  msgid "Saving of system server/dns with dn '%s' failed."
  msgstr "Zapisywanie ustawień serwera baz danych nieudane"
  
-#: plugins/admin/systems/class_servDNS.inc:344
+#: plugins/admin/systems/class_servDNS.inc:346
  #, php-format
  msgid "Set status flag for system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:391
-#: plugins/admin/systems/class_termDNS.inc:541
+#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_termDNS.inc:546
  #: plugins/admin/systems/servdnseditzone.tpl:7
  msgid "Zone name"
  msgstr "Nazwa strefy"
  
-#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_servDNS.inc:395
  msgid "Primary dns server"
  msgstr "Podstawowy serwer DNS"
  
-#: plugins/admin/systems/class_servDNS.inc:397
+#: plugins/admin/systems/class_servDNS.inc:399
  #: plugins/admin/systems/servdnseditzone.tpl:73
  #: plugins/admin/ogroups/phonequeue.tpl:70
  #: plugins/admin/ogroups/class_phonequeue.inc:751
@@ -8879,12 +8660,12 @@ msgstr "Podstawowy serwer DNS"
  msgid "Retry"
  msgstr "Ponawia"
  
-#: plugins/admin/systems/class_servDNS.inc:398
+#: plugins/admin/systems/class_servDNS.inc:400
  #: plugins/admin/systems/servdnseditzone.tpl:79
  msgid "Expire"
  msgstr "Wygasa"
  
-#: plugins/admin/systems/class_servDNS.inc:400
+#: plugins/admin/systems/class_servDNS.inc:402
  #: plugins/admin/systems/servdnseditzone.tpl:24
  msgid "Zone records"
  msgstr "Rekordy strefy"
@@ -9073,22 +8854,22 @@ msgstr "Zezwól na nieautoryzowane pobieranie informacji Free/Busy"
  msgid "kolabFreeBusyFuture"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:110
+#: plugins/admin/systems/class_printGeneric.inc:111
  #, php-format
  msgid "Can't extract a valid base out of object dn, setting base to '%s'."
  msgstr ""
  "Nie można wydobyć poprawnej podstawy z obiektu dn, ustawiam podstawę na '%s'."
  
-#: plugins/admin/systems/class_printGeneric.inc:257
-#: plugins/admin/systems/class_printGeneric.inc:265
-#: plugins/admin/systems/class_printGeneric.inc:270
-#: plugins/admin/systems/class_printGeneric.inc:327
-#: plugins/admin/systems/class_printGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:260
+#: plugins/admin/systems/class_printGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:273
+#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:341
  msgid "Add printer extension"
  msgstr "Dodaj rozszerzenie drukarki"
  
-#: plugins/admin/systems/class_printGeneric.inc:258
+#: plugins/admin/systems/class_printGeneric.inc:261
  msgid ""
  "Could not intialize printer tab, parameter parent was missing while "
  "construction."
@@ -9096,19 +8877,19 @@ msgstr ""
  "Nie można zainicjalizować zakładki drukarek, brak parametru parent podzczas "
  "tworzenia."
  
-#: plugins/admin/systems/class_printGeneric.inc:266
+#: plugins/admin/systems/class_printGeneric.inc:269
  msgid "This is a workstation template, printer tab is disabled."
  msgstr "To jest szablon stacji roboczej, zakładka drukarek jest wyłączona."
  
-#: plugins/admin/systems/class_printGeneric.inc:271
+#: plugins/admin/systems/class_printGeneric.inc:274
  msgid "This is a terminal template, printer tab is disabled."
  msgstr "To jest szablon terminala, zakładka drukarek jest wyłączona."
  
-#: plugins/admin/systems/class_printGeneric.inc:320
+#: plugins/admin/systems/class_printGeneric.inc:315
  msgid "This 'dn' has no printer features."
  msgstr "Ten 'dn' nie posiada cech drukarki."
  
-#: plugins/admin/systems/class_printGeneric.inc:328
+#: plugins/admin/systems/class_printGeneric.inc:323
  msgid ""
  "This object has printer extension disabled. You can't enable it while 'cn' "
  "is not present in entry. Possibly you are currently creating a new terminal "
@@ -9118,12 +8899,12 @@ msgstr ""
  "'cn' nie jest obecne we wpisie. Prawdopodobnie próbujesz tworzyć nowy "
  "szablon terminala."
  
-#: plugins/admin/systems/class_printGeneric.inc:335
-#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:330
+#: plugins/admin/systems/class_printGeneric.inc:333
  msgid "Remove printer extension"
  msgstr "Usuń rozszerzenie drukarki"
  
-#: plugins/admin/systems/class_printGeneric.inc:336
+#: plugins/admin/systems/class_printGeneric.inc:331
  msgid ""
  "This workstation has printer extension enabled.You can disable it by "
  "clicking below."
@@ -9131,7 +8912,7 @@ msgstr ""
  "Ta stacja robocza ma włączone rozszerzenia drukarki. Można je wyłączyć "
  "klikając poniżej."
  
-#: plugins/admin/systems/class_printGeneric.inc:339
+#: plugins/admin/systems/class_printGeneric.inc:334
  msgid ""
  "This terminal has printer extension enabled. You can disable it by clicking "
  "below."
@@ -9139,7 +8920,7 @@ msgstr ""
  "Ten terminal ma włączone rozszerzenia drukarki. Można je wyłączyć klikając "
  "poniżej."
  
-#: plugins/admin/systems/class_printGeneric.inc:344
+#: plugins/admin/systems/class_printGeneric.inc:339
  msgid ""
  "This workstation has printer extension disabled. You can enable it by "
  "clicking below."
@@ -9147,7 +8928,7 @@ msgstr ""
  "Ta stacja robocza ma wyłączone rozszerzenia drukarki. Można je włączyć "
  "klikając poniżej."
  
-#: plugins/admin/systems/class_printGeneric.inc:347
+#: plugins/admin/systems/class_printGeneric.inc:342
  msgid ""
  "This terminal has printer extension disabled. You can enable it by clicking "
  "below."
@@ -9155,61 +8936,61 @@ msgstr ""
  "Ten terminal ma wyłączone rozszerzenia drukarki. Można je włączyć klikając "
  "poniżej."
  
-#: plugins/admin/systems/class_printGeneric.inc:510
+#: plugins/admin/systems/class_printGeneric.inc:511
  #, php-format
  msgid "Your currently selected PPD file '%s' doesn't exist."
  msgstr "Wybrany plik PPD '%s' nie istnieje."
  
-#: plugins/admin/systems/class_printGeneric.inc:518
+#: plugins/admin/systems/class_printGeneric.inc:519
  msgid "can't get ppd informations."
  msgstr "Nie można pobrać informacji ppd."
  
-#: plugins/admin/systems/class_printGeneric.inc:531
+#: plugins/admin/systems/class_printGeneric.inc:532
  #, php-format
  msgid "This printer belongs to terminal %s. You can't rename this printer."
  msgstr ""
  "Ta drukarka należy do terminala %s. Nie można zmienić nazwy tej drukarki."
  
-#: plugins/admin/systems/class_printGeneric.inc:533
+#: plugins/admin/systems/class_printGeneric.inc:534
  #, php-format
  msgid "This printer belongs to workstation %s. You can't rename this printer."
  msgstr ""
  "Ta drukarka należy do stacji roboczej %s. Nie można zmienić nazwy tej "
  "drulkarki."
  
-#: plugins/admin/systems/class_printGeneric.inc:588
+#: plugins/admin/systems/class_printGeneric.inc:589
  #, fuzzy, php-format
  msgid "Removing of system print/generic with dn '%s' failed."
  msgstr "Usuwanie drukarki nieudane"
  
-#: plugins/admin/systems/class_printGeneric.inc:814
+#: plugins/admin/systems/class_printGeneric.inc:818
  #, php-format
  msgid "Saving of system print/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:837
-#: plugins/admin/systems/class_printGeneric.inc:839
-#: plugins/admin/ogroups/class_ogroupManagement.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:841
+#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
  #: plugins/admin/fai/faiTemplateEntry.tpl:85
  #: plugins/admin/fai/faiTemplateEntry.tpl:127
  #: plugins/generic/references/class_reference.inc:36
  msgid "Group"
  msgstr "Grupa"
  
-#: plugins/admin/systems/class_printGeneric.inc:855
+#: plugins/admin/systems/class_printGeneric.inc:859
  #, fuzzy
  msgid "Print generic"
  msgstr "Usługa drukowania"
  
-#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_printGeneric.inc:871
  msgid "LabeledURL"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_printGeneric.inc:872
  msgid "Printer PPD"
  msgstr "PPD drukarki"
  
-#: plugins/admin/systems/class_printGeneric.inc:885
+#: plugins/admin/systems/class_printGeneric.inc:889
  #, php-format
  msgid ""
  "You are not allowed to remove the given object '%s' from the list of members "
@@ -9217,25 +8998,25 @@ msgid ""
  msgstr ""
  "Brak uprawnień do usunięcia obiektu '%s' z listy członków drukarki '%s'."
  
-#: plugins/admin/systems/class_printGeneric.inc:902
+#: plugins/admin/systems/class_printGeneric.inc:906
  #, php-format
  msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
  msgstr ""
  "Nieprawidłowy typ drukarki podczas dodawania '%s' do listy '%s' drukarek."
  
-#: plugins/admin/systems/class_printGeneric.inc:907
+#: plugins/admin/systems/class_printGeneric.inc:911
  #, php-format
  msgid ""
  "You are not allowed to add the given object '%s' to the list of members of '%"
  "s'."
  msgstr "Brak uprawnień do dodawania obiekti '%s' do listy członków '%s',"
  
-#: plugins/admin/systems/class_printGeneric.inc:942
+#: plugins/admin/systems/class_printGeneric.inc:946
  #, php-format
  msgid "Can't add '%s' to the list of members, it is already used."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:953
+#: plugins/admin/systems/class_printGeneric.inc:957
  #, php-format
  msgid "Can't add '%s' to list of members, it is not reachable."
  msgstr ""
@@ -9258,43 +9039,39 @@ msgstr "Pozostaw pola puste aby dziedziczyć hasło z wpisów domyślnych."
  msgid "Changing the password impinges on authentification only."
  msgstr "Zmiana hasła wpływa tylko na autentykację."
  
-#: plugins/admin/systems/class_componentGeneric.inc:127
+#: plugins/admin/systems/class_componentGeneric.inc:125
  #, fuzzy, php-format
  msgid "Removing of system component/generic with dn '%s' failed."
  msgstr "Usuwanie ogólnego komponentu nieudane"
  
-#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_componentGeneric.inc:172
  msgid "The required field 'Component name' is not set."
  msgstr "Wymagane pole 'Nazwa komponentu' jest puste."
  
-#: plugins/admin/systems/class_componentGeneric.inc:170
-#: plugins/admin/systems/class_phoneGeneric.inc:307
+#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_phoneGeneric.inc:317
  msgid "The required field IP address is empty."
  msgstr "Wymagane pole adres IP jest puste."
  
-#: plugins/admin/systems/class_componentGeneric.inc:173
-#: plugins/admin/systems/class_phoneGeneric.inc:310
+#: plugins/admin/systems/class_componentGeneric.inc:180
+#: plugins/admin/systems/class_phoneGeneric.inc:320
  msgid "The field IP address contains an invalid address."
  msgstr "Pole adres IP zawiera nieprawidłowy adres."
  
-#: plugins/admin/systems/class_componentGeneric.inc:247
+#: plugins/admin/systems/class_componentGeneric.inc:249
  #, php-format
  msgid "Saving of system component/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:258
+#: plugins/admin/systems/class_componentGeneric.inc:260
  #, fuzzy
  msgid "Component generic"
  msgstr "Nowy komponent"
  
-#: plugins/admin/systems/class_componentGeneric.inc:263
+#: plugins/admin/systems/class_componentGeneric.inc:265
  msgid "Network device"
  msgstr "Urządzenia sieciowe"
  
-#: plugins/admin/systems/goNtpServer.tpl:2
-msgid "Time server"
-msgstr "Serwer czasu"
-
  #: plugins/admin/systems/goKrbServer.tpl:1
  msgid "Kerberos kadmin access"
  msgstr "Dostęp do Kerberos kadmin"
@@ -9309,6 +9086,22 @@ msgstr "Dziedzina Kerberos"
  msgid "Admin user"
  msgstr "Użytkownik administracyjny"
  
+#: plugins/admin/systems/goFonServer.tpl:1
+msgid "VoIP database information"
+msgstr "Informacje bazy danych VoIP"
+
+#: plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr "Użytkownik basy Asterisk"
+
+#: plugins/admin/systems/goFonServer.tpl:20
+msgid "Country dial prefix"
+msgstr "Krajowy prefix telefoniczny"
+
+#: plugins/admin/systems/goFonServer.tpl:28
+msgid "Local dial prefix"
+msgstr "Lokalny prefix telefoniczny"
+
  #: plugins/admin/systems/chooser.tpl:1
  msgid "Choose the kind of system component you want to create"
  msgstr "Wybierz rodzaj komponentu systemu do utworzenia"
@@ -9383,21 +9176,13 @@ msgstr "Strona kodowa"
  msgid "Option"
  msgstr "Opcja"
  
-#: plugins/admin/systems/goFonServer.tpl:1
-msgid "VoIP database information"
-msgstr "Informacje bazy danych VoIP"
-
-#: plugins/admin/systems/goFonServer.tpl:4
-msgid "Asterisk DB user"
-msgstr "Użytkownik basy Asterisk"
-
-#: plugins/admin/systems/goFonServer.tpl:20
-msgid "Country dial prefix"
-msgstr "Krajowy prefix telefoniczny"
+#: plugins/admin/systems/goFaxServer.tpl:1
+msgid "FAX database information"
+msgstr "Informacje bazy FAX"
  
-#: plugins/admin/systems/goFonServer.tpl:28
-msgid "Local dial prefix"
-msgstr "Lokalny prefix telefoniczny"
+#: plugins/admin/systems/goFaxServer.tpl:4
+msgid "FAX DB user"
+msgstr "Użytkownik bazy FAX"
  
  #: plugins/admin/systems/remove_glpi.tpl:10
  msgid ""
@@ -9413,12 +9198,12 @@ msgid "This 'dn' has no phone features."
  msgstr "Ten 'dn' nie posiada cech telefonu."
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  msgid "yes"
  msgstr "tak"
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  msgid "no"
  msgstr "nie"
  
@@ -9444,100 +9229,97 @@ msgstr ""
  msgid "Removing of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:315
+#: plugins/admin/systems/class_phoneGeneric.inc:325
  msgid "The required field 'Phone name' is not set."
  msgstr "Wymagane pole 'Nazwa telefonu' jest puste."
  
-#: plugins/admin/systems/class_phoneGeneric.inc:318
+#: plugins/admin/systems/class_phoneGeneric.inc:328
  msgid "The 'Phone name' '0' is reserved and cannot be used."
  msgstr "Nazwa telefonu '0' jest zarezerwowana i nie może być użyta."
  
-#: plugins/admin/systems/class_phoneGeneric.inc:323
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr "Brak uprawnień do tworzenia telefonu w tym elemencie."
-
-#: plugins/admin/systems/class_phoneGeneric.inc:413
+#: plugins/admin/systems/class_phoneGeneric.inc:418
  #, php-format
  msgid "Saving of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:426
+#: plugins/admin/systems/class_phoneGeneric.inc:431
  #, fuzzy
  msgid "Phone generic"
  msgstr "Numer telefonu"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:431
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
  msgid "Phone hardware"
  msgstr "Sprzęt telefoniczny"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/admin/systems/class_phoneGeneric.inc:442
  #, fuzzy
  msgid "SIP Mode"
  msgstr "Tryb"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:437
+#: plugins/admin/systems/class_phoneGeneric.inc:443
  #, fuzzy
  msgid "SIP DTMF mode"
  msgstr "Tryb DTMF"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:438
+#: plugins/admin/systems/class_phoneGeneric.inc:444
  #, fuzzy
  msgid "SIP Default ip"
  msgstr "Domyślny IP"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_phoneGeneric.inc:445
  #, fuzzy
  msgid "SIP Qualify"
  msgstr "Kwalifikuj"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_phoneGeneric.inc:446
  #, fuzzy
  msgid "IAX authentication type"
  msgstr "Autentykacja Nagios"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:441
+#: plugins/admin/systems/class_phoneGeneric.inc:447
  #, fuzzy
  msgid "IAX secret"
  msgstr "Usługa FAX"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:442
+#: plugins/admin/systems/class_phoneGeneric.inc:448
  #, fuzzy
  msgid "IAX account code"
  msgstr "Kod konta"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:443
+#: plugins/admin/systems/class_phoneGeneric.inc:449
  #, fuzzy
  msgid "IAX trunk lines"
  msgstr "Zmniejsz linie"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:444
+#: plugins/admin/systems/class_phoneGeneric.inc:450
  #, fuzzy
  msgid "IAX permit settings"
  msgstr "Ustawienia FAX"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:445
+#: plugins/admin/systems/class_phoneGeneric.inc:451
  #, fuzzy
  msgid "IAX deny settings"
  msgstr "Ustawienia FAX"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:446
+#: plugins/admin/systems/class_phoneGeneric.inc:452
  msgid "CAPI MSN"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:447
+#: plugins/admin/systems/class_phoneGeneric.inc:453
  msgid "Hardware type"
  msgstr "Typ sprzętu"
  
  #: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#, fuzzy, php-format
+msgid "The file '%s/encodings' does not exist, can't get supported charsets."
  msgstr ""
  "Plik '/etc/gosa/encodings' nie istnieje. Nie można pobrać wspieranych "
  "zestawów znaków."
  
  #: plugins/admin/systems/class_servNfs.inc:49
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#, fuzzy, php-format
+msgid "Can't read '%s/encodings', please check permissions."
  msgstr "Nie można czytać '/etc/gosa/encodings', proszę sprawdzić uprawnienia."
  
  #: plugins/admin/systems/class_servNfs.inc:178
@@ -9568,7 +9350,7 @@ msgstr "Ścieżka zawiera nieprawidłowe znaki."
  msgid "Option contains invalid characters."
  msgstr "Opcja zawiera nieprawidłowe znaki."
  
-#: plugins/admin/systems/class_workstationStartup.inc:402
+#: plugins/admin/systems/class_workstationStartup.inc:429
  msgid ""
  "There are packages in your configuration, which can't be resolved with "
  "current server/release settings."
@@ -9576,11 +9358,11 @@ msgstr ""
  "Istnieją pakiety w twojej konfiguracji które nie mogą zostać przeanalizowane "
  "przy obecnych ustawieniach serwera/wydania."
  
-#: plugins/admin/systems/class_workstationStartup.inc:447
+#: plugins/admin/systems/class_workstationStartup.inc:474
  msgid "Please select a 'FAI server' or remove the 'FAI classes'."
  msgstr "Proszę wybrać 'serwer FAI' lub usunąć 'klasy FAI'."
  
-#: plugins/admin/systems/class_workstationStartup.inc:509
+#: plugins/admin/systems/class_workstationStartup.inc:537
  msgid ""
  "There is already a profile in your selection that contain partition table "
  "configurations."
@@ -9588,11 +9370,11 @@ msgstr ""
  "Już istnieje profil w twoim wyborze który zawiera konfiguracje tablicy "
  "partycji."
  
-#: plugins/admin/systems/class_workstationStartup.inc:721
+#: plugins/admin/systems/class_workstationStartup.inc:754
  msgid "Not available in current setup"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:897
  #, php-format
  msgid ""
  "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
@@ -9601,7 +9383,7 @@ msgstr ""
  "Nie można przetłumaczyć jednej lub więcej klas FAI [%s] na serwerze FAI '%"
  "s'. Serwer zresetowano na 'auto'."
  
-#: plugins/admin/systems/class_workstationStartup.inc:879
+#: plugins/admin/systems/class_workstationStartup.inc:913
  #, fuzzy, php-format
  msgid ""
  "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -9613,19 +9395,19 @@ msgstr ""
  "klasy zostały usunięte z tego konta, naciśnij anuluj jeśli nie chcesz tego "
  "zachować."
  
-#: plugins/admin/systems/class_workstationStartup.inc:1040
+#: plugins/admin/systems/class_workstationStartup.inc:1085
  #, fuzzy, php-format
  msgid "Saving of system workstation/startup with dn '%s' failed."
  msgstr "Zapisywanie ustawień uruchamiania stacji roboczej nieudane"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1090
+#: plugins/admin/systems/class_workstationStartup.inc:1135
  #, php-format
  msgid ""
  "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
  msgstr ""
  "Nie można wykonać podanego REPOSITORY_HOOK '%s' proszę sprawdzić gosa.conf."
  
-#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/class_workstationStartup.inc:1137
  #: plugins/admin/systems/class_servRepositorySetup.inc:203
  #, php-format
  msgid ""
@@ -9635,26 +9417,26 @@ msgstr ""
  "Podana wartość parametru  REPOSITORY_HOOK '%s' w gosa.conf zwraca pusty ciąg "
  "znaków."
  
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1155
  #, fuzzy
  msgid "System startup"
  msgstr "Status systemu"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: plugins/admin/systems/class_workstationStartup.inc:1170
  #: plugins/admin/fai/class_faiProfile.inc:453
  #: plugins/admin/fai/faiProfile.tpl:36
  msgid "FAI classes"
  msgstr "Klasy FAI"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1126
+#: plugins/admin/systems/class_workstationStartup.inc:1171
  msgid "Debian mirror"
  msgstr "Mirror Debiana"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1127
+#: plugins/admin/systems/class_workstationStartup.inc:1172
  msgid "Debian release"
  msgstr "Wydanie debian"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1129
+#: plugins/admin/systems/class_workstationStartup.inc:1174
  msgid "FAI status flag"
  msgstr "flaga statusu FAI"
  
@@ -9827,13 +9609,13 @@ msgstr "Sekcja"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:462
  #: plugins/admin/systems/class_printerPPDDialog.inc:465
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:289
  msgid "True"
  msgstr "Tak"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:463
  #: plugins/admin/systems/class_printerPPDDialog.inc:466
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:286
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:287
  msgid "False"
  msgstr "Nie"
  
@@ -9842,7 +9624,24 @@ msgstr "Nie"
  msgid "Unsupported ppd type '%s' used for '%s' "
  msgstr "Niewspierany typ ppd '%s' użyty dla '%s'"
  
-#: plugins/admin/systems/class_printerPPDDialog.inc:485
+#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#, fuzzy, php-format
+msgid "Removing old ppd file '%s' failed."
+msgstr "Usuwanie profilu FAI nieudane"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#, fuzzy, php-format
+msgid "Removing old ppd file '%s' failed. File is not accessible."
+msgstr ""
+"Nie można dodać nowego pliku ppd, plik źródłowy '%s' jest nieosiągalny."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#, php-format
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:502
  msgid ""
  "Please select a valid ppd file or use 'Cancel' to go back to printer "
  "configuration."
@@ -9855,7 +9654,7 @@ msgstr "Sterownik drulkarki"
  #: plugins/admin/systems/printerPPDDialog.tpl:5
  #: plugins/admin/systems/workstationService.tpl:7
  #: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:246
+#: plugins/admin/systems/terminalService.tpl:254
  #: plugins/admin/systems/class_glpiAccount.inc:784
  msgid "Model"
  msgstr "Model"
@@ -9890,29 +9689,185 @@ msgstr "Wyświetl obiekty pasujące"
  msgid "Regular expression for matching object names"
  msgstr "Wyrażenie regularne dla dopasowania nazw obiektów"
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#, fuzzy, php-format
+msgid "You're about to delete the ppd file '%s' at '%s'."
+msgstr "Zamierzasz usunąć aplikację '%s'."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#, fuzzy, php-format
+msgid "Could not found specified ppd file '%s'."
+msgstr "Nie można otworzyć wybranego certyfikatu!"
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+msgid ""
+"Something went wrong while trying to remove the ppd file from server, "
+"possibly we have no write access."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
  #, php-format
  msgid "Selected vendor '%s' does not exists in our list of ppds."
  msgstr "Wybrany dostawca '%s' nie istnieje w naszej liście ppd."
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
  msgid "Printer ppd selection."
  msgstr "Wybór ppd drukarki."
  
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:157
+#: plugins/admin/systems/class_terminalService.inc:71
+msgid "unknown"
+msgstr "nieznane"
+
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_terminalService.inc:105
+#: plugins/admin/systems/class_terminalService.inc:106
+msgid "bit"
+msgstr "bit"
+
+#: plugins/admin/systems/class_workstationService.inc:138
+#: plugins/admin/systems/class_terminalService.inc:158
+msgid "show chooser"
+msgstr "pokaż wybor"
+
+#: plugins/admin/systems/class_workstationService.inc:139
+#: plugins/admin/systems/class_terminalService.inc:159
+msgid "direct"
+msgstr "bezpośredni"
+
+#: plugins/admin/systems/class_workstationService.inc:142
+#: plugins/admin/systems/class_terminalService.inc:162
+msgid "load balanced"
+msgstr "równoważone obciążenie"
+
+#: plugins/admin/systems/class_workstationService.inc:145
+#: plugins/admin/systems/class_terminalService.inc:165
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_workstationService.inc:146
+#: plugins/admin/systems/class_terminalService.inc:166
+msgid "ICA client"
+msgstr "Klient ICA"
+
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_terminalService.inc:221
+msgid "Bit"
+msgstr "Bit"
+
+#: plugins/admin/systems/class_workstationService.inc:314
+#: plugins/admin/systems/class_terminalService.inc:316
+msgid "Choose the phone located at the current terminal"
+msgstr "Wybierz telefon umieszczony przy obecnym terminalu"
+
+#: plugins/admin/systems/class_workstationService.inc:380
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_terminalService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:395
+msgid "Please specify a valid VSync range."
+msgstr "Proszę podać prawidłowy parametr VSync"
+
+#: plugins/admin/systems/class_workstationService.inc:395
+#: plugins/admin/systems/class_workstationService.inc:400
+#: plugins/admin/systems/class_terminalService.inc:404
+#: plugins/admin/systems/class_terminalService.inc:409
+msgid "Please specify a valid HSync range."
+msgstr "Proszę podać prawidłowy parametr HSync."
+
  #: plugins/admin/systems/class_workstationService.inc:443
  #, fuzzy, php-format
  msgid "Saving of system workstation/service with dn '%s' failed."
  msgstr "Zapisywanie usług stacji roboczej nieudane"
  
+#: plugins/admin/systems/class_workstationService.inc:451
+#: plugins/admin/systems/class_terminalService.inc:466
+msgid "Service"
+msgstr "Usługa"
+
  #: plugins/admin/systems/class_workstationService.inc:452
  msgid "Workstation service"
  msgstr "Usługa stacji roboczej"
  
+#: plugins/admin/systems/class_workstationService.inc:460
+#: plugins/admin/systems/class_terminalService.inc:475
+msgid "Monitor"
+msgstr "Monitor"
+
+#: plugins/admin/systems/class_workstationService.inc:461
+#: plugins/admin/systems/class_terminalService.inc:479
+msgid "Gfx driver"
+msgstr "Sterownik Gfx"
+
+#: plugins/admin/systems/class_workstationService.inc:462
+#: plugins/admin/systems/class_terminalService.inc:480
+msgid "Gfx resolution"
+msgstr "Rozdzielczość Gfx"
+
+#: plugins/admin/systems/class_workstationService.inc:463
+#: plugins/admin/systems/class_terminalService.inc:481
+msgid "Gfx color depth"
+msgstr "Głębia kolorów Gfx"
+
+#: plugins/admin/systems/class_workstationService.inc:464
+#: plugins/admin/systems/class_terminalService.inc:482
+msgid "Hsync"
+msgstr "HSync"
+
+#: plugins/admin/systems/class_workstationService.inc:465
+#: plugins/admin/systems/class_terminalService.inc:483
+msgid "Vsync"
+msgstr "VSync"
+
  #: plugins/admin/systems/class_workstationService.inc:466
  #, fuzzy
  msgid "Use DDC"
  msgstr "Identyfikator użytkownika"
  
+#: plugins/admin/systems/class_workstationService.inc:467
+#: plugins/admin/systems/class_terminalService.inc:487
+msgid "Scanner enabled"
+msgstr "Skaner włączony"
+
+#: plugins/admin/systems/class_workstationService.inc:468
+#: plugins/admin/systems/class_terminalService.inc:491
+msgid "Keyboard model"
+msgstr "Model klawiatury"
+
+#: plugins/admin/systems/class_workstationService.inc:469
+#: plugins/admin/systems/class_terminalService.inc:492
+msgid "Keyboard layout"
+msgstr "Układ klawiatury"
+
+#: plugins/admin/systems/class_workstationService.inc:470
+#: plugins/admin/systems/class_terminalService.inc:493
+msgid "Keyboard variant"
+msgstr "Wariant klawiatury"
+
+#: plugins/admin/systems/class_workstationService.inc:471
+#: plugins/admin/systems/class_terminalService.inc:494
+msgid "Mouse type"
+msgstr "Typ myszy"
+
+#: plugins/admin/systems/class_workstationService.inc:472
+#: plugins/admin/systems/class_terminalService.inc:495
+msgid "Mouse port"
+msgstr "Port myszy"
+
+#: plugins/admin/systems/class_workstationService.inc:473
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:76
+#: plugins/admin/systems/class_terminalService.inc:496
+#: plugins/gofon/phoneaccount/generic.tpl:30
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Sprzęt telefoniczny"
+
  #: plugins/admin/systems/workstationService.tpl:4
  #: plugins/admin/systems/terminalService.tpl:4
  msgid "Keyboard"
@@ -9989,41 +9944,42 @@ msgid "Display device"
  msgstr "Urządzenie wyświetlające"
  
  #: plugins/admin/systems/workstationService.tpl:167
+#: plugins/admin/systems/terminalService.tpl:147
  msgid "Use DDC for automatic detection"
  msgstr "Użyj DCC do automatycznego wykrywania"
  
  #: plugins/admin/systems/workstationService.tpl:170
-#: plugins/admin/systems/terminalService.tpl:142
+#: plugins/admin/systems/terminalService.tpl:150
  msgid "HSync"
  msgstr "HSync"
  
  #: plugins/admin/systems/workstationService.tpl:175
-#: plugins/admin/systems/terminalService.tpl:146
+#: plugins/admin/systems/terminalService.tpl:154
  msgid "Horizontal refresh frequency for installed monitor"
  msgstr "Częstotliwość odświeżania poziomego dla zainstalowanego monitora"
  
  #: plugins/admin/systems/workstationService.tpl:181
-#: plugins/admin/systems/terminalService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:158
  msgid "VSync"
  msgstr "VSync"
  
  #: plugins/admin/systems/workstationService.tpl:186
-#: plugins/admin/systems/terminalService.tpl:154
+#: plugins/admin/systems/terminalService.tpl:162
  msgid "Vertical refresh frequency for installed monitor"
  msgstr "Częstotliwość odświeżania pionowego dla zainstalowanego monitora"
  
  #: plugins/admin/systems/workstationService.tpl:201
-#: plugins/admin/systems/terminalService.tpl:237
+#: plugins/admin/systems/terminalService.tpl:245
  msgid "Scan device"
  msgstr "Urządzenie skanujące"
  
  #: plugins/admin/systems/workstationService.tpl:204
-#: plugins/admin/systems/terminalService.tpl:239
+#: plugins/admin/systems/terminalService.tpl:247
  msgid "Select to start SANE scan service on terminal"
  msgstr "Zaznacz aby uruchomić usługę skanowania SANE na terminalu"
  
  #: plugins/admin/systems/workstationService.tpl:207
-#: plugins/admin/systems/terminalService.tpl:241
+#: plugins/admin/systems/terminalService.tpl:249
  msgid "Provide scan services"
  msgstr "Dostarcza usługi skanowania"
  
@@ -10065,17 +10021,17 @@ msgstr "Przydzielone klasy FAI"
  msgid "set"
  msgstr "ustaw"
  
-#: plugins/admin/systems/workstationStartup.tpl:137
+#: plugins/admin/systems/workstationStartup.tpl:141
  #: plugins/admin/systems/terminalStartup.tpl:66
  msgid "Kernel modules (format: name parameters)"
  msgstr "Modułu jądra (format: nazwa parametry)"
  
-#: plugins/admin/systems/workstationStartup.tpl:140
+#: plugins/admin/systems/workstationStartup.tpl:144
  #: plugins/admin/systems/terminalStartup.tpl:69
  msgid "Add additional modules to load on startup"
  msgstr "Dodaj inne moduły do załadowania na starcie"
  
-#: plugins/admin/systems/workstationStartup.tpl:176
+#: plugins/admin/systems/workstationStartup.tpl:180
  #: plugins/admin/systems/terminalStartup.tpl:105
  msgid "Mountpoint"
  msgstr "Punkt montowania"
@@ -10108,65 +10064,75 @@ msgstr ""
  msgid "use debug mode for startup"
  msgstr "użyj trybu debug podczas uruchamiania"
  
-#: plugins/admin/systems/terminalService.tpl:169
+#: plugins/admin/systems/terminalService.tpl:173
+#: plugins/admin/systems/class_terminalService.inc:477
+msgid "Remote desktop"
+msgstr "Zdalny pulpit"
+
+#: plugins/admin/systems/terminalService.tpl:177
  msgid "Connect method"
  msgstr "Metoda połączenia"
  
-#: plugins/admin/systems/terminalService.tpl:172
+#: plugins/admin/systems/terminalService.tpl:180
  msgid "Choose method to connect to terminal server"
  msgstr "Wybierz metodę połączenia z serwerem terminali"
  
-#: plugins/admin/systems/terminalService.tpl:180
+#: plugins/admin/systems/terminalService.tpl:188
  msgid "Terminal server"
  msgstr "Serwer terminali"
  
-#: plugins/admin/systems/terminalService.tpl:183
+#: plugins/admin/systems/terminalService.tpl:191
  msgid "Select specific terminal server to use"
  msgstr "Wybierz serwer terminali"
  
-#: plugins/admin/systems/terminalService.tpl:191
+#: plugins/admin/systems/terminalService.tpl:199
  msgid "Font server"
  msgstr "Serwer fontów"
  
-#: plugins/admin/systems/terminalService.tpl:194
+#: plugins/admin/systems/terminalService.tpl:202
  msgid "Select specific font server to use"
  msgstr "Wybierz font serwer"
  
-#: plugins/admin/systems/terminalService.tpl:211
+#: plugins/admin/systems/terminalService.tpl:219
  msgid "Print device"
  msgstr "Urządzenie drukujące"
  
-#: plugins/admin/systems/terminalService.tpl:213
+#: plugins/admin/systems/terminalService.tpl:221
  msgid "Select to start IPP based printing service on terminal"
  msgstr "Wybierz aby rozpocząć usługę drukowania IPP na terminalu"
  
-#: plugins/admin/systems/terminalService.tpl:215
+#: plugins/admin/systems/terminalService.tpl:223
  msgid "Provide print services"
  msgstr "Dostarcza usługi drukowania"
  
-#: plugins/admin/systems/terminalService.tpl:224
+#: plugins/admin/systems/terminalService.tpl:229
+#: plugins/admin/systems/class_terminalService.inc:486
+msgid "Spool server"
+msgstr "Serwer kolejkowania"
+
+#: plugins/admin/systems/terminalService.tpl:232
  msgid "Select NFS filesystem to place spool files on"
  msgstr "Proszę wybrać system plików NFS dla przechowywania plików kolejki"
  
-#: plugins/admin/systems/terminalService.tpl:249
+#: plugins/admin/systems/terminalService.tpl:257
  msgid "Select scanner driver to use"
  msgstr "Proszę wybrać sterownik skanera do użycia"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:1
-#: plugins/admin/systems/class_servRepository.inc:349
+#: plugins/admin/systems/class_servRepository.inc:365
  #: plugins/admin/fai/faiPackage.tpl:33
  msgid "Repository"
  msgstr "Repozytorium"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:364
+#: plugins/admin/systems/class_servRepository.inc:380
  msgid "Parent server"
  msgstr "Nadrzędny serwer"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:39
-#: plugins/admin/systems/class_servRepository.inc:239
-#: plugins/admin/systems/class_servRepository.inc:262
-#: plugins/admin/systems/class_servRepository.inc:363
+#: plugins/admin/systems/class_servRepository.inc:253
+#: plugins/admin/systems/class_servRepository.inc:276
+#: plugins/admin/systems/class_servRepository.inc:379
  msgid "Sections"
  msgstr "Sekcje"
  
@@ -10185,13 +10151,18 @@ msgid ""
  msgstr ""
  "Nie można wykonać podanego REPOSITORY_HOOK '%s'. proszę sprawdzić gosa.conf."
  
-#: plugins/admin/systems/class_servRepository.inc:35
-#: plugins/admin/systems/class_servRepository.inc:339
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:44
+#: plugins/admin/systems/class_servRepository.inc:355
+#: plugins/admin/systems/class_servRepository.inc:366
  msgid "Repository service"
  msgstr "Usługa repozytorium"
  
-#: plugins/admin/systems/class_servRepository.inc:138
+#: plugins/admin/systems/class_servRepository.inc:94
+#: plugins/admin/fai/class_faiSummaryTab.inc:175
+msgid "You can't use this plugin until FAI is activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:152
  #, php-format
  msgid ""
  "You can't delete this release, it is still used by these workstations [%s]. "
@@ -10200,7 +10171,7 @@ msgstr ""
  "Nie można usunąć tego wydania, jest wciąż używane przez te stacje robocze [%"
  "s]. Proszę poprawić te zależności aby zachować spójność danych."
  
-#: plugins/admin/systems/class_servRepository.inc:172
+#: plugins/admin/systems/class_servRepository.inc:186
  #, php-format
  msgid ""
  "Be careful editing this release, it is still used by these workstations [%s]."
@@ -10208,13 +10179,13 @@ msgstr ""
  "Ostrożnie z edycją tego wydania, jest wciąż używane przez te stacje robocze "
  "[%s]."
  
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:212
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
  #: plugins/admin/fai/class_faiManagement.inc:343
  msgid "This name is already in use."
  msgstr "Ta nazwa jest już w użyciu."
  
-#: plugins/admin/systems/class_servRepository.inc:359
+#: plugins/admin/systems/class_servRepository.inc:375
  #: plugins/admin/systems/class_goGlpiServer.inc:92
  #: plugins/admin/systems/class_goCupsServer.inc:71
  #: plugins/admin/systems/class_serverService.inc:8
@@ -10225,7 +10196,7 @@ msgstr "Ta nazwa jest już w użyciu."
  msgid "Start"
  msgstr "Start"
  
-#: plugins/admin/systems/class_servRepository.inc:360
+#: plugins/admin/systems/class_servRepository.inc:376
  #: plugins/admin/systems/class_goGlpiServer.inc:93
  #: plugins/admin/systems/class_goCupsServer.inc:72
  #: plugins/admin/systems/class_serverService.inc:7
@@ -10237,7 +10208,7 @@ msgstr "Start"
  msgid "Stop"
  msgstr "Zatrzymaj"
  
-#: plugins/admin/systems/class_servRepository.inc:361
+#: plugins/admin/systems/class_servRepository.inc:377
  #: plugins/admin/systems/class_goGlpiServer.inc:94
  #: plugins/admin/systems/class_goCupsServer.inc:73
  #: plugins/admin/systems/class_serverService.inc:9
@@ -10248,11 +10219,11 @@ msgstr "Zatrzymaj"
  msgid "Restart"
  msgstr "Restart"
  
-#: plugins/admin/systems/class_servRepository.inc:362
+#: plugins/admin/systems/class_servRepository.inc:378
  msgid "Releases"
  msgstr "Wydania"
  
-#: plugins/admin/systems/class_servRepository.inc:365
+#: plugins/admin/systems/class_servRepository.inc:381
  msgid "Url"
  msgstr "Url"
  
@@ -10344,13 +10315,9 @@ msgstr "Wyrażenie regularne dla dopasowania nazw urządzeń"
  msgid "Use"
  msgstr "Użyj"
  
-#: plugins/admin/systems/goFaxServer.tpl:1
-msgid "FAX database information"
-msgstr "Informacje bazy FAX"
-
-#: plugins/admin/systems/goFaxServer.tpl:4
-msgid "FAX DB user"
-msgstr "Użytkownik bazy FAX"
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
+msgstr ""
  
  #: plugins/admin/systems/class_glpiAccount.inc:147
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:161
@@ -10477,7 +10444,7 @@ msgid "Attachment"
  msgstr "Załącznik"
  
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:136
  msgid "File"
  msgstr "Plik"
  
@@ -10493,6 +10460,37 @@ msgstr "Typ-Mime"
  msgid "use"
  msgstr "użyj"
  
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+msgid "Go to root department"
+msgstr "Idź do głównego departamentu"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:194
+msgid "Go up one department"
+msgstr "Idź jeden departament wyżej"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+msgid "Go to users department"
+msgstr "Przejdź do departamentu użytkowników"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+#: include/class_MultiSelectWindow.inc:204
+msgid "Home"
+msgstr "Katalog domowy"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: include/class_MultiSelectWindow.inc:209
+msgid "Reload list"
+msgstr "Przeładuj listę"
+
  #: plugins/admin/systems/glpiSelectUser.tpl:23
  msgid ""
  "This dialog allows you to select a user as technical responsible person."
@@ -10632,7 +10630,7 @@ msgid "Add/Edit network interface"
  msgstr "Dodaj/Zmień interfejs sieciowy"
  
  #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:532
+#: plugins/admin/systems/class_termDNS.inc:537
  msgid "MAC address"
  msgstr "Adres MAC"
  
@@ -10714,7 +10712,7 @@ msgid "New processor"
  msgstr "Nowy procesor"
  
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "P"
  msgstr "P"
  
@@ -10848,7 +10846,8 @@ msgid "Upload wasn't successfull."
  msgstr "Wgrywanie nieudane."
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#, fuzzy, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
  msgstr "Brak katalogu '/etc/gosa/glpi' do przechowywania plików glpi."
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:138
@@ -11006,26 +11005,26 @@ msgstr ""
  msgid "Cartridges"
  msgstr "Kartridźe"
  
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:137
  #, php-format
  msgid ""
  "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
  msgstr ""
  "Nie można wykonać podanego AUTO_NETWORK_HOOK '%s' proszę sprawdzić gosa.conf."
  
-#: plugins/admin/systems/class_termDNS.inc:311
+#: plugins/admin/systems/class_termDNS.inc:319
  msgid "The required field 'IP-address' is not set."
  msgstr "Wymagane pole 'adres-IP' nie jest wypełnione"
  
-#: plugins/admin/systems/class_termDNS.inc:318
+#: plugins/admin/systems/class_termDNS.inc:323
  msgid "Wrong IP format in field IP-address."
  msgstr "Zły format danych w polu 'adres-IP'"
  
-#: plugins/admin/systems/class_termDNS.inc:324
+#: plugins/admin/systems/class_termDNS.inc:330
  msgid "The required field 'MAC-address' is not set."
  msgstr "Wymagane pole 'MAC-adres' nie jest wypełnione"
  
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_termDNS.inc:333
  msgid ""
  "The given macaddress is invalid. There must be 6 2byte segments seperated by "
  "':'."
@@ -11033,17 +11032,17 @@ msgstr ""
  "Podany MAC-adres jest nieprawidłowy. Musi być w formacie 6 2bajtowych "
  "segmentów oddzielonych ':'."
  
-#: plugins/admin/systems/class_termDNS.inc:351
+#: plugins/admin/systems/class_termDNS.inc:353
  #, php-format
  msgid "Found duplicate value for record type '%s'."
  msgstr "Znaleziono powtórzoną wartość dla typu rekordu '%s'."
  
-#: plugins/admin/systems/class_termDNS.inc:359
+#: plugins/admin/systems/class_termDNS.inc:361
  #, php-format
  msgid "Found more than one entry for the uniqe record type '%s'."
  msgstr "Znaleziono więcej niż jeden wpis dla unikalnego typu rekordu '%s'."
  
-#: plugins/admin/systems/class_termDNS.inc:370
+#: plugins/admin/systems/class_termDNS.inc:372
  #, php-format
  msgid ""
  "The device IP '%s' is added as 'A Record', this will be done automatically, "
@@ -11052,30 +11051,30 @@ msgstr ""
  "IP '%s' urządzenia jest dodane jako 'rekord A', to zostanie dodane "
  "automatycznie. Proszę usunąć rekord."
  
-#: plugins/admin/systems/class_termDNS.inc:377
+#: plugins/admin/systems/class_termDNS.inc:379
  #: plugins/admin/systems/class_servDNSeditZone.inc:409
  #, php-format
  msgid "Only lowercase is allowed, please check your '%ss'."
  msgstr "Tylko małe litery są dozwolone, proszę sprawdzić '%s'."
  
-#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:463
  #, fuzzy, php-format
  msgid "Saving of terminal/dns account with dn '%s' failed."
  msgstr "Zapisywanie konta pocztowego nieudane"
  
-#: plugins/admin/systems/class_termDNS.inc:522
+#: plugins/admin/systems/class_termDNS.inc:527
  msgid "DNS"
  msgstr "DNS"
  
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:528
  msgid "DNS settings"
  msgstr "Ustawienia DNS"
  
-#: plugins/admin/systems/class_termDNS.inc:531
+#: plugins/admin/systems/class_termDNS.inc:536
  msgid "IP address"
  msgstr "adres IP"
  
-#: plugins/admin/systems/class_termDNS.inc:540
+#: plugins/admin/systems/class_termDNS.inc:545
  msgid "DNS records"
  msgstr "Rekordy DNS"
  
@@ -11178,7 +11177,7 @@ msgstr "Proszę wybrać grupę obiektów"
  
  #: plugins/admin/systems/class_servDNSeditZone.inc:290
  #: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:371
  msgid "Down"
  msgstr "W dół"
  
@@ -11268,44 +11267,39 @@ msgstr ""
  "Nie zmienić nazwy z '%s' na '%s', istnieje już wpis z tą samą nazwą w "
  "dialogu edycji strefy."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:206
  #, php-format
  msgid "Entry name '%s' contains invalid characters."
  msgstr "Nazwa wpisu '%s' zawiera niedozwolone znaki."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
  #, php-format
  msgid "Can not rename '%s' to '%s',the destination name already exists."
  msgstr "Nie można zmienić nazwy z '%s' na '%s', nazwa docelowa już istnieje."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:221
  #, php-format
  msgid "Can not create '%s',the destination name already exists."
  msgstr "Nie można utworzyć '%s', nazwa docelowa już istnieje."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
  #, php-format
  msgid "The name '%s' is used more than once."
  msgstr "Nazwa '%s' jest użyta więcej niż raz."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
-msgstr "Nazwa hosta '%s' powinna zostać wpisana małymi literami."
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
  #, php-format
  msgid "The record type '%s' is a unique type and can't be defined twice."
  msgstr ""
  "Typ rekordu '%s' jest unikalnym typem i nie może być zdefiniowany po raz "
  "drugi."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:260
  #, php-format
  msgid "There is an empty '%s' for host '%s'."
  msgstr "'%s' jest puste dla hosta '%s'."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:268
  #, php-format
  msgid "There is a duplicate entry in '%s' for '%s'."
  msgstr "Istnieje duplikat w '%s' dla '%s'."
@@ -11415,94 +11409,90 @@ msgstr "Pokaż urządzenia sieciowe"
  msgid "Display systems of user"
  msgstr "Wyświetl systemy użytkownika"
  
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:148
  msgid "New Terminal template"
  msgstr "Nowy szablon terminala"
  
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:154
  msgid "New Workstation template"
  msgstr "Nowy szablon stacji roboczej"
  
-#: plugins/admin/systems/class_divListSystem.inc:140
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:160
  msgid "New Server"
  msgstr "Nowy serwer"
  
-#: plugins/admin/systems/class_divListSystem.inc:142
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:166
  msgid "New Printer"
  msgstr "Nowa drukarka"
  
-#: plugins/admin/systems/class_divListSystem.inc:144
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:172
  msgid "New Phone"
  msgstr "Nowy telefon"
  
-#: plugins/admin/systems/class_divListSystem.inc:146
-#: plugins/admin/systems/class_divListSystem.inc:147
+#: plugins/admin/systems/class_divListSystem.inc:178
  msgid "New Component"
  msgstr "Nowy komponent"
  
-#: plugins/admin/systems/class_divListSystem.inc:165
+#: plugins/admin/systems/class_divListSystem.inc:203
  msgid "Cups Server"
  msgstr "Serwer Cups"
  
-#: plugins/admin/systems/class_divListSystem.inc:166
+#: plugins/admin/systems/class_divListSystem.inc:204
  msgid "Log Db"
  msgstr "baza danych Log"
  
-#: plugins/admin/systems/class_divListSystem.inc:167
+#: plugins/admin/systems/class_divListSystem.inc:205
  msgid "Syslog Server"
  msgstr "Serwer syslog"
  
-#: plugins/admin/systems/class_divListSystem.inc:168
+#: plugins/admin/systems/class_divListSystem.inc:206
  msgid "Mail Server"
  msgstr "Serwer poczty"
  
-#: plugins/admin/systems/class_divListSystem.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:207
  msgid "Imap Server"
  msgstr "Serwer imap"
  
-#: plugins/admin/systems/class_divListSystem.inc:170
+#: plugins/admin/systems/class_divListSystem.inc:208
  msgid "Nfs Server"
  msgstr "Serwer Nfs"
  
-#: plugins/admin/systems/class_divListSystem.inc:171
+#: plugins/admin/systems/class_divListSystem.inc:209
  msgid "Kerberos Server"
  msgstr "Serwer Kerberos"
  
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:210
  msgid "Asterisk Server"
  msgstr "Serwer Asterisk"
  
-#: plugins/admin/systems/class_divListSystem.inc:173
+#: plugins/admin/systems/class_divListSystem.inc:211
  msgid "Fax Server"
  msgstr "Serwer Fax"
  
-#: plugins/admin/systems/class_divListSystem.inc:174
+#: plugins/admin/systems/class_divListSystem.inc:212
  msgid "Ldap Server"
  msgstr "Serwer Ldap"
  
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/acl/class_divListACL.inc:123
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/acl/class_divListACL.inc:128
  msgid "Edit system"
  msgstr "Edytuj system"
  
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/acl/class_divListACL.inc:126
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/acl/class_divListACL.inc:132
  msgid "Delete system"
  msgstr "Usuń system"
  
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_divListSystem.inc:308
  msgid "Set root       password"
  msgstr "Ustaw hasło roota"
  
-#: plugins/admin/systems/class_divListSystem.inc:229
+#: plugins/admin/systems/class_divListSystem.inc:315
  #, fuzzy
  msgid "Create CD"
  msgstr "Utwórz"
  
-#: plugins/admin/systems/class_divListSystem.inc:230
+#: plugins/admin/systems/class_divListSystem.inc:316
  #, fuzzy
  msgid "Create FAI CD"
  msgstr "Utwórz nowy obiekt FAI"
@@ -11532,6 +11522,10 @@ msgstr "Wszystkie dostępne usługi są już w użyciu."
  msgid "Cups"
  msgstr "Cups"
  
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr ""
+
  #: plugins/admin/systems/goLdapServer.tpl:1
  #: plugins/admin/systems/class_goLdapServer.inc:28
  msgid "LDAP service"
@@ -11614,6 +11608,15 @@ msgstr "Edytuj usługę"
  msgid "Remove service"
  msgstr "Usuń usługę"
  
+#: plugins/admin/systems/class_goTerminalServer.inc:31
+#: plugins/admin/systems/class_goTerminalServer.inc:54
+#: plugins/admin/systems/class_goTerminalServer.inc:117
+#: plugins/admin/systems/class_goTerminalServer.inc:118
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#: plugins/admin/systems/class_terminalService.inc:467
+msgid "Terminal service"
+msgstr "Usługa Terminali"
+
  #: plugins/admin/systems/class_goTerminalServer.inc:78
  #, fuzzy, php-format
  msgid "Saving server services/terminalServer with dn '%s' failed."
@@ -11628,6 +11631,12 @@ msgstr "Serwer terminali musi posiadać zdefiniowaną ścieżkę fontów."
  msgid "Temporary disable login"
  msgstr "Tymczasowo zablokuj logowanie"
  
+#: plugins/admin/systems/class_goTerminalServer.inc:127
+#: plugins/admin/systems/goTerminalServer.tpl:12
+#: plugins/admin/systems/class_terminalService.inc:478
+msgid "Font path"
+msgstr "Ścieżka do fontów"
+
  #: plugins/admin/systems/class_serverService.inc:288
  msgid "Can't set status while this server is not saved."
  msgstr "Nie można ustawić statusu podczas gdy nie zapisano tego serwera."
@@ -12330,6 +12339,41 @@ msgid ""
  "Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
  msgstr "Polecenie '%s' podane jako ACTION_HOOK dla dodatku '%s' nie istnieje."
  
+#: plugins/admin/systems/class_terminalService.inc:157
+msgid "default"
+msgstr "domyślny"
+
+#: plugins/admin/systems/class_terminalService.inc:457
+#, fuzzy, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr "Zapisywanie ustawień usługi terminala nieudane"
+
+#: plugins/admin/systems/class_terminalService.inc:476
+#: plugins/admin/ogroups/class_phonequeue.inc:748
+msgid "Method"
+msgstr "Metoda"
+
+#: plugins/admin/systems/class_terminalService.inc:484
+msgid "Auto-Sync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:485
+msgid "Printer service enabled"
+msgstr "Usługa drukowania włączona"
+
+#: plugins/admin/systems/class_terminalService.inc:488
+msgid "Scanner model"
+msgstr "Model skanera"
+
+#: plugins/admin/systems/class_terminalService.inc:489
+msgid "Haeh ? "
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:490
+#, fuzzy
+msgid "..."
+msgstr ".."
+
  #: plugins/admin/ogroups/termgroup.tpl:2
  msgid ""
  "Actions you choose here influence all systems in this object group. "
@@ -12353,8 +12397,8 @@ msgstr "Dodaj członka"
  msgid "Phone queue"
  msgstr "Kolejka telefoniczna"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:88
-#: plugins/admin/ogroups/class_termgroup.inc:383
+#: plugins/admin/ogroups/tabs_ogroups.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:382
  msgid "System"
  msgstr "System"
  
@@ -12362,20 +12406,24 @@ msgstr "System"
  msgid "Terminals"
  msgstr "Terminale"
  
-#: plugins/admin/ogroups/class_termgroup.inc:114
+#: plugins/admin/ogroups/class_termgroup.inc:108
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr "Brak uprawnień do tworzenia stacji roboczej w tej 'bazie'."
+
+#: plugins/admin/ogroups/class_termgroup.inc:113
  msgid "There must be at least one NTP server selected."
  msgstr "Musi być wybrany co najmniej jeden serwer NTP."
  
-#: plugins/admin/ogroups/class_termgroup.inc:168
+#: plugins/admin/ogroups/class_termgroup.inc:167
  #, php-format
  msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:376
+#: plugins/admin/ogroups/class_termgroup.inc:375
  msgid "Saving workstation failed"
  msgstr "Zapisywanie stacji roboczej nieudane"
  
-#: plugins/admin/ogroups/class_termgroup.inc:384
+#: plugins/admin/ogroups/class_termgroup.inc:383
  msgid "System group"
  msgstr "Grupa systemowa"
  
@@ -12436,18 +12484,18 @@ msgid "Display objects of department"
  msgstr "Wyświetl obiekty departamentu"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:715
+#: plugins/admin/ogroups/class_ogroup.inc:698
  #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
  msgid "Object groups"
  msgstr "Grupy obiektów"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:159
+#: plugins/admin/ogroups/class_ogroupManagement.inc:154
  #, php-format
  msgid "You're about to delete the object group '%s'."
  msgstr "Zamierzasz usunąć grupę obiektową '%s'."
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:165
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:160
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
  msgid "You are not allowed to delete this object group!"
  msgstr "Brak uprawnień do usunięcia grupy obiektowej."
  
@@ -12455,77 +12503,77 @@ msgstr "Brak uprawnień do usunięcia grupy obiektowej."
  msgid "This 'dn' is no object group."
  msgstr "Ten 'dn' nie jest grupą obiektową."
  
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:290
  msgid "too many different objects!"
  msgstr "za dużo różnych obiektów!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:292
  msgid "users"
  msgstr "użytkownicy"
  
-#: plugins/admin/ogroups/class_ogroup.inc:295
+#: plugins/admin/ogroups/class_ogroup.inc:293
  msgid "groups"
  msgstr "grupy"
  
-#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:294
  msgid "applications"
  msgstr "aplikacje"
  
-#: plugins/admin/ogroups/class_ogroup.inc:297
+#: plugins/admin/ogroups/class_ogroup.inc:295
  msgid "departments"
  msgstr "departamenty"
  
-#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:296
  msgid "servers"
  msgstr "serwery"
  
-#: plugins/admin/ogroups/class_ogroup.inc:299
+#: plugins/admin/ogroups/class_ogroup.inc:297
  msgid "workstations"
  msgstr "stacje robocze"
  
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:298
  msgid "terminals"
  msgstr "terminale"
  
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:299
  msgid "phones"
  msgstr "telefony"
  
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:300
  msgid "printers"
  msgstr "drukarki"
  
-#: plugins/admin/ogroups/class_ogroup.inc:309
+#: plugins/admin/ogroups/class_ogroup.inc:307
  msgid "and"
  msgstr "i"
  
-#: plugins/admin/ogroups/class_ogroup.inc:462
+#: plugins/admin/ogroups/class_ogroup.inc:444
  msgid "Non existing dn:"
  msgstr "Nieistniejące dn:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:604
+#: plugins/admin/ogroups/class_ogroup.inc:586
  msgid "There is already an object with this cn."
  msgstr "Już istnieje obiekt z tym cn."
  
-#: plugins/admin/ogroups/class_ogroup.inc:618
+#: plugins/admin/ogroups/class_ogroup.inc:601
  msgid "You can combine two different object types at maximum only!"
  msgstr "Można połączyć maksymalnie tylko 2 różne typy obiektów!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:667
+#: plugins/admin/ogroups/class_ogroup.inc:650
  #, php-format
  msgid "Saving of object group/generic with dn '%s' failed."
  msgstr "Zapisywanie grupy/podstawowej z dn '%s' nieudane."
  
-#: plugins/admin/ogroups/class_ogroup.inc:680
+#: plugins/admin/ogroups/class_ogroup.inc:663
  #, php-format
  msgid "Removing of object group/generic with dn '%s' failed."
  msgstr "Usuwanie grupy/podstawowej z dn '%s' nieudane."
  
-#: plugins/admin/ogroups/class_ogroup.inc:710
+#: plugins/admin/ogroups/class_ogroup.inc:693
  msgid "Object group generic"
  msgstr "Podstawowa grupa obiektu"
  
-#: plugins/admin/ogroups/class_ogroup.inc:721
+#: plugins/admin/ogroups/class_ogroup.inc:704
  msgid "Member"
  msgstr "Członek"
  
@@ -12775,7 +12823,7 @@ msgstr ""
  "Brak zdefiniowanych serwerów asterisk. Ustawienia nie mogą być zapisane."
  
  #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:307
  #, php-format
  msgid ""
  "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -12789,9 +12837,9 @@ msgstr ""
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:97
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:317
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/macro/class_gofonMacro.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
+#: plugins/gofon/macro/class_gofonMacro.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:318
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:434
  #, php-format
  msgid "Can't select database %s on %s."
  msgstr "Nie można wybrać bazy %s na %s."
@@ -12807,8 +12855,8 @@ msgstr "Nie można usuwać w bazie %s na serwerze %s."
  #: plugins/admin/ogroups/class_phonequeue.inc:537
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1185
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:474
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:476
  #, php-format
  msgid "The specified telephonenumber '%s' is already assigned to '%s'."
  msgstr "Podany numer telefonu '%s' jest już przypisany do '%s'."
@@ -12822,8 +12870,8 @@ msgstr "Zapisywanie grupy/kolejki telefonicznie z dn '%s' nieudane."
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:90
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1067
-#: plugins/gofon/macro/class_gofonMacro.inc:234
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:423
  #, php-format
  msgid ""
  "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -12976,16 +13024,16 @@ msgstr "Zaznacz aby zobaczyć grupy zawierające telefony"
  msgid "Show groups containing phones"
  msgstr "Pokaż grupy zawierające telefony"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
  msgid "Create new object group"
  msgstr "Utwórz nową grupę obiektów"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:207
  #, fuzzy
  msgid "You are not allowed to remove this entry."
  msgstr "Brak uprawnień do usunięcia tego elementu!"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:218
+#: plugins/admin/ogroups/class_divListOGroup.inc:222
  #: plugins/generic/references/class_reference.inc:50
  msgid "Object group"
  msgstr "Grupa obiektu"
@@ -12999,16 +13047,31 @@ msgstr "Proszę podać nową nazwę."
  msgid "ACLs"
  msgstr "ACLe"
  
-#: plugins/admin/acl/class_aclManagement.inc:159
+#: plugins/admin/acl/class_aclManagement.inc:122
+#, fuzzy
+msgid "You are not allowed to edit this acl."
+msgstr "Brak uprawnień do usunięcia  tego ACL!"
+
+#: plugins/admin/acl/class_aclManagement.inc:167
  #, php-format
  msgid "You're about to delete the acl %s."
  msgstr "Zamierzasz usunąć ACL '%s'."
  
-#: plugins/admin/acl/class_aclManagement.inc:165
-#: plugins/admin/acl/class_aclManagement.inc:191
+#: plugins/admin/acl/class_aclManagement.inc:173
+#: plugins/admin/acl/class_aclManagement.inc:198
  msgid "You are not allowed to delete this acl!"
  msgstr "Brak uprawnień do usunięcia  tego ACL!"
  
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430
+#, fuzzy
+msgid "Access control list"
+msgstr "Kontrola dostępu"
+
+#: plugins/admin/acl/class_aclManagement.inc:433
+msgid "I don't know Jack"
+msgstr ""
+
  #: plugins/admin/acl/class_divListACL.inc:31
  msgid "List of acl"
  msgstr "Lista ACL"
@@ -13021,30 +13084,14 @@ msgstr "Lista ACLi"
  msgid "This menu allows you to edit and delete selected acls."
  msgstr "To menu umożliwia dodawanie, edycję i kasowanie wybranych ACL."
  
-#: plugins/admin/acl/class_divListACL.inc:61
+#: plugins/admin/acl/class_divListACL.inc:60
  msgid "Display acls matching"
  msgstr "Wyświetl ACL pasujące"
  
-#: plugins/admin/acl/class_divListACL.inc:109
+#: plugins/admin/acl/class_divListACL.inc:115
  msgid "Acl"
  msgstr "ACL"
  
-#: plugins/admin/acl/class_divListACL.inc:153
-msgid "Select to display users"
-msgstr "Zaznacz aby wyświetlić użytkownika"
-
-#: plugins/admin/acl/class_divListACL.inc:153
-msgid "Display user"
-msgstr "Wyświetl użytkownika"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-msgid "Select to display departments"
-msgstr "Zaznacz aby wyświetlić departamenty"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-msgid "Display departments"
-msgstr "Wyświetl departamenty"
-
  #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
  msgid "ACL management"
  msgstr "Zarządzanie ACL"
@@ -13069,33 +13116,35 @@ msgstr "Wybierz zmienną do usunięcia lub edycji"
  msgid "Fully Automatic Installation"
  msgstr "Fully Automatic Installation"
  
-#: plugins/admin/fai/class_faiScript.inc:422
+#: plugins/admin/fai/class_faiScript.inc:433
  #, php-format
  msgid "Creating of FAI/script with dn '%s' failed."
  msgstr "Tworzenie FAI/skryptu z dn '%s' nieudane."
  
-#: plugins/admin/fai/class_faiScript.inc:519
+#: plugins/admin/fai/class_faiScript.inc:530
  #: plugins/admin/fai/class_faiHookEntry.inc:191
  msgid "FAI script"
  msgstr "Skrypt FAI"
  
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
+#: plugins/admin/fai/class_faiPackage.inc:539
+#: plugins/admin/fai/class_faiPackage.inc:542
  #, fuzzy
  msgid "Readonly"
  msgstr "Odczyt"
  
-#: plugins/admin/fai/class_faiTemplate.inc:401
+#: plugins/admin/fai/class_faiTemplate.inc:414
  #, php-format
  msgid "Saving of FAI/template with dn '%s' failed."
  msgstr "Zapisywanie FAI/szablonu z dn '%s' nieudane."
  
-#: plugins/admin/fai/class_faiTemplate.inc:487
+#: plugins/admin/fai/class_faiTemplate.inc:500
  msgid "FAI template"
  msgstr "Szablon FAI"
  
  #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:853
+#: plugins/admin/fai/class_faiManagement.inc:863
  msgid "FAI"
  msgstr "FAI"
  
@@ -13137,18 +13186,18 @@ msgstr "Podana nazwa zamrożenia jest niepoprawna."
  msgid "You are not allowed to create a new branch."
  msgstr "Brak uprawnień do zmiany przekazywania poczty"
  
-#: plugins/admin/fai/class_faiManagement.inc:506
-#: plugins/admin/fai/class_faiManagement.inc:522
+#: plugins/admin/fai/class_faiManagement.inc:516
+#: plugins/admin/fai/class_faiManagement.inc:532
  #, fuzzy, php-format
  msgid "You are not allowed to create a new '%s' object."
  msgstr "Brak uprawnień do usunięcia grupy obiektowej."
  
-#: plugins/admin/fai/class_faiManagement.inc:847
+#: plugins/admin/fai/class_faiManagement.inc:857
  #, fuzzy
  msgid "FAI releases"
  msgstr "Klasy FAI"
  
-#: plugins/admin/fai/class_faiManagement.inc:848
+#: plugins/admin/fai/class_faiManagement.inc:858
  #, fuzzy
  msgid "FAI release management"
  msgstr "Zarządzanie FAI"
@@ -13170,11 +13219,11 @@ msgstr "Użyte pakiety"
  msgid "Choosen packages"
  msgstr "Wybrane pakiety"
  
-#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:674
  msgid "Configure"
  msgstr "Konfiguruj"
  
-#: plugins/admin/fai/faiPackage.tpl:80
+#: plugins/admin/fai/faiPackage.tpl:87
  msgid "Toggle remove flag"
  msgstr "Przełącz flagę usuwania"
  
@@ -13357,7 +13406,7 @@ msgstr "Zestaw pakietów"
  #: plugins/admin/fai/class_faiProfile.inc:298
  #: plugins/admin/fai/class_faiPartitionTable.inc:520
  #: plugins/admin/fai/class_faiProfileEntry.inc:140
-#: plugins/admin/fai/class_faiSummaryTab.inc:45
+#: plugins/admin/fai/class_faiSummaryTab.inc:48
  msgid "Partition table"
  msgstr "Tablica partycji"
  
@@ -13406,59 +13455,64 @@ msgstr "Zaczep FAI"
  
  #: plugins/admin/fai/class_faiHook.inc:535
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #, fuzzy
  msgid "Read only"
  msgstr "Odczyt"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  msgid "primary"
  msgstr "podstawowa"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  msgid "logical"
  msgstr "logiczna"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
  msgid "FS type"
  msgstr "Typ FS"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
-#: plugins/admin/fai/class_faiSummaryTab.inc:317
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:468
+#: plugins/admin/fai/class_faiSummaryTab.inc:344
  msgid "Mount point"
  msgstr "Punkt montowania"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
-#: plugins/admin/fai/class_faiSummaryTab.inc:316
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:343
  msgid "Size in MB"
  msgstr "Rozmiar w MB"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
-#: plugins/admin/fai/class_faiSummaryTab.inc:315
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:470
+#: plugins/admin/fai/class_faiSummaryTab.inc:342
  msgid "Mount options"
  msgstr "Opcje montowania"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
  msgid "FS option"
  msgstr "Opcje systemu plików"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
  msgid "Preserve"
  msgstr "Zachowaj"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:368
+#, fuzzy
+msgid "Please specify a valid disc name."
+msgstr "Proszę podać prawidłową nazwę skryptu."
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
  #, php-format
  msgid "please enter a unique mount point for partition %s"
  msgstr "proszę podać unikalny punkt montowania dla partycji %s"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
  #, php-format
  msgid "Please enter a valid mount point for partition %s."
  msgstr "Proszę podać poprawny punkt montowania dla partycji %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:401
  #, php-format
  msgid ""
  "File system type 'swap' is already used, change file system type for "
@@ -13467,30 +13521,30 @@ msgstr ""
  "Typ systemu plików 'swap' jest już użyty. Zmień system plików dla partycji %"
  "s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:405
  msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
  msgstr ""
  "Proszę użyć 'swap' jako punkt montowania w przypadku użycia systemu plików "
  "'swap'."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:411
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:415
  #, php-format
  msgid "Please enter a valid partition size for partition %s."
  msgstr "Proszę podać poprawny rozmiar partycji dla partycji %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:412
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:421
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:423
  #, php-format
  msgid "Please enter a valid range for partition %s."
  msgstr "Proszę podać prawidłowy zasięg dla partycji %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:428
  #, php-format
  msgid "Please enter a range for partition size for partition %s."
  msgstr "Proszę podać zasięg dla rozmiaru partycji %s."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:434
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:443
  msgid ""
  "You have more than 3 primary partition table entries in your configuration, "
  "please check your configuration twice."
@@ -13498,37 +13552,37 @@ msgstr ""
  "Jest więcej niż 3 wpisy w podstawowej tablicy partycji. Proszę sprawdzić "
  "konfigurację."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:446
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
  #, fuzzy
  msgid "Partition table entry"
  msgstr "Tablica partycji"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
  #, fuzzy
  msgid "FAI partition table entry"
  msgstr "Tablica partycji FAI"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:465
  msgid "Partition type"
  msgstr "Typ partycji"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:466
  msgid "Partition no."
  msgstr "Nr. Partycji"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:467
  msgid "File system type"
  msgstr "Typ systemu plików"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:469
  msgid "Partition size"
  msgstr "Rozmiar partycji"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:471
  msgid "File system options"
  msgstr "Opcje systemu plików"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:472
  msgid "Partition flags"
  msgstr "Flagi partycji"
  
@@ -13726,12 +13780,12 @@ msgstr "Wybierz nazwę klasy"
  msgid "A new class name."
  msgstr "Nowa nazwa klasy"
  
-#: plugins/admin/fai/class_faiVariable.inc:334
+#: plugins/admin/fai/class_faiVariable.inc:330
  #, php-format
  msgid "Saving of FAI/variable with dn '%s' failed."
  msgstr "Zapisywanie FAI/zmiennej z dn '%s' nieudane."
  
-#: plugins/admin/fai/class_faiVariable.inc:413
+#: plugins/admin/fai/class_faiVariable.inc:409
  msgid "FAI variable"
  msgstr "Zmienna FAI"
  
@@ -13807,7 +13861,7 @@ msgid "Destination path"
  msgstr "Ścieżka docelowa"
  
  #: plugins/admin/fai/faiTemplateEntry.tpl:74
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:577
  #: plugins/gofon/conference/class_divListConferences.inc:53
  msgid "Owner"
  msgstr "Właściciel"
@@ -13971,35 +14025,36 @@ msgstr ""
  "Proszę upewnić się czy na pewno wykonać operację, gdyż nie ma możliwości "
  "powrotu."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:41
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
  msgid "Scripts"
  msgstr "Skrypty"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:46
+#: plugins/admin/fai/class_faiSummaryTab.inc:49
  msgid "Package list"
  msgstr "Lista pakietów"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:86
+msgid ""
+"Unknown type of FAI source information. This is not a profile, workstation "
+"nor a ogroup."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:217
  msgid "This object has no FAI classes assigned."
  msgstr "Ten obiekt nie ma przypisanych klas FAI."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:203
+#: plugins/admin/fai/class_faiSummaryTab.inc:230
  msgid "Open"
  msgstr "Otwórz"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:312
+#: plugins/admin/fai/class_faiSummaryTab.inc:339
  msgid "No."
  msgstr "Nie."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:314
+#: plugins/admin/fai/class_faiSummaryTab.inc:341
  msgid "FS options"
  msgstr "Opcje systemu plików"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:553
-#, fuzzy
-msgid "Viewable"
-msgstr "Zmienna"
-
  #: plugins/admin/fai/branch_selector.tpl:21
  msgid "Create new branch"
  msgstr "Utwórz nową gałąź"
@@ -14085,90 +14140,90 @@ msgstr "Wyświetl partycje FAI"
  msgid "Show partitions"
  msgstr "Pokaż partycje"
  
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "New profile"
  msgstr "Nowy profil"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "New partition table"
  msgstr "Nowa tablica partycji"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "PT"
  msgstr "PT"
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "New scripts"
  msgstr "Nowe skrypty"
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "S"
  msgstr "S"
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "New hooks"
  msgstr "Nowe zaczepy"
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "H"
  msgstr "H"
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "New variables"
  msgstr "Nowe zmienne"
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "V"
  msgstr "V"
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "New templates "
  msgstr "Nowe szablony"
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "I"
  msgstr "NI"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "New package list"
  msgstr "Nowa lista pakietów"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "PK"
  msgstr "PK"
  
-#: plugins/admin/fai/class_divListFai.inc:242
-#: plugins/admin/fai/class_divListFai.inc:245
+#: plugins/admin/fai/class_divListFai.inc:240
+#: plugins/admin/fai/class_divListFai.inc:243
  msgid "Edit class"
  msgstr "Edytuj klasę"
  
-#: plugins/admin/fai/class_divListFai.inc:253
+#: plugins/admin/fai/class_divListFai.inc:251
  msgid "Delete class"
  msgstr "Usuń klasę"
  
-#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/generic.tpl:12
  #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:180
  msgid "Mime type"
  msgstr "Typ mime"
  
-#: plugins/admin/mimetypes/generic.tpl:17
+#: plugins/admin/mimetypes/generic.tpl:16
  #: plugins/admin/mimetypes/paste_generic.tpl:16
  msgid "Please enter a name for the mime type here"
  msgstr "Proszę podać nazwę typu mime"
  
-#: plugins/admin/mimetypes/generic.tpl:23
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:673
+#: plugins/admin/mimetypes/generic.tpl:22
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:681
  msgid "Mime group"
  msgstr "Grupa mime"
  
-#: plugins/admin/mimetypes/generic.tpl:27
+#: plugins/admin/mimetypes/generic.tpl:26
  msgid "Categorize this mime type"
  msgstr "Skategoryzuj ten typ mime"
  
-#: plugins/admin/mimetypes/generic.tpl:39
+#: plugins/admin/mimetypes/generic.tpl:38
  msgid "Please specify a description"
  msgstr "Proszę podać opis"
  
@@ -14186,7 +14241,7 @@ msgid "Left click"
  msgstr ""
  
  #: plugins/admin/mimetypes/generic.tpl:99
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:679
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:687
  msgid "File patterns"
  msgstr "Wzorce pliku"
  
@@ -14224,55 +14279,51 @@ msgstr "Pokaż plik w zewnętrznej przeglądarce"
  msgid "Ask whether to save to local disk"
  msgstr "Pytaj czy zapisać na dysk"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:461
  #, php-format
  msgid "Saving of mime type/generic with dn '%s' failed."
  msgstr "Zapisywanie typu mime z dn '%s' nieudane."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:452
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:470
  #, php-format
  msgid "Removing of mime type/generic with dn '%s' failed."
  msgstr "Usuwanie typu mime z dn '%s' nieudane."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:464
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:482
  #, php-format
  msgid "Removing mime type from objectgroup '%s' failed"
  msgstr "Usuwanie typu mime z grupy obiektów '%s' nieudane"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:474
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:492
  msgid "Please specify a valid name for this mime type."
  msgstr "Proszę podać prawidłową nazwę dla tego typu mime."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:477
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:495
  msgid "Please specify at least one file pattern."
  msgstr "Proszę podać conajmniej jeden wzorzec pliku."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:490
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:508
  msgid "There's already a mime type with this 'Name'."
  msgstr "Już istnieje typ mime o takiej 'Nazwie'"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:498
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:516
  msgid "There's already an mime with this 'Name'."
  msgstr "Już istnieje mime o takiej 'Nazwie'"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:510
-msgid "You have no permissions to create a mime type on this 'Base'."
-msgstr "Brak uprawnień do tworzenia typu mime w tej lokalizacji."
-
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
  msgid "Mime type generic"
  msgstr "Typ mime podstawowy"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
  #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
  msgid "Mime types"
  msgstr "Typy mime"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:685
  msgid "Left click action"
  msgstr "Akcja lewego kliknięcia"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:688
  msgid "Embedded applications"
  msgstr "Osadzone aplikacje"
  
@@ -14280,13 +14331,13 @@ msgstr "Osadzone aplikacje"
  msgid "Manage mime types"
  msgstr "Zarządzaj typami mime"
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:276
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:278
  #, php-format
  msgid "You're about to delete the mime type '%s'."
  msgstr "Zamierzasz usunąć typ mime '%s'."
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:282
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:311
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:313
  msgid "You are not allowed to delete this mime type!"
  msgstr "Brak uprawnień do usunięcia tego typu mime!"
  
@@ -14317,7 +14368,7 @@ msgstr "Nazwa typu mime"
  msgid "Display mime types matching"
  msgstr "Wyświetl pasujące typy mime"
  
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:140
  msgid "Create new mime type"
  msgstr "Utwórz nowy typ mime"
  
@@ -14351,7 +14402,7 @@ msgstr "niezdefiniowany"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:658
  #: plugins/gofon/macro/class_gofonMacro.inc:95
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:286
  msgid ""
  "There is currently no asterisk server defined. Possibly you are missing a "
  "server that handles the asterisk management (goFonServer). Your settings "
@@ -14485,20 +14536,25 @@ msgstr "Usuwanie konta telefonicznego z dn '%s' nieudane"
  msgid "Phone account settings"
  msgstr "Ustawienia konta telefonicznego"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1237
+#, fuzzy
+msgid "GOfon reports"
+msgstr "Raporty telefoniczne"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:576
  msgid "Telephone number"
  msgstr "Numer telefonu"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1242
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
  msgid "Macro settings"
  msgstr "Ustawienia makra"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1246
  msgid "Telephone pin"
  msgstr "PIN Telefonu"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1247
  msgid "Voicemail pin"
  msgstr "PIN poczty głosowej"
  
@@ -14538,7 +14594,7 @@ msgid "Regular expression for matching macro names"
  msgstr "Wyrażenie regularne dla dopasowania nazw makr"
  
  #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
-#: plugins/gofon/macro/class_gofonMacro.inc:483
+#: plugins/gofon/macro/class_gofonMacro.inc:496
  msgid "Macro name"
  msgstr "Nazwa makra"
  
@@ -14558,13 +14614,13 @@ msgstr "Tekst makro"
  msgid "Phone macros"
  msgstr "Makra telefoniczne"
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:207
  #, php-format
  msgid "You're about to delete the macro '%s'."
  msgstr "Zamierzasz usunąć makro '%s'."
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:214
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:213
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
  msgid "You are not allowed to delete this macro!"
  msgstr "Brak uprawnień do usunięcia  tego makro!"
  
@@ -14573,7 +14629,7 @@ msgstr "Brak uprawnień do usunięcia  tego makro!"
  msgid "This 'dn' is no phone macro."
  msgstr "Ten 'dn' nie jest makrem telefonu."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:185
+#: plugins/gofon/macro/class_gofonMacro.inc:183
  msgid ""
  "This macro ist still in use. To delete this Macro ensure that nobody has "
  "selected this Macro."
@@ -14581,14 +14637,14 @@ msgstr ""
  "To makro jest wciąż używane. Aby je usunąć upewnij się że nikt nie zaznaczył "
  "tego Makra."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: plugins/gofon/macro/class_gofonMacro.inc:190
+#: plugins/gofon/macro/class_gofonMacro.inc:205
  #: plugins/gofon/macro/class_gofonMacroParameters.inc:402
  #, php-format
  msgid "Removing of goFonMacro/generic account with dn '%s' failed."
  msgstr "Usuwanie konta goFonMakro z dn '%s'  nieudane."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:220
+#: plugins/gofon/macro/class_gofonMacro.inc:218
  msgid ""
  "There is no mysql extension available in your php setup, can't save any "
  "changes to asterisk db."
@@ -14596,63 +14652,69 @@ msgstr ""
  "Brak wsparcia dla mysql w ustawieniach php. Nie można zapisać żadnych zmian "
  "w bazie asterisk."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:290
+#: plugins/gofon/macro/class_gofonMacro.inc:288
  #, php-format
  msgid "Unable to parse macro contents on line: %s"
  msgstr "Nie można sparsować makro w linii: %s"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:308
+#: plugins/gofon/macro/class_gofonMacro.inc:306
  #, php-format
  msgid "Can't perform SELECT query in DB '%s'"
  msgstr "Nie można wykonać zapytania SELECT w bazie '%s'"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:317
-#: plugins/gofon/macro/class_gofonMacro.inc:325
+#: plugins/gofon/macro/class_gofonMacro.inc:315
+#: plugins/gofon/macro/class_gofonMacro.inc:323
  #, php-format
  msgid "Can't perform DELETE query in DB '%s'"
  msgstr "Nie można wykonać zapytania DELETE w bazie '%s'"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:339
+#: plugins/gofon/macro/class_gofonMacro.inc:337
  #, php-format
  msgid "Can't perform INSERT query in DB '%s'"
  msgstr "Nie można wykonać zapytanie INSERT w bazie '%s'"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:405
+#: plugins/gofon/macro/class_gofonMacro.inc:417
  #, php-format
  msgid "The given cn '%s' already exists."
  msgstr "Podane cn '%s' już istnieje."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:422
  msgid "You must specify the 'Display Name' in order to save this macro"
  msgstr "Należy podać 'Nazwa wyświetlana' aby zapisać to makro"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:414
+#: plugins/gofon/macro/class_gofonMacro.inc:426
  msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
  msgstr ""
  "Podane cn jest zbyt długie aby utworzyć wpis Makro, maksimum 20 znaków."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:418
+#: plugins/gofon/macro/class_gofonMacro.inc:430
  msgid "Makro length must be lower than 100 lines"
  msgstr "Długość makro musi być mniejsza niż 100 linii"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:423
+#: plugins/gofon/macro/class_gofonMacro.inc:435
  msgid "Please choose a valid  base."
  msgstr "Proszę wybrać poprawną bazę"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:478
  #, php-format
  msgid "Saving of goFonMacro/generic account with dn '%s' failed."
  msgstr "Zapisywanie konta goFonMacro z dn '%s' nieudane."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/macro/class_gofonMacro.inc:487
  msgid "Asterisk macro management"
  msgstr "Zarządzanie makro Asterisk"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:487
-msgid "Macro content"
+#: plugins/gofon/macro/class_gofonMacro.inc:492
+#, fuzzy
+msgid "GOfon macro"
+msgstr "brak makra"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:500
+#, fuzzy
+msgid "Macro content and parameter"
  msgstr "Zawartość makro"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:488
+#: plugins/gofon/macro/class_gofonMacro.inc:501
  msgid "Visibility flag"
  msgstr "Flaga widoczności"
  
@@ -14711,32 +14773,30 @@ msgstr "Nazwa makra"
  msgid "Visible"
  msgstr "Widoczne"
  
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "Create new phone macro"
  msgstr "Utwórz nowe makro telefonu"
  
-#: plugins/gofon/macro/class_divListMacros.inc:132
-#: plugins/gofon/macro/class_divListMacros.inc:160
-msgid "Edit macro"
-msgstr "Edytuj makro"
-
-#: plugins/gofon/macro/class_divListMacros.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:168
-msgid "Delete macro"
-msgstr "Usuń makro"
-
-#: plugins/gofon/macro/class_divListMacros.inc:137
+#: plugins/gofon/macro/class_divListMacros.inc:124
  msgid "Macro"
  msgstr "Makro"
  
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  msgid "visible"
  msgstr "widoczne"
  
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  msgid "invisible"
  msgstr "niewidoczne"
  
+#: plugins/gofon/macro/class_divListMacros.inc:147
+msgid "Edit macro"
+msgstr "Edytuj makro"
+
+#: plugins/gofon/macro/class_divListMacros.inc:155
+msgid "Delete macro"
+msgstr "Usuń makro"
+
  #: plugins/gofon/conference/headpage.tpl:6
  #: plugins/gofon/conference/class_divListConferences.inc:31
  #: plugins/gofon/conference/class_divListConferences.inc:32
@@ -14775,7 +14835,7 @@ msgid "Lifetime (in days)"
  msgstr "Wiek (w dniach)"
  
  #: plugins/gofon/conference/generic.tpl:137
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:566
  msgid "Preset PIN"
  msgstr "Prekonfiturowany PIN"
  
@@ -14785,7 +14845,7 @@ msgid "PIN"
  msgstr "PIN"
  
  #: plugins/gofon/conference/generic.tpl:157
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
  msgid "Record conference"
  msgstr "Nagrywanie konferencji"
  
@@ -14794,7 +14854,7 @@ msgid "Sound file format"
  msgstr "Format pliku dźwiękowego"
  
  #: plugins/gofon/conference/generic.tpl:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:568
  msgid "Play music on hold"
  msgstr "Odtwarzaj muzykę podczas zawieszenia"
  
@@ -14823,30 +14883,30 @@ msgstr "Zarządzanie"
  msgid "Removing of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:252
  msgid ""
  "You have specified a conference 'without PIN' ... please leave the PIN "
  "fields empty."
  msgstr "Wybrano konferencję 'bez PINu'... proszę pozostawić pola PIN puste."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
  msgid "Please enter a PIN."
  msgstr "Proszę wpisać PIN."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:260
  msgid "Please enter a name for the conference."
  msgstr "Proszę podać nazwę konferencji."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:251
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:264
  msgid "Only numeric chars are allowed in Number field."
  msgstr "Tylko cyfry są dozwolone w polu Numer."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:268
  msgid "Only numbers are allowed in Lifetime."
  msgstr "Tylko liczby są dozwolone w okresie życia"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:298
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:408
  msgid ""
  "Can't save any changes to asterisk database, there is currently no mysql "
  "extension available in your php setup."
@@ -14854,49 +14914,50 @@ msgstr ""
  "Nie można zapisać zmian do bazy asterisk. Brak funkcjonalnosci mysql w "
  "ustawieniach php."
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
  #, php-format
  msgid "Saving of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
-#: plugins/gofon/conference/class_divListConferences.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_divListConferences.inc:198
  msgid "Conference"
  msgstr "Konferencja"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:552
  msgid "Phone conference management"
  msgstr "Zarządzanie konferencją telefoniczną"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
-msgid "GOfon"
-msgstr "GOfon"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#, fuzzy
+msgid "GOfon conference"
+msgstr "Konferencje telefoniczne"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
  msgid "Conference PIN"
  msgstr "PIN Konferencji"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:569
  msgid "Activate menu"
  msgstr "Aktywuj menu"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:570
  msgid "Announce user activity"
  msgstr "Zapowiadaj aktywność użytkownika"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:571
  msgid "Count user"
  msgstr "Zlicz użytkownika"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:572
  msgid "Conference type"
  msgstr "Typ konferencji"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:574
  msgid "Format"
  msgstr "format"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:575
  msgid "Lifetime"
  msgstr "Wiek"
  
@@ -14912,43 +14973,43 @@ msgstr "Nazwa - Numer"
  msgid "Regular expression for matching conference names"
  msgstr "Wyrażenie regularne dla dopasowania nazw konferencji"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  msgid "Create new conference"
  msgstr "Utwórz nową konferencję"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  msgid "New conference"
  msgstr "Nowa konferencja"
  
-#: plugins/gofon/conference/class_divListConferences.inc:196
+#: plugins/gofon/conference/class_divListConferences.inc:192
  #: include/class_pluglist.inc:145 include/class_pluglist.inc:146
  #: include/class_pluglist.inc:245
  msgid "Unknown"
  msgstr "Nieznane"
  
  #: plugins/gofon/fonreports/contents.tpl:31
-#: plugins/gofon/fonreports/class_fonreport.inc:399
+#: plugins/gofon/fonreports/class_fonreport.inc:400
  msgid "Source"
  msgstr "Źródło"
  
  #: plugins/gofon/fonreports/contents.tpl:32
-#: plugins/gofon/fonreports/class_fonreport.inc:400
+#: plugins/gofon/fonreports/class_fonreport.inc:401
  msgid "Destination"
  msgstr "Cel"
  
  #: plugins/gofon/fonreports/contents.tpl:33
-#: plugins/gofon/fonreports/class_fonreport.inc:401
+#: plugins/gofon/fonreports/class_fonreport.inc:402
  msgid "Channel"
  msgstr "Kanał"
  
  #: plugins/gofon/fonreports/contents.tpl:36
-#: plugins/gofon/fonreports/class_fonreport.inc:404
+#: plugins/gofon/fonreports/class_fonreport.inc:405
  msgid "Duration"
  msgstr "Czas trwania"
  
  #: plugins/gofon/fonreports/main.inc:16
-#: plugins/gofon/fonreports/class_fonreport.inc:389
  #: plugins/gofon/fonreports/class_fonreport.inc:390
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  msgid "Phone reports"
  msgstr "Raporty telefoniczne"
  
@@ -14970,12 +15031,12 @@ msgstr "Nie można wybrać bazy telefonów aby generować raport!"
  msgid "Query for phone database failed!"
  msgstr "Zapytanie do bazy telefonów nieudane!"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:402
+#: plugins/gofon/fonreports/class_fonreport.inc:403
  #, fuzzy
  msgid "Application called"
  msgstr "Nazwa aplikacji"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:403
+#: plugins/gofon/fonreports/class_fonreport.inc:404
  #, fuzzy
  msgid "Disposition"
  msgstr "Rozłączenie"
@@ -15027,7 +15088,7 @@ msgstr "Witaj %s!"
  msgid "Generating this page caused the PHP interpreter to raise some errors!"
  msgstr "Tworzenie tej strony spowodowało, że interpreter PHP zwrócił błędy!"
  
-#: include/php_setup.inc:71 html/main.php:388
+#: include/php_setup.inc:71
  msgid "Toggle information"
  msgstr "Przełącz informacje"
  
@@ -15051,15 +15112,15 @@ msgstr "statyczna"
  msgid "method"
  msgstr "metoda"
  
-#: include/php_setup.inc:129
+#: include/php_setup.inc:135
  msgid "Trace"
  msgstr "Śledzenie"
  
-#: include/php_setup.inc:130
+#: include/php_setup.inc:136
  msgid "Line"
  msgstr "Linia"
  
-#: include/php_setup.inc:131
+#: include/php_setup.inc:137
  msgid "Arguments"
  msgstr "Argumenty"
  
@@ -15146,7 +15207,7 @@ msgstr ""
  msgid "incomplete"
  msgstr "niepełne"
  
-#: include/functions.inc:1046 include/functions.inc:1233
+#: include/functions.inc:1046 include/functions.inc:1202
  msgid "LDAP error:"
  msgstr "błąd LDAP:"
  
@@ -15192,19 +15253,19 @@ msgstr ""
  "Zamierzasz edytować wpis LDAP '%s' który wydaje się być używany przez '%s'. "
  "Proszę skontaktować się z osobą aby wyjaśnić postępowanie."
  
-#: include/functions.inc:1415
+#: include/functions.inc:1384
  msgid "Entries per page"
  msgstr "Wpisów na stronie"
  
-#: include/functions.inc:1443
+#: include/functions.inc:1412
  msgid "Apply filter"
  msgstr "Zastosuj filtr"
  
-#: include/functions.inc:1717
+#: include/functions.inc:1686
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  
-#: include/functions.inc:1760
+#: include/functions.inc:1729
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr "Wersja deweloperska GOsa (Rev %s)"
@@ -15213,7 +15274,7 @@ msgstr "Wersja deweloperska GOsa (Rev %s)"
  msgid "Warning: Account has an invalid mailserver string!"
  msgstr "Uwaga: Konto posiada nieprawidłową nazwę serwera pocztowego!"
  
-#: include/class_mail-methods-cyrus.inc:53
+#: include/class_mail-methods-cyrus.inc:58
  msgid ""
  "Warning: IMAP Server cannot be reached! If you save this account, some mail "
  "settings will not be stored on your server!"
@@ -15221,46 +15282,46 @@ msgstr ""
  "Uwaga: serwer IMAP jest niedostępny! Jeśli zapiszesz to konto, pewne "
  "ustawienia poczty nie zostaną zachowane na serwerze!"
  
-#: include/class_mail-methods-cyrus.inc:151
+#: include/class_mail-methods-cyrus.inc:156
  #, php-format
  msgid "Can't create IMAP mailbox. Server says '%s'."
  msgstr "Nie można utworzyć konta IMAP. Odpowiedź serwera '%s'."
  
-#: include/class_mail-methods-cyrus.inc:170
+#: include/class_mail-methods-cyrus.inc:175
  #, php-format
  msgid "Can't write IMAP quota. Server says '%s'."
  msgstr "Nie można zapisać quoty IMAP. Odpowiedź serwera '%s'."
  
-#: include/class_mail-methods-cyrus.inc:196
+#: include/class_mail-methods-cyrus.inc:201
  msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
  msgstr ""
  "Uwaga: imap_getacl nie jest zaimplementowane nie można usunąć informacji acl."
  
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:219
  msgid "Warning: imap_getacl is not available, can't get imap permissions!"
  msgstr "Uwaga: imap_getacl nie jest dostępne, nie można pobrać uprawnień imap!"
  
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_mail-methods-cyrus.inc:241
  #, php-format
  msgid "Can't remove IMAP mailbox. Server says '%s'."
  msgstr "Nie można usunąć konta IMAP. Odpowiedź serwera '%s'."
  
-#: include/class_mail-methods-cyrus.inc:264
+#: include/class_mail-methods-cyrus.inc:269
  #, php-format
  msgid "Can't log into SIEVE server. Server says '%s'."
  msgstr "Nie można zalogować się do serwera SIEVE. Odpowiedź serwera '%s'."
  
-#: include/class_mail-methods-cyrus.inc:277
+#: include/class_mail-methods-cyrus.inc:282
  #, php-format
  msgid "Can't get sieve script. Server says '%s'."
  msgstr "Nie można pobrać skryptu sieve. Odpowiedź serwera '%s'."
  
-#: include/class_mail-methods-cyrus.inc:348
+#: include/class_mail-methods-cyrus.inc:353
  #, php-format
  msgid "Can't send sieve script. Server says '%s'."
  msgstr "Nie można wysłać skryptu sieve. Odpowiedź serwera '%s'."
  
-#: include/class_mail-methods-cyrus.inc:352
+#: include/class_mail-methods-cyrus.inc:357
  #, php-format
  msgid "Can't activate GOsa sieve script. Server says '%s'."
  msgstr "Nie można aktywować skryptu sieve. Odpowiedź serwera '%s'."
@@ -15301,7 +15362,7 @@ msgstr "Błąd podczas pobierania źródłowego dn - anulowano!"
  msgid "Unknown FAIstate %s"
  msgstr "Nieznany FAIstate %s"
  
-#: include/class_ldap.inc:705
+#: include/class_ldap.inc:707
  #, php-format
  msgid ""
  "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -15310,17 +15371,17 @@ msgstr ""
  "Automatyczne tworzenie typu '%s' nie jest obecnie wspierane. Proszę "
  "skontaktować się z zespołem GOsa."
  
-#: include/class_ldap.inc:774
+#: include/class_ldap.inc:776
  #, php-format
  msgid "while operating on '%s' using LDAP server '%s'"
  msgstr "podczas działania na '%s' używając serwera LDAP '%s'"
  
-#: include/class_ldap.inc:776
+#: include/class_ldap.inc:778
  #, php-format
  msgid "while operating on LDAP server %s"
  msgstr "podczas połączenia z serwerem LDAP '%s'"
  
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1000
  #, php-format
  msgid ""
  "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -15329,12 +15390,12 @@ msgstr ""
  "To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się "
  "'dn: ...' w linii %s"
  
-#: include/class_ldap.inc:1027
+#: include/class_ldap.inc:1029
  #, php-format
  msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
  msgstr "Błąd podczas importu dn: '%s', proszę sprawdzić LDIF od linii %s !"
  
-#: include/class_ldap.inc:1155
+#: include/class_ldap.inc:1157
  #, php-format
  msgid "Ldap import with dn '%s' failed."
  msgstr "Import LDAP z dn '%s' nieudany."
@@ -15348,61 +15409,57 @@ msgstr "Proces usuwania został anulowany przez dodatek '%s': %s"
  msgid "References"
  msgstr "Zależności"
  
-#: include/class_plugin.inc:420
+#: include/class_plugin.inc:421
  #, php-format
  msgid ""
  "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
  msgstr "Polecenie '%s' podane jako CHECK dla dodatku '%s' nie istnieje."
  
-#: include/class_plugin.inc:601
+#: include/class_plugin.inc:602
  #, php-format
  msgid ""
  "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
  msgstr "Polecenie '%s' podane jako POSTCREATE dla dodatku '%s' nie istnieje."
  
-#: include/class_plugin.inc:635 include/class_password-methods.inc:183
+#: include/class_plugin.inc:636 include/class_password-methods.inc:183
  #, php-format
  msgid ""
  "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
  msgstr "Polecenie '%s', podane jako POSTMODIFY dla dodatku '%s' nie istnieje."
  
-#: include/class_plugin.inc:669
+#: include/class_plugin.inc:670
  #, php-format
  msgid ""
  "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
  msgstr "Polecenie '%s' podane jako POSTREMOVE dla dodatku '%s' nie istnieje."
  
-#: include/class_plugin.inc:977
+#: include/class_plugin.inc:978
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr "Obiekt '%s' jest już zaznaczony"
  
-#: include/class_plugin.inc:984
+#: include/class_plugin.inc:985
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr "Dodawanie znacznika (%s) do obiektu '%s'"
  
-#: include/class_plugin.inc:998 include/class_plugin.inc:1027
+#: include/class_plugin.inc:999 include/class_plugin.inc:1028
  #, php-format
  msgid "Handle object tagging with dn '%s' failed."
  msgstr "Obsługa znakowania obiektu z dn '%s' nieudana."
  
-#: include/class_plugin.inc:1014
+#: include/class_plugin.inc:1015
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr "Usuwanie znacznika z obiektu '%s'"
  
-#: include/class_plugin.inc:1075 include/class_plugin.inc:1121
-#: include/class_plugin.inc:1122
+#: include/class_plugin.inc:1076 include/class_plugin.inc:1122
+#: include/class_plugin.inc:1123
  #, php-format
  msgid "Saving object snapshot with dn '%s' failed."
  msgstr "Zapisywanie obiektu snapshotu w dn '%s' nieudane"
  
-#: include/class_plugin.inc:1137
-msgid "You are not allowed to delete this snapshot!"
-msgstr "Brak uprawnień do usunięcia tego snapshotu!"
-
-#: include/class_plugin.inc:1153
+#: include/class_plugin.inc:1149
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -15411,7 +15468,7 @@ msgstr ""
  "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
  "skonfigurowana w gosa.conf."
  
-#: include/class_plugin.inc:1165
+#: include/class_plugin.inc:1161
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable(s) '%s' is "
@@ -15420,17 +15477,17 @@ msgstr ""
  "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna(e) '%s' nie "
  "jest skonfigurowana w gosa.conf."
  
-#: include/class_plugin.inc:1197
+#: include/class_plugin.inc:1193
  #, php-format
  msgid "Method get available snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1253
+#: include/class_plugin.inc:1249
  #, php-format
  msgid "Method get deleted snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1317 include/class_plugin.inc:1331
+#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
  #, php-format
  msgid "Restore snapshot with dn '%s' failed."
  msgstr "Odtwarzanie snapshot'u z dn '%s' nieudane."
@@ -15529,7 +15586,7 @@ msgid "Can't bind to LDAP. Please contact the system administrator."
  msgstr ""
  "Nie można połączyć się z LDAP. Proszę skontaktować się z administratorem."
  
-#: include/class_config.inc:472
+#: include/class_config.inc:477
  msgid "SID and/or RIDBASE missing in your configuration!"
  msgstr "Brak parametru SID lub/i RIDBASE w konfiguracji!"
  
@@ -16043,7 +16100,7 @@ msgstr ""
  "Nie można spiąć się z podanym serwerem LDAP! Proszę sprawdzić czy jest on "
  "dostępny dla GOsa."
  
-#: include/functions_setup.inc:784
+#: include/functions_setup.inc:792
  #, php-format
  msgid ""
  "You're missing the required attribute '%s' from this formular. Please "
@@ -16076,13 +16133,14 @@ msgstr ""
  msgid "Can't log into LDAP server. Reason was: %s."
  msgstr "Nie można zalogować się do serwera LDAP. Powód: %s."
  
-#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:252
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1092
+#, fuzzy
  msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr "Brak konta administracyjnego dla GOsa, nie można niczym administrować!"
+"User and/or group could not be created, please check your configuration "
+"twice !"
+msgstr ""
+"OpenGroupware: Nie można połączyć się z bazą. Proszę sprawdzić podane "
+"parametry konfiguracji."
  
  #: include/functions_helpviewer.inc:43
  #, php-format
@@ -16143,93 +16201,98 @@ msgstr "Pełne poddrzewo (trwałe)"
  msgid "Use ACL defined in role"
  msgstr "Użyj ACL zdefiniowanego w tej roli"
  
-#: include/class_acl.inc:370
+#: include/class_acl.inc:372
  msgid "Edit ACL"
  msgstr "Edytuj ACL"
  
-#: include/class_acl.inc:371
+#: include/class_acl.inc:373
  msgid "Delete ACL"
  msgstr "Usuń ACL"
  
-#: include/class_acl.inc:408
+#: include/class_acl.inc:410
  msgid "No ACL settings for this category"
  msgstr "Brak ustawień ACL w tej kategorii"
  
-#: include/class_acl.inc:410
+#: include/class_acl.inc:412
  #, php-format
  msgid "Contains ACLs for these objects: %s"
  msgstr "Zawiera ACL'e w tych kategoriach: %s"
  
-#: include/class_acl.inc:415
+#: include/class_acl.inc:417
  msgid "Edit categories ACLs"
  msgstr "Edytuj kategorie ACL'i"
  
-#: include/class_acl.inc:416
+#: include/class_acl.inc:418
  msgid "Clear categories ACLs"
  msgstr "Wyczyść ACL'e kategorii"
  
-#: include/class_acl.inc:455
+#: include/class_acl.inc:457
  #, php-format
  msgid "Edit ACL for '%s', scope is '%s'"
  msgstr "Edytuj ACL dla '%s', zakres to '%s'"
  
-#: include/class_acl.inc:465
+#: include/class_acl.inc:467
  msgid "All objects in current subtree"
  msgstr "Wszystkie obiekty w obecnym poddrzewie"
  
-#: include/class_acl.inc:525 include/class_acl.inc:532
+#: include/class_acl.inc:557 include/class_acl.inc:564
  #, fuzzy
  msgid "Show/Hide Advanced Settings"
  msgstr "Zaawansowane ustawienia telefonu"
  
-#: include/class_acl.inc:550
+#: include/class_acl.inc:582
  msgid "Create objects"
  msgstr "Utwórz obiekty"
  
-#: include/class_acl.inc:551
+#: include/class_acl.inc:583
  msgid "Move objects"
  msgstr "Przenieś obiekty"
  
-#: include/class_acl.inc:552
+#: include/class_acl.inc:584
  msgid "Remove objects"
  msgstr "Usuń obiekty"
  
-#: include/class_acl.inc:554 include/class_acl.inc:560
+#: include/class_acl.inc:586 include/class_acl.inc:592
  msgid "Modifyable by owner"
  msgstr "Modyfikowalne przez właściciela"
  
-#: include/class_acl.inc:557
+#: include/class_acl.inc:589
  msgid "Move object"
  msgstr "Przenieś obiekt"
  
-#: include/class_acl.inc:558
+#: include/class_acl.inc:590
  msgid "Remove object"
  msgstr "Usuń obiekt"
  
-#: include/class_acl.inc:686
+#: include/class_acl.inc:602
+#, fuzzy
+msgid "Complete object"
+msgstr "Utwórz obiekty"
+
+#: include/class_acl.inc:718
  #, php-format
  msgid "Unkown ACL type '%s'. Don't know how to handle it."
  msgstr "Nieznany typ ACL '%s', Nie wiem co z tym zrobic."
  
-#: include/class_acl.inc:726
+#: include/class_acl.inc:758
  #, php-format
  msgid "Unknown entry '%s'!"
  msgstr "Nieznany wpis  '%s'!"
  
-#: include/class_acl.inc:787
+#: include/class_acl.inc:819
  #, php-format
  msgid "Contains settings for these objects: %s"
  msgstr "Zawiera ustawienia dla tych obiektów: %s"
  
-#: include/class_acl.inc:795
+#: include/class_acl.inc:827
  msgid "Members:"
  msgstr "Członkowie:"
  
-#: include/class_acl.inc:801
+#: include/class_acl.inc:833
  msgid "ACL is valid for all users"
  msgstr "ACL jest prawidłowy dla wszystkich użytkowników"
  
-#: include/class_acl.inc:909
+#: include/class_acl.inc:941
  #, php-format
  msgid "Saving ACLs with dn '%s' failed."
  msgstr "Zapisywanie ACL w dn '%s' nieudane."
@@ -16238,31 +16301,31 @@ msgstr "Zapisywanie ACL w dn '%s' nieudane."
  msgid "This package has no debconf options."
  msgstr "Ten pakiet nie ma opcji debconf."
  
-#: include/class_MultiSelectWindow.inc:400
+#: include/class_MultiSelectWindow.inc:458
  msgid ""
  "Error: The requested subtree has an inconsistent DN encoding, check your "
  "LDAP!"
  msgstr ""
  "Błąd: żądanie poddrzewo zawiera niespójne kodowanie w DN, sprawdź LDAP!"
  
-#: include/class_MultiSelectWindow.inc:504
+#: include/class_MultiSelectWindow.inc:567
  msgid "Restore snapshopts of already deleted objects"
  msgstr "Otwórz snapshoty usuniętych obiektów"
  
-#: include/class_MultiSelectWindow.inc:505
+#: include/class_MultiSelectWindow.inc:568
  msgid "Restore"
  msgstr "Odtwórz"
  
-#: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:106
+#: include/class_MultiSelectWindow.inc:586
+#: include/class_SnapShotDialog.inc:113
  msgid "Restore snapshot"
  msgstr "Odtwórz snapshot"
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  msgid "Create snapshot"
  msgstr "Utwórz spanshot"
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  msgid "Create a new snapshot from this object"
  msgstr "Utwórz nowy snapshot z tego obiektu"
  
@@ -16282,43 +16345,54 @@ msgstr ""
  "Znaleziono więcej niż jedną strefę odwrotną dla strefy DNS '%s'. Anulowano "
  "przetwarzanie tej strefy."
  
-#: include/class_CopyPasteHandler.inc:153
+#: include/functions_dns.inc:607
  #, php-format
-msgid "You are going to copy the entry '%s'."
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:147
+#, fuzzy, php-format
+msgid "You are going to paste the cutted entry '%s'."
+msgstr "Zamierzasz skopiować wpis '%s'."
+
+#: include/class_CopyPasteHandler.inc:174
+#, fuzzy, php-format
+msgid "You are going to paste the copied entry '%s'."
  msgstr "Zamierzasz skopiować wpis '%s'."
  
-#: include/class_CopyPasteHandler.inc:217
+#: include/class_CopyPasteHandler.inc:238
  msgid "Paste"
  msgstr "Wklej"
  
-#: include/class_CopyPasteHandler.inc:219
+#: include/class_CopyPasteHandler.inc:240
  msgid "Can't paste"
  msgstr "Nie można wkleić"
  
-#: include/functions_FAI.inc:363
+#: include/functions_FAI.inc:361
  #, php-format
  msgid "Error, following objects should be equal '%s' and '%s'"
  msgstr "Błąd, następujące obiekty powinny być równe '%s' oraz '%s'"
  
-#: include/functions_FAI.inc:470
+#: include/functions_FAI.inc:468
  #, php-format
  msgid "Release management failed, can't save '%s'"
  msgstr "Zarządzanie wydaniem nieudane, nie można zapisać '%s'"
  
-#: include/class_SnapShotDialog.inc:53
+#: include/class_SnapShotDialog.inc:63
  #, php-format
  msgid "You're about to delete the snapshot '%s'."
  msgstr "Zamierzasz usunąć snapshot '%s'."
  
-#: include/class_SnapShotDialog.inc:108
+#: include/class_SnapShotDialog.inc:115
  msgid "Remove snapshot"
  msgstr "Usuń snapshot"
  
-#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
+#: include/class_SnapShotDialog.inc:117 include/class_SnapShotDialog.inc:137
  msgid "Y-m-d, H:i:s"
  msgstr "Y-m-d, H:i:s"
  
-#: include/class_SnapShotDialog.inc:142
+#: include/class_SnapShotDialog.inc:149
  msgid "Please specify a valid description for this snapshot."
  msgstr "Proszę podać prawidłowy opis dla tego snapshot'u."
  
@@ -16362,7 +16436,7 @@ msgstr ""
  "Katalog '%s' podany jako katalog kompilacji smarty nie jest osiągalny, "
  "proszę sprawdzić katalog i uprawnienia!"
  
-#: html/main.php:170
+#: html/main.php:172
  msgid ""
  "FATAL: Register globals is on. GOsa will refuse to login unless this is "
  "fixed by an administrator."
@@ -16370,28 +16444,20 @@ msgstr ""
  "BŁĄD: Register globals jest włączone. GOsa odmówi logowania do momentu "
  "poprawienia tego parametru przez administratora."
  
-#: html/main.php:212
+#: html/main.php:214
  msgid "Warning: memory is getting low - please increase the memory_limit!"
  msgstr ""
  "Ostrzeżenie: zaczyna brakować pamięci - proszę zwiększyć parametry "
  "memory_limit!"
  
-#: html/main.php:349
-#, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
-msgstr "BŁĄD: Nie można znaleźć żadnych definicji dla pluginu '%s'!"
-
-#: html/main.php:364
+#: html/main.php:353
  msgid "Your password is about to expire, please change your password"
  msgstr "Twoje hasło zaraz wygaśnie, proszę zmienić hasło"
  
-#: html/main.php:388
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
-msgstr ""
-"Tworzenie tej strony spowodowało wystąpienie błędów przy sprawdzaniu "
-"zgodności z W3C!"
+#: html/main.php:361
+#, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgstr "BŁĄD: Nie można znaleźć żadnych definicji dla pluginu '%s'!"
  
  #: html/getkiosk.php:25
  #, php-format
@@ -16403,11 +16469,11 @@ msgstr "Nie można otworzyć pliku '%s', prawdopodobnie plik nie istnieje."
  msgid "Can't read file '%s', check permissions."
  msgstr "Nie można czytać pliku '%s', proszę sprawdzić uprawnienia."
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Session will not be encrypted."
  msgstr "Sesja nie będzie szyfrowana."
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Enter SSL session"
  msgstr "Sprowadź sesję SSL"
  
@@ -16429,30 +16495,36 @@ msgstr ""
  "GOsa nie może uzyskać informacji o zainstalowanych plikach schema. Proszę "
  "skorygować."
  
-#: html/index.php:232
+#: html/index.php:231
  msgid ""
  "Your ldap setup contains old schema definitions. Please re-run the setup."
  msgstr ""
  "Ustawienia serwera LDAP zawierają stare definicje schema. Proszę uruchomić "
  "setup."
  
-#: html/index.php:260
+#: html/index.php:250 ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr "Brak konta administracyjnego dla GOsa, nie można niczym administrować!"
+
+#: html/index.php:258
  msgid "Please specify a valid username!"
  msgstr "Proszę podać prawidłową nazwę użytkownika!"
  
-#: html/index.php:262
+#: html/index.php:260
  msgid "Please specify your password!"
  msgstr "Proszę podać prawidłowe hasło!"
  
-#: html/index.php:269
+#: html/index.php:267
  msgid "Please check the username/password combination."
  msgstr "Proszę sprawdzić kombinację login/hasło."
  
-#: html/index.php:293
+#: html/index.php:291
  msgid "Account locked. Please contact your system administrator."
  msgstr "Konto zablokowane. Proszę skontaktować się z administratorem systemu."
  
-#: html/index.php:345
+#: html/index.php:343
  msgid ""
  "Your browser has cookies disabled. Please enable cookies and reload this "
  "page before logging in!"
@@ -16601,7 +16673,7 @@ msgstr ""
  "ignoruj ten błąd i pokaż wszystkie elementy które zmieszczą się w "
  "zdefiniowanych limicie rozmiaru i pozwól mi użyć filtrów"
  
-#: ihtml/themes/default/login.tpl:14
+#: ihtml/themes/default/login.tpl:15
  msgid "Please use your username and password to log in"
  msgstr "Proszę użyć swojego loginu i hasła aby się zalogować"
  
@@ -16980,7 +17052,7 @@ msgstr "ACLe dla tego obiektu"
  msgid "Copy & paste wizard"
  msgstr "Kreator Copy &amp; paste"
  
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:7
  msgid ""
  "Some values need to be unique in the complete directory while some "
  "combinations make no sense. GOsa shows the relevant attributes. Please "
@@ -16990,7 +17062,17 @@ msgstr ""
  "kombinacje nie mają sensu. GOsa pokazuje dotyczące atrybuty. Proszę poprawić "
  "wartości poniżej aby utrzymać zgodność z regułami."
  
-#: ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/copyPasteDialog.tpl:9
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:10
+msgid ""
+"Or if you copy or cut an entry within GOsa and delete the source object, you "
+"may get errors while pasting this object again!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:26
  msgid "Operation complete"
  msgstr "Operacja zakończona"
  
@@ -17033,19 +17115,32 @@ msgstr ""
  "Ta procedura przywróci snapshot wybranego obiektu. Obecny obiekt zostanie "
  "zamieniony po naciśnięciu przycisku przywróć."
  
-#: ihtml/themes/default/snapshotdialog.tpl:23
+#: ihtml/themes/default/snapshotdialog.tpl:9
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only nescessary to open and save them again (goFon), "
+"but some entries must be recreated manually (glpi)."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:12
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:29
  msgid "There is no snapshot available that could be restored"
  msgstr "Brak snapshot'u który mógłby zostać odtworzony"
  
-#: ihtml/themes/default/snapshotdialog.tpl:25
+#: ihtml/themes/default/snapshotdialog.tpl:31
  msgid "Choose a snapshot and click the folder image, to restore the snapshot"
  msgstr "Wybierz snapshot i klinij w obrazek folderu, aby odtwodzyć snapshot."
  
-#: ihtml/themes/default/snapshotdialog.tpl:43
+#: ihtml/themes/default/snapshotdialog.tpl:49
  msgid "Creating object snapshots"
  msgstr "Tworzenie obiektu snapshoty"
  
-#: ihtml/themes/default/snapshotdialog.tpl:46
+#: ihtml/themes/default/snapshotdialog.tpl:52
  msgid ""
  "This procedure will create a snapshot of the selected object. It will be "
  "stored inside a special branch of your directory system and can be restored "
@@ -17054,14 +17149,98 @@ msgstr ""
  "Ta procedura utworzy snapshot wybranego obiektu. Kopia obiektu zostanie "
  "zachowana w specjalnej gałęzi i będzie mogła zostać przywrócona później."
  
-#: ihtml/themes/default/snapshotdialog.tpl:61
+#: ihtml/themes/default/snapshotdialog.tpl:55
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:70
  msgid "Timestamp"
  msgstr "Czas"
  
-#: ihtml/themes/default/snapshotdialog.tpl:70
+#: ihtml/themes/default/snapshotdialog.tpl:79
  msgid "Reason for generating this snapshot"
  msgstr "Przyczyna utworzenia tego snapshot'u"
  
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr "Brak uprawnień do tworzenia konta w tym 'Kontenerze'."
+
+#, fuzzy
+#~ msgid "You have no permissions to move this user to the specified 'Base'."
+#~ msgstr "Brak uprawnień do przenoszenia konta z obecnego 'Kontenera'."
+
+#~ msgid "You have no permissions to create a blocklist on this 'Base'."
+#~ msgstr "Brak uprawnień do tworzenia bloklisty w tym miejscu."
+
+#~ msgid "You have no permissions to create a group on this 'Base'."
+#~ msgstr "Brak uprawnień do tworzenia grupy w tej 'bazie'."
+
+#~ msgid "You have no permissions to create a application on this 'Base'."
+#~ msgstr "Brak uprawnień do tworzenia aplikacji w tej 'bazie'."
+
+#~ msgid ""
+#~ "As soon as the move operation has finished, you can scroll down to end of "
+#~ "the page and press the 'Continue' button to continue with the department "
+#~ "management dialog."
+#~ msgstr ""
+#~ "Jak tylko operacja przenoszenia zakończy się, można przewinąć stronę na "
+#~ "dół i nacisnąć przycisk 'Kontynuuj' aby przejść do dialogu zarządzania "
+#~ "departamentami."
+
+#~ msgid "You have no permissions to create a department on this 'Base'."
+#~ msgstr "Brak uprawnień do tworzenia departamentu w tym miejscu."
+
+#~ msgid "Go to users home department"
+#~ msgstr "Przejdź do domowego departamentu użytkowników"
+
+#~ msgid "You have no permissions to create a terminal on this 'Base'."
+#~ msgstr "Brak uprawnień do tworzenia terminala w tej 'bazie'."
+
+#~ msgid "You have no permissions to create a server on this 'Base'."
+#~ msgstr "Brak uprawnień do tworzenia serwera w tym elemencie."
+
+#~ msgid "You are not allowed to set this systems password!"
+#~ msgstr "Brak uprawnień do ustalania tych haseł systemowych!"
+
+#~ msgid "You have no permissions to create a phone on this 'Base'."
+#~ msgstr "Brak uprawnień do tworzenia telefonu w tym elemencie."
+
+#~ msgid "The host name '%s' should be written in lowercase."
+#~ msgstr "Nazwa hosta '%s' powinna zostać wpisana małymi literami."
+
+#~ msgid "Select to display users"
+#~ msgstr "Zaznacz aby wyświetlić użytkownika"
+
+#~ msgid "Display user"
+#~ msgstr "Wyświetl użytkownika"
+
+#~ msgid "Select to display departments"
+#~ msgstr "Zaznacz aby wyświetlić departamenty"
+
+#~ msgid "Display departments"
+#~ msgstr "Wyświetl departamenty"
+
+#, fuzzy
+#~ msgid "Viewable"
+#~ msgstr "Zmienna"
+
+#~ msgid "You have no permissions to create a mime type on this 'Base'."
+#~ msgstr "Brak uprawnień do tworzenia typu mime w tej lokalizacji."
+
+#~ msgid "GOfon"
+#~ msgstr "GOfon"
+
+#~ msgid "You are not allowed to delete this snapshot!"
+#~ msgstr "Brak uprawnień do usunięcia tego snapshotu!"
+
+#~ msgid ""
+#~ "Generating this page caused the W3C          conformance checker to raise "
+#~ "some errors!"
+#~ msgstr ""
+#~ "Tworzenie tej strony spowodowało wystąpienie błędów przy sprawdzaniu "
+#~ "zgodności z W3C!"
+
  #~ msgid "Only insider delivery"
  #~ msgstr "Tylko wewnętrzne dostarczanie"
  
@@ -17570,9 +17749,6 @@ msgstr "Przyczyna utworzenia tego snapshot'u"
  #~ msgid "Saving FAI hook failed"
  #~ msgstr "Zapisywanie zaczepu FAI nieudane"
  
-#~ msgid "Removing FAI profile failed"
-#~ msgstr "Usuwanie profilu FAI nieudane"
-
  #~ msgid "Removing FAI partition table failed"
  #~ msgstr "Usuwanie tablicy partycji FAI nieudane"
  
diff --git a/locale/ru/LC_MESSAGES/messages.po b/locale/ru/LC_MESSAGES/messages.po

index 4dcc898d9ec30072660f49ac84b4690df59a259e..1c699e5b3bd33a62b81986a685a08b0af300b74c 100644 (file)
--- a/locale/ru/LC_MESSAGES/messages.po
+++ b/locale/ru/LC_MESSAGES/messages.po
@@ -1,15 +1,13 @@
  # Translation of messages.po to Russian
  # Valia V. Vaneeva <fattie@altlinux.ru>, 2004.
  # $Id: messages.po,v 1.61 2005/04/18 10:37:13 migor-guest Exp $
-#: plugins/personal/generic/class_user.inc:1361
-#: plugins/admin/systems/class_terminalService.inc:452
-#: plugins/admin/systems/class_terminalService.inc:453
-#: include/class_plugin.inc:115 include/class_plugin.inc:116
+#: plugins/personal/generic/class_user.inc:1360 include/class_plugin.inc:115
+#: include/class_plugin.inc:116
  msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-11-17 12:33+0100\n"
+"POT-Creation-Date: 2006-12-18 11:18+0100\n"
  "PO-Revision-Date: 2005-04-18 14:35+0300\n"
  "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
  "Language-Team: ALT Linux Team\n"
@@ -18,7 +16,24 @@ msgstr ""
  "Content-Transfer-Encoding: 8bit\n"
  "X-Generator: poEdit 1.3.1\n"
  
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1373
+#: contrib/gosa.conf:4 plugins/personal/mail/class_mailAccount.inc:1011
+#: plugins/personal/password/class_password.inc:16
+#: plugins/personal/posix/class_posixAccount.inc:1313
+#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/connectivity/class_phpgwAccount.inc:147
+#: plugins/personal/connectivity/class_kolabAccount.inc:451
+#: plugins/personal/connectivity/class_webdavAccount.inc:146
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:223
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:954
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#: plugins/personal/connectivity/class_intranetAccount.inc:180
+#: plugins/personal/connectivity/class_pptpAccount.inc:163
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:148
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/personal/environment/class_environment.inc:1274
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#: plugins/personal/netatalk/class_netatalk.inc:359
  msgid "My account"
  msgstr "Моя учетная запись"
  
@@ -26,8 +41,8 @@ msgstr "Моя учетная запись"
  msgid "Administration"
  msgstr "Администрирование"
  
-#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:788
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
  msgid "Addons"
  msgstr "Дополнительно"
  
@@ -39,28 +54,28 @@ msgstr "Дополнительно"
  #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
  #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
  #: plugins/personal/generic/class_user.inc:16
-#: plugins/personal/generic/class_user.inc:1368
+#: plugins/personal/generic/class_user.inc:1367
  #: plugins/gofax/blocklists/generic.tpl:1
  #: plugins/gofax/faxaccount/generic.tpl:6
  #: plugins/gofax/faxaccount/paste_generic.tpl:4
  #: plugins/admin/groups/mail.tpl:7
-#: plugins/admin/groups/class_groupGeneric.inc:884
-#: plugins/admin/applications/class_applicationGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:531
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#: plugins/admin/applications/class_applicationGeneric.inc:523
+#: plugins/admin/departments/class_departmentGeneric.inc:575
  #: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/class_servGeneric.inc:334
-#: plugins/admin/systems/class_workstationGeneric.inc:504
+#: plugins/admin/systems/class_servGeneric.inc:347
+#: plugins/admin/systems/class_workstationGeneric.inc:526
  #: plugins/admin/systems/servkolab.tpl:6 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/class_printGeneric.inc:854
-#: plugins/admin/systems/class_componentGeneric.inc:257
-#: plugins/admin/systems/class_phoneGeneric.inc:425
+#: plugins/admin/systems/class_printGeneric.inc:858
+#: plugins/admin/systems/class_componentGeneric.inc:259
+#: plugins/admin/systems/class_phoneGeneric.inc:430
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
  #: plugins/admin/systems/servdnseditzone.tpl:1
  #: plugins/admin/systems/goMailServer.tpl:1
  #: plugins/admin/systems/goImapServer.tpl:1
  #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:709
+#: plugins/admin/ogroups/class_ogroup.inc:692
  #: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
  #: plugins/admin/fai/faiPartitionTable.tpl:4
  #: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiProfile.tpl:4
@@ -71,9 +86,9 @@ msgstr "Дополнительно"
  #: plugins/admin/fai/faiHookEntry.tpl:5
  #: plugins/admin/fai/faiTemplateEntry.tpl:3
  #: plugins/admin/mimetypes/generic.tpl:4
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:671
  #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_gofonMacro.inc:486
  #: plugins/generic/references/class_reference.inc:20
  msgid "Generic"
  msgstr "Общее"
@@ -85,30 +100,30 @@ msgstr "Unix"
  #: contrib/gosa.conf:82 contrib/gosa.conf:98
  #: plugins/personal/environment/class_environment.inc:12
  #: plugins/personal/environment/class_environment.inc:1269
-#: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:189
+#: plugins/admin/groups/class_divListGroup.inc:188
+#: plugins/admin/users/class_divListUsers.inc:177
  msgid "Environment"
  msgstr "Окружение"
  
  #: contrib/gosa.conf:83 contrib/gosa.conf:100
  #: plugins/personal/mail/class_mailAccount.inc:22
  #: plugins/personal/mail/class_mailAccount.inc:1006
-#: plugins/admin/groups/class_groupMail.inc:1066
-#: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:191
-#: plugins/admin/ogroups/tabs_ogroups.inc:76
+#: plugins/admin/groups/class_groupMail.inc:1073
+#: plugins/admin/groups/class_divListGroup.inc:180
+#: plugins/admin/users/class_divListUsers.inc:179
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
  #: plugins/admin/ogroups/tabs_ogroups.inc:184
  #: plugins/admin/ogroups/paste_mail.tpl:4
  #: plugins/admin/ogroups/class_mailogroup.inc:167
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/admin/ogroups/class_divListOGroup.inc:171
  #: plugins/generic/references/class_reference.inc:24
  msgid "Mail"
  msgstr "Почта"
  
  #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
  #: plugins/personal/samba/class_sambaAccount.inc:1041
-#: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/groups/class_divListGroup.inc:182
+#: plugins/admin/users/class_divListUsers.inc:185
  #: plugins/generic/references/class_reference.inc:26
  #: plugins/generic/references/class_reference.inc:28
  msgid "Samba"
@@ -116,7 +131,7 @@ msgstr "Samba"
  
  #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
  #: plugins/personal/netatalk/class_netatalk.inc:355
-#: plugins/admin/users/class_divListUsers.inc:199
+#: plugins/admin/users/class_divListUsers.inc:187
  msgid "Netatalk"
  msgstr ""
  
@@ -127,15 +142,14 @@ msgstr "Подключение"
  
  #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
  #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:581
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:586
  #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:807
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
  #: plugins/gofax/faxaccount/paste_generic.tpl:8
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:183
  #: plugins/admin/departments/generic.tpl:91
-#: plugins/admin/departments/class_departmentGeneric.inc:550
+#: plugins/admin/departments/class_departmentGeneric.inc:594
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Fax"
@@ -148,12 +162,12 @@ msgstr "Факс"
  #: plugins/addons/addressbook/address_edit.tpl:221
  #: plugins/addons/addressbook/address_info.tpl:67
  #: plugins/addons/addressbook/address_info.tpl:163
-#: plugins/admin/groups/class_divListGroup.inc:178
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/groups/class_divListGroup.inc:186
+#: plugins/admin/users/class_divListUsers.inc:181
  #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:818
+#: plugins/admin/systems/class_systemManagement.inc:1003
  #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/ogroups/class_ogroupManagement.inc:351
  #: plugins/admin/ogroups/class_phonequeue.inc:718
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1231
@@ -173,9 +187,9 @@ msgstr ""
  msgid "Applications"
  msgstr "Приложения"
  
-#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:92
  #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:240
+#: plugins/admin/systems/class_servRepository.inc:254
  #: plugins/admin/ogroups/phonequeue.tpl:43
  #: plugins/gofon/conference/generic.tpl:121
  msgid "Options"
@@ -190,21 +204,21 @@ msgstr "Параметры загрузки"
  
  #: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
  #: plugins/admin/systems/class_terminalStartup.inc:442
-#: plugins/admin/systems/class_workstationStartup.inc:1109
-#: plugins/admin/ogroups/tabs_ogroups.inc:99
+#: plugins/admin/systems/class_workstationStartup.inc:1154
+#: plugins/admin/ogroups/tabs_ogroups.inc:96
  msgid "Startup"
  msgstr "Запуск"
  
  #: contrib/gosa.conf:120 contrib/gosa.conf:136
-#: plugins/admin/ogroups/tabs_ogroups.inc:103
+#: plugins/admin/ogroups/tabs_ogroups.inc:99
  msgid "Devices"
  msgstr "Устройства"
  
  #: contrib/gosa.conf:121 contrib/gosa.conf:137
  #: plugins/personal/environment/environment.tpl:235
-#: plugins/admin/systems/class_systemManagement.inc:827
-#: plugins/admin/systems/class_printGeneric.inc:860
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/systems/class_systemManagement.inc:1012
+#: plugins/admin/systems/class_printGeneric.inc:864
+#: plugins/admin/ogroups/class_ogroupManagement.inc:354
  #: plugins/generic/references/class_reference.inc:52
  msgid "Printer"
  msgstr "Принтер"
@@ -223,16 +237,16 @@ msgstr "Принтер"
  #: plugins/admin/fai/faiPackageEntry.tpl:22
  #: plugins/gofon/macro/headpage.tpl:20
  #: plugins/gofon/conference/headpage.tpl:20
-#: ihtml/themes/default/MultiSelectWindow.tpl:24
-#: ihtml/themes/default/MultiSelectWindow.tpl:64
+#: ihtml/themes/default/MultiSelectWindow.tpl:27
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
  msgid "Information"
  msgstr "Информация"
  
  #: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:385
  #: plugins/admin/systems/class_goFaxServer.inc:85
  #: plugins/admin/systems/class_servKolab.inc:375
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:366
  #: plugins/admin/systems/class_goGlpiServer.inc:84
  #: plugins/admin/systems/class_goCupsServer.inc:64
  #: plugins/admin/systems/class_goTerminalServer.inc:118
@@ -251,7 +265,6 @@ msgid "Services"
  msgstr "Сервисы"
  
  #: contrib/gosa.conf:129 contrib/gosa.conf:139
-#: plugins/admin/fai/class_faiSummaryTab.inc:546
  msgid "FAI summary"
  msgstr ""
  
@@ -279,7 +292,7 @@ msgstr "Экспорт"
  #: plugins/addons/ldapmanager/contentcsv.tpl:112
  #: plugins/addons/ldapmanager/contentimport.tpl:50
  #: plugins/addons/notifications/contents.tpl:52
-#: plugins/admin/applications/generic.tpl:132
+#: plugins/admin/applications/generic.tpl:135
  msgid "Import"
  msgstr "Импортировать"
  
@@ -294,37 +307,36 @@ msgid "Partitions"
  msgstr "Назначение"
  
  #: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:518
+#: plugins/admin/applications/generic.tpl:130
+#: plugins/admin/fai/class_faiScript.inc:529
  #: plugins/admin/fai/faiScriptEntry.tpl:56
  #: plugins/admin/fai/faiHookEntry.tpl:56
  #, fuzzy
  msgid "Script"
  msgstr "Путь к сценариям"
  
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:45
  msgid "Hooks"
  msgstr ""
  
-#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:46
  #, fuzzy
  msgid "Variables"
  msgstr "Переменная"
  
-#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:47
  #, fuzzy
  msgid "Templates"
  msgstr "Шаблон"
  
  #: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
-#: plugins/admin/fai/class_faiSummaryTab.inc:47
+#: plugins/admin/fai/class_faiSummaryTab.inc:50
  #, fuzzy
  msgid "Profiles"
  msgstr "Путь к профилю"
  
-#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:103
  #: plugins/admin/acl/class_divListACL.inc:49
-#: plugins/admin/fai/class_faiSummaryTab.inc:545
  msgid "Summary"
  msgstr ""
  
@@ -381,7 +393,7 @@ msgstr "Выберите адреса для добавления"
  #: plugins/personal/environment/hotplugDialog.tpl:24
  #: plugins/personal/environment/selectPrinterDialog.tpl:24
  #: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:62
+#: plugins/addons/addressbook/contents.tpl:65
  #: plugins/addons/godfs/contents.tpl:31
  #: plugins/admin/groups/mail_locals.tpl:22
  #: plugins/admin/groups/group_objects.tpl:20
@@ -397,8 +409,8 @@ msgstr "Выберите адреса для добавления"
  #: plugins/admin/fai/faiPackageEntry.tpl:32
  #: plugins/gofon/macro/headpage.tpl:29
  #: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:75
+#: ihtml/themes/default/MultiSelectWindow.tpl:38
+#: ihtml/themes/default/MultiSelectWindow.tpl:78
  msgid "Filters"
  msgstr "Фильтры"
  
@@ -413,7 +425,7 @@ msgstr "Выберите подразделение"
  #: plugins/personal/samba/samba3_workstations.tpl:27
  #: plugins/personal/environment/selectPrinterDialog.tpl:34
  #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:84
+#: plugins/addons/addressbook/contents.tpl:87
  #: plugins/admin/groups/mail_locals.tpl:33
  #: plugins/admin/groups/group_objects.tpl:40
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
@@ -464,22 +476,22 @@ msgstr "Имя пользователя, адрес которого показ
  #: plugins/admin/groups/mail.tpl:135 plugins/admin/groups/mail_locals.tpl:66
  #: plugins/admin/groups/generic.tpl:137
  #: plugins/admin/groups/application.tpl:39
-#: plugins/admin/groups/class_groupMail.inc:591
+#: plugins/admin/groups/class_groupMail.inc:598
  #: plugins/admin/groups/group_objects.tpl:55
  #: plugins/admin/groups/paste_mail.tpl:30
  #: plugins/admin/groups/paste_mail.tpl:41
  #: plugins/admin/systems/terminal.tpl:117
+#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/workstation.tpl:94
  #: plugins/admin/systems/glpiPrinter.tpl:115
  #: plugins/admin/systems/glpiPrinter.tpl:149
  #: plugins/admin/systems/servdns.tpl:6 plugins/admin/systems/glpi.tpl:125
-#: plugins/admin/systems/goNtpServer.tpl:18
  #: plugins/admin/systems/phonesettings.tpl:207
  #: plugins/admin/systems/phonesettings.tpl:230
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:124
-#: plugins/admin/systems/workstationStartup.tpl:150
-#: plugins/admin/systems/workstationStartup.tpl:179
+#: plugins/admin/systems/workstationStartup.tpl:127
+#: plugins/admin/systems/workstationStartup.tpl:154
+#: plugins/admin/systems/workstationStartup.tpl:183
  #: plugins/admin/systems/terminalStartup.tpl:79
  #: plugins/admin/systems/terminalStartup.tpl:108
  #: plugins/admin/systems/servRepositorySetup.tpl:47
@@ -487,12 +499,12 @@ msgstr "Имя пользователя, адрес которого показ
  #: plugins/admin/systems/glpiManufacturer.tpl:6
  #: plugins/admin/systems/glpi_edit_os.tpl:8
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/class_termDNS.inc:472
-#: plugins/admin/systems/class_termDNS.inc:492
+#: plugins/admin/systems/class_termDNS.inc:477
+#: plugins/admin/systems/class_termDNS.inc:497
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
  #: plugins/admin/systems/servdnseditzone.tpl:106
  #: plugins/admin/systems/class_servDNSeditZone.inc:486
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:392
  #: plugins/admin/systems/goShareServer.tpl:14
  #: plugins/admin/systems/goMailServer.tpl:70
  #: plugins/admin/systems/goMailServer.tpl:101
@@ -505,7 +517,7 @@ msgstr "Имя пользователя, адрес которого показ
  #: plugins/admin/ogroups/ogroup_objects.tpl:54
  #: plugins/admin/ogroups/phonequeue.tpl:33
  #: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
-#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPackage.tpl:78
  #: plugins/admin/fai/faiPartitionTable.tpl:48
  #: plugins/admin/fai/faiPartitionTable.tpl:50
  #: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
@@ -554,15 +566,17 @@ msgstr "Добавить"
  #: plugins/admin/applications/remove.tpl:15
  #: plugins/admin/applications/class_applicationManagement.inc:352
  #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_systemManagement.inc:506
+#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/departments/dep_move_confirm.tpl:17
+#: plugins/admin/systems/goNtpServer.tpl:31
+#: plugins/admin/systems/class_systemManagement.inc:654
  #: plugins/admin/systems/servdns.tpl:23
-#: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/servkolab.tpl:247 plugins/admin/systems/gencd.tpl:11
  #: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/goNtpServer.tpl:32
-#: plugins/admin/systems/goKrbServer.tpl:33
+#: plugins/admin/systems/goKrbServer.tpl:32
+#: plugins/admin/systems/goFonServer.tpl:41
  #: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:140
-#: plugins/admin/systems/goFonServer.tpl:42
+#: plugins/admin/systems/goFaxServer.tpl:25
  #: plugins/admin/systems/remove_glpi.tpl:16
  #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
  #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -570,7 +584,7 @@ msgstr "Добавить"
  #: plugins/admin/systems/servRepository.tpl:68
  #: plugins/admin/systems/glpi_edit_type.tpl:29
  #: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/goFaxServer.tpl:26
+#: plugins/admin/systems/remove_ppd.tpl:14
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
  #: plugins/admin/systems/glpiSelectUser.tpl:51
  #: plugins/admin/systems/glpi_devices.tpl:761
@@ -583,26 +597,27 @@ msgstr "Добавить"
  #: plugins/admin/systems/SelectDeviceType.tpl:45
  #: plugins/admin/systems/class_baseSelectDialog.inc:43
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/ServiceAddDialog.tpl:31
-#: plugins/admin/systems/goLdapServer.tpl:12
-#: plugins/admin/systems/goShareServer.tpl:32
-#: plugins/admin/systems/goMailServer.tpl:224
-#: plugins/admin/systems/goImapServer.tpl:119
-#: plugins/admin/systems/goSyslogServer.tpl:8
-#: plugins/admin/systems/goGlpiServer.tpl:35
-#: plugins/admin/systems/goCupsServer.tpl:8
-#: plugins/admin/systems/goTerminalServer.tpl:26
-#: plugins/admin/systems/goLogDBServer.tpl:26
-#: plugins/admin/systems/goSpamServer.tpl:128
-#: plugins/admin/systems/goSpamServerRule.tpl:24
-#: plugins/admin/systems/goVirusServer.tpl:171
+#: plugins/admin/systems/ServiceAddDialog.tpl:30
+#: plugins/admin/systems/goLdapServer.tpl:11
+#: plugins/admin/systems/goShareServer.tpl:31
+#: plugins/admin/systems/goMailServer.tpl:223
+#: plugins/admin/systems/goImapServer.tpl:118
+#: plugins/admin/systems/goSyslogServer.tpl:7
+#: plugins/admin/systems/goGlpiServer.tpl:34
+#: plugins/admin/systems/goCupsServer.tpl:7
+#: plugins/admin/systems/goTerminalServer.tpl:25
+#: plugins/admin/systems/goLogDBServer.tpl:25
+#: plugins/admin/systems/goSpamServer.tpl:127
+#: plugins/admin/systems/goSpamServerRule.tpl:23
+#: plugins/admin/systems/goVirusServer.tpl:170
  #: plugins/admin/systems/class_goService.inc:34
  #: plugins/admin/ogroups/ogroup_objects.tpl:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:307
+#: plugins/admin/ogroups/class_ogroupManagement.inc:302
  #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:619
-#: plugins/admin/fai/class_faiManagement.inc:624
-#: plugins/admin/fai/class_faiManagement.inc:630
+#: plugins/admin/acl/class_aclManagement.inc:289
+#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/fai/class_faiManagement.inc:634
+#: plugins/admin/fai/class_faiManagement.inc:640
  #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
  #: plugins/admin/fai/faiScriptEntry.tpl:83
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:40
@@ -614,17 +629,17 @@ msgstr "Добавить"
  #: plugins/admin/fai/faiPackageNew.tpl:51
  #: plugins/admin/fai/faiNewBranch.tpl:20
  #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
  #: plugins/admin/mimetypes/remove.tpl:15
  #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
  #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:256
  #: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
  #: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
-#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:38
-#: ihtml/themes/default/snapshotdialog.tpl:80
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:89
  msgid "Cancel"
  msgstr "Отмена"
  
@@ -636,11 +651,11 @@ msgstr "Основной адрес"
  
  #: plugins/personal/mail/generic.tpl:15
  #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:18
-#: plugins/admin/systems/class_servGeneric.inc:340
-#: plugins/admin/systems/class_systemManagement.inc:819
+#: plugins/admin/systems/class_servGeneric.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:1004
  #: plugins/admin/systems/servnfs.tpl:39
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:355
+#: plugins/admin/ogroups/class_ogroupManagement.inc:350
  #: plugins/generic/references/class_reference.inc:44
  msgid "Server"
  msgstr "Сервер"
@@ -655,14 +670,14 @@ msgstr "Использование квоты"
  
  #: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:38
  #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:515
+#: plugins/admin/systems/class_printGeneric.inc:516
  msgid "not defined"
  msgstr "не определена"
  
  #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/personal/mail/class_mailAccount.inc:1019
  #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1077
+#: plugins/admin/groups/class_groupMail.inc:1084
  msgid "Quota size"
  msgstr "Размер квоты"
  
@@ -702,22 +717,23 @@ msgstr "Список альтернативных адресов эл. почт
  #: plugins/admin/applications/remove.tpl:13
  #: plugins/admin/departments/remove.tpl:14
  #: plugins/admin/systems/terminal.tpl:121
+#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/printer.tpl:102 plugins/admin/systems/printer.tpl:126
  #: plugins/admin/systems/workstation.tpl:98
  #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/goNtpServer.tpl:21
  #: plugins/admin/systems/remove_glpi.tpl:14
  #: plugins/admin/systems/phonesettings.tpl:210
  #: plugins/admin/systems/phonesettings.tpl:233
-#: plugins/admin/systems/workstationStartup.tpl:125
-#: plugins/admin/systems/workstationStartup.tpl:153
+#: plugins/admin/systems/workstationStartup.tpl:129
+#: plugins/admin/systems/workstationStartup.tpl:157
  #: plugins/admin/systems/terminalStartup.tpl:82
  #: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/remove_ppd.tpl:12
  #: plugins/admin/systems/glpi_edit_os.tpl:10
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
  #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
  #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_termDNS.inc:486
+#: plugins/admin/systems/class_termDNS.inc:491
  #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
  #: plugins/admin/systems/class_servDNSeditZone.inc:292
  #: plugins/admin/systems/class_servDNSeditZone.inc:480
@@ -789,7 +805,7 @@ msgid "MB"
  msgstr "Мб"
  
  #: plugins/personal/mail/generic.tpl:126
-#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1022
  msgid "Vacation message"
  msgstr "Сообщение автоответчика"
  
@@ -820,7 +836,7 @@ msgid "User is only allowed to send and receive local mails"
  msgstr "Пользователь может отправлять и получать почту только локально"
  
  #: plugins/personal/mail/generic.tpl:190
-#: plugins/personal/mail/class_mailAccount.inc:1036
+#: plugins/personal/mail/class_mailAccount.inc:1037
  msgid "Use custom sieve script"
  msgstr "Использовать другой сценарий SIEVE"
  
@@ -838,13 +854,14 @@ msgstr "отключает все почтовые настройки!"
  #: plugins/admin/groups/class_groupManagement.inc:329
  #: plugins/admin/users/class_userManagement.inc:651
  #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:500
-#: plugins/admin/ogroups/class_ogroupManagement.inc:301
-#: plugins/admin/fai/class_faiManagement.inc:613
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
+#: plugins/admin/systems/class_systemManagement.inc:648
+#: plugins/admin/ogroups/class_ogroupManagement.inc:296
+#: plugins/admin/acl/class_aclManagement.inc:280
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:339
  #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:250
  msgid "Ok"
  msgstr ""
  
@@ -1033,35 +1050,35 @@ msgid ""
  msgstr ""
  
  #: plugins/personal/mail/class_mailAccount.inc:781
-#: plugins/admin/groups/class_groupMail.inc:880
+#: plugins/admin/groups/class_groupMail.inc:887
  msgid "The required field 'Primary address' is not set."
  msgstr "Обязательное поле \"Основной адрес\" не заполнено."
  
  #: plugins/personal/mail/class_mailAccount.inc:785
  #: plugins/personal/mail/class_mailAccount.inc:789
-#: plugins/addons/addressbook/class_addressbook.inc:694
+#: plugins/addons/addressbook/class_addressbook.inc:696
  #: plugins/admin/ogroups/class_mailogroup.inc:79
  msgid "Please enter a valid email address in 'Primary address' field."
  msgstr "Введите корректное значение в поле \"Основной адрес\"."
  
  #: plugins/personal/mail/class_mailAccount.inc:795
-#: plugins/admin/groups/class_groupMail.inc:889
+#: plugins/admin/groups/class_groupMail.inc:896
  #: plugins/admin/ogroups/class_mailogroup.inc:86
  msgid "The primary address you've entered is already in use."
  msgstr "Введенный вами адрес уже используется."
  
  #: plugins/personal/mail/class_mailAccount.inc:801
-#: plugins/admin/groups/class_groupMail.inc:895
+#: plugins/admin/groups/class_groupMail.inc:902
  msgid "Value in 'Quota size' is not valid."
  msgstr "Значение поля \"Квота\" некорректно."
  
  #: plugins/personal/mail/class_mailAccount.inc:810
-#: plugins/admin/groups/class_groupMail.inc:904
+#: plugins/admin/groups/class_groupMail.inc:911
  msgid "Please specify a vaild mail size for mails to be rejected."
  msgstr "Укажите корректный размер сообщений, которые будут отклоняться."
  
  #: plugins/personal/mail/class_mailAccount.inc:820
-#: plugins/admin/groups/class_groupMail.inc:912
+#: plugins/admin/groups/class_groupMail.inc:919
  msgid "You need to set the maximum mail size in order to reject anything."
  msgstr "Помните, что указывать нужно максимальный допустимый размер сообщений."
  
@@ -1091,70 +1108,75 @@ msgid ""
  "methods."
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1012
+#, fuzzy
+msgid "Mail account"
+msgstr "Моя учетная запись"
+
+#: plugins/personal/mail/class_mailAccount.inc:1017
  #: plugins/personal/nagios/nagios.tpl:17
-#: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/addons/addressbook/class_addressbook.inc:797
-#: plugins/admin/groups/class_groupMail.inc:1074
-#: plugins/admin/systems/class_servDNS.inc:394
+#: plugins/personal/nagios/class_nagiosAccount.inc:273
+#: plugins/addons/addressbook/class_addressbook.inc:799
+#: plugins/admin/groups/class_groupMail.inc:1081
+#: plugins/admin/systems/class_servDNS.inc:396
  #: plugins/admin/systems/servdnseditzone.tpl:51
  #: plugins/admin/ogroups/class_mailogroup.inc:175 html/getxls.php:225
  #, fuzzy
  msgid "Mail address"
  msgstr "MAC-адрес"
  
-#: plugins/personal/mail/class_mailAccount.inc:1017
-#: plugins/admin/groups/class_groupMail.inc:1078
+#: plugins/personal/mail/class_mailAccount.inc:1018
+#: plugins/admin/groups/class_groupMail.inc:1085
  #, fuzzy
  msgid "Mail server"
  msgstr "Сервер"
  
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1021
  #, fuzzy
  msgid "Add vacation information"
  msgstr "Информация об организации"
  
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1024
  msgid "Use spam filter"
  msgstr ""
  
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1025
  #, fuzzy
  msgid "Spam level"
  msgstr "Уровень информативности"
  
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1026
  #, fuzzy
  msgid "Spam mail box"
  msgstr "Размер квоты"
  
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1028
  #, fuzzy
  msgid "Reject due to mailsize"
  msgstr "Отклонять сообщения размером больше"
  
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:1029
  #, fuzzy
  msgid "Mail max size"
  msgstr "Размер квоты"
  
-#: plugins/personal/mail/class_mailAccount.inc:1030
-#: plugins/personal/mail/class_mailAccount.inc:1035
+#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1036
  #, fuzzy
  msgid "Forwarding address"
  msgstr "Основной адрес"
  
-#: plugins/personal/mail/class_mailAccount.inc:1031
+#: plugins/personal/mail/class_mailAccount.inc:1032
  #, fuzzy
  msgid "Local delivery"
  msgstr "Последняя доставка"
  
-#: plugins/personal/mail/class_mailAccount.inc:1032
+#: plugins/personal/mail/class_mailAccount.inc:1033
  #, fuzzy
  msgid "No delivery to own mailbox "
  msgstr "Не оставлять копии в своем почтовом ящике"
  
-#: plugins/personal/mail/class_mailAccount.inc:1033
+#: plugins/personal/mail/class_mailAccount.inc:1034
  #, fuzzy
  msgid "Mail alternative addresses"
  msgstr "Альтернативные адреса"
@@ -1227,8 +1249,9 @@ msgstr ""
  #: plugins/addons/ldapmanager/contentexport.tpl:66
  #: plugins/addons/ldapmanager/contentexportxls.tpl:69
  #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/departments/dep_iframe.tpl:19
-#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1452
+#: plugins/admin/departments/dep_iframe.tpl:18
+#: plugins/admin/systems/class_systemManagement.inc:145
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1421
  #: ihtml/themes/default/setup_useradmin.tpl:40
  #: ihtml/themes/default/setup_step4.tpl:114
  #: ihtml/themes/default/setup_step2.tpl:12
@@ -1238,13 +1261,14 @@ msgid "Back"
  msgstr "Назад"
  
  #: plugins/personal/password/class_password.inc:5
+#: plugins/personal/password/class_password.inc:17
  #: plugins/personal/generic/paste_generic.tpl:20
  #: plugins/admin/systems/class_goFaxServer.inc:94
  #: plugins/admin/systems/goKrbServer.tpl:20
  #: plugins/admin/systems/goFonServer.tpl:12
-#: plugins/admin/systems/class_goGlpiServer.inc:98
  #: plugins/admin/systems/goFaxServer.tpl:12
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_goGlpiServer.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:308
  #: plugins/admin/systems/goImapServer.tpl:34
  #: plugins/admin/systems/class_goFonServer.inc:107
  #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1257,7 +1281,7 @@ msgid "Password"
  msgstr "Пароль"
  
  #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/generic/class_user.inc:1378
  #, fuzzy
  msgid "User password"
  msgstr "Новый пароль"
@@ -1307,12 +1331,12 @@ msgid "External password changer reported a problem: "
  msgstr "При попытке сменить пароль извне возникла проблема: "
  
  #: plugins/personal/password/main.inc:123
-#: plugins/admin/users/class_divListUsers.inc:261
+#: plugins/admin/users/class_divListUsers.inc:249
  msgid "Change password"
  msgstr "Сменить пароль"
  
  #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1327
+#: plugins/personal/posix/class_posixAccount.inc:1320
  #: plugins/personal/posix/paste_generic.tpl:8
  #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
  #: plugins/personal/samba/class_sambaAccount.inc:645
@@ -1320,7 +1344,7 @@ msgid "Home directory"
  msgstr "Домашний каталог"
  
  #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1328
+#: plugins/personal/posix/class_posixAccount.inc:1321
  msgid "Shell"
  msgstr "Оболочка"
  
@@ -1329,10 +1353,10 @@ msgid "Primary group"
  msgstr "Основная группа"
  
  #: plugins/personal/posix/generic.tpl:35
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:235
  #: plugins/gofax/faxreports/contents.tpl:32
  #: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/class_faxreport.inc:482
+#: plugins/gofax/faxreports/class_faxreport.inc:487
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
  #: plugins/gofon/fonreports/contents.tpl:35
  msgid "Status"
@@ -1350,7 +1374,7 @@ msgstr "UID"
  
  #: plugins/personal/posix/generic.tpl:62
  #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:894
  msgid "GID"
  msgstr "GID"
  
@@ -1395,7 +1419,7 @@ msgstr "Объединения в подразделении"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -1452,57 +1476,57 @@ msgstr "Атрибуты UNIX"
  msgid "UNIX"
  msgstr "Unix"
  
-#: plugins/personal/posix/class_posixAccount.inc:136
+#: plugins/personal/posix/class_posixAccount.inc:135
  #, fuzzy
  msgid "expired"
  msgstr "Экспорт"
  
-#: plugins/personal/posix/class_posixAccount.inc:138
+#: plugins/personal/posix/class_posixAccount.inc:137
  msgid "grace time active"
  msgstr ""
  
-#: plugins/personal/posix/class_posixAccount.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:140
  #, fuzzy
  msgid "active, password not changable"
  msgstr "Новый пароль"
  
-#: plugins/personal/posix/class_posixAccount.inc:143
+#: plugins/personal/posix/class_posixAccount.inc:142
  #, fuzzy
  msgid "active, password expired"
  msgstr "Срок действия пароля истекает"
  
-#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:144
  #, fuzzy
  msgid "active"
  msgstr "Личный"
  
-#: plugins/personal/posix/class_posixAccount.inc:156
-#: plugins/personal/posix/class_posixAccount.inc:1010
+#: plugins/personal/posix/class_posixAccount.inc:155
+#: plugins/personal/posix/class_posixAccount.inc:1002
  msgid "Group of user"
  msgstr "Группа пользователя"
  
-#: plugins/personal/posix/class_posixAccount.inc:191
+#: plugins/personal/posix/class_posixAccount.inc:190
  msgid "unconfigured"
  msgstr "Не настроено"
  
-#: plugins/personal/posix/class_posixAccount.inc:208
-#: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:791
+#: plugins/personal/posix/class_posixAccount.inc:201
+#: plugins/admin/systems/class_workstationStartup.inc:825
  #: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:196
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:222
  msgid "automatic"
  msgstr "автоматически"
  
-#: plugins/personal/posix/class_posixAccount.inc:254
+#: plugins/personal/posix/class_posixAccount.inc:247
  msgid "This account has no unix extensions."
  msgstr "В этой учетной записи нет расширений UNIX."
  
-#: plugins/personal/posix/class_posixAccount.inc:274
-#: plugins/personal/posix/class_posixAccount.inc:277
+#: plugins/personal/posix/class_posixAccount.inc:267
+#: plugins/personal/posix/class_posixAccount.inc:270
  msgid "Remove posix account"
  msgstr "Удалить учетную запись POSIX"
  
-#: plugins/personal/posix/class_posixAccount.inc:275
+#: plugins/personal/posix/class_posixAccount.inc:268
  #, fuzzy
  msgid ""
  "This account has unix features enabled. To disable them, you'll need to "
@@ -1511,7 +1535,7 @@ msgstr ""
  "В этой учетной записи используются атрибуты POSIX. Чтобы отключить их "
  "использование, сначала нужно удалить учетную запись Samba."
  
-#: plugins/personal/posix/class_posixAccount.inc:278
+#: plugins/personal/posix/class_posixAccount.inc:271
  msgid ""
  "This account has posix features enabled. You can disable them by clicking "
  "below."
@@ -1519,11 +1543,11 @@ msgstr ""
  "В этой учетной записи используются атрибуты POSIX. Вы можете отключить их "
  "использование, щелкнув ниже."
  
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:274
  msgid "Create posix account"
  msgstr "Создать учетную запись POSIX"
  
-#: plugins/personal/posix/class_posixAccount.inc:282
+#: plugins/personal/posix/class_posixAccount.inc:275
  msgid ""
  "This account has posix features disabled. You can enable them by clicking "
  "below."
@@ -1531,31 +1555,31 @@ msgstr ""
  "В этой учетной записи не используются атрибуты POSIX. Вы можете использовать "
  "их, щелкнув ниже."
  
-#: plugins/personal/posix/class_posixAccount.inc:442
+#: plugins/personal/posix/class_posixAccount.inc:435
  #, php-format
  msgid "Password can't be changed up to %s days after last change"
  msgstr "Пароль нельзя изменить в течение %s дн. с последней смены (shadowMin)"
  
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:439
  #, php-format
  msgid "Password must be changed after %s days"
  msgstr "Пароль должен быть изменен по истечении %s дн. (shadowMax)"
  
-#: plugins/personal/posix/class_posixAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:443
  #, php-format
  msgid "Disable account after %s days of inactivity after password expiery"
  msgstr ""
  "Отключить учетную запись, если срок действия пароля истек и прошло %s дн. "
  "бездействия (shadowInactive)"
  
-#: plugins/personal/posix/class_posixAccount.inc:454
+#: plugins/personal/posix/class_posixAccount.inc:447
  #, php-format
  msgid "Warn user %s days before password expiery"
  msgstr ""
  "Предупреждать пользователей за %s дн. до истечения срока действия пароля "
  "(shadowWarning)"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1564,7 +1588,7 @@ msgstr ""
  msgid "January"
  msgstr "Январь"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1573,7 +1597,7 @@ msgstr "Январь"
  msgid "February"
  msgstr "Февраль"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1582,7 +1606,7 @@ msgstr "Февраль"
  msgid "March"
  msgstr "Март"
  
-#: plugins/personal/posix/class_posixAccount.inc:493
+#: plugins/personal/posix/class_posixAccount.inc:486
  #: plugins/personal/samba/class_sambaAccount.inc:371
  #: plugins/personal/samba/class_sambaAccount.inc:389
  #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1591,7 +1615,7 @@ msgstr "Март"
  msgid "April"
  msgstr "Апрель"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1600,7 +1624,7 @@ msgstr "Апрель"
  msgid "May"
  msgstr "Май"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1609,7 +1633,7 @@ msgstr "Май"
  msgid "June"
  msgstr "Июнь"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1618,7 +1642,7 @@ msgstr "Июнь"
  msgid "July"
  msgstr "Июль"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1627,7 +1651,7 @@ msgstr "Июль"
  msgid "August"
  msgstr "Август"
  
-#: plugins/personal/posix/class_posixAccount.inc:494
+#: plugins/personal/posix/class_posixAccount.inc:487
  #: plugins/personal/samba/class_sambaAccount.inc:372
  #: plugins/personal/samba/class_sambaAccount.inc:390
  #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1636,7 +1660,7 @@ msgstr "Август"
  msgid "September"
  msgstr "Сентябрь"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1645,7 +1669,7 @@ msgstr "Сентябрь"
  msgid "October"
  msgstr "Октябрь"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1654,7 +1678,7 @@ msgstr "Октябрь"
  msgid "November"
  msgstr "Ноябрь"
  
-#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/posix/class_posixAccount.inc:488
  #: plugins/personal/samba/class_sambaAccount.inc:373
  #: plugins/personal/samba/class_sambaAccount.inc:391
  #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1663,155 +1687,160 @@ msgstr "Ноябрь"
  msgid "December"
  msgstr "Декабрь"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  #: plugins/personal/samba/class_sambaAccount.inc:468
-#: plugins/admin/systems/class_terminalGeneric.inc:97
+#: plugins/admin/systems/class_terminalGeneric.inc:104
  #: ihtml/themes/default/setup_step4.tpl:91
  msgid "disabled"
  msgstr "отключен"
  
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: plugins/personal/posix/class_posixAccount.inc:567
  msgid "full access"
  msgstr "полный доступ"
  
-#: plugins/personal/posix/class_posixAccount.inc:576
+#: plugins/personal/posix/class_posixAccount.inc:568
  msgid "allow access to these hosts"
  msgstr "разрешить доступ только на эти хосты"
  
-#: plugins/personal/posix/class_posixAccount.inc:622
+#: plugins/personal/posix/class_posixAccount.inc:614
  #, fuzzy, php-format
  msgid "Removing of user/posix account with dn '%s' failed."
  msgstr "Удалить учетную запись POSIX"
  
-#: plugins/personal/posix/class_posixAccount.inc:770
+#: plugins/personal/posix/class_posixAccount.inc:762
  msgid "Failed: overriding lock"
  msgstr "Ошибка: замещение блокировки"
  
-#: plugins/personal/posix/class_posixAccount.inc:859
+#: plugins/personal/posix/class_posixAccount.inc:851
  #, fuzzy, php-format
  msgid "Saving of user/posix account with dn '%s' failed."
  msgstr "Аккаунт Proxy"
  
-#: plugins/personal/posix/class_posixAccount.inc:924
+#: plugins/personal/posix/class_posixAccount.inc:916
  msgid "The required field 'Home directory' is not set."
  msgstr "Обязательное поле \"Домашний каталог\" не заполнено."
  
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:919
  msgid "Please enter a valid path in 'Home directory' field."
  msgstr "Введите корректный путь в поле \"Домашний каталог\"."
  
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:927
  msgid "Value specified as 'UID' is not valid."
  msgstr "Значение поля \"UID\" некорректно."
  
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:930
  msgid "Value specified as 'UID' is too small."
  msgstr "Значение 'UID' слишком маленькое."
  
-#: plugins/personal/posix/class_posixAccount.inc:942
-#: plugins/admin/groups/class_groupGeneric.inc:797
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:791
  msgid "Value specified as 'GID' is not valid."
  msgstr "Значение поля 'GID' некорректно."
  
-#: plugins/personal/posix/class_posixAccount.inc:945
-#: plugins/admin/groups/class_groupGeneric.inc:800
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:794
  msgid "Value specified as 'GID' is too small."
  msgstr "Значение 'GID' слишком маленькое."
  
-#: plugins/personal/posix/class_posixAccount.inc:953
+#: plugins/personal/posix/class_posixAccount.inc:945
  msgid "Value specified as 'shadowMin' is not valid."
  msgstr "Значение поля \"shadowMin\" некорректно."
  
-#: plugins/personal/posix/class_posixAccount.inc:958
+#: plugins/personal/posix/class_posixAccount.inc:950
  msgid "Value specified as 'shadowMax' is not valid."
  msgstr "Значение поля \"shadowMax\" некорректно."
  
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:955
  msgid "Value specified as 'shadowWarning' is not valid."
  msgstr "Значение поля \"shadowWarning\" некорректно."
  
-#: plugins/personal/posix/class_posixAccount.inc:966
+#: plugins/personal/posix/class_posixAccount.inc:958
  msgid "'shadowWarning' without 'shadowMax' makes no sense."
  msgstr "Использование \"shadowWarning\" без \"shadowMax\" бессмысленно."
  
-#: plugins/personal/posix/class_posixAccount.inc:969
+#: plugins/personal/posix/class_posixAccount.inc:961
  msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
  msgstr ""
  "Значение поля \"shadowWarning\" должно быть меньше значения поля \"shadowMax"
  "\"."
  
-#: plugins/personal/posix/class_posixAccount.inc:972
+#: plugins/personal/posix/class_posixAccount.inc:964
  msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
  msgstr ""
  "Значение поля \"shadowWarning\" должно быть больше значения поля \"shadowMin"
  "\"."
  
-#: plugins/personal/posix/class_posixAccount.inc:977
+#: plugins/personal/posix/class_posixAccount.inc:969
  msgid "Value specified as 'shadowInactive' is not valid."
  msgstr "Значение поля \"shadowInactive\" некорректно."
  
-#: plugins/personal/posix/class_posixAccount.inc:980
+#: plugins/personal/posix/class_posixAccount.inc:972
  msgid "'shadowInactive' without 'shadowMax' makes no sense."
  msgstr "Использование \"shadowInactive\" без \"shadowMax\" бессмысленно."
  
-#: plugins/personal/posix/class_posixAccount.inc:985
+#: plugins/personal/posix/class_posixAccount.inc:977
  msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
  msgstr ""
  "Значение поля \"shadowMin\" должно быть меньше значения поля \"shadowMax\"."
  
-#: plugins/personal/posix/class_posixAccount.inc:1148
-#: plugins/admin/groups/class_groupGeneric.inc:836
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:830
  msgid "Too many users, can't allocate a free ID!"
  msgstr "Слишком много пользователей, невозможно создать идентификатор!"
  
-#: plugins/personal/posix/class_posixAccount.inc:1317
+#: plugins/personal/posix/class_posixAccount.inc:1309
  #, fuzzy
  msgid "POSIX account"
  msgstr "Аккаунт FTP"
  
-#: plugins/personal/posix/class_posixAccount.inc:1329
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:100
+#: plugins/personal/posix/class_posixAccount.inc:1314
+#, fuzzy
+msgid "Posix Account"
+msgstr "Аккаунт Proxy"
+
+#: plugins/personal/posix/class_posixAccount.inc:1322
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:100
  #: html/getxls.php:135 html/getxls.php:158 html/getxls.php:347
  #: html/getxls.php:364
  msgid "User ID"
  msgstr "Идентификатор пользователя"
  
-#: plugins/personal/posix/class_posixAccount.inc:1330
+#: plugins/personal/posix/class_posixAccount.inc:1323
  #, fuzzy
  msgid "Group ID"
  msgstr "Группа"
  
-#: plugins/personal/posix/class_posixAccount.inc:1332
+#: plugins/personal/posix/class_posixAccount.inc:1325
  #, fuzzy
  msgid "Force password change on login"
  msgstr "Сменить пароль"
  
-#: plugins/personal/posix/class_posixAccount.inc:1333
+#: plugins/personal/posix/class_posixAccount.inc:1326
  #, fuzzy
  msgid "Shadow min"
  msgstr "Затенение"
  
-#: plugins/personal/posix/class_posixAccount.inc:1334
+#: plugins/personal/posix/class_posixAccount.inc:1327
  #, fuzzy
  msgid "Shadow max"
  msgstr "Затенение"
  
-#: plugins/personal/posix/class_posixAccount.inc:1335
+#: plugins/personal/posix/class_posixAccount.inc:1328
  #, fuzzy
  msgid "Shadow warning"
  msgstr "Затенение"
  
-#: plugins/personal/posix/class_posixAccount.inc:1336
+#: plugins/personal/posix/class_posixAccount.inc:1329
  #, fuzzy
  msgid "Shadow inactive"
  msgstr "Затенение"
  
-#: plugins/personal/posix/class_posixAccount.inc:1337
+#: plugins/personal/posix/class_posixAccount.inc:1330
  #, fuzzy
  msgid "Shadow expire"
  msgstr "Показать людей"
  
-#: plugins/personal/posix/class_posixAccount.inc:1338
+#: plugins/personal/posix/class_posixAccount.inc:1331
  #, fuzzy
  msgid "System trust model"
  msgstr "Системные доверия"
@@ -1844,7 +1873,7 @@ msgid "Allow user to change password from client"
  msgstr "Разрешить пользователям менять пароль с клиента"
  
  #: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/class_sambaAccount.inc:1056
  msgid "Login from windows client requires no password"
  msgstr "Не спрашивать пароль при входе в систему из Windows"
  
@@ -1853,7 +1882,7 @@ msgid "Temporary disable samba account"
  msgstr "Временно отключить учетную запись Samba"
  
  #: plugins/personal/samba/samba3.tpl:27
-#: plugins/personal/samba/class_sambaAccount.inc:1069
+#: plugins/personal/samba/class_sambaAccount.inc:1070
  msgid "Domain"
  msgstr "Домен"
  
@@ -1862,12 +1891,12 @@ msgid "Terminal Server"
  msgstr "Терминальный сервер"
  
  #: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1052
  msgid "Allow login on terminal server"
  msgstr "Разрешить вход на терминальный сервер"
  
  #: plugins/personal/samba/samba3.tpl:131
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1053
  msgid "Inherit client config"
  msgstr "Унаследовать конфигурацию клиента"
  
@@ -1932,18 +1961,18 @@ msgid "Reconnect if disconnected"
  msgstr "В"
  
  #: plugins/personal/samba/samba3.tpl:306
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1057
  #, fuzzy
  msgid "Lock samba account"
  msgstr "Удалить учетную запись Samba"
  
  #: plugins/personal/samba/samba3.tpl:331
-#: plugins/personal/samba/class_sambaAccount.inc:1062
+#: plugins/personal/samba/class_sambaAccount.inc:1063
  msgid "Limit Logon Time"
  msgstr ""
  
  #: plugins/personal/samba/samba3.tpl:351
-#: plugins/personal/samba/class_sambaAccount.inc:1063
+#: plugins/personal/samba/class_sambaAccount.inc:1064
  msgid "Limit Logoff Time"
  msgstr ""
  
@@ -2082,41 +2111,46 @@ msgstr ""
  msgid "Saving of user/samba account with dn '%s' failed."
  msgstr "Моя учетная запись"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1047
+#, fuzzy
+msgid "Samba account"
+msgstr "Удалить учетную запись Samba"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1055
  #, fuzzy
  msgid "Allow user to change password"
  msgstr "Разрешить пользователям менять пароль с клиента"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1059
+#: plugins/personal/samba/class_sambaAccount.inc:1060
  #, fuzzy
  msgid "Account expires"
  msgstr "Учетная запись"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1060
+#: plugins/personal/samba/class_sambaAccount.inc:1061
  #, fuzzy
  msgid "Password expires"
  msgstr "Срок действия пароля истекает"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1065
+#: plugins/personal/samba/class_sambaAccount.inc:1066
  #, fuzzy
  msgid "Generic home directory"
  msgstr "Домашний каталог"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1066
+#: plugins/personal/samba/class_sambaAccount.inc:1067
  msgid "Generic samba home drive"
  msgstr ""
  
-#: plugins/personal/samba/class_sambaAccount.inc:1067
+#: plugins/personal/samba/class_sambaAccount.inc:1068
  #, fuzzy
  msgid "Generic script path"
  msgstr "Путь к сценариям"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1068
+#: plugins/personal/samba/class_sambaAccount.inc:1069
  #, fuzzy
  msgid "Generic profile path"
  msgstr "Путь к профилю"
  
-#: plugins/personal/samba/class_sambaAccount.inc:1070
+#: plugins/personal/samba/class_sambaAccount.inc:1071
  #, fuzzy
  msgid "Allow connection from"
  msgstr "Разрешить подключения только от этой рабочей станции"
@@ -2133,103 +2167,93 @@ msgstr "мужской"
  msgid "This account has no valid GOsa extensions."
  msgstr "Для этой учетной записи нет корректных расширений GOsa."
  
-#: plugins/personal/generic/class_user.inc:330
+#: plugins/personal/generic/class_user.inc:335
  msgid "The specified file has not been uploaded via HTTP POST! Aborted."
  msgstr ""
  "Указанный файл не был загружен на сервер (метод HTTP POST)! Операция "
  "прервана."
  
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:432
  msgid "Please enter a valid serial number"
  msgstr "Введите корректный серийный номер"
  
-#: plugins/personal/generic/class_user.inc:471
+#: plugins/personal/generic/class_user.inc:476
  msgid ""
  "(Some types of certificates are currently not supported and may be displayed "
  "as 'invalid'.)"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:481
+#: plugins/personal/generic/class_user.inc:486
  #, php-format
  msgid "Certificate is valid from %s to %s and is currently %s."
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:484
+#: plugins/personal/generic/class_user.inc:489
  msgid "valid"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:485
+#: plugins/personal/generic/class_user.inc:490
  msgid "invalid"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:490
+#: plugins/personal/generic/class_user.inc:495
  #, fuzzy
  msgid "No certificate installed"
  msgstr "Изменить сертификаты"
  
-#: plugins/personal/generic/class_user.inc:579
+#: plugins/personal/generic/class_user.inc:582
  #, fuzzy, php-format
  msgid "Removing of user/generic account with dn '%s' failed."
  msgstr "Удалить учетную запись POSIX"
  
-#: plugins/personal/generic/class_user.inc:611
-#: plugins/personal/generic/class_user.inc:980
+#: plugins/personal/generic/class_user.inc:614
+#: plugins/personal/generic/class_user.inc:982
  msgid "Kerberos database communication failed"
  msgstr "Ошибка соединения с базой данных Kerberos"
  
-#: plugins/personal/generic/class_user.inc:625
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:628
+#: plugins/personal/generic/class_user.inc:999
  msgid "Can't remove user from kerberos database."
  msgstr "Не удается удалить пользователя из базы данных Kerberos."
  
-#: plugins/personal/generic/class_user.inc:682
-#: plugins/admin/systems/class_printGeneric.inc:625
+#: plugins/personal/generic/class_user.inc:684
  #, fuzzy, php-format
  msgid "You are not allowed to move this object to '%s'."
  msgstr "У вас недостаточно прав для удаления этого группового объекта!"
  
-#: plugins/personal/generic/class_user.inc:933
+#: plugins/personal/generic/class_user.inc:935
  #, fuzzy, php-format
  msgid "Saving of user/generic account with dn '%s' failed."
  msgstr "Аккаунт Proxy"
  
-#: plugins/personal/generic/class_user.inc:1008
+#: plugins/personal/generic/class_user.inc:1010
  msgid "Can't add user to kerberos database."
  msgstr "Не удается добавить пользователя в базу данных Kerberos."
  
-#: plugins/personal/generic/class_user.inc:1049
-msgid "You have no permissions to create a user on this 'Base'."
-msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
-
-#: plugins/personal/generic/class_user.inc:1052
-#, fuzzy
-msgid "You have no permissions to move this user to the specified 'Base'."
-msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
-
-#: plugins/personal/generic/class_user.inc:1058
-#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/personal/generic/class_user.inc:1057
+#: plugins/addons/addressbook/class_addressbook.inc:653
  #: plugins/admin/users/class_userManagement.inc:471
  #: plugins/admin/users/class_userManagement.inc:549
  msgid "The required field 'Name' is not set."
  msgstr "Обязательное поле \"Имя\" не заполнено."
  
-#: plugins/personal/generic/class_user.inc:1067
+#: plugins/personal/generic/class_user.inc:1066
  msgid "There's already a person with this 'Login' in the database."
  msgstr ""
  "Пользователь с таким регистрационным именем в базе данных уже существует."
  
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/personal/generic/class_user.inc:1072
+#: plugins/addons/addressbook/class_addressbook.inc:657
  #: plugins/admin/users/class_userManagement.inc:474
  #: plugins/admin/users/class_userManagement.inc:552
  msgid "The required field 'Given name' is not set."
  msgstr "Обязательное поле \"Личное имя\" не заполнено."
  
-#: plugins/personal/generic/class_user.inc:1076
+#: plugins/personal/generic/class_user.inc:1075
  msgid "The required field 'Login' is not set."
  msgstr "Обязательное поле \"Регистрационное имя\" не заполнено."
  
-#: plugins/personal/generic/class_user.inc:1083
+#: plugins/personal/generic/class_user.inc:1082
  msgid ""
  "There's already a person with this 'Name'/'Given name' combination in the "
  "database."
@@ -2237,7 +2261,7 @@ msgstr ""
  "Пользователь с такой комбинацией имени и личного имени в базе данных уже "
  "существует."
  
-#: plugins/personal/generic/class_user.inc:1090
+#: plugins/personal/generic/class_user.inc:1089
  msgid ""
  "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
@@ -2245,121 +2269,121 @@ msgstr ""
  "Значение поля \"Регистрационное имя\" содержит недопустимые символы. "
  "Допустимыми являются буквы в нижнем регистре, цифры и дефисы."
  
-#: plugins/personal/generic/class_user.inc:1093
+#: plugins/personal/generic/class_user.inc:1092
  msgid "The field 'Homepage' contains an invalid URL definition."
  msgstr "Значение поля \"Домашняя страница\" содержит некорректный URL."
  
-#: plugins/personal/generic/class_user.inc:1096
-#: plugins/personal/generic/class_user.inc:1121
-#: plugins/addons/addressbook/class_addressbook.inc:661
-#: plugins/addons/addressbook/class_addressbook.inc:689
-#: plugins/admin/departments/class_departmentGeneric.inc:249
+#: plugins/personal/generic/class_user.inc:1095
+#: plugins/personal/generic/class_user.inc:1120
+#: plugins/addons/addressbook/class_addressbook.inc:663
+#: plugins/addons/addressbook/class_addressbook.inc:691
+#: plugins/admin/departments/class_departmentGeneric.inc:269
  msgid "The field 'Name' contains invalid characters."
  msgstr "Значение поля \"Имя\" содержит недопустимые символы."
  
-#: plugins/personal/generic/class_user.inc:1099
-#: plugins/personal/generic/class_user.inc:1118
-#: plugins/addons/addressbook/class_addressbook.inc:664
-#: plugins/addons/addressbook/class_addressbook.inc:686
+#: plugins/personal/generic/class_user.inc:1098
+#: plugins/personal/generic/class_user.inc:1117
+#: plugins/addons/addressbook/class_addressbook.inc:666
+#: plugins/addons/addressbook/class_addressbook.inc:688
  msgid "The field 'Given name' contains invalid characters."
  msgstr "Значение поля \"Личное имя\" содержит недопустимые символы."
  
-#: plugins/personal/generic/class_user.inc:1104
-#: plugins/addons/addressbook/class_addressbook.inc:669
-#: plugins/addons/addressbook/class_addressbook.inc:672
-#: plugins/admin/departments/class_departmentGeneric.inc:252
+#: plugins/personal/generic/class_user.inc:1103
+#: plugins/addons/addressbook/class_addressbook.inc:671
+#: plugins/addons/addressbook/class_addressbook.inc:674
+#: plugins/admin/departments/class_departmentGeneric.inc:272
  msgid "The field 'Phone' contains an invalid phone number."
  msgstr "Значение поля \"Телефон\" содержит недопустимый номер телефона."
  
-#: plugins/personal/generic/class_user.inc:1107
-#: plugins/addons/addressbook/class_addressbook.inc:675
-#: plugins/admin/departments/class_departmentGeneric.inc:255
+#: plugins/personal/generic/class_user.inc:1106
+#: plugins/addons/addressbook/class_addressbook.inc:677
+#: plugins/admin/departments/class_departmentGeneric.inc:275
  msgid "The field 'Fax' contains an invalid phone number."
  msgstr "Значение поля \"Факс\" содержит недопустимый номер телефона."
  
-#: plugins/personal/generic/class_user.inc:1110
-#: plugins/addons/addressbook/class_addressbook.inc:678
+#: plugins/personal/generic/class_user.inc:1109
+#: plugins/addons/addressbook/class_addressbook.inc:680
  msgid "The field 'Mobile' contains an invalid phone number."
  msgstr "Значение поля \"Мобильный\" содержит некорректный номер телефона."
  
-#: plugins/personal/generic/class_user.inc:1113
-#: plugins/addons/addressbook/class_addressbook.inc:681
+#: plugins/personal/generic/class_user.inc:1112
+#: plugins/addons/addressbook/class_addressbook.inc:683
  msgid "The field 'Pager' contains an invalid phone number."
  msgstr "Значение поля \"Пейджер\" содержит некорректный номер телефона."
  
-#: plugins/personal/generic/class_user.inc:1222
+#: plugins/personal/generic/class_user.inc:1221
  #, fuzzy
  msgid "Could not open specified certificate!"
  msgstr "Невозможно выбрать базу данных!"
  
-#: plugins/personal/generic/class_user.inc:1353
+#: plugins/personal/generic/class_user.inc:1352
  #: plugins/personal/generic/generic.tpl:442
  msgid "Unit"
  msgstr "Подразделение"
  
-#: plugins/personal/generic/class_user.inc:1354
+#: plugins/personal/generic/class_user.inc:1353
  #: plugins/personal/generic/generic.tpl:467
  msgid "House identifier"
  msgstr "Номер дома"
  
-#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/class_user.inc:1354
  #: plugins/personal/generic/generic.tpl:384
  msgid "Vocation"
  msgstr "Специальность"
  
-#: plugins/personal/generic/class_user.inc:1356
+#: plugins/personal/generic/class_user.inc:1355
  #: plugins/personal/generic/generic.tpl:511
  msgid "Last delivery"
  msgstr "Последняя доставка"
  
-#: plugins/personal/generic/class_user.inc:1357
+#: plugins/personal/generic/class_user.inc:1356
  #: plugins/personal/generic/generic.tpl:433
  msgid "Person locality"
  msgstr "Местоположение сотрудника"
  
-#: plugins/personal/generic/class_user.inc:1358
+#: plugins/personal/generic/class_user.inc:1357
  #: plugins/personal/generic/generic.tpl:392
  msgid "Unit description"
  msgstr "Описание подразделения"
  
-#: plugins/personal/generic/class_user.inc:1359
+#: plugins/personal/generic/class_user.inc:1358
  #: plugins/personal/generic/generic.tpl:401
  msgid "Subject area"
  msgstr "Область деятельности"
  
-#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/class_user.inc:1359
  #: plugins/personal/generic/generic.tpl:410
  msgid "Functional title"
  msgstr "Должность"
  
-#: plugins/personal/generic/class_user.inc:1362
+#: plugins/personal/generic/class_user.inc:1361
  #: plugins/personal/generic/generic.tpl:520
  msgid "Public visible"
  msgstr "Видимый всем"
  
-#: plugins/personal/generic/class_user.inc:1363
+#: plugins/personal/generic/class_user.inc:1362
  #: plugins/personal/generic/generic.tpl:451
  msgid "Street"
  msgstr "Улица"
  
-#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/class_user.inc:1363
  #: plugins/personal/generic/generic.tpl:419
  msgid "Role"
  msgstr "Роль"
  
-#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/class_user.inc:1364
  #: plugins/personal/generic/generic.tpl:459
  #: plugins/addons/addressbook/address_edit.tpl:179
  #: plugins/addons/addressbook/address_info.tpl:133 html/getxls.php:227
  msgid "Postal code"
  msgstr "Почтовый индекс"
  
-#: plugins/personal/generic/class_user.inc:1369
+#: plugins/personal/generic/class_user.inc:1368
  #, fuzzy
  msgid "Generic user settings"
  msgstr "Общая информация о пользователе"
  
-#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/class_user.inc:1373
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/users/class_userManagement.inc:28
  #: plugins/admin/systems/printer.tpl:91
@@ -2369,220 +2393,221 @@ msgstr "Общая информация о пользователе"
  msgid "Users"
  msgstr "Пользователи"
  
-#: plugins/personal/generic/class_user.inc:1378
+#: plugins/personal/generic/class_user.inc:1377
  #: plugins/personal/generic/generic.tpl:143
  #: plugins/gofax/blocklists/generic.tpl:17
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:598
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
  #: plugins/addons/godfs/class_dfsManagment.inc:217
  #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:894
-#: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/groups/class_groupGeneric.inc:888
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:129
  #: plugins/admin/applications/generic.tpl:42
-#: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:134
+#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/class_divListApplication.inc:144
  #: plugins/admin/departments/generic.tpl:35
-#: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:107
+#: plugins/admin/departments/class_departmentGeneric.inc:586
+#: plugins/admin/departments/class_divListDepartment.inc:100
  #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:22
  #: plugins/admin/systems/phone.tpl:17 plugins/admin/systems/printer.tpl:27
  #: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/class_terminalGeneric.inc:513
-#: plugins/admin/systems/class_servGeneric.inc:346
-#: plugins/admin/systems/class_workstationGeneric.inc:515
+#: plugins/admin/systems/class_terminalGeneric.inc:553
+#: plugins/admin/systems/class_servGeneric.inc:359
+#: plugins/admin/systems/class_workstationGeneric.inc:537
  #: plugins/admin/systems/wingeneric.tpl:13
  #: plugins/admin/systems/component.tpl:17
-#: plugins/admin/systems/class_printGeneric.inc:864
-#: plugins/admin/systems/class_componentGeneric.inc:267
-#: plugins/admin/systems/class_glpiSelectUser.inc:167
+#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_componentGeneric.inc:269
+#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_glpiSelectUser.inc:181
  #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:148
+#: plugins/admin/systems/class_divListSystem.inc:187
  #: plugins/admin/systems/goLdapServer.tpl:2
  #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:719
-#: plugins/admin/ogroups/class_divListOGroup.inc:145
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_divListOGroup.inc:149
+#: plugins/admin/acl/class_divListACL.inc:98
+#: plugins/admin/fai/class_divListFai.inc:171
  #: plugins/admin/mimetypes/generic.tpl:44
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:683
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:153
  #: plugins/gofon/macro/generic.tpl:27
-#: plugins/gofon/macro/class_gofonMacro.inc:484
-#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/macro/class_gofonMacro.inc:497
+#: plugins/gofon/macro/class_divListMacros.inc:106
  #: plugins/gofon/conference/generic.tpl:49
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
-#: plugins/gofon/conference/class_divListConferences.inc:119
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_divListConferences.inc:114
  msgid "Base"
  msgstr "Ветка"
  
-#: plugins/personal/generic/class_user.inc:1380
-#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/addons/addressbook/class_addressbook.inc:792 html/getxls.php:301
  #, fuzzy
  msgid "Surename"
  msgstr "Имя сервера"
  
-#: plugins/personal/generic/class_user.inc:1381
-#: plugins/addons/addressbook/class_addressbook.inc:611
-#: plugins/addons/addressbook/class_addressbook.inc:791 html/getxls.php:86
+#: plugins/personal/generic/class_user.inc:1380
+#: plugins/addons/addressbook/class_addressbook.inc:613
+#: plugins/addons/addressbook/class_addressbook.inc:793 html/getxls.php:86
  #: html/getxls.php:223 html/getxls.php:281 html/getxls.php:297
  msgid "Given name"
  msgstr "Имя"
  
-#: plugins/personal/generic/class_user.inc:1382
-#: plugins/addons/addressbook/class_addressbook.inc:796
+#: plugins/personal/generic/class_user.inc:1381
+#: plugins/addons/addressbook/class_addressbook.inc:798
  #, fuzzy
  msgid "User identification"
  msgstr "Информация"
  
-#: plugins/personal/generic/class_user.inc:1383
+#: plugins/personal/generic/class_user.inc:1382
  #: plugins/personal/generic/generic.tpl:73
  #: plugins/addons/addressbook/address_edit.tpl:60
  #: plugins/addons/addressbook/address_info.tpl:40
  msgid "Personal title"
  msgstr "Обращение"
  
-#: plugins/personal/generic/class_user.inc:1384
+#: plugins/personal/generic/class_user.inc:1383
  #: plugins/personal/generic/generic.tpl:83
  msgid "Academic title"
  msgstr "Академическое звание"
  
-#: plugins/personal/generic/class_user.inc:1385
-#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
+#: plugins/personal/generic/class_user.inc:1384
+#: plugins/addons/addressbook/class_addressbook.inc:809 html/getxls.php:224
  msgid "Home postal address"
  msgstr ""
  
-#: plugins/personal/generic/class_user.inc:1386
-#: plugins/addons/addressbook/class_addressbook.inc:795
+#: plugins/personal/generic/class_user.inc:1385
+#: plugins/addons/addressbook/class_addressbook.inc:797
  #, fuzzy
  msgid "Home phone number"
  msgstr "Телефонные номера"
  
-#: plugins/personal/generic/class_user.inc:1387
+#: plugins/personal/generic/class_user.inc:1386
  #: plugins/personal/generic/generic.tpl:183
  msgid "Homepage"
  msgstr "Домашняя страница"
  
-#: plugins/personal/generic/class_user.inc:1388
+#: plugins/personal/generic/class_user.inc:1387
  #: plugins/personal/generic/generic.tpl:250
-#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
+#: plugins/addons/addressbook/class_addressbook.inc:801 html/getxls.php:299
  msgid "Organization"
  msgstr "Организация"
  
-#: plugins/personal/generic/class_user.inc:1389
+#: plugins/personal/generic/class_user.inc:1388
  #: plugins/personal/generic/generic.tpl:258
  #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
  #: plugins/addons/addressbook/address_edit.tpl:155
-#: plugins/addons/addressbook/class_addressbook.inc:800
+#: plugins/addons/addressbook/class_addressbook.inc:802
  #: plugins/addons/addressbook/address_info.tpl:117
  #: plugins/admin/users/class_divListUsers.inc:56
  #: plugins/admin/applications/class_divListApplication.inc:51
-#: plugins/admin/ogroups/class_ogroupManagement.inc:354
+#: plugins/admin/ogroups/class_ogroupManagement.inc:349
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
  #: plugins/gofon/macro/class_divListMacros.inc:52
  #: plugins/generic/references/class_reference.inc:38
  msgid "Department"
  msgstr "Подразделение"
  
-#: plugins/personal/generic/class_user.inc:1390
+#: plugins/personal/generic/class_user.inc:1389
  #: plugins/personal/generic/generic.tpl:93
  msgid "Date of birth"
  msgstr "Дата рождения"
  
-#: plugins/personal/generic/class_user.inc:1391
+#: plugins/personal/generic/class_user.inc:1390
  #, fuzzy
  msgid "Gender"
  msgstr "Отправитель"
  
-#: plugins/personal/generic/class_user.inc:1392
+#: plugins/personal/generic/class_user.inc:1391
  #, fuzzy
  msgid "Preferred language"
  msgstr "Язык по умолчанию"
  
-#: plugins/personal/generic/class_user.inc:1393
+#: plugins/personal/generic/class_user.inc:1392
  #, fuzzy
  msgid "Department number"
  msgstr "Управление подразделениями"
  
-#: plugins/personal/generic/class_user.inc:1394
+#: plugins/personal/generic/class_user.inc:1393
  #, fuzzy
  msgid "Employee number"
  msgstr "Форма трудоустройства"
  
-#: plugins/personal/generic/class_user.inc:1395
+#: plugins/personal/generic/class_user.inc:1394
  #: plugins/personal/generic/generic.tpl:282
  msgid "Employee type"
  msgstr "Форма трудоустройства"
  
-#: plugins/personal/generic/class_user.inc:1396
+#: plugins/personal/generic/class_user.inc:1395
  #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/class_addressbook.inc:801
+#: plugins/addons/addressbook/class_addressbook.inc:803
  #: plugins/addons/godfs/generic.tpl:34
  #: plugins/admin/departments/generic.tpl:56
  #: plugins/admin/departments/generic.tpl:68
-#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: plugins/admin/departments/class_departmentGeneric.inc:587
  #: plugins/admin/systems/workstation.tpl:19
-#: plugins/admin/systems/class_workstationGeneric.inc:514
-#: plugins/admin/systems/class_printGeneric.inc:866
+#: plugins/admin/systems/class_workstationGeneric.inc:536
+#: plugins/admin/systems/class_printGeneric.inc:870
  #: plugins/admin/systems/class_glpiAccount.inc:782
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
  msgid "Location"
  msgstr "Местоположение"
  
-#: plugins/personal/generic/class_user.inc:1397
+#: plugins/personal/generic/class_user.inc:1396
  #: plugins/personal/generic/generic.tpl:360
-#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:806
  #: plugins/admin/departments/generic.tpl:60
-#: plugins/admin/departments/class_departmentGeneric.inc:547
+#: plugins/admin/departments/class_departmentGeneric.inc:591
  #: html/getxls.php:228 html/getxls.php:301
  msgid "State"
  msgstr "Адм. единица"
  
-#: plugins/personal/generic/class_user.inc:1398
+#: plugins/personal/generic/class_user.inc:1397
  #: plugins/personal/generic/paste_generic.tpl:47
  #, fuzzy
  msgid "User picture"
  msgstr "Изображение"
  
-#: plugins/personal/generic/class_user.inc:1399
+#: plugins/personal/generic/class_user.inc:1398
  #, fuzzy
  msgid "Room number"
  msgstr "Телефонные номера"
  
-#: plugins/personal/generic/class_user.inc:1400
-#: plugins/addons/addressbook/class_addressbook.inc:792
+#: plugins/personal/generic/class_user.inc:1399
+#: plugins/addons/addressbook/class_addressbook.inc:794
  #, fuzzy
  msgid "Telefon number"
  msgstr "Телефонные номера"
  
-#: plugins/personal/generic/class_user.inc:1401
-#: plugins/addons/addressbook/class_addressbook.inc:794
+#: plugins/personal/generic/class_user.inc:1400
+#: plugins/addons/addressbook/class_addressbook.inc:796
  #, fuzzy
  msgid "Mobile number"
  msgstr "Домашний телефон"
  
-#: plugins/personal/generic/class_user.inc:1402
-#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#: plugins/personal/generic/class_user.inc:1401
+#: plugins/personal/nagios/class_nagiosAccount.inc:272
  #, fuzzy
  msgid "Pager number"
  msgstr "Телефонные номера"
  
-#: plugins/personal/generic/class_user.inc:1403
+#: plugins/personal/generic/class_user.inc:1402
  #, fuzzy
  msgid "User certificates"
  msgstr "Стандартный сертификат"
  
-#: plugins/personal/generic/class_user.inc:1405
-#: plugins/addons/addressbook/class_addressbook.inc:802
-#: plugins/addons/addressbook/class_addressbook.inc:803 html/getxls.php:226
+#: plugins/personal/generic/class_user.inc:1404
+#: plugins/addons/addressbook/class_addressbook.inc:804
+#: plugins/addons/addressbook/class_addressbook.inc:805 html/getxls.php:226
  #: html/getxls.php:298 html/getxls.php:300
  #, fuzzy
  msgid "Postal address"
  msgstr "Почтовый индекс"
  
-#: plugins/personal/generic/class_user.inc:1406
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:820
-#: plugins/addons/addressbook/class_addressbook.inc:793
+#: plugins/personal/generic/class_user.inc:1405
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
+#: plugins/addons/addressbook/class_addressbook.inc:795
  #, fuzzy
  msgid "Fax number"
  msgstr "Терминал"
@@ -2661,7 +2686,7 @@ msgstr "Выберите ветку для пользователя"
  #: plugins/admin/systems/workstation.tpl:35
  #: plugins/admin/systems/wingeneric.tpl:18
  #: plugins/admin/systems/component.tpl:25 plugins/admin/ogroups/generic.tpl:34
-#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:36
+#: plugins/admin/mimetypes/generic.tpl:53 plugins/gofon/macro/generic.tpl:36
  #: plugins/gofon/conference/generic.tpl:56
  #: plugins/gofon/conference/generic.tpl:62
  #, fuzzy
@@ -2675,7 +2700,7 @@ msgstr "Выберите, чтобы просмотреть серверы"
  #: plugins/addons/addressbook/address_info.tpl:59
  #: plugins/addons/addressbook/address_info.tpl:155
  #: plugins/admin/departments/generic.tpl:76
-#: plugins/admin/departments/class_departmentGeneric.inc:548
+#: plugins/admin/departments/class_departmentGeneric.inc:592
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
  msgid "Address"
  msgstr "Адрес"
@@ -2733,7 +2758,7 @@ msgstr "Мобильный"
  #: plugins/personal/generic/generic.tpl:326
  #: plugins/personal/nagios/nagios.tpl:79
  #: plugins/addons/addressbook/address_edit.tpl:246
-#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/class_addressbook.inc:800
  #: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
  #: html/getxls.php:300
  msgid "Pager"
@@ -2755,6 +2780,7 @@ msgstr ""
  
  #: plugins/personal/generic/generic_picture.tpl:27
  #: plugins/personal/generic/paste_generic.tpl:52
+#: plugins/admin/applications/generic.tpl:81
  msgid "Remove picture"
  msgstr "Удалить изображение"
  
@@ -2762,37 +2788,38 @@ msgstr "Удалить изображение"
  #: plugins/personal/generic/generic_certs.tpl:91
  #: plugins/personal/environment/hotplugDialogNew.tpl:53
  #: plugins/addons/addressbook/address_edit.tpl:264
-#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/departments/dep_move_confirm.tpl:15
+#: plugins/admin/systems/goNtpServer.tpl:29
  #: plugins/admin/systems/servdns.tpl:21
-#: plugins/admin/systems/servkolab.tpl:246
-#: plugins/admin/systems/goNtpServer.tpl:30
-#: plugins/admin/systems/goKrbServer.tpl:31
+#: plugins/admin/systems/servkolab.tpl:245
+#: plugins/admin/systems/goKrbServer.tpl:30
+#: plugins/admin/systems/goFonServer.tpl:39
  #: plugins/admin/systems/servnfs.tpl:139
-#: plugins/admin/systems/goFonServer.tpl:40
+#: plugins/admin/systems/goFaxServer.tpl:23
  #: plugins/admin/systems/servRepository.tpl:66
-#: plugins/admin/systems/goFaxServer.tpl:24
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
  #: plugins/admin/systems/glpi_devices.tpl:760
  #: plugins/admin/systems/glpiManufacturerAdd.tpl:80
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
  #: plugins/admin/systems/servdnseditzone.tpl:119
  #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/goLdapServer.tpl:10
-#: plugins/admin/systems/goShareServer.tpl:30
-#: plugins/admin/systems/goMailServer.tpl:222
-#: plugins/admin/systems/goImapServer.tpl:117
-#: plugins/admin/systems/goSyslogServer.tpl:6
-#: plugins/admin/systems/goGlpiServer.tpl:33
-#: plugins/admin/systems/goCupsServer.tpl:6
-#: plugins/admin/systems/goTerminalServer.tpl:24
-#: plugins/admin/systems/goLogDBServer.tpl:24
-#: plugins/admin/systems/goSpamServer.tpl:126
-#: plugins/admin/systems/goSpamServerRule.tpl:22
-#: plugins/admin/systems/goVirusServer.tpl:169
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:29
+#: plugins/admin/systems/goMailServer.tpl:221
+#: plugins/admin/systems/goImapServer.tpl:116
+#: plugins/admin/systems/goSyslogServer.tpl:5
+#: plugins/admin/systems/goGlpiServer.tpl:32
+#: plugins/admin/systems/goCupsServer.tpl:5
+#: plugins/admin/systems/goTerminalServer.tpl:23
+#: plugins/admin/systems/goLogDBServer.tpl:23
+#: plugins/admin/systems/goSpamServer.tpl:125
+#: plugins/admin/systems/goSpamServerRule.tpl:21
+#: plugins/admin/systems/goVirusServer.tpl:168
  #: plugins/admin/systems/class_goService.inc:33
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:38
  #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:13
+#: ihtml/themes/default/copyPasteDialog.tpl:19
  msgid "Save"
  msgstr "Сохранить"
  
@@ -2814,21 +2841,21 @@ msgstr "Стандартный сертификат"
  #: plugins/personal/connectivity/class_kolabAccount.inc:258
  #: plugins/personal/environment/environment.tpl:159
  #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:597
+#: plugins/admin/groups/class_groupMail.inc:604
  #: plugins/admin/applications/class_applicationParameters.inc:124
  #: plugins/admin/systems/printer.tpl:71
  #: plugins/admin/systems/glpiPrinter.tpl:152
  #: plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/workstationStartup.tpl:182
+#: plugins/admin/systems/workstationStartup.tpl:186
  #: plugins/admin/systems/terminalStartup.tpl:111
  #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:393
  #: plugins/admin/systems/goMailServer.tpl:73
  #: plugins/admin/systems/goMailServer.tpl:104
  #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:78
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
+#: plugins/admin/fai/faiPackage.tpl:81
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:293
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:295
  msgid "Remove"
  msgstr "Удалить"
  
@@ -2860,6 +2887,7 @@ msgid "Set new password"
  msgstr "Изменить пароль"
  
  #: plugins/personal/connectivity/pureftpd.tpl:4
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:224
  msgid "FTP account"
  msgstr "Аккаунт FTP"
  
@@ -2915,6 +2943,7 @@ msgstr "Временно отключить доступ к FTP"
  
  #: plugins/personal/connectivity/proxy.tpl:23
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
+#: plugins/personal/connectivity/class_proxyAccount.inc:297
  msgid "Proxy account"
  msgstr "Аккаунт Proxy"
  
@@ -2929,7 +2958,7 @@ msgid "Limit proxy access to working time"
  msgstr "Ограничить доступ к прокси рабочим временем"
  
  #: plugins/personal/connectivity/proxy.tpl:84
-#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
  msgid "Restrict proxy usage by quota"
  msgstr "Ограничить квотой использование прокси"
  
@@ -2966,7 +2995,7 @@ msgstr "Настройки Samba"
  #: plugins/personal/connectivity/class_pureftpdAccount.inc:219
  #: plugins/personal/connectivity/class_oxchangeAccount.inc:950
  #: plugins/personal/connectivity/class_proxyAccount.inc:292
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
  #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
  #: plugins/personal/connectivity/class_opengwAccount.inc:310
@@ -2974,12 +3003,18 @@ msgstr "Настройки Samba"
  msgid "Connectivity addon"
  msgstr "Подключение"
  
+#: plugins/personal/connectivity/class_phpgwAccount.inc:148
+#, fuzzy
+msgid "PHPgroupware"
+msgstr "PHPGroupware"
+
  #: plugins/personal/connectivity/phpgw.tpl:3
  msgid "PHPGroupware account"
  msgstr "Учетная запись Groupware"
  
  #: plugins/personal/connectivity/kolab.tpl:3
  #: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/class_kolabAccount.inc:452
  #, fuzzy
  msgid "Kolab account"
  msgstr "Моя учетная запись"
@@ -2991,7 +3026,7 @@ msgid ""
  msgstr ""
  
  #: plugins/personal/connectivity/kolab.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:459
+#: plugins/personal/connectivity/class_kolabAccount.inc:460
  #, fuzzy
  msgid "Delegations"
  msgstr "Назначение"
@@ -3027,7 +3062,7 @@ msgid "days"
  msgstr "день"
  
  #: plugins/personal/connectivity/kolab.tpl:93
-#: plugins/personal/connectivity/class_kolabAccount.inc:460
+#: plugins/personal/connectivity/class_kolabAccount.inc:461
  msgid "Invitation policy"
  msgstr ""
  
@@ -3112,16 +3147,16 @@ msgstr "Моя учетная запись"
  msgid "Kolab account settings"
  msgstr "Моя учетная запись"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:456
+#: plugins/personal/connectivity/class_kolabAccount.inc:457
  msgid "Free busy future"
  msgstr ""
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:457
+#: plugins/personal/connectivity/class_kolabAccount.inc:458
  #, fuzzy
  msgid "Mail size restriction"
  msgstr "Почтовые настройки пользователя"
  
-#: plugins/personal/connectivity/class_kolabAccount.inc:458
+#: plugins/personal/connectivity/class_kolabAccount.inc:459
  #, fuzzy
  msgid "Free busy information"
  msgstr "Общая информация о пользователе"
@@ -3142,6 +3177,7 @@ msgid "Saving of user/webDAV account with dn '%s' failed."
  msgstr "Учетная запись WebDAV"
  
  #: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_webdavAccount.inc:147
  #: plugins/personal/connectivity/webdav.tpl:3
  msgid "WebDAV account"
  msgstr "Учетная запись WebDAV"
@@ -3199,32 +3235,32 @@ msgstr "Тип"
  msgid "Pure ftp account"
  msgstr "Создать настройки факса"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:228
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
  #, fuzzy
  msgid "Quota files"
  msgstr "Размер квоты"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:229
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
  #, fuzzy
  msgid "Upload ratio"
  msgstr "Загрузка процессора"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:230
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
  #, fuzzy
  msgid "Quota MBytes"
  msgstr "Размер квоты"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:231
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
  #, fuzzy
  msgid "Download ratio"
  msgstr "Системная информация"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:232
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
  #, fuzzy
  msgid "Upload bandwith"
  msgstr "Пропускная способность (на сервер)"
  
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:233
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:234
  #, fuzzy
  msgid "Download bandwith"
  msgstr "Пропускная способность (с сервера)"
@@ -3325,19 +3361,25 @@ msgstr "Удалить телефонный аккаунт"
  msgid "Open xchange account settings"
  msgstr "Удалить телефонный аккаунт"
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:959
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:955
+#, fuzzy
+msgid "OpenExchange account"
+msgstr "Удалить телефонный аккаунт"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
  msgid "OXAppointmentDays"
  msgstr ""
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:960
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
  msgid "OXTaskDays"
  msgstr ""
  
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:961
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:962
  msgid "OXTimeZone"
  msgstr ""
  
  #: plugins/personal/connectivity/intranet.tpl:3
+#: plugins/personal/connectivity/class_intranetAccount.inc:181
  #, fuzzy
  msgid "Intranet account"
  msgstr "Создать телефонный аккаунт"
@@ -3399,17 +3441,18 @@ msgstr "Значение поля \"Квота\" некорректно."
  msgid "Saving of user/proxy account with dn '%s' failed."
  msgstr "Аккаунт Proxy"
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:301
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
  msgid "Filter unwanted content"
  msgstr ""
  
-#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
  #, fuzzy
  msgid "Limit proxy access"
  msgstr "Ограничить доступ к прокси рабочим временем"
  
  #: plugins/personal/connectivity/pptp.tpl:3
  #: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_pptpAccount.inc:164
  #, fuzzy
  msgid "PPTP account"
  msgstr "Аккаунт FTP"
@@ -3429,7 +3472,7 @@ msgstr "Удалить настройки эл. почты"
  msgid "Saving of user/intranet account with dn '%s' failed."
  msgstr "Создать телефонный аккаунт"
  
-#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_intranetAccount.inc:185
  #, fuzzy
  msgid "Intranet account settings"
  msgstr "Создать телефонный аккаунт"
@@ -3456,32 +3499,33 @@ msgstr "Аккаунт FTP"
  
  #: plugins/personal/connectivity/opengw.tpl:1
  #: plugins/personal/connectivity/class_opengwAccount.inc:309
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
  #, fuzzy
  msgid "Opengroupware"
  msgstr "Учетная запись Groupware"
  
  #: plugins/personal/connectivity/opengw.tpl:8
-#: plugins/personal/connectivity/class_opengwAccount.inc:319
+#: plugins/personal/connectivity/class_opengwAccount.inc:320
  #, fuzzy
  msgid "Location team"
  msgstr "Местоположение"
  
  #: plugins/personal/connectivity/opengw.tpl:21
-#: plugins/personal/connectivity/class_opengwAccount.inc:320
+#: plugins/personal/connectivity/class_opengwAccount.inc:321
  #, fuzzy
  msgid "Template user"
  msgstr "Шаблон"
  
  #: plugins/personal/connectivity/opengw.tpl:33
-#: plugins/personal/connectivity/class_opengwAccount.inc:321
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/ogroups/class_termgroup.inc:42
+#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/admin/systems/class_servGeneric.inc:53
+#: plugins/admin/systems/class_workstationGeneric.inc:109
+#: plugins/admin/ogroups/class_termgroup.inc:41
  msgid "Locked"
  msgstr ""
  
  #: plugins/personal/connectivity/opengw.tpl:48
-#: plugins/personal/connectivity/class_opengwAccount.inc:322
+#: plugins/personal/connectivity/class_opengwAccount.inc:323
  msgid "Teams"
  msgstr ""
  
@@ -3515,6 +3559,11 @@ msgstr "Учетная запись Groupware"
  msgid "PHP Schedule it settings"
  msgstr "Учетная запись Groupware"
  
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:149
+#, fuzzy
+msgid "PHP schedule it"
+msgstr "Учетная запись Groupware"
+
  #: plugins/personal/connectivity/class_opengwAccount.inc:6
  #, fuzzy
  msgid "Opengroupware account"
@@ -3580,7 +3629,7 @@ msgid "Profil quota"
  msgstr "Путь к профилю"
  
  #: plugins/personal/environment/environment.tpl:73
-#: plugins/personal/environment/class_environment.inc:1282
+#: plugins/personal/environment/class_environment.inc:1285
  msgid "Cache profile localy"
  msgstr ""
  
@@ -3590,7 +3639,7 @@ msgid "Kiosk profile settings"
  msgstr "Почтовые настройки пользователя"
  
  #: plugins/personal/environment/environment.tpl:85
-#: plugins/personal/environment/class_environment.inc:1288
+#: plugins/personal/environment/class_environment.inc:1291
  msgid "Kiosk profile"
  msgstr ""
  
@@ -3600,22 +3649,22 @@ msgid "Manage"
  msgstr "Название"
  
  #: plugins/personal/environment/environment.tpl:105
-#: plugins/personal/environment/class_environment.inc:1281
+#: plugins/personal/environment/class_environment.inc:1284
  msgid "Resolution changeable during session"
  msgstr ""
  
  #: plugins/personal/environment/environment.tpl:110
-#: plugins/personal/environment/class_environment.inc:1287
+#: plugins/personal/environment/class_environment.inc:1290
  #: plugins/admin/systems/workstationService.tpl:122
  #: plugins/admin/systems/terminalService.tpl:108
  msgid "Resolution"
  msgstr "Разрешение"
  
  #: plugins/personal/environment/environment.tpl:133
-#: plugins/personal/environment/class_environment.inc:1293
+#: plugins/personal/environment/class_environment.inc:1296
  #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1123
-#: plugins/admin/systems/workstationStartup.tpl:158
+#: plugins/admin/systems/class_workstationStartup.inc:1168
+#: plugins/admin/systems/workstationStartup.tpl:162
  #: plugins/admin/systems/terminalStartup.tpl:87
  #: plugins/admin/systems/goShareServer.tpl:1
  #, fuzzy
@@ -3649,7 +3698,7 @@ msgid "Logon script management"
  msgstr "Управление системами"
  
  #: plugins/personal/environment/environment.tpl:203
-#: plugins/personal/environment/class_environment.inc:1292
+#: plugins/personal/environment/class_environment.inc:1295
  #, fuzzy
  msgid "Hotplug devices"
  msgstr "Дисковод"
@@ -3661,7 +3710,7 @@ msgstr "Дисковод"
  
  #: plugins/personal/environment/environment.tpl:219
  #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  msgid "New"
  msgstr "Создать"
  
@@ -3725,7 +3774,7 @@ msgid "Please select an entry or press cancel."
  msgstr "Введите корректный номер телефона!"
  
  #: plugins/personal/environment/class_selectPrinterDialog.inc:102
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:140
  #, fuzzy
  msgid "Please select a printer or press cancel."
  msgstr "Введите корректный номер телефона!"
@@ -3771,8 +3820,8 @@ msgid "auto"
  msgstr "Отношение"
  
  #: plugins/personal/environment/class_environment.inc:230
-#: plugins/admin/systems/class_terminalService.inc:95
  #: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_terminalService.inc:97
  #, php-format
  msgid ""
  "You have specified an external resolution hook which can't be read, please "
@@ -3847,7 +3896,7 @@ msgstr "У вас недостаточно прав для удаления эт
  #: plugins/personal/environment/class_environment.inc:591
  #: plugins/personal/environment/class_environment.inc:604
  #: plugins/admin/systems/class_terminalStartup.inc:203
-#: plugins/admin/systems/class_workstationStartup.inc:616
+#: plugins/admin/systems/class_workstationStartup.inc:645
  #, fuzzy
  msgid "You must specify a valid mount point."
  msgstr "Введите корректное имя пользователя!"
@@ -3917,30 +3966,32 @@ msgid "Administrator"
  msgstr "Администрирование"
  
  #: plugins/personal/environment/class_environment.inc:1243
-#: plugins/personal/environment/class_environment.inc:1290
+#: plugins/personal/environment/class_environment.inc:1293
  msgid "Default printer"
  msgstr "Принтер по умолчанию"
  
  #: plugins/personal/environment/class_environment.inc:1270
+#: plugins/personal/environment/class_environment.inc:1275
+#: plugins/personal/environment/class_environment.inc:1277
  #, fuzzy
  msgid "Environment settings"
  msgstr "Почтовые настройки пользователя"
  
-#: plugins/personal/environment/class_environment.inc:1277
+#: plugins/personal/environment/class_environment.inc:1280
  msgid "Command to extend the list of possible screen resolutions"
  msgstr ""
  
-#: plugins/personal/environment/class_environment.inc:1284
+#: plugins/personal/environment/class_environment.inc:1287
  #, fuzzy
  msgid "Profile quota"
  msgstr "Путь к профилю"
  
-#: plugins/personal/environment/class_environment.inc:1285
+#: plugins/personal/environment/class_environment.inc:1288
  #, fuzzy
  msgid "Profile server"
  msgstr "Сервер для хранения запросов и временных файлов"
  
-#: plugins/personal/environment/class_environment.inc:1291
+#: plugins/personal/environment/class_environment.inc:1294
  #: plugins/personal/environment/logonManagement.tpl:56
  msgid "Logon script"
  msgstr ""
@@ -3994,31 +4045,31 @@ msgstr "Список"
  #: plugins/personal/environment/logonManagement.tpl:17
  #: plugins/personal/environment/hotplugDialogNew.tpl:17
  #: plugins/gofax/blocklists/generic.tpl:51
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:597
  #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
  #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:889
  #: plugins/admin/applications/generic.tpl:33
-#: plugins/admin/applications/class_applicationGeneric.inc:525
+#: plugins/admin/applications/class_applicationGeneric.inc:534
  #: plugins/admin/departments/generic.tpl:16
-#: plugins/admin/departments/class_departmentGeneric.inc:540
-#: plugins/admin/systems/class_winGeneric.inc:260
+#: plugins/admin/departments/class_departmentGeneric.inc:584
+#: plugins/admin/systems/class_winGeneric.inc:281
  #: plugins/admin/systems/server.tpl:14 plugins/admin/systems/phone.tpl:34
  #: plugins/admin/systems/printer.tpl:16
-#: plugins/admin/systems/class_servGeneric.inc:344
+#: plugins/admin/systems/class_servGeneric.inc:357
  #: plugins/admin/systems/wingeneric.tpl:25
  #: plugins/admin/systems/component.tpl:35
-#: plugins/admin/systems/class_printGeneric.inc:865
-#: plugins/admin/systems/class_componentGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_componentGeneric.inc:270
  #: plugins/admin/systems/servnfs.tpl:19
-#: plugins/admin/systems/class_phoneGeneric.inc:435
+#: plugins/admin/systems/class_phoneGeneric.inc:441
  #: plugins/admin/systems/class_goMailServer.inc:695
  #: plugins/admin/systems/class_goShareServer.inc:372
  #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:720
+#: plugins/admin/ogroups/class_ogroup.inc:703
  #: plugins/admin/fai/faiVariable.tpl:21
-#: plugins/admin/fai/class_faiScript.inc:527
-#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/class_faiScript.inc:538
+#: plugins/admin/fai/class_faiTemplate.inc:508
  #: plugins/admin/fai/faiPackage.tpl:21
  #: plugins/admin/fai/faiPartitionTable.tpl:21
  #: plugins/admin/fai/class_faiScriptEntry.inc:180
@@ -4026,7 +4077,7 @@ msgstr "Список"
  #: plugins/admin/fai/class_faiPackage.inc:537
  #: plugins/admin/fai/class_faiProfile.inc:452
  #: plugins/admin/fai/class_faiHook.inc:536 plugins/admin/fai/faiProfile.tpl:21
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:464
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:13
  #: plugins/admin/fai/faiScript.tpl:21
  #: plugins/admin/fai/class_faiVariableEntry.inc:143
@@ -4035,16 +4086,16 @@ msgstr "Список"
  #: plugins/admin/fai/class_faiPartitionTable.inc:529
  #: plugins/admin/fai/class_faiHookEntry.inc:189
  #: plugins/admin/fai/faiHookEntry.tpl:19
-#: plugins/admin/fai/class_faiVariable.inc:421
+#: plugins/admin/fai/class_faiVariable.inc:417
  #: plugins/admin/fai/class_faiTemplateEntry.inc:248
  #: plugins/admin/fai/faiTemplateEntry.tpl:13
-#: plugins/admin/mimetypes/generic.tpl:35
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:674
+#: plugins/admin/mimetypes/generic.tpl:34
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:682
  #: plugins/admin/mimetypes/paste_generic.tpl:21
  #: plugins/gofon/macro/generic.tpl:49
-#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/macro/class_gofonMacro.inc:498
  #: plugins/gofon/conference/generic.tpl:78
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
  #: plugins/generic/references/contents.tpl:11 html/getxls.php:158
  #: html/getxls.php:287
  msgid "Description"
@@ -4077,11 +4128,11 @@ msgstr ""
  #: plugins/admin/groups/application_options.tpl:11
  #: plugins/admin/users/class_userManagement.inc:654
  #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:503
+#: plugins/admin/systems/class_systemManagement.inc:651
  #: plugins/admin/systems/printerPPDDialog.tpl:22
  #: plugins/admin/systems/servRepositorySetup.tpl:54
-#: plugins/admin/ogroups/class_ogroupManagement.inc:304
-#: plugins/admin/fai/class_faiManagement.inc:616
+#: plugins/admin/ogroups/class_ogroupManagement.inc:299
+#: plugins/admin/fai/class_faiManagement.inc:626
  #: plugins/admin/fai/faiProfileEntry.tpl:70
  #: plugins/admin/fai/faiScriptEntry.tpl:82
  #: plugins/admin/fai/faiVariableEntry.tpl:54
@@ -4090,9 +4141,9 @@ msgstr ""
  #: plugins/admin/fai/faiPackageEntry.tpl:56
  #: plugins/admin/fai/faiPackageConfiguration.tpl:6
  #: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:340
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:342
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:260
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:253
  #: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
  #: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
  msgid "Apply"
@@ -4185,7 +4236,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
-#: plugins/admin/fai/class_faiSummaryTab.inc:209
+#: plugins/admin/fai/class_faiSummaryTab.inc:236
  #: include/class_MultiSelectWindow.inc:81
  #, fuzzy
  msgid "Close"
@@ -4197,43 +4248,43 @@ msgid "Nagios Account"
  msgstr "Контакт"
  
  #: plugins/personal/nagios/nagios.tpl:8
-#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
  #, fuzzy
  msgid "Alias"
  msgstr "женский"
  
  #: plugins/personal/nagios/nagios.tpl:27
-#: plugins/personal/nagios/class_nagiosAccount.inc:276
+#: plugins/personal/nagios/class_nagiosAccount.inc:277
  #, fuzzy
  msgid "Host notification period"
  msgstr "Параметры приложения"
  
  #: plugins/personal/nagios/nagios.tpl:40
-#: plugins/personal/nagios/class_nagiosAccount.inc:280
+#: plugins/personal/nagios/class_nagiosAccount.inc:281
  #, fuzzy
  msgid "Service notification period"
  msgstr "Параметры приложения"
  
  #: plugins/personal/nagios/nagios.tpl:53
-#: plugins/personal/nagios/class_nagiosAccount.inc:279
+#: plugins/personal/nagios/class_nagiosAccount.inc:280
  #, fuzzy
  msgid "Service notification options"
  msgstr "Параметры приложения"
  
  #: plugins/personal/nagios/nagios.tpl:66
-#: plugins/personal/nagios/class_nagiosAccount.inc:275
+#: plugins/personal/nagios/class_nagiosAccount.inc:276
  #, fuzzy
  msgid "Host notification options"
  msgstr "Параметры приложения"
  
  #: plugins/personal/nagios/nagios.tpl:90
-#: plugins/personal/nagios/class_nagiosAccount.inc:278
+#: plugins/personal/nagios/class_nagiosAccount.inc:279
  #, fuzzy
  msgid "Service notification commands"
  msgstr "Параметры приложения"
  
  #: plugins/personal/nagios/nagios.tpl:100
-#: plugins/personal/nagios/class_nagiosAccount.inc:274
+#: plugins/personal/nagios/class_nagiosAccount.inc:275
  #, fuzzy
  msgid "Host notification commands"
  msgstr "Параметры приложения"
@@ -4338,36 +4389,41 @@ msgstr "Удалить настройки эл. почты"
  msgid "Nagios account settings"
  msgstr "Почтовые настройки пользователя"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:282
+#: plugins/personal/nagios/class_nagiosAccount.inc:265
+#, fuzzy
+msgid "Nagios account"
+msgstr "Контакт"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:283
  #, fuzzy
  msgid "View all hosts"
  msgstr "Предоставлять службу сканирования"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:283
+#: plugins/personal/nagios/class_nagiosAccount.inc:284
  #, fuzzy
  msgid "View all services"
  msgstr "Предоставлять службу сканирования"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:285
+#: plugins/personal/nagios/class_nagiosAccount.inc:286
  #, fuzzy
  msgid "Trigger system commands"
  msgstr "Системная информация"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:286
+#: plugins/personal/nagios/class_nagiosAccount.inc:287
  msgid "Trigger all host commands"
  msgstr ""
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:287
+#: plugins/personal/nagios/class_nagiosAccount.inc:288
  #, fuzzy
  msgid "Trigger all service commands"
  msgstr "Предоставлять службу сканирования"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:289
+#: plugins/personal/nagios/class_nagiosAccount.inc:290
  #, fuzzy
  msgid "View configuration information"
  msgstr "Информация об организации"
  
-#: plugins/personal/nagios/class_nagiosAccount.inc:290
+#: plugins/personal/nagios/class_nagiosAccount.inc:291
  #, fuzzy
  msgid "View system informations"
  msgstr "Системная информация"
@@ -4378,7 +4434,7 @@ msgid "Nagios settings"
  msgstr "Почтовые настройки пользователя"
  
  #: plugins/personal/netatalk/netatalk.tpl:4
-#: plugins/personal/netatalk/class_netatalk.inc:365
+#: plugins/personal/netatalk/class_netatalk.inc:366
  #, fuzzy
  msgid "Share"
  msgstr "сброс"
@@ -4447,7 +4503,12 @@ msgstr "Создать телефонный аккаунт"
  msgid "Removing of user/netatalk account with dn '%s' failed."
  msgstr "Удалить настройки эл. почты"
  
-#: plugins/personal/netatalk/class_netatalk.inc:364
+#: plugins/personal/netatalk/class_netatalk.inc:360
+#, fuzzy
+msgid "Netatalk account"
+msgstr "Создать телефонный аккаунт"
+
+#: plugins/personal/netatalk/class_netatalk.inc:365
  #, fuzzy
  msgid "User home path"
  msgstr "Домашний телефон"
@@ -4481,9 +4542,9 @@ msgstr "Выберите ветку для группы"
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
  #: plugins/admin/systems/class_goShareServer.inc:373
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
-#: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiSummaryTab.inc:345
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:136
  msgid "Type"
  msgstr "Тип"
  
@@ -4506,13 +4567,15 @@ msgstr "Вместо точных номеров можно использова
  #: plugins/gofax/blocklists/remove.tpl:2
  #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
  #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/departments/dep_move_confirm.tpl:2
+#: plugins/admin/systems/remove.tpl:2 plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/systems/remove_ppd.tpl:2
  #: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
  #: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
  #: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
  #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:339 html/index.php:345
+#: html/index.php:49 html/index.php:337 html/index.php:343
  #: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
  #: ihtml/themes/default/remove.tpl:2
  msgid "Warning"
@@ -4544,77 +4607,74 @@ msgid "Blocklist management"
  msgstr "Управление \"черными списками\""
  
  #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
  msgid "FAX Blocklists"
  msgstr "Стоп-лист номеров (факсы)"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:168
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:167
  #, php-format
  msgid "You're about to delete the blocklist '%s'."
  msgstr "Вы собираетесь удалить стоп-лист '%s'."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:185
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:184
  msgid "You have no permission to remove this blocklist."
  msgstr "У вас недостаточно прав для удаления этого стоп-листа."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:200
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:199
  msgid "Please specify a valid phone number."
  msgstr "Укажите корректный номер телефона."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "send"
  msgstr "отправка"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
  msgid "receive"
  msgstr "получение"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:435
  #, fuzzy, php-format
  msgid "Removing of blocklist with dn '%s' failed."
  msgstr "Удалить приложения"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:477
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr "У вас недостаточно прав для создания стоп-листа в этой ветке."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:482
-#: plugins/admin/departments/class_departmentGeneric.inc:238
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:487
+#: plugins/admin/departments/class_departmentGeneric.inc:258
  msgid "Required field 'Name' is not set."
  msgstr "Обязательное поле \"Имя\" не заполнено."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:490
  msgid "Required field 'Name' contains invalid characters"
  msgstr "Значение поля 'Имя' содержит недопустимые символы."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:497
  msgid "Specified name is already used."
  msgstr "Указанное имя уже используется."
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:547
  #, fuzzy, php-format
  msgid "Saving of blocklist with dn '%s' failed."
  msgstr "Приложение"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
  #, fuzzy
-msgid "Fax Blocklists"
+msgid "Fax blocklists"
  msgstr "Стоп-лист номеров (факсы)"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:596
  #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/addressbook/address_info.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:893
-#: plugins/admin/applications/class_applicationGeneric.inc:523
-#: plugins/admin/applications/class_applicationGeneric.inc:527
-#: plugins/admin/systems/class_terminalGeneric.inc:514
-#: plugins/admin/systems/class_servGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:863
-#: plugins/admin/systems/class_componentGeneric.inc:266
+#: plugins/admin/groups/class_groupGeneric.inc:887
+#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/systems/class_terminalGeneric.inc:554
+#: plugins/admin/systems/class_servGeneric.inc:356
+#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_componentGeneric.inc:268
  #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_phoneGeneric.inc:434
-#: plugins/admin/systems/class_servRepository.inc:358
+#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_servRepository.inc:374
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:10
  #: plugins/admin/systems/glpi_devices.tpl:105
@@ -4634,10 +4694,10 @@ msgstr "Стоп-лист номеров (факсы)"
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
  #: plugins/admin/systems/class_goShareServer.inc:370
  #: plugins/admin/systems/goSpamServerRule.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:701
  #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
  #: plugins/admin/fai/faiPackage.tpl:9
  #: plugins/admin/fai/faiPartitionTable.tpl:9
  #: plugins/admin/fai/class_faiScriptEntry.inc:179
@@ -4645,7 +4705,7 @@ msgstr "Стоп-лист номеров (факсы)"
  #: plugins/admin/fai/class_faiPackage.inc:536
  #: plugins/admin/fai/class_faiProfile.inc:451
  #: plugins/admin/fai/class_faiHook.inc:535 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:454
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
  #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
  #: plugins/admin/fai/faiScript.tpl:9
  #: plugins/admin/fai/class_faiVariableEntry.inc:142
@@ -4654,23 +4714,23 @@ msgstr "Стоп-лист номеров (факсы)"
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
  #: plugins/admin/fai/class_faiHookEntry.inc:188
  #: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #: plugins/admin/fai/class_faiTemplateEntry.inc:247
  #: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:313
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
+#: plugins/admin/fai/class_faiSummaryTab.inc:340
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
  #: plugins/gofon/macro/parameter.tpl:6
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
  #: html/getxls.php:223 html/getxls.php:290
  msgid "Name"
  msgstr "Фамилия"
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:599
  #, fuzzy
  msgid "Blocklist"
  msgstr "\"Черные списки\""
  
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:600
  #, fuzzy
  msgid "Blocklist type"
  msgstr "Управление \"черными списками\""
@@ -4739,7 +4799,7 @@ msgstr "Показать стоп-листы получения"
  #: plugins/admin/systems/class_divListSystem.inc:76
  #: plugins/admin/ogroups/ogroup_objects.tpl:38
  #: plugins/admin/ogroups/class_divListOGroup.inc:75
-#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/acl/class_divListACL.inc:56
  #: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
  #: plugins/gofon/macro/class_divListMacros.inc:57
  #: plugins/gofon/conference/class_divListConferences.inc:58
@@ -4751,253 +4811,113 @@ msgstr "Искать в поддеревьях"
  msgid "Regular expression for matching list names"
  msgstr "Регулярное выражение, соответствующее именам списков"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-#, fuzzy
-msgid "Go to root department"
-msgstr "Список подразделений"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:117
-#: plugins/admin/applications/class_divListApplication.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:90
-#: plugins/admin/systems/class_glpiSelectUser.inc:161
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/systems/class_divListSystem.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:122
-#: plugins/admin/acl/class_divListACL.inc:82
-#: plugins/admin/fai/class_divListFai.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:127
-#: plugins/gofon/macro/class_divListMacros.inc:98
-#: plugins/gofon/conference/class_divListConferences.inc:97
-#, fuzzy
-msgid "Root"
-msgstr "Перезагрузить"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-#, fuzzy
-msgid "Go up one department"
-msgstr "Подразделение"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:119
-#: plugins/admin/applications/class_divListApplication.inc:119
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/systems/class_glpiSelectUser.inc:163
-#: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/systems/class_divListSystem.inc:130
-#: plugins/admin/ogroups/phonequeue.tpl:20
-#: plugins/admin/ogroups/class_divListOGroup.inc:124
-#: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/fai/class_divListFai.inc:136
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/class_divListMacros.inc:100
-#: plugins/gofon/conference/class_divListConferences.inc:99
-#: include/class_acl.inc:368
-msgid "Up"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-#, fuzzy
-msgid "Go to users department"
-msgstr "Выберите подразделение"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:121
-#: plugins/admin/applications/class_divListApplication.inc:121
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_baseSelectDialog.inc:32
-#: plugins/admin/systems/class_divListSystem.inc:132
-#: plugins/admin/ogroups/class_divListOGroup.inc:126
-#: plugins/admin/acl/class_divListACL.inc:86
-#: plugins/admin/fai/class_divListFai.inc:139
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:102
-#: plugins/gofon/conference/class_divListConferences.inc:101
-#, fuzzy
-msgid "Home"
-msgstr "Имя системы"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/fai/class_divListFai.inc:141
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/conference/class_divListConferences.inc:103
-msgid "Reload list"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
-#: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:123
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:123
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:96
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_baseSelectDialog.inc:33
-#: plugins/admin/systems/class_divListSystem.inc:133
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:88
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:142
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:133
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:104
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:103
-#: plugins/gofon/conference/class_divListConferences.inc:121
-msgid "Submit"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  #, fuzzy
  msgid "Create new blocklist"
  msgstr "Имя стоп-листа"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:110
  #, fuzzy
  msgid "New Blocklist"
  msgstr "\"Черные списки\""
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:121
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
  #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/groups/class_divListGroup.inc:140
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:136
-#: plugins/admin/departments/class_divListDepartment.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:170
-#: plugins/admin/systems/class_divListSystem.inc:151
-#: plugins/admin/ogroups/class_divListOGroup.inc:147
-#: plugins/admin/acl/class_divListACL.inc:94
-#: plugins/admin/fai/class_divListFai.inc:174
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:147
-#: plugins/gofon/macro/class_divListMacros.inc:116
-#: plugins/gofon/conference/class_divListConferences.inc:121
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
  #, fuzzy
  msgid "Submit department"
  msgstr "Показать подразделения"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/users/class_divListUsers.inc:255
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:117
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:148
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/applications/class_divListApplication.inc:146
+#: plugins/admin/departments/class_divListDepartment.inc:102
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_glpiSelectUser.inc:184
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/ogroups/class_divListOGroup.inc:151
+#: plugins/admin/acl/class_divListACL.inc:100
+#: plugins/admin/fai/class_divListFai.inc:173
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:155
+#: plugins/gofon/macro/class_divListMacros.inc:108
+#: plugins/gofon/conference/class_divListConferences.inc:116
+#: include/class_MultiSelectWindow.inc:209
+msgid "Submit"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/users/class_divListUsers.inc:243
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
  #: plugins/admin/systems/glpiPrinter.tpl:18
  #: plugins/admin/systems/glpiPrinter.tpl:32 plugins/admin/systems/glpi.tpl:18
  #: plugins/admin/systems/glpi.tpl:32 plugins/admin/systems/glpi.tpl:46
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
  #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/acl/class_divListACL.inc:122
-#: plugins/admin/fai/class_faiScript.inc:283
-#: plugins/admin/fai/class_faiScript.inc:285
-#: plugins/admin/fai/class_faiTemplate.inc:257
-#: plugins/admin/fai/class_faiTemplate.inc:259
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/acl/class_divListACL.inc:127
+#: plugins/admin/fai/class_faiScript.inc:293
+#: plugins/admin/fai/class_faiScript.inc:295
+#: plugins/admin/fai/class_faiTemplate.inc:270
+#: plugins/admin/fai/class_faiTemplate.inc:272
  #: plugins/admin/fai/class_faiHook.inc:294
  #: plugins/admin/fai/class_faiHook.inc:296
-#: plugins/admin/fai/class_divListFai.inc:241
-#: plugins/admin/fai/class_divListFai.inc:244
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/macro/class_divListMacros.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:159
-#: plugins/gofon/conference/class_divListConferences.inc:159
-#: include/class_acl.inc:370 include/class_acl.inc:415
+#: plugins/admin/fai/class_divListFai.inc:239
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/macro/class_divListMacros.inc:146
+#: plugins/gofon/conference/class_divListConferences.inc:155
+#: include/class_acl.inc:372 include/class_acl.inc:417
  #, fuzzy
  msgid "edit"
  msgstr "Изменить"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
-#: plugins/admin/users/class_divListUsers.inc:256
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:151
+#: plugins/admin/users/class_divListUsers.inc:244
  #, fuzzy
  msgid "Edit user"
  msgstr "Пользователи домена"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/users/class_divListUsers.inc:274
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/acl/class_divListACL.inc:125
-#: plugins/admin/fai/class_faiScript.inc:287
-#: plugins/admin/fai/class_faiTemplate.inc:261
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/addons/mailqueue/contents.tpl:94
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/users/class_divListUsers.inc:262
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/acl/class_divListACL.inc:131
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:274
  #: plugins/admin/fai/class_faiHook.inc:298
-#: plugins/admin/fai/class_divListFai.inc:252
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/macro/class_divListMacros.inc:133
-#: plugins/gofon/macro/class_divListMacros.inc:167
-#: plugins/gofon/conference/class_divListConferences.inc:169
-#: include/class_acl.inc:371 include/class_acl.inc:416
+#: plugins/admin/fai/class_divListFai.inc:250
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/macro/class_divListMacros.inc:154
+#: plugins/gofon/conference/class_divListConferences.inc:165
+#: include/class_acl.inc:373 include/class_acl.inc:418
  #, fuzzy
  msgid "delete"
  msgstr "Удалить"
  
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
-#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:161
+#: plugins/admin/users/class_divListUsers.inc:263
  #, fuzzy
  msgid "Delete user"
  msgstr "Удалить"
@@ -5008,7 +4928,7 @@ msgid "Fax number for GOfax to trigger on"
  msgstr "Номер факса, для которого сработает GOfax"
  
  #: plugins/gofax/faxaccount/generic.tpl:21
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:832
  #: plugins/admin/ogroups/phonequeue.tpl:47
  #: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
  #: html/getxls.php:281
@@ -5021,7 +4941,7 @@ msgstr ""
  "Укаэите предпочтительный язык для получения сообщений о факсах по эл. почте"
  
  #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:831
  msgid "Delivery format"
  msgstr "Формат доставки"
  
@@ -5043,12 +4963,12 @@ msgid "Deliver fax as mail to"
  msgstr "Отправлять факсы по эл. почте"
  
  #: plugins/gofax/faxaccount/generic.tpl:70
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
  msgid "Deliver fax as mail"
  msgstr "Отправлять факсы по эл. почте"
  
  #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:830
  msgid "Deliver fax to printer"
  msgstr "Отправлять факсы на принтер"
  
@@ -5116,15 +5036,15 @@ msgstr "Настройки факса"
  msgid "FAX"
  msgstr "Факс"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
  msgid "This account has no fax extensions."
  msgstr "Для этой учетной записи нет расширений факса."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:162
  msgid "Remove fax account"
  msgstr "Удалить настройки факса"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:163
  msgid ""
  "This account has fax features enabled. You can disable them by clicking "
  "below."
@@ -5132,11 +5052,11 @@ msgstr ""
  "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
  "ниже."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:165
  msgid "Create fax account"
  msgstr "Создать настройки факса"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:159
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:166
  msgid ""
  "This account has fax features disabled. You can enable them by clicking "
  "below."
@@ -5144,71 +5064,71 @@ msgstr ""
  "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
  "ниже."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:222
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:229
  msgid "You're trying to add an invalid phone number."
  msgstr "Вы пытаетесь ввести некорректный номер телефона."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:512
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:438
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:519
  #: plugins/admin/groups/class_groupApplication.inc:674
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:147
  #, fuzzy
  msgid "back"
  msgstr "Назад"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:617
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
  #, fuzzy, php-format
  msgid "Removing of user/fax account with dn '%s' failed."
  msgstr "Удалить учетную запись POSIX"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:632
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
  msgid "The required field 'Fax' is not set."
  msgstr "Обязательное поле \"Факс\" не заполнено."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
  msgid "Please enter a valid telephone number in the 'Fax' field."
  msgstr "Введите корректный номер телефона в поле \"Факс\"."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
  msgid "Mail delivery is checked, but no address has been specified."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:646
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
  #, fuzzy
  msgid "The mail address you've entered is invalid."
  msgstr "Введенный вами адрес уже используется."
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
  msgid ""
  "Deliver fax to printer, is only possible if valid printer is given. Please "
  "correct your choice."
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:737
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:744
  #, fuzzy, php-format
  msgid "Saving of user/fax account with dn '%s' failed."
  msgstr "Аккаунт Proxy"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:808
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
  #, fuzzy
  msgid "Fax account settings"
  msgstr "Настройки Samba"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
  msgid "Enable/Disable fax"
  msgstr ""
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
  #, fuzzy
  msgid "Receive blocklist"
  msgstr "Показать стоп-листы получения"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
  #, fuzzy
  msgid "Send blocklist"
  msgstr "Показать стоп-листы отправки"
  
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
  #, fuzzy
  msgid "Alternate fax number"
  msgstr "Альтернативные номера факсов"
@@ -5225,7 +5145,7 @@ msgid "Filter"
  msgstr "Фильтр"
  
  #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:106
+#: plugins/addons/addressbook/contents.tpl:109
  #: plugins/addons/logview/contents.tpl:47
  #: plugins/addons/mailqueue/contents.tpl:11
  #: plugins/gofon/fonreports/contents.tpl:6
@@ -5264,17 +5184,17 @@ msgstr "Поиск"
  
  #: plugins/gofax/faxreports/contents.tpl:30
  #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:842
-#: plugins/admin/ogroups/class_ogroupManagement.inc:351
+#: plugins/admin/systems/class_printGeneric.inc:846
+#: plugins/admin/ogroups/class_ogroupManagement.inc:346
  #: plugins/admin/fai/faiTemplateEntry.tpl:110
  msgid "User"
  msgstr "Пользователь"
  
  #: plugins/gofax/faxreports/contents.tpl:31
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #: plugins/addons/logview/contents.tpl:84
  #: plugins/gofon/fonreports/contents.tpl:30
-#: plugins/gofon/fonreports/class_fonreport.inc:398
+#: plugins/gofon/fonreports/class_fonreport.inc:399
  msgid "Date"
  msgstr "Дата"
  
@@ -5315,22 +5235,22 @@ msgid "Date / Time"
  msgstr "Дата / время"
  
  #: plugins/gofax/faxreports/detail.tpl:29
-#: plugins/gofax/faxreports/class_faxreport.inc:484
+#: plugins/gofax/faxreports/class_faxreport.inc:489
  msgid "Sender MSN"
  msgstr "MSN отправителя"
  
  #: plugins/gofax/faxreports/detail.tpl:33
-#: plugins/gofax/faxreports/class_faxreport.inc:483
+#: plugins/gofax/faxreports/class_faxreport.inc:488
  msgid "Sender ID"
  msgstr "Идентификатор отправителя"
  
  #: plugins/gofax/faxreports/detail.tpl:37
-#: plugins/gofax/faxreports/class_faxreport.inc:486
+#: plugins/gofax/faxreports/class_faxreport.inc:491
  msgid "Receiver MSN"
  msgstr "MSN получателя"
  
  #: plugins/gofax/faxreports/detail.tpl:41
-#: plugins/gofax/faxreports/class_faxreport.inc:485
+#: plugins/gofax/faxreports/class_faxreport.inc:490
  msgid "Receiver ID"
  msgstr "Идентификатор получателя"
  
@@ -5339,7 +5259,7 @@ msgid "Status message"
  msgstr "Сообщение о состоянии"
  
  #: plugins/gofax/faxreports/detail.tpl:53
-#: plugins/gofax/faxreports/class_faxreport.inc:489
+#: plugins/gofax/faxreports/class_faxreport.inc:494
  msgid "Transfer time"
  msgstr "Время передачи"
  
@@ -5351,93 +5271,99 @@ msgstr "Отчеты о факсах"
  msgid "FAX Reports"
  msgstr "Отчеты о факсах"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:108
  msgid ""
  "No fax extension defined in your server configuration, no reports can be "
  "shown!"
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: plugins/gofax/faxreports/class_faxreport.inc:111
  #: plugins/addons/logview/class_logview.inc:75
  #: plugins/gofon/fonreports/class_fonreport.inc:163
  msgid "There is no mysql extension available, please check your php setup."
  msgstr ""
  
-#: plugins/gofax/faxreports/class_faxreport.inc:117
+#: plugins/gofax/faxreports/class_faxreport.inc:118
  msgid "Can't connect to fax database, no reports can be shown!"
  msgstr ""
  "Не удается подключиться к базе данных факсов, отчеты показаны не будут!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:121
+#: plugins/gofax/faxreports/class_faxreport.inc:122
  msgid "Can't select fax database for report generation!"
  msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:126
+#: plugins/gofax/faxreports/class_faxreport.inc:127
  #, fuzzy
  msgid "Can't query fax table 'faxlog' for report generation!"
  msgstr "Не удается выбрать базу данных факсов для создания отчетов!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:149
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: plugins/gofax/faxreports/class_faxreport.inc:150
+#: plugins/gofax/faxreports/class_faxreport.inc:290
  msgid "Query for fax database failed!"
  msgstr "Невозможно выполнить запрос к базе данных факсов!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:158
-#: plugins/gofax/faxreports/class_faxreport.inc:168
+#: plugins/gofax/faxreports/class_faxreport.inc:159
+#: plugins/gofax/faxreports/class_faxreport.inc:169
  msgid "You have no permission to retrieve informations about this fax id!"
  msgstr "У вас недостаточно прав для получения информации об этом факсе!"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:196
-#: plugins/gofax/faxreports/class_faxreport.inc:311
-#: plugins/gofon/fonreports/class_fonreport.inc:221
+#: plugins/gofax/faxreports/class_faxreport.inc:200
+#: plugins/gofax/faxreports/class_faxreport.inc:315
+#: plugins/gofon/fonreports/class_fonreport.inc:223
  msgid "Y-M-D"
  msgstr "Г-М-Д"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions to view this attribute"
  msgstr "У вас недостаточно прав для удаления этого подразделения."
  
-#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: plugins/gofax/faxreports/class_faxreport.inc:309
  #: plugins/admin/groups/class_groupApplication.inc:427
  #: plugins/gofon/fonreports/class_fonreport.inc:204
  #, fuzzy
  msgid "Insufficient permissions"
  msgstr "Права для членов группы"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:469
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:473
+#: plugins/gofax/faxreports/class_faxreport.inc:474
  #, fuzzy
  msgid "Fax report"
  msgstr "Отчеты о факсах"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:470
+#: plugins/gofax/faxreports/class_faxreport.inc:474
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  #, fuzzy
  msgid "All entries are readonly"
  msgstr "Все поля доступны для записи"
  
  #: plugins/gofax/faxreports/class_faxreport.inc:479
  #, fuzzy
+msgid "Fax reports"
+msgstr "Отчеты о факсах"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:484
+#, fuzzy
  msgid "Detailed view"
  msgstr "Клиентские устройства"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:480
+#: plugins/gofax/faxreports/class_faxreport.inc:485
  #, fuzzy
  msgid "Fax ID"
  msgstr "Идентификатор факса"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:481
+#: plugins/gofax/faxreports/class_faxreport.inc:486
  #, fuzzy
  msgid "Time"
  msgstr "Мобильный"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:487
+#: plugins/gofax/faxreports/class_faxreport.inc:492
  #, fuzzy
  msgid "Number of pages"
  msgstr "Подразделение"
  
-#: plugins/gofax/faxreports/class_faxreport.inc:488
+#: plugins/gofax/faxreports/class_faxreport.inc:493
  #, fuzzy
  msgid "Status Message"
  msgstr "Сообщение о состоянии"
@@ -5467,44 +5393,44 @@ msgstr ""
  msgid "Add entry"
  msgstr "Добавить объект"
  
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:54
  #: plugins/admin/groups/class_groupApplication.inc:756
  msgid "Edit entry"
  msgstr "Редактиовать объект"
  
-#: plugins/addons/addressbook/contents.tpl:55
+#: plugins/addons/addressbook/contents.tpl:58
  msgid "Remove entry"
  msgstr "Удалить объект"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Select to see regular users"
  msgstr "Выберите, чтобы просмотреть пользователей"
  
-#: plugins/addons/addressbook/contents.tpl:72
+#: plugins/addons/addressbook/contents.tpl:75
  msgid "Show organizational entries"
  msgstr "Показать организационные объекты"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Select to see users in addressbook"
  msgstr "Выберите, чтобы просмотреть пользователей в адресной книге"
  
-#: plugins/addons/addressbook/contents.tpl:73
+#: plugins/addons/addressbook/contents.tpl:76
  msgid "Show addressbook entries"
  msgstr "Показать объекты адресной книги"
  
-#: plugins/addons/addressbook/contents.tpl:81
+#: plugins/addons/addressbook/contents.tpl:84
  msgid "Display results for department"
  msgstr "Показать результаты для подразделения"
  
-#: plugins/addons/addressbook/contents.tpl:94
+#: plugins/addons/addressbook/contents.tpl:97
  msgid "Match object"
  msgstr "Соответствующий объект"
  
-#: plugins/addons/addressbook/contents.tpl:97
+#: plugins/addons/addressbook/contents.tpl:100
  msgid "Choose the object that will be searched in"
  msgstr "Выберите объект, в котором будет осуществлен поиск"
  
-#: plugins/addons/addressbook/contents.tpl:109
+#: plugins/addons/addressbook/contents.tpl:112
  msgid "Search string"
  msgstr "Строка поиска"
  
@@ -5513,10 +5439,10 @@ msgid "Dial connection..."
  msgstr "Соединение..."
  
  #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:427
-#: plugins/addons/addressbook/class_addressbook.inc:434
-#: plugins/addons/addressbook/class_addressbook.inc:438
-#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/addons/addressbook/class_addressbook.inc:429
+#: plugins/addons/addressbook/class_addressbook.inc:436
+#: plugins/addons/addressbook/class_addressbook.inc:440
+#: plugins/addons/addressbook/class_addressbook.inc:553
  msgid "Dial"
  msgstr "Звонок"
  
@@ -5539,7 +5465,7 @@ msgid "Personal"
  msgstr "Контакт"
  
  #: plugins/addons/addressbook/address_edit.tpl:48
-#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/class_addressbook.inc:807
  #: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
  #: html/getxls.php:298
  msgid "Initials"
@@ -5569,77 +5495,77 @@ msgstr "Город"
  
  #: plugins/addons/addressbook/address_edit.tpl:191
  #: plugins/addons/addressbook/address_info.tpl:141
-#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_departmentGeneric.inc:585
  msgid "Country"
  msgstr "Страна"
  
-#: plugins/addons/addressbook/main.inc:35
+#: plugins/addons/addressbook/main.inc:36
  msgid "Address book"
  msgstr "Адресная книга"
  
  #: plugins/addons/addressbook/class_addressbook.inc:6
-#: plugins/addons/addressbook/class_addressbook.inc:781
-#: plugins/addons/addressbook/class_addressbook.inc:787
+#: plugins/addons/addressbook/class_addressbook.inc:783
+#: plugins/addons/addressbook/class_addressbook.inc:789
  msgid "Addressbook"
  msgstr "Адресная книга"
  
-#: plugins/addons/addressbook/class_addressbook.inc:172
+#: plugins/addons/addressbook/class_addressbook.inc:173
  #, php-format
  msgid "Dial from %s to %s now?"
  msgstr "Звоним с %s на %s?"
  
-#: plugins/addons/addressbook/class_addressbook.inc:176
+#: plugins/addons/addressbook/class_addressbook.inc:177
  msgid ""
  "You have no personal phone number set. Please change that in order to "
  "perform direct dials."
  msgstr ""
  "У вас нет персонального набора телефонов. Настройте это прежде чем звонить."
  
-#: plugins/addons/addressbook/class_addressbook.inc:202
-#: plugins/addons/addressbook/class_addressbook.inc:751
+#: plugins/addons/addressbook/class_addressbook.inc:203
+#: plugins/addons/addressbook/class_addressbook.inc:753
  #, fuzzy, php-format
  msgid "Removing of addressbook entry '%s' failed."
  msgstr "Показать объекты адресной книги"
  
-#: plugins/addons/addressbook/class_addressbook.inc:209
-#: plugins/addons/addressbook/class_addressbook.inc:318
+#: plugins/addons/addressbook/class_addressbook.inc:210
+#: plugins/addons/addressbook/class_addressbook.inc:319
  msgid "You are not allowed to delete this entry!"
  msgstr "У вас недостаточно прав для удаления этого объекта!"
  
-#: plugins/addons/addressbook/class_addressbook.inc:312
+#: plugins/addons/addressbook/class_addressbook.inc:313
  #, php-format
  msgid "You're about to delete the entry %s."
  msgstr "Вы собираетесь удалить объект %s."
  
-#: plugins/addons/addressbook/class_addressbook.inc:444
+#: plugins/addons/addressbook/class_addressbook.inc:446
  #, php-format
  msgid "Save contact for %s as vcard"
  msgstr "Сохранить контактную информацию %s в формате vcard"
  
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: plugins/addons/addressbook/class_addressbook.inc:452
  #, php-format
  msgid "Send mail to %s"
  msgstr "Отправить %s сообщение по эл. почте"
  
-#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/addons/addressbook/class_addressbook.inc:565
  msgid "global addressbook"
  msgstr "общая адресная книга"
  
-#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/addons/addressbook/class_addressbook.inc:568
  #, fuzzy
  msgid "user database"
  msgstr "Базы данных"
  
-#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/addons/addressbook/class_addressbook.inc:572
  #, fuzzy, php-format
  msgid "Contact stored in '%s'"
  msgstr "Контакт сохранен в %s"
  
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/addons/addressbook/class_addressbook.inc:574
  msgid "Creating new entry in"
  msgstr "Создание нового объекта в"
  
-#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:613
  #: plugins/addons/logview/class_logview.inc:112
  #: plugins/addons/logview/class_logview.inc:133
  #: plugins/addons/mailqueue/class_mailqueue.inc:306
@@ -5647,35 +5573,35 @@ msgstr "Создание нового объекта в"
  msgid "All"
  msgstr "Все"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Work phone"
  msgstr "Рабочий телефон"
  
-#: plugins/addons/addressbook/class_addressbook.inc:612
+#: plugins/addons/addressbook/class_addressbook.inc:614
  msgid "Cell phone"
  msgstr "Сотовый телефон"
  
-#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
+#: plugins/addons/addressbook/class_addressbook.inc:615 html/getxls.php:223
  msgid "Home phone"
  msgstr "Домашний телефон"
  
-#: plugins/addons/addressbook/class_addressbook.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:704
  msgid ""
  "Cannot create a unique DN for your entry. Please fill more formular fields."
  msgstr ""
  "Невозможно создать уникальный DN для объекта. Заполните все поля формы."
  
-#: plugins/addons/addressbook/class_addressbook.inc:782
+#: plugins/addons/addressbook/class_addressbook.inc:784
  #, fuzzy
  msgid "Addressbook entry acls"
  msgstr "Показать объекты адресной книги"
  
-#: plugins/addons/addressbook/class_addressbook.inc:806 html/getxls.php:301
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:301
  #, fuzzy
  msgid "Title"
  msgstr "Файлы"
  
-#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: plugins/addons/addressbook/class_addressbook.inc:810 html/getxls.php:169
  #: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
  #, fuzzy
  msgid "Common name"
@@ -5881,12 +5807,12 @@ msgid "CSV import"
  msgstr "Импортировать"
  
  #: plugins/addons/ldapmanager/class_export.inc:77
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
+#: plugins/addons/ldapmanager/class_exportxls.inc:91
  msgid "Error while exporting the requested entries!"
  msgstr ""
  
  #: plugins/addons/ldapmanager/class_export.inc:89
-#: plugins/addons/ldapmanager/class_exportxls.inc:102
+#: plugins/addons/ldapmanager/class_exportxls.inc:104
  #, fuzzy, php-format
  msgid "You are not allowed to export the given ldap entry (%s)"
  msgstr "У вас недостаточно прав для удаления этого объекта!"
@@ -6122,46 +6048,46 @@ msgstr ""
  msgid "Active"
  msgstr "Личный"
  
-#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/addons/mailqueue/contents.tpl:94
  #, fuzzy
  msgid "Delete this message"
  msgstr "Удалить"
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  msgid "unhold"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:97
+#: plugins/addons/mailqueue/contents.tpl:98
  #, fuzzy
  msgid "Release message"
  msgstr "Сообщение о состоянии"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  #, fuzzy
  msgid "hold"
  msgstr "Почтовые настройки"
  
-#: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/contents.tpl:102
  #: plugins/addons/mailqueue/class_mailqueue.inc:398
  #, fuzzy
  msgid "Hold message"
  msgstr "Домашняя страница"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  #, fuzzy
  msgid "requeue"
  msgstr "Номер телефона"
  
-#: plugins/addons/mailqueue/contents.tpl:105
+#: plugins/addons/mailqueue/contents.tpl:106
  msgid "Requeue this message"
  msgstr ""
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  #, fuzzy
  msgid "header"
  msgstr "Отправитель"
  
-#: plugins/addons/mailqueue/contents.tpl:108
+#: plugins/addons/mailqueue/contents.tpl:109
  #, fuzzy
  msgid "Display header from this message"
  msgstr "Показать совпадения номеров"
@@ -6347,17 +6273,37 @@ msgstr ""
  msgid "Go up one dfsshare"
  msgstr "Подразделение"
  
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/ogroups/phonequeue.tpl:20
+#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:370
+#: include/class_MultiSelectWindow.inc:194
+#: include/class_MultiSelectWindow.inc:196
+msgid "Up"
+msgstr ""
+
  #: plugins/addons/godfs/class_dfsManagment.inc:214
  msgid "Go to dfs root"
  msgstr ""
  
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+#: include/class_MultiSelectWindow.inc:188
+#, fuzzy
+msgid "Root"
+msgstr "Перезагрузить"
+
  #: plugins/addons/godfs/class_dfsManagment.inc:215
  #, fuzzy
  msgid "Create new dfsshare"
  msgstr "Создание нового объекта в"
  
  #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:22
+#: ihtml/themes/default/copyPasteDialog.tpl:28
  msgid "Finish"
  msgstr "Готово"
  
@@ -6414,7 +6360,7 @@ msgstr "Специальность"
  
  #: plugins/addons/notifications/class_msgplug.inc:35
  #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:890 include/class_acl.inc:164
+#: plugins/admin/groups/class_groupGeneric.inc:884 include/class_acl.inc:164
  #: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
  msgid "Groups"
  msgstr "Группы"
@@ -6430,12 +6376,12 @@ msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
  msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
  
  #: plugins/addons/notifications/class_msgplug.inc:116
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/systems/class_terminalGeneric.inc:207
-#: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/systems/class_workstationGeneric.inc:161
-#: plugins/admin/ogroups/class_termgroup.inc:210
+#: plugins/admin/systems/class_terminalGeneric.inc:192
+#: plugins/admin/systems/class_terminalGeneric.inc:204
+#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_servGeneric.inc:92
+#: plugins/admin/systems/class_workstationGeneric.inc:167
+#: plugins/admin/ogroups/class_termgroup.inc:209
  #, php-format
  msgid "Execution of '%s' failed!"
  msgstr "Ошибка при выполнении \"%s\"!"
@@ -6497,19 +6443,19 @@ msgstr ""
  
  #: plugins/addons/notifications/contents.tpl:74
  #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:433
-#: plugins/admin/departments/class_departmentGeneric.inc:518
+#: plugins/admin/departments/class_departmentGeneric.inc:469
+#: plugins/admin/departments/class_departmentGeneric.inc:561
  #: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/ServiceAddDialog.tpl:29
-#: plugins/admin/fai/class_faiManagement.inc:447
-#: plugins/admin/fai/class_faiManagement.inc:623
-#: plugins/admin/fai/class_faiManagement.inc:629
+#: plugins/admin/systems/ServiceAddDialog.tpl:28
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/admin/fai/class_faiManagement.inc:633
+#: plugins/admin/fai/class_faiManagement.inc:639
  #: plugins/admin/fai/faiPackageNew.tpl:50
  #: ihtml/themes/default/setup_introduction.tpl:12
  #: ihtml/themes/default/setup_useradmin.tpl:41
  #: ihtml/themes/default/setup_step2.tpl:13
  #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/default/snapshotdialog.tpl:78
+#: ihtml/themes/default/snapshotdialog.tpl:87
  msgid "Continue"
  msgstr "Продолжить"
  
@@ -6628,61 +6574,55 @@ msgstr "Не могу найти SID в базе LDAP или в сонфигур
  msgid "This 'dn' is no group."
  msgstr "Это DN соответствует не группе."
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Samba group"
  msgstr "Группа Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain admins"
  msgstr "Администраторы домена"
  
-#: plugins/admin/groups/class_groupGeneric.inc:327
+#: plugins/admin/groups/class_groupGeneric.inc:318
  msgid "Domain users"
  msgstr "Пользователи домена"
  
-#: plugins/admin/groups/class_groupGeneric.inc:328
+#: plugins/admin/groups/class_groupGeneric.inc:319
  msgid "Domain guests"
  msgstr "Непривилегированные пользователи домена"
  
-#: plugins/admin/groups/class_groupGeneric.inc:333
+#: plugins/admin/groups/class_groupGeneric.inc:324
  #, php-format
  msgid "Special group (%d)"
  msgstr "Специальная группа (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:446
+#: plugins/admin/groups/class_groupGeneric.inc:437
  #, fuzzy
  msgid "! unknown id"
  msgstr "состояние неизвестно"
  
-#: plugins/admin/groups/class_groupGeneric.inc:483
+#: plugins/admin/groups/class_groupGeneric.inc:474
  #, php-format
  msgid ""
  "Your search method returned more than '%s' users, only '%s' users are shown."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/admin/groups/class_groupGeneric.inc:720
+#: plugins/admin/groups/class_groupGeneric.inc:503
+#: plugins/admin/groups/class_groupGeneric.inc:718
  #, fuzzy, php-format
  msgid "Removing of groups/generic with dn '%s' failed."
  msgstr "Показать группы приложений"
  
-#: plugins/admin/groups/class_groupGeneric.inc:630
+#: plugins/admin/groups/class_groupGeneric.inc:628
  #, php-format
  msgid "No configured SID found for '%s'."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:635
+#: plugins/admin/groups/class_groupGeneric.inc:633
  #, php-format
  msgid "No configured RIDBASE found for '%s'."
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:746
-#: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/ogroups/class_ogroup.inc:608
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "У вас недостаточно прав для создания группы в этой ветке."
-
-#: plugins/admin/groups/class_groupGeneric.inc:756
+#: plugins/admin/groups/class_groupGeneric.inc:750
  msgid ""
  "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
  "are allowed."
@@ -6690,43 +6630,43 @@ msgstr ""
  "Значение поля \"Имя\" содержит недопустимые символы. Допустимыми являются "
  "буквы в нижнем регистре, цифры и дефисы."
  
-#: plugins/admin/groups/class_groupGeneric.inc:767
-#: plugins/admin/groups/class_groupGeneric.inc:781
-#: plugins/admin/groups/class_groupGeneric.inc:788
+#: plugins/admin/groups/class_groupGeneric.inc:761
+#: plugins/admin/groups/class_groupGeneric.inc:775
+#: plugins/admin/groups/class_groupGeneric.inc:782
  msgid "Value specified as 'Name' is already used."
  msgstr "Группа с таким именем уже существует."
  
-#: plugins/admin/groups/class_groupGeneric.inc:885
+#: plugins/admin/groups/class_groupGeneric.inc:879
  #, fuzzy
  msgid "Generic group settings"
  msgstr "Общая информация о пользователе"
  
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:891
  #, fuzzy
  msgid "Phone pickup group"
  msgstr "Члены телефонной группы"
  
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, fuzzy
  msgid "Nagios group"
  msgstr "Контакт"
  
-#: plugins/admin/groups/class_groupGeneric.inc:901
+#: plugins/admin/groups/class_groupGeneric.inc:895
  #, fuzzy
  msgid "Group member"
  msgstr "Члены группы"
  
-#: plugins/admin/groups/class_groupGeneric.inc:902
+#: plugins/admin/groups/class_groupGeneric.inc:896
  #, fuzzy
  msgid "Samba group type"
  msgstr "Группа Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:903
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Домашний каталог Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:904
+#: plugins/admin/groups/class_groupGeneric.inc:898
  #, fuzzy
  msgid "Samba SID"
  msgstr "Samba"
@@ -6754,8 +6694,8 @@ msgstr "Категория"
  msgid "Available applications"
  msgstr "Доступные приложения"
  
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:565
-#: include/class_acl.inc:656
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:597
+#: include/class_acl.inc:688
  msgid "read"
  msgstr "чтение"
  
@@ -6771,8 +6711,8 @@ msgstr "отправка (внешн.)"
  msgid "append"
  msgstr "добавление"
  
-#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:566
-#: include/class_acl.inc:658
+#: plugins/admin/groups/class_groupMail.inc:292 include/class_acl.inc:598
+#: include/class_acl.inc:690
  msgid "write"
  msgstr "запись"
  
@@ -6797,48 +6737,48 @@ msgstr "Вы пытаетесь добавить некорректный адр
  msgid "to the list of forwarders."
  msgstr "к списку тех, кому должны пересылаться сообщения."
  
-#: plugins/admin/groups/class_groupMail.inc:672
+#: plugins/admin/groups/class_groupMail.inc:679
  #, fuzzy, php-format
  msgid "Removing of groups/mail with dn '%s' failed."
  msgstr "Почтовые настройки пользователя"
  
-#: plugins/admin/groups/class_groupMail.inc:854
+#: plugins/admin/groups/class_groupMail.inc:861
  #, fuzzy, php-format
  msgid "Saving of groups/mail with dn '%s' failed."
  msgstr "Почтовые настройки пользователя"
  
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/admin/groups/class_groupMail.inc:890
  msgid "Please enter a valid email addres in 'Primary address' field."
  msgstr "Введите корректное значение в поле \"Основной адрес\"."
  
-#: plugins/admin/groups/class_groupMail.inc:916
+#: plugins/admin/groups/class_groupMail.inc:923
  msgid ""
  "Please choose valid permission settings. Default permission can't be emtpy."
  msgstr ""
  
-#: plugins/admin/groups/class_groupMail.inc:920
+#: plugins/admin/groups/class_groupMail.inc:927
  #, fuzzy
  msgid "Please select a valid mail server."
  msgstr "Введите корректный серийный номер"
  
-#: plugins/admin/groups/class_groupMail.inc:1067
+#: plugins/admin/groups/class_groupMail.inc:1074
  #, fuzzy
  msgid "Group mail"
  msgstr "Группа"
  
-#: plugins/admin/groups/class_groupMail.inc:1075
+#: plugins/admin/groups/class_groupMail.inc:1082
  #, fuzzy
  msgid "Alternate addresses"
  msgstr "Альтернативные адреса"
  
-#: plugins/admin/groups/class_groupMail.inc:1076
+#: plugins/admin/groups/class_groupMail.inc:1083
  #, fuzzy
  msgid "Forwarding addresses"
  msgstr "Основной адрес"
  
-#: plugins/admin/groups/class_groupMail.inc:1079
+#: plugins/admin/groups/class_groupMail.inc:1086
  #: plugins/admin/systems/printer.tpl:82
-#: plugins/admin/systems/class_printGeneric.inc:869
+#: plugins/admin/systems/class_printGeneric.inc:873
  #, fuzzy
  msgid "Permissions"
  msgstr "Права для членов группы"
@@ -6909,7 +6849,9 @@ msgstr ""
  "ниже."
  
  #: plugins/admin/groups/class_groupApplication.inc:426
-#: include/class_tabs.inc:303
+#: plugins/admin/acl/class_aclManagement.inc:424
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430 include/class_tabs.inc:303
  msgid "ACL"
  msgstr "Доступ"
  
@@ -6939,7 +6881,7 @@ msgid "The selected application has no options."
  msgstr "У выбранного приложения нет параметров."
  
  #: plugins/admin/groups/class_groupApplication.inc:682
-#: plugins/admin/departments/class_divListDepartment.inc:154
+#: plugins/admin/departments/class_divListDepartment.inc:147
  #, fuzzy
  msgid "department"
  msgstr "подразделения"
@@ -7019,11 +6961,11 @@ msgid "Group applications"
  msgstr "Показать приложения"
  
  #: plugins/admin/groups/class_groupApplication.inc:1173
-#: plugins/admin/groups/class_divListGroup.inc:176
-#: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:353
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
+#: plugins/admin/groups/class_divListGroup.inc:184
+#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_divListApplication.inc:170
+#: plugins/admin/ogroups/class_ogroupManagement.inc:348
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:684
  #: plugins/gofon/fonreports/contents.tpl:34
  #: plugins/generic/references/class_reference.inc:42
  msgid "Application"
@@ -7033,7 +6975,7 @@ msgstr "Приложение"
  #: plugins/admin/systems/workstationStartup.tpl:53
  #: plugins/admin/systems/workstationStartup.tpl:87
  #: plugins/admin/systems/servRepositorySetup.tpl:19
-#: plugins/admin/systems/class_servRepository.inc:238
+#: plugins/admin/systems/class_servRepository.inc:252
  #: plugins/admin/fai/faiPackage.tpl:37
  #: plugins/admin/fai/class_faiPackage.inc:542
  #: plugins/admin/fai/faiPackageNew.tpl:21
@@ -7125,63 +7067,63 @@ msgstr "Показать обычные группы"
  msgid "Create new group"
  msgstr "Создать телефонный аккаунт"
  
-#: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/groups/class_divListGroup.inc:178
+#: plugins/admin/users/class_divListUsers.inc:175
  #, fuzzy
  msgid "Posix"
  msgstr "Прокси-сервер"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  #, fuzzy
  msgid "cut"
  msgstr "Выполнить"
  
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:188
-#: plugins/admin/ogroups/class_divListOGroup.inc:185
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
+#: plugins/admin/groups/class_divListGroup.inc:208
+#: plugins/admin/users/class_divListUsers.inc:237
+#: plugins/admin/applications/class_divListApplication.inc:197
+#: plugins/admin/ogroups/class_divListOGroup.inc:190
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:208
  #, fuzzy
  msgid "Cut this entry"
  msgstr "Редактиовать объект"
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  msgid "copy"
  msgstr ""
  
-#: plugins/admin/groups/class_divListGroup.inc:201
-#: plugins/admin/users/class_divListUsers.inc:251
-#: plugins/admin/applications/class_divListApplication.inc:195
-#: plugins/admin/ogroups/class_divListOGroup.inc:187
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
+#: plugins/admin/groups/class_divListGroup.inc:210
+#: plugins/admin/users/class_divListUsers.inc:239
+#: plugins/admin/applications/class_divListApplication.inc:200
+#: plugins/admin/ogroups/class_divListOGroup.inc:192
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:210
  #, fuzzy
  msgid "Copy this entry"
  msgstr "Редактиовать объект"
  
-#: plugins/admin/groups/class_divListGroup.inc:206
-#: plugins/admin/applications/class_divListApplication.inc:200
-#: plugins/admin/departments/class_divListDepartment.inc:133
-#: plugins/admin/ogroups/class_divListOGroup.inc:192
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
-#: plugins/gofon/conference/class_divListConferences.inc:159
+#: plugins/admin/groups/class_divListGroup.inc:215
+#: plugins/admin/applications/class_divListApplication.inc:206
+#: plugins/admin/departments/class_divListDepartment.inc:126
+#: plugins/admin/ogroups/class_divListOGroup.inc:196
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:214
+#: plugins/gofon/conference/class_divListConferences.inc:155
  #, fuzzy
  msgid "Edit this entry"
  msgstr "Редактиовать объект"
  
-#: plugins/admin/groups/class_divListGroup.inc:215
-#: plugins/admin/applications/class_divListApplication.inc:206
-#: plugins/admin/departments/class_divListDepartment.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:200
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
-#: plugins/gofon/conference/class_divListConferences.inc:169
+#: plugins/admin/groups/class_divListGroup.inc:224
+#: plugins/admin/applications/class_divListApplication.inc:216
+#: plugins/admin/departments/class_divListDepartment.inc:131
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:219
+#: plugins/gofon/conference/class_divListConferences.inc:165
  #, fuzzy
  msgid "Delete this entry"
  msgstr "Удалить"
@@ -7234,7 +7176,7 @@ msgstr "У вас недостаточно прав для удаления эт
  #: plugins/admin/users/class_userManagement.inc:449
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
  #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:288
  msgid "none"
  msgstr "нет"
  
@@ -7263,8 +7205,8 @@ msgstr ""
  "использовать шаблоны."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:812
-#: plugins/admin/fai/class_faiTemplate.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:997
+#: plugins/admin/fai/class_faiTemplate.inc:499
  msgid "Template"
  msgstr "Шаблон"
  
@@ -7347,129 +7289,129 @@ msgstr "Выберите, чтобы просмотреть пользовате
  msgid "Show proxy users"
  msgstr "Показать пользователей с прокси-серверами"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  #, fuzzy
  msgid "Create new user"
  msgstr "Создание нового объекта в"
  
-#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/class_divListUsers.inc:121
  #, fuzzy
  msgid "New user"
  msgstr "пользователи"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  #, fuzzy
  msgid "Create new template"
  msgstr "Создать шаблон"
  
-#: plugins/admin/users/class_divListUsers.inc:135
+#: plugins/admin/users/class_divListUsers.inc:123
  msgid "New template"
  msgstr "Создать шаблон"
  
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:173
  msgid "GOsa"
  msgstr ""
  
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:174
  #, fuzzy
  msgid "Edit generic properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:176
  #, fuzzy
  msgid "Edit UNIX properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:178
  #, fuzzy
  msgid "Edit environment properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:180
  #, fuzzy
  msgid "Edit mail properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:182
  #, fuzzy
  msgid "Edit phone properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:184
  #, fuzzy
  msgid "Edit fax properies"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:186
  #, fuzzy
  msgid "Edit samba properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_divListUsers.inc:200
+#: plugins/admin/users/class_divListUsers.inc:188
  #, fuzzy
  msgid "Edit netatalk properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_divListUsers.inc:201
+#: plugins/admin/users/class_divListUsers.inc:189
  #, fuzzy
  msgid "Create user from template"
  msgstr "Создать шаблон"
  
-#: plugins/admin/users/class_divListUsers.inc:202
+#: plugins/admin/users/class_divListUsers.inc:190
  #, fuzzy
  msgid "Create user with this template"
  msgstr "Создать шаблон"
  
-#: plugins/admin/users/class_divListUsers.inc:260
+#: plugins/admin/users/class_divListUsers.inc:248
  #, fuzzy
  msgid "password"
  msgstr "Пароль"
  
-#: plugins/admin/users/class_divListUsers.inc:264
+#: plugins/admin/users/class_divListUsers.inc:252
  #, fuzzy
  msgid "You are not allowed to change the password for this user."
  msgstr "Вам не разрешено менять пароль."
  
-#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:266
  #, fuzzy
  msgid "You are not allowed to remove this user."
  msgstr "У вас недостаточно прав для удаления этого пользователя!"
  
-#: plugins/admin/users/class_divListUsers.inc:297
+#: plugins/admin/users/class_divListUsers.inc:285
  #, fuzzy
  msgid "Online"
  msgstr "в сети"
  
-#: plugins/admin/users/class_divListUsers.inc:304
+#: plugins/admin/users/class_divListUsers.inc:292
  #, fuzzy
  msgid "Offline"
  msgstr "не в сети"
  
  #: plugins/admin/applications/generic.tpl:7
  #: plugins/admin/applications/generic.tpl:10
-#: plugins/admin/applications/class_applicationGeneric.inc:486
+#: plugins/admin/applications/class_applicationGeneric.inc:495
  #: plugins/admin/applications/class_divListApplication.inc:51
  msgid "Application name"
  msgstr "Приложение"
  
  #: plugins/admin/applications/generic.tpl:15
  #: plugins/gofon/macro/generic.tpl:14
-#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: plugins/gofon/macro/class_gofonMacro.inc:499 html/getxls.php:222
  #: html/getxls.php:297
  msgid "Display name"
  msgstr "Отображаемое имя"
  
  #: plugins/admin/applications/generic.tpl:19
-#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/applications/class_applicationGeneric.inc:500
  msgid "Application name to be displayed (i.e. below icons)"
  msgstr ""
  "Имя приложения, которое будет показано пользователям (например, под "
  "пиктограммами)"
  
  #: plugins/admin/applications/generic.tpl:24
-#: plugins/admin/applications/class_applicationGeneric.inc:526
-#: plugins/admin/systems/terminal.tpl:149 plugins/admin/systems/server.tpl:73
-#: plugins/admin/systems/workstation.tpl:124
+#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/systems/terminal.tpl:153 plugins/admin/systems/server.tpl:74
+#: plugins/admin/systems/workstation.tpl:127
  #: plugins/admin/systems/goMailServer.tpl:215
  #: plugins/admin/systems/goImapServer.tpl:110
  #: plugins/admin/ogroups/termgroup.tpl:101
@@ -7487,9 +7429,9 @@ msgid "Choose subtree to place application in"
  msgstr "Выберите ветку, куда нужно поместить приложение"
  
  #: plugins/admin/applications/generic.tpl:66
-#: plugins/admin/applications/class_applicationGeneric.inc:528
+#: plugins/admin/applications/class_applicationGeneric.inc:537
  #: plugins/admin/mimetypes/generic.tpl:67
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:678
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:686
  msgid "Icon"
  msgstr "Пиктограмма"
  
@@ -7502,33 +7444,38 @@ msgstr "Обновить"
  msgid "Reload picture from LDAP"
  msgstr "Обновить изображение с LDAP"
  
-#: plugins/admin/applications/generic.tpl:96
-#: plugins/admin/applications/class_applicationGeneric.inc:532
+#: plugins/admin/applications/generic.tpl:81
+#, fuzzy
+msgid "Remove picture from LDAP"
+msgstr "Обновить изображение с LDAP"
+
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/applications/class_applicationGeneric.inc:541
  msgid "Only executable for members"
  msgstr "Разрешено для выполнения только членам группы"
  
-#: plugins/admin/applications/generic.tpl:101
-#: plugins/admin/applications/class_applicationGeneric.inc:536
+#: plugins/admin/applications/generic.tpl:104
+#: plugins/admin/applications/class_applicationGeneric.inc:545
  msgid "Replace user configuration on startup"
  msgstr "Заменять настройки пользователя при запуске"
  
-#: plugins/admin/applications/generic.tpl:107
-#: plugins/admin/applications/class_applicationGeneric.inc:533
+#: plugins/admin/applications/generic.tpl:110
+#: plugins/admin/applications/class_applicationGeneric.inc:542
  msgid "Place icon on members desktop"
  msgstr "Помещать пиктограмму на рабочие столы членов группы"
  
-#: plugins/admin/applications/generic.tpl:112
-#: plugins/admin/applications/class_applicationGeneric.inc:535
+#: plugins/admin/applications/generic.tpl:115
+#: plugins/admin/applications/class_applicationGeneric.inc:544
  msgid "Place entry in members startmenu"
  msgstr "Помещать членам группы соответствующий элемент в меню запуска"
  
-#: plugins/admin/applications/generic.tpl:117
-#: plugins/admin/applications/class_applicationGeneric.inc:534
+#: plugins/admin/applications/generic.tpl:120
+#: plugins/admin/applications/class_applicationGeneric.inc:543
  #, fuzzy
  msgid "Place entry in members launch bar"
  msgstr "Помещать членам группы соответствующий элемент в меню запуска"
  
-#: plugins/admin/applications/generic.tpl:135
+#: plugins/admin/applications/generic.tpl:138
  #: plugins/admin/systems/printerPPDDialog.tpl:11
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
  #: plugins/admin/fai/faiTemplateEntry.tpl:49
@@ -7536,9 +7483,9 @@ msgstr "Помещать членам группы соответствующи
  msgid "Upload"
  msgstr "Загрузка процессора"
  
-#: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:297
-#: plugins/admin/fai/class_faiTemplate.inc:271
+#: plugins/admin/applications/generic.tpl:140
+#: plugins/admin/fai/class_faiScript.inc:307
+#: plugins/admin/fai/class_faiTemplate.inc:284
  #: plugins/admin/fai/class_faiScriptEntry.inc:89
  #: plugins/admin/fai/class_faiHook.inc:308
  #: plugins/admin/fai/class_faiHookEntry.inc:84
@@ -7568,7 +7515,7 @@ msgstr ""
  "его, щелкнув ниже."
  
  #: plugins/admin/applications/class_applicationParameters.inc:98
-#: plugins/admin/fai/class_faiVariable.inc:412
+#: plugins/admin/fai/class_faiVariable.inc:408
  msgid "Variable"
  msgstr "Переменная"
  
@@ -7627,74 +7574,70 @@ msgstr "Управление приложениями"
  msgid "no example"
  msgstr "не полный"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:132
+#: plugins/admin/applications/class_applicationGeneric.inc:126
  msgid "This 'dn' is no application."
  msgstr "Это DN соответствует не приложению."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:228
+#: plugins/admin/applications/class_applicationGeneric.inc:227
  #, fuzzy, php-format
  msgid "Removing of application with dn '%s' failed."
  msgstr "Показать группы приложений"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:240
+#: plugins/admin/applications/class_applicationGeneric.inc:239
  #, php-format
  msgid "Removing application from objectgroup '%s' failed"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:247
+#: plugins/admin/applications/class_applicationGeneric.inc:246
  #, fuzzy, php-format
  msgid "Removing application from group '%s' failed"
  msgstr "Показать группы приложений"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:289
+#: plugins/admin/applications/class_applicationGeneric.inc:297
  msgid "The specified picture has not been uploaded correctly."
  msgstr "Указанное изображение было загружено некорректно."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:372
  msgid "Specified execute path must start with '/'."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:375
-msgid "You have no permissions to create a application on this 'Base'."
-msgstr "У вас недостаточно прав для создания приложения в этой ветке."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:380
+#: plugins/admin/applications/class_applicationGeneric.inc:389
  msgid "Required field 'Name' is not filled."
  msgstr "Обязательное поле \"Имя\" не заполнено."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:384
+#: plugins/admin/applications/class_applicationGeneric.inc:393
  msgid "Invalid character in application name. Only a-z 0-9 are allowed."
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:388
+#: plugins/admin/applications/class_applicationGeneric.inc:397
  msgid "Required field 'Execute' is not filled."
  msgstr "Обязательное поле \"Выполнить\" не заполнено."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:403
-#: plugins/admin/applications/class_applicationGeneric.inc:411
+#: plugins/admin/applications/class_applicationGeneric.inc:412
+#: plugins/admin/applications/class_applicationGeneric.inc:420
  msgid "There's already an application with this 'Name'."
  msgstr "Приложение с таким именем уже существует."
  
-#: plugins/admin/applications/class_applicationGeneric.inc:457
+#: plugins/admin/applications/class_applicationGeneric.inc:466
  #, fuzzy, php-format
  msgid "Saving of application with dn '%s' failed."
  msgstr "Приложение"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:482
+#: plugins/admin/applications/class_applicationGeneric.inc:491
  #, fuzzy
  msgid "Application settings"
  msgstr "Параметры приложения"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:515
+#: plugins/admin/applications/class_applicationGeneric.inc:524
  #, fuzzy
  msgid "Application generic"
  msgstr "Приложение"
  
-#: plugins/admin/applications/class_applicationGeneric.inc:529
+#: plugins/admin/applications/class_applicationGeneric.inc:538
  msgid "Flag"
  msgstr ""
  
-#: plugins/admin/applications/class_applicationGeneric.inc:530
+#: plugins/admin/applications/class_applicationGeneric.inc:539
  #, fuzzy
  msgid "Script content"
  msgstr "Путь к сценариям"
@@ -7730,14 +7673,14 @@ msgstr ""
  "приложения. Если у вас достаточно большое количество приложений, вы можете "
  "использовать групповое выделение."
  
-#: plugins/admin/applications/class_divListApplication.inc:128
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
  #, fuzzy
  msgid "new"
  msgstr "Создать"
  
-#: plugins/admin/applications/class_divListApplication.inc:129
+#: plugins/admin/applications/class_divListApplication.inc:131
  #, fuzzy
  msgid "Create new application"
  msgstr "Создать приложения"
@@ -7756,6 +7699,18 @@ msgstr "Отмена"
  msgid "Current release"
  msgstr "Текущий пароль"
  
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested operation"
+msgstr ""
+
+#: plugins/admin/departments/dep_iframe.tpl:7
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
  #: plugins/admin/departments/generic.tpl:8
  msgid "Name of department"
  msgstr "Подразделение"
@@ -7770,7 +7725,7 @@ msgid "Descriptive text for department"
  msgstr "Описание подразделения"
  
  #: plugins/admin/departments/generic.tpl:24
-#: plugins/admin/departments/class_departmentGeneric.inc:546
+#: plugins/admin/departments/class_departmentGeneric.inc:590
  msgid "Category"
  msgstr "Категория"
  
@@ -7803,13 +7758,13 @@ msgstr "Основный телефонный номер для ветки"
  msgid "Base facsimile telephone number of this subtree"
  msgstr "Основный номер факса для ветки"
  
-#: plugins/admin/departments/generic.tpl:109
-#: plugins/admin/departments/class_departmentGeneric.inc:549
+#: plugins/admin/departments/generic.tpl:117
+#: plugins/admin/departments/class_departmentGeneric.inc:593
  #, fuzzy
  msgid "Administrative settings"
  msgstr "Администрирование"
  
-#: plugins/admin/departments/generic.tpl:111
+#: plugins/admin/departments/generic.tpl:119
  msgid "Tag department as an independent administrative unit"
  msgstr ""
  
@@ -7846,94 +7801,71 @@ msgstr ""
  "файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
  "<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
  
-#: plugins/admin/departments/dep_iframe.tpl:1
-#: plugins/admin/fai/faiNewBranch.tpl:33
-msgid "Processing the requested operation"
-msgstr ""
+#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
+msgid "Department management"
+msgstr "Управление подразделениями"
  
-#: plugins/admin/departments/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-
-#: plugins/admin/departments/dep_iframe.tpl:8
-#: plugins/admin/fai/faiNewBranch.tpl:40
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
-msgid "Department management"
-msgstr "Управление подразделениями"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:175
+#: plugins/admin/departments/class_departmentGeneric.inc:190
  #, fuzzy, php-format
  msgid "Removing of department with dn '%s' failed."
  msgstr "Показать подразделения"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:224
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr "У вас недостаточно прав для создания подразделения в этой ветке."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:231
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/admin/departments/class_departmentGeneric.inc:251
+#: plugins/admin/departments/class_departmentGeneric.inc:253
  msgid "Department with that 'Name' already exists."
  msgstr "Подразделение с таким именем уже существует."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:241
+#: plugins/admin/departments/class_departmentGeneric.inc:261
  msgid "Required field 'Description' is not set."
  msgstr "Обязательное поле \"Описание\" не заполнено."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:245
+#: plugins/admin/departments/class_departmentGeneric.inc:265
  #, fuzzy, php-format
  msgid ""
  "The field 'Name' contains the reserved word '%s'. Please choose another name."
  msgstr "Значение поля \"Имя\" содержит служебное слово \"incoming\"."
  
-#: plugins/admin/departments/class_departmentGeneric.inc:297
+#: plugins/admin/departments/class_departmentGeneric.inc:319
  msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:343
+#: plugins/admin/departments/class_departmentGeneric.inc:368
  #, fuzzy, php-format
  msgid "Saving of department with dn '%s' failed."
  msgstr "Показать подразделения"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:385
+#: plugins/admin/departments/class_departmentGeneric.inc:421
  #, php-format
  msgid "Tagging '%s'."
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:463
+#: plugins/admin/departments/class_departmentGeneric.inc:506
  #, php-format
  msgid "Moving '%s' to '%s'"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:499
-#: include/class_ldap.inc:458 include/class_acl.inc:523
-#: include/class_acl.inc:530 include/class_acl.inc:537
-#: include/class_acl.inc:543 ihtml/themes/default/snapshotdialog.tpl:14
-#: ihtml/themes/default/snapshotdialog.tpl:53
+#: plugins/admin/departments/class_departmentGeneric.inc:542
+#: include/class_ldap.inc:458 include/class_acl.inc:555
+#: include/class_acl.inc:562 include/class_acl.inc:569
+#: include/class_acl.inc:575 ihtml/themes/default/snapshotdialog.tpl:20
+#: ihtml/themes/default/snapshotdialog.tpl:62
  msgid "Object"
  msgstr "Объект"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:502
+#: plugins/admin/departments/class_departmentGeneric.inc:545
  #, php-format
  msgid "FAILED to copy %s, aborting operation"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentGeneric.inc:532
-#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/departments/class_departmentGeneric.inc:576
+#: plugins/admin/departments/class_departmentGeneric.inc:581
  #: plugins/admin/departments/class_departmentManagement.inc:25
  #: plugins/admin/systems/class_glpiSelectUser.inc:112
  #: plugins/admin/ogroups/class_divListOGroup.inc:58
  msgid "Departments"
  msgstr "Подразделения"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:544
+#: plugins/admin/departments/class_departmentGeneric.inc:588
  #: plugins/admin/systems/workstationService.tpl:89
  #: plugins/admin/systems/terminalService.tpl:79
  #: plugins/gofon/phoneaccount/generic.tpl:32
@@ -7942,24 +7874,25 @@ msgstr "Подразделения"
  msgid "Telephone"
  msgstr "Телефон"
  
-#: plugins/admin/departments/class_departmentGeneric.inc:545
+#: plugins/admin/departments/class_departmentGeneric.inc:589
  #: plugins/admin/departments/class_divListDepartment.inc:41
  #, fuzzy
  msgid "Department name"
  msgstr "Управление подразделениями"
  
-#: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
+#: plugins/admin/departments/class_departmentManagement.inc:160
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:134
  #, php-format
  msgid "You're about to delete the whole LDAP subtree placed under '%s'."
  msgstr "Вы собираетесь удалить целую ветку LDAP с корнем в \"%s\"."
  
-#: plugins/admin/departments/class_departmentManagement.inc:175
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:153
+#: plugins/admin/departments/class_departmentManagement.inc:165
+#: plugins/admin/departments/class_departmentManagement.inc:185
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:155
  msgid "You have no permission to remove this department."
  msgstr "У вас недостаточно прав для удаления этого подразделения."
  
-#: plugins/admin/departments/class_departmentManagement.inc:330
+#: plugins/admin/departments/class_departmentManagement.inc:352
  msgid ".."
  msgstr ""
  
@@ -7984,15 +7917,30 @@ msgid "Regular expression for matching department names"
  msgstr "Регулярное выражение, соответствующее именам подразделений"
  
  #: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/fai/class_divListFai.inc:139
  #, fuzzy
-msgid "Go to users home department"
+msgid "Create new department"
  msgstr "Подразделение"
  
-#: plugins/admin/departments/class_divListDepartment.inc:101
+#: plugins/admin/departments/dep_move_confirm.tpl:2
  #, fuzzy
-msgid "Create new department"
-msgstr "Подразделение"
+msgid "You are currently moving/renaming this department."
+msgstr "У вас недостаточно прав для удаления этого подразделения."
+
+#: plugins/admin/departments/dep_move_confirm.tpl:5
+msgid ""
+"Modifying a departments naming attribute 'ou' or base may corrupt acls and "
+"snapshot entries for all entire objects."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:8
+msgid "GOsa can NOT fix this for you, yet."
+msgstr ""
+
+#: plugins/admin/departments/dep_move_confirm.tpl:11
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
+msgstr ""
  
  #: plugins/admin/systems/network.tpl:1
  #, fuzzy
@@ -8016,7 +7964,7 @@ msgid "Enable DNS for this device"
  msgstr ""
  
  #: plugins/admin/systems/network.tpl:59
-#: plugins/admin/systems/class_servDNS.inc:396
+#: plugins/admin/systems/class_servDNS.inc:398
  #: plugins/admin/systems/servdnseditzone.tpl:67
  #: plugins/admin/fai/faiPackageNew.tpl:31
  #: plugins/gofon/phoneaccount/generic.tpl:84
@@ -8031,8 +7979,8 @@ msgstr "телефоны"
  
  #: plugins/admin/systems/network.tpl:77
  #: plugins/admin/systems/class_servDNS.inc:168
-#: plugins/admin/systems/class_servDNS.inc:399
-#: plugins/admin/systems/class_termDNS.inc:542
+#: plugins/admin/systems/class_servDNS.inc:401
+#: plugins/admin/systems/class_termDNS.inc:547
  #: plugins/admin/systems/servdnseditzone.tpl:85
  msgid "TTL"
  msgstr ""
@@ -8048,10 +7996,10 @@ msgid "present"
  msgstr "присутствует"
  
  #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:252
  #: plugins/admin/systems/class_terminalStartup.inc:161
-#: plugins/admin/systems/class_terminalGeneric.inc:242
-#: plugins/admin/systems/class_workstationStartup.inc:471
+#: plugins/admin/systems/class_terminalGeneric.inc:256
+#: plugins/admin/systems/class_workstationStartup.inc:498
+#: plugins/admin/systems/class_terminalService.inc:261
  msgid "This 'dn' has no terminal features."
  msgstr "Это DN не соответствует терминалу."
  
@@ -8087,6 +8035,92 @@ msgstr "не запущен"
  msgid "offline"
  msgstr "не в сети"
  
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr "Шаблон терминала"
+
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr "Терминал"
+
+#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
+#: plugins/admin/systems/workstation.tpl:44
+#: plugins/admin/systems/class_terminalGeneric.inc:548
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:390
+msgid "Mode"
+msgstr "Режим"
+
+#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:50
+msgid "Select terminal mode"
+msgstr "Выберите режим терминала"
+
+#: plugins/admin/systems/terminal.tpl:47
+#: plugins/admin/systems/workstation.tpl:54
+#: plugins/admin/systems/class_workstationGeneric.inc:539
+#: plugins/admin/ogroups/termgroup.tpl:58
+#: plugins/admin/ogroups/class_termgroup.inc:391
+msgid "Syslog server"
+msgstr "Сервер системных журналов"
+
+#: plugins/admin/systems/terminal.tpl:50
+#: plugins/admin/systems/workstation.tpl:57
+#: plugins/admin/ogroups/termgroup.tpl:61
+msgid "Choose server to use for logging"
+msgstr "Выберите сервер для ведения системных журналов"
+
+#: plugins/admin/systems/terminal.tpl:66
+#: plugins/admin/systems/class_terminalGeneric.inc:549
+msgid "Root server"
+msgstr "Основной сервер"
+
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Select NFS root filesystem to use"
+msgstr "Выберите корневую файловую систему NFS"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/class_terminalGeneric.inc:550
+msgid "Swap server"
+msgstr "Сервер подкачки"
+
+#: plugins/admin/systems/terminal.tpl:79
+msgid "Choose NFS filesystem to place swap files on"
+msgstr "Выберите файловую систему NFS для файлов подкачки"
+
+#: plugins/admin/systems/terminal.tpl:98
+#: plugins/admin/systems/workstation.tpl:75
+msgid "Inherit time server attributes"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:80
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr "Сервер NTP"
+
+#: plugins/admin/systems/terminal.tpl:106
+#: plugins/admin/systems/workstation.tpl:83
+#: plugins/admin/ogroups/termgroup.tpl:17
+msgid "Choose server to use for synchronizing time"
+msgstr "Выберите сервер для синхронизации времени"
+
+#: plugins/admin/systems/terminal.tpl:140 plugins/admin/systems/server.tpl:62
+#: plugins/admin/systems/workstation.tpl:115
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:47
+#: plugins/admin/ogroups/termgroup.tpl:88
+msgid "Action"
+msgstr "Действие"
+
+#: plugins/admin/systems/terminal.tpl:145
+#: plugins/admin/systems/workstation.tpl:120
+#: plugins/admin/ogroups/termgroup.tpl:93
+msgid "Select action to execute for this terminal"
+msgstr "Выберите действие, которое нужно выполнить на этом терминале"
+
  #: plugins/admin/systems/info.tpl:1
  msgid "System information"
  msgstr "Системная информация"
@@ -8195,51 +8229,50 @@ msgstr "Графический интерфейс"
  msgid "This 'dn' has no network features."
  msgstr "Этот DN не имеет свойств принтера."
  
-#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_winGeneric.inc:145
  #, php-format
  msgid "Removing of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_componentGeneric.inc:179
+#: plugins/admin/systems/class_winGeneric.inc:195
  #, fuzzy
  msgid "You have no permissions to create a component on this 'Base'."
  msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
  
-#: plugins/admin/systems/class_winGeneric.inc:184
-#: plugins/admin/systems/class_terminalGeneric.inc:400
-#: plugins/admin/systems/class_servGeneric.inc:261
-#: plugins/admin/systems/class_workstationGeneric.inc:400
-#: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/systems/class_componentGeneric.inc:189
-#: plugins/admin/systems/class_phoneGeneric.inc:333
+#: plugins/admin/systems/class_winGeneric.inc:205
+#: plugins/admin/systems/class_terminalGeneric.inc:434
+#: plugins/admin/systems/class_servGeneric.inc:274
+#: plugins/admin/systems/class_workstationGeneric.inc:414
+#: plugins/admin/systems/class_printGeneric.inc:673
+#: plugins/admin/systems/class_componentGeneric.inc:191
+#: plugins/admin/systems/class_phoneGeneric.inc:338
  #, php-format
  msgid "There is already an entry '%s' in the base choosen by you"
  msgstr "В выбранной вами ветке уже есть запись \"%s\""
  
-#: plugins/admin/systems/class_winGeneric.inc:239
+#: plugins/admin/systems/class_winGeneric.inc:260
  #, php-format
  msgid "Saving of system wingeneric/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_winGeneric.inc:250
+#: plugins/admin/systems/class_winGeneric.inc:271
  #, fuzzy
  msgid "Win generic"
  msgstr "Служба печати"
  
-#: plugins/admin/systems/class_winGeneric.inc:251
+#: plugins/admin/systems/class_winGeneric.inc:272
  #, fuzzy
  msgid "Windows workstation generic"
  msgstr "Имя рабочий станции"
  
-#: plugins/admin/systems/class_winGeneric.inc:256
+#: plugins/admin/systems/class_winGeneric.inc:277
  #, fuzzy
  msgid "Win workstation"
  msgstr "Рабочая станция Windows"
  
-#: plugins/admin/systems/class_winGeneric.inc:259
+#: plugins/admin/systems/class_winGeneric.inc:280
  #: plugins/admin/systems/workstation.tpl:10
-#: plugins/admin/systems/class_workstationGeneric.inc:513
+#: plugins/admin/systems/class_workstationGeneric.inc:535
  msgid "Workstation name"
  msgstr "Имя рабочий станции"
  
@@ -8247,123 +8280,21 @@ msgstr "Имя рабочий станции"
  msgid "System management"
  msgstr "Управление системами"
  
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr "Шаблон терминала"
-
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-msgstr "Терминал"
-
-#: plugins/admin/systems/terminal.tpl:37 plugins/admin/systems/server.tpl:41
-#: plugins/admin/systems/workstation.tpl:44
-#: plugins/admin/systems/class_terminalGeneric.inc:508
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/ogroups/termgroup.tpl:47
-#: plugins/admin/ogroups/class_termgroup.inc:391
-msgid "Mode"
-msgstr "Режим"
-
-#: plugins/admin/systems/terminal.tpl:40 plugins/admin/systems/server.tpl:44
-#: plugins/admin/systems/workstation.tpl:47
-#: plugins/admin/ogroups/termgroup.tpl:50
-msgid "Select terminal mode"
-msgstr "Выберите режим терминала"
-
-#: plugins/admin/systems/terminal.tpl:47
-#: plugins/admin/systems/workstation.tpl:54
-#: plugins/admin/systems/class_workstationGeneric.inc:517
-#: plugins/admin/ogroups/termgroup.tpl:58
-#: plugins/admin/ogroups/class_termgroup.inc:392
-msgid "Syslog server"
-msgstr "Сервер системных журналов"
-
-#: plugins/admin/systems/terminal.tpl:50
-#: plugins/admin/systems/workstation.tpl:57
-#: plugins/admin/ogroups/termgroup.tpl:61
-msgid "Choose server to use for logging"
-msgstr "Выберите сервер для ведения системных журналов"
-
-#: plugins/admin/systems/terminal.tpl:66
-#: plugins/admin/systems/class_terminalGeneric.inc:509
-msgid "Root server"
-msgstr "Основной сервер"
-
-#: plugins/admin/systems/terminal.tpl:69
-msgid "Select NFS root filesystem to use"
-msgstr "Выберите корневую файловую систему NFS"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/class_terminalGeneric.inc:510
-msgid "Swap server"
-msgstr "Сервер подкачки"
-
-#: plugins/admin/systems/terminal.tpl:79
-msgid "Choose NFS filesystem to place swap files on"
-msgstr "Выберите файловую систему NFS для файлов подкачки"
-
-#: plugins/admin/systems/terminal.tpl:98
-#: plugins/admin/systems/workstation.tpl:75
-msgid "Inherit time server attributes"
-msgstr ""
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
-msgstr "Сервер NTP"
-
-#: plugins/admin/systems/terminal.tpl:106
-#: plugins/admin/systems/workstation.tpl:83
-#: plugins/admin/ogroups/termgroup.tpl:17
-msgid "Choose server to use for synchronizing time"
-msgstr "Выберите сервер для синхронизации времени"
-
-#: plugins/admin/systems/terminal.tpl:136 plugins/admin/systems/server.tpl:61
-#: plugins/admin/systems/workstation.tpl:112
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/class_baseSelectDialog.inc:47
-#: plugins/admin/ogroups/termgroup.tpl:88
-msgid "Action"
-msgstr "Действие"
-
-#: plugins/admin/systems/terminal.tpl:141
-#: plugins/admin/systems/workstation.tpl:117
-#: plugins/admin/ogroups/termgroup.tpl:93
-msgid "Select action to execute for this terminal"
-msgstr "Выберите действие, которое нужно выполнить на этом терминале"
-
-#: plugins/admin/systems/class_terminalService.inc:69
-#: plugins/admin/systems/class_workstationService.inc:92
-#: plugins/admin/systems/workstationService.tpl:157
+#: plugins/admin/systems/goNtpServer.tpl:2
  #, fuzzy
-msgid "unknown"
-msgstr "состояние неизвестно"
+msgid "Time server"
+msgstr "Сервисы"
  
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
-#: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:214
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
  #: plugins/admin/systems/class_terminalStartup.inc:39
  #: plugins/admin/systems/class_terminalStartup.inc:121
  #: plugins/admin/systems/class_terminalStartup.inc:141
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_terminalGeneric.inc:298
-#: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_workstationStartup.inc:268
-#: plugins/admin/systems/class_workstationStartup.inc:285
-#: plugins/admin/systems/class_workstationStartup.inc:289
-#: plugins/admin/systems/class_workstationStartup.inc:790
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:312
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:290
+#: plugins/admin/systems/class_workstationStartup.inc:312
+#: plugins/admin/systems/class_workstationStartup.inc:316
+#: plugins/admin/systems/class_workstationStartup.inc:824
  #: plugins/admin/systems/class_workstationService.inc:201
  #: plugins/admin/systems/class_workstationService.inc:204
  #: plugins/admin/systems/class_workstationService.inc:207
@@ -8378,213 +8309,25 @@ msgstr "состояние неизвестно"
  #: plugins/admin/systems/class_workstationService.inc:233
  #: plugins/admin/systems/class_workstationService.inc:234
  #: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_terminalService.inc:74
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:108
+#: plugins/admin/systems/class_terminalService.inc:118
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:121
+#: plugins/admin/systems/class_terminalService.inc:125
+#: plugins/admin/systems/class_terminalService.inc:218
+#: plugins/admin/systems/class_terminalService.inc:221
+#: plugins/admin/systems/class_terminalService.inc:224
+#: plugins/admin/systems/class_terminalService.inc:227
+#: plugins/admin/systems/class_terminalService.inc:230
+#: plugins/admin/systems/class_terminalService.inc:233
+#: plugins/admin/systems/class_terminalService.inc:236
  msgid "inherited"
  msgstr ""
  
-#: plugins/admin/systems/class_terminalService.inc:101
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:95
-#: plugins/admin/systems/class_workstationService.inc:96
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:98
-#, fuzzy
-msgid "bit"
-msgstr "запись"
-
-#: plugins/admin/systems/class_terminalService.inc:155
-msgid "default"
-msgstr "по умолчанию"
-
-#: plugins/admin/systems/class_terminalService.inc:156
-#: plugins/admin/systems/class_workstationService.inc:138
-msgid "show chooser"
-msgstr "показать окно входа в систему"
-
-#: plugins/admin/systems/class_terminalService.inc:157
-#: plugins/admin/systems/class_workstationService.inc:139
-msgid "direct"
-msgstr "напрямую"
-
-#: plugins/admin/systems/class_terminalService.inc:160
-#: plugins/admin/systems/class_workstationService.inc:142
-msgid "load balanced"
-msgstr "с выравниваем нагрузки"
-
-#: plugins/admin/systems/class_terminalService.inc:163
-#: plugins/admin/systems/class_workstationService.inc:145
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: plugins/admin/systems/class_terminalService.inc:164
-#: plugins/admin/systems/class_workstationService.inc:146
-msgid "ICA client"
-msgstr "Клиент ICA"
-
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_workstationService.inc:204
-#, fuzzy
-msgid "Bit"
-msgstr "запись"
-
-#: plugins/admin/systems/class_terminalService.inc:307
-#: plugins/admin/systems/class_workstationService.inc:314
-#, fuzzy
-msgid "Choose the phone located at the current terminal"
-msgstr "Выбрать раздел, для хранения объекта"
-
-#: plugins/admin/systems/class_terminalService.inc:370
-#: plugins/admin/systems/class_terminalService.inc:375
-#: plugins/admin/systems/class_workstationService.inc:380
-#: plugins/admin/systems/class_workstationService.inc:385
-msgid "Please specify a valid VSync range."
-msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
-
-#: plugins/admin/systems/class_terminalService.inc:385
-#: plugins/admin/systems/class_terminalService.inc:390
-#: plugins/admin/systems/class_workstationService.inc:395
-#: plugins/admin/systems/class_workstationService.inc:400
-msgid "Please specify a valid HSync range."
-msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
-
-#: plugins/admin/systems/class_terminalService.inc:421
-#, fuzzy, php-format
-msgid "Saving of object system terminal/service with dn '%s' failed."
-msgstr "Информация об организации"
-
-#: plugins/admin/systems/class_terminalService.inc:430
-#: plugins/admin/systems/class_workstationService.inc:451
-#, fuzzy
-msgid "Service"
-msgstr "Сервисы"
-
-#: plugins/admin/systems/class_terminalService.inc:431
-#: plugins/admin/systems/class_goTerminalServer.inc:31
-#: plugins/admin/systems/class_goTerminalServer.inc:54
-#: plugins/admin/systems/class_goTerminalServer.inc:117
-#: plugins/admin/systems/class_goTerminalServer.inc:118
-#: plugins/admin/systems/goTerminalServer.tpl:1
-#, fuzzy
-msgid "Terminal service"
-msgstr "Терминальный сервер"
-
-#: plugins/admin/systems/class_terminalService.inc:439
-#: plugins/admin/systems/class_workstationService.inc:460
-#, fuzzy
-msgid "Monitor"
-msgstr "Мониторинг"
-
-#: plugins/admin/systems/class_terminalService.inc:440
-#: plugins/admin/ogroups/class_phonequeue.inc:748
-#, fuzzy
-msgid "Method"
-msgstr "Почтовые настройки"
-
-#: plugins/admin/systems/class_terminalService.inc:441
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Remote desktop"
-msgstr "Удаленная рабочая станция"
-
-#: plugins/admin/systems/class_terminalService.inc:442
-#: plugins/admin/systems/class_goTerminalServer.inc:127
-#: plugins/admin/systems/goTerminalServer.tpl:12
-#, fuzzy
-msgid "Font path"
-msgstr "Контакт"
-
-#: plugins/admin/systems/class_terminalService.inc:443
-#: plugins/admin/systems/class_workstationService.inc:461
-#, fuzzy
-msgid "Gfx driver"
-msgstr "Сервер"
-
-#: plugins/admin/systems/class_terminalService.inc:444
-#: plugins/admin/systems/class_workstationService.inc:462
-#, fuzzy
-msgid "Gfx resolution"
-msgstr "Разрешение"
-
-#: plugins/admin/systems/class_terminalService.inc:445
-#: plugins/admin/systems/class_workstationService.inc:463
-#, fuzzy
-msgid "Gfx color depth"
-msgstr "Глубина цвета"
-
-#: plugins/admin/systems/class_terminalService.inc:446
-#: plugins/admin/systems/class_workstationService.inc:464
-#, fuzzy
-msgid "Hsync"
-msgstr "Строчная синхронизация"
-
-#: plugins/admin/systems/class_terminalService.inc:447
-#: plugins/admin/systems/class_workstationService.inc:465
-#, fuzzy
-msgid "Vsync"
-msgstr "Кадровая синхронизация"
-
-#: plugins/admin/systems/class_terminalService.inc:448
-#, fuzzy
-msgid "Printer service enabled"
-msgstr "Служба печати"
-
-#: plugins/admin/systems/class_terminalService.inc:449
-#: plugins/admin/systems/terminalService.tpl:221
-msgid "Spool server"
-msgstr "Сервер для хранения запросов и временных файлов"
-
-#: plugins/admin/systems/class_terminalService.inc:450
-#: plugins/admin/systems/class_workstationService.inc:467
-#, fuzzy
-msgid "Scanner enabled"
-msgstr "отключен"
-
-#: plugins/admin/systems/class_terminalService.inc:451
-#, fuzzy
-msgid "Scanner model"
-msgstr "отключен"
-
-#: plugins/admin/systems/class_terminalService.inc:454
-#: plugins/admin/systems/class_workstationService.inc:468
-#, fuzzy
-msgid "Keyboard model"
-msgstr "Выберите модель клавиатуры"
-
-#: plugins/admin/systems/class_terminalService.inc:455
-#: plugins/admin/systems/class_workstationService.inc:469
-#, fuzzy
-msgid "Keyboard layout"
-msgstr "Выберите раскладку"
-
-#: plugins/admin/systems/class_terminalService.inc:456
-#: plugins/admin/systems/class_workstationService.inc:470
-#, fuzzy
-msgid "Keyboard variant"
-msgstr "Выберите вариант раскладки"
-
-#: plugins/admin/systems/class_terminalService.inc:457
-#: plugins/admin/systems/class_workstationService.inc:471
-#, fuzzy
-msgid "Mouse type"
-msgstr "Тип"
-
-#: plugins/admin/systems/class_terminalService.inc:458
-#: plugins/admin/systems/class_workstationService.inc:472
-#, fuzzy
-msgid "Mouse port"
-msgstr "Мониторинг"
-
-#: plugins/admin/systems/class_terminalService.inc:459
-#: plugins/admin/systems/class_workstationService.inc:473
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:76
-#: plugins/gofon/phoneaccount/generic.tpl:30
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Телефонное оборудование"
-
  #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:310
+#: plugins/admin/systems/class_workstationStartup.inc:337
  #, fuzzy, php-format
  msgid ""
  "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -8603,26 +8346,26 @@ msgid "Terminal startup"
  msgstr "Шаблон терминала"
  
  #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1163
  #, fuzzy
  msgid "Ldap server"
  msgstr "Сервер подкачки"
  
  #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1122
+#: plugins/admin/systems/class_workstationStartup.inc:1167
  #, fuzzy
  msgid "Kernel modules"
  msgstr "Изменить параметры"
  
  #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1119
+#: plugins/admin/systems/class_workstationStartup.inc:1164
  #: plugins/admin/systems/workstationStartup.tpl:8
  #: plugins/admin/systems/terminalStartup.tpl:8
  msgid "Boot kernel"
  msgstr "Ядро для загрузки"
  
  #: plugins/admin/systems/class_terminalStartup.inc:455
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1165
  #, fuzzy
  msgid "Kernel parameter"
  msgstr "Изменить параметры"
@@ -8631,7 +8374,7 @@ msgstr "Изменить параметры"
  msgid "Server name"
  msgstr "Имя сервера"
  
-#: plugins/admin/systems/server.tpl:66
+#: plugins/admin/systems/server.tpl:67
  #, fuzzy
  msgid "Select action to execute for this server"
  msgstr "Выберите действие, которое нужно выполнить на этом терминале"
@@ -8728,7 +8471,7 @@ msgid "Supported interfaces"
  msgstr "Сетевой принтер"
  
  #: plugins/admin/systems/glpiPrinter.tpl:48
-#: plugins/admin/systems/class_servDNS.inc:395
+#: plugins/admin/systems/class_servDNS.inc:397
  #, fuzzy
  msgid "Serial"
  msgstr "терминалы"
@@ -8774,212 +8517,209 @@ msgstr "подразделения"
  msgid "Installed cartridges"
  msgstr "Клиентские устройства"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:98
+#: plugins/admin/systems/class_terminalGeneric.inc:105
  msgid "text"
  msgstr "текст"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:106
  msgid "graphic"
  msgstr "графика"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:173
+#: plugins/admin/systems/class_terminalGeneric.inc:181
  #, php-format
  msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:179
+#: plugins/admin/systems/class_terminalGeneric.inc:188
  msgid "No WAKECMD definition found in your gosa.conf"
  msgstr "Определение WAKECMD в вашем файле gosa.conf не найдено"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:191
+#: plugins/admin/systems/class_terminalGeneric.inc:200
  msgid "No REBOOTCMD definition found in your gosa.conf"
  msgstr "Определение REBOOTCMD в вашем файле gosa.conf не найдено"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:203
+#: plugins/admin/systems/class_terminalGeneric.inc:212
  msgid "No HALTCMD definition found in your gosa.conf"
  msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:280
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:294
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Switch off"
  msgstr "Выключить"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:281
-#: plugins/admin/systems/class_servGeneric.inc:175
-#: plugins/admin/systems/class_workstationGeneric.inc:277
-#: plugins/admin/ogroups/class_termgroup.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:295
+#: plugins/admin/systems/class_servGeneric.inc:185
+#: plugins/admin/systems/class_workstationGeneric.inc:284
+#: plugins/admin/ogroups/class_termgroup.inc:295
  msgid "Reboot"
  msgstr "Перезагрузить"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:282
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_servGeneric.inc:186
-#: plugins/admin/systems/class_workstationGeneric.inc:282
-#: plugins/admin/systems/class_workstationGeneric.inc:288
-#: plugins/admin/ogroups/class_termgroup.inc:301
+#: plugins/admin/systems/class_terminalGeneric.inc:296
+#: plugins/admin/systems/class_terminalGeneric.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:190
+#: plugins/admin/systems/class_servGeneric.inc:196
+#: plugins/admin/systems/class_workstationGeneric.inc:289
+#: plugins/admin/systems/class_workstationGeneric.inc:295
+#: plugins/admin/ogroups/class_termgroup.inc:300
  #, fuzzy
  msgid "Memory test"
  msgstr "Память"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:283
-#: plugins/admin/systems/class_terminalGeneric.inc:287
-#: plugins/admin/systems/class_servGeneric.inc:181
-#: plugins/admin/systems/class_servGeneric.inc:187
-#: plugins/admin/systems/class_workstationGeneric.inc:283
-#: plugins/admin/systems/class_workstationGeneric.inc:289
-#: plugins/admin/ogroups/class_termgroup.inc:302
+#: plugins/admin/systems/class_terminalGeneric.inc:297
+#: plugins/admin/systems/class_terminalGeneric.inc:301
+#: plugins/admin/systems/class_servGeneric.inc:191
+#: plugins/admin/systems/class_servGeneric.inc:197
+#: plugins/admin/systems/class_workstationGeneric.inc:290
+#: plugins/admin/systems/class_workstationGeneric.inc:296
+#: plugins/admin/ogroups/class_termgroup.inc:301
  #, fuzzy
  msgid "System analysis"
  msgstr "Системные журналы"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:285
-#: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/systems/class_terminalGeneric.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:193
+#: plugins/admin/systems/class_workstationGeneric.inc:292
  msgid "Wake up"
  msgstr "Вернуть в обычный режим"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:333
+#: plugins/admin/systems/class_terminalGeneric.inc:348
  #, php-format
  msgid "Removing of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:383
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr "У вас недостаточно прав для создания терминала в этой ветке."
-
-#: plugins/admin/systems/class_terminalGeneric.inc:387
+#: plugins/admin/systems/class_terminalGeneric.inc:415
  msgid "The required field 'Terminal name' is not set."
  msgstr "Обязательное поле 'Название терминала' не заполнено."
  
-#: plugins/admin/systems/class_terminalGeneric.inc:410
-#: plugins/admin/systems/class_workstationGeneric.inc:410
+#: plugins/admin/systems/class_terminalGeneric.inc:444
+#: plugins/admin/systems/class_workstationGeneric.inc:424
  msgid ""
  "There must be at least one NTP server selected, or the inherit mode "
  "activated."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:488
+#: plugins/admin/systems/class_terminalGeneric.inc:528
  #, php-format
  msgid "Saving of object system terminal/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_terminalGeneric.inc:499
-#: plugins/admin/systems/class_terminalGeneric.inc:505
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: plugins/admin/systems/class_terminalGeneric.inc:539
+#: plugins/admin/systems/class_terminalGeneric.inc:545
+#: plugins/admin/systems/class_systemManagement.inc:998
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/admin/ogroups/class_ogroupManagement.inc:353
  #, fuzzy
  msgid "Terminal"
  msgstr "Терминалы"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:500
+#: plugins/admin/systems/class_terminalGeneric.inc:540
  #, fuzzy
  msgid "Terminal generic"
  msgstr "Терминальный сервер"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: plugins/admin/systems/class_terminalGeneric.inc:551
  #, fuzzy
  msgid "Syslog server enabled"
  msgstr "Сервер системных журналов"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: plugins/admin/systems/class_terminalGeneric.inc:552
  #, fuzzy
  msgid "Ntp server settings"
  msgstr "Почтовые настройки пользователя"
  
-#: plugins/admin/systems/class_terminalGeneric.inc:515
-#: plugins/admin/systems/class_servGeneric.inc:347
-#: plugins/admin/systems/class_workstationGeneric.inc:519
-#: plugins/admin/ogroups/class_termgroup.inc:393
+#: plugins/admin/systems/class_terminalGeneric.inc:555
+#: plugins/admin/systems/class_workstationGeneric.inc:541
+#, fuzzy
+msgid "Root password"
+msgstr "Изменить пароль"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:556
+#: plugins/admin/systems/class_servGeneric.inc:360
+#: plugins/admin/systems/class_workstationGeneric.inc:542
+#: plugins/admin/ogroups/class_termgroup.inc:392
  #, fuzzy
  msgid "Action flag"
  msgstr "Действие"
  
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:41
+#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_workstationGeneric.inc:108
+#: plugins/admin/ogroups/class_termgroup.inc:40
  #, fuzzy
  msgid "Activated"
  msgstr "Личный"
  
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_servGeneric.inc:79
  #, fuzzy
  msgid "This 'dn' has no server features."
  msgstr "Этот DN не имеет свойств принтера."
  
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#: plugins/admin/ogroups/class_termgroup.inc:206
+#: plugins/admin/systems/class_servGeneric.inc:87
+#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/ogroups/class_termgroup.inc:205
  #, fuzzy
  msgid "No ACTIONCMD definition found in your gosa.conf"
  msgstr "Определение HALTCMD в вашем файле gosa.conf не найдено"
  
-#: plugins/admin/systems/class_servGeneric.inc:114
+#: plugins/admin/systems/class_servGeneric.inc:125
  #, php-format
  msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:176
-#: plugins/admin/systems/class_workstationGeneric.inc:278
-#: plugins/admin/ogroups/class_termgroup.inc:297
+#: plugins/admin/systems/class_servGeneric.inc:186
+#: plugins/admin/systems/class_workstationGeneric.inc:285
+#: plugins/admin/ogroups/class_termgroup.inc:296
  #, fuzzy
  msgid "Instant update"
  msgstr "Создать телефонный аккаунт"
  
-#: plugins/admin/systems/class_servGeneric.inc:177
-#: plugins/admin/systems/class_servGeneric.inc:185
-#: plugins/admin/systems/class_workstationGeneric.inc:279
-#: plugins/admin/systems/class_workstationGeneric.inc:287
-#: plugins/admin/ogroups/class_termgroup.inc:298
+#: plugins/admin/systems/class_servGeneric.inc:187
+#: plugins/admin/systems/class_servGeneric.inc:195
+#: plugins/admin/systems/class_workstationGeneric.inc:286
+#: plugins/admin/systems/class_workstationGeneric.inc:294
+#: plugins/admin/ogroups/class_termgroup.inc:297
  #, fuzzy
  msgid "Scheduled update"
  msgstr "Выберите режим терминала"
  
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_servGeneric.inc:184
-#: plugins/admin/systems/class_workstationGeneric.inc:280
-#: plugins/admin/systems/class_workstationGeneric.inc:286
-#: plugins/admin/ogroups/class_termgroup.inc:299
+#: plugins/admin/systems/class_servGeneric.inc:188
+#: plugins/admin/systems/class_servGeneric.inc:194
+#: plugins/admin/systems/class_workstationGeneric.inc:287
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/ogroups/class_termgroup.inc:298
  msgid "Reinstall"
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:179
-#: plugins/admin/systems/class_workstationGeneric.inc:281
-#: plugins/admin/ogroups/class_termgroup.inc:300
+#: plugins/admin/systems/class_servGeneric.inc:189
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:299
  #, fuzzy
  msgid "Rescan hardware"
  msgstr "Телефонное оборудование"
  
-#: plugins/admin/systems/class_servGeneric.inc:207
+#: plugins/admin/systems/class_servGeneric.inc:218
  #, fuzzy, php-format
  msgid "Removing of system server/generic with dn '%s' failed."
  msgstr "Удалить учетную запись POSIX"
  
-#: plugins/admin/systems/class_servGeneric.inc:245
+#: plugins/admin/systems/class_servGeneric.inc:263
  #, fuzzy
  msgid "The required field 'Server name' is not set."
  msgstr "Обязательное поле \"Личное имя\" не заполнено."
  
-#: plugins/admin/systems/class_servGeneric.inc:250
-#, fuzzy
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
-
-#: plugins/admin/systems/class_servGeneric.inc:319
+#: plugins/admin/systems/class_servGeneric.inc:332
  #, php-format
  msgid "Saving of system server/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servGeneric.inc:335
+#: plugins/admin/systems/class_servGeneric.inc:348
  #, fuzzy
  msgid "Server generic"
  msgstr "Имя сервера"
  
-#: plugins/admin/systems/class_servGeneric.inc:345
-#: plugins/admin/systems/class_workstationGeneric.inc:516
+#: plugins/admin/systems/class_servGeneric.inc:358
+#: plugins/admin/systems/class_workstationGeneric.inc:538
  #, fuzzy
  msgid "Goto mode"
  msgstr "в папку"
@@ -9010,51 +8750,46 @@ msgstr ""
  "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
  "ниже."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:191
-#: plugins/admin/ogroups/class_termgroup.inc:249
+#: plugins/admin/systems/class_workstationGeneric.inc:198
+#: plugins/admin/ogroups/class_termgroup.inc:248
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
  msgstr "Шаблон рабочей станции"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_workstationGeneric.inc:209
  msgid "This 'dn' has no workstation features."
  msgstr "Это DN не содержит атрибутоов рабочей станции."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:324
+#: plugins/admin/systems/class_workstationGeneric.inc:332
  #, fuzzy, php-format
  msgid "Removing of system workstation/generic with dn '%s' failed."
  msgstr "Удалить учетную запись Samba"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:382
-#: plugins/admin/ogroups/class_termgroup.inc:109
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr "У вас недостаточно прав для создания рабочей станции в этой ветке."
-
-#: plugins/admin/systems/class_workstationGeneric.inc:387
+#: plugins/admin/systems/class_workstationGeneric.inc:396
  msgid "The required field 'Workstation name' is not set."
  msgstr "Обязательное поле 'Название рабочей станции' не заполнено."
  
-#: plugins/admin/systems/class_workstationGeneric.inc:477
-#: plugins/admin/systems/class_workstationGeneric.inc:495
+#: plugins/admin/systems/class_workstationGeneric.inc:491
+#: plugins/admin/systems/class_workstationGeneric.inc:517
  #, fuzzy, php-format
  msgid "Saving of system workstation/generic with dn '%s' failed."
  msgstr "Дополнительные записи в fstab"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:505
+#: plugins/admin/systems/class_workstationGeneric.inc:527
  #, fuzzy
  msgid "Workstation generic"
  msgstr "Имя рабочий станции"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:814
+#: plugins/admin/systems/class_workstationGeneric.inc:532
+#: plugins/admin/systems/class_systemManagement.inc:999
  #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/admin/ogroups/class_ogroupManagement.inc:352
  #: plugins/generic/references/class_reference.inc:48
  msgid "Workstation"
  msgstr "Рабочая станция"
  
-#: plugins/admin/systems/class_workstationGeneric.inc:518
-#: plugins/admin/ogroups/class_termgroup.inc:394
+#: plugins/admin/systems/class_workstationGeneric.inc:540
+#: plugins/admin/ogroups/class_termgroup.inc:393
  #, fuzzy
  msgid "Ntp server"
  msgstr "Сервер NTP"
@@ -9063,105 +8798,127 @@ msgstr "Сервер NTP"
  msgid "Systems"
  msgstr "Системы"
  
-#: plugins/admin/systems/class_systemManagement.inc:222
+#: plugins/admin/systems/class_systemManagement.inc:191
+msgid "Creating the image failed. Please see the report below."
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:200
+#, fuzzy, php-format
+msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+msgstr ""
+"Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
+
+#: plugins/admin/systems/class_systemManagement.inc:257
+#, fuzzy
+msgid "You are not allowed to create a new object of this type."
+msgstr "У вас недостаточно прав для удаления этого группового объекта!"
+
+#: plugins/admin/systems/class_systemManagement.inc:308
  msgid "You can't edit this object type yet!"
  msgstr "Вы не можете редактировать сейчас этот тип объекта!"
  
-#: plugins/admin/systems/class_systemManagement.inc:247
+#: plugins/admin/systems/class_systemManagement.inc:336
+#: plugins/admin/systems/class_systemManagement.inc:402
+#, fuzzy
+msgid "You are not allowed to change the password for this object."
+msgstr "Вам не разрешено менять пароль."
+
+#: plugins/admin/systems/class_systemManagement.inc:348
  msgid "Passwords entered as new and repeated do not match!"
  msgstr "Введенные пароли не совпадают!"
  
-#: plugins/admin/systems/class_systemManagement.inc:264
-msgid "You are not allowed to set this systems password!"
-msgstr "У вас недостаточно прав для смены пароля этой системы!"
+#: plugins/admin/systems/class_systemManagement.inc:405
+#, fuzzy
+msgid "Can't detect object to change password."
+msgstr "Сменить пароль"
  
-#: plugins/admin/systems/class_systemManagement.inc:318
+#: plugins/admin/systems/class_systemManagement.inc:467
  #, fuzzy, php-format
  msgid "You're about to delete all information about the component at '%s'."
  msgstr "Вы собираетесь удалить всю информацию о терминале (\"%s\")."
  
-#: plugins/admin/systems/class_systemManagement.inc:324
-#: plugins/admin/systems/class_systemManagement.inc:385
+#: plugins/admin/systems/class_systemManagement.inc:473
+#: plugins/admin/systems/class_systemManagement.inc:533
  #: plugins/admin/fai/class_faiManagement.inc:168
  #: plugins/admin/fai/class_faiManagement.inc:221
  #, fuzzy
  msgid "You are not allowed to delete this component!"
  msgstr "У вас недостаточно прав для удаления этого объекта!"
  
-#: plugins/admin/systems/class_systemManagement.inc:652
+#: plugins/admin/systems/class_systemManagement.inc:837
  msgid "New terminal"
  msgstr "Создать терминал"
  
-#: plugins/admin/systems/class_systemManagement.inc:654
+#: plugins/admin/systems/class_systemManagement.inc:839
  msgid "New workstation"
  msgstr "Новая рабочая станция"
  
-#: plugins/admin/systems/class_systemManagement.inc:656
+#: plugins/admin/systems/class_systemManagement.inc:841
  #, fuzzy
  msgid "New Device"
  msgstr "Сетевые устройства"
  
-#: plugins/admin/systems/class_systemManagement.inc:675
+#: plugins/admin/systems/class_systemManagement.inc:860
  #, fuzzy
  msgid "Terminal template for"
  msgstr "Шаблон терминала"
  
-#: plugins/admin/systems/class_systemManagement.inc:691
+#: plugins/admin/systems/class_systemManagement.inc:876
  msgid "Workstation template for"
  msgstr "Шаблон рабочей станции для"
  
-#: plugins/admin/systems/class_systemManagement.inc:811
+#: plugins/admin/systems/class_systemManagement.inc:996
  #, fuzzy
  msgid "New System from incoming"
  msgstr "Системная информация"
  
-#: plugins/admin/systems/class_systemManagement.inc:815
+#: plugins/admin/systems/class_systemManagement.inc:1000
  #, fuzzy
  msgid "Workstation is installing"
  msgstr "Имя рабочий станции"
  
-#: plugins/admin/systems/class_systemManagement.inc:816
+#: plugins/admin/systems/class_systemManagement.inc:1001
  #, fuzzy
  msgid "Workstation is waiting for action"
  msgstr "Шаблон рабочей станции для"
  
-#: plugins/admin/systems/class_systemManagement.inc:817
+#: plugins/admin/systems/class_systemManagement.inc:1002
  #, fuzzy
  msgid "Workstation installation failed"
  msgstr "Шаблон рабочей станции"
  
-#: plugins/admin/systems/class_systemManagement.inc:820
+#: plugins/admin/systems/class_systemManagement.inc:1005
  msgid "Server is installing"
  msgstr ""
  
-#: plugins/admin/systems/class_systemManagement.inc:821
+#: plugins/admin/systems/class_systemManagement.inc:1006
  #, fuzzy
  msgid "Server is waiting for action"
  msgstr "Общая информация о пользователе"
  
-#: plugins/admin/systems/class_systemManagement.inc:822
+#: plugins/admin/systems/class_systemManagement.inc:1007
  #, fuzzy
  msgid "Server installation failed"
  msgstr "Номер дома"
  
-#: plugins/admin/systems/class_systemManagement.inc:823
+#: plugins/admin/systems/class_systemManagement.inc:1008
  #, fuzzy
  msgid "Winstation"
  msgstr "Рабочая станция"
  
-#: plugins/admin/systems/class_systemManagement.inc:824
+#: plugins/admin/systems/class_systemManagement.inc:1009
  #, fuzzy
  msgid "Network Device"
  msgstr "Сетевые устройства"
  
-#: plugins/admin/systems/class_systemManagement.inc:825
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_systemManagement.inc:1010
+#: plugins/admin/systems/class_divListSystem.inc:148
  #, fuzzy
  msgid "New Terminal"
  msgstr "Создать терминал"
  
-#: plugins/admin/systems/class_systemManagement.inc:826
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_systemManagement.inc:1011
+#: plugins/admin/systems/class_divListSystem.inc:154
  #, fuzzy
  msgid "New Workstation"
  msgstr "Новая рабочая станция"
@@ -9280,9 +9037,9 @@ msgid "Accept mail from other domains over non-authenticated SMTP"
  msgstr ""
  
  #: plugins/admin/systems/class_servDNS.inc:34
-#: plugins/admin/systems/class_servDNS.inc:353
-#: plugins/admin/systems/class_servDNS.inc:382
-#: plugins/admin/systems/class_servDNS.inc:383
+#: plugins/admin/systems/class_servDNS.inc:355
+#: plugins/admin/systems/class_servDNS.inc:384
+#: plugins/admin/systems/class_servDNS.inc:385
  #, fuzzy
  msgid "DNS service"
  msgstr "Добавить сервис DNS"
@@ -9316,7 +9073,7 @@ msgstr ""
  "ниже."
  
  #: plugins/admin/systems/class_servDNS.inc:167
-#: plugins/admin/systems/class_servDNS.inc:392
+#: plugins/admin/systems/class_servDNS.inc:394
  #, fuzzy
  msgid "Reverse zone"
  msgstr "Ссылки"
@@ -9327,46 +9084,46 @@ msgstr "Ссылки"
  msgid "Class"
  msgstr "Выберите тип мыши"
  
-#: plugins/admin/systems/class_servDNS.inc:231
+#: plugins/admin/systems/class_servDNS.inc:233
  #, php-format
  msgid ""
  "Can't delete the selected zone, because it is still in use by these entry/"
  "entries '%s'"
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:290
+#: plugins/admin/systems/class_servDNS.inc:292
  #, php-format
  msgid "Updating of system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:299
+#: plugins/admin/systems/class_servDNS.inc:301
  #, fuzzy, php-format
  msgid "Removing of system server/dns with dn '%s' failed."
  msgstr "Удалить сервис DNS"
  
-#: plugins/admin/systems/class_servDNS.inc:320
+#: plugins/admin/systems/class_servDNS.inc:322
  #, fuzzy, php-format
  msgid "Saving of system server/dns with dn '%s' failed."
  msgstr "Почтовые настройки пользователя"
  
-#: plugins/admin/systems/class_servDNS.inc:344
+#: plugins/admin/systems/class_servDNS.inc:346
  #, php-format
  msgid "Set status flag for system server/dns with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNS.inc:391
-#: plugins/admin/systems/class_termDNS.inc:541
+#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_termDNS.inc:546
  #: plugins/admin/systems/servdnseditzone.tpl:7
  #, fuzzy
  msgid "Zone name"
  msgstr "Название"
  
-#: plugins/admin/systems/class_servDNS.inc:393
+#: plugins/admin/systems/class_servDNS.inc:395
  #, fuzzy
  msgid "Primary dns server"
  msgstr "Основной адрес эл. почты для этой общей папки"
  
-#: plugins/admin/systems/class_servDNS.inc:397
+#: plugins/admin/systems/class_servDNS.inc:399
  #: plugins/admin/systems/servdnseditzone.tpl:73
  #: plugins/admin/ogroups/phonequeue.tpl:70
  #: plugins/admin/ogroups/class_phonequeue.inc:751
@@ -9374,13 +9131,13 @@ msgstr "Основной адрес эл. почты для этой общей
  msgid "Retry"
  msgstr "Повторить"
  
-#: plugins/admin/systems/class_servDNS.inc:398
+#: plugins/admin/systems/class_servDNS.inc:400
  #: plugins/admin/systems/servdnseditzone.tpl:79
  #, fuzzy
  msgid "Expire"
  msgstr "Экспорт"
  
-#: plugins/admin/systems/class_servDNS.inc:400
+#: plugins/admin/systems/class_servDNS.inc:402
  #: plugins/admin/systems/servdnseditzone.tpl:24
  #, fuzzy
  msgid "Zone records"
@@ -9589,39 +9346,39 @@ msgstr ""
  msgid "kolabFreeBusyFuture"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:110
+#: plugins/admin/systems/class_printGeneric.inc:111
  #, php-format
  msgid "Can't extract a valid base out of object dn, setting base to '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:257
-#: plugins/admin/systems/class_printGeneric.inc:265
-#: plugins/admin/systems/class_printGeneric.inc:270
-#: plugins/admin/systems/class_printGeneric.inc:327
-#: plugins/admin/systems/class_printGeneric.inc:343
-#: plugins/admin/systems/class_printGeneric.inc:346
+#: plugins/admin/systems/class_printGeneric.inc:260
+#: plugins/admin/systems/class_printGeneric.inc:268
+#: plugins/admin/systems/class_printGeneric.inc:273
+#: plugins/admin/systems/class_printGeneric.inc:322
+#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:341
  msgid "Add printer extension"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:258
+#: plugins/admin/systems/class_printGeneric.inc:261
  msgid ""
  "Could not intialize printer tab, parameter parent was missing while "
  "construction."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:266
+#: plugins/admin/systems/class_printGeneric.inc:269
  msgid "This is a workstation template, printer tab is disabled."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:271
+#: plugins/admin/systems/class_printGeneric.inc:274
  msgid "This is a terminal template, printer tab is disabled."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:320
+#: plugins/admin/systems/class_printGeneric.inc:315
  msgid "This 'dn' has no printer features."
  msgstr "Этот DN не имеет свойств принтера."
  
-#: plugins/admin/systems/class_printGeneric.inc:328
+#: plugins/admin/systems/class_printGeneric.inc:323
  #, fuzzy
  msgid ""
  "This object has printer extension disabled. You can't enable it while 'cn' "
@@ -9631,13 +9388,13 @@ msgstr ""
  "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
  "ниже."
  
-#: plugins/admin/systems/class_printGeneric.inc:335
-#: plugins/admin/systems/class_printGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:330
+#: plugins/admin/systems/class_printGeneric.inc:333
  #, fuzzy
  msgid "Remove printer extension"
  msgstr "Удалить параметры"
  
-#: plugins/admin/systems/class_printGeneric.inc:336
+#: plugins/admin/systems/class_printGeneric.inc:331
  #, fuzzy
  msgid ""
  "This workstation has printer extension enabled.You can disable it by "
@@ -9646,7 +9403,7 @@ msgstr ""
  "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
  "ниже."
  
-#: plugins/admin/systems/class_printGeneric.inc:339
+#: plugins/admin/systems/class_printGeneric.inc:334
  #, fuzzy
  msgid ""
  "This terminal has printer extension enabled. You can disable it by clicking "
@@ -9655,7 +9412,7 @@ msgstr ""
  "В этой учетной записи есть настройки факса. Вы можете удалить их, щелкнув "
  "ниже."
  
-#: plugins/admin/systems/class_printGeneric.inc:344
+#: plugins/admin/systems/class_printGeneric.inc:339
  #, fuzzy
  msgid ""
  "This workstation has printer extension disabled. You can enable it by "
@@ -9664,7 +9421,7 @@ msgstr ""
  "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
  "ниже."
  
-#: plugins/admin/systems/class_printGeneric.inc:347
+#: plugins/admin/systems/class_printGeneric.inc:342
  #, fuzzy
  msgid ""
  "This terminal has printer extension disabled. You can enable it by clicking "
@@ -9673,84 +9430,84 @@ msgstr ""
  "В этой учетной записи нет настроек факса. Вы можете добавить их, щелкнув "
  "ниже."
  
-#: plugins/admin/systems/class_printGeneric.inc:510
+#: plugins/admin/systems/class_printGeneric.inc:511
  #, php-format
  msgid "Your currently selected PPD file '%s' doesn't exist."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:518
+#: plugins/admin/systems/class_printGeneric.inc:519
  #, fuzzy
  msgid "can't get ppd informations."
  msgstr "Системная информация"
  
-#: plugins/admin/systems/class_printGeneric.inc:531
+#: plugins/admin/systems/class_printGeneric.inc:532
  #, php-format
  msgid "This printer belongs to terminal %s. You can't rename this printer."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:533
+#: plugins/admin/systems/class_printGeneric.inc:534
  #, php-format
  msgid "This printer belongs to workstation %s. You can't rename this printer."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:588
+#: plugins/admin/systems/class_printGeneric.inc:589
  #, fuzzy, php-format
  msgid "Removing of system print/generic with dn '%s' failed."
  msgstr "Показать подразделения"
  
-#: plugins/admin/systems/class_printGeneric.inc:814
+#: plugins/admin/systems/class_printGeneric.inc:818
  #, php-format
  msgid "Saving of system print/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:837
-#: plugins/admin/systems/class_printGeneric.inc:839
-#: plugins/admin/ogroups/class_ogroupManagement.inc:352
+#: plugins/admin/systems/class_printGeneric.inc:841
+#: plugins/admin/systems/class_printGeneric.inc:843
+#: plugins/admin/ogroups/class_ogroupManagement.inc:347
  #: plugins/admin/fai/faiTemplateEntry.tpl:85
  #: plugins/admin/fai/faiTemplateEntry.tpl:127
  #: plugins/generic/references/class_reference.inc:36
  msgid "Group"
  msgstr "Группа"
  
-#: plugins/admin/systems/class_printGeneric.inc:855
+#: plugins/admin/systems/class_printGeneric.inc:859
  #, fuzzy
  msgid "Print generic"
  msgstr "Служба печати"
  
-#: plugins/admin/systems/class_printGeneric.inc:867
+#: plugins/admin/systems/class_printGeneric.inc:871
  msgid "LabeledURL"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:868
+#: plugins/admin/systems/class_printGeneric.inc:872
  #, fuzzy
  msgid "Printer PPD"
  msgstr "Принтер"
  
-#: plugins/admin/systems/class_printGeneric.inc:885
+#: plugins/admin/systems/class_printGeneric.inc:889
  #, php-format
  msgid ""
  "You are not allowed to remove the given object '%s' from the list of members "
  "of printer '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:902
+#: plugins/admin/systems/class_printGeneric.inc:906
  #, php-format
  msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:907
+#: plugins/admin/systems/class_printGeneric.inc:911
  #, php-format
  msgid ""
  "You are not allowed to add the given object '%s' to the list of members of '%"
  "s'."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:942
+#: plugins/admin/systems/class_printGeneric.inc:946
  #, php-format
  msgid "Can't add '%s' to the list of members, it is already used."
  msgstr ""
  
-#: plugins/admin/systems/class_printGeneric.inc:953
+#: plugins/admin/systems/class_printGeneric.inc:957
  #, php-format
  msgid "Can't add '%s' to list of members, it is not reachable."
  msgstr ""
@@ -9774,48 +9531,43 @@ msgstr ""
  msgid "Changing the password impinges on authentification only."
  msgstr "Изменение пароля влияет только на аутентификацию в системе."
  
-#: plugins/admin/systems/class_componentGeneric.inc:127
+#: plugins/admin/systems/class_componentGeneric.inc:125
  #, fuzzy, php-format
  msgid "Removing of system component/generic with dn '%s' failed."
  msgstr "Показать подразделения"
  
-#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_componentGeneric.inc:172
  #, fuzzy
  msgid "The required field 'Component name' is not set."
  msgstr "Обязательное поле \"Личное имя\" не заполнено."
  
-#: plugins/admin/systems/class_componentGeneric.inc:170
-#: plugins/admin/systems/class_phoneGeneric.inc:307
+#: plugins/admin/systems/class_componentGeneric.inc:177
+#: plugins/admin/systems/class_phoneGeneric.inc:317
  #, fuzzy
  msgid "The required field IP address is empty."
  msgstr "Обязательное поле \"Основной адрес\" не заполнено."
  
-#: plugins/admin/systems/class_componentGeneric.inc:173
-#: plugins/admin/systems/class_phoneGeneric.inc:310
+#: plugins/admin/systems/class_componentGeneric.inc:180
+#: plugins/admin/systems/class_phoneGeneric.inc:320
  #, fuzzy
  msgid "The field IP address contains an invalid address."
  msgstr "Значение поля \"Имя\" содержит недопустимые символы."
  
-#: plugins/admin/systems/class_componentGeneric.inc:247
+#: plugins/admin/systems/class_componentGeneric.inc:249
  #, php-format
  msgid "Saving of system component/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_componentGeneric.inc:258
+#: plugins/admin/systems/class_componentGeneric.inc:260
  #, fuzzy
  msgid "Component generic"
  msgstr "Прочие сетевые компоненты"
  
-#: plugins/admin/systems/class_componentGeneric.inc:263
+#: plugins/admin/systems/class_componentGeneric.inc:265
  #, fuzzy
  msgid "Network device"
  msgstr "Сетевые устройства"
  
-#: plugins/admin/systems/goNtpServer.tpl:2
-#, fuzzy
-msgid "Time server"
-msgstr "Сервисы"
-
  #: plugins/admin/systems/goKrbServer.tpl:1
  msgid "Kerberos kadmin access"
  msgstr ""
@@ -9832,6 +9584,23 @@ msgstr "Kerberos"
  msgid "Admin user"
  msgstr "Пользователи домена"
  
+#: plugins/admin/systems/goFonServer.tpl:1
+#, fuzzy
+msgid "VoIP database information"
+msgstr "Системная информация"
+
+#: plugins/admin/systems/goFonServer.tpl:4
+msgid "Asterisk DB user"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:20
+msgid "Country dial prefix"
+msgstr ""
+
+#: plugins/admin/systems/goFonServer.tpl:28
+msgid "Local dial prefix"
+msgstr ""
+
  #: plugins/admin/systems/chooser.tpl:1
  msgid "Choose the kind of system component you want to create"
  msgstr "Выберите тип системного компонента который желаете создать"
@@ -9910,22 +9679,15 @@ msgstr "Домашняя страница"
  msgid "Option"
  msgstr "Параметры"
  
-#: plugins/admin/systems/goFonServer.tpl:1
+#: plugins/admin/systems/goFaxServer.tpl:1
  #, fuzzy
-msgid "VoIP database information"
-msgstr "Системная информация"
-
-#: plugins/admin/systems/goFonServer.tpl:4
-msgid "Asterisk DB user"
-msgstr ""
-
-#: plugins/admin/systems/goFonServer.tpl:20
-msgid "Country dial prefix"
-msgstr ""
+msgid "FAX database information"
+msgstr "Базы данных"
  
-#: plugins/admin/systems/goFonServer.tpl:28
-msgid "Local dial prefix"
-msgstr ""
+#: plugins/admin/systems/goFaxServer.tpl:4
+#, fuzzy
+msgid "FAX DB user"
+msgstr "Показать пользователей факсов"
  
  #: plugins/admin/systems/remove_glpi.tpl:10
  #, fuzzy
@@ -9943,13 +9705,13 @@ msgid "This 'dn' has no phone features."
  msgstr "Этот DN не имеет свойств телефона."
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  #, fuzzy
  msgid "yes"
  msgstr "Системы"
  
  #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  #, fuzzy
  msgid "no"
  msgstr "нет"
@@ -9975,100 +9737,96 @@ msgstr ""
  msgid "Removing of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:315
+#: plugins/admin/systems/class_phoneGeneric.inc:325
  #, fuzzy
  msgid "The required field 'Phone name' is not set."
  msgstr "Обязательное поле \"Личное имя\" не заполнено."
  
-#: plugins/admin/systems/class_phoneGeneric.inc:318
+#: plugins/admin/systems/class_phoneGeneric.inc:328
  msgid "The 'Phone name' '0' is reserved and cannot be used."
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:323
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
+msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:413
+#: plugins/admin/systems/class_phoneGeneric.inc:418
  #, php-format
  msgid "Saving of system phone/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:426
+#: plugins/admin/systems/class_phoneGeneric.inc:431
  #, fuzzy
  msgid "Phone generic"
  msgstr "Телефонные номера"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:431
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
  #, fuzzy
  msgid "Phone hardware"
  msgstr "Телефонное оборудование"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:436
+#: plugins/admin/systems/class_phoneGeneric.inc:442
  #, fuzzy
  msgid "SIP Mode"
  msgstr "Режим"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:437
+#: plugins/admin/systems/class_phoneGeneric.inc:443
  #, fuzzy
  msgid "SIP DTMF mode"
  msgstr "Режим"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:438
+#: plugins/admin/systems/class_phoneGeneric.inc:444
  #, fuzzy
  msgid "SIP Default ip"
  msgstr "по умолчанию"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:439
+#: plugins/admin/systems/class_phoneGeneric.inc:445
  msgid "SIP Qualify"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:440
+#: plugins/admin/systems/class_phoneGeneric.inc:446
  #, fuzzy
  msgid "IAX authentication type"
  msgstr "Рабочая станция Windows"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:441
+#: plugins/admin/systems/class_phoneGeneric.inc:447
  #, fuzzy
  msgid "IAX secret"
  msgstr "LDAP-сервер"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:442
+#: plugins/admin/systems/class_phoneGeneric.inc:448
  #, fuzzy
  msgid "IAX account code"
  msgstr "Учетная запись"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:443
+#: plugins/admin/systems/class_phoneGeneric.inc:449
  #, fuzzy
  msgid "IAX trunk lines"
  msgstr "Тонкие клиенты"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:444
+#: plugins/admin/systems/class_phoneGeneric.inc:450
  #, fuzzy
  msgid "IAX permit settings"
  msgstr "Настройки факса"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:445
+#: plugins/admin/systems/class_phoneGeneric.inc:451
  #, fuzzy
  msgid "IAX deny settings"
  msgstr "Настройки факса"
  
-#: plugins/admin/systems/class_phoneGeneric.inc:446
+#: plugins/admin/systems/class_phoneGeneric.inc:452
  msgid "CAPI MSN"
  msgstr ""
  
-#: plugins/admin/systems/class_phoneGeneric.inc:447
+#: plugins/admin/systems/class_phoneGeneric.inc:453
  msgid "Hardware type"
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:46
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#, php-format
+msgid "The file '%s/encodings' does not exist, can't get supported charsets."
  msgstr ""
  
  #: plugins/admin/systems/class_servNfs.inc:49
-#, fuzzy
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
+#, fuzzy, php-format
+msgid "Can't read '%s/encodings', please check permissions."
  msgstr "Удалить"
  
  #: plugins/admin/systems/class_servNfs.inc:178
@@ -10106,18 +9864,18 @@ msgstr "Значение поля \"Имя\" содержит недопусти
  msgid "Option contains invalid characters."
  msgstr "Неправильное указание таймаута '%s'"
  
-#: plugins/admin/systems/class_workstationStartup.inc:402
+#: plugins/admin/systems/class_workstationStartup.inc:429
  msgid ""
  "There are packages in your configuration, which can't be resolved with "
  "current server/release settings."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:447
+#: plugins/admin/systems/class_workstationStartup.inc:474
  #, fuzzy
  msgid "Please select a 'FAI server' or remove the 'FAI classes'."
  msgstr "Введите корректный номер телефона!"
  
-#: plugins/admin/systems/class_workstationStartup.inc:509
+#: plugins/admin/systems/class_workstationStartup.inc:537
  #, fuzzy
  msgid ""
  "There is already a profile in your selection that contain partition table "
@@ -10125,18 +9883,18 @@ msgid ""
  msgstr ""
  "Пользователь с таким регистрационным именем в базе данных уже существует."
  
-#: plugins/admin/systems/class_workstationStartup.inc:721
+#: plugins/admin/systems/class_workstationStartup.inc:754
  msgid "Not available in current setup"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:863
+#: plugins/admin/systems/class_workstationStartup.inc:897
  #, php-format
  msgid ""
  "Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
  "Server was reset to 'auto'."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:879
+#: plugins/admin/systems/class_workstationStartup.inc:913
  #, php-format
  msgid ""
  "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
@@ -10144,18 +9902,18 @@ msgid ""
  "reset to 'auto'."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1040
+#: plugins/admin/systems/class_workstationStartup.inc:1085
  #, fuzzy, php-format
  msgid "Saving of system workstation/startup with dn '%s' failed."
  msgstr "Шаблон рабочей станции"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1090
+#: plugins/admin/systems/class_workstationStartup.inc:1135
  #, fuzzy, php-format
  msgid ""
  "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
  msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/class_workstationStartup.inc:1137
  #: plugins/admin/systems/class_servRepositorySetup.inc:203
  #, php-format
  msgid ""
@@ -10163,28 +9921,28 @@ msgid ""
  "empty string."
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1155
  #, fuzzy
  msgid "System startup"
  msgstr "Состояние системы"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: plugins/admin/systems/class_workstationStartup.inc:1170
  #: plugins/admin/fai/class_faiProfile.inc:453
  #: plugins/admin/fai/faiProfile.tpl:36
  #, fuzzy
  msgid "FAI classes"
  msgstr "Выберите тип мыши"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1126
+#: plugins/admin/systems/class_workstationStartup.inc:1171
  msgid "Debian mirror"
  msgstr ""
  
-#: plugins/admin/systems/class_workstationStartup.inc:1127
+#: plugins/admin/systems/class_workstationStartup.inc:1172
  #, fuzzy
  msgid "Debian release"
  msgstr "Текущий пароль"
  
-#: plugins/admin/systems/class_workstationStartup.inc:1129
+#: plugins/admin/systems/class_workstationStartup.inc:1174
  msgid "FAI status flag"
  msgstr ""
  
@@ -10370,14 +10128,14 @@ msgstr "Действие"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:462
  #: plugins/admin/systems/class_printerPPDDialog.inc:465
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:289
  #, fuzzy
  msgid "True"
  msgstr "Улица"
  
  #: plugins/admin/systems/class_printerPPDDialog.inc:463
  #: plugins/admin/systems/class_printerPPDDialog.inc:466
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:286
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:287
  #, fuzzy
  msgid "False"
  msgstr "женский"
@@ -10387,7 +10145,23 @@ msgstr "женский"
  msgid "Unsupported ppd type '%s' used for '%s' "
  msgstr ""
  
-#: plugins/admin/systems/class_printerPPDDialog.inc:485
+#: plugins/admin/systems/class_printerPPDDialog.inc:488
+#, fuzzy, php-format
+msgid "Removing old ppd file '%s' failed."
+msgstr "Показать группы приложений"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:491
+#, php-format
+msgid "Removing old ppd file '%s' failed. File is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:494
+#, php-format
+msgid ""
+"Removing old ppd file '%s' failed. File does not exists or is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:502
  msgid ""
  "Please select a valid ppd file or use 'Cancel' to go back to printer "
  "configuration."
@@ -10401,7 +10175,7 @@ msgstr "Устройство печати"
  #: plugins/admin/systems/printerPPDDialog.tpl:5
  #: plugins/admin/systems/workstationService.tpl:7
  #: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:246
+#: plugins/admin/systems/terminalService.tpl:254
  #: plugins/admin/systems/class_glpiAccount.inc:784
  msgid "Model"
  msgstr "Модель"
@@ -10438,31 +10212,204 @@ msgstr "Показать совпадения объектов"
  msgid "Regular expression for matching object names"
  msgstr "Регулярное выражение, соответствующее именам объектов"
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
+#, fuzzy, php-format
+msgid "You're about to delete the ppd file '%s' at '%s'."
+msgstr "Вы собираетесь удалить приложение \"%s\"."
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:78
+#, fuzzy, php-format
+msgid "Could not found specified ppd file '%s'."
+msgstr "Невозможно выбрать базу данных!"
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:104
+msgid ""
+"Something went wrong while trying to remove the ppd file from server, "
+"possibly we have no write access."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:124
  #, php-format
  msgid "Selected vendor '%s' does not exists in our list of ppds."
  msgstr ""
  
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:133
  #, fuzzy
  msgid "Printer ppd selection."
  msgstr "Настройки телефона"
  
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:157
+#: plugins/admin/systems/class_terminalService.inc:71
+#, fuzzy
+msgid "unknown"
+msgstr "состояние неизвестно"
+
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_terminalService.inc:105
+#: plugins/admin/systems/class_terminalService.inc:106
+#, fuzzy
+msgid "bit"
+msgstr "запись"
+
+#: plugins/admin/systems/class_workstationService.inc:138
+#: plugins/admin/systems/class_terminalService.inc:158
+msgid "show chooser"
+msgstr "показать окно входа в систему"
+
+#: plugins/admin/systems/class_workstationService.inc:139
+#: plugins/admin/systems/class_terminalService.inc:159
+msgid "direct"
+msgstr "напрямую"
+
+#: plugins/admin/systems/class_workstationService.inc:142
+#: plugins/admin/systems/class_terminalService.inc:162
+msgid "load balanced"
+msgstr "с выравниваем нагрузки"
+
+#: plugins/admin/systems/class_workstationService.inc:145
+#: plugins/admin/systems/class_terminalService.inc:165
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_workstationService.inc:146
+#: plugins/admin/systems/class_terminalService.inc:166
+msgid "ICA client"
+msgstr "Клиент ICA"
+
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_terminalService.inc:221
+#, fuzzy
+msgid "Bit"
+msgstr "запись"
+
+#: plugins/admin/systems/class_workstationService.inc:314
+#: plugins/admin/systems/class_terminalService.inc:316
+#, fuzzy
+msgid "Choose the phone located at the current terminal"
+msgstr "Выбрать раздел, для хранения объекта"
+
+#: plugins/admin/systems/class_workstationService.inc:380
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_terminalService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:395
+msgid "Please specify a valid VSync range."
+msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
+
+#: plugins/admin/systems/class_workstationService.inc:395
+#: plugins/admin/systems/class_workstationService.inc:400
+#: plugins/admin/systems/class_terminalService.inc:404
+#: plugins/admin/systems/class_terminalService.inc:409
+msgid "Please specify a valid HSync range."
+msgstr "Пожалуйста, укажите корректную строчную синхронзацию."
+
  #: plugins/admin/systems/class_workstationService.inc:443
  #, fuzzy, php-format
  msgid "Saving of system workstation/service with dn '%s' failed."
  msgstr "Дополнительные записи в fstab"
  
+#: plugins/admin/systems/class_workstationService.inc:451
+#: plugins/admin/systems/class_terminalService.inc:466
+#, fuzzy
+msgid "Service"
+msgstr "Сервисы"
+
  #: plugins/admin/systems/class_workstationService.inc:452
  #, fuzzy
  msgid "Workstation service"
  msgstr "Рабочие станции"
  
+#: plugins/admin/systems/class_workstationService.inc:460
+#: plugins/admin/systems/class_terminalService.inc:475
+#, fuzzy
+msgid "Monitor"
+msgstr "Мониторинг"
+
+#: plugins/admin/systems/class_workstationService.inc:461
+#: plugins/admin/systems/class_terminalService.inc:479
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Сервер"
+
+#: plugins/admin/systems/class_workstationService.inc:462
+#: plugins/admin/systems/class_terminalService.inc:480
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Разрешение"
+
+#: plugins/admin/systems/class_workstationService.inc:463
+#: plugins/admin/systems/class_terminalService.inc:481
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Глубина цвета"
+
+#: plugins/admin/systems/class_workstationService.inc:464
+#: plugins/admin/systems/class_terminalService.inc:482
+#, fuzzy
+msgid "Hsync"
+msgstr "Строчная синхронизация"
+
+#: plugins/admin/systems/class_workstationService.inc:465
+#: plugins/admin/systems/class_terminalService.inc:483
+#, fuzzy
+msgid "Vsync"
+msgstr "Кадровая синхронизация"
+
  #: plugins/admin/systems/class_workstationService.inc:466
  #, fuzzy
  msgid "Use DDC"
  msgstr "Идентификатор пользователя"
  
+#: plugins/admin/systems/class_workstationService.inc:467
+#: plugins/admin/systems/class_terminalService.inc:487
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "отключен"
+
+#: plugins/admin/systems/class_workstationService.inc:468
+#: plugins/admin/systems/class_terminalService.inc:491
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Выберите модель клавиатуры"
+
+#: plugins/admin/systems/class_workstationService.inc:469
+#: plugins/admin/systems/class_terminalService.inc:492
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Выберите раскладку"
+
+#: plugins/admin/systems/class_workstationService.inc:470
+#: plugins/admin/systems/class_terminalService.inc:493
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Выберите вариант раскладки"
+
+#: plugins/admin/systems/class_workstationService.inc:471
+#: plugins/admin/systems/class_terminalService.inc:494
+#, fuzzy
+msgid "Mouse type"
+msgstr "Тип"
+
+#: plugins/admin/systems/class_workstationService.inc:472
+#: plugins/admin/systems/class_terminalService.inc:495
+#, fuzzy
+msgid "Mouse port"
+msgstr "Мониторинг"
+
+#: plugins/admin/systems/class_workstationService.inc:473
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:76
+#: plugins/admin/systems/class_terminalService.inc:496
+#: plugins/gofon/phoneaccount/generic.tpl:30
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Телефонное оборудование"
+
  #: plugins/admin/systems/workstationService.tpl:4
  #: plugins/admin/systems/terminalService.tpl:4
  msgid "Keyboard"
@@ -10539,41 +10486,42 @@ msgid "Display device"
  msgstr "Устройство отображения"
  
  #: plugins/admin/systems/workstationService.tpl:167
+#: plugins/admin/systems/terminalService.tpl:147
  msgid "Use DDC for automatic detection"
  msgstr ""
  
  #: plugins/admin/systems/workstationService.tpl:170
-#: plugins/admin/systems/terminalService.tpl:142
+#: plugins/admin/systems/terminalService.tpl:150
  msgid "HSync"
  msgstr "Строчная синхронизация"
  
  #: plugins/admin/systems/workstationService.tpl:175
-#: plugins/admin/systems/terminalService.tpl:146
+#: plugins/admin/systems/terminalService.tpl:154
  msgid "Horizontal refresh frequency for installed monitor"
  msgstr "Частота обновления строк для данного монитора"
  
  #: plugins/admin/systems/workstationService.tpl:181
-#: plugins/admin/systems/terminalService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:158
  msgid "VSync"
  msgstr "Кадровая синхронизация"
  
  #: plugins/admin/systems/workstationService.tpl:186
-#: plugins/admin/systems/terminalService.tpl:154
+#: plugins/admin/systems/terminalService.tpl:162
  msgid "Vertical refresh frequency for installed monitor"
  msgstr "Частота обновления кадров для данного монитора"
  
  #: plugins/admin/systems/workstationService.tpl:201
-#: plugins/admin/systems/terminalService.tpl:237
+#: plugins/admin/systems/terminalService.tpl:245
  msgid "Scan device"
  msgstr "Устройство сканирования"
  
  #: plugins/admin/systems/workstationService.tpl:204
-#: plugins/admin/systems/terminalService.tpl:239
+#: plugins/admin/systems/terminalService.tpl:247
  msgid "Select to start SANE scan service on terminal"
  msgstr "Выберите, чтобы запустить на терминале службу сканирования"
  
  #: plugins/admin/systems/workstationService.tpl:207
-#: plugins/admin/systems/terminalService.tpl:241
+#: plugins/admin/systems/terminalService.tpl:249
  msgid "Provide scan services"
  msgstr "Предоставлять службу сканирования"
  
@@ -10618,18 +10566,18 @@ msgstr "Выберите тип мыши"
  msgid "set"
  msgstr "сброс"
  
-#: plugins/admin/systems/workstationStartup.tpl:137
+#: plugins/admin/systems/workstationStartup.tpl:141
  #: plugins/admin/systems/terminalStartup.tpl:66
  msgid "Kernel modules (format: name parameters)"
  msgstr "Модули ядра (формат: имя параметры)"
  
-#: plugins/admin/systems/workstationStartup.tpl:140
+#: plugins/admin/systems/workstationStartup.tpl:144
  #: plugins/admin/systems/terminalStartup.tpl:69
  msgid "Add additional modules to load on startup"
  msgstr ""
  "Укажите дополнительные модули, которые должны загружаться при запуске системы"
  
-#: plugins/admin/systems/workstationStartup.tpl:176
+#: plugins/admin/systems/workstationStartup.tpl:180
  #: plugins/admin/systems/terminalStartup.tpl:105
  #, fuzzy
  msgid "Mountpoint"
@@ -10662,67 +10610,77 @@ msgstr ""
  msgid "use debug mode for startup"
  msgstr "Используйте отладочный режим"
  
-#: plugins/admin/systems/terminalService.tpl:169
+#: plugins/admin/systems/terminalService.tpl:173
+#: plugins/admin/systems/class_terminalService.inc:477
+msgid "Remote desktop"
+msgstr "Удаленная рабочая станция"
+
+#: plugins/admin/systems/terminalService.tpl:177
  msgid "Connect method"
  msgstr "Способ подключения"
  
-#: plugins/admin/systems/terminalService.tpl:172
+#: plugins/admin/systems/terminalService.tpl:180
  msgid "Choose method to connect to terminal server"
  msgstr "Выберите способ подключения к серверу терминалов"
  
-#: plugins/admin/systems/terminalService.tpl:180
+#: plugins/admin/systems/terminalService.tpl:188
  msgid "Terminal server"
  msgstr "Терминал-сервер"
  
-#: plugins/admin/systems/terminalService.tpl:183
+#: plugins/admin/systems/terminalService.tpl:191
  msgid "Select specific terminal server to use"
  msgstr "Выберите сервер терминалов"
  
-#: plugins/admin/systems/terminalService.tpl:191
+#: plugins/admin/systems/terminalService.tpl:199
  msgid "Font server"
  msgstr "Сервер шрифтов"
  
-#: plugins/admin/systems/terminalService.tpl:194
+#: plugins/admin/systems/terminalService.tpl:202
  msgid "Select specific font server to use"
  msgstr "Выберите сервер шрифтов"
  
-#: plugins/admin/systems/terminalService.tpl:211
+#: plugins/admin/systems/terminalService.tpl:219
  msgid "Print device"
  msgstr "Устройство печати"
  
-#: plugins/admin/systems/terminalService.tpl:213
+#: plugins/admin/systems/terminalService.tpl:221
  msgid "Select to start IPP based printing service on terminal"
  msgstr "Выберите, чтобы запустить на терминале службу печати по протоколу IPP"
  
-#: plugins/admin/systems/terminalService.tpl:215
+#: plugins/admin/systems/terminalService.tpl:223
  msgid "Provide print services"
  msgstr "Предоставлять службу печати"
  
-#: plugins/admin/systems/terminalService.tpl:224
+#: plugins/admin/systems/terminalService.tpl:229
+#: plugins/admin/systems/class_terminalService.inc:486
+msgid "Spool server"
+msgstr "Сервер для хранения запросов и временных файлов"
+
+#: plugins/admin/systems/terminalService.tpl:232
  msgid "Select NFS filesystem to place spool files on"
  msgstr "Выберите файловую систему NFS для хранения временных файлов"
  
-#: plugins/admin/systems/terminalService.tpl:249
+#: plugins/admin/systems/terminalService.tpl:257
  msgid "Select scanner driver to use"
  msgstr "Выберите драйвер для используемого сканера"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:1
-#: plugins/admin/systems/class_servRepository.inc:349
+#: plugins/admin/systems/class_servRepository.inc:365
  #: plugins/admin/fai/faiPackage.tpl:33
  #, fuzzy
  msgid "Repository"
  msgstr "Повторить"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:364
+#: plugins/admin/systems/class_servRepository.inc:380
  #, fuzzy
  msgid "Parent server"
  msgstr "Служба печати"
  
  #: plugins/admin/systems/servRepositorySetup.tpl:39
-#: plugins/admin/systems/class_servRepository.inc:239
-#: plugins/admin/systems/class_servRepository.inc:262
-#: plugins/admin/systems/class_servRepository.inc:363
+#: plugins/admin/systems/class_servRepository.inc:253
+#: plugins/admin/systems/class_servRepository.inc:276
+#: plugins/admin/systems/class_servRepository.inc:379
  #, fuzzy
  msgid "Sections"
  msgstr "Действие"
@@ -10743,34 +10701,39 @@ msgid ""
  "Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
  msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
  
-#: plugins/admin/systems/class_servRepository.inc:35
-#: plugins/admin/systems/class_servRepository.inc:339
-#: plugins/admin/systems/class_servRepository.inc:350
+#: plugins/admin/systems/class_servRepository.inc:44
+#: plugins/admin/systems/class_servRepository.inc:355
+#: plugins/admin/systems/class_servRepository.inc:366
  #, fuzzy
  msgid "Repository service"
  msgstr "Служба печати"
  
-#: plugins/admin/systems/class_servRepository.inc:138
+#: plugins/admin/systems/class_servRepository.inc:94
+#: plugins/admin/fai/class_faiSummaryTab.inc:175
+msgid "You can't use this plugin until FAI is activated."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:152
  #, php-format
  msgid ""
  "You can't delete this release, it is still used by these workstations [%s]. "
  "Please solve this dependencies first, to keep data base consistency."
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:172
+#: plugins/admin/systems/class_servRepository.inc:186
  #, php-format
  msgid ""
  "Be careful editing this release, it is still used by these workstations [%s]."
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:212
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
  #: plugins/admin/fai/class_faiManagement.inc:343
  #, fuzzy
  msgid "This name is already in use."
  msgstr "Указанное имя уже используется."
  
-#: plugins/admin/systems/class_servRepository.inc:359
+#: plugins/admin/systems/class_servRepository.inc:375
  #: plugins/admin/systems/class_goGlpiServer.inc:92
  #: plugins/admin/systems/class_goCupsServer.inc:71
  #: plugins/admin/systems/class_serverService.inc:8
@@ -10782,7 +10745,7 @@ msgstr "Указанное имя уже используется."
  msgid "Start"
  msgstr "Запуск"
  
-#: plugins/admin/systems/class_servRepository.inc:360
+#: plugins/admin/systems/class_servRepository.inc:376
  #: plugins/admin/systems/class_goGlpiServer.inc:93
  #: plugins/admin/systems/class_goCupsServer.inc:72
  #: plugins/admin/systems/class_serverService.inc:7
@@ -10794,7 +10757,7 @@ msgstr "Запуск"
  msgid "Stop"
  msgstr ""
  
-#: plugins/admin/systems/class_servRepository.inc:361
+#: plugins/admin/systems/class_servRepository.inc:377
  #: plugins/admin/systems/class_goGlpiServer.inc:94
  #: plugins/admin/systems/class_goCupsServer.inc:73
  #: plugins/admin/systems/class_serverService.inc:9
@@ -10806,12 +10769,12 @@ msgstr ""
  msgid "Restart"
  msgstr "Повторить"
  
-#: plugins/admin/systems/class_servRepository.inc:362
+#: plugins/admin/systems/class_servRepository.inc:378
  #, fuzzy
  msgid "Releases"
  msgstr "Набор правил"
  
-#: plugins/admin/systems/class_servRepository.inc:365
+#: plugins/admin/systems/class_servRepository.inc:381
  msgid "Url"
  msgstr ""
  
@@ -10914,15 +10877,9 @@ msgstr "Регулярное выражение, соответствующее
  msgid "Use"
  msgstr "Пользователь"
  
-#: plugins/admin/systems/goFaxServer.tpl:1
-#, fuzzy
-msgid "FAX database information"
-msgstr "Базы данных"
-
-#: plugins/admin/systems/goFaxServer.tpl:4
-#, fuzzy
-msgid "FAX DB user"
-msgstr "Показать пользователей факсов"
+#: plugins/admin/systems/remove_ppd.tpl:9
+msgid "The ppd file will be removed from the server and can not be restored."
+msgstr ""
  
  #: plugins/admin/systems/class_glpiAccount.inc:147
  #: plugins/admin/systems/class_glpiPrinterAccount.inc:161
@@ -11055,7 +11012,7 @@ msgid "Attachment"
  msgstr "подразделения"
  
  #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:136
  #, fuzzy
  msgid "File"
  msgstr "Файлы"
@@ -11075,6 +11032,41 @@ msgstr "Тип"
  msgid "use"
  msgstr "Мышь"
  
+#: plugins/admin/systems/class_glpiSelectUser.inc:175
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: include/class_MultiSelectWindow.inc:186
+#, fuzzy
+msgid "Go to root department"
+msgstr "Список подразделений"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:177
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: include/class_MultiSelectWindow.inc:194
+#, fuzzy
+msgid "Go up one department"
+msgstr "Подразделение"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+#, fuzzy
+msgid "Go to users department"
+msgstr "Выберите подразделение"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:179
+#: plugins/admin/systems/class_baseSelectDialog.inc:32
+#: include/class_MultiSelectWindow.inc:202
+#: include/class_MultiSelectWindow.inc:204
+#, fuzzy
+msgid "Home"
+msgstr "Имя системы"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:180
+#: plugins/admin/systems/class_baseSelectDialog.inc:33
+#: include/class_MultiSelectWindow.inc:209
+msgid "Reload list"
+msgstr ""
+
  #: plugins/admin/systems/glpiSelectUser.tpl:23
  msgid ""
  "This dialog allows you to select a user as technical responsible person."
@@ -11233,7 +11225,7 @@ msgid "Add/Edit network interface"
  msgstr "Сетевой принтер"
  
  #: plugins/admin/systems/glpi_devices.tpl:589
-#: plugins/admin/systems/class_termDNS.inc:532
+#: plugins/admin/systems/class_termDNS.inc:537
  #, fuzzy
  msgid "MAC address"
  msgstr "MAC-адрес"
@@ -11326,7 +11318,7 @@ msgid "New processor"
  msgstr "Новый пароль"
  
  #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  msgid "P"
  msgstr ""
  
@@ -11477,7 +11469,8 @@ msgid "Upload wasn't successfull."
  msgstr "Экспорт успешен."
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#, php-format
+msgid "Missing directory '%s/glpi/' to store glpi uploads."
  msgstr ""
  
  #: plugins/admin/systems/class_glpiAttachmentPool.inc:138
@@ -11649,76 +11642,76 @@ msgstr ""
  msgid "Cartridges"
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:138
+#: plugins/admin/systems/class_termDNS.inc:137
  #, fuzzy, php-format
  msgid ""
  "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
  msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
  
-#: plugins/admin/systems/class_termDNS.inc:311
+#: plugins/admin/systems/class_termDNS.inc:319
  #, fuzzy
  msgid "The required field 'IP-address' is not set."
  msgstr "Обязательное поле \"Основной адрес\" не заполнено."
  
-#: plugins/admin/systems/class_termDNS.inc:318
+#: plugins/admin/systems/class_termDNS.inc:323
  msgid "Wrong IP format in field IP-address."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:324
+#: plugins/admin/systems/class_termDNS.inc:330
  #, fuzzy
  msgid "The required field 'MAC-address' is not set."
  msgstr "Обязательное поле \"Основной адрес\" не заполнено."
  
-#: plugins/admin/systems/class_termDNS.inc:331
+#: plugins/admin/systems/class_termDNS.inc:333
  msgid ""
  "The given macaddress is invalid. There must be 6 2byte segments seperated by "
  "':'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:351
+#: plugins/admin/systems/class_termDNS.inc:353
  #, php-format
  msgid "Found duplicate value for record type '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:359
+#: plugins/admin/systems/class_termDNS.inc:361
  #, php-format
  msgid "Found more than one entry for the uniqe record type '%s'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:370
+#: plugins/admin/systems/class_termDNS.inc:372
  #, php-format
  msgid ""
  "The device IP '%s' is added as 'A Record', this will be done automatically, "
  "please remove the record."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:377
+#: plugins/admin/systems/class_termDNS.inc:379
  #: plugins/admin/systems/class_servDNSeditZone.inc:409
  #, php-format
  msgid "Only lowercase is allowed, please check your '%ss'."
  msgstr ""
  
-#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:463
  #, fuzzy, php-format
  msgid "Saving of terminal/dns account with dn '%s' failed."
  msgstr "Удалить настройки эл. почты"
  
-#: plugins/admin/systems/class_termDNS.inc:522
+#: plugins/admin/systems/class_termDNS.inc:527
  #, fuzzy
  msgid "DNS"
  msgstr "DNS"
  
-#: plugins/admin/systems/class_termDNS.inc:523
+#: plugins/admin/systems/class_termDNS.inc:528
  #, fuzzy
  msgid "DNS settings"
  msgstr "Настройки Samba"
  
-#: plugins/admin/systems/class_termDNS.inc:531
+#: plugins/admin/systems/class_termDNS.inc:536
  #, fuzzy
  msgid "IP address"
  msgstr "IP-адрес"
  
-#: plugins/admin/systems/class_termDNS.inc:540
+#: plugins/admin/systems/class_termDNS.inc:545
  #, fuzzy
  msgid "DNS records"
  msgstr "Каталог"
@@ -11824,7 +11817,7 @@ msgstr "Объект группы"
  
  #: plugins/admin/systems/class_servDNSeditZone.inc:290
  #: plugins/admin/ogroups/phonequeue.tpl:23
-#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:371
  #, fuzzy
  msgid "Down"
  msgstr "Домен"
@@ -11916,42 +11909,37 @@ msgid ""
  "our zone editing dialog."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:206
  #, fuzzy, php-format
  msgid "Entry name '%s' contains invalid characters."
  msgstr "Неправильное указание таймаута '%s'"
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
  #, fuzzy, php-format
  msgid "Can not rename '%s' to '%s',the destination name already exists."
  msgstr "Подразделение с таким именем уже существует."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:221
  #, fuzzy, php-format
  msgid "Can not create '%s',the destination name already exists."
  msgstr "Подразделение с таким именем уже существует."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
  #, php-format
  msgid "The name '%s' is used more than once."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
-msgstr ""
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
  #, php-format
  msgid "The record type '%s' is a unique type and can't be defined twice."
  msgstr ""
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:260
  #, fuzzy, php-format
  msgid "There is an empty '%s' for host '%s'."
  msgstr "Метод '%s' не описан в вашем файле конфигурации."
  
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:268
  #, php-format
  msgid "There is a duplicate entry in '%s' for '%s'."
  msgstr ""
@@ -12064,112 +12052,108 @@ msgstr "Сетевые устройства"
  msgid "Display systems of user"
  msgstr "Показать адреса пользователя"
  
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:148
  #, fuzzy
  msgid "New Terminal template"
  msgstr "Шаблон терминала"
  
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:154
  #, fuzzy
  msgid "New Workstation template"
  msgstr "Шаблон рабочей станции"
  
-#: plugins/admin/systems/class_divListSystem.inc:140
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:160
  #, fuzzy
  msgid "New Server"
  msgstr "Сервер"
  
-#: plugins/admin/systems/class_divListSystem.inc:142
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:166
  #, fuzzy
  msgid "New Printer"
  msgstr "Принтер"
  
-#: plugins/admin/systems/class_divListSystem.inc:144
-#: plugins/admin/systems/class_divListSystem.inc:145
+#: plugins/admin/systems/class_divListSystem.inc:172
  #, fuzzy
  msgid "New Phone"
  msgstr "Телефон"
  
-#: plugins/admin/systems/class_divListSystem.inc:146
-#: plugins/admin/systems/class_divListSystem.inc:147
+#: plugins/admin/systems/class_divListSystem.inc:178
  #, fuzzy
  msgid "New Component"
  msgstr "Прочие сетевые компоненты"
  
-#: plugins/admin/systems/class_divListSystem.inc:165
+#: plugins/admin/systems/class_divListSystem.inc:203
  #, fuzzy
  msgid "Cups Server"
  msgstr "Сервер"
  
-#: plugins/admin/systems/class_divListSystem.inc:166
+#: plugins/admin/systems/class_divListSystem.inc:204
  msgid "Log Db"
  msgstr ""
  
-#: plugins/admin/systems/class_divListSystem.inc:167
+#: plugins/admin/systems/class_divListSystem.inc:205
  #, fuzzy
  msgid "Syslog Server"
  msgstr "Сервер системных журналов"
  
-#: plugins/admin/systems/class_divListSystem.inc:168
+#: plugins/admin/systems/class_divListSystem.inc:206
  #, fuzzy
  msgid "Mail Server"
  msgstr "Сервер"
  
-#: plugins/admin/systems/class_divListSystem.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:207
  #, fuzzy
  msgid "Imap Server"
  msgstr "Сервер подкачки"
  
-#: plugins/admin/systems/class_divListSystem.inc:170
+#: plugins/admin/systems/class_divListSystem.inc:208
  #, fuzzy
  msgid "Nfs Server"
  msgstr "Сервер"
  
-#: plugins/admin/systems/class_divListSystem.inc:171
+#: plugins/admin/systems/class_divListSystem.inc:209
  #, fuzzy
  msgid "Kerberos Server"
  msgstr "Kerberos"
  
-#: plugins/admin/systems/class_divListSystem.inc:172
+#: plugins/admin/systems/class_divListSystem.inc:210
  #, fuzzy
  msgid "Asterisk Server"
  msgstr "Терминальный сервер"
  
-#: plugins/admin/systems/class_divListSystem.inc:173
+#: plugins/admin/systems/class_divListSystem.inc:211
  #, fuzzy
  msgid "Fax Server"
  msgstr "Сервер"
  
-#: plugins/admin/systems/class_divListSystem.inc:174
+#: plugins/admin/systems/class_divListSystem.inc:212
  #, fuzzy
  msgid "Ldap Server"
  msgstr "Сервер подкачки"
  
-#: plugins/admin/systems/class_divListSystem.inc:190
-#: plugins/admin/acl/class_divListACL.inc:123
+#: plugins/admin/systems/class_divListSystem.inc:256
+#: plugins/admin/acl/class_divListACL.inc:128
  #, fuzzy
  msgid "Edit system"
  msgstr "Список систем"
  
-#: plugins/admin/systems/class_divListSystem.inc:192
-#: plugins/admin/acl/class_divListACL.inc:126
+#: plugins/admin/systems/class_divListSystem.inc:265
+#: plugins/admin/acl/class_divListACL.inc:132
  #, fuzzy
  msgid "Delete system"
  msgstr "Удалить"
  
-#: plugins/admin/systems/class_divListSystem.inc:223
+#: plugins/admin/systems/class_divListSystem.inc:308
  #, fuzzy
  msgid "Set root       password"
  msgstr "Изменить пароль"
  
-#: plugins/admin/systems/class_divListSystem.inc:229
+#: plugins/admin/systems/class_divListSystem.inc:315
  #, fuzzy
  msgid "Create CD"
  msgstr "Создать"
  
-#: plugins/admin/systems/class_divListSystem.inc:230
+#: plugins/admin/systems/class_divListSystem.inc:316
  #, fuzzy
  msgid "Create FAI CD"
  msgstr "Объект группы"
@@ -12199,6 +12183,10 @@ msgstr "Указанное имя уже используется."
  msgid "Cups"
  msgstr "группы"
  
+#: plugins/admin/systems/gencd_frame.tpl:2
+msgid "Your browser does not supprt iframes."
+msgstr ""
+
  #: plugins/admin/systems/goLdapServer.tpl:1
  #: plugins/admin/systems/class_goLdapServer.inc:28
  #, fuzzy
@@ -12303,6 +12291,16 @@ msgstr "Служба печати"
  msgid "Remove service"
  msgstr "Удалить сервис DNS"
  
+#: plugins/admin/systems/class_goTerminalServer.inc:31
+#: plugins/admin/systems/class_goTerminalServer.inc:54
+#: plugins/admin/systems/class_goTerminalServer.inc:117
+#: plugins/admin/systems/class_goTerminalServer.inc:118
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#: plugins/admin/systems/class_terminalService.inc:467
+#, fuzzy
+msgid "Terminal service"
+msgstr "Терминальный сервер"
+
  #: plugins/admin/systems/class_goTerminalServer.inc:78
  #, fuzzy, php-format
  msgid "Saving server services/terminalServer with dn '%s' failed."
@@ -12315,8 +12313,15 @@ msgstr ""
  #: plugins/admin/systems/class_goTerminalServer.inc:126
  #: plugins/admin/systems/goTerminalServer.tpl:8
  #, fuzzy
-msgid "Temporary disable login"
-msgstr "Временно отключить использование факса"
+msgid "Temporary disable login"
+msgstr "Временно отключить использование факса"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:127
+#: plugins/admin/systems/goTerminalServer.tpl:12
+#: plugins/admin/systems/class_terminalService.inc:478
+#, fuzzy
+msgid "Font path"
+msgstr "Контакт"
  
  #: plugins/admin/systems/class_serverService.inc:288
  msgid "Can't set status while this server is not saved."
@@ -13068,6 +13073,43 @@ msgid ""
  msgstr ""
  "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
  
+#: plugins/admin/systems/class_terminalService.inc:157
+msgid "default"
+msgstr "по умолчанию"
+
+#: plugins/admin/systems/class_terminalService.inc:457
+#, fuzzy, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr "Информация об организации"
+
+#: plugins/admin/systems/class_terminalService.inc:476
+#: plugins/admin/ogroups/class_phonequeue.inc:748
+#, fuzzy
+msgid "Method"
+msgstr "Почтовые настройки"
+
+#: plugins/admin/systems/class_terminalService.inc:484
+msgid "Auto-Sync"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:485
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Служба печати"
+
+#: plugins/admin/systems/class_terminalService.inc:488
+#, fuzzy
+msgid "Scanner model"
+msgstr "отключен"
+
+#: plugins/admin/systems/class_terminalService.inc:489
+msgid "Haeh ? "
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:490
+msgid "..."
+msgstr ""
+
  #: plugins/admin/ogroups/termgroup.tpl:2
  msgid ""
  "Actions you choose here influence all systems in this object group. "
@@ -13089,8 +13131,8 @@ msgstr "Включаемые объекты"
  msgid "Phone queue"
  msgstr "Номер телефона"
  
-#: plugins/admin/ogroups/tabs_ogroups.inc:88
-#: plugins/admin/ogroups/class_termgroup.inc:383
+#: plugins/admin/ogroups/tabs_ogroups.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:382
  #, fuzzy
  msgid "System"
  msgstr "Системы"
@@ -13099,21 +13141,25 @@ msgstr "Системы"
  msgid "Terminals"
  msgstr "Терминалы"
  
-#: plugins/admin/ogroups/class_termgroup.inc:114
+#: plugins/admin/ogroups/class_termgroup.inc:108
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr "У вас недостаточно прав для создания рабочей станции в этой ветке."
+
+#: plugins/admin/ogroups/class_termgroup.inc:113
  msgid "There must be at least one NTP server selected."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:168
+#: plugins/admin/ogroups/class_termgroup.inc:167
  #, php-format
  msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
  msgstr ""
  
-#: plugins/admin/ogroups/class_termgroup.inc:376
+#: plugins/admin/ogroups/class_termgroup.inc:375
  #, fuzzy
  msgid "Saving workstation failed"
  msgstr "Приложение"
  
-#: plugins/admin/ogroups/class_termgroup.inc:384
+#: plugins/admin/ogroups/class_termgroup.inc:383
  #, fuzzy
  msgid "System group"
  msgstr "Состояние системы"
@@ -13175,18 +13221,18 @@ msgid "Display objects of department"
  msgstr "Показать объекты подразделения"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:715
+#: plugins/admin/ogroups/class_ogroup.inc:698
  #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
  msgid "Object groups"
  msgstr "Объединения"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:159
+#: plugins/admin/ogroups/class_ogroupManagement.inc:154
  #, php-format
  msgid "You're about to delete the object group '%s'."
  msgstr "Вы собираетесь удалить групповой объект \"%s\"."
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:165
-#: plugins/admin/ogroups/class_ogroupManagement.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:160
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
  msgid "You are not allowed to delete this object group!"
  msgstr "У вас недостаточно прав для удаления этого группового объекта!"
  
@@ -13194,82 +13240,82 @@ msgstr "У вас недостаточно прав для удаления эт
  msgid "This 'dn' is no object group."
  msgstr "Этот объект не является группой."
  
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:290
  msgid "too many different objects!"
  msgstr "слишком много различных объектов!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:292
  msgid "users"
  msgstr "пользователи"
  
-#: plugins/admin/ogroups/class_ogroup.inc:295
+#: plugins/admin/ogroups/class_ogroup.inc:293
  msgid "groups"
  msgstr "группы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:294
  msgid "applications"
  msgstr "приложения"
  
-#: plugins/admin/ogroups/class_ogroup.inc:297
+#: plugins/admin/ogroups/class_ogroup.inc:295
  msgid "departments"
  msgstr "подразделения"
  
-#: plugins/admin/ogroups/class_ogroup.inc:298
+#: plugins/admin/ogroups/class_ogroup.inc:296
  msgid "servers"
  msgstr "серверы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:299
+#: plugins/admin/ogroups/class_ogroup.inc:297
  msgid "workstations"
  msgstr "рабочие станции"
  
-#: plugins/admin/ogroups/class_ogroup.inc:300
+#: plugins/admin/ogroups/class_ogroup.inc:298
  msgid "terminals"
  msgstr "терминалы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:299
  msgid "phones"
  msgstr "телефоны"
  
-#: plugins/admin/ogroups/class_ogroup.inc:302
+#: plugins/admin/ogroups/class_ogroup.inc:300
  msgid "printers"
  msgstr "принтеры"
  
-#: plugins/admin/ogroups/class_ogroup.inc:309
+#: plugins/admin/ogroups/class_ogroup.inc:307
  msgid "and"
  msgstr "и"
  
-#: plugins/admin/ogroups/class_ogroup.inc:462
+#: plugins/admin/ogroups/class_ogroup.inc:444
  #, fuzzy
  msgid "Non existing dn:"
  msgstr "Не существующий dn:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:604
+#: plugins/admin/ogroups/class_ogroup.inc:586
  #, fuzzy
  msgid "There is already an object with this cn."
  msgstr ""
  "Пользователь с таким регистрационным именем в базе данных уже существует."
  
-#: plugins/admin/ogroups/class_ogroup.inc:618
+#: plugins/admin/ogroups/class_ogroup.inc:601
  msgid "You can combine two different object types at maximum only!"
  msgstr ""
  "Вы можете комбинировать не более двух различных классов в одном объекте!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:667
+#: plugins/admin/ogroups/class_ogroup.inc:650
  #, fuzzy, php-format
  msgid "Saving of object group/generic with dn '%s' failed."
  msgstr "Моя учетная запись"
  
-#: plugins/admin/ogroups/class_ogroup.inc:680
+#: plugins/admin/ogroups/class_ogroup.inc:663
  #, fuzzy, php-format
  msgid "Removing of object group/generic with dn '%s' failed."
  msgstr "Атрибуты UNIX"
  
-#: plugins/admin/ogroups/class_ogroup.inc:710
+#: plugins/admin/ogroups/class_ogroup.inc:693
  #, fuzzy
  msgid "Object group generic"
  msgstr "Объект группы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:721
+#: plugins/admin/ogroups/class_ogroup.inc:704
  #, fuzzy
  msgid "Member"
  msgstr "Включаемые объекты"
@@ -13542,7 +13588,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:307
  #, php-format
  msgid ""
  "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13554,9 +13600,9 @@ msgstr ""
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:97
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:317
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
-#: plugins/gofon/macro/class_gofonMacro.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
+#: plugins/gofon/macro/class_gofonMacro.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:318
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:434
  #, fuzzy, php-format
  msgid "Can't select database %s on %s."
  msgstr "Невозможно выбрать базу данных!"
@@ -13572,8 +13618,8 @@ msgstr "Невозможно выбрать базу данных!"
  #: plugins/admin/ogroups/class_phonequeue.inc:537
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1185
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:474
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:476
  #, php-format
  msgid "The specified telephonenumber '%s' is already assigned to '%s'."
  msgstr ""
@@ -13587,8 +13633,8 @@ msgstr "Удалить настройки эл. почты"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:90
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1067
-#: plugins/gofon/macro/class_gofonMacro.inc:234
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:423
  #, php-format
  msgid ""
  "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13760,17 +13806,17 @@ msgstr "Показать группы с принтерами"
  msgid "Show groups containing phones"
  msgstr "Показать группы с принтерами"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:136
  #, fuzzy
  msgid "Create new object group"
  msgstr "Объект группы"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:207
  #, fuzzy
  msgid "You are not allowed to remove this entry."
  msgstr "У вас недостаточно прав для удаления этого объекта!"
  
-#: plugins/admin/ogroups/class_divListOGroup.inc:218
+#: plugins/admin/ogroups/class_divListOGroup.inc:222
  #: plugins/generic/references/class_reference.inc:50
  msgid "Object group"
  msgstr "Объект группы"
@@ -13785,17 +13831,32 @@ msgstr "Введите адрес сервера"
  msgid "ACLs"
  msgstr "Доступ"
  
-#: plugins/admin/acl/class_aclManagement.inc:159
+#: plugins/admin/acl/class_aclManagement.inc:122
+#, fuzzy
+msgid "You are not allowed to edit this acl."
+msgstr "У вас недостаточно прав для удаления этой группы!"
+
+#: plugins/admin/acl/class_aclManagement.inc:167
  #, fuzzy, php-format
  msgid "You're about to delete the acl %s."
  msgstr "Вы собираетесь удалить группу \"%s\"."
  
-#: plugins/admin/acl/class_aclManagement.inc:165
-#: plugins/admin/acl/class_aclManagement.inc:191
+#: plugins/admin/acl/class_aclManagement.inc:173
+#: plugins/admin/acl/class_aclManagement.inc:198
  #, fuzzy
  msgid "You are not allowed to delete this acl!"
  msgstr "У вас недостаточно прав для удаления этой группы!"
  
+#: plugins/admin/acl/class_aclManagement.inc:425
+#: plugins/admin/acl/class_aclManagement.inc:430
+#, fuzzy
+msgid "Access control list"
+msgstr "Параметры доступа"
+
+#: plugins/admin/acl/class_aclManagement.inc:433
+msgid "I don't know Jack"
+msgstr ""
+
  #: plugins/admin/acl/class_divListACL.inc:31
  #, fuzzy
  msgid "List of acl"
@@ -13814,36 +13875,16 @@ msgstr ""
  "листы. Если у вас достаточно большое количество списков, вы можете "
  "использовать групповое выделение."
  
-#: plugins/admin/acl/class_divListACL.inc:61
+#: plugins/admin/acl/class_divListACL.inc:60
  #, fuzzy
  msgid "Display acls matching"
  msgstr "Шаблон для групп"
  
-#: plugins/admin/acl/class_divListACL.inc:109
+#: plugins/admin/acl/class_divListACL.inc:115
  #, fuzzy
  msgid "Acl"
  msgstr "Все"
  
-#: plugins/admin/acl/class_divListACL.inc:153
-#, fuzzy
-msgid "Select to display users"
-msgstr "Выберите, чтобы просмотреть пользователей"
-
-#: plugins/admin/acl/class_divListACL.inc:153
-#, fuzzy
-msgid "Display user"
-msgstr "Отображаемое имя"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-#, fuzzy
-msgid "Select to display departments"
-msgstr "Выберите подразделение"
-
-#: plugins/admin/acl/class_divListACL.inc:155
-#, fuzzy
-msgid "Display departments"
-msgstr "Подразделения в подразделении"
-
  #: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
  #, fuzzy
  msgid "ACL management"
@@ -13872,35 +13913,37 @@ msgstr ""
  msgid "Fully Automatic Installation"
  msgstr "Управление приложениями"
  
-#: plugins/admin/fai/class_faiScript.inc:422
+#: plugins/admin/fai/class_faiScript.inc:433
  #, fuzzy, php-format
  msgid "Creating of FAI/script with dn '%s' failed."
  msgstr "Объект группы"
  
-#: plugins/admin/fai/class_faiScript.inc:519
+#: plugins/admin/fai/class_faiScript.inc:530
  #: plugins/admin/fai/class_faiHookEntry.inc:191
  #, fuzzy
  msgid "FAI script"
  msgstr "Показать хосты"
  
-#: plugins/admin/fai/class_faiScript.inc:526
-#: plugins/admin/fai/class_faiTemplate.inc:494
+#: plugins/admin/fai/class_faiScript.inc:537
+#: plugins/admin/fai/class_faiTemplate.inc:507
+#: plugins/admin/fai/class_faiPackage.inc:539
+#: plugins/admin/fai/class_faiPackage.inc:542
  #, fuzzy
  msgid "Readonly"
  msgstr "чтение"
  
-#: plugins/admin/fai/class_faiTemplate.inc:401
+#: plugins/admin/fai/class_faiTemplate.inc:414
  #, fuzzy, php-format
  msgid "Saving of FAI/template with dn '%s' failed."
  msgstr "Список подразделений"
  
-#: plugins/admin/fai/class_faiTemplate.inc:487
+#: plugins/admin/fai/class_faiTemplate.inc:500
  #, fuzzy
  msgid "FAI template"
  msgstr "Создать шаблон"
  
  #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:853
+#: plugins/admin/fai/class_faiManagement.inc:863
  #, fuzzy
  msgid "FAI"
  msgstr "Идентификатор факса"
@@ -13947,18 +13990,18 @@ msgstr "Указанное имя уже используется."
  msgid "You are not allowed to create a new branch."
  msgstr "Вам не разрешено менять пароль."
  
-#: plugins/admin/fai/class_faiManagement.inc:506
-#: plugins/admin/fai/class_faiManagement.inc:522
+#: plugins/admin/fai/class_faiManagement.inc:516
+#: plugins/admin/fai/class_faiManagement.inc:532
  #, fuzzy, php-format
  msgid "You are not allowed to create a new '%s' object."
  msgstr "У вас недостаточно прав для удаления этого группового объекта!"
  
-#: plugins/admin/fai/class_faiManagement.inc:847
+#: plugins/admin/fai/class_faiManagement.inc:857
  #, fuzzy
  msgid "FAI releases"
  msgstr "Выберите тип мыши"
  
-#: plugins/admin/fai/class_faiManagement.inc:848
+#: plugins/admin/fai/class_faiManagement.inc:858
  #, fuzzy
  msgid "FAI release management"
  msgstr "Управление подразделениями"
@@ -13983,11 +14026,11 @@ msgstr "Показать телефоны"
  msgid "Choosen packages"
  msgstr "Показать телефоны"
  
-#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:84 include/functions.inc:674
  msgid "Configure"
  msgstr "Настроить"
  
-#: plugins/admin/fai/faiPackage.tpl:80
+#: plugins/admin/fai/faiPackage.tpl:87
  #, fuzzy
  msgid "Toggle remove flag"
  msgstr "по умолчанию"
@@ -14191,7 +14234,7 @@ msgstr ""
  #: plugins/admin/fai/class_faiProfile.inc:298
  #: plugins/admin/fai/class_faiPartitionTable.inc:520
  #: plugins/admin/fai/class_faiProfileEntry.inc:140
-#: plugins/admin/fai/class_faiSummaryTab.inc:45
+#: plugins/admin/fai/class_faiSummaryTab.inc:48
  #, fuzzy
  msgid "Partition table"
  msgstr "Переменная"
@@ -14247,136 +14290,141 @@ msgstr "Ошибка LDAP:"
  
  #: plugins/admin/fai/class_faiHook.inc:535
  #: plugins/admin/fai/class_faiPartitionTable.inc:528
-#: plugins/admin/fai/class_faiVariable.inc:420
+#: plugins/admin/fai/class_faiVariable.inc:416
  #, fuzzy
  msgid "Read only"
  msgstr "чтение"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  #, fuzzy
  msgid "primary"
  msgstr "Основная группа"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
  #, fuzzy
  msgid "logical"
  msgstr "Добавить локально"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
  #, fuzzy
  msgid "FS type"
  msgstr "Тип"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
-#: plugins/admin/fai/class_faiSummaryTab.inc:317
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:468
+#: plugins/admin/fai/class_faiSummaryTab.inc:344
  #, fuzzy
  msgid "Mount point"
  msgstr "Мониторинг"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
-#: plugins/admin/fai/class_faiSummaryTab.inc:316
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:343
  #, fuzzy
  msgid "Size in MB"
  msgstr "Пользователь:"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
-#: plugins/admin/fai/class_faiSummaryTab.inc:315
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:470
+#: plugins/admin/fai/class_faiSummaryTab.inc:342
  #, fuzzy
  msgid "Mount options"
  msgstr "Дополнительные параметры"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
  #, fuzzy
  msgid "FS option"
  msgstr "Добавить параметр"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
  #, fuzzy
  msgid "Preserve"
  msgstr "серверы"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:368
+#, fuzzy
+msgid "Please specify a valid disc name."
+msgstr "Введите корректное имя пользователя!"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
  #, php-format
  msgid "please enter a unique mount point for partition %s"
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
  #, fuzzy, php-format
  msgid "Please enter a valid mount point for partition %s."
  msgstr "Введите корректный путь в поле \"Домашний каталог\"."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:401
  #, php-format
  msgid ""
  "File system type 'swap' is already used, change file system type for "
  "partition %s."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:405
  msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:411
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:415
  #, fuzzy, php-format
  msgid "Please enter a valid partition size for partition %s."
  msgstr "Введите корректный путь в поле \"Домашний каталог\"."
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:412
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:421
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:423
  #, fuzzy, php-format
  msgid "Please enter a valid range for partition %s."
  msgstr "Введите корректный серийный номер"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:428
  #, fuzzy, php-format
  msgid "Please enter a range for partition size for partition %s."
  msgstr "Введите корректный серийный номер"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:434
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:443
  msgid ""
  "You have more than 3 primary partition table entries in your configuration, "
  "please check your configuration twice."
  msgstr ""
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:446
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:455
  #, fuzzy
  msgid "Partition table entry"
  msgstr "Переменная"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
  #, fuzzy
  msgid "FAI partition table entry"
  msgstr "Принтер"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:465
  #, fuzzy
  msgid "Partition type"
  msgstr "Переменная"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:466
  #, fuzzy
  msgid "Partition no."
  msgstr "Назначение"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:467
  #, fuzzy
  msgid "File system type"
  msgstr "Системы"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:469
  #, fuzzy
  msgid "Partition size"
  msgstr "Назначение"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:471
  #, fuzzy
  msgid "File system options"
  msgstr "Системная информация"
  
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:472
  #, fuzzy
  msgid "Partition flags"
  msgstr "Назначение"
@@ -14596,12 +14644,12 @@ msgstr "Выберите тип мыши"
  msgid "A new class name."
  msgstr "Доступные приложения"
  
-#: plugins/admin/fai/class_faiVariable.inc:334
+#: plugins/admin/fai/class_faiVariable.inc:330
  #, fuzzy, php-format
  msgid "Saving of FAI/variable with dn '%s' failed."
  msgstr "Дополнительные записи в fstab"
  
-#: plugins/admin/fai/class_faiVariable.inc:413
+#: plugins/admin/fai/class_faiVariable.inc:409
  #, fuzzy
  msgid "FAI variable"
  msgstr "Устройство отображения"
@@ -14692,7 +14740,7 @@ msgid "Destination path"
  msgstr "Назначение"
  
  #: plugins/admin/fai/faiTemplateEntry.tpl:74
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:577
  #: plugins/gofon/conference/class_divListConferences.inc:53
  msgid "Owner"
  msgstr ""
@@ -14852,39 +14900,40 @@ msgstr ""
  "ли вам нужно удаление, так как GOsa не сможет отменить результаты этой "
  "операции."
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:41
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
  #, fuzzy
  msgid "Scripts"
  msgstr "Путь к сценариям"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:46
+#: plugins/admin/fai/class_faiSummaryTab.inc:49
  msgid "Package list"
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:191
+#: plugins/admin/fai/class_faiSummaryTab.inc:86
+msgid ""
+"Unknown type of FAI source information. This is not a profile, workstation "
+"nor a ogroup."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:217
  msgid "This object has no FAI classes assigned."
  msgstr ""
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:203
+#: plugins/admin/fai/class_faiSummaryTab.inc:230
  #, fuzzy
  msgid "Open"
  msgstr "Параметры"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:312
+#: plugins/admin/fai/class_faiSummaryTab.inc:339
  #, fuzzy
  msgid "No."
  msgstr "нет"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:314
+#: plugins/admin/fai/class_faiSummaryTab.inc:341
  #, fuzzy
  msgid "FS options"
  msgstr "Добавить параметр"
  
-#: plugins/admin/fai/class_faiSummaryTab.inc:553
-#, fuzzy
-msgid "Viewable"
-msgstr "Переменная"
-
  #: plugins/admin/fai/branch_selector.tpl:21
  #, fuzzy
  msgid "Create new branch"
@@ -14987,102 +15036,102 @@ msgstr "Показать рабочие станции"
  msgid "Show partitions"
  msgstr "Показать рабочие станции"
  
-#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/fai/class_divListFai.inc:135
  #, fuzzy
  msgid "New profile"
  msgstr "Управление системами"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  #, fuzzy
  msgid "New partition table"
  msgstr "Принтер"
  
-#: plugins/admin/fai/class_divListFai.inc:157
+#: plugins/admin/fai/class_divListFai.inc:151
  msgid "PT"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  #, fuzzy
  msgid "New scripts"
  msgstr "Показать хосты"
  
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:152
  msgid "S"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  #, fuzzy
  msgid "New hooks"
  msgstr "Показать хосты"
  
-#: plugins/admin/fai/class_divListFai.inc:159
+#: plugins/admin/fai/class_divListFai.inc:153
  msgid "H"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  #, fuzzy
  msgid "New variables"
  msgstr "Показать терминалы"
  
-#: plugins/admin/fai/class_divListFai.inc:160
+#: plugins/admin/fai/class_divListFai.inc:154
  msgid "V"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "New templates "
  msgstr "Создать шаблон"
  
-#: plugins/admin/fai/class_divListFai.inc:161
+#: plugins/admin/fai/class_divListFai.inc:155
  #, fuzzy
  msgid "I"
  msgstr "Unix"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  #, fuzzy
  msgid "New package list"
  msgstr "Число страниц"
  
-#: plugins/admin/fai/class_divListFai.inc:162
+#: plugins/admin/fai/class_divListFai.inc:156
  msgid "PK"
  msgstr ""
  
-#: plugins/admin/fai/class_divListFai.inc:242
-#: plugins/admin/fai/class_divListFai.inc:245
+#: plugins/admin/fai/class_divListFai.inc:240
+#: plugins/admin/fai/class_divListFai.inc:243
  #, fuzzy
  msgid "Edit class"
  msgstr "Список систем"
  
-#: plugins/admin/fai/class_divListFai.inc:253
+#: plugins/admin/fai/class_divListFai.inc:251
  #, fuzzy
  msgid "Delete class"
  msgstr "Удалить"
  
-#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/generic.tpl:12
  #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:180
  #, fuzzy
  msgid "Mime type"
  msgstr "Тип"
  
-#: plugins/admin/mimetypes/generic.tpl:17
+#: plugins/admin/mimetypes/generic.tpl:16
  #: plugins/admin/mimetypes/paste_generic.tpl:16
  #, fuzzy
  msgid "Please enter a name for the mime type here"
  msgstr "Введите корректный номер телефона!"
  
-#: plugins/admin/mimetypes/generic.tpl:23
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:673
+#: plugins/admin/mimetypes/generic.tpl:22
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:681
  #, fuzzy
  msgid "Mime group"
  msgstr "Основная группа"
  
-#: plugins/admin/mimetypes/generic.tpl:27
+#: plugins/admin/mimetypes/generic.tpl:26
  #, fuzzy
  msgid "Categorize this mime type"
  msgstr "Категория этой ветки"
  
-#: plugins/admin/mimetypes/generic.tpl:39
+#: plugins/admin/mimetypes/generic.tpl:38
  #, fuzzy
  msgid "Please specify a description"
  msgstr "Введите корректное имя пользователя!"
@@ -15101,7 +15150,7 @@ msgid "Left click"
  msgstr ""
  
  #: plugins/admin/mimetypes/generic.tpl:99
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:679
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:687
  #, fuzzy
  msgid "File patterns"
  msgstr "Фильтры"
@@ -15143,63 +15192,58 @@ msgstr ""
  msgid "Ask whether to save to local disk"
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:461
  #, php-format
  msgid "Saving of mime type/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:452
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:470
  #, fuzzy, php-format
  msgid "Removing of mime type/generic with dn '%s' failed."
  msgstr "Показать подразделения"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:464
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:482
  #, fuzzy, php-format
  msgid "Removing mime type from objectgroup '%s' failed"
  msgstr "Показать группы приложений"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:474
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:492
  #, fuzzy
  msgid "Please specify a valid name for this mime type."
  msgstr "Укажите корректный номер телефона."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:477
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:495
  #, fuzzy
  msgid "Please specify at least one file pattern."
  msgstr "Укажите корректный номер телефона."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:490
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:508
  #, fuzzy
  msgid "There's already a mime type with this 'Name'."
  msgstr "Приложение с таким именем уже существует."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:498
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:516
  #, fuzzy
  msgid "There's already an mime with this 'Name'."
  msgstr "Приложение с таким именем уже существует."
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:510
-#, fuzzy
-msgid "You have no permissions to create a mime type on this 'Base'."
-msgstr "У вас недостаточно прав для создания принтера в этой ветке."
-
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:672
  #, fuzzy
  msgid "Mime type generic"
  msgstr "Тип"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
  #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
  #, fuzzy
  msgid "Mime types"
  msgstr "Тип"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:677
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:685
  #, fuzzy
  msgid "Left click action"
  msgstr "Создать приложения"
  
-#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:680
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:688
  #, fuzzy
  msgid "Embedded applications"
  msgstr "Используемые приложения"
@@ -15209,13 +15253,13 @@ msgstr "Используемые приложения"
  msgid "Manage mime types"
  msgstr "Системы"
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:276
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:278
  #, fuzzy, php-format
  msgid "You're about to delete the mime type '%s'."
  msgstr "Вы собираетесь удалить объект %s."
  
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:282
-#: plugins/admin/mimetypes/class_mimetypeManagement.inc:311
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:313
  #, fuzzy
  msgid "You are not allowed to delete this mime type!"
  msgstr "У вас недостаточно прав для удаления этого объекта!"
@@ -15252,7 +15296,7 @@ msgstr "Тип"
  msgid "Display mime types matching"
  msgstr "Показать совпадения номеров"
  
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:140
  #, fuzzy
  msgid "Create new mime type"
  msgstr "Создать шаблон"
@@ -15292,7 +15336,7 @@ msgstr "не определена"
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
  #: plugins/gofon/phoneaccount/class_phoneAccount.inc:658
  #: plugins/gofon/macro/class_gofonMacro.inc:95
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:286
  msgid ""
  "There is currently no asterisk server defined. Possibly you are missing a "
  "server that handles the asterisk management (goFonServer). Your settings "
@@ -15425,23 +15469,28 @@ msgstr "Удалить учетную запись POSIX"
  msgid "Phone account settings"
  msgstr "Настройки телефона"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1241
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1237
+#, fuzzy
+msgid "GOfon reports"
+msgstr "Телефонные отчеты"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:576
  #, fuzzy
  msgid "Telephone number"
  msgstr "Телефонные номера"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1242
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
  #, fuzzy
  msgid "Macro settings"
  msgstr "Почтовые настройки пользователя"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1246
  #, fuzzy
  msgid "Telephone pin"
  msgstr "Телефон"
  
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1245
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1247
  msgid "Voicemail pin"
  msgstr ""
  
@@ -15486,7 +15535,7 @@ msgid "Regular expression for matching macro names"
  msgstr "Регулярное выражение, соответствующее именам групп"
  
  #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
-#: plugins/gofon/macro/class_gofonMacro.inc:483
+#: plugins/gofon/macro/class_gofonMacro.inc:496
  #, fuzzy
  msgid "Macro name"
  msgstr "Название"
@@ -15510,13 +15559,13 @@ msgstr "Название"
  msgid "Phone macros"
  msgstr "Телефонные отчеты"
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:207
  #, fuzzy, php-format
  msgid "You're about to delete the macro '%s'."
  msgstr "Вы собираетесь удалить группу \"%s\"."
  
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:214
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:213
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
  #, fuzzy
  msgid "You are not allowed to delete this macro!"
  msgstr "У вас недостаточно прав для удаления этой группы!"
@@ -15527,84 +15576,89 @@ msgstr "У вас недостаточно прав для удаления эт
  msgid "This 'dn' is no phone macro."
  msgstr "Этот DN не имеет свойств телефона."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:185
+#: plugins/gofon/macro/class_gofonMacro.inc:183
  msgid ""
  "This macro ist still in use. To delete this Macro ensure that nobody has "
  "selected this Macro."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: plugins/gofon/macro/class_gofonMacro.inc:190
+#: plugins/gofon/macro/class_gofonMacro.inc:205
  #: plugins/gofon/macro/class_gofonMacroParameters.inc:402
  #, fuzzy, php-format
  msgid "Removing of goFonMacro/generic account with dn '%s' failed."
  msgstr "Удалить настройки эл. почты"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:220
+#: plugins/gofon/macro/class_gofonMacro.inc:218
  msgid ""
  "There is no mysql extension available in your php setup, can't save any "
  "changes to asterisk db."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:290
+#: plugins/gofon/macro/class_gofonMacro.inc:288
  #, php-format
  msgid "Unable to parse macro contents on line: %s"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:308
+#: plugins/gofon/macro/class_gofonMacro.inc:306
  #, php-format
  msgid "Can't perform SELECT query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:317
-#: plugins/gofon/macro/class_gofonMacro.inc:325
+#: plugins/gofon/macro/class_gofonMacro.inc:315
+#: plugins/gofon/macro/class_gofonMacro.inc:323
  #, php-format
  msgid "Can't perform DELETE query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:339
+#: plugins/gofon/macro/class_gofonMacro.inc:337
  #, php-format
  msgid "Can't perform INSERT query in DB '%s'"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:405
+#: plugins/gofon/macro/class_gofonMacro.inc:417
  #, fuzzy, php-format
  msgid "The given cn '%s' already exists."
  msgstr "Подразделение с таким именем уже существует."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:410
+#: plugins/gofon/macro/class_gofonMacro.inc:422
  msgid "You must specify the 'Display Name' in order to save this macro"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:414
+#: plugins/gofon/macro/class_gofonMacro.inc:426
  msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:418
+#: plugins/gofon/macro/class_gofonMacro.inc:430
  msgid "Makro length must be lower than 100 lines"
  msgstr ""
  
-#: plugins/gofon/macro/class_gofonMacro.inc:423
+#: plugins/gofon/macro/class_gofonMacro.inc:435
  #, fuzzy
  msgid "Please choose a valid  base."
  msgstr "Пожалуйста, укажите корректную кадровую синхронизацию."
  
-#: plugins/gofon/macro/class_gofonMacro.inc:466
+#: plugins/gofon/macro/class_gofonMacro.inc:478
  #, fuzzy, php-format
  msgid "Saving of goFonMacro/generic account with dn '%s' failed."
  msgstr "Создать настройки запись эл. почты"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/macro/class_gofonMacro.inc:487
  #, fuzzy
  msgid "Asterisk macro management"
  msgstr "Управление системами"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:487
+#: plugins/gofon/macro/class_gofonMacro.inc:492
+#, fuzzy
+msgid "GOfon macro"
+msgstr "Телефонные отчеты"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:500
  #, fuzzy
-msgid "Macro content"
+msgid "Macro content and parameter"
  msgstr "Название"
  
-#: plugins/gofon/macro/class_gofonMacro.inc:488
+#: plugins/gofon/macro/class_gofonMacro.inc:501
  msgid "Visibility flag"
  msgstr ""
  
@@ -15668,38 +15722,36 @@ msgstr "Название"
  msgid "Visible"
  msgstr "Переменная"
  
-#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:103
  #, fuzzy
  msgid "Create new phone macro"
  msgstr "Создать телефонный аккаунт"
  
-#: plugins/gofon/macro/class_divListMacros.inc:132
-#: plugins/gofon/macro/class_divListMacros.inc:160
-#, fuzzy
-msgid "Edit macro"
-msgstr "Пользователи домена"
-
-#: plugins/gofon/macro/class_divListMacros.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:168
-#, fuzzy
-msgid "Delete macro"
-msgstr "Удалить"
-
-#: plugins/gofon/macro/class_divListMacros.inc:137
+#: plugins/gofon/macro/class_divListMacros.inc:124
  #, fuzzy
  msgid "Macro"
  msgstr "Название"
  
-#: plugins/gofon/macro/class_divListMacros.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:125
  #, fuzzy
  msgid "visible"
  msgstr "Видимый всем"
  
-#: plugins/gofon/macro/class_divListMacros.inc:139
+#: plugins/gofon/macro/class_divListMacros.inc:126
  #, fuzzy
  msgid "invisible"
  msgstr "Видимый всем"
  
+#: plugins/gofon/macro/class_divListMacros.inc:147
+#, fuzzy
+msgid "Edit macro"
+msgstr "Пользователи домена"
+
+#: plugins/gofon/macro/class_divListMacros.inc:155
+#, fuzzy
+msgid "Delete macro"
+msgstr "Удалить"
+
  #: plugins/gofon/conference/headpage.tpl:6
  #: plugins/gofon/conference/class_divListConferences.inc:31
  #: plugins/gofon/conference/class_divListConferences.inc:32
@@ -15744,7 +15796,7 @@ msgid "Lifetime (in days)"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:137
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:566
  #, fuzzy
  msgid "Preset PIN"
  msgstr "присутствует"
@@ -15755,7 +15807,7 @@ msgid "PIN"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:157
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:567
  #, fuzzy
  msgid "Record conference"
  msgstr "Ссылки"
@@ -15765,7 +15817,7 @@ msgid "Sound file format"
  msgstr ""
  
  #: plugins/gofon/conference/generic.tpl:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:568
  msgid "Play music on hold"
  msgstr ""
  
@@ -15798,87 +15850,88 @@ msgstr "Название"
  msgid "Removing of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:252
  msgid ""
  "You have specified a conference 'without PIN' ... please leave the PIN "
  "fields empty."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
  #, fuzzy
  msgid "Please enter a PIN."
  msgstr "Введите адрес сервера"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:260
  #, fuzzy
  msgid "Please enter a name for the conference."
  msgstr "Введите корректный номер телефона!"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:251
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:264
  msgid "Only numeric chars are allowed in Number field."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:268
  msgid "Only numbers are allowed in Lifetime."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:298
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:408
  msgid ""
  "Can't save any changes to asterisk database, there is currently no mysql "
  "extension available in your php setup."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
  #, php-format
  msgid "Saving of goFonConference/generic with dn '%s' failed."
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
-#: plugins/gofon/conference/class_divListConferences.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_divListConferences.inc:198
  #, fuzzy
  msgid "Conference"
  msgstr "Ссылки"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:552
  #, fuzzy
  msgid "Phone conference management"
  msgstr "Управление подразделениями"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
-msgid "GOfon"
-msgstr ""
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#, fuzzy
+msgid "GOfon conference"
+msgstr "Номер телефона"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
  #, fuzzy
  msgid "Conference PIN"
  msgstr "Ссылки"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:569
  #, fuzzy
  msgid "Activate menu"
  msgstr "Включить автоответчик"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:570
  msgid "Announce user activity"
  msgstr ""
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:571
  #, fuzzy
  msgid "Count user"
  msgstr "Страна"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:572
  #, fuzzy
  msgid "Conference type"
  msgstr "Ссылки"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:574
  #, fuzzy
  msgid "Format"
  msgstr "Порт"
  
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:575
  msgid "Lifetime"
  msgstr ""
  
@@ -15897,17 +15950,17 @@ msgstr "Номер телефона"
  msgid "Regular expression for matching conference names"
  msgstr "Регулярное выражение, соответствующее именам пользователей"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  #, fuzzy
  msgid "Create new conference"
  msgstr "Создание нового объекта в"
  
-#: plugins/gofon/conference/class_divListConferences.inc:109
+#: plugins/gofon/conference/class_divListConferences.inc:104
  #, fuzzy
  msgid "New conference"
  msgstr "Номер телефона"
  
-#: plugins/gofon/conference/class_divListConferences.inc:196
+#: plugins/gofon/conference/class_divListConferences.inc:192
  #: include/class_pluglist.inc:145 include/class_pluglist.inc:146
  #: include/class_pluglist.inc:245
  #, fuzzy
@@ -15915,28 +15968,28 @@ msgid "Unknown"
  msgstr "состояние неизвестно"
  
  #: plugins/gofon/fonreports/contents.tpl:31
-#: plugins/gofon/fonreports/class_fonreport.inc:399
+#: plugins/gofon/fonreports/class_fonreport.inc:400
  msgid "Source"
  msgstr "Источник"
  
  #: plugins/gofon/fonreports/contents.tpl:32
-#: plugins/gofon/fonreports/class_fonreport.inc:400
+#: plugins/gofon/fonreports/class_fonreport.inc:401
  msgid "Destination"
  msgstr "Назначение"
  
  #: plugins/gofon/fonreports/contents.tpl:33
-#: plugins/gofon/fonreports/class_fonreport.inc:401
+#: plugins/gofon/fonreports/class_fonreport.inc:402
  msgid "Channel"
  msgstr "Канал"
  
  #: plugins/gofon/fonreports/contents.tpl:36
-#: plugins/gofon/fonreports/class_fonreport.inc:404
+#: plugins/gofon/fonreports/class_fonreport.inc:405
  msgid "Duration"
  msgstr "Продолжительность"
  
  #: plugins/gofon/fonreports/main.inc:16
-#: plugins/gofon/fonreports/class_fonreport.inc:389
  #: plugins/gofon/fonreports/class_fonreport.inc:390
+#: plugins/gofon/fonreports/class_fonreport.inc:391
  msgid "Phone reports"
  msgstr "Телефонные отчеты"
  
@@ -15960,12 +16013,12 @@ msgstr "Не удается выбрать базу данных факсов д
  msgid "Query for phone database failed!"
  msgstr "Запрос в базу телефонов не выполнен!"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:402
+#: plugins/gofon/fonreports/class_fonreport.inc:403
  #, fuzzy
  msgid "Application called"
  msgstr "Приложение"
  
-#: plugins/gofon/fonreports/class_fonreport.inc:403
+#: plugins/gofon/fonreports/class_fonreport.inc:404
  #, fuzzy
  msgid "Disposition"
  msgstr "Отключение"
@@ -16020,7 +16073,7 @@ msgstr "Добро пожаловать %s!"
  msgid "Generating this page caused the PHP interpreter to raise some errors!"
  msgstr ""
  
-#: include/php_setup.inc:71 html/main.php:388
+#: include/php_setup.inc:71
  #, fuzzy
  msgid "Toggle information"
  msgstr "Личная информация"
@@ -16049,16 +16102,16 @@ msgstr "Состояние"
  msgid "method"
  msgstr "Почтовые настройки"
  
-#: include/php_setup.inc:129
+#: include/php_setup.inc:135
  msgid "Trace"
  msgstr ""
  
-#: include/php_setup.inc:130
+#: include/php_setup.inc:136
  #, fuzzy
  msgid "Line"
  msgstr "в"
  
-#: include/php_setup.inc:131
+#: include/php_setup.inc:137
  #, fuzzy
  msgid "Arguments"
  msgstr "подразделения"
@@ -16144,7 +16197,7 @@ msgstr ""
  msgid "incomplete"
  msgstr "не полный"
  
-#: include/functions.inc:1046 include/functions.inc:1233
+#: include/functions.inc:1046 include/functions.inc:1202
  msgid "LDAP error:"
  msgstr "Ошибка LDAP:"
  
@@ -16187,19 +16240,19 @@ msgstr ""
  "Вы собираетесь редактировать запись LDAP \"%s\", которая используется \"%s"
  "\". Пожалуйста, обратитесь к пользователю и уточните отношения."
  
-#: include/functions.inc:1415
+#: include/functions.inc:1384
  msgid "Entries per page"
  msgstr ""
  
-#: include/functions.inc:1443
+#: include/functions.inc:1412
  msgid "Apply filter"
  msgstr ""
  
-#: include/functions.inc:1717
+#: include/functions.inc:1686
  msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
  msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
  
-#: include/functions.inc:1760
+#: include/functions.inc:1729
  #, php-format
  msgid "GOsa development snapshot (Rev %s)"
  msgstr ""
@@ -16208,7 +16261,7 @@ msgstr ""
  msgid "Warning: Account has an invalid mailserver string!"
  msgstr ""
  
-#: include/class_mail-methods-cyrus.inc:53
+#: include/class_mail-methods-cyrus.inc:58
  msgid ""
  "Warning: IMAP Server cannot be reached! If you save this account, some mail "
  "settings will not be stored on your server!"
@@ -16216,50 +16269,50 @@ msgstr ""
  "Предупреждение: не удается получить доступ к серверу IMAP! Некоторые "
  "почтовые настройки не будут сохранены."
  
-#: include/class_mail-methods-cyrus.inc:151
+#: include/class_mail-methods-cyrus.inc:156
  #, php-format
  msgid "Can't create IMAP mailbox. Server says '%s'."
  msgstr "Не удается создать почтовый ящик IMAP. Ответ сервера: \"%s\"."
  
-#: include/class_mail-methods-cyrus.inc:170
+#: include/class_mail-methods-cyrus.inc:175
  #, php-format
  msgid "Can't write IMAP quota. Server says '%s'."
  msgstr "Не удается создать квоту IMAP. Ответ сервера: \"%s\"."
  
-#: include/class_mail-methods-cyrus.inc:196
+#: include/class_mail-methods-cyrus.inc:201
  #, fuzzy
  msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
  msgstr ""
  "Предупреждение: функция imap_getacl не реализована, и вы не сможете менять "
  "права доступа к общим папкам."
  
-#: include/class_mail-methods-cyrus.inc:214
+#: include/class_mail-methods-cyrus.inc:219
  msgid "Warning: imap_getacl is not available, can't get imap permissions!"
  msgstr ""
  "Предупреждение: функция imap_getacl недоступна, не удается считать права на "
  "доступ к папкам!"
  
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_mail-methods-cyrus.inc:241
  #, php-format
  msgid "Can't remove IMAP mailbox. Server says '%s'."
  msgstr "Не удается удалить почтовый ящик IMAP. Ответ сервера: '%s'."
  
-#: include/class_mail-methods-cyrus.inc:264
+#: include/class_mail-methods-cyrus.inc:269
  #, php-format
  msgid "Can't log into SIEVE server. Server says '%s'."
  msgstr "Невозможно зарегистрироваться на сервере SIEVE. Ответ сервера: \"%s\"."
  
-#: include/class_mail-methods-cyrus.inc:277
+#: include/class_mail-methods-cyrus.inc:282
  #, php-format
  msgid "Can't get sieve script. Server says '%s'."
  msgstr "Невозможно получить сценарий SIEVE. Ответ сервера: \"%s\"."
  
-#: include/class_mail-methods-cyrus.inc:348
+#: include/class_mail-methods-cyrus.inc:353
  #, php-format
  msgid "Can't send sieve script. Server says '%s'."
  msgstr "Невозможно отправить сценарий SIEVE. Ответ сервера: \"%s\"."
  
-#: include/class_mail-methods-cyrus.inc:352
+#: include/class_mail-methods-cyrus.inc:357
  #, php-format
  msgid "Can't activate GOsa sieve script. Server says '%s'."
  msgstr "Невозможно активировать сценарий  GOsa SIEVE. Ответ сервера: \"%s\"."
@@ -16296,7 +16349,7 @@ msgstr ""
  msgid "Unknown FAIstate %s"
  msgstr "состояние неизвестно"
  
-#: include/class_ldap.inc:705
+#: include/class_ldap.inc:707
  #, php-format
  msgid ""
  "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -16305,29 +16358,29 @@ msgstr ""
  "Автоматическое создание типа \"%s\" не поддерживается. Пожалуйста, сообщите "
  "об этом команде разработчиков GOsa."
  
-#: include/class_ldap.inc:774
+#: include/class_ldap.inc:776
  #, php-format
  msgid "while operating on '%s' using LDAP server '%s'"
  msgstr ""
  
-#: include/class_ldap.inc:776
+#: include/class_ldap.inc:778
  #, fuzzy, php-format
  msgid "while operating on LDAP server %s"
  msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
  
-#: include/class_ldap.inc:998
+#: include/class_ldap.inc:1000
  #, php-format
  msgid ""
  "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
  "in line %s"
  msgstr ""
  
-#: include/class_ldap.inc:1027
+#: include/class_ldap.inc:1029
  #, php-format
  msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
  msgstr ""
  
-#: include/class_ldap.inc:1155
+#: include/class_ldap.inc:1157
  #, fuzzy, php-format
  msgid "Ldap import with dn '%s' failed."
  msgstr "Показать подразделения"
@@ -16341,90 +16394,85 @@ msgstr ""
  msgid "References"
  msgstr "Ссылки"
  
-#: include/class_plugin.inc:420
+#: include/class_plugin.inc:421
  #, fuzzy, php-format
  msgid ""
  "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
  msgstr ""
  "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
  
-#: include/class_plugin.inc:601
+#: include/class_plugin.inc:602
  #, php-format
  msgid ""
  "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
  msgstr ""
  "Не удается найти команду \"%s\", указанную в поле POSTCREATE модуля \"%s\"."
  
-#: include/class_plugin.inc:635 include/class_password-methods.inc:183
+#: include/class_plugin.inc:636 include/class_password-methods.inc:183
  #, 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:669
+#: include/class_plugin.inc:670
  #, php-format
  msgid ""
  "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
  msgstr ""
  "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
  
-#: include/class_plugin.inc:977
+#: include/class_plugin.inc:978
  #, php-format
  msgid "Object '%s' is already tagged"
  msgstr ""
  
-#: include/class_plugin.inc:984
+#: include/class_plugin.inc:985
  #, php-format
  msgid "Adding tag (%s) to object '%s'"
  msgstr ""
  
-#: include/class_plugin.inc:998 include/class_plugin.inc:1027
+#: include/class_plugin.inc:999 include/class_plugin.inc:1028
  #, php-format
  msgid "Handle object tagging with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1014
+#: include/class_plugin.inc:1015
  #, php-format
  msgid "Removing tag from object '%s'"
  msgstr ""
  
-#: include/class_plugin.inc:1075 include/class_plugin.inc:1121
-#: include/class_plugin.inc:1122
+#: include/class_plugin.inc:1076 include/class_plugin.inc:1122
+#: include/class_plugin.inc:1123
  #, fuzzy, php-format
  msgid "Saving object snapshot with dn '%s' failed."
  msgstr "Моя учетная запись"
  
-#: include/class_plugin.inc:1137
-#, fuzzy
-msgid "You are not allowed to delete this snapshot!"
-msgstr "У вас недостаточно прав для удаления этого объекта!"
-
-#: include/class_plugin.inc:1153
+#: include/class_plugin.inc:1149
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1165
+#: include/class_plugin.inc:1161
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable(s) '%s' is "
  "not configured in your gosa.conf."
  msgstr ""
  
-#: include/class_plugin.inc:1197
+#: include/class_plugin.inc:1193
  #, php-format
  msgid "Method get available snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1253
+#: include/class_plugin.inc:1249
  #, php-format
  msgid "Method get deleted snapshots with dn '%s' failed."
  msgstr ""
  
-#: include/class_plugin.inc:1317 include/class_plugin.inc:1331
+#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
  #, fuzzy, php-format
  msgid "Restore snapshot with dn '%s' failed."
  msgstr "Удалить приложения"
@@ -16526,7 +16574,7 @@ msgstr ""
  "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
  "администратору."
  
-#: include/class_config.inc:472
+#: include/class_config.inc:477
  msgid "SID and/or RIDBASE missing in your configuration!"
  msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
  
@@ -17037,7 +17085,7 @@ msgstr ""
  "Не удается начать сеанс на указанном LDAP-сервере! Убедитесь, что он "
  "доступен GOsa."
  
-#: include/functions_setup.inc:784
+#: include/functions_setup.inc:792
  #, php-format
  msgid ""
  "You're missing the required attribute '%s' from this formular. Please "
@@ -17070,15 +17118,12 @@ msgstr ""
  msgid "Can't log into LDAP server. Reason was: %s."
  msgstr "Невозможно зарегистрироваться на LDAP-сервере. Причина: %s."
  
-#: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:252
-#: ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:1092
+#, fuzzy
  msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr ""
-"У вас нет учетной записи администратора для GOsa, так что вы не сможете что-"
-"либо администрировать!"
+"User and/or group could not be created, please check your configuration "
+"twice !"
+msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
  
  #: include/functions_helpviewer.inc:43
  #, fuzzy, php-format
@@ -17145,103 +17190,108 @@ msgstr ""
  msgid "Use ACL defined in role"
  msgstr ""
  
-#: include/class_acl.inc:370
+#: include/class_acl.inc:372
  #, fuzzy
  msgid "Edit ACL"
  msgstr "Изменить"
  
-#: include/class_acl.inc:371
+#: include/class_acl.inc:373
  #, fuzzy
  msgid "Delete ACL"
  msgstr "Удалить"
  
-#: include/class_acl.inc:408
+#: include/class_acl.inc:410
  #, fuzzy
  msgid "No ACL settings for this category"
  msgstr "Описание группы"
  
-#: include/class_acl.inc:410
+#: include/class_acl.inc:412
  #, php-format
  msgid "Contains ACLs for these objects: %s"
  msgstr ""
  
-#: include/class_acl.inc:415
+#: include/class_acl.inc:417
  #, fuzzy
  msgid "Edit categories ACLs"
  msgstr "Список систем"
  
-#: include/class_acl.inc:416
+#: include/class_acl.inc:418
  msgid "Clear categories ACLs"
  msgstr ""
  
-#: include/class_acl.inc:455
+#: include/class_acl.inc:457
  #, php-format
  msgid "Edit ACL for '%s', scope is '%s'"
  msgstr ""
  
-#: include/class_acl.inc:465
+#: include/class_acl.inc:467
  msgid "All objects in current subtree"
  msgstr ""
  
-#: include/class_acl.inc:525 include/class_acl.inc:532
+#: include/class_acl.inc:557 include/class_acl.inc:564
  #, fuzzy
  msgid "Show/Hide Advanced Settings"
  msgstr "Настройки телефона"
  
-#: include/class_acl.inc:550
+#: include/class_acl.inc:582
  #, fuzzy
  msgid "Create objects"
  msgstr "Объект группы"
  
-#: include/class_acl.inc:551
+#: include/class_acl.inc:583
  #, fuzzy
  msgid "Move objects"
  msgstr "Включаемые объекты"
  
-#: include/class_acl.inc:552
+#: include/class_acl.inc:584
  #, fuzzy
  msgid "Remove objects"
  msgstr "Включаемые объекты"
  
-#: include/class_acl.inc:554 include/class_acl.inc:560
+#: include/class_acl.inc:586 include/class_acl.inc:592
  msgid "Modifyable by owner"
  msgstr ""
  
-#: include/class_acl.inc:557
+#: include/class_acl.inc:589
  #, fuzzy
  msgid "Move object"
  msgstr "Включаемые объекты"
  
-#: include/class_acl.inc:558
+#: include/class_acl.inc:590
  #, fuzzy
  msgid "Remove object"
  msgstr "Включаемые объекты"
  
-#: include/class_acl.inc:686
+#: include/class_acl.inc:602
+#, fuzzy
+msgid "Complete object"
+msgstr "Включаемые объекты"
+
+#: include/class_acl.inc:718
  #, php-format
  msgid "Unkown ACL type '%s'. Don't know how to handle it."
  msgstr ""
  
-#: include/class_acl.inc:726
+#: include/class_acl.inc:758
  #, fuzzy, php-format
  msgid "Unknown entry '%s'!"
  msgstr "состояние неизвестно"
  
-#: include/class_acl.inc:787
+#: include/class_acl.inc:819
  #, fuzzy, php-format
  msgid "Contains settings for these objects: %s"
  msgstr "Описание группы"
  
-#: include/class_acl.inc:795
+#: include/class_acl.inc:827
  #, fuzzy
  msgid "Members:"
  msgstr "Включаемые объекты"
  
-#: include/class_acl.inc:801
+#: include/class_acl.inc:833
  msgid "ACL is valid for all users"
  msgstr ""
  
-#: include/class_acl.inc:909
+#: include/class_acl.inc:941
  #, fuzzy, php-format
  msgid "Saving ACLs with dn '%s' failed."
  msgstr "Атрибуты UNIX"
@@ -17251,32 +17301,32 @@ msgstr "Атрибуты UNIX"
  msgid "This package has no debconf options."
  msgstr "В этой учетной записи нет атрибутов для телефона."
  
-#: include/class_MultiSelectWindow.inc:400
+#: include/class_MultiSelectWindow.inc:458
  msgid ""
  "Error: The requested subtree has an inconsistent DN encoding, check your "
  "LDAP!"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:504
+#: include/class_MultiSelectWindow.inc:567
  msgid "Restore snapshopts of already deleted objects"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:505
+#: include/class_MultiSelectWindow.inc:568
  #, fuzzy
  msgid "Restore"
  msgstr "Повторить"
  
-#: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:106
+#: include/class_MultiSelectWindow.inc:586
+#: include/class_SnapShotDialog.inc:113
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  #, fuzzy
  msgid "Create snapshot"
  msgstr "Создать настройки запись эл. почты"
  
-#: include/class_MultiSelectWindow.inc:529
+#: include/class_MultiSelectWindow.inc:592
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "Объект группы"
@@ -17293,46 +17343,57 @@ msgid ""
  "zone."
  msgstr ""
  
-#: include/class_CopyPasteHandler.inc:153
+#: include/functions_dns.inc:607
+#, php-format
+msgid ""
+"Undefined zone name '%s'. Zone name must look like this 'server/zone.com'."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:147
  #, fuzzy, php-format
-msgid "You are going to copy the entry '%s'."
+msgid "You are going to paste the cutted entry '%s'."
  msgstr "Вы собираетесь удалить объект %s."
  
-#: include/class_CopyPasteHandler.inc:217
+#: include/class_CopyPasteHandler.inc:174
+#, fuzzy, php-format
+msgid "You are going to paste the copied entry '%s'."
+msgstr "Вы собираетесь удалить объект %s."
+
+#: include/class_CopyPasteHandler.inc:238
  #, fuzzy
  msgid "Paste"
  msgstr "Дата"
  
-#: include/class_CopyPasteHandler.inc:219
+#: include/class_CopyPasteHandler.inc:240
  #, fuzzy
  msgid "Can't paste"
  msgstr "Создать телефонный аккаунт"
  
-#: include/functions_FAI.inc:363
+#: include/functions_FAI.inc:361
  #, php-format
  msgid "Error, following objects should be equal '%s' and '%s'"
  msgstr ""
  
-#: include/functions_FAI.inc:470
+#: include/functions_FAI.inc:468
  #, php-format
  msgid "Release management failed, can't save '%s'"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:53
+#: include/class_SnapShotDialog.inc:63
  #, fuzzy, php-format
  msgid "You're about to delete the snapshot '%s'."
  msgstr "Вы собираетесь удалить группу \"%s\"."
  
-#: include/class_SnapShotDialog.inc:108
+#: include/class_SnapShotDialog.inc:115
  #, fuzzy
  msgid "Remove snapshot"
  msgstr "Создать настройки запись эл. почты"
  
-#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
+#: include/class_SnapShotDialog.inc:117 include/class_SnapShotDialog.inc:137
  msgid "Y-m-d, H:i:s"
  msgstr ""
  
-#: include/class_SnapShotDialog.inc:142
+#: include/class_SnapShotDialog.inc:149
  #, fuzzy
  msgid "Please specify a valid description for this snapshot."
  msgstr "Укажите корректный номер телефона."
@@ -17376,7 +17437,7 @@ msgid ""
  "please check existence and rights of this directory!"
  msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
  
-#: html/main.php:170
+#: html/main.php:172
  #, fuzzy
  msgid ""
  "FATAL: Register globals is on. GOsa will refuse to login unless this is "
@@ -17385,25 +17446,19 @@ msgstr ""
  "Используется механизм register_globals. GOsa не допустит пользователей в "
  "систему, пока он не будет отключен администратором."
  
-#: html/main.php:212
+#: html/main.php:214
  msgid "Warning: memory is getting low - please increase the memory_limit!"
  msgstr "Предупреждение: нехватка памяти, увеличьте значение memory_limit!"
  
-#: html/main.php:349
-#, fuzzy, php-format
-msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
-msgstr "Не удается найти определение для модуля \"%s\"!"
-
-#: html/main.php:364
+#: html/main.php:353
  #, fuzzy
  msgid "Your password is about to expire, please change your password"
  msgstr "У вас недостаточно прав для смены своего пароля."
  
-#: html/main.php:388
-msgid ""
-"Generating this page caused the W3C          conformance checker to raise "
-"some errors!"
-msgstr ""
+#: html/main.php:361
+#, fuzzy, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
+msgstr "Не удается найти определение для модуля \"%s\"!"
  
  #: html/getkiosk.php:25
  #, php-format
@@ -17415,11 +17470,11 @@ msgstr ""
  msgid "Can't read file '%s', check permissions."
  msgstr "Удалить"
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Session will not be encrypted."
  msgstr "Данные, передаваемые в течение этого сеанса, не будут зашифрованы."
  
-#: html/index.php:49 html/index.php:339
+#: html/index.php:49 html/index.php:337
  msgid "Enter SSL session"
  msgstr "Использовать шифрование SSL"
  
@@ -17440,31 +17495,39 @@ msgid ""
  "make sure, that this is possible."
  msgstr ""
  
-#: html/index.php:232
+#: html/index.php:231
  msgid ""
  "Your ldap setup contains old schema definitions. Please re-run the setup."
  msgstr ""
  
-#: html/index.php:260
+#: html/index.php:250 ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+"У вас нет учетной записи администратора для GOsa, так что вы не сможете что-"
+"либо администрировать!"
+
+#: html/index.php:258
  msgid "Please specify a valid username!"
  msgstr "Введите корректное имя пользователя!"
  
-#: html/index.php:262
+#: html/index.php:260
  msgid "Please specify your password!"
  msgstr "Введите свой пароль!"
  
-#: html/index.php:269
+#: html/index.php:267
  msgid "Please check the username/password combination."
  msgstr "Проверьте, правильно ли вы ввели имя пользователя и пароль."
  
-#: html/index.php:293
+#: html/index.php:291
  #, fuzzy
  msgid "Account locked. Please contact your system administrator."
  msgstr ""
  "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
  "администратору."
  
-#: html/index.php:345
+#: html/index.php:343
  msgid ""
  "Your browser has cookies disabled. Please enable cookies and reload this "
  "page before logging in!"
@@ -17622,7 +17685,7 @@ msgstr ""
  "Игнорировать ошибку и показать все возвращаемые объекты в пределах лимита и "
  "позволить использовать фильтры"
  
-#: ihtml/themes/default/login.tpl:14
+#: ihtml/themes/default/login.tpl:15
  #, fuzzy
  msgid "Please use your username and password to log in"
  msgstr ""
@@ -18000,14 +18063,24 @@ msgstr ""
  msgid "Copy & paste wizard"
  msgstr ""
  
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: ihtml/themes/default/copyPasteDialog.tpl:7
  msgid ""
  "Some values need to be unique in the complete directory while some "
  "combinations make no sense. GOsa shows the relevant attributes. Please "
  "maintain the values below to fullfill the policies."
  msgstr ""
  
-#: ihtml/themes/default/copyPasteDialog.tpl:20
+#: ihtml/themes/default/copyPasteDialog.tpl:9
+msgid "Remember that some properties like taken snapshots will not be copied!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:10
+msgid ""
+"Or if you copy or cut an entry within GOsa and delete the source object, you "
+"may get errors while pasting this object again!"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:26
  #, fuzzy
  msgid "Operation complete"
  msgstr "не полный"
@@ -18055,35 +18128,118 @@ msgid ""
  "replace the existing object after pressing the restore button."
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:23
+#: ihtml/themes/default/snapshotdialog.tpl:9
+msgid ""
+"Remember that DNS configuration and database entries could not be restored. "
+"For some objects it is only nescessary to open and save them again (goFon), "
+"but some entries must be recreated manually (glpi)."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:12
+msgid ""
+"Don't forget to check references to other objects, for example does the "
+"selected printer still exists ?"
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:29
  msgid "There is no snapshot available that could be restored"
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:25
+#: ihtml/themes/default/snapshotdialog.tpl:31
  msgid "Choose a snapshot and click the folder image, to restore the snapshot"
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:43
+#: ihtml/themes/default/snapshotdialog.tpl:49
  #, fuzzy
  msgid "Creating object snapshots"
  msgstr "Объект группы"
  
-#: ihtml/themes/default/snapshotdialog.tpl:46
+#: ihtml/themes/default/snapshotdialog.tpl:52
  msgid ""
  "This procedure will create a snapshot of the selected object. It will be "
  "stored inside a special branch of your directory system and can be restored "
  "later on."
  msgstr ""
  
-#: ihtml/themes/default/snapshotdialog.tpl:61
+#: ihtml/themes/default/snapshotdialog.tpl:55
+msgid ""
+"Remember that database entries, DNS configurations and possibly created "
+"zones in server extensions will not be stored in the snapshot."
+msgstr ""
+
+#: ihtml/themes/default/snapshotdialog.tpl:70
  #, fuzzy
  msgid "Timestamp"
  msgstr "Таймаут (с)"
  
-#: ihtml/themes/default/snapshotdialog.tpl:70
+#: ihtml/themes/default/snapshotdialog.tpl:79
  msgid "Reason for generating this snapshot"
  msgstr ""
  
+#~ msgid "You have no permissions to create a user on this 'Base'."
+#~ msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#, fuzzy
+#~ msgid "You have no permissions to move this user to the specified 'Base'."
+#~ msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#~ msgid "You have no permissions to create a blocklist on this 'Base'."
+#~ msgstr "У вас недостаточно прав для создания стоп-листа в этой ветке."
+
+#~ msgid "You have no permissions to create a group on this 'Base'."
+#~ msgstr "У вас недостаточно прав для создания группы в этой ветке."
+
+#~ msgid "You have no permissions to create a application on this 'Base'."
+#~ msgstr "У вас недостаточно прав для создания приложения в этой ветке."
+
+#~ msgid "You have no permissions to create a department on this 'Base'."
+#~ msgstr "У вас недостаточно прав для создания подразделения в этой ветке."
+
+#, fuzzy
+#~ msgid "Go to users home department"
+#~ msgstr "Подразделение"
+
+#~ msgid "You have no permissions to create a terminal on this 'Base'."
+#~ msgstr "У вас недостаточно прав для создания терминала в этой ветке."
+
+#, fuzzy
+#~ msgid "You have no permissions to create a server on this 'Base'."
+#~ msgstr "У вас недостаточно прав для создания пользователя в этой ветке."
+
+#~ msgid "You are not allowed to set this systems password!"
+#~ msgstr "У вас недостаточно прав для смены пароля этой системы!"
+
+#~ msgid "You have no permissions to create a phone on this 'Base'."
+#~ msgstr "У вас недостаточно прав для создания телефонов в этой ветке."
+
+#, fuzzy
+#~ msgid "Select to display users"
+#~ msgstr "Выберите, чтобы просмотреть пользователей"
+
+#, fuzzy
+#~ msgid "Display user"
+#~ msgstr "Отображаемое имя"
+
+#, fuzzy
+#~ msgid "Select to display departments"
+#~ msgstr "Выберите подразделение"
+
+#, fuzzy
+#~ msgid "Display departments"
+#~ msgstr "Подразделения в подразделении"
+
+#, fuzzy
+#~ msgid "Viewable"
+#~ msgstr "Переменная"
+
+#, fuzzy
+#~ msgid "You have no permissions to create a mime type on this 'Base'."
+#~ msgstr "У вас недостаточно прав для создания принтера в этой ветке."
+
+#, fuzzy
+#~ msgid "You are not allowed to delete this snapshot!"
+#~ msgstr "У вас недостаточно прав для удаления этого объекта!"
+
  #, fuzzy
  #~ msgid "This zoneName is already in use"
  #~ msgstr "Указанное имя уже используется."
@@ -19042,10 +19198,6 @@ msgstr ""
  #~ msgid "No mysql extension loaded, can't connect to mysql server."
  #~ msgstr "Выберите способ подключения к серверу терминалов"
  
-#, fuzzy
-#~ msgid "Can change password"
-#~ msgstr "Сменить пароль"
-
  #, fuzzy
  #~ msgid "Home drive"
  #~ msgstr "Сервер"
@@ -19345,10 +19497,6 @@ msgstr ""
  #~ msgid "Edit object"
  #~ msgstr "Соответствующий объект"
  
-#, fuzzy
-#~ msgid "Delete object"
-#~ msgstr "Включаемые объекты"
-
  #, fuzzy
  #~ msgid "Abort"
  #~ msgstr "Порт"
diff --git a/plugins/admin/systems/class_terminalService.inc b/plugins/admin/systems/class_terminalService.inc

index 5a24d156a0a42366af1fc8367e8aab8e0ba5e6c1..ac449433ab44c1dda0079afdd82586cfed8e1011 100644 (file)
--- a/plugins/admin/systems/class_terminalService.inc
+++ b/plugins/admin/systems/class_terminalService.inc
@@ -486,7 +486,7 @@ class termservice extends plugin
              "gotoLpdServer"           => _("Spool server"),
              "gotoScannerEnable"       => _("Scanner enabled"),
              "gotoScannerModel"        => _("Scanner model"),
-            "gotoScannerClients"      => _("Heäh ? "),
+            "gotoScannerClients"      => _("Haeh ? "),
              "gotoScannerBackend"      => _("..."),
              "gotoXKbModel"            => _("Keyboard model"),
              "gotoXKbLayout"           => _("Keyboard layout"),
author	janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
	Mon, 18 Dec 2006 07:40:54 +0000 (07:40 +0000)
committer	janw <janw@594d385d-05f5-0310-b6e9-bd551577e9d8>
	Mon, 18 Dec 2006 07:40:54 +0000 (07:40 +0000)
ihtml/themes/default/copyPasteDialog.tpl		patch \| blob \| history
locale/de/LC_MESSAGES/messages.mo		patch \| blob \| history
locale/de/LC_MESSAGES/messages.po		patch \| blob \| history
locale/es/LC_MESSAGES/messages.po		patch \| blob \| history
locale/fr/LC_MESSAGES/messages.po		patch \| blob \| history
locale/it/LC_MESSAGES/messages.po		patch \| blob \| history
locale/messages.po		patch \| blob \| history
locale/nl/LC_MESSAGES/messages.po		patch \| blob \| history
locale/pl/LC_MESSAGES/messages.po		patch \| blob \| history
locale/ru/LC_MESSAGES/messages.po		patch \| blob \| history
plugins/admin/systems/class_terminalService.inc		patch \| blob \| history