Fixed Translation String.

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

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 351ed0c126a5c57405443acaaa79001da981b814..c65bbfc93c23d3a0c9be4c899eb66c000f48f665 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1,6 +1,6 @@
 # translation of messages.po to Español
 # Alejandro Escanero Blanco <aescanero@chaosdimension.org>, 2003, 2006.
-#: plugins/personal/generic/class_user.inc:1305
+#: plugins/personal/generic/class_user.inc:1287
 #: plugins/admin/systems/class_terminalService.inc:452
 #: plugins/admin/systems/class_terminalService.inc:453
 #: include/class_plugin.inc:115 include/class_plugin.inc:116
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-10-05 11:00+0200\n"
+"POT-Creation-Date: 2006-11-09 12:07+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 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1317
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1299
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -25,25 +25,25 @@ msgstr "Mi cuenta"
 msgid "Administration"
 msgstr "Administradores"
 
-#: contrib/gosa.conf:61
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
+#: contrib/gosa.conf:61 plugins/addons/addressbook/class_addressbook.inc:786
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
 msgid "Addons"
 msgstr "Agregados"
 
 #: contrib/gosa.conf:80 contrib/gosa.conf:93 contrib/gosa.conf:97
-#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:114
-#: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
-#: contrib/gosa.conf:144 contrib/gosa.conf:148 contrib/gosa.conf:170
-#: contrib/gosa.conf:174 contrib/gosa.conf:178 contrib/gosa.conf:182
+#: contrib/gosa.conf:104 contrib/gosa.conf:109 contrib/gosa.conf:113
+#: contrib/gosa.conf:118 contrib/gosa.conf:126 contrib/gosa.conf:134
+#: contrib/gosa.conf:143 contrib/gosa.conf:147 contrib/gosa.conf:169
+#: contrib/gosa.conf:173 contrib/gosa.conf:177 contrib/gosa.conf:181
 #: 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:1312
+#: plugins/personal/generic/class_user.inc:1294
 #: 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:880
+#: plugins/admin/groups/class_groupGeneric.inc:882
 #: plugins/admin/applications/class_applicationGeneric.inc:514
 #: plugins/admin/departments/class_departmentGeneric.inc:531
 #: plugins/admin/systems/glpiPrinter.tpl:6
@@ -59,11 +59,11 @@ msgstr "Agregados"
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
 #: plugins/admin/ogroups/termgroup.tpl:6
-#: plugins/admin/ogroups/class_ogroup.inc:690
+#: plugins/admin/ogroups/class_ogroup.inc:705
 #: 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
-#: plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/fai/faiProfile.tpl:36
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHook.tpl:4
@@ -72,7 +72,7 @@ msgstr "Agregados"
 #: plugins/admin/mimetypes/generic.tpl:4
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:4
-#: plugins/gofon/macro/class_gofonMacro.inc:465
+#: plugins/gofon/macro/class_gofonMacro.inc:474
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Genérico"
@@ -83,18 +83,18 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/personal/environment/class_environment.inc:1240
+#: plugins/personal/environment/class_environment.inc:1269
 #: plugins/admin/groups/class_divListGroup.inc:180
-#: plugins/admin/users/class_divListUsers.inc:185
+#: plugins/admin/users/class_divListUsers.inc:189
 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:998
-#: plugins/admin/groups/class_groupMail.inc:1028
+#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/admin/groups/class_groupMail.inc:1054
 #: plugins/admin/groups/class_divListGroup.inc:172
-#: plugins/admin/users/class_divListUsers.inc:187
+#: plugins/admin/users/class_divListUsers.inc:191
 #: plugins/admin/ogroups/tabs_ogroups.inc:76
 #: plugins/admin/ogroups/tabs_ogroups.inc:184
 #: plugins/admin/ogroups/class_mailogroup.inc:163
@@ -106,7 +106,7 @@ msgstr "Correo Electrónico"
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/personal/samba/class_sambaAccount.inc:1033
 #: plugins/admin/groups/class_divListGroup.inc:174
-#: plugins/admin/users/class_divListUsers.inc:193
+#: plugins/admin/users/class_divListUsers.inc:197
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
@@ -114,7 +114,7 @@ msgstr "Samba"
 
 #: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
 #: plugins/personal/netatalk/class_netatalk.inc:342
-#: plugins/admin/users/class_divListUsers.inc:195
+#: plugins/admin/users/class_divListUsers.inc:199
 msgid "Netatalk"
 msgstr ""
 
@@ -125,31 +125,31 @@ msgstr "Conectividad"
 
 #: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
 #: plugins/personal/generic/generic.tpl:502
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:581
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:588
 #: plugins/gofax/faxaccount/generic.tpl:10
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:805
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:811
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_divListUsers.inc:191
+#: plugins/admin/users/class_divListUsers.inc:195
 #: plugins/admin/departments/generic.tpl:91
 #: plugins/admin/departments/class_departmentGeneric.inc:550
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:222
+#: html/getxls.php:297
 msgid "Fax"
 msgstr "Fax"
 
 #: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_edit.tpl:85
-#: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
+#: plugins/addons/addressbook/address_edit.tpl:94
+#: 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:189
+#: plugins/admin/users/class_divListUsers.inc:193
 #: plugins/admin/departments/generic.tpl:83
-#: plugins/admin/systems/class_systemManagement.inc:804
+#: plugins/admin/systems/class_systemManagement.inc:818
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:383
 #: plugins/admin/ogroups/class_phonequeue.inc:718
@@ -164,54 +164,50 @@ msgstr "Teléfono"
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1102
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1163
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:112
 #: plugins/admin/mimetypes/generic.tpl:165
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: contrib/gosa.conf:101 include/class_tabs.inc:307
-msgid "ACL"
-msgstr "ACL"
-
-#: contrib/gosa.conf:106 plugins/admin/applications/generic.tpl:89
+#: contrib/gosa.conf:105 plugins/admin/applications/generic.tpl:89
 #: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:240
 #: plugins/admin/ogroups/phonequeue.tpl:43
-#: plugins/gofon/conference/generic.tpl:92
+#: plugins/gofon/conference/generic.tpl:121
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:115
+#: contrib/gosa.conf:114
 #: plugins/admin/applications/class_applicationParameters.inc:230
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:664
 msgid "Parameter"
 msgstr "Parámetro"
 
-#: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: 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:1100
+#: plugins/admin/systems/class_workstationStartup.inc:1109
 #: plugins/admin/ogroups/tabs_ogroups.inc:99
 msgid "Startup"
 msgstr "Inicio"
 
-#: contrib/gosa.conf:121 contrib/gosa.conf:137
+#: contrib/gosa.conf:120 contrib/gosa.conf:136
 #: plugins/admin/ogroups/tabs_ogroups.inc:103
 msgid "Devices"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:122 contrib/gosa.conf:138
-#: plugins/personal/environment/environment.tpl:228
-#: plugins/admin/systems/class_systemManagement.inc:813
+#: 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:386
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Impresora"
 
-#: contrib/gosa.conf:123 contrib/gosa.conf:131 contrib/gosa.conf:139
-#: plugins/gofax/blocklists/generic.tpl:75
+#: contrib/gosa.conf:122 contrib/gosa.conf:130 contrib/gosa.conf:138
+#: plugins/gofax/blocklists/generic.tpl:90
 #: plugins/addons/addressbook/contents.tpl:33
 #: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/systems/glpiPrinter.tpl:127
@@ -229,7 +225,7 @@ msgstr "Impresora"
 msgid "Information"
 msgstr "Información"
 
-#: contrib/gosa.conf:129 plugins/admin/systems/servkolab.tpl:39
+#: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:39
 #: plugins/admin/systems/class_servDNS.inc:383
 #: plugins/admin/systems/class_goFaxServer.inc:85
 #: plugins/admin/systems/class_servKolab.inc:375
@@ -245,22 +241,22 @@ msgstr "Información"
 #: plugins/admin/systems/class_goKrbServer.inc:88
 #: plugins/admin/systems/class_goMailServer.inc:686
 #: plugins/admin/systems/class_goImapServer.inc:155
+#: plugins/admin/systems/class_goShareServer.inc:344
 #: plugins/admin/systems/class_goVirusServer.inc:212
 #: plugins/admin/systems/class_goSpamServer.inc:320
-#: plugins/admin/systems/class_goShareServer.inc:344
 msgid "Services"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:140
+#: contrib/gosa.conf:129 contrib/gosa.conf:139
 #: plugins/admin/fai/class_faiSummaryTab.inc:546
 msgid "FAI summary"
 msgstr ""
 
-#: contrib/gosa.conf:193
+#: contrib/gosa.conf:192
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:204 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:203 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -269,11 +265,11 @@ msgstr ""
 msgid "Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:205
+#: contrib/gosa.conf:204
 msgid "Excel Export"
 msgstr "Exportar en XLS"
 
-#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:145
+#: contrib/gosa.conf:205 plugins/personal/mail/generic.tpl:141
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -283,50 +279,50 @@ msgstr "Exportar en XLS"
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:207
+#: contrib/gosa.conf:206
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:211
+#: contrib/gosa.conf:210
 msgid "Partitions"
 msgstr "Paticiones"
 
-#: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:214 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:127
-#: plugins/admin/fai/class_faiScript.inc:507
+#: plugins/admin/fai/class_faiScript.inc:518
 #: plugins/admin/fai/faiScriptEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:56
 msgid "Script"
 msgstr "Script"
 
-#: contrib/gosa.conf:219 plugins/admin/fai/class_faiSummaryTab.inc:42
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:223 plugins/admin/fai/class_faiSummaryTab.inc:43
+#: contrib/gosa.conf:222 plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Variables"
 msgstr "Variables"
 
-#: contrib/gosa.conf:227 plugins/admin/fai/class_faiSummaryTab.inc:44
+#: contrib/gosa.conf:226 plugins/admin/fai/class_faiSummaryTab.inc:44
 msgid "Templates"
 msgstr "Plantillas"
 
-#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:11
+#: contrib/gosa.conf:230 plugins/personal/environment/environment.tpl:11
 #: plugins/admin/fai/class_faiSummaryTab.inc:47
 msgid "Profiles"
 msgstr "Perfiles"
 
-#: contrib/gosa.conf:232 plugins/admin/ogroups/tabs_ogroups.inc:108
+#: contrib/gosa.conf:231 plugins/admin/ogroups/tabs_ogroups.inc:108
 #: plugins/admin/acl/class_divListACL.inc:49
 #: plugins/admin/fai/class_faiSummaryTab.inc:545
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:557
+#: contrib/gosa.conf:235 plugins/admin/fai/class_faiPackage.inc:538
 msgid "Packages"
 msgstr "Paquetes"
 
-#: contrib/gosa.conf:258
+#: contrib/gosa.conf:257
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
@@ -373,7 +369,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:58
+#: plugins/addons/addressbook/contents.tpl:62
 #: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/groups/group_objects.tpl:20
@@ -400,11 +396,11 @@ msgstr "Filtros"
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/addons/addressbook/contents.tpl:84
 #: plugins/admin/groups/mail_locals.tpl:33
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Choose the department the search will be based on"
 msgstr "Escoja el departamento base de la búsqueda"
 
@@ -426,7 +422,7 @@ msgid "User name of which addresses are shown"
 msgstr "Nombre de usuario de las direcciones mostradas"
 
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:164
+#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:160
 #: plugins/personal/mail/copypaste.tpl:43
 #: plugins/personal/mail/copypaste.tpl:61
 #: plugins/personal/posix/generic.tpl:88
@@ -438,20 +434,20 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/connectivity/kolab.tpl:53
 #: plugins/personal/connectivity/class_kolabAccount.inc:255
-#: plugins/personal/environment/environment.tpl:150
-#: plugins/personal/environment/environment.tpl:174
-#: plugins/personal/environment/environment.tpl:241
+#: plugins/personal/environment/environment.tpl:157
+#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/environment.tpl:248
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/gofax/blocklists/generic.tpl:68
+#: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/generic.tpl:105
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/groups/mail.tpl:71
 #: 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:573
+#: plugins/admin/groups/class_groupMail.inc:588
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
@@ -474,8 +470,8 @@ 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:473
-#: plugins/admin/systems/class_termDNS.inc:493
+#: plugins/admin/systems/class_termDNS.inc:472
+#: plugins/admin/systems/class_termDNS.inc:492
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
@@ -489,14 +485,16 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/admin/systems/goSpamServer.tpl:45
 #: plugins/admin/systems/goSpamServer.tpl:113
 #: plugins/admin/ogroups/termgroup.tpl:28 plugins/admin/ogroups/generic.tpl:51
-#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/ogroup_objects.tpl:54
 #: plugins/admin/ogroups/phonequeue.tpl:33
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:48
-#: plugins/admin/fai/faiScript.tpl:50 plugins/admin/fai/faiTemplate.tpl:35
-#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/fai/faiHook.tpl:50
-#: plugins/admin/mimetypes/generic.tpl:108
+#: plugins/admin/fai/faiVariable.tpl:49 plugins/admin/fai/faiVariable.tpl:51
+#: plugins/admin/fai/faiPackage.tpl:77
+#: plugins/admin/fai/faiPartitionTable.tpl:48
+#: plugins/admin/fai/faiPartitionTable.tpl:50
+#: plugins/admin/fai/faiProfile.tpl:43 plugins/admin/fai/faiScript.tpl:48
+#: plugins/admin/fai/faiScript.tpl:50 plugins/admin/fai/faiTemplate.tpl:40
+#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:48
+#: plugins/admin/fai/faiHook.tpl:50 plugins/admin/mimetypes/generic.tpl:108
 #: plugins/admin/mimetypes/generic.tpl:120
 #: plugins/admin/mimetypes/generic.tpl:174
 #: plugins/gofon/phoneaccount/generic.tpl:19
@@ -504,43 +502,43 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 msgid "Add"
 msgstr "Añadir"
 
-#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:97
+#: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:105
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:102 plugins/personal/samba/main.inc:97
+#: plugins/personal/posix/main.inc:107 plugins/personal/samba/main.inc:105
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
-#: plugins/personal/generic/main.inc:151
+#: plugins/personal/generic/main.inc:158
 #: plugins/personal/generic/generic_certs.tpl:94
 #: plugins/personal/connectivity/main.inc:103
-#: plugins/personal/environment/main.inc:97
+#: plugins/personal/environment/main.inc:103
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:54
-#: plugins/personal/nagios/main.inc:97 plugins/personal/netatalk/main.inc:97
-#: plugins/gofax/blocklists/generic.tpl:91
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:97
+#: plugins/gofax/blocklists/generic.tpl:106
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
-#: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:83
+#: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:95
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
-#: plugins/addons/addressbook/address_edit.tpl:234
+#: plugins/addons/addressbook/address_edit.tpl:265
 #: plugins/addons/godfs/class_dfsManagment.inc:249
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:332
+#: plugins/admin/groups/class_groupManagement.inc:335
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/users/remove.tpl:16 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:652
 #: plugins/admin/users/template.tpl:50
 #: 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:492
+#: plugins/admin/systems/class_systemManagement.inc:506
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:248 plugins/admin/systems/remove.tpl:16
 #: plugins/admin/systems/password.tpl:30
@@ -582,18 +580,18 @@ msgstr "Añadir"
 #: plugins/admin/systems/goSpamServerRule.tpl:24
 #: plugins/admin/systems/goVirusServer.tpl:171
 #: plugins/admin/systems/class_goService.inc:34
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/ogroup_objects.tpl:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:334
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:617
-#: plugins/admin/fai/class_faiManagement.inc:622
-#: plugins/admin/fai/class_faiManagement.inc:628
+#: plugins/admin/fai/class_faiManagement.inc:619
+#: plugins/admin/fai/class_faiManagement.inc:624
+#: plugins/admin/fai/class_faiManagement.inc:630
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:83
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiVariableEntry.tpl:49
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:40
+#: plugins/admin/fai/faiVariableEntry.tpl:55
 #: plugins/admin/fai/faiHookEntry.tpl:85
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
+#: plugins/admin/fai/faiTemplateEntry.tpl:171
 #: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiPackageNew.tpl:51
@@ -601,15 +599,15 @@ msgstr "Añadir"
 #: plugins/admin/fai/remove_branch.tpl:16
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:343
 #: plugins/admin/mimetypes/remove.tpl:15
-#: plugins/gofon/phoneaccount/main.inc:98
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:269
+#: plugins/gofon/phoneaccount/main.inc:107
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:264
 #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:247
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:254
 #: 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:15
-#: ihtml/themes/default/snapshotdialog.tpl:39
-#: ihtml/themes/default/snapshotdialog.tpl:82
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:14
+#: ihtml/themes/default/snapshotdialog.tpl:38
+#: ihtml/themes/default/snapshotdialog.tpl:80
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -622,7 +620,7 @@ 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:805
+#: plugins/admin/systems/class_systemManagement.inc:819
 #: plugins/admin/systems/servnfs.tpl:39
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:382
@@ -645,9 +643,9 @@ msgid "not defined"
 msgstr "sin definirse"
 
 #: plugins/personal/mail/generic.tpl:40
-#: plugins/personal/mail/class_mailAccount.inc:1010
+#: plugins/personal/mail/class_mailAccount.inc:1009
 #: plugins/admin/groups/mail.tpl:43
-#: plugins/admin/groups/class_groupMail.inc:1039
+#: plugins/admin/groups/class_groupMail.inc:1065
 msgid "Quota size"
 msgstr "Tamaño de la Cola de correo"
 
@@ -663,7 +661,7 @@ msgstr "Direcciones alternativas"
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
 
-#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:170
+#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:166
 #: plugins/personal/mail/copypaste.tpl:45
 #: plugins/personal/mail/copypaste.tpl:62
 #: plugins/personal/posix/generic.tpl:91
@@ -671,11 +669,11 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/personal/posix/paste_generic.tpl:62
 #: plugins/personal/samba/samba3.tpl:410
 #: plugins/personal/connectivity/kolab.tpl:56
-#: plugins/personal/environment/environment.tpl:180
-#: plugins/personal/environment/environment.tpl:218
-#: plugins/personal/environment/environment.tpl:244
-#: plugins/personal/environment/class_environment.inc:658
-#: plugins/gofax/blocklists/generic.tpl:69
+#: plugins/personal/environment/environment.tpl:187
+#: plugins/personal/environment/environment.tpl:225
+#: plugins/personal/environment/environment.tpl:251
+#: plugins/personal/environment/class_environment.inc:685
+#: plugins/gofax/blocklists/generic.tpl:83
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:111
 #: plugins/gofax/faxaccount/lists.tpl:14
@@ -701,15 +699,16 @@ msgstr "Lista de direcciones de correo alternativas."
 #: 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:487
+#: plugins/admin/systems/class_termDNS.inc:486
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:292
 #: plugins/admin/systems/class_servDNSeditZone.inc:480
 #: plugins/admin/systems/goShareServer.tpl:20
 #: plugins/admin/ogroups/termgroup.tpl:33 plugins/admin/ogroups/generic.tpl:54
 #: plugins/admin/ogroups/phonequeue.tpl:36 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/acl/remove.tpl:14 plugins/admin/fai/faiVariable.tpl:46
-#: plugins/admin/fai/remove.tpl:15 plugins/admin/fai/faiPartitionTable.tpl:45
+#: plugins/admin/acl/remove.tpl:14 plugins/admin/fai/faiVariable.tpl:55
+#: plugins/admin/fai/faiVariable.tpl:57 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiPartitionTable.tpl:54
 #: plugins/admin/fai/remove_branch.tpl:14
 #: plugins/admin/mimetypes/remove.tpl:13
 #: plugins/gofon/phoneaccount/generic.tpl:22
@@ -723,137 +722,137 @@ msgstr "Borrar"
 msgid "Mail options"
 msgstr "Opciones de correo"
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:85
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr "Seleccione si quiere reenviar nagios sin quedarse copias de ellos"
 
-#: plugins/personal/mail/generic.tpl:86
+#: plugins/personal/mail/generic.tpl:85
 msgid "No delivery to own mailbox"
 msgstr "No se enviara a su propia carpeta de correo"
 
-#: plugins/personal/mail/generic.tpl:91
+#: plugins/personal/mail/generic.tpl:89
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 "Seleccione para responder automáticamente con el mensaje de ausencia "
 "definido aqui"
 
-#: plugins/personal/mail/generic.tpl:91
+#: plugins/personal/mail/generic.tpl:89
 msgid "Activate vacation message"
 msgstr "Activar mensaje de ausencia"
 
-#: plugins/personal/mail/generic.tpl:99
+#: plugins/personal/mail/generic.tpl:97
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 "Seleccione aquí si quiere que su correo se filtre a través de spamassassin"
 
-#: plugins/personal/mail/generic.tpl:101
+#: plugins/personal/mail/generic.tpl:99
 msgid "Move mails tagged with spam level greater than"
 msgstr "Mover los correos etiquetados con nivel de spam mayor que"
 
-#: plugins/personal/mail/generic.tpl:104
+#: plugins/personal/mail/generic.tpl:102
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr "Elija el nivele de spam - los mas bajos son mas sensibles"
 
-#: plugins/personal/mail/generic.tpl:108
+#: plugins/personal/mail/generic.tpl:106
 msgid "to folder"
 msgstr "a la carpeta"
 
-#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/generic.tpl:117
 msgid "Reject mails bigger than"
 msgstr "rechazar correos mayores que"
 
-#: plugins/personal/mail/generic.tpl:122
+#: plugins/personal/mail/generic.tpl:119
 #: plugins/personal/connectivity/pureftpd.tpl:60
 #: plugins/personal/connectivity/class_proxyAccount.inc:91
-#: plugins/personal/environment/environment.tpl:55
+#: plugins/personal/environment/environment.tpl:62
 #: plugins/admin/groups/mail.tpl:48
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "Mb"
 
-#: plugins/personal/mail/generic.tpl:129
-#: plugins/personal/mail/class_mailAccount.inc:1013
+#: plugins/personal/mail/generic.tpl:126
+#: plugins/personal/mail/class_mailAccount.inc:1012
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
-#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/generic.tpl:147
 #: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr "reenviar mensajes a"
 
-#: plugins/personal/mail/generic.tpl:167
+#: plugins/personal/mail/generic.tpl:163
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:108 plugins/admin/groups/mail.tpl:138
 #: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr "Añadir Cuenta Local"
 
-#: plugins/personal/mail/generic.tpl:178
+#: plugins/personal/mail/generic.tpl:174
 msgid "Advanced mail options"
 msgstr "Opciones de correo avanzadas"
 
-#: plugins/personal/mail/generic.tpl:184
+#: plugins/personal/mail/generic.tpl:180
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Seleccione si el usuario solo puede enviar y recibir dentro de su propio "
 "dominio"
 
-#: plugins/personal/mail/generic.tpl:186
+#: plugins/personal/mail/generic.tpl:182
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 "El usuario solo esta permitido a enviar y recibir correo de forma local"
 
-#: plugins/personal/mail/generic.tpl:195
-#: plugins/personal/mail/class_mailAccount.inc:1028
+#: plugins/personal/mail/generic.tpl:190
+#: plugins/personal/mail/class_mailAccount.inc:1027
 msgid "Use custom sieve script"
 msgstr "Usar 'script sive' propios"
 
-#: plugins/personal/mail/generic.tpl:195
+#: plugins/personal/mail/generic.tpl:190
 msgid "disables all Mail options!"
 msgstr "¡Desactivar todas las opciones de correo!"
 
-#: plugins/personal/mail/main.inc:95 plugins/personal/posix/main.inc:100
-#: plugins/personal/samba/main.inc:95 plugins/personal/generic/main.inc:149
+#: plugins/personal/mail/main.inc:103 plugins/personal/posix/main.inc:105
+#: plugins/personal/samba/main.inc:103 plugins/personal/generic/main.inc:156
 #: plugins/personal/connectivity/main.inc:101
-#: plugins/personal/environment/main.inc:95
-#: plugins/personal/nagios/main.inc:95 plugins/personal/netatalk/main.inc:95
-#: plugins/gofax/blocklists/generic.tpl:85
-#: plugins/gofax/faxaccount/main.inc:81
-#: plugins/admin/groups/class_groupManagement.inc:326
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/personal/environment/main.inc:101
+#: plugins/personal/nagios/main.inc:104 plugins/personal/netatalk/main.inc:95
+#: plugins/gofax/blocklists/generic.tpl:100
+#: plugins/gofax/faxaccount/main.inc:93
+#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/users/class_userManagement.inc:646
 #: plugins/admin/applications/class_applicationManagement.inc:346
-#: plugins/admin/systems/class_systemManagement.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:500
 #: plugins/admin/ogroups/class_ogroupManagement.inc:328
-#: plugins/admin/fai/class_faiManagement.inc:611
+#: plugins/admin/fai/class_faiManagement.inc:613
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:337
-#: plugins/gofon/phoneaccount/main.inc:96
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:258
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:248
 msgid "Ok"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:105 plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/main.inc:107 plugins/personal/generic/main.inc:172
+#: plugins/personal/mail/main.inc:113 plugins/personal/posix/main.inc:117
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:111
-#: plugins/personal/environment/main.inc:105
-#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:102
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/personal/environment/main.inc:111
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:102
+#: plugins/gofax/faxaccount/main.inc:101
+#: plugins/gofon/phoneaccount/main.inc:113
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Pulse en el botón - Editar - para cambiar la información de esta ventana"
 
-#: plugins/personal/mail/main.inc:106 plugins/personal/posix/main.inc:114
-#: plugins/personal/samba/main.inc:108 plugins/personal/generic/main.inc:162
+#: plugins/personal/mail/main.inc:116 plugins/personal/posix/main.inc:119
+#: plugins/personal/samba/main.inc:116 plugins/personal/generic/main.inc:169
 #: plugins/personal/connectivity/main.inc:112
-#: plugins/personal/environment/environment.tpl:177
-#: plugins/personal/environment/main.inc:106
-#: plugins/personal/nagios/main.inc:107 plugins/personal/netatalk/main.inc:103
+#: plugins/personal/environment/environment.tpl:184
+#: plugins/personal/environment/main.inc:112
+#: plugins/personal/nagios/main.inc:116 plugins/personal/netatalk/main.inc:103
 #: plugins/gofax/faxaccount/generic.tpl:121
 #: plugins/gofax/faxaccount/generic.tpl:129
-#: plugins/gofax/faxaccount/main.inc:90 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/systems/printer.tpl:68
+#: plugins/gofax/faxaccount/main.inc:102
+#: plugins/addons/logview/contents.tpl:62 plugins/admin/systems/printer.tpl:68
 #: plugins/admin/systems/glpiPrinter.tpl:88
 #: plugins/admin/systems/glpiPrinter.tpl:99
 #: plugins/admin/systems/servdns.tpl:7 plugins/admin/systems/glpi.tpl:61
@@ -863,18 +862,18 @@ msgstr ""
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/systems/goShareServer.tpl:17
-#: plugins/admin/fai/faiVariable.tpl:45
-#: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/gofon/phoneaccount/main.inc:105
+#: plugins/admin/fai/faiVariable.tpl:53
+#: plugins/admin/fai/faiPartitionTable.tpl:53
+#: plugins/gofon/phoneaccount/main.inc:114
 msgid "Edit"
 msgstr "Editar"
 
-#: plugins/personal/mail/main.inc:114
+#: plugins/personal/mail/main.inc:125
 msgid "User mail settings"
 msgstr "Parametros del correo de usuarios"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/class_mailAccount.inc:998
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr "Parámetros de correo"
@@ -924,7 +923,7 @@ msgid "This does something"
 msgstr "Esto hace algo"
 
 #: plugins/personal/mail/class_mailAccount.inc:90
-#: plugins/admin/groups/class_groupMail.inc:75
+#: plugins/admin/groups/class_groupMail.inc:76
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
@@ -939,7 +938,7 @@ msgstr "Esta cuenta no tiene extensiones validas de correo."
 
 #: plugins/personal/mail/class_mailAccount.inc:262
 #: plugins/personal/mail/class_mailAccount.inc:265
-#: plugins/admin/groups/class_groupMail.inc:332
+#: plugins/admin/groups/class_groupMail.inc:335
 #: plugins/admin/ogroups/class_mailogroup.inc:44
 msgid "Remove mail account"
 msgstr "Borrar cuenta de correo"
@@ -951,7 +950,7 @@ msgid ""
 msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:333
+#: plugins/admin/groups/class_groupMail.inc:336
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -960,13 +959,13 @@ msgstr ""
 "apretando a continuación."
 
 #: plugins/personal/mail/class_mailAccount.inc:269
-#: plugins/admin/groups/class_groupMail.inc:335
+#: plugins/admin/groups/class_groupMail.inc:338
 #: plugins/admin/ogroups/class_mailogroup.inc:47
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
 #: plugins/personal/mail/class_mailAccount.inc:269
-#: plugins/admin/groups/class_groupMail.inc:336
+#: plugins/admin/groups/class_groupMail.inc:339
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -982,7 +981,7 @@ msgstr ""
 "reenvíos."
 
 #: plugins/personal/mail/class_mailAccount.inc:327
-#: plugins/admin/groups/class_groupMail.inc:400
+#: plugins/admin/groups/class_groupMail.inc:415
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
@@ -990,7 +989,7 @@ msgstr ""
 
 #: plugins/personal/mail/class_mailAccount.inc:357
 #: plugins/personal/mail/class_mailAccount.inc:362
-#: plugins/admin/groups/class_groupMail.inc:426
+#: plugins/admin/groups/class_groupMail.inc:441
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
@@ -999,161 +998,156 @@ msgstr ""
 "direcciones alternativas"
 
 #: plugins/personal/mail/class_mailAccount.inc:372
-#: plugins/admin/groups/class_groupMail.inc:431
+#: plugins/admin/groups/class_groupMail.inc:446
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "La dirección de correo que esta intentando añadir, ya esta usada por otro "
 "usuario"
 
-#: plugins/personal/mail/class_mailAccount.inc:597
+#: plugins/personal/mail/class_mailAccount.inc:596
 #, fuzzy, php-format
 msgid "Removing of user/mail account with dn '%s' failed."
 msgstr "No se ha podido borrar la cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:725
+#: plugins/personal/mail/class_mailAccount.inc:724
 #, fuzzy, php-format
 msgid "Saving of user/mail account with dn '%s' failed."
 msgstr "No se ha podido guardar la cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:777
+#: plugins/personal/mail/class_mailAccount.inc:776
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:782
-#: plugins/admin/groups/class_groupMail.inc:851
+#: plugins/personal/mail/class_mailAccount.inc:781
+#: plugins/admin/groups/class_groupMail.inc:877
 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:786
-#: plugins/personal/mail/class_mailAccount.inc:790
-#: plugins/addons/addressbook/class_addressbook.inc:596
+#: plugins/personal/mail/class_mailAccount.inc:785
+#: plugins/personal/mail/class_mailAccount.inc:789
+#: plugins/addons/addressbook/class_addressbook.inc:694
 #: plugins/admin/ogroups/class_mailogroup.inc:79
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/personal/mail/class_mailAccount.inc:796
-#: plugins/admin/groups/class_groupMail.inc:860
+#: plugins/personal/mail/class_mailAccount.inc:795
+#: plugins/admin/groups/class_groupMail.inc:886
 #: 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:802
-#: plugins/admin/groups/class_groupMail.inc:866
+#: plugins/personal/mail/class_mailAccount.inc:801
+#: plugins/admin/groups/class_groupMail.inc:892
 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:811
-#: plugins/admin/groups/class_groupMail.inc:875
+#: plugins/personal/mail/class_mailAccount.inc:810
+#: plugins/admin/groups/class_groupMail.inc:901
 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:821
-#: plugins/admin/groups/class_groupMail.inc:883
+#: plugins/personal/mail/class_mailAccount.inc:820
+#: plugins/admin/groups/class_groupMail.inc:909
 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 "
 "rechazar mensajes."
 
-#: plugins/personal/mail/class_mailAccount.inc:825
+#: plugins/personal/mail/class_mailAccount.inc:824
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:865
-#: plugins/personal/mail/class_mailAccount.inc:877
+#: plugins/personal/mail/class_mailAccount.inc:864
+#: plugins/personal/mail/class_mailAccount.inc:876
 #, fuzzy
 msgid "You are not allowed to write mail forwarding."
 msgstr "¡No tiene permisos para cambiar su contraseña!"
 
-#: plugins/personal/mail/class_mailAccount.inc:909
-#: plugins/personal/mail/class_mailAccount.inc:920
+#: plugins/personal/mail/class_mailAccount.inc:908
+#: plugins/personal/mail/class_mailAccount.inc:919
 #, fuzzy
 msgid "You are not allowed to write mail alternate address."
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:984
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:986
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1008
+#: plugins/personal/mail/class_mailAccount.inc:1007
 #: plugins/personal/nagios/nagios.tpl:17
 #: plugins/personal/nagios/class_nagiosAccount.inc:272
-#: plugins/admin/groups/class_groupMail.inc:1036
+#: plugins/addons/addressbook/class_addressbook.inc:797
+#: plugins/admin/groups/class_groupMail.inc:1062
 #: plugins/admin/systems/class_servDNS.inc:394
 #: plugins/admin/systems/servdnseditzone.tpl:51
-#: plugins/admin/ogroups/class_mailogroup.inc:171 html/getxls.php:174
+#: plugins/admin/ogroups/class_mailogroup.inc:171 html/getxls.php:225
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
-#: plugins/personal/mail/class_mailAccount.inc:1009
-#: plugins/admin/groups/class_groupMail.inc:1040
+#: plugins/personal/mail/class_mailAccount.inc:1008
+#: plugins/admin/groups/class_groupMail.inc:1066
 msgid "Mail server"
 msgstr "Servidor de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:1012
+#: plugins/personal/mail/class_mailAccount.inc:1011
 #, fuzzy
 msgid "Add vacation information"
 msgstr "Información organizativa"
 
-#: plugins/personal/mail/class_mailAccount.inc:1015
+#: plugins/personal/mail/class_mailAccount.inc:1014
 msgid "Use spam filter"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1016
+#: plugins/personal/mail/class_mailAccount.inc:1015
 #, fuzzy
 msgid "Spam level"
 msgstr "Nivel de log"
 
-#: plugins/personal/mail/class_mailAccount.inc:1017
+#: plugins/personal/mail/class_mailAccount.inc:1016
 #, fuzzy
 msgid "Spam mail box"
 msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/mail/class_mailAccount.inc:1019
+#: plugins/personal/mail/class_mailAccount.inc:1018
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "rechazar correos mayores que"
 
-#: plugins/personal/mail/class_mailAccount.inc:1020
+#: plugins/personal/mail/class_mailAccount.inc:1019
 #, fuzzy
 msgid "Mail max size"
 msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/mail/class_mailAccount.inc:1022
-#: plugins/personal/mail/class_mailAccount.inc:1027
+#: plugins/personal/mail/class_mailAccount.inc:1021
+#: plugins/personal/mail/class_mailAccount.inc:1026
 #, fuzzy
 msgid "Forwarding address"
 msgstr "Cuenta Principal"
 
-#: plugins/personal/mail/class_mailAccount.inc:1023
+#: plugins/personal/mail/class_mailAccount.inc:1022
 #, fuzzy
 msgid "Local delivery"
 msgstr "Último envío"
 
-#: plugins/personal/mail/class_mailAccount.inc:1024
+#: plugins/personal/mail/class_mailAccount.inc:1023
 msgid "Only insider delivery"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:1025
+#: plugins/personal/mail/class_mailAccount.inc:1024
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Direcciones alternativas"
 
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_divListUsers.inc:255
-msgid "Change password"
-msgstr "Cambiar contraseña"
-
-#: plugins/personal/password/password.tpl:6
+#: plugins/personal/password/password.tpl:3
 msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
@@ -1163,12 +1157,12 @@ msgstr ""
 "tendrán efecto inmediato. Por favor memorice la nueva contraseña, porque no "
 "podrá entrar sin ella."
 
-#: plugins/personal/password/password.tpl:11
-#: plugins/personal/password/main.inc:73
+#: plugins/personal/password/password.tpl:8
+#: plugins/personal/password/main.inc:74
 msgid "You have no permissions to change your password."
 msgstr "No tiene permisos para cambiar su contraseña."
 
-#: plugins/personal/password/password.tpl:13
+#: plugins/personal/password/password.tpl:10
 #: plugins/admin/users/password.tpl:6
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
@@ -1177,33 +1171,33 @@ msgstr ""
 "Cambiar la contraseña modifica la autenticación del usuario para el correo, "
 "proxy, samba y los servicios unix."
 
-#: plugins/personal/password/password.tpl:19
+#: plugins/personal/password/password.tpl:16
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: plugins/personal/password/password.tpl:27
+#: plugins/personal/password/password.tpl:24
 #: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
 #: plugins/admin/systems/password.tpl:14
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/password/password.tpl:35
+#: plugins/personal/password/password.tpl:32
 #: plugins/personal/generic/password.tpl:11
 #: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
 msgid "Repeat new password"
 msgstr "Repetir la nueva contraseña"
 
-#: plugins/personal/password/password.tpl:48
+#: plugins/personal/password/password.tpl:45
 #: plugins/personal/generic/password.tpl:17
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr "Poner Contraseña"
 
-#: plugins/personal/password/password.tpl:52
+#: plugins/personal/password/password.tpl:49
 msgid "Clear fields"
 msgstr "Limpiar campos"
 
-#: plugins/personal/password/changed.tpl:6
+#: plugins/personal/password/changed.tpl:2
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
@@ -1211,8 +1205,8 @@ msgstr ""
 "Su cambio de contraseña se ha realizado correctamente. Recuerde cambiarla en "
 "todos los programas configurados también."
 
-#: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:159
+#: plugins/personal/password/changed.tpl:8
+#: plugins/personal/generic/main.inc:166
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentimport.tpl:45
@@ -1220,7 +1214,7 @@ msgstr ""
 #: 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:1531
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1445
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -1230,13 +1224,13 @@ msgid "Back"
 msgstr "Atras"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/personal/generic/paste_generic.tpl:32
+#: 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:193
+#: plugins/admin/systems/class_divListSystem.inc:223
 #: plugins/admin/systems/goImapServer.tpl:34
 #: plugins/admin/systems/class_goFonServer.inc:107
 #: plugins/admin/systems/class_goLogDBServer.inc:96
@@ -1249,7 +1243,7 @@ msgid "Password"
 msgstr "Contraseña"
 
 #: plugins/personal/password/class_password.inc:12
-#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1305
 #, fuzzy
 msgid "User password"
 msgstr "Borrar contraseña"
@@ -1262,18 +1256,18 @@ msgstr "No se permite cambiar contraseña"
 msgid "You are not allowed to change your password at this time"
 msgstr "¡No tiene permisos para cambiar su contraseña! en este momento"
 
-#: plugins/personal/password/main.inc:44
+#: plugins/personal/password/main.inc:45
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "La contraseña introducida como contraseña actual no es correcta."
 
-#: plugins/personal/password/main.inc:47
+#: plugins/personal/password/main.inc:48
 msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
-#: plugins/personal/password/main.inc:52 plugins/personal/generic/main.inc:76
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/personal/password/main.inc:53 plugins/personal/generic/main.inc:79
+#: plugins/admin/users/class_userManagement.inc:218
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1281,25 +1275,30 @@ msgstr ""
 "Las contraseñas ingresadas como 'Nueva contraseña' y 'Repetir nueva "
 "contraseña' no concuerdan."
 
-#: plugins/personal/password/main.inc:55 plugins/personal/generic/main.inc:81
-#: plugins/admin/users/class_userManagement.inc:224
+#: plugins/personal/password/main.inc:56 plugins/personal/generic/main.inc:84
+#: plugins/admin/users/class_userManagement.inc:223
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La contraseña que ingreso como 'Nueva contraseña' está vacia."
 
-#: plugins/personal/password/main.inc:63
+#: plugins/personal/password/main.inc:64
 msgid "The password used as new and current are too similar."
 msgstr "Las contraseñas antigua y nueva son demasiado parecidas."
 
-#: plugins/personal/password/main.inc:68
+#: plugins/personal/password/main.inc:69
 msgid "The password used as new is to short."
 msgstr "La nueva contraseña es demasiado corta."
 
-#: plugins/personal/password/main.inc:91
+#: plugins/personal/password/main.inc:94
 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
+msgid "Change password"
+msgstr "Cambiar contraseña"
+
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1281
+#: plugins/personal/posix/class_posixAccount.inc:1289
 #: 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:637
@@ -1307,7 +1306,7 @@ msgid "Home directory"
 msgstr "Directorio Principal"
 
 #: plugins/personal/posix/generic.tpl:15
-#: plugins/personal/posix/class_posixAccount.inc:1282
+#: plugins/personal/posix/class_posixAccount.inc:1290
 msgid "Shell"
 msgstr "Shell"
 
@@ -1319,6 +1318,7 @@ msgstr "Grupo primario"
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:234
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
+#: plugins/gofax/faxreports/class_faxreport.inc:482
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
 #: plugins/gofon/fonreports/contents.tpl:35
 msgid "Status"
@@ -1330,13 +1330,13 @@ msgid "Force UID/GID"
 msgstr "Forzar UID/GID"
 
 #: plugins/personal/posix/generic.tpl:51
-#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
+#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:287
 msgid "UID"
 msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:62
 #: plugins/personal/posix/paste_generic.tpl:37
-#: plugins/admin/groups/class_groupGeneric.inc:896
+#: plugins/admin/groups/class_groupGeneric.inc:898
 msgid "GID"
 msgstr "GID"
 
@@ -1377,6 +1377,7 @@ msgstr "Mostrar los grupos de departamentos"
 #: plugins/admin/applications/class_divListApplication.inc:55
 #: plugins/admin/departments/class_divListDepartment.inc:46
 #: 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/mimetypes/class_divListMimeTypes.inc:59
@@ -1427,7 +1428,7 @@ msgstr "Mostrar sistemas de departamentos"
 msgid "Display systems matching"
 msgstr "Mostrar sistemas que concuerden con"
 
-#: plugins/personal/posix/main.inc:123
+#: plugins/personal/posix/main.inc:128
 msgid "Unix settings"
 msgstr "Parametros Unix"
 
@@ -1457,32 +1458,32 @@ msgid "active"
 msgstr "activo"
 
 #: plugins/personal/posix/class_posixAccount.inc:155
-#: plugins/personal/posix/class_posixAccount.inc:1009
+#: plugins/personal/posix/class_posixAccount.inc:1002
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: plugins/personal/posix/class_posixAccount.inc:195
+#: plugins/personal/posix/class_posixAccount.inc:190
 msgid "unconfigured"
 msgstr "Desconfigurado"
 
-#: plugins/personal/posix/class_posixAccount.inc:212
+#: plugins/personal/posix/class_posixAccount.inc:207
 #: plugins/admin/systems/class_terminalService.inc:194
-#: plugins/admin/systems/class_workstationStartup.inc:784
+#: plugins/admin/systems/class_workstationStartup.inc:791
 #: plugins/admin/systems/class_workstationService.inc:182
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:220
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:258
+#: plugins/personal/posix/class_posixAccount.inc:253
 msgid "This account has no unix extensions."
 msgstr "Este cuenta no tiene extensiones unix."
 
-#: plugins/personal/posix/class_posixAccount.inc:278
-#: plugins/personal/posix/class_posixAccount.inc:281
+#: plugins/personal/posix/class_posixAccount.inc:273
+#: plugins/personal/posix/class_posixAccount.inc:276
 msgid "Remove posix account"
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:279
+#: plugins/personal/posix/class_posixAccount.inc:274
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
@@ -1490,7 +1491,7 @@ msgstr ""
 "Esta cuenta tiene las características unix activadas. Para desactivarlas, "
 "necesita eliminar la cuenta samba primero."
 
-#: plugins/personal/posix/class_posixAccount.inc:282
+#: plugins/personal/posix/class_posixAccount.inc:277
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1498,11 +1499,11 @@ msgstr ""
 "Esta cuenta tiene características posix activadas. Puede desactivarla "
 "pulsando aqui"
 
-#: plugins/personal/posix/class_posixAccount.inc:285
+#: plugins/personal/posix/class_posixAccount.inc:280
 msgid "Create posix account"
 msgstr "Crear cuenta posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:286
+#: plugins/personal/posix/class_posixAccount.inc:281
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1510,30 +1511,30 @@ msgstr ""
 "Esta cuenta tiene la extensión posix desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:441
 #, 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:450
+#: plugins/personal/posix/class_posixAccount.inc:445
 #, 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:454
+#: plugins/personal/posix/class_posixAccount.inc:449
 #, 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:458
+#: plugins/personal/posix/class_posixAccount.inc:453
 #, 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:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1542,7 +1543,7 @@ msgstr "Avisar al usuario %s días antes de expirar la contraseña"
 msgid "January"
 msgstr "Enero"
 
-#: plugins/personal/posix/class_posixAccount.inc:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1551,7 +1552,7 @@ msgstr "Enero"
 msgid "February"
 msgstr "Febrero"
 
-#: plugins/personal/posix/class_posixAccount.inc:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1560,7 +1561,7 @@ msgstr "Febrero"
 msgid "March"
 msgstr "Marzo"
 
-#: plugins/personal/posix/class_posixAccount.inc:490
+#: plugins/personal/posix/class_posixAccount.inc:485
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
@@ -1569,7 +1570,7 @@ msgstr "Marzo"
 msgid "April"
 msgstr "Abril"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1578,7 +1579,7 @@ msgstr "Abril"
 msgid "May"
 msgstr "Mayo"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1587,7 +1588,7 @@ msgstr "Mayo"
 msgid "June"
 msgstr "Junio"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1596,7 +1597,7 @@ msgstr "Junio"
 msgid "July"
 msgstr "Julio"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1605,7 +1606,7 @@ msgstr "Julio"
 msgid "August"
 msgstr "Agosto"
 
-#: plugins/personal/posix/class_posixAccount.inc:491
+#: plugins/personal/posix/class_posixAccount.inc:486
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
@@ -1614,7 +1615,7 @@ msgstr "Agosto"
 msgid "September"
 msgstr "Septiembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:492
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1623,7 +1624,7 @@ msgstr "Septiembre"
 msgid "October"
 msgstr "Octubre"
 
-#: plugins/personal/posix/class_posixAccount.inc:492
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1632,7 +1633,7 @@ msgstr "Octubre"
 msgid "November"
 msgstr "Noviembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:492
+#: plugins/personal/posix/class_posixAccount.inc:487
 #: plugins/personal/samba/class_sambaAccount.inc:373
 #: plugins/personal/samba/class_sambaAccount.inc:391
 #: plugins/personal/samba/class_sambaAccount.inc:409
@@ -1641,154 +1642,154 @@ msgstr "Noviembre"
 msgid "December"
 msgstr "Diciembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:574
+#: plugins/personal/posix/class_posixAccount.inc:567
 #: plugins/personal/samba/class_sambaAccount.inc:468
 #: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/personal/posix/class_posixAccount.inc:574
+#: plugins/personal/posix/class_posixAccount.inc:567
 msgid "full access"
 msgstr "Acceso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:575
+#: 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:621
+#: 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:769
+#: plugins/personal/posix/class_posixAccount.inc:762
 msgid "Failed: overriding lock"
 msgstr "Fallo: Sobrepasado bloqueo"
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: 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:923
+#: 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:926
+#: 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:934
+#: 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:937
+#: 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:941
-#: plugins/admin/groups/class_groupGeneric.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:934
+#: plugins/admin/groups/class_groupGeneric.inc:795
 msgid "Value specified as 'GID' is not valid."
 msgstr "El valor especificado como 'GID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:944
-#: plugins/admin/groups/class_groupGeneric.inc:796
+#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:798
 msgid "Value specified as 'GID' is too small."
 msgstr "El valor especificado como 'GID' es muy pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:952
+#: 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:957
+#: 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:962
+#: 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:965
+#: 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:968
+#: 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:971
+#: 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:976
+#: 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:979
+#: 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:984
+#: 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:1132
-#: plugins/admin/groups/class_groupGeneric.inc:832
+#: plugins/personal/posix/class_posixAccount.inc:1140
+#: plugins/admin/groups/class_groupGeneric.inc:834
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1271
+#: plugins/personal/posix/class_posixAccount.inc:1279
 #, fuzzy
 msgid "POSIX account"
 msgstr "Cuenta GLPI"
 
-#: plugins/personal/posix/class_posixAccount.inc:1283
-#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:80
-#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
-#: html/getxls.php:299
+#: plugins/personal/posix/class_posixAccount.inc:1291
+#: plugins/addons/addressbook/class_addressbook.inc:613 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:1284
+#: plugins/personal/posix/class_posixAccount.inc:1292
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1286
+#: plugins/personal/posix/class_posixAccount.inc:1294
 #, fuzzy
 msgid "Force password change on login"
 msgstr "No se permite cambiar contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:1287
+#: plugins/personal/posix/class_posixAccount.inc:1295
 #, fuzzy
 msgid "Shadow min"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1288
+#: plugins/personal/posix/class_posixAccount.inc:1296
 #, fuzzy
 msgid "Shadow max"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1289
+#: plugins/personal/posix/class_posixAccount.inc:1297
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1290
+#: plugins/personal/posix/class_posixAccount.inc:1298
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1291
+#: plugins/personal/posix/class_posixAccount.inc:1299
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Mostrar personal"
 
-#: plugins/personal/posix/class_posixAccount.inc:1292
+#: plugins/personal/posix/class_posixAccount.inc:1300
 #, fuzzy
 msgid "System trust model"
 msgstr "Autenticación del sistema"
@@ -1930,7 +1931,7 @@ msgstr "La cuenta expirará después de"
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
-#: plugins/personal/samba/main.inc:116
+#: plugins/personal/samba/main.inc:124
 #: plugins/personal/samba/class_sambaAccount.inc:1034
 msgid "Samba settings"
 msgstr "Parametros de samba"
@@ -2137,65 +2138,66 @@ msgstr ""
 msgid "No certificate installed"
 msgstr "No hay certificados instalados"
 
-#: plugins/personal/generic/class_user.inc:562
+#: plugins/personal/generic/class_user.inc:560
 #, fuzzy, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/personal/generic/class_user.inc:630
+#: plugins/personal/generic/class_user.inc:628
 #: plugins/admin/systems/class_printGeneric.inc:625
 #, 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:877
+#: plugins/personal/generic/class_user.inc:876
 #, fuzzy, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "Cuenta proxy"
 
-#: plugins/personal/generic/class_user.inc:924
+#: plugins/personal/generic/class_user.inc:923
 msgid "Kerberos database communication failed"
 msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/class_user.inc:941
+#: plugins/personal/generic/class_user.inc:940
 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:952
+#: plugins/personal/generic/class_user.inc:951
 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:993
+#: plugins/personal/generic/class_user.inc:992
 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:996
-msgid "You have no permissions to move a user from the original 'Base'."
+#: plugins/personal/generic/class_user.inc:995
+#, fuzzy
+msgid "You have no permissions to move this user to the spicified 'Base'."
 msgstr "No tiene permisos para transladar a un usuario de su base original"
 
-#: plugins/personal/generic/class_user.inc:1002
-#: plugins/addons/addressbook/class_addressbook.inc:553
-#: plugins/admin/users/class_userManagement.inc:470
-#: plugins/admin/users/class_userManagement.inc:548
+#: plugins/personal/generic/class_user.inc:1001
+#: plugins/addons/addressbook/class_addressbook.inc:651
+#: plugins/admin/users/class_userManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:544
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1010
 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:1017
-#: plugins/addons/addressbook/class_addressbook.inc:557
-#: plugins/admin/users/class_userManagement.inc:473
-#: plugins/admin/users/class_userManagement.inc:551
+#: plugins/personal/generic/class_user.inc:1016
+#: plugins/addons/addressbook/class_addressbook.inc:655
+#: plugins/admin/users/class_userManagement.inc:469
+#: plugins/admin/users/class_userManagement.inc:547
 msgid "The required field 'Given name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:1020
+#: plugins/personal/generic/class_user.inc:1019
 msgid "The required field 'Login' is not set."
 msgstr " El campo requerido 'Login' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:1027
+#: plugins/personal/generic/class_user.inc:1026
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2203,7 +2205,7 @@ msgstr ""
 "Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
 "base de datos."
 
-#: plugins/personal/generic/class_user.inc:1034
+#: plugins/personal/generic/class_user.inc:1033
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2211,150 +2213,150 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1036
 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:1040
-#: plugins/personal/generic/class_user.inc:1065
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:591
+#: plugins/personal/generic/class_user.inc:1039
+#: plugins/personal/generic/class_user.inc:1064
+#: plugins/addons/addressbook/class_addressbook.inc:661
+#: plugins/addons/addressbook/class_addressbook.inc:689
 #: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Name' contains invalid characters."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/personal/generic/class_user.inc:1043
-#: plugins/personal/generic/class_user.inc:1062
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/personal/generic/class_user.inc:1042
+#: plugins/personal/generic/class_user.inc:1061
+#: plugins/addons/addressbook/class_addressbook.inc:664
+#: plugins/addons/addressbook/class_addressbook.inc:686
 msgid "The field 'Given name' contains invalid characters."
 msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
 
-#: plugins/personal/generic/class_user.inc:1048
-#: plugins/addons/addressbook/class_addressbook.inc:571
-#: plugins/addons/addressbook/class_addressbook.inc:574
+#: plugins/personal/generic/class_user.inc:1047
+#: plugins/addons/addressbook/class_addressbook.inc:669
+#: plugins/addons/addressbook/class_addressbook.inc:672
 #: plugins/admin/departments/class_departmentGeneric.inc:252
 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:1051
-#: plugins/addons/addressbook/class_addressbook.inc:577
+#: plugins/personal/generic/class_user.inc:1050
+#: plugins/addons/addressbook/class_addressbook.inc:675
 #: plugins/admin/departments/class_departmentGeneric.inc:255
 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:1054
-#: plugins/addons/addressbook/class_addressbook.inc:580
+#: plugins/personal/generic/class_user.inc:1053
+#: plugins/addons/addressbook/class_addressbook.inc:678
 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:1057
-#: plugins/addons/addressbook/class_addressbook.inc:583
+#: plugins/personal/generic/class_user.inc:1056
+#: plugins/addons/addressbook/class_addressbook.inc:681
 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:1185
+#: plugins/personal/generic/class_user.inc:1165
 msgid "Could not open specified certificate!"
 msgstr "¡No puedo abrir el certificado especificado!"
 
-#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1279
 #: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/class_user.inc:1298
+#: plugins/personal/generic/class_user.inc:1280
 #: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Tipo de Vía"
 
-#: plugins/personal/generic/class_user.inc:1299
+#: plugins/personal/generic/class_user.inc:1281
 #: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Intereses"
 
-#: plugins/personal/generic/class_user.inc:1300
+#: plugins/personal/generic/class_user.inc:1282
 #: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "Último envío"
 
-#: plugins/personal/generic/class_user.inc:1301
+#: plugins/personal/generic/class_user.inc:1283
 #: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Población de la Persona"
 
-#: plugins/personal/generic/class_user.inc:1302
+#: plugins/personal/generic/class_user.inc:1284
 #: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Descripción de la unidad"
 
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1285
 #: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Adjunto al area"
 
-#: plugins/personal/generic/class_user.inc:1304
+#: plugins/personal/generic/class_user.inc:1286
 #: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Título Funcional"
 
-#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1288
 #: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
-#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1289
 #: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1290
 #: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Papel desempeñado"
 
-#: plugins/personal/generic/class_user.inc:1309
+#: plugins/personal/generic/class_user.inc:1291
 #: plugins/personal/generic/generic.tpl:459
-#: plugins/addons/addressbook/address_edit.tpl:158
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
+#: 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:1313
+#: plugins/personal/generic/class_user.inc:1295
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Parámetros genéricos de la cola"
 
-#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1300
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:91
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:164 html/getxls.php:68 html/getxls.php:70
-#: html/getxls.php:243
+#: include/class_acl.inc:164 html/getxls.php:89 html/getxls.php:90
+#: html/getxls.php:308
 msgid "Users"
 msgstr "Usuarios"
 
-#: plugins/personal/generic/class_user.inc:1322
+#: plugins/personal/generic/class_user.inc:1304
 #: plugins/personal/generic/generic.tpl:143
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:574
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/gofax/blocklists/generic.tpl:17
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:593
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:119
 #: plugins/addons/godfs/class_dfsManagment.inc:217
 #: plugins/admin/groups/generic.tpl:30
-#: plugins/admin/groups/class_groupGeneric.inc:890
+#: plugins/admin/groups/class_groupGeneric.inc:892
 #: plugins/admin/groups/class_divListGroup.inc:139
-#: plugins/admin/users/class_divListUsers.inc:137
+#: plugins/admin/users/class_divListUsers.inc:141
 #: plugins/admin/applications/generic.tpl:42
 #: plugins/admin/applications/class_applicationGeneric.inc:524
-#: plugins/admin/applications/class_divListApplication.inc:118
+#: plugins/admin/applications/class_divListApplication.inc:134
 #: plugins/admin/departments/generic.tpl:35
 #: plugins/admin/departments/class_departmentGeneric.inc:542
-#: plugins/admin/departments/class_divListDepartment.inc:90
+#: plugins/admin/departments/class_divListDepartment.inc:107
 #: 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:510
+#: plugins/admin/systems/class_terminalGeneric.inc:513
 #: plugins/admin/systems/class_servGeneric.inc:346
 #: plugins/admin/systems/class_workstationGeneric.inc:515
 #: plugins/admin/systems/wingeneric.tpl:13
@@ -2363,77 +2365,84 @@ msgstr "Usuarios"
 #: plugins/admin/systems/class_componentGeneric.inc:267
 #: plugins/admin/systems/class_glpiSelectUser.inc:167
 #: plugins/admin/systems/class_baseSelectDialog.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:118
+#: plugins/admin/systems/class_divListSystem.inc:148
 #: plugins/admin/systems/goLdapServer.tpl:2
 #: plugins/admin/ogroups/generic.tpl:26
-#: plugins/admin/ogroups/class_ogroup.inc:700
+#: plugins/admin/ogroups/class_ogroup.inc:715
 #: plugins/admin/ogroups/class_divListOGroup.inc:145
 #: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:158
+#: plugins/admin/fai/class_divListFai.inc:173
 #: plugins/admin/mimetypes/generic.tpl:44
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:675
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:129
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_gofonMacro.inc:474
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
-#: plugins/gofon/conference/class_divListConferences.inc:93
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:145
+#: plugins/gofon/macro/generic.tpl:27
+#: plugins/gofon/macro/class_gofonMacro.inc:484
+#: plugins/gofon/macro/class_divListMacros.inc:114
+#: plugins/gofon/conference/generic.tpl:49
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:549
+#: plugins/gofon/conference/class_divListConferences.inc:119
 msgid "Base"
 msgstr "Base"
 
-#: plugins/personal/generic/class_user.inc:1324 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/addons/addressbook/class_addressbook.inc:790 html/getxls.php:301
 #, fuzzy
 msgid "Surename"
 msgstr "Nombre del servidor"
 
-#: plugins/personal/generic/class_user.inc:1325
-#: plugins/addons/addressbook/class_addressbook.inc:520 html/getxls.php:65
-#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/class_addressbook.inc:791 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:1326
+#: plugins/personal/generic/class_user.inc:1308
+#: plugins/addons/addressbook/class_addressbook.inc:796
 #, fuzzy
 msgid "User identification"
 msgstr "Información de Usuario"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1309
 #: plugins/personal/generic/generic.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:54
-#: plugins/addons/addressbook/address_info.tpl:22
+#: 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:1328
+#: plugins/personal/generic/class_user.inc:1310
 #: plugins/personal/generic/generic.tpl:83
 msgid "Academic title"
 msgstr "Títulos academicos"
 
-#: plugins/personal/generic/class_user.inc:1329 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1311
+#: plugins/addons/addressbook/class_addressbook.inc:807 html/getxls.php:224
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1330
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/addons/addressbook/class_addressbook.inc:795
 #, fuzzy
 msgid "Home phone number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1313
 #: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Página Web Principal"
 
-#: plugins/personal/generic/class_user.inc:1332
-#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/generic.tpl:250
+#: plugins/addons/addressbook/class_addressbook.inc:799 html/getxls.php:299
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1315
 #: plugins/personal/generic/generic.tpl:258
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:52
-#: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/addons/addressbook/address_edit.tpl:155
+#: plugins/addons/addressbook/class_addressbook.inc:800
+#: 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:381
@@ -2443,38 +2452,39 @@ msgstr "Organización"
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1316
 #: plugins/personal/generic/generic.tpl:93
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1317
 #, fuzzy
 msgid "Gender"
 msgstr "Remitente"
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1318
 #, fuzzy
 msgid "Preferred language"
 msgstr "Lenguaje preferido"
 
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1319
 #, fuzzy
 msgid "Department number"
 msgstr "Nombre del departamento"
 
-#: plugins/personal/generic/class_user.inc:1338
+#: plugins/personal/generic/class_user.inc:1320
 #, fuzzy
 msgid "Employee number"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1321
 #: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1322
 #: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/addressbook/class_addressbook.inc:801
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:56
 #: plugins/admin/departments/generic.tpl:68
@@ -2483,57 +2493,63 @@ msgstr "Tipo de empleado"
 #: plugins/admin/systems/class_workstationGeneric.inc:514
 #: plugins/admin/systems/class_printGeneric.inc:866
 #: plugins/admin/systems/class_glpiAccount.inc:782
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:174
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785 html/getxls.php:224
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/generic/class_user.inc:1323
 #: plugins/personal/generic/generic.tpl:360
+#: plugins/addons/addressbook/class_addressbook.inc:804
 #: plugins/admin/departments/generic.tpl:60
 #: plugins/admin/departments/class_departmentGeneric.inc:547
-#: html/getxls.php:174 html/getxls.php:236
+#: html/getxls.php:228 html/getxls.php:301
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/class_user.inc:1342
-#: plugins/personal/generic/paste_generic.tpl:22
+#: plugins/personal/generic/class_user.inc:1324
+#: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Foto del usuario"
 
-#: plugins/personal/generic/class_user.inc:1343
+#: plugins/personal/generic/class_user.inc:1325
 #, fuzzy
 msgid "Room number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1344
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/addons/addressbook/class_addressbook.inc:792
 #, fuzzy
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1345
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/addons/addressbook/class_addressbook.inc:794
 #, fuzzy
 msgid "Mobile number"
 msgstr "Teléfono particular"
 
-#: plugins/personal/generic/class_user.inc:1346
+#: plugins/personal/generic/class_user.inc:1328
 #: plugins/personal/nagios/class_nagiosAccount.inc:271
 #, fuzzy
 msgid "Pager number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1347
+#: plugins/personal/generic/class_user.inc:1329
 #, fuzzy
 msgid "User certificates"
 msgstr "Certificado estandar"
 
-#: plugins/personal/generic/class_user.inc:1349 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/addons/addressbook/class_addressbook.inc:802
+#: plugins/addons/addressbook/class_addressbook.inc:803 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:1350
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:818
+#: plugins/personal/generic/class_user.inc:1332
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#: plugins/addons/addressbook/class_addressbook.inc:793
 #, fuzzy
 msgid "Fax number"
 msgstr "Número de serie"
@@ -2547,7 +2563,7 @@ msgstr "Información personal"
 #: plugins/personal/generic/generic.tpl:38
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
-#: plugins/personal/generic/paste_generic.tpl:50
+#: plugins/personal/generic/paste_generic.tpl:37
 msgid "Personal picture"
 msgstr "Foto Personal"
 
@@ -2585,8 +2601,8 @@ msgstr "Inicio de sesión"
 msgid "Set"
 msgstr "por debajo"
 
-#: plugins/personal/generic/generic.tpl:118 html/getxls.php:65
-#: html/getxls.php:224
+#: plugins/personal/generic/generic.tpl:118 html/getxls.php:86
+#: html/getxls.php:281
 msgid "Sex"
 msgstr "Sexo"
 
@@ -2600,8 +2616,7 @@ msgid "Choose subtree to place user in"
 msgstr "Elija el subárbol donde colocar el usuario"
 
 #: plugins/personal/generic/generic.tpl:153
-#: plugins/gofax/blocklists/generic.tpl:21
-#: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:40
+#: plugins/gofax/blocklists/generic.tpl:26 plugins/admin/groups/generic.tpl:40
 #: plugins/admin/applications/generic.tpl:52
 #: plugins/admin/departments/generic.tpl:45
 #: plugins/admin/systems/terminal.tpl:28 plugins/admin/systems/server.tpl:32
@@ -2609,21 +2624,21 @@ 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:27
-#: plugins/gofon/macro/generic.tpl:29 plugins/gofon/conference/generic.tpl:39
-#: plugins/gofon/conference/generic.tpl:41
+#: plugins/admin/mimetypes/generic.tpl:54 plugins/gofon/macro/generic.tpl:36
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/generic.tpl:62
 msgid "Select a base"
 msgstr "Seleccione una base"
 
 #: plugins/personal/generic/generic.tpl:167
 #: plugins/personal/generic/generic.tpl:368
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_edit.tpl:182
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
+#: plugins/addons/addressbook/address_edit.tpl:80
+#: plugins/addons/addressbook/address_edit.tpl:207
+#: 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/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:227
 msgid "Address"
 msgstr "Dirección"
 
@@ -2672,16 +2687,17 @@ msgstr "Habitación No."
 
 #: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:95
-#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:106
+#: plugins/addons/addressbook/address_info.tpl:75 html/getxls.php:299
 msgid "Mobile"
 msgstr "Teléfono Móvil"
 
 #: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:79
-#: plugins/addons/addressbook/address_edit.tpl:217
-#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:246
+#: plugins/addons/addressbook/class_addressbook.inc:798
+#: plugins/addons/addressbook/address_info.tpl:179 html/getxls.php:226
+#: html/getxls.php:300
 msgid "Pager"
 msgstr "Paginador"
 
@@ -2700,14 +2716,14 @@ msgstr ""
 "codificara esta con el nuevo método seleccionado."
 
 #: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:52
 msgid "Remove picture"
 msgstr "Eliminar foto"
 
 #: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:91
 #: plugins/personal/environment/hotplugDialogNew.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/addons/addressbook/address_edit.tpl:264
 #: plugins/admin/departments/class_departmentManagement.inc:294
 #: plugins/admin/systems/servdns.tpl:21
 #: plugins/admin/systems/servkolab.tpl:246
@@ -2736,17 +2752,17 @@ msgstr "Eliminar foto"
 #: plugins/admin/systems/goSpamServerRule.tpl:22
 #: plugins/admin/systems/goVirusServer.tpl:169
 #: plugins/admin/systems/class_goService.inc:33
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:38
 #: include/class_MultiSelectWindow.inc:80
-#: ihtml/themes/default/copyPasteDialog.tpl:14
+#: ihtml/themes/default/copyPasteDialog.tpl:13
 msgid "Save"
 msgstr "Guardar"
 
-#: plugins/personal/generic/main.inc:99
+#: plugins/personal/generic/main.inc:102
 msgid "You are not allowed to set your password!"
 msgstr "¡No tiene permisos para cambiar su contraseña!"
 
-#: plugins/personal/generic/main.inc:184
+#: plugins/personal/generic/main.inc:191
 msgid "Generic user information"
 msgstr "Información genérica del usuario"
 
@@ -2758,9 +2774,9 @@ msgstr "Certificado estandar"
 #: plugins/personal/generic/generic_certs.tpl:45
 #: plugins/personal/generic/generic_certs.tpl:69
 #: plugins/personal/connectivity/class_kolabAccount.inc:258
-#: plugins/personal/environment/environment.tpl:152
+#: plugins/personal/environment/environment.tpl:159
 #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:579
+#: plugins/admin/groups/class_groupMail.inc:594
 #: plugins/admin/applications/class_applicationParameters.inc:122
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/glpiPrinter.tpl:152
@@ -2772,8 +2788,9 @@ msgstr "Certificado estandar"
 #: plugins/admin/systems/goMailServer.tpl:73
 #: plugins/admin/systems/goMailServer.tpl:104
 #: plugins/admin/systems/goSpamServer.tpl:48
-#: plugins/admin/fai/faiPackage.tpl:72
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
+#: plugins/admin/fai/faiPackage.tpl:78
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:292
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:294
 msgid "Remove"
 msgstr "Eliminar"
 
@@ -2789,15 +2806,15 @@ msgstr "Certificado PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
-#: plugins/personal/generic/paste_generic.tpl:4
+#: plugins/personal/generic/paste_generic.tpl:1
 msgid "User settings"
 msgstr "Parámetros del usuario"
 
-#: plugins/personal/generic/paste_generic.tpl:35
+#: plugins/personal/generic/paste_generic.tpl:23
 msgid "Clear password"
 msgstr "Borrar contraseña"
 
-#: plugins/personal/generic/paste_generic.tpl:36
+#: plugins/personal/generic/paste_generic.tpl:24
 msgid "Set new password"
 msgstr "Poner nueva Contraseña"
 
@@ -2900,6 +2917,20 @@ msgstr ""
 msgid "PHP GW account settings"
 msgstr "Parámetros de grupo"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:143
+#: plugins/personal/connectivity/class_kolabAccount.inc:447
+#: plugins/personal/connectivity/class_webdavAccount.inc:142
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:219
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:951
+#: plugins/personal/connectivity/class_proxyAccount.inc:291
+#: plugins/personal/connectivity/class_intranetAccount.inc:184
+#: plugins/personal/connectivity/class_pptpAccount.inc:159
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:310
+#, fuzzy
+msgid "Connectivity addon"
+msgstr "Conectividad"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Cuenta PHPGroupware"
@@ -3292,7 +3323,7 @@ msgid "GB"
 msgstr "Gb"
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:92
-#: plugins/addons/mailqueue/class_mailqueue.inc:323
+#: plugins/addons/mailqueue/class_mailqueue.inc:324
 msgid "hour"
 msgstr "hora"
 
@@ -3467,8 +3498,8 @@ msgid "The environment extension is currently disabled."
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:14
-#: plugins/personal/environment/environment.tpl:121
-#: plugins/personal/environment/environment.tpl:191
+#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:198
 msgid "Environment managment settings"
 msgstr "Parámetros de gestión de estado"
 
@@ -3476,116 +3507,116 @@ msgstr "Parámetros de gestión de estado"
 msgid "Profile managment"
 msgstr "Gestión de perfiles"
 
-#: plugins/personal/environment/environment.tpl:26
+#: plugins/personal/environment/environment.tpl:25
 msgid "Use profile managment"
 msgstr "Gestión de perfiles de usuario"
 
-#: plugins/personal/environment/environment.tpl:33
+#: plugins/personal/environment/environment.tpl:32
 msgid "Profile server managment"
 msgstr "Gestión de perfiles de servidor"
 
-#: plugins/personal/environment/environment.tpl:36
+#: plugins/personal/environment/environment.tpl:35
 msgid "Profil path"
 msgstr "Ruta del Perfil"
 
-#: plugins/personal/environment/environment.tpl:49
+#: plugins/personal/environment/environment.tpl:56
 msgid "Profil quota"
 msgstr "Cuota del Perfil"
 
-#: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1253
+#: plugins/personal/environment/environment.tpl:73
+#: plugins/personal/environment/class_environment.inc:1282
 msgid "Cache profile localy"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:75
+#: plugins/personal/environment/environment.tpl:82
 msgid "Kiosk profile settings"
 msgstr "Parámetros del perfil de Kiosk"
 
-#: plugins/personal/environment/environment.tpl:78
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/environment.tpl:85
+#: plugins/personal/environment/class_environment.inc:1288
 msgid "Kiosk profile"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:88
+#: plugins/personal/environment/environment.tpl:95
 msgid "Manage"
 msgstr "Gestionar"
 
-#: plugins/personal/environment/environment.tpl:98
-#: plugins/personal/environment/class_environment.inc:1252
+#: plugins/personal/environment/environment.tpl:105
+#: plugins/personal/environment/class_environment.inc:1281
 msgid "Resolution changeable during session"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/environment.tpl:110
+#: plugins/personal/environment/class_environment.inc:1287
 #: plugins/admin/systems/workstationService.tpl:122
 #: plugins/admin/systems/terminalService.tpl:108
 msgid "Resolution"
 msgstr "Resolución"
 
-#: plugins/personal/environment/environment.tpl:126
-#: plugins/personal/environment/class_environment.inc:1264
+#: plugins/personal/environment/environment.tpl:133
+#: plugins/personal/environment/class_environment.inc:1293
 #: plugins/admin/systems/class_terminalStartup.inc:452
-#: plugins/admin/systems/class_workstationStartup.inc:1114
+#: plugins/admin/systems/class_workstationStartup.inc:1123
 #: plugins/admin/systems/workstationStartup.tpl:158
 #: plugins/admin/systems/terminalStartup.tpl:87
 #: plugins/admin/systems/goShareServer.tpl:1
 msgid "Shares"
 msgstr "Recursos compartidos"
 
-#: plugins/personal/environment/environment.tpl:136
+#: plugins/personal/environment/environment.tpl:143
 msgid "User used to connect to the share"
 msgstr "Usuario utilizado para conectarse con el recurso compartido"
 
-#: plugins/personal/environment/environment.tpl:139
+#: plugins/personal/environment/environment.tpl:146
 msgid "Select a share"
 msgstr "Seleccione un recurso compartido"
 
-#: plugins/personal/environment/environment.tpl:147
+#: plugins/personal/environment/environment.tpl:154
 msgid "Mount path"
 msgstr "Punto de montaje"
 
-#: plugins/personal/environment/environment.tpl:160
+#: plugins/personal/environment/environment.tpl:167
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:162
+#: plugins/personal/environment/environment.tpl:169
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 msgid "Logon script management"
 msgstr "Gestión del script de gestión"
 
-#: plugins/personal/environment/environment.tpl:196
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/environment.tpl:203
+#: plugins/personal/environment/class_environment.inc:1292
 msgid "Hotplug devices"
 msgstr "Dispositivos de conexión en caliente (HotPlug)"
 
-#: plugins/personal/environment/environment.tpl:198
+#: plugins/personal/environment/environment.tpl:205
 msgid "Hotplug device settings"
 msgstr "Parámetros dispositivos de conexión en caliente (HotPlug)"
 
-#: plugins/personal/environment/environment.tpl:212
+#: plugins/personal/environment/environment.tpl:219
 #: plugins/admin/groups/class_divListGroup.inc:134
-#: plugins/gofon/macro/class_divListMacros.inc:90
+#: plugins/gofon/macro/class_divListMacros.inc:111
 msgid "New"
 msgstr "Nuevo"
 
-#: plugins/personal/environment/environment.tpl:215
+#: plugins/personal/environment/environment.tpl:222
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:230
+#: plugins/personal/environment/environment.tpl:237
 msgid "Printer settings"
 msgstr "Parámetros de impresora"
 
-#: plugins/personal/environment/environment.tpl:247
+#: plugins/personal/environment/environment.tpl:254
 msgid "Toggle admin"
 msgstr "Cambio de administrador"
 
-#: plugins/personal/environment/environment.tpl:250
+#: plugins/personal/environment/environment.tpl:257
 msgid "Toggle default"
 msgstr "Cambio por defecto"
 
-#: plugins/personal/environment/main.inc:114
+#: plugins/personal/environment/main.inc:120
 msgid "User environment settings"
 msgstr "Parámetros de estado de usuarios"
 
@@ -3621,7 +3652,7 @@ msgstr "Ya existe una entrada con este 'Nombre'."
 msgid "Please select an entry or press cancel."
 msgstr "¡Por favor seleccione una entrada o presione cancelar."
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/personal/environment/class_selectPrinterDialog.inc:102
 #: plugins/admin/systems/class_selectUserToPrinterDialog.inc:107
 msgid "Please select a printer or press cancel."
 msgstr "¡Por favor seleccione una impresora o presione cancelar."
@@ -3671,32 +3702,46 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:324
-#: plugins/personal/environment/class_environment.inc:362
+#: plugins/personal/environment/class_environment.inc:271
+#, php-format
+msgid ""
+"Your selected profile server '%s' is no longer available. Setting profile "
+"server to '%s'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:276
+#, php-format
+msgid ""
+"Your selected profile server '%s' is no longer available. Profile server "
+"configuration is resetted."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:345
+#: plugins/personal/environment/class_environment.inc:383
 msgid "Remove environment extension"
 msgstr "Eliminar extensión de estado"
 
-#: plugins/personal/environment/class_environment.inc:325
-#: plugins/personal/environment/class_environment.inc:363
+#: plugins/personal/environment/class_environment.inc:346
+#: plugins/personal/environment/class_environment.inc:384
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 "La extensión de estado está activada. Puede desactivarla pulsando aquí."
 
-#: plugins/personal/environment/class_environment.inc:334
-#: plugins/personal/environment/class_environment.inc:339
-#: plugins/personal/environment/class_environment.inc:368
-#: plugins/personal/environment/class_environment.inc:373
+#: plugins/personal/environment/class_environment.inc:355
+#: plugins/personal/environment/class_environment.inc:360
+#: plugins/personal/environment/class_environment.inc:389
+#: plugins/personal/environment/class_environment.inc:394
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:335
-#: plugins/personal/environment/class_environment.inc:369
+#: plugins/personal/environment/class_environment.inc:356
+#: plugins/personal/environment/class_environment.inc:390
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "La extensión de estado está desactivada. Puede activarla pulsando aquí."
 
-#: plugins/personal/environment/class_environment.inc:340
-#: plugins/personal/environment/class_environment.inc:374
+#: plugins/personal/environment/class_environment.inc:361
+#: plugins/personal/environment/class_environment.inc:395
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -3704,108 +3749,108 @@ msgstr ""
 "La extensión de estado está desactivada. Debe crear una cuenta Posix antes "
 "de poder activarla."
 
-#: plugins/personal/environment/class_environment.inc:477
-#: plugins/personal/environment/class_environment.inc:869
+#: plugins/personal/environment/class_environment.inc:498
+#: plugins/personal/environment/class_environment.inc:895
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "Ninguno"
 
-#: plugins/personal/environment/class_environment.inc:491
+#: plugins/personal/environment/class_environment.inc:512
 #, fuzzy
 msgid "You are not allowed to write Logon scripts."
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/personal/environment/class_environment.inc:570
-#: plugins/personal/environment/class_environment.inc:583
+#: 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:615
+#: plugins/admin/systems/class_workstationStartup.inc:616
 msgid "You must specify a valid mount point."
 msgstr "Por favor especifique un punto de montaje válido."
 
-#: plugins/personal/environment/class_environment.inc:572
+#: plugins/personal/environment/class_environment.inc:593
 #, fuzzy
 msgid "Spaces are not allowed in the mount path!"
 msgstr "¡No tiene permisos para cambiar su contraseña!"
 
-#: plugins/personal/environment/class_environment.inc:645
-#: plugins/personal/environment/class_environment.inc:646
-#: plugins/personal/environment/class_environment.inc:654
-#: plugins/personal/environment/class_environment.inc:655
+#: plugins/personal/environment/class_environment.inc:672
+#: plugins/personal/environment/class_environment.inc:673
+#: plugins/personal/environment/class_environment.inc:681
+#: plugins/personal/environment/class_environment.inc:682
 msgid "Reset password hash"
 msgstr "Reiniciar hash de la contraseña"
 
-#: plugins/personal/environment/class_environment.inc:659
+#: plugins/personal/environment/class_environment.inc:686
 msgid "Delete share entry"
 msgstr "Eliminar entrada compartida"
 
-#: plugins/personal/environment/class_environment.inc:848
+#: plugins/personal/environment/class_environment.inc:875
 msgid "GOsa default printer flag is not allowed within groups."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:872
+#: plugins/personal/environment/class_environment.inc:898
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:911
+#: plugins/personal/environment/class_environment.inc:936
 #, fuzzy, php-format
 msgid "Removing of user/environment account with dn '%s' failed."
 msgstr "Ha fallado al eliminar la extensión de estado"
 
-#: plugins/personal/environment/class_environment.inc:980
+#: plugins/personal/environment/class_environment.inc:1005
 msgid "Please set a valid profile quota size."
 msgstr "Por favor especifique un tamaño de cuota del perfil valido"
 
-#: plugins/personal/environment/class_environment.inc:987
+#: plugins/personal/environment/class_environment.inc:1012
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1025
+#: plugins/personal/environment/class_environment.inc:1050
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1164
+#: plugins/personal/environment/class_environment.inc:1189
 #, fuzzy, php-format
 msgid "Saving of user/environment account with dn '%s' failed."
 msgstr "Ha fallado la grabación de la cuenta de intranet"
 
-#: plugins/personal/environment/class_environment.inc:1177
+#: plugins/personal/environment/class_environment.inc:1202
 msgid "group share"
 msgstr "grupos compartidos"
 
-#: plugins/personal/environment/class_environment.inc:1210
+#: plugins/personal/environment/class_environment.inc:1238
 msgid "Administrator"
 msgstr "Administrador"
 
-#: plugins/personal/environment/class_environment.inc:1215
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1243
+#: plugins/personal/environment/class_environment.inc:1290
 msgid "Default printer"
 msgstr "Impresora por defecto"
 
-#: plugins/personal/environment/class_environment.inc:1241
+#: plugins/personal/environment/class_environment.inc:1270
 #, fuzzy
 msgid "Environment settings"
 msgstr "Parámetros de estado de usuarios"
 
-#: plugins/personal/environment/class_environment.inc:1248
+#: plugins/personal/environment/class_environment.inc:1277
 msgid "Command to extend the list of possible screen resolutions"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/class_environment.inc:1284
 #, fuzzy
 msgid "Profile quota"
 msgstr "Cuota del Perfil"
 
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/class_environment.inc:1285
 #, fuzzy
 msgid "Profile server"
 msgstr "Servidor de Archivos"
 
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/class_environment.inc:1291
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
@@ -3850,11 +3895,11 @@ msgstr "Nombre del Script"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:573
+#: plugins/gofax/blocklists/generic.tpl:51
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:592
 #: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
 #: plugins/admin/groups/generic.tpl:15
-#: plugins/admin/groups/class_groupGeneric.inc:891
+#: plugins/admin/groups/class_groupGeneric.inc:893
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/applications/class_applicationGeneric.inc:525
 #: plugins/admin/departments/generic.tpl:16
@@ -3872,34 +3917,38 @@ msgstr "Nombre del Script"
 #: plugins/admin/systems/class_goMailServer.inc:695
 #: plugins/admin/systems/class_goShareServer.inc:354
 #: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/class_ogroup.inc:701
-#: plugins/admin/fai/faiVariable.tpl:19
-#: plugins/admin/fai/class_faiScript.inc:516
-#: plugins/admin/fai/class_faiTemplate.inc:460
-#: plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiPartitionTable.tpl:19
+#: plugins/admin/ogroups/class_ogroup.inc:716
+#: plugins/admin/fai/faiVariable.tpl:21
+#: plugins/admin/fai/class_faiScript.inc:527
+#: plugins/admin/fai/class_faiTemplate.inc:495
+#: plugins/admin/fai/faiPackage.tpl:21
+#: plugins/admin/fai/faiPartitionTable.tpl:21
 #: plugins/admin/fai/class_faiScriptEntry.inc:180
 #: plugins/admin/fai/faiScriptEntry.tpl:19
-#: plugins/admin/fai/class_faiPackage.inc:556
-#: plugins/admin/fai/class_faiProfile.inc:446
-#: plugins/admin/fai/class_faiHook.inc:502 plugins/admin/fai/faiProfile.tpl:19
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: 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/faiPartitionTableEntry.tpl:13
 #: plugins/admin/fai/faiScript.tpl:21
-#: plugins/admin/fai/faiVariableEntry.tpl:17
-#: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:21
-#: plugins/admin/fai/class_faiHookEntry.inc:187
+#: plugins/admin/fai/class_faiVariableEntry.inc:143
+#: plugins/admin/fai/faiVariableEntry.tpl:19
+#: plugins/admin/fai/faiTemplate.tpl:21 plugins/admin/fai/faiHook.tpl:21
+#: 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:393
-#: plugins/admin/fai/faiTemplateEntry.tpl:11
+#: plugins/admin/fai/class_faiVariable.inc:421
+#: 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/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41
-#: plugins/gofon/macro/class_gofonMacro.inc:475
-#: plugins/gofon/conference/generic.tpl:56
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
-#: plugins/generic/references/contents.tpl:11 html/getxls.php:123
-#: html/getxls.php:230
+#: plugins/gofon/macro/generic.tpl:49
+#: plugins/gofon/macro/class_gofonMacro.inc:485
+#: plugins/gofon/conference/generic.tpl:78
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:550
+#: plugins/generic/references/contents.tpl:11 html/getxls.php:158
+#: html/getxls.php:287
 msgid "Description"
 msgstr "Descripción"
 
@@ -3921,30 +3970,30 @@ msgid "Script can be replaced by user"
 msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
-#: plugins/gofax/blocklists/generic.tpl:88
+#: plugins/gofax/blocklists/generic.tpl:103
 #: plugins/gofax/faxaccount/lists.tpl:31
 #: plugins/addons/notifications/contents.tpl:12
-#: plugins/admin/groups/class_groupManagement.inc:329
+#: plugins/admin/groups/class_groupManagement.inc:332
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/users/class_userManagement.inc:649
 #: plugins/admin/applications/class_applicationManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:489
+#: plugins/admin/systems/class_systemManagement.inc:503
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:54
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#: plugins/admin/fai/class_faiManagement.inc:614
+#: plugins/admin/fai/class_faiManagement.inc:616
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:82
-#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiVariableEntry.tpl:54
 #: plugins/admin/fai/faiHookEntry.tpl:84
-#: plugins/admin/fai/faiTemplateEntry.tpl:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:170
 #: 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:266
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:244
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:251
 #: 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"
@@ -4202,7 +4251,7 @@ msgstr "Ver la información de configuración"
 msgid "View system informations"
 msgstr "Ver la información de sistema"
 
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr "Parámetros de Nagios"
 
@@ -4277,15 +4326,19 @@ msgstr "Ruta del Perfil"
 msgid "List name"
 msgstr "Nombre de la lista"
 
-#: plugins/gofax/blocklists/generic.tpl:10
+#: plugins/gofax/blocklists/generic.tpl:12
 msgid "Name of blocklist"
 msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
+#: plugins/gofax/blocklists/generic.tpl:20 plugins/admin/groups/generic.tpl:34
+#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/server.tpl:26
+#: plugins/admin/systems/phone.tpl:20 plugins/admin/systems/workstation.tpl:30
+#: plugins/admin/systems/component.tpl:20 plugins/admin/ogroups/generic.tpl:29
+#: plugins/gofon/macro/generic.tpl:30
+msgid "Choose subtree to place group in"
+msgstr "Elija lugar del árbol para colocar la aplicación"
 
-#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/gofax/blocklists/generic.tpl:40
 #: plugins/admin/systems/servnfs.tpl:56
 #: plugins/admin/systems/workstationService.tpl:54
 #: plugins/admin/systems/workstationService.tpl:156
@@ -4298,25 +4351,25 @@ msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:787
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/systems/class_goShareServer.inc:355
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:187
 #: plugins/admin/fai/class_faiSummaryTab.inc:318
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+#: plugins/gofon/conference/generic.tpl:28 include/php_setup.inc:130
 msgid "Type"
 msgstr "Tipo"
 
-#: plugins/gofax/blocklists/generic.tpl:39
+#: plugins/gofax/blocklists/generic.tpl:43
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
 
-#: plugins/gofax/blocklists/generic.tpl:48
+#: plugins/gofax/blocklists/generic.tpl:54
 msgid "Descriptive text for this blocklist"
 msgstr "Descripción de esta lista de bloqueos"
 
-#: plugins/gofax/blocklists/generic.tpl:61
+#: plugins/gofax/blocklists/generic.tpl:68
 msgid "Blocked numbers"
 msgstr "Números bloqueados"
 
-#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/blocklists/generic.tpl:92
 msgid "Numbers can also contain wild cards."
 msgstr "Los números pueden contener también comodínes"
 
@@ -4360,7 +4413,7 @@ msgid "Blocklist management"
 msgstr "Gestión de listas de bloqueo"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:565
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:587
 msgid "FAX Blocklists"
 msgstr "Lista de bloqueos de FAX"
 
@@ -4377,58 +4430,54 @@ msgstr "No tiene permisos para eliminar esta lista de bloqueo."
 msgid "Please specify a valid phone number."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 msgid "send"
 msgstr "enviar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 msgid "receive"
 msgstr "recibir"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:409
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:431
 #, 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:449
+#: 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:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:482
 #: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:458
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:485
 msgid "Required field 'Name' contains invalid characters"
 msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:465
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:492
 msgid "Specified name is already used."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:472
-msgid "No permission to create a blocklist on this base."
-msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:520
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
 #, 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:560
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:582
 #, fuzzy
 msgid "Fax Blocklists"
 msgstr "Lista de bloqueos de FAX"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:572
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:591
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:520
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/groups/class_groupGeneric.inc:889
+#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/addressbook/address_info.tpl:24
+#: plugins/admin/groups/class_groupGeneric.inc:891
 #: plugins/admin/applications/class_applicationGeneric.inc:523
 #: plugins/admin/applications/class_applicationGeneric.inc:527
-#: plugins/admin/systems/class_terminalGeneric.inc:511
+#: 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
@@ -4452,34 +4501,45 @@ msgstr "Lista de bloqueos de FAX"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:7
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/goSpamServerRule.tpl:6
 #: plugins/admin/systems/class_goShareServer.inc:352
-#: plugins/admin/ogroups/class_ogroup.inc:699
+#: plugins/admin/systems/goSpamServerRule.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:714
 #: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/class_faiScript.inc:515
-#: plugins/admin/fai/class_faiTemplate.inc:459
+#: plugins/admin/fai/class_faiScript.inc:526
+#: plugins/admin/fai/class_faiTemplate.inc:494
 #: plugins/admin/fai/faiPackage.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
 #: plugins/admin/fai/class_faiScriptEntry.inc:179
 #: plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/class_faiPackage.inc:555
-#: plugins/admin/fai/class_faiProfile.inc:445
-#: plugins/admin/fai/class_faiHook.inc:501 plugins/admin/fai/faiProfile.tpl:9
+#: 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/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScript.tpl:9
+#: plugins/admin/fai/class_faiVariableEntry.inc:142
+#: plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/class_faiPartitionTable.inc:498
-#: plugins/admin/fai/class_faiHookEntry.inc:186
+#: 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:392
+#: plugins/admin/fai/class_faiVariable.inc:420
+#: 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/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+#: plugins/gofon/macro/parameter.tpl:6
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:548
+#: html/getxls.php:223 html/getxls.php:290
 msgid "Name"
 msgstr "Nombre"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:575
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:594
+#, fuzzy
+msgid "Blocklist"
+msgstr "Listas de bloqueo"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:595
 #, fuzzy
 msgid "Blocklist type"
 msgstr "N0mbre de listas de bloqueo"
@@ -4544,6 +4604,7 @@ msgstr "Mostrar listas de bloqueos entrantes"
 #: plugins/admin/applications/class_divListApplication.inc:55
 #: plugins/admin/departments/class_divListDepartment.inc:46
 #: 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/mimetypes/class_divListMimeTypes.inc:59
@@ -4556,243 +4617,242 @@ 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:83
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:103
 #: plugins/admin/groups/class_divListGroup.inc:120
-#: plugins/admin/users/class_divListUsers.inc:116
-#: plugins/admin/applications/class_divListApplication.inc:101
-#: plugins/admin/departments/class_divListDepartment.inc:73
+#: 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:98
+#: 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:118
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
+#: 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:83
+#: 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:116
-#: plugins/admin/applications/class_divListApplication.inc:101
-#: plugins/admin/departments/class_divListDepartment.inc:73
+#: 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:98
+#: 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:118
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:80
-#: plugins/gofon/conference/class_divListConferences.inc:81
+#: 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:85
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
 #: plugins/admin/groups/class_divListGroup.inc:121
-#: plugins/admin/users/class_divListUsers.inc:118
-#: plugins/admin/applications/class_divListApplication.inc:103
-#: plugins/admin/departments/class_divListDepartment.inc:75
+#: 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:100
+#: 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:121
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:82
-#: plugins/gofon/conference/class_divListConferences.inc:83
+#: 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:85
+#: 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:118
-#: plugins/admin/applications/class_divListApplication.inc:103
-#: plugins/admin/departments/class_divListDepartment.inc:75
+#: 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:100
+#: 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:299
-#: plugins/admin/fai/class_divListFai.inc:121
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:113
-#: plugins/gofon/macro/class_divListMacros.inc:82
-#: plugins/gofon/conference/class_divListConferences.inc:83
+#: 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:87
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
 #: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:120
-#: plugins/admin/applications/class_divListApplication.inc:105
+#: 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:102
+#: 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:115
-#: plugins/gofon/macro/class_divListMacros.inc:84
-#: plugins/gofon/conference/class_divListConferences.inc:85
+#: 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:87
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:107
 #: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:120
-#: plugins/admin/applications/class_divListApplication.inc:105
-#: plugins/admin/departments/class_divListDepartment.inc:77
+#: 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:102
+#: 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:124
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:115
-#: plugins/gofon/macro/class_divListMacros.inc:84
-#: plugins/gofon/conference/class_divListConferences.inc:85
+#: 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:89
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:109
 #: plugins/admin/groups/class_divListGroup.inc:123
-#: plugins/admin/users/class_divListUsers.inc:122
-#: plugins/admin/applications/class_divListApplication.inc:107
-#: plugins/admin/departments/class_divListDepartment.inc:79
+#: 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:103
+#: 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:126
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
-#: plugins/gofon/macro/class_divListMacros.inc:86
-#: plugins/gofon/conference/class_divListConferences.inc:87
+#: 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:89
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: 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:122
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:107
-#: plugins/admin/applications/class_divListApplication.inc:120
-#: plugins/admin/departments/class_divListDepartment.inc:79
-#: plugins/admin/departments/class_divListDepartment.inc:92
+#: 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:103
-#: plugins/admin/systems/class_divListSystem.inc:121
+#: 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:127
-#: plugins/admin/fai/class_divListFai.inc:159
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:86
-#: plugins/gofon/macro/class_divListMacros.inc:94
-#: plugins/gofon/conference/class_divListConferences.inc:87
-#: plugins/gofon/conference/class_divListConferences.inc:95
+#: 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:93
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
 msgid "Create new blocklist"
 msgstr "Crear nueva lista de bloqueos"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:115
 msgid "New Blocklist"
 msgstr "Nueva lista de bloqueo"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: 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:139
-#: plugins/admin/applications/class_divListApplication.inc:120
-#: plugins/admin/departments/class_divListDepartment.inc:92
+#: 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:121
+#: 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:159
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:131
-#: plugins/gofon/macro/class_divListMacros.inc:94
-#: plugins/gofon/conference/class_divListConferences.inc:95
+#: 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 "Enviar departamentos"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
-#: plugins/admin/groups/class_divListGroup.inc:203
-#: plugins/admin/users/class_divListUsers.inc:249
-#: plugins/admin/applications/class_divListApplication.inc:184
-#: plugins/admin/departments/class_divListDepartment.inc:116
+#: 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/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:160
+#: 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:276
-#: plugins/admin/fai/class_faiScript.inc:278
-#: plugins/admin/fai/class_faiTemplate.inc:236
-#: plugins/admin/fai/class_faiTemplate.inc:239
-#: plugins/admin/fai/class_faiHook.inc:260
-#: plugins/admin/fai/class_faiHook.inc:263
-#: plugins/admin/fai/class_divListFai.inc:226
-#: plugins/admin/fai/class_divListFai.inc:229
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:196
-#: plugins/gofon/macro/class_divListMacros.inc:109
-#: plugins/gofon/macro/class_divListMacros.inc:128
-#: plugins/gofon/conference/class_divListConferences.inc:124
+#: 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/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
 msgid "edit"
 msgstr "Editar"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
-#: plugins/admin/users/class_divListUsers.inc:250
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:155
+#: plugins/admin/users/class_divListUsers.inc:256
 msgid "Edit user"
 msgstr "Editar usuario"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_divListGroup.inc:211
-#: plugins/admin/users/class_divListUsers.inc:266
-#: plugins/admin/applications/class_divListApplication.inc:190
-#: plugins/admin/departments/class_divListDepartment.inc:121
-#: plugins/admin/systems/class_divListSystem.inc:162
+#: 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:280
-#: plugins/admin/fai/class_faiTemplate.inc:240
-#: plugins/admin/fai/class_faiHook.inc:264
-#: plugins/admin/fai/class_divListFai.inc:237
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:201
-#: plugins/gofon/macro/class_divListMacros.inc:111
-#: plugins/gofon/macro/class_divListMacros.inc:131
-#: plugins/gofon/conference/class_divListConferences.inc:127
-#: plugins/gofon/conference/class_divListConferences.inc:129
+#: plugins/admin/fai/class_faiScript.inc:287
+#: plugins/admin/fai/class_faiTemplate.inc:261
+#: 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
 msgid "delete"
 msgstr "borrar"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
-#: plugins/admin/users/class_divListUsers.inc:267
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:165
+#: plugins/admin/users/class_divListUsers.inc:275
 msgid "Delete user"
 msgstr "Borrar usuario"
 
@@ -4802,10 +4862,10 @@ 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:823
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
 #: plugins/admin/ogroups/phonequeue.tpl:47
-#: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:65
-#: html/getxls.php:224
+#: plugins/admin/ogroups/class_phonequeue.inc:747 html/getxls.php:86
+#: html/getxls.php:281
 msgid "Language"
 msgstr "Lenguaje"
 
@@ -4816,7 +4876,7 @@ msgstr ""
 "correo"
 
 #: plugins/gofax/faxaccount/generic.tpl:34
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Formato de envío"
 
@@ -4837,12 +4897,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:820
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 msgid "Deliver fax as mail"
 msgstr "Enviar fax como correo electrónico"
 
 #: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Enviar fax a la impresora"
 
@@ -4898,26 +4958,26 @@ msgstr "Listas de listas de bloqueos predefinidas"
 msgid "Add the list to the blocklists"
 msgstr "Añadir a la lista de bloqueos"
 
-#: plugins/gofax/faxaccount/main.inc:98
+#: plugins/gofax/faxaccount/main.inc:110
 msgid "FAX settings"
 msgstr "Parametros del Fax"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:206
-#: plugins/addons/addressbook/address_info.tpl:88
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/addons/addressbook/address_info.tpl:171
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:140
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:143
 msgid "This account has no fax extensions."
 msgstr "Esta cuenta no tiene extensiones de fax."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:149
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:152
 msgid "Remove fax account"
 msgstr "Eliminar cuenta de fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:150
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
@@ -4925,11 +4985,11 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:152
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
 msgid "Create fax account"
 msgstr "Crear cuenta de fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:153
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:156
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
@@ -4937,71 +4997,71 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:216
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:219
 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:425
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:506
-#: plugins/admin/groups/class_groupApplication.inc:644
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:428
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:509
+#: plugins/admin/groups/class_groupApplication.inc:672
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr "Atrás"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:618
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:621
 #, fuzzy, php-format
 msgid "Removing of user/fax account with dn '%s' failed."
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:633
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:636
 msgid "The required field 'Fax' is not set."
 msgstr "No ha rellenado el campo requerido 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:637
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:640
 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:645
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:648
 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:647
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:650
 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:653
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:656
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:735
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:741
 #, 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:806
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:812
 #, fuzzy
 msgid "Fax account settings"
 msgstr "Parametros de samba"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:815
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:821
 msgid "Enable/Disable fax"
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:816
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:822
 #, fuzzy
 msgid "Receive blocklist"
 msgstr "Mostrar listas de bloqueos entrantes"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:817
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
 #, fuzzy
 msgid "Send blocklist"
 msgstr "Mostrar listas de bloqueos salientes"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:819
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
 #, fuzzy
 msgid "Alternate fax number"
 msgstr "Intercambiar los números de fax"
@@ -5013,7 +5073,7 @@ msgid "Filter"
 msgstr "Filtro"
 
 #: plugins/gofax/faxreports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/addressbook/contents.tpl:106
 #: plugins/addons/logview/contents.tpl:47
 #: plugins/addons/mailqueue/contents.tpl:11
 #: plugins/gofon/fonreports/contents.tpl:6
@@ -5043,7 +5103,7 @@ msgid "during"
 msgstr "durante"
 
 #: plugins/gofax/faxreports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:67
+#: plugins/addons/logview/contents.tpl:68
 #: plugins/addons/mailqueue/contents.tpl:10
 #: plugins/addons/mailqueue/contents.tpl:26
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
@@ -5054,13 +5114,15 @@ msgstr "Buscar"
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/admin/systems/class_printGeneric.inc:842
 #: plugins/admin/ogroups/class_ogroupManagement.inc:378
-#: plugins/admin/fai/faiTemplateEntry.tpl:94
+#: plugins/admin/fai/faiTemplateEntry.tpl:110
 msgid "User"
 msgstr "Usuario"
 
 #: plugins/gofax/faxreports/contents.tpl:31
+#: plugins/gofax/faxreports/class_faxreport.inc:481
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/fonreports/contents.tpl:30
+#: plugins/gofon/fonreports/class_fonreport.inc:398
 msgid "Date"
 msgstr "Fecha"
 
@@ -5101,18 +5163,22 @@ msgid "Date / Time"
 msgstr "Fecha / Hora"
 
 #: plugins/gofax/faxreports/detail.tpl:29
+#: plugins/gofax/faxreports/class_faxreport.inc:484
 msgid "Sender MSN"
 msgstr "MSN del Remitente"
 
 #: plugins/gofax/faxreports/detail.tpl:33
+#: plugins/gofax/faxreports/class_faxreport.inc:483
 msgid "Sender ID"
 msgstr "ID del Remitente"
 
 #: plugins/gofax/faxreports/detail.tpl:37
+#: plugins/gofax/faxreports/class_faxreport.inc:486
 msgid "Receiver MSN"
 msgstr "MSN del Receptor"
 
 #: plugins/gofax/faxreports/detail.tpl:41
+#: plugins/gofax/faxreports/class_faxreport.inc:485
 msgid "Receiver ID"
 msgstr "ID del Receptor"
 
@@ -5121,10 +5187,11 @@ msgid "Status message"
 msgstr "Estado del mensaje"
 
 #: plugins/gofax/faxreports/detail.tpl:53
+#: plugins/gofax/faxreports/class_faxreport.inc:489
 msgid "Transfer time"
 msgstr "Tiempo de envio"
 
-#: plugins/gofax/faxreports/main.inc:18
+#: plugins/gofax/faxreports/main.inc:14
 msgid "FAX reports"
 msgstr "Reportes de FAX"
 
@@ -5132,56 +5199,95 @@ msgstr "Reportes de FAX"
 msgid "FAX Reports"
 msgstr "Informes de FAX"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:106
-#: plugins/gofax/faxreports/class_faxreport.inc:116
+#: plugins/gofax/faxreports/class_faxreport.inc:107
+#: plugins/gofax/faxreports/class_faxreport.inc:117
 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:109
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:160
+#: plugins/gofax/faxreports/class_faxreport.inc:110
+#: 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:120
-#: plugins/gofax/faxreports/class_faxreport.inc:125
+#: plugins/gofax/faxreports/class_faxreport.inc:121
+#: plugins/gofax/faxreports/class_faxreport.inc:126
 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:148
-#: plugins/gofax/faxreports/class_faxreport.inc:266
+#: plugins/gofax/faxreports/class_faxreport.inc:149
+#: plugins/gofax/faxreports/class_faxreport.inc:286
 msgid "Query for fax database failed!"
 msgstr "¡La consulta a la base de datos de fax ha fallado!"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:157
+#: plugins/gofax/faxreports/class_faxreport.inc:158
+#: plugins/gofax/faxreports/class_faxreport.inc:168
 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:177
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-#: plugins/gofon/fonreports/class_fonreport.inc:202
+#: plugins/gofax/faxreports/class_faxreport.inc:196
+#: plugins/gofax/faxreports/class_faxreport.inc:311
+#: plugins/gofon/fonreports/class_fonreport.inc:221
 msgid "Y-M-D"
 msgstr "Y-M-D"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:389
-#: plugins/gofax/faxreports/class_faxreport.inc:390
+#: plugins/gofax/faxreports/class_faxreport.inc:305
+#: 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/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
 #, fuzzy
 msgid "Fax report"
 msgstr "Reportes de FAX"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:399
+#: plugins/gofax/faxreports/class_faxreport.inc:470
+#, fuzzy
+msgid "All entries are readonly"
+msgstr "Todos los campos son rellenarles."
+
+#: plugins/gofax/faxreports/class_faxreport.inc:479
 #, fuzzy
 msgid "Detailed view"
 msgstr "Dispositivos instalados"
 
+#: plugins/gofax/faxreports/class_faxreport.inc:480
+#, fuzzy
+msgid "Fax ID"
+msgstr "FAX ID"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:481
+#, fuzzy
+msgid "Time"
+msgstr "Mime"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:487
+#, fuzzy
+msgid "Number of pages"
+msgstr "Nombre del departamento"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:488
+#, fuzzy
+msgid "Status Message"
+msgstr "Estado del mensaje"
+
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:66
-#: plugins/addons/addressbook/address_info.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:74
+#: plugins/addons/addressbook/address_info.tpl:53
 msgid "Private"
 msgstr "Privado"
 
@@ -5199,48 +5305,48 @@ msgstr ""
 "búsqueda de usuarios en su sitio. Se puede especificar asterisco (*) como en "
 "'Go*us' para encontrar 'Gonicus'. Use estos filtros para reducir su búsqueda."
 
-#: plugins/addons/addressbook/contents.tpl:47
+#: plugins/addons/addressbook/contents.tpl:48
 msgid "Add entry"
 msgstr "Añadir entrada"
 
-#: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:743
+#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/admin/groups/class_groupApplication.inc:754
 msgid "Edit entry"
 msgstr "Editar entrada"
 
-#: plugins/addons/addressbook/contents.tpl:52
+#: plugins/addons/addressbook/contents.tpl:55
 msgid "Remove entry"
 msgstr "Eliminar entrada"
 
-#: plugins/addons/addressbook/contents.tpl:68
+#: plugins/addons/addressbook/contents.tpl:72
 msgid "Select to see regular users"
 msgstr "Seleccione para ver usuarios estandar"
 
-#: plugins/addons/addressbook/contents.tpl:68
+#: plugins/addons/addressbook/contents.tpl:72
 msgid "Show organizational entries"
 msgstr "Mostrar entradas de organizaciones"
 
-#: plugins/addons/addressbook/contents.tpl:69
+#: plugins/addons/addressbook/contents.tpl:73
 msgid "Select to see users in addressbook"
 msgstr "Seleccione para ver los usuarios en la libreta de direcciones"
 
-#: plugins/addons/addressbook/contents.tpl:69
+#: plugins/addons/addressbook/contents.tpl:73
 msgid "Show addressbook entries"
 msgstr "Enseñar las entradas de la libreta de direcciones"
 
-#: plugins/addons/addressbook/contents.tpl:77
+#: plugins/addons/addressbook/contents.tpl:81
 msgid "Display results for department"
 msgstr "Mostrar resultados para departamentos"
 
-#: plugins/addons/addressbook/contents.tpl:90
+#: plugins/addons/addressbook/contents.tpl:94
 msgid "Match object"
 msgstr "Encontrar objeto"
 
-#: plugins/addons/addressbook/contents.tpl:93
+#: plugins/addons/addressbook/contents.tpl:97
 msgid "Choose the object that will be searched in"
 msgstr "Elegir el objeto que sera buscado"
 
-#: plugins/addons/addressbook/contents.tpl:105
+#: plugins/addons/addressbook/contents.tpl:109
 msgid "Search string"
 msgstr "Cadena de búsqueda"
 
@@ -5249,10 +5355,10 @@ msgid "Dial connection..."
 msgstr "Marcando conexión"
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:374
-#: plugins/addons/addressbook/class_addressbook.inc:378
-#: plugins/addons/addressbook/class_addressbook.inc:460
+#: 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
 msgid "Dial"
 msgstr "Llamar"
 
@@ -5271,58 +5377,61 @@ msgid "Choose the department to store entry in"
 msgstr "Elija un departamento para guardar la entrada"
 
 #: plugins/addons/addressbook/address_edit.tpl:24
-#: plugins/addons/addressbook/address_info.tpl:12
+#: plugins/addons/addressbook/address_info.tpl:18
 msgid "Personal"
 msgstr "Personal"
 
-#: plugins/addons/addressbook/address_edit.tpl:44
-#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:48
+#: plugins/addons/addressbook/class_addressbook.inc:805
+#: plugins/addons/addressbook/address_info.tpl:32 html/getxls.php:224
+#: html/getxls.php:298
 msgid "Initials"
 msgstr "Iniciales"
 
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/addons/addressbook/address_edit.tpl:118
+#: plugins/addons/addressbook/address_info.tpl:83
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:46
 msgid "Email"
 msgstr "Correo Electrónico"
 
-#: plugins/addons/addressbook/address_edit.tpl:119
-#: plugins/addons/addressbook/address_info.tpl:53
+#: plugins/addons/addressbook/address_edit.tpl:134
+#: plugins/addons/addressbook/address_info.tpl:99
 msgid "Organizational"
 msgstr "De organización"
 
-#: plugins/addons/addressbook/address_edit.tpl:128
-#: plugins/addons/addressbook/address_info.tpl:61
+#: plugins/addons/addressbook/address_edit.tpl:143
+#: plugins/addons/addressbook/address_info.tpl:109
 msgid "Company"
 msgstr "Compañia"
 
-#: plugins/addons/addressbook/address_edit.tpl:148
-#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/addons/addressbook/address_edit.tpl:167
+#: plugins/addons/addressbook/address_info.tpl:125 html/getxls.php:225
+#: html/getxls.php:298
 msgid "City"
 msgstr "Ciudad"
 
-#: plugins/addons/addressbook/address_edit.tpl:168
-#: plugins/addons/addressbook/address_info.tpl:73
+#: plugins/addons/addressbook/address_edit.tpl:191
+#: plugins/addons/addressbook/address_info.tpl:141
 #: plugins/admin/departments/class_departmentGeneric.inc:541
 msgid "Country"
 msgstr "Pais"
 
-#: plugins/addons/addressbook/main.inc:37
+#: plugins/addons/addressbook/main.inc:35
 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
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
 
-#: plugins/addons/addressbook/class_addressbook.inc:160
+#: plugins/addons/addressbook/class_addressbook.inc:172
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "¿Llamar desde %s a %s ahora?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:164
+#: plugins/addons/addressbook/class_addressbook.inc:176
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -5330,82 +5439,91 @@ msgstr ""
 "No tiene configurado un numero de teléfono personal. Por favor cambie esto "
 "para permitir llamadas directas."
 
-#: plugins/addons/addressbook/class_addressbook.inc:187
-#: plugins/addons/addressbook/class_addressbook.inc:657
+#: plugins/addons/addressbook/class_addressbook.inc:202
+#: plugins/addons/addressbook/class_addressbook.inc:751
 #, 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:194
-#: plugins/addons/addressbook/class_addressbook.inc:295
+#: plugins/addons/addressbook/class_addressbook.inc:209
+#: plugins/addons/addressbook/class_addressbook.inc:318
 msgid "You are not allowed to delete this entry!"
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:289
+#: plugins/addons/addressbook/class_addressbook.inc:312
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Has decidido eliminar la entrada %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:384
+#: plugins/addons/addressbook/class_addressbook.inc:444
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Salvar el contacto %s como una vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:388
+#: plugins/addons/addressbook/class_addressbook.inc:450
 #, php-format
 msgid "Send mail to %s"
 msgstr "Enviar correo a %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:563
 msgid "global addressbook"
 msgstr "Directorio de contactos global"
 
-#: plugins/addons/addressbook/class_addressbook.inc:475
+#: plugins/addons/addressbook/class_addressbook.inc:566
 msgid "user database"
 msgstr "Usuario de Base de datos"
 
-#: plugins/addons/addressbook/class_addressbook.inc:479
+#: plugins/addons/addressbook/class_addressbook.inc:570
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Contacto guardado en '%s'"
 
-#: plugins/addons/addressbook/class_addressbook.inc:481
+#: plugins/addons/addressbook/class_addressbook.inc:572
 msgid "Creating new entry in"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/addons/addressbook/class_addressbook.inc:520
-#: plugins/addons/logview/class_logview.inc:94
-#: plugins/addons/logview/class_logview.inc:111
-#: plugins/addons/mailqueue/class_mailqueue.inc:305
-#: plugins/addons/mailqueue/class_mailqueue.inc:370
+#: plugins/addons/addressbook/class_addressbook.inc:611
+#: plugins/addons/logview/class_logview.inc:112
+#: plugins/addons/logview/class_logview.inc:133
+#: plugins/addons/mailqueue/class_mailqueue.inc:306
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "All"
 msgstr "Todo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:521
+#: plugins/addons/addressbook/class_addressbook.inc:612
 msgid "Work phone"
 msgstr "Teléfono del trabajo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:521
+#: plugins/addons/addressbook/class_addressbook.inc:612
 msgid "Cell phone"
 msgstr "Móvil"
 
-#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:613 html/getxls.php:223
 msgid "Home phone"
 msgstr "Teléfono particular"
 
-#: plugins/addons/addressbook/class_addressbook.inc:604
+#: plugins/addons/addressbook/class_addressbook.inc:702
 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:612
-msgid ""
-"You have no permissions to create or modify a global address book entry."
-msgstr ""
-"No tiene permisos para crear o modificar una entrada de libreta de "
-"direcciones global."
+#: plugins/addons/addressbook/class_addressbook.inc:782
+#, 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
+#, fuzzy
+msgid "Title"
+msgstr "Archivo"
+
+#: plugins/addons/addressbook/class_addressbook.inc:808 html/getxls.php:169
+#: html/getxls.php:222 html/getxls.php:401 html/getxls.php:421
+#, fuzzy
+msgid "Common name"
+msgstr "Nombre de la localización"
 
 #: plugins/addons/ldapmanager/contentcsv.tpl:2
 msgid ""
@@ -5444,7 +5562,7 @@ msgstr "Este es el informe de estado de la importación:"
 msgid "Selected Template"
 msgstr "Plantilla seleccionada"
 
-#: plugins/addons/ldapmanager/main.inc:40
+#: plugins/addons/ldapmanager/main.inc:34
 #: plugins/addons/ldapmanager/class_ldif.inc:7
 msgid "LDAP manager"
 msgstr "Gestor LDAP"
@@ -5454,51 +5572,51 @@ msgstr "Gestor LDAP"
 msgid "LDIF export"
 msgstr "Exportar a LDIF"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:101
+#: plugins/addons/ldapmanager/class_csvimport.inc:98
 msgid "You've no permission to do CSV imports."
 msgstr "No tiene permisos para hacer importaciones desde CVS."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:161
+#: plugins/addons/ldapmanager/class_csvimport.inc:159
 msgid "Need 'sn','givenName' and 'uid' to create user."
 msgstr "Se necesita 'sn', 'givenName' y 'uid' para crear usuario."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:209
+#: plugins/addons/ldapmanager/class_csvimport.inc:207
 msgid "failed"
 msgstr "Fallado"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:213
+#: plugins/addons/ldapmanager/class_csvimport.inc:211
 msgid "ok"
 msgstr "ok"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:277
+#: plugins/addons/ldapmanager/class_csvimport.inc:275
 msgid "status"
 msgstr "Estado"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:281
+#: plugins/addons/ldapmanager/class_csvimport.inc:279
 #, php-format
 msgid "An Error Occured while inserting entry %s - process aborted"
 msgstr ""
 "Un error ha ocurrido cuando se insertaba la entrada '%s' - El proceso ha "
 "sido abortado."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:319
+#: plugins/addons/ldapmanager/class_csvimport.inc:317
 msgid "Nothing to import!"
 msgstr "¡No hay nada que importar!"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:331
-#: plugins/addons/ldapmanager/class_csvimport.inc:342
-#: plugins/addons/ldapmanager/class_csvimport.inc:347
-#: plugins/addons/ldapmanager/class_import.inc:62
-#: plugins/addons/ldapmanager/class_import.inc:70
+#: plugins/addons/ldapmanager/class_csvimport.inc:329
+#: plugins/addons/ldapmanager/class_csvimport.inc:340
+#: plugins/addons/ldapmanager/class_csvimport.inc:345
+#: plugins/addons/ldapmanager/class_import.inc:61
+#: plugins/addons/ldapmanager/class_import.inc:69
 msgid "There is no file uploaded."
 msgstr "No se ha subido ningún archivo."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:336
-#: plugins/addons/ldapmanager/class_import.inc:55
+#: plugins/addons/ldapmanager/class_csvimport.inc:334
+#: plugins/addons/ldapmanager/class_import.inc:54
 msgid "The specified file is empty."
 msgstr "El archivo especificado está vacío."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:490
+#: plugins/addons/ldapmanager/class_csvimport.inc:488
 msgid "The selected file does not contain any CSV Data..."
 msgstr "El archivo seleccionado no contiene datos CSV..."
 
@@ -5536,11 +5654,11 @@ msgstr "Ha fallado la eliminación de las entradas DNS"
 msgid "Import successful"
 msgstr "Importación correcta"
 
-#: plugins/addons/ldapmanager/class_import.inc:41
-msgid "You've no permission to do LDAP imports."
-msgstr "No tiene permisos para hacer importaciones LDAP"
+#: plugins/addons/ldapmanager/class_import.inc:45
+msgid "You need full access to all objects, to execute the import command."
+msgstr ""
 
-#: plugins/addons/ldapmanager/class_import.inc:108
+#: plugins/addons/ldapmanager/class_import.inc:102
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
@@ -5588,20 +5706,31 @@ msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
 msgid "Click here to save the LDAP Export "
 msgstr "Pulse aquí para exportar la base de datos LDAP"
 
+#: plugins/addons/ldapmanager/class_ldif.inc:35
+#, fuzzy
+msgid "Ldap manager"
+msgstr "Gestor LDAP"
+
+#: plugins/addons/ldapmanager/class_ldif.inc:41
+#, fuzzy
+msgid "Ldap manager addon"
+msgstr "Gestor LDAP"
+
 #: plugins/addons/ldapmanager/class_export.inc:6
 msgid "CSV import"
 msgstr "Importar desde CSV"
 
-#: plugins/addons/ldapmanager/class_export.inc:38
-#: plugins/addons/ldapmanager/class_exportxls.inc:39
-msgid "You've no permission to do LDAP exports."
-msgstr "No tiene permisos para hacer exportaciones LDAP."
-
-#: plugins/addons/ldapmanager/class_export.inc:83
+#: plugins/addons/ldapmanager/class_export.inc:77
 #: plugins/addons/ldapmanager/class_exportxls.inc:89
 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
+#, fuzzy, php-format
+msgid "You are not allowed to export the given ldap entry (%s)"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
+
 #: plugins/addons/ldapmanager/contentexportxls.tpl:3
 msgid ""
 "The XLS export plugin provides methods to download a complete snapshot of "
@@ -5665,68 +5794,88 @@ msgstr "Nombre de Maquina"
 msgid "Message"
 msgstr "Mensaje"
 
-#: plugins/addons/logview/main.inc:33
+#: plugins/addons/logview/main.inc:36
 msgid "System log view"
 msgstr "Ver registro del sistema"
 
 #: plugins/addons/logview/class_logview.inc:6
+#: plugins/addons/logview/class_logview.inc:390
 msgid "System logs"
 msgstr "Registro del sistema"
 
-#: plugins/addons/logview/class_logview.inc:63
+#: plugins/addons/logview/class_logview.inc:71
 msgid "No LOG servers defined!"
 msgstr "¡No se han definido servidores LOG!"
 
-#: plugins/addons/logview/class_logview.inc:73
-#: plugins/addons/logview/class_logview.inc:168
+#: plugins/addons/logview/class_logview.inc:86
+#: plugins/addons/logview/class_logview.inc:182
 msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
 "No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
 "registros!"
 
-#: plugins/addons/logview/class_logview.inc:77
-#: plugins/addons/logview/class_logview.inc:171
+#: plugins/addons/logview/class_logview.inc:92
+#: plugins/addons/logview/class_logview.inc:185
 msgid "Can't select log database for log generation!"
 msgstr ""
 "No puedo consultar la base de datos de registro para la generación de "
 "registros."
 
-#: plugins/addons/logview/class_logview.inc:86
-#: plugins/addons/logview/class_logview.inc:103
+#: plugins/addons/logview/class_logview.inc:104
+#, fuzzy
+msgid "Query for log database failed!. Requesting host names failed."
+msgstr "¡Consulta a la base de datos de logs fallida!"
+
+#: plugins/addons/logview/class_logview.inc:125
 msgid "Query for log database failed!"
 msgstr "¡Consulta a la base de datos de logs fallida!"
 
-#: plugins/addons/logview/class_logview.inc:118
+#: plugins/addons/logview/class_logview.inc:143
 msgid "one hour"
 msgstr "Una hora"
 
-#: plugins/addons/logview/class_logview.inc:118
+#: plugins/addons/logview/class_logview.inc:143
 msgid "6 hours"
 msgstr "6 horas"
 
-#: plugins/addons/logview/class_logview.inc:119
+#: plugins/addons/logview/class_logview.inc:144
 msgid "12 hours"
 msgstr "12 horas"
 
-#: plugins/addons/logview/class_logview.inc:119
+#: plugins/addons/logview/class_logview.inc:144
 msgid "24 hours"
 msgstr "24 horas"
 
-#: plugins/addons/logview/class_logview.inc:120
+#: plugins/addons/logview/class_logview.inc:145
 msgid "2 days"
 msgstr "2 días"
 
-#: plugins/addons/logview/class_logview.inc:120
+#: plugins/addons/logview/class_logview.inc:145
 msgid "one week"
 msgstr "una semana"
 
-#: plugins/addons/logview/class_logview.inc:121
-msgid "2 weeks"
-msgstr "2 semanas"
+#: plugins/addons/logview/class_logview.inc:146
+msgid "2 weeks"
+msgstr "2 semanas"
+
+#: plugins/addons/logview/class_logview.inc:146
+msgid "one month"
+msgstr "un mes"
+
+#: plugins/addons/logview/class_logview.inc:163
+#, fuzzy
+msgid "You have insufficient permissions to view syslog entries."
+msgstr "No tiene permisos para eliminar esta lista de bloqueo."
+
+#: plugins/addons/logview/class_logview.inc:384
+#, fuzzy
+msgid "Log view"
+msgstr "Base de datos de acceso de usuarios"
 
-#: plugins/addons/logview/class_logview.inc:121
-msgid "one month"
-msgstr "un mes"
+#: plugins/addons/logview/class_logview.inc:385
+#, fuzzy
+msgid "Log view addon"
+msgstr "Abajo"
 
 #: plugins/addons/mailqueue/contents.tpl:12
 msgid "Please enter a search string here."
@@ -5753,6 +5902,7 @@ msgid "Remove all messages from selected servers queue"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:31
+#: plugins/addons/mailqueue/class_mailqueue.inc:394
 msgid "Hold all messages"
 msgstr "Guardar todos los mensajes"
 
@@ -5769,6 +5919,7 @@ msgid "Release all messages in selected servers queue"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:35
+#: plugins/addons/mailqueue/class_mailqueue.inc:396
 msgid "Requeue all messages"
 msgstr ""
 
@@ -5797,7 +5948,7 @@ msgid "Error"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:76
-#: plugins/addons/mailqueue/class_mailqueue.inc:373
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Active"
 msgstr "Activo"
 
@@ -5818,6 +5969,7 @@ msgid "hold"
 msgstr "Poner en espera"
 
 #: plugins/addons/mailqueue/contents.tpl:101
+#: plugins/addons/mailqueue/class_mailqueue.inc:398
 msgid "Hold message"
 msgstr "Poner el mensaje en espera"
 
@@ -5837,7 +5989,7 @@ msgstr "cabecera"
 msgid "Display header from this message"
 msgstr "Mostrar cabeceras para este mensaje"
 
-#: plugins/addons/mailqueue/main.inc:38
+#: plugins/addons/mailqueue/main.inc:42
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
 msgid "Mail queue"
 msgstr "Cola de correo"
@@ -5850,7 +6002,7 @@ msgstr ""
 #: plugins/addons/mailqueue/class_mailqueue.inc:85
 #: plugins/addons/mailqueue/class_mailqueue.inc:112
 #: plugins/addons/mailqueue/class_mailqueue.inc:171
-#: plugins/addons/mailqueue/class_mailqueue.inc:198
+#: plugins/addons/mailqueue/class_mailqueue.inc:199
 #, fuzzy, php-format
 msgid ""
 "You do not have permission to execute the command '%s' on the mailqueue."
@@ -5859,43 +6011,92 @@ msgstr "No tiene permisos para crear un usuario en esta 'Base'."
 #: plugins/addons/mailqueue/class_mailqueue.inc:93
 #: plugins/addons/mailqueue/class_mailqueue.inc:121
 #: plugins/addons/mailqueue/class_mailqueue.inc:181
-#: plugins/addons/mailqueue/class_mailqueue.inc:213
+#: plugins/addons/mailqueue/class_mailqueue.inc:214
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:225
+#: plugins/addons/mailqueue/class_mailqueue.inc:226
 msgid "There are no mail server specified."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:275
+#: plugins/addons/mailqueue/class_mailqueue.inc:276
 msgid "up"
 msgstr "Arriba"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:277
+#: plugins/addons/mailqueue/class_mailqueue.inc:278
 msgid "down"
 msgstr "Abajo"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:320
+#: plugins/addons/mailqueue/class_mailqueue.inc:321
 msgid "no limit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:325
+#: plugins/addons/mailqueue/class_mailqueue.inc:326
 msgid "hours"
 msgstr "horas"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:371
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:372
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 msgid "Un hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:374
+#: plugins/addons/mailqueue/class_mailqueue.inc:375
 msgid "Not active"
 msgstr ""
 
+#: plugins/addons/mailqueue/class_mailqueue.inc:384
+#, fuzzy
+msgid "Mailqueue"
+msgstr "Cola de correo"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:385
+#, fuzzy
+msgid "Mailqueue addon"
+msgstr "Cola de correo"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:390
+#, fuzzy
+msgid "Mail queue addon"
+msgstr "Cola de correo"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:393
+#, fuzzy
+msgid "Unhold all messages"
+msgstr "Guardar todos los mensajes"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:395
+#, fuzzy
+msgid "Delete all messages"
+msgstr "Eliminar este mensaje"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:397
+#, fuzzy
+msgid "Unhold message"
+msgstr "Poner el mensaje en espera"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:399
+#, fuzzy
+msgid "Delete message"
+msgstr "Eliminar este mensaje"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:400
+#, fuzzy
+msgid "Requeue message"
+msgstr "Desbloquear el mensaje"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:401
+msgid "Gathering queue data"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:402
+#, fuzzy
+msgid "Get header information"
+msgstr "Información genérica del usuario"
+
 #: plugins/addons/godfs/contents.tpl:8
 msgid "DFS Shares"
 msgstr "Compartidos DFS"
@@ -5965,7 +6166,7 @@ msgid "Create new dfsshare"
 msgstr "Crear un nuevo compartido DFS"
 
 #: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:23
+#: ihtml/themes/default/copyPasteDialog.tpl:22
 msgid "Finish"
 msgstr "Terminar"
 
@@ -6018,8 +6219,8 @@ msgstr "Intereses"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/groups/class_groupGeneric.inc:886 include/class_acl.inc:164
-#: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
+#: plugins/admin/groups/class_groupGeneric.inc:888 include/class_acl.inc:164
+#: html/getxls.php:124 html/getxls.php:126 html/getxls.php:309
 msgid "Groups"
 msgstr "Grupos"
 
@@ -6106,14 +6307,14 @@ msgstr ""
 #: 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:621
-#: plugins/admin/fai/class_faiManagement.inc:627
+#: plugins/admin/fai/class_faiManagement.inc:623
+#: plugins/admin/fai/class_faiManagement.inc:629
 #: 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:80
+#: ihtml/themes/default/snapshotdialog.tpl:78
 msgid "Continue"
 msgstr "Continuar"
 
@@ -6151,7 +6352,7 @@ msgstr "Mostrar direcciones que concuerden con"
 
 #: plugins/admin/groups/generic.tpl:6 plugins/admin/groups/paste_generic.tpl:5
 #: plugins/admin/ogroups/generic.tpl:7
-#: plugins/admin/ogroups/class_ogroup.inc:674
+#: plugins/admin/ogroups/class_ogroup.inc:689
 msgid "Group name"
 msgstr "Nombre del grupo"
 
@@ -6163,13 +6364,6 @@ msgstr "Nombre 'Posix' del grupo"
 msgid "Descriptive text for this group"
 msgstr "Descripción del grupo"
 
-#: plugins/admin/groups/generic.tpl:34 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/server.tpl:26 plugins/admin/systems/phone.tpl:20
-#: plugins/admin/systems/workstation.tpl:30
-#: plugins/admin/systems/component.tpl:20 plugins/admin/ogroups/generic.tpl:29
-msgid "Choose subtree to place group in"
-msgstr "Elija lugar del árbol para colocar la aplicación"
-
 #: plugins/admin/groups/generic.tpl:53
 #: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
@@ -6219,13 +6413,13 @@ msgstr ""
 msgid "Group administration"
 msgstr "Administración de grupos"
 
-#: plugins/admin/groups/class_groupManagement.inc:241
+#: plugins/admin/groups/class_groupManagement.inc:243
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Está a punto de borrar el grupo '%s'."
 
-#: plugins/admin/groups/class_groupManagement.inc:247
-#: plugins/admin/groups/class_groupManagement.inc:278
+#: plugins/admin/groups/class_groupManagement.inc:249
+#: plugins/admin/groups/class_groupManagement.inc:281
 msgid "You are not allowed to delete this group!"
 msgstr "¡No le está permitido eliminar este grupo!"
 
@@ -6235,64 +6429,64 @@ msgstr ""
 "¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
 "archivo de configuración!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:173
+#: plugins/admin/groups/class_groupGeneric.inc:175
 msgid "This 'dn' is no group."
 msgstr "Este 'dn' no es un grupo."
 
-#: plugins/admin/groups/class_groupGeneric.inc:323
+#: plugins/admin/groups/class_groupGeneric.inc:325
 msgid "Samba group"
 msgstr "Grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:323
+#: plugins/admin/groups/class_groupGeneric.inc:325
 msgid "Domain admins"
 msgstr "Administradores del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:323
+#: plugins/admin/groups/class_groupGeneric.inc:325
 msgid "Domain users"
 msgstr "Usuarios del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:324
+#: plugins/admin/groups/class_groupGeneric.inc:326
 msgid "Domain guests"
 msgstr "Invitados del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
+#: plugins/admin/groups/class_groupGeneric.inc:331
 #, php-format
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:444
 msgid "! unknown id"
 msgstr "! id desconocido"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:481
 #, php-format
 msgid ""
 "Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:508
-#: plugins/admin/groups/class_groupGeneric.inc:716
+#: plugins/admin/groups/class_groupGeneric.inc:510
+#: 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:626
+#: plugins/admin/groups/class_groupGeneric.inc:628
 #, php-format
 msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:631
+#: plugins/admin/groups/class_groupGeneric.inc:633
 #, php-format
 msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:744
 #: plugins/admin/systems/class_printGeneric.inc:660
-#: plugins/admin/ogroups/class_ogroup.inc:593
+#: 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:752
+#: plugins/admin/groups/class_groupGeneric.inc:754
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -6300,43 +6494,43 @@ msgstr ""
 "El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
 "numeros y guiones."
 
-#: plugins/admin/groups/class_groupGeneric.inc:763
-#: plugins/admin/groups/class_groupGeneric.inc:777
-#: plugins/admin/groups/class_groupGeneric.inc:784
+#: plugins/admin/groups/class_groupGeneric.inc:765
+#: plugins/admin/groups/class_groupGeneric.inc:779
+#: plugins/admin/groups/class_groupGeneric.inc:786
 msgid "Value specified as 'Name' is already used."
 msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/groups/class_groupGeneric.inc:881
+#: plugins/admin/groups/class_groupGeneric.inc:883
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Parámetros genéricos de la cola"
 
-#: plugins/admin/groups/class_groupGeneric.inc:893
+#: plugins/admin/groups/class_groupGeneric.inc:895
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "Miembros están en un grupo de salto telefónico"
 
-#: plugins/admin/groups/class_groupGeneric.inc:894
+#: plugins/admin/groups/class_groupGeneric.inc:896
 #, fuzzy
 msgid "Nagios group"
 msgstr "Cuenta Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:897
+#: plugins/admin/groups/class_groupGeneric.inc:899
 #, fuzzy
 msgid "Group member"
 msgstr "Miembros del grupo"
 
-#: plugins/admin/groups/class_groupGeneric.inc:898
+#: plugins/admin/groups/class_groupGeneric.inc:900
 #, fuzzy
 msgid "Samba group type"
 msgstr "Grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:899
+#: plugins/admin/groups/class_groupGeneric.inc:901
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Directorio Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:900
+#: plugins/admin/groups/class_groupGeneric.inc:902
 #, fuzzy
 msgid "Samba SID"
 msgstr "Samba"
@@ -6361,81 +6555,90 @@ msgstr "Añadir categoría"
 msgid "Available applications"
 msgstr "Aplicaciones disponibles"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:565
+#: plugins/admin/groups/class_groupMail.inc:285 include/class_acl.inc:565
 #: include/class_acl.inc:656
 msgid "read"
 msgstr "leer"
 
-#: plugins/admin/groups/class_groupMail.inc:285
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid "post"
 msgstr "post"
 
-#: plugins/admin/groups/class_groupMail.inc:286
+#: plugins/admin/groups/class_groupMail.inc:287
 msgid "external post"
 msgstr "post externo"
 
-#: plugins/admin/groups/class_groupMail.inc:287
+#: plugins/admin/groups/class_groupMail.inc:288
 msgid "append"
 msgstr "añadir"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:566
+#: plugins/admin/groups/class_groupMail.inc:289 include/class_acl.inc:566
 #: include/class_acl.inc:658
 msgid "write"
 msgstr "escribir"
 
-#: plugins/admin/groups/class_groupMail.inc:324
+#: plugins/admin/groups/class_groupMail.inc:327
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Esta 'dn' no tiene extensiones validas de correo."
 
-#: plugins/admin/groups/class_groupMail.inc:394
+#: plugins/admin/groups/class_groupMail.inc:349
+#, fuzzy
+msgid "Remove shared folder from mail server database"
+msgstr "No se puede eliminar el usuario de la base de datos Kerberos"
+
+#: plugins/admin/groups/class_groupMail.inc:350
+msgid "Remove the shared folder and all its contents from mail server."
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:409
 msgid "You're trying to add an invalid email address "
 msgstr "Esta intentando añadir una dirección de correo no valida"
 
-#: plugins/admin/groups/class_groupMail.inc:395
+#: plugins/admin/groups/class_groupMail.inc:410
 msgid "to the list of forwarders."
 msgstr "a la lista de remitentes."
 
-#: plugins/admin/groups/class_groupMail.inc:653
+#: plugins/admin/groups/class_groupMail.inc:669
 #, 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:825
+#: plugins/admin/groups/class_groupMail.inc:851
 #, 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:854
+#: plugins/admin/groups/class_groupMail.inc:880
 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:887
+#: plugins/admin/groups/class_groupMail.inc:913
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:891
+#: plugins/admin/groups/class_groupMail.inc:917
 msgid "Please select a valid mail server."
 msgstr "Por favor seleccione un servidor de correo valido."
 
-#: plugins/admin/groups/class_groupMail.inc:1029
+#: plugins/admin/groups/class_groupMail.inc:1055
 #, fuzzy
 msgid "Group mail"
 msgstr "Nombre del grupo"
 
-#: plugins/admin/groups/class_groupMail.inc:1037
+#: plugins/admin/groups/class_groupMail.inc:1063
 #, fuzzy
 msgid "Alternate addresses"
 msgstr "Direcciones alternativas"
 
-#: plugins/admin/groups/class_groupMail.inc:1038
+#: plugins/admin/groups/class_groupMail.inc:1064
 #, fuzzy
 msgid "Forwarding addresses"
 msgstr "Cuenta Principal"
 
-#: plugins/admin/groups/class_groupMail.inc:1041
+#: plugins/admin/groups/class_groupMail.inc:1067
 #: plugins/admin/systems/printer.tpl:82
 #: plugins/admin/systems/class_printGeneric.inc:869
 msgid "Permissions"
@@ -6477,15 +6680,15 @@ msgstr "Mostrar usuarios del departamento"
 msgid "Regular expression for matching user names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/admin/groups/class_groupApplication.inc:395
+#: plugins/admin/groups/class_groupApplication.inc:407
 msgid "This 'dn' is no appgroup."
 msgstr "Esta'dn' no es un grupo de aplicaciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:403
+#: plugins/admin/groups/class_groupApplication.inc:415
 msgid "Remove applications"
 msgstr "Borrar aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:404
+#: plugins/admin/groups/class_groupApplication.inc:416
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -6493,11 +6696,11 @@ msgstr ""
 "Este grupo tiene la características de aplicación activa. Puede "
 "desactivarlas apretando a continuación."
 
-#: plugins/admin/groups/class_groupApplication.inc:406
+#: plugins/admin/groups/class_groupApplication.inc:418
 msgid "Create applications"
 msgstr "Crear aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:407
+#: plugins/admin/groups/class_groupApplication.inc:419
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -6505,95 +6708,112 @@ msgstr ""
 "Este grupo tiene la característica de aplicacióon desactivada. Puede "
 "activarlas apretando a continuación."
 
-#: plugins/admin/groups/class_groupApplication.inc:420
+#: plugins/admin/groups/class_groupApplication.inc:426
+#: include/class_tabs.inc:303
+msgid "ACL"
+msgstr "ACL"
+
+#: plugins/admin/groups/class_groupApplication.inc:429
+msgid ""
+"You do not have permission to query application entries. All your changes "
+"will not be saved."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:442
 msgid "Invalid character in category name."
 msgstr "El campo 'Nombre de categoría' contiene caracteres no validos."
 
-#: plugins/admin/groups/class_groupApplication.inc:428
+#: plugins/admin/groups/class_groupApplication.inc:450
 msgid "The specified category already exists."
 msgstr "La categoría especificada ya existe."
 
-#: plugins/admin/groups/class_groupApplication.inc:526
+#: plugins/admin/groups/class_groupApplication.inc:556
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "El nombre seleccionado de aplicación no es único. Por favor compruebe su "
 "base de datos LDAP."
 
-#: plugins/admin/groups/class_groupApplication.inc:562
+#: plugins/admin/groups/class_groupApplication.inc:594
 msgid "The selected application has no options."
 msgstr "La aplicación seleccionada no tiene opciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:650
-#: plugins/admin/departments/class_divListDepartment.inc:137
+#: plugins/admin/groups/class_groupApplication.inc:680
+#: plugins/admin/departments/class_divListDepartment.inc:154
 msgid "department"
 msgstr "departamento"
 
-#: plugins/admin/groups/class_groupApplication.inc:658
+#: plugins/admin/groups/class_groupApplication.inc:689
 msgid "application"
 msgstr "aplicación"
 
-#: plugins/admin/groups/class_groupApplication.inc:694
-#: plugins/admin/groups/class_groupApplication.inc:736
+#: plugins/admin/groups/class_groupApplication.inc:705
+#: plugins/admin/groups/class_groupApplication.inc:746
 msgid "Delete entry"
 msgstr "Borrar entrada"
 
-#: plugins/admin/groups/class_groupApplication.inc:696
-#: plugins/admin/groups/class_groupApplication.inc:731
+#: plugins/admin/groups/class_groupApplication.inc:707
+#: plugins/admin/groups/class_groupApplication.inc:741
 msgid "Move up"
 msgstr "Arriba"
 
-#: plugins/admin/groups/class_groupApplication.inc:699
-#: plugins/admin/groups/class_groupApplication.inc:734
+#: plugins/admin/groups/class_groupApplication.inc:710
+#: plugins/admin/groups/class_groupApplication.inc:744
 msgid "Move down"
 msgstr "Abajo"
 
-#: plugins/admin/groups/class_groupApplication.inc:729
+#: plugins/admin/groups/class_groupApplication.inc:739
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:769
+#: plugins/admin/groups/class_groupApplication.inc:784
 msgid "This application is no longer available."
 msgstr "La aplicación ya no está disponible."
 
-#: plugins/admin/groups/class_groupApplication.inc:772
+#: plugins/admin/groups/class_groupApplication.inc:787
 #, php-format
 msgid "This application is not available in any release named %s."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:776
+#: plugins/admin/groups/class_groupApplication.inc:791
 msgid "Check parameter"
 msgstr "Comprobar parámetros"
 
-#: plugins/admin/groups/class_groupApplication.inc:778
+#: plugins/admin/groups/class_groupApplication.inc:793
 msgid "This application has changed parameters."
 msgstr "Los parámetros de la aplicación han cambiado."
 
-#: plugins/admin/groups/class_groupApplication.inc:871
+#: plugins/admin/groups/class_groupApplication.inc:914
 #, fuzzy, php-format
 msgid "Removing of groups/applications with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
 
-#: plugins/admin/groups/class_groupApplication.inc:916
+#: plugins/admin/groups/class_groupApplication.inc:967
 #, fuzzy, php-format
 msgid "Saving of groups/applications with dn '%s' failed."
 msgstr "Ha fallado la grabación de la aplicación"
 
-#: plugins/admin/groups/class_groupApplication.inc:960
+#: plugins/admin/groups/class_groupApplication.inc:1018
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:1103
+#: plugins/admin/groups/class_groupApplication.inc:1023
+msgid ""
+"There are no releases available. You will not be able to select another "
+"release."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:1164
 #, fuzzy
 msgid "Group applications"
 msgstr "Mostrar aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:1110
+#: plugins/admin/groups/class_groupApplication.inc:1171
 #: plugins/admin/groups/class_divListGroup.inc:176
 #: plugins/admin/applications/class_applicationGeneric.inc:520
-#: plugins/admin/applications/class_divListApplication.inc:144
+#: plugins/admin/applications/class_divListApplication.inc:160
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/admin/mimetypes/class_mimetypeGeneric.inc:676
 #: plugins/gofon/fonreports/contents.tpl:34
@@ -6601,19 +6821,19 @@ msgstr "Mostrar aplicaciones"
 msgid "Application"
 msgstr "Aplicación"
 
-#: plugins/admin/groups/class_groupApplication.inc:1111
+#: plugins/admin/groups/class_groupApplication.inc:1172
 #: 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/fai/faiPackage.tpl:33
-#: plugins/admin/fai/class_faiPackage.inc:560
+#: plugins/admin/fai/faiPackage.tpl:37
+#: plugins/admin/fai/class_faiPackage.inc:542
 #: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr "Versión"
 
-#: plugins/admin/groups/class_groupApplication.inc:1112
+#: plugins/admin/groups/class_groupApplication.inc:1173
 #, fuzzy
 msgid "Application parameter"
 msgstr "Nombre de la aplicación"
@@ -6644,7 +6864,7 @@ msgstr "Nombre de grupo / Departamento"
 #: plugins/admin/systems/workstation.tpl:1
 #: plugins/admin/ogroups/class_divListOGroup.inc:59
 #: plugins/admin/fai/faiScriptEntry.tpl:33
-#: plugins/gofon/conference/generic.tpl:4
+#: plugins/gofon/conference/generic.tpl:5
 msgid "Properties"
 msgstr "Propiedades"
 
@@ -6694,58 +6914,57 @@ msgid "Create new group"
 msgstr "Crear nuevo grupo"
 
 #: plugins/admin/groups/class_divListGroup.inc:170
-#: plugins/admin/users/class_divListUsers.inc:183
+#: plugins/admin/users/class_divListUsers.inc:187
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_divListGroup.inc:197
-#: plugins/admin/users/class_divListUsers.inc:243
-#: plugins/admin/applications/class_divListApplication.inc:172
+#: 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:184
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
 msgid "cut"
 msgstr "Cortar"
 
-#: plugins/admin/groups/class_divListGroup.inc:197
-#: plugins/admin/users/class_divListUsers.inc:243
-#: plugins/admin/applications/class_divListApplication.inc:172
+#: 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:184
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:200
 msgid "Cut this entry"
 msgstr "Cortar por esta entrada"
 
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:245
-#: plugins/admin/applications/class_divListApplication.inc:179
+#: 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:191
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:199
-#: plugins/admin/users/class_divListUsers.inc:245
-#: plugins/admin/applications/class_divListApplication.inc:179
+#: 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:191
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:207
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: plugins/admin/groups/class_divListGroup.inc:203
-#: plugins/admin/applications/class_divListApplication.inc:184
-#: plugins/admin/departments/class_divListDepartment.inc:116
+#: 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:196
-#: plugins/gofon/conference/class_divListConferences.inc:124
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:212
+#: plugins/gofon/conference/class_divListConferences.inc:159
 msgid "Edit this entry"
 msgstr "Editar esta entrada"
 
-#: plugins/admin/groups/class_divListGroup.inc:211
-#: plugins/admin/applications/class_divListApplication.inc:190
-#: plugins/admin/departments/class_divListDepartment.inc:121
+#: 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:201
-#: plugins/gofon/conference/class_divListConferences.inc:127
-#: plugins/gofon/conference/class_divListConferences.inc:129
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:217
+#: plugins/gofon/conference/class_divListConferences.inc:169
 msgid "Delete this entry"
 msgstr "Borrar esta entrada"
 
@@ -6778,33 +6997,33 @@ msgstr ""
 "cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
 "contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/users/class_userManagement.inc:193
-#: plugins/admin/users/class_userManagement.inc:273
+#: plugins/admin/users/class_userManagement.inc:191
+#: plugins/admin/users/class_userManagement.inc:272
 msgid "You are not allowed to set this users password!"
 msgstr "No le es permitido cambiarle la contraseña a estos usuarios."
 
-#: plugins/admin/users/class_userManagement.inc:309
+#: plugins/admin/users/class_userManagement.inc:307
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Esta a punto de borrar el usuario %s"
 
-#: plugins/admin/users/class_userManagement.inc:340
+#: plugins/admin/users/class_userManagement.inc:337
 msgid "You are not allowed to delete this user!"
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/users/class_userManagement.inc:448
+#: plugins/admin/users/class_userManagement.inc:444
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:282
+#: plugins/admin/ogroups/class_ogroup.inc:290
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:467
+#: plugins/admin/users/class_userManagement.inc:463
 #, fuzzy
 msgid "Please select a valid template."
 msgstr "Por favor seleccione un fichero válido."
 
-#: plugins/admin/users/class_userManagement.inc:560
+#: plugins/admin/users/class_userManagement.inc:556
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Una persona con el nombre elegido ya existe en el árbol"
 
@@ -6823,12 +7042,12 @@ msgstr ""
 "Elegir 'ninguno' para saltarse el uso de plantillas."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:798
-#: plugins/admin/fai/class_faiTemplate.inc:451
+#: plugins/admin/systems/class_systemManagement.inc:812
+#: plugins/admin/fai/class_faiTemplate.inc:486
 msgid "Template"
 msgstr "Plantilla"
 
-#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
+#: plugins/admin/users/main.inc:42 plugins/admin/users/main.inc:48
 msgid "User administration"
 msgstr "Administración de Usuarios"
 
@@ -6903,85 +7122,85 @@ 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:129
+#: plugins/admin/users/class_divListUsers.inc:133
 msgid "Create new user"
 msgstr "Crear nuevo usuario"
 
-#: plugins/admin/users/class_divListUsers.inc:129
+#: plugins/admin/users/class_divListUsers.inc:133
 msgid "New user"
 msgstr "Nuevo usuario"
 
-#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/users/class_divListUsers.inc:135
 msgid "Create new template"
 msgstr "Crear nueva plantilla"
 
-#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/users/class_divListUsers.inc:135
 msgid "New template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_divListUsers.inc:181
+#: plugins/admin/users/class_divListUsers.inc:185
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:182
+#: plugins/admin/users/class_divListUsers.inc:186
 msgid "Edit generic properties"
 msgstr "Editar propiedades genéricas"
 
-#: plugins/admin/users/class_divListUsers.inc:184
+#: plugins/admin/users/class_divListUsers.inc:188
 msgid "Edit UNIX properties"
 msgstr "Editar propiedades UNIX"
 
-#: plugins/admin/users/class_divListUsers.inc:186
+#: plugins/admin/users/class_divListUsers.inc:190
 msgid "Edit environment properties"
 msgstr "Editar propiedades de estado"
 
-#: plugins/admin/users/class_divListUsers.inc:188
+#: plugins/admin/users/class_divListUsers.inc:192
 msgid "Edit mail properties"
 msgstr "Editar propiedades de correo"
 
-#: plugins/admin/users/class_divListUsers.inc:190
+#: plugins/admin/users/class_divListUsers.inc:194
 msgid "Edit phone properties"
 msgstr "Editar propiedades telefónicas"
 
-#: plugins/admin/users/class_divListUsers.inc:192
+#: plugins/admin/users/class_divListUsers.inc:196
 msgid "Edit fax properies"
 msgstr "Editar propiedades de fax"
 
-#: plugins/admin/users/class_divListUsers.inc:194
+#: plugins/admin/users/class_divListUsers.inc:198
 msgid "Edit samba properties"
 msgstr "Editar propiedades samba"
 
-#: plugins/admin/users/class_divListUsers.inc:196
+#: plugins/admin/users/class_divListUsers.inc:200
 msgid "Edit netatalk properties"
 msgstr "Editar propiedades Netatalk"
 
-#: plugins/admin/users/class_divListUsers.inc:197
+#: plugins/admin/users/class_divListUsers.inc:201
 msgid "Create user from template"
 msgstr "Crear usuario desde plantilla"
 
-#: plugins/admin/users/class_divListUsers.inc:198
+#: plugins/admin/users/class_divListUsers.inc:202
 msgid "Create user with this template"
 msgstr "Crear usuario con esta plantilla"
 
-#: plugins/admin/users/class_divListUsers.inc:254
+#: plugins/admin/users/class_divListUsers.inc:260
 msgid "password"
 msgstr "contraseña"
 
-#: plugins/admin/users/class_divListUsers.inc:258
+#: plugins/admin/users/class_divListUsers.inc:264
 #, 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:270
+#: plugins/admin/users/class_divListUsers.inc:278
 #, fuzzy
 msgid "You are not allowed to remove this user."
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/users/class_divListUsers.inc:289
+#: plugins/admin/users/class_divListUsers.inc:297
 msgid "Online"
 msgstr "En linea"
 
-#: plugins/admin/users/class_divListUsers.inc:296
+#: plugins/admin/users/class_divListUsers.inc:304
 msgid "Offline"
 msgstr "Fuera de linea"
 
@@ -6993,9 +7212,9 @@ msgid "Application name"
 msgstr "Nombre de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:15
-#: plugins/gofon/macro/generic.tpl:10
-#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:14
+#: plugins/gofon/macro/class_gofonMacro.inc:486 html/getxls.php:222
+#: html/getxls.php:297
 msgid "Display name"
 msgstr "Nombre mostrado"
 
@@ -7012,7 +7231,7 @@ msgstr ""
 #: plugins/admin/systems/goMailServer.tpl:215
 #: plugins/admin/systems/goImapServer.tpl:110
 #: plugins/admin/ogroups/termgroup.tpl:101
-#: plugins/admin/fai/faiTemplateEntry.tpl:89
+#: plugins/admin/fai/faiTemplateEntry.tpl:105
 msgid "Execute"
 msgstr "Ejecute"
 
@@ -7069,15 +7288,15 @@ msgstr "Colocar entrada en los barra de inicio de los miembros"
 #: plugins/admin/applications/generic.tpl:135
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
-#: plugins/admin/fai/faiTemplateEntry.tpl:40
+#: plugins/admin/fai/faiTemplateEntry.tpl:49
 msgid "Upload"
 msgstr "Enviar"
 
 #: plugins/admin/applications/generic.tpl:137
-#: plugins/admin/fai/class_faiScript.inc:288
-#: plugins/admin/fai/class_faiTemplate.inc:252
+#: plugins/admin/fai/class_faiScript.inc:297
+#: plugins/admin/fai/class_faiTemplate.inc:271
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:273
+#: plugins/admin/fai/class_faiHook.inc:308
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 msgid "Download"
 msgstr "Descargar"
@@ -7101,12 +7320,12 @@ msgstr ""
 "Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
 
 #: plugins/admin/applications/class_applicationParameters.inc:96
-#: plugins/admin/fai/class_faiVariable.inc:384
+#: plugins/admin/fai/class_faiVariable.inc:412
 msgid "Variable"
 msgstr "Variable"
 
 #: plugins/admin/applications/class_applicationParameters.inc:96
-#: plugins/gofon/macro/parameter.tpl:9
+#: plugins/gofon/macro/parameter.tpl:10
 msgid "Default value"
 msgstr "Valor por defecto"
 
@@ -7258,13 +7477,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:112
+#: plugins/admin/applications/class_divListApplication.inc:128
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:122
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:138
 msgid "new"
 msgstr "nuevo"
 
-#: plugins/admin/applications/class_divListApplication.inc:113
+#: plugins/admin/applications/class_divListApplication.inc:129
 msgid "Create new application"
 msgstr "Crear nueva aplicación"
 
@@ -7289,7 +7508,7 @@ msgid "Name of subtree to create"
 msgstr "Nombre del subárbol para crear"
 
 #: plugins/admin/departments/generic.tpl:19
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:84
 msgid "Descriptive text for department"
 msgstr "Descripción del departamento"
 
@@ -7303,7 +7522,7 @@ msgid "Category for this subtree"
 msgstr "Categoría de este subarbol"
 
 #: plugins/admin/departments/generic.tpl:39
-#: plugins/gofon/conference/generic.tpl:127
+#: plugins/gofon/conference/generic.tpl:168
 msgid "Choose subtree to place department in"
 msgstr "Elija subárbol para colocar el departamento"
 
@@ -7439,7 +7658,7 @@ msgstr ""
 #: 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:54
+#: ihtml/themes/default/snapshotdialog.tpl:53
 msgid "Object"
 msgstr "Objeto"
 
@@ -7471,13 +7690,13 @@ msgid "Department name"
 msgstr "Nombre del departamento"
 
 #: plugins/admin/departments/class_departmentManagement.inc:156
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:132
 #, 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:152
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:153
 msgid "You have no permission to remove this department."
 msgstr "No tiene permisos para eliminar este departamento."
 
@@ -7505,12 +7724,12 @@ msgstr ""
 msgid "Regular expression for matching department names"
 msgstr "Expresiones regulares para encontrar nombres de departamentos"
 
-#: plugins/admin/departments/class_divListDepartment.inc:77
-#: plugins/admin/fai/class_divListFai.inc:124
+#: 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:84
+#: plugins/admin/departments/class_divListDepartment.inc:101
 msgid "Create new department"
 msgstr "Crear nuevo departamento"
 
@@ -7549,7 +7768,7 @@ 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:543
+#: plugins/admin/systems/class_termDNS.inc:542
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
@@ -7567,7 +7786,7 @@ msgstr "presente"
 #: 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:470
+#: plugins/admin/systems/class_workstationStartup.inc:471
 msgid "This 'dn' has no terminal features."
 msgstr "Esta 'dn' no tiene características de terminal."
 
@@ -7770,7 +7989,7 @@ 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:505
+#: 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:389
@@ -7798,7 +8017,7 @@ 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:506
+#: plugins/admin/systems/class_terminalGeneric.inc:509
 msgid "Root server"
 msgstr "Servidor Raíz"
 
@@ -7807,7 +8026,7 @@ 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:507
+#: plugins/admin/systems/class_terminalGeneric.inc:510
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
 
@@ -7874,10 +8093,10 @@ msgstr "desconocido"
 #: 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:266
-#: plugins/admin/systems/class_workstationStartup.inc:284
-#: plugins/admin/systems/class_workstationStartup.inc:288
-#: plugins/admin/systems/class_workstationStartup.inc:783
+#: 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
@@ -8094,7 +8313,7 @@ msgid "Telephone hardware"
 msgstr "Componente telefónico"
 
 #: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:309
+#: plugins/admin/systems/class_workstationStartup.inc:310
 #, php-format
 msgid ""
 "Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
@@ -8114,31 +8333,31 @@ msgid "Terminal startup"
 msgstr "Plantilla de terminal"
 
 #: plugins/admin/systems/class_terminalStartup.inc:451
-#: plugins/admin/systems/class_workstationStartup.inc:1109
+#: plugins/admin/systems/class_workstationStartup.inc:1118
 #, fuzzy
 msgid "Ldap server"
 msgstr "Servidor LDAP"
 
 #: plugins/admin/systems/class_terminalStartup.inc:453
-#: plugins/admin/systems/class_workstationStartup.inc:1113
+#: plugins/admin/systems/class_workstationStartup.inc:1122
 #, fuzzy
 msgid "Kernel modules"
 msgstr "Comprobar parámetros"
 
 #: plugins/admin/systems/class_terminalStartup.inc:454
-#: plugins/admin/systems/class_workstationStartup.inc:1110
+#: plugins/admin/systems/class_workstationStartup.inc:1119
 #: 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:1111
+#: plugins/admin/systems/class_workstationStartup.inc:1120
 #, fuzzy
 msgid "Kernel parameter"
 msgstr "Comprobar parámetros"
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:185
 msgid "Server name"
 msgstr "Nombre del servidor"
 
@@ -8354,35 +8573,35 @@ msgid ""
 "activated."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:485
+#: plugins/admin/systems/class_terminalGeneric.inc:488
 #, php-format
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:496
-#: plugins/admin/systems/class_terminalGeneric.inc:502
-#: plugins/admin/systems/class_systemManagement.inc:799
+#: 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_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:385
 msgid "Terminal"
 msgstr "Terminal"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:497
+#: plugins/admin/systems/class_terminalGeneric.inc:500
 #, fuzzy
 msgid "Terminal generic"
 msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:508
+#: plugins/admin/systems/class_terminalGeneric.inc:511
 #, fuzzy
 msgid "Syslog server enabled"
 msgstr "Servidor de Logs"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:509
+#: plugins/admin/systems/class_terminalGeneric.inc:512
 #, fuzzy
 msgid "Ntp server settings"
 msgstr "Parámetros del usuario"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:512
+#: 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:391
@@ -8530,7 +8749,7 @@ msgid "Workstation generic"
 msgstr "Nombre de la estación de trabajo"
 
 #: plugins/admin/systems/class_workstationGeneric.inc:510
-#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_systemManagement.inc:814
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:384
 #: plugins/generic/references/class_reference.inc:48
@@ -8547,94 +8766,94 @@ msgstr "Servidor NTP"
 msgid "Systems"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:208
+#: plugins/admin/systems/class_systemManagement.inc:222
 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:233
+#: plugins/admin/systems/class_systemManagement.inc:247
 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:250
+#: 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:304
+#: plugins/admin/systems/class_systemManagement.inc:318
 #, 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:310
-#: plugins/admin/systems/class_systemManagement.inc:371
+#: plugins/admin/systems/class_systemManagement.inc:324
+#: plugins/admin/systems/class_systemManagement.inc:385
 #: 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:638
+#: plugins/admin/systems/class_systemManagement.inc:652
 msgid "New terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:640
+#: plugins/admin/systems/class_systemManagement.inc:654
 msgid "New workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:642
+#: plugins/admin/systems/class_systemManagement.inc:656
 msgid "New Device"
 msgstr "Nuevo dispositivo"
 
-#: plugins/admin/systems/class_systemManagement.inc:661
+#: plugins/admin/systems/class_systemManagement.inc:675
 msgid "Terminal template for"
 msgstr "Plantilla de terminal para"
 
-#: plugins/admin/systems/class_systemManagement.inc:677
+#: plugins/admin/systems/class_systemManagement.inc:691
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
-#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_systemManagement.inc:811
 msgid "New System from incoming"
 msgstr "Nuevo sistema desde la entrada"
 
-#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_systemManagement.inc:815
 msgid "Workstation is installing"
 msgstr "La estación de trabajo se está instalando"
 
-#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_systemManagement.inc:816
 msgid "Workstation is waiting for action"
 msgstr "la estación de trabajo esta esperando por una acción"
 
-#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_systemManagement.inc:817
 msgid "Workstation installation failed"
 msgstr "Ha fallado la instalación de la estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:806
+#: plugins/admin/systems/class_systemManagement.inc:820
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:807
+#: plugins/admin/systems/class_systemManagement.inc:821
 msgid "Server is waiting for action"
 msgstr "El servidor está esperando por una acción"
 
-#: plugins/admin/systems/class_systemManagement.inc:808
+#: plugins/admin/systems/class_systemManagement.inc:822
 msgid "Server installation failed"
 msgstr "Ha fallado la instalación del servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:809
+#: plugins/admin/systems/class_systemManagement.inc:823
 msgid "Winstation"
 msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/systems/class_systemManagement.inc:810
+#: plugins/admin/systems/class_systemManagement.inc:824
 msgid "Network Device"
 msgstr "Dispositivo de Red"
 
-#: plugins/admin/systems/class_systemManagement.inc:811
-#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_systemManagement.inc:825
+#: plugins/admin/systems/class_divListSystem.inc:137
 msgid "New Terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:812
-#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_systemManagement.inc:826
+#: plugins/admin/systems/class_divListSystem.inc:139
 msgid "New Workstation"
 msgstr "Nueva estación de trabajo"
 
@@ -8784,7 +9003,7 @@ msgid "Reverse zone"
 msgstr "Zona Inversa"
 
 #: plugins/admin/systems/class_servDNS.inc:169
-#: plugins/admin/fai/faiTemplateEntry.tpl:86
+#: plugins/admin/fai/faiTemplateEntry.tpl:102
 msgid "Class"
 msgstr "Clase"
 
@@ -8817,7 +9036,7 @@ 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:542
+#: plugins/admin/systems/class_termDNS.inc:541
 #: plugins/admin/systems/servdnseditzone.tpl:7
 msgid "Zone name"
 msgstr "Nombre de la zona"
@@ -8870,7 +9089,7 @@ msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
 #: plugins/admin/systems/class_goFaxServer.inc:67
 #: plugins/admin/systems/class_goFonServer.inc:70
-#, fuzzy, php-format
+#, fuzzy
 msgid "The attribute password is empty or contains invalid characters."
 msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
@@ -9139,8 +9358,8 @@ msgstr ""
 #: plugins/admin/systems/class_printGeneric.inc:837
 #: plugins/admin/systems/class_printGeneric.inc:839
 #: plugins/admin/ogroups/class_ogroupManagement.inc:379
-#: plugins/admin/fai/faiTemplateEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:103
+#: plugins/admin/fai/faiTemplateEntry.tpl:85
+#: plugins/admin/fai/faiTemplateEntry.tpl:127
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Grupo"
@@ -9366,12 +9585,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:116
+#: plugins/gofon/macro/class_divListMacros.inc:138
 msgid "yes"
 msgstr "si"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:229
-#: plugins/gofon/macro/class_divListMacros.inc:117
+#: plugins/gofon/macro/class_divListMacros.inc:139
 msgid "no"
 msgstr "no"
 
@@ -9518,17 +9737,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:401
+#: plugins/admin/systems/class_workstationStartup.inc:402
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
 "current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:446
+#: plugins/admin/systems/class_workstationStartup.inc:447
 msgid "Please select a 'FAI server' or remove the 'FAI classes'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:508
+#: plugins/admin/systems/class_workstationStartup.inc:509
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
@@ -9536,35 +9755,38 @@ 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:856
+#: plugins/admin/systems/class_workstationStartup.inc:721
+msgid "Not available in current setup"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:863
 #, 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:870
+#: plugins/admin/systems/class_workstationStartup.inc:879
 #, php-format
 msgid ""
 "Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
+"configurations, possibly some classes where deleted or renamed. Server was "
+"reset to 'auto'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1031
+#: plugins/admin/systems/class_workstationStartup.inc:1040
 #, 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:1081
+#: plugins/admin/systems/class_workstationStartup.inc:1090
 #, php-format
 msgid ""
 "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1083
+#: plugins/admin/systems/class_workstationStartup.inc:1092
 #: plugins/admin/systems/class_servRepositorySetup.inc:203
 #, php-format
 msgid ""
@@ -9572,27 +9794,27 @@ msgid ""
 "empty string."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1101
+#: plugins/admin/systems/class_workstationStartup.inc:1110
 #, fuzzy
 msgid "System startup"
 msgstr "Estado del Sistema"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1116
-#: plugins/admin/fai/class_faiProfile.inc:447
-#: plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/systems/class_workstationStartup.inc:1125
+#: 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:1117
+#: plugins/admin/systems/class_workstationStartup.inc:1126
 msgid "Debian mirror"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1118
+#: plugins/admin/systems/class_workstationStartup.inc:1127
 #, fuzzy
 msgid "Debian release"
 msgstr "Versión actual"
 
-#: plugins/admin/systems/class_workstationStartup.inc:1120
+#: plugins/admin/systems/class_workstationStartup.inc:1129
 msgid "FAI status flag"
 msgstr ""
 
@@ -9752,18 +9974,20 @@ msgid "Uploaded ppd file is empty, can't create new ppd file."
 msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
-#: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/fai/class_faiPackage.inc:558
+#: plugins/admin/fai/faiPackage.tpl:45
+#: plugins/admin/fai/class_faiPackage.inc:539
 msgid "Section"
 msgstr "Sección"
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:462
 #: plugins/admin/systems/class_printerPPDDialog.inc:465
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:288
 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
 msgid "False"
 msgstr "Falso"
 
@@ -9805,7 +10029,7 @@ msgstr "Seleccione objetos a añadir"
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/systems/servRepository.tpl:48
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
+#: plugins/admin/ogroups/ogroup_objects.tpl:45
 #: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
 #: plugins/admin/fai/faiPackageEntry.tpl:42
@@ -9814,7 +10038,7 @@ msgstr "Mostrar objetos que concuerden con"
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/systems/servRepository.tpl:52
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
+#: plugins/admin/ogroups/ogroup_objects.tpl:46
 #: plugins/admin/fai/faiProfileEntry.tpl:59
 #: plugins/admin/fai/faiPackageEntry.tpl:46
 msgid "Regular expression for matching object names"
@@ -10086,7 +10310,7 @@ msgstr "Seleccione que controladores de escáner se usaran"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #: plugins/admin/systems/class_servRepository.inc:349
-#: plugins/admin/fai/faiPackage.tpl:29
+#: plugins/admin/fai/faiPackage.tpl:33
 msgid "Repository"
 msgstr "Repositorio"
 
@@ -10417,7 +10641,7 @@ msgid "Attachment"
 msgstr "Adjuntos"
 
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:130
+#: plugins/admin/fai/faiTemplateEntry.tpl:33 include/php_setup.inc:130
 msgid "File"
 msgstr "Archivo"
 
@@ -10572,7 +10796,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:533
+#: plugins/admin/systems/class_termDNS.inc:532
 msgid "MAC address"
 msgstr "Dirección MAC"
 
@@ -10652,7 +10876,7 @@ msgid "New processor"
 msgstr "Nuevo procesador"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_divListFai.inc:134
+#: plugins/admin/fai/class_divListFai.inc:149
 msgid "P"
 msgstr ""
 
@@ -10760,8 +10984,8 @@ msgstr "Sitio web"
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:32
 #: plugins/admin/ogroups/class_mailogroup.inc:146
 #: plugins/admin/ogroups/class_phonequeue.inc:701
-#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/gofon/conference/generic.tpl:100 html/getxls.php:226
+#: html/getxls.php:298 html/getxls.php:300
 msgid "Phone number"
 msgstr "Número de teléfono"
 
@@ -10958,59 +11182,59 @@ msgstr " El campo requerido 'Dirección IP' no ha sido rellenado."
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:325
+#: plugins/admin/systems/class_termDNS.inc:324
 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:332
+#: plugins/admin/systems/class_termDNS.inc:331
 msgid ""
 "The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:352
+#: plugins/admin/systems/class_termDNS.inc:351
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:360
+#: plugins/admin/systems/class_termDNS.inc:359
 #, php-format
 msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:371
+#: plugins/admin/systems/class_termDNS.inc:370
 #, 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:378
+#: plugins/admin/systems/class_termDNS.inc:377
 #: 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:461
+#: plugins/admin/systems/class_termDNS.inc:460
 #, 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:523
+#: plugins/admin/systems/class_termDNS.inc:522
 msgid "DNS"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:524
+#: plugins/admin/systems/class_termDNS.inc:523
 #, fuzzy
 msgid "DNS settings"
 msgstr "Parametros de samba"
 
-#: plugins/admin/systems/class_termDNS.inc:532
+#: plugins/admin/systems/class_termDNS.inc:531
 #, fuzzy
 msgid "IP address"
 msgstr "Dirección IP"
 
-#: plugins/admin/systems/class_termDNS.inc:541
+#: plugins/admin/systems/class_termDNS.inc:540
 #, fuzzy
 msgid "DNS records"
 msgstr "Registros DNS"
@@ -11104,7 +11328,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:300 include/class_acl.inc:369
+#: plugins/admin/fai/class_faiProfile.inc:305 include/class_acl.inc:369
 msgid "Down"
 msgstr "Abajo"
 
@@ -11335,88 +11559,98 @@ msgstr "Mostrar dispositivos de Red"
 msgid "Display systems of user"
 msgstr "Mostrar sistemas del usuario"
 
-#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/systems/class_divListSystem.inc:137
 msgid "New Terminal template"
 msgstr "Nueva plantilla de terminal"
 
-#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/systems/class_divListSystem.inc:139
 msgid "New Workstation template"
 msgstr "Nueva plantilla de estación de trabajo"
 
-#: plugins/admin/systems/class_divListSystem.inc:110
-#: plugins/admin/systems/class_divListSystem.inc:111
+#: plugins/admin/systems/class_divListSystem.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:141
 msgid "New Server"
 msgstr "Nuevo servidor"
 
-#: plugins/admin/systems/class_divListSystem.inc:112
-#: plugins/admin/systems/class_divListSystem.inc:113
+#: plugins/admin/systems/class_divListSystem.inc:142
+#: plugins/admin/systems/class_divListSystem.inc:143
 msgid "New Printer"
 msgstr "Nueva impresora"
 
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/class_divListSystem.inc:115
+#: plugins/admin/systems/class_divListSystem.inc:144
+#: plugins/admin/systems/class_divListSystem.inc:145
 msgid "New Phone"
 msgstr "Nuevo teléfono"
 
-#: plugins/admin/systems/class_divListSystem.inc:116
-#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/systems/class_divListSystem.inc:146
+#: plugins/admin/systems/class_divListSystem.inc:147
 msgid "New Component"
 msgstr "Nuevo componente"
 
-#: plugins/admin/systems/class_divListSystem.inc:135
+#: plugins/admin/systems/class_divListSystem.inc:165
 msgid "Cups Server"
 msgstr "Servidor CUPS"
 
-#: plugins/admin/systems/class_divListSystem.inc:136
+#: plugins/admin/systems/class_divListSystem.inc:166
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:137
+#: plugins/admin/systems/class_divListSystem.inc:167
 msgid "Syslog Server"
 msgstr "Servidor SYSLOG"
 
-#: plugins/admin/systems/class_divListSystem.inc:138
+#: plugins/admin/systems/class_divListSystem.inc:168
 msgid "Mail Server"
 msgstr "Servidor de correo"
 
-#: plugins/admin/systems/class_divListSystem.inc:139
+#: plugins/admin/systems/class_divListSystem.inc:169
 msgid "Imap Server"
 msgstr "Servidor IMAP"
 
-#: plugins/admin/systems/class_divListSystem.inc:140
+#: plugins/admin/systems/class_divListSystem.inc:170
 msgid "Nfs Server"
 msgstr "Servidor NFS"
 
-#: plugins/admin/systems/class_divListSystem.inc:141
+#: plugins/admin/systems/class_divListSystem.inc:171
 msgid "Kerberos Server"
 msgstr "Servidor Kerberos"
 
-#: plugins/admin/systems/class_divListSystem.inc:142
+#: plugins/admin/systems/class_divListSystem.inc:172
 msgid "Asterisk Server"
 msgstr "Servidor Asterisk"
 
-#: plugins/admin/systems/class_divListSystem.inc:143
+#: plugins/admin/systems/class_divListSystem.inc:173
 msgid "Fax Server"
 msgstr "Servidor FAX"
 
-#: plugins/admin/systems/class_divListSystem.inc:144
+#: plugins/admin/systems/class_divListSystem.inc:174
 msgid "Ldap Server"
 msgstr "Servidor LDAP"
 
-#: plugins/admin/systems/class_divListSystem.inc:160
+#: plugins/admin/systems/class_divListSystem.inc:190
 #: plugins/admin/acl/class_divListACL.inc:123
 msgid "Edit system"
 msgstr "Editar sistema"
 
-#: plugins/admin/systems/class_divListSystem.inc:162
+#: plugins/admin/systems/class_divListSystem.inc:192
 #: plugins/admin/acl/class_divListACL.inc:126
 msgid "Delete system"
 msgstr "Eliminar sistema"
 
-#: plugins/admin/systems/class_divListSystem.inc:193
+#: plugins/admin/systems/class_divListSystem.inc:223
 msgid "Set root       password"
 msgstr "Poner Contraseña de root"
 
+#: plugins/admin/systems/class_divListSystem.inc:229
+#, fuzzy
+msgid "Create CD"
+msgstr "Crear"
+
+#: plugins/admin/systems/class_divListSystem.inc:230
+#, fuzzy
+msgid "Create FAI CD"
+msgstr "Crear nuevo objeto FAI."
+
 #: plugins/admin/systems/ServiceAddDialog.tpl:3
 msgid "Adding a new service to the current server"
 msgstr ""
@@ -11797,18 +12031,18 @@ msgid "VoIP service - Asterisk management"
 msgstr "Gestión de Asterisk PBX"
 
 #: plugins/admin/systems/class_goFonServer.inc:67
-#, fuzzy, php-format
+#, fuzzy
 msgid "The attribute DB user is empty or contains invalid characters."
 msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
 #: plugins/admin/systems/class_goFonServer.inc:73
-#, fuzzy, php-format
+#, fuzzy
 msgid ""
 "The attribute local dial prefix is empty or contains invalid characters."
 msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
 #: plugins/admin/systems/class_goFonServer.inc:76
-#, fuzzy, php-format
+#, fuzzy
 msgid ""
 "The attribute country dial prefix is empty or contains invalid characters."
 msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
@@ -11993,6 +12227,52 @@ msgstr "Servicio IMAP"
 msgid "Admin password"
 msgstr "Nueva contraseña"
 
+#: plugins/admin/systems/class_goShareServer.inc:32
+#, fuzzy
+msgid "File service"
+msgstr "Servidor de Archivos"
+
+#: plugins/admin/systems/class_goShareServer.inc:153
+#: plugins/admin/systems/class_goShareServer.inc:343
+#, fuzzy
+msgid "File service (Shares)"
+msgstr "Servidor de Archivos"
+
+#: plugins/admin/systems/class_goShareServer.inc:187
+#, fuzzy, php-format
+msgid "Saving of system server/shares with dn '%s' failed."
+msgstr ""
+"Ha fallado la grabación de los parámetros del servidor de base de datos"
+
+#: plugins/admin/systems/class_goShareServer.inc:238
+#, fuzzy, php-format
+msgid "Creating system server/shares (mount container) with dn '%s' failed."
+msgstr "Ha fallado la creación del contenedor de montaje"
+
+#: plugins/admin/systems/class_goShareServer.inc:252
+#, fuzzy, php-format
+msgid "Removing system server/shares (mount container) with dn '%s' failed."
+msgstr "Ha fallado la eliminación del contenedor de montaje"
+
+#: plugins/admin/systems/class_goShareServer.inc:263
+#, fuzzy, php-format
+msgid "Saving system server/shares (mount container) with dn '%s' failed."
+msgstr "Ha fallado la grabación del contenedor de montaje"
+
+#: plugins/admin/systems/class_goShareServer.inc:344
+#, fuzzy
+msgid "File service - Shares"
+msgstr "Servidor de Archivos"
+
+#: plugins/admin/systems/class_goShareServer.inc:353
+msgid "Apple mounts"
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:356
+#, fuzzy
+msgid "Charset"
+msgstr "Chipset"
+
 #: plugins/admin/systems/goLogDBServer.tpl:1
 #, fuzzy
 msgid "Logging database information"
@@ -12236,64 +12516,18 @@ msgstr "Ha fallado la grabación de la impresora"
 msgid "Saving of server services/"
 msgstr "Servicio Sieve"
 
-#: plugins/admin/systems/class_goService.inc:147
-#, fuzzy, php-format
-msgid "Set status flag for server services/"
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: 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 ""
-"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
-"parece existir."
-
-#: plugins/admin/systems/class_goShareServer.inc:32
-#, fuzzy
-msgid "File service"
-msgstr "Servidor de Archivos"
-
-#: plugins/admin/systems/class_goShareServer.inc:153
-#: plugins/admin/systems/class_goShareServer.inc:343
-#, fuzzy
-msgid "File service (Shares)"
-msgstr "Servidor de Archivos"
-
-#: plugins/admin/systems/class_goShareServer.inc:187
-#, fuzzy, php-format
-msgid "Saving of system server/shares with dn '%s' failed."
-msgstr ""
-"Ha fallado la grabación de los parámetros del servidor de base de datos"
-
-#: plugins/admin/systems/class_goShareServer.inc:238
-#, fuzzy, php-format
-msgid "Creating system server/shares (mount container) with dn '%s' failed."
-msgstr "Ha fallado la creación del contenedor de montaje"
-
-#: plugins/admin/systems/class_goShareServer.inc:252
-#, fuzzy, php-format
-msgid "Removing system server/shares (mount container) with dn '%s' failed."
-msgstr "Ha fallado la eliminación del contenedor de montaje"
-
-#: plugins/admin/systems/class_goShareServer.inc:263
+#: plugins/admin/systems/class_goService.inc:147
 #, fuzzy, php-format
-msgid "Saving system server/shares (mount container) with dn '%s' failed."
-msgstr "Ha fallado la grabación del contenedor de montaje"
-
-#: plugins/admin/systems/class_goShareServer.inc:344
-#, fuzzy
-msgid "File service - Shares"
-msgstr "Servidor de Archivos"
+msgid "Set status flag for server services/"
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/class_goShareServer.inc:353
-msgid "Apple mounts"
+#: 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 ""
-
-#: plugins/admin/systems/class_goShareServer.inc:356
-#, fuzzy
-msgid "Charset"
-msgstr "Chipset"
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
 
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
@@ -12395,12 +12629,12 @@ msgstr "Mostrar impresoras"
 msgid "Select to see phones"
 msgstr "Seleccione para ver teléfonos"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects of department"
 msgstr "Mostrar objetos de departamentos"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:696
+#: plugins/admin/ogroups/class_ogroup.inc:711
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Grupos de objetos"
@@ -12415,82 +12649,82 @@ msgstr "Has decidido eliminar el objeto grupo '%s'."
 msgid "You are not allowed to delete this object group!"
 msgstr "¡No tiene permisos para eliminar este objeto grupo!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:138
+#: plugins/admin/ogroups/class_ogroup.inc:146
 msgid "This 'dn' is no object group."
 msgstr "Este 'dn' no es un objeto tipo grupo."
 
-#: plugins/admin/ogroups/class_ogroup.inc:284
+#: plugins/admin/ogroups/class_ogroup.inc:292
 msgid "too many different objects!"
 msgstr "¡Demasiados objetos diferentes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:286
+#: plugins/admin/ogroups/class_ogroup.inc:294
 msgid "users"
 msgstr "usuarios"
 
-#: plugins/admin/ogroups/class_ogroup.inc:287
+#: plugins/admin/ogroups/class_ogroup.inc:295
 msgid "groups"
 msgstr "grupos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:288
+#: plugins/admin/ogroups/class_ogroup.inc:296
 msgid "applications"
 msgstr "Aplicaciones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:289
+#: plugins/admin/ogroups/class_ogroup.inc:297
 msgid "departments"
 msgstr "departamentos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:290
+#: plugins/admin/ogroups/class_ogroup.inc:298
 msgid "servers"
 msgstr "servidores"
 
-#: plugins/admin/ogroups/class_ogroup.inc:291
+#: plugins/admin/ogroups/class_ogroup.inc:299
 msgid "workstations"
 msgstr "estaciones de trabajo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:292
+#: plugins/admin/ogroups/class_ogroup.inc:300
 msgid "terminals"
 msgstr "terminales"
 
-#: plugins/admin/ogroups/class_ogroup.inc:293
+#: plugins/admin/ogroups/class_ogroup.inc:301
 msgid "phones"
 msgstr "teléfonos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:294
+#: plugins/admin/ogroups/class_ogroup.inc:302
 msgid "printers"
 msgstr "servidores de Impresión"
 
-#: plugins/admin/ogroups/class_ogroup.inc:301
+#: plugins/admin/ogroups/class_ogroup.inc:309
 msgid "and"
 msgstr "y"
 
-#: plugins/admin/ogroups/class_ogroup.inc:447
+#: plugins/admin/ogroups/class_ogroup.inc:462
 msgid "Non existing dn:"
 msgstr "No existe 'dn':"
 
-#: plugins/admin/ogroups/class_ogroup.inc:589
+#: plugins/admin/ogroups/class_ogroup.inc:604
 msgid "There is already an object with this cn."
 msgstr "Ya existe un objeto con este 'cn'."
 
-#: plugins/admin/ogroups/class_ogroup.inc:603
+#: plugins/admin/ogroups/class_ogroup.inc:618
 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:652
+#: plugins/admin/ogroups/class_ogroup.inc:667
 #, 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:665
+#: plugins/admin/ogroups/class_ogroup.inc:680
 #, 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:691
+#: plugins/admin/ogroups/class_ogroup.inc:706
 #, fuzzy
 msgid "Object group generic"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:702
+#: plugins/admin/ogroups/class_ogroup.inc:717
 #, fuzzy
 msgid "Member"
 msgstr "Objetos miembro"
@@ -12741,7 +12975,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:250
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:271
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:294
 #, php-format
 msgid ""
 "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -12753,9 +12987,9 @@ msgstr ""
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:95
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:315
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1076
-#: plugins/gofon/macro/class_gofonMacro.inc:247
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:282
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:398
+#: plugins/gofon/macro/class_gofonMacro.inc:245
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:305
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:421
 #, php-format
 msgid "Can't select database %s on %s."
 msgstr "No puedo seleccionar la base de datos '%s' en '%s'."
@@ -12771,8 +13005,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:1181
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1183
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:438
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:440
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:461
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:463
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
@@ -12786,8 +13020,8 @@ msgstr "Ha fallado la grabación de los parámetros de correo del objeto grupo"
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:88
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:304
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1065
-#: plugins/gofon/macro/class_gofonMacro.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#: plugins/gofon/macro/class_gofonMacro.inc:234
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:410
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -13025,19 +13259,19 @@ msgstr "Mostrar Departamentos que concuerden con"
 msgid "ACL management"
 msgstr "Gestión de listas de bloqueo"
 
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:38 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiVariable.tpl:36
+#: plugins/admin/fai/faiPartitionTable.tpl:36
+#: plugins/admin/fai/faiScript.tpl:38 plugins/admin/fai/faiTemplate.tpl:33
 #: plugins/admin/fai/faiHook.tpl:38
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/class_faiProfileEntry.inc:171
 msgid "Objects"
 msgstr "Objetos"
 
-#: plugins/admin/fai/faiVariable.tpl:34
+#: plugins/admin/fai/faiVariable.tpl:38
 msgid "List of assigned variables"
 msgstr "Lista de variables asignadas"
 
-#: plugins/admin/fai/faiVariable.tpl:40
+#: plugins/admin/fai/faiVariable.tpl:44
 msgid "Choose a variable to delete or edit"
 msgstr ""
 
@@ -13045,54 +13279,35 @@ msgstr ""
 msgid "Fully Automatic Installation"
 msgstr "Instalación Totalmente Automática"
 
-#: plugins/admin/fai/class_faiScript.inc:411
+#: plugins/admin/fai/class_faiScript.inc:422
 #, 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:508
-#: plugins/admin/fai/class_faiHookEntry.inc:189
+#: plugins/admin/fai/class_faiScript.inc:519
+#: plugins/admin/fai/class_faiHookEntry.inc:191
 #, fuzzy
 msgid "FAI script"
 msgstr "Script de importación"
 
-#: plugins/admin/fai/class_faiScript.inc:515
+#: plugins/admin/fai/class_faiScript.inc:526
+#: plugins/admin/fai/class_faiTemplate.inc:494
 #, fuzzy
 msgid "Readonly"
 msgstr "Lectura"
 
-#: plugins/admin/fai/class_faiTemplate.inc:366
+#: plugins/admin/fai/class_faiTemplate.inc:401
 #, 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:452
+#: plugins/admin/fai/class_faiTemplate.inc:487
 #, fuzzy
 msgid "FAI template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/fai/class_faiTemplate.inc:461
-#, fuzzy
-msgid "Template file"
-msgstr "Plantilla de paquete"
-
-#: plugins/admin/fai/class_faiTemplate.inc:462
-#, fuzzy
-msgid "Template path"
-msgstr "Nombre de la plantilla"
-
-#: plugins/admin/fai/class_faiTemplate.inc:463
-#, fuzzy
-msgid "File owner"
-msgstr "Nombre del archivo"
-
-#: plugins/admin/fai/class_faiTemplate.inc:464
-#, fuzzy
-msgid "File permissions"
-msgstr "Permisos"
-
 #: plugins/admin/fai/class_faiManagement.inc:33
-#: plugins/admin/fai/class_faiManagement.inc:851
+#: plugins/admin/fai/class_faiManagement.inc:853
 msgid "FAI"
 msgstr "FAI"
 
@@ -13135,38 +13350,43 @@ 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:520
+#: plugins/admin/fai/class_faiManagement.inc:522
 #, 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:845
+#: plugins/admin/fai/class_faiManagement.inc:847
 #, fuzzy
 msgid "FAI releases"
 msgstr "Clases FAI"
 
-#: plugins/admin/fai/class_faiManagement.inc:846
+#: plugins/admin/fai/class_faiManagement.inc:848
 #, fuzzy
 msgid "FAI release management"
 msgstr "Gestión de listas de bloqueo"
 
-#: plugins/admin/fai/faiPackage.tpl:49
+#: plugins/admin/fai/faiPackage.tpl:53
 msgid "Install method"
 msgstr "Método de instalación"
 
-#: plugins/admin/fai/faiPackage.tpl:65
+#: plugins/admin/fai/faiPackage.tpl:57
+#, fuzzy
+msgid "Please select the installation method"
+msgstr "Por favor seleccione un fichero válido."
+
+#: plugins/admin/fai/faiPackage.tpl:71
 msgid "Used packages"
 msgstr "Paquetes usados"
 
-#: plugins/admin/fai/faiPackage.tpl:67
+#: plugins/admin/fai/faiPackage.tpl:73
 msgid "Choosen packages"
 msgstr "Paquetes elegidos"
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:674
+#: plugins/admin/fai/faiPackage.tpl:79 include/functions.inc:674
 msgid "Configure"
 msgstr "Configurar"
 
-#: plugins/admin/fai/faiPackage.tpl:74
+#: plugins/admin/fai/faiPackage.tpl:80
 msgid "Toggle remove flag"
 msgstr "Cambiar la marca de eliminación"
 
@@ -13179,11 +13399,11 @@ msgstr ""
 "si realmente quiere hacer esto, ya que una vez hecho esto, no hay forma de "
 "que GOsa recupere la información."
 
-#: plugins/admin/fai/faiPartitionTable.tpl:34
+#: plugins/admin/fai/faiPartitionTable.tpl:38
 msgid "Discs"
 msgstr "Discos"
 
-#: plugins/admin/fai/faiPartitionTable.tpl:40
+#: plugins/admin/fai/faiPartitionTable.tpl:44
 msgid "Choose a disk to delete or edit"
 msgstr ""
 
@@ -13232,9 +13452,9 @@ msgid "Selected file is empty."
 msgstr "El archivo especificado está vacío."
 
 #: plugins/admin/fai/class_faiScriptEntry.inc:136
-#: plugins/admin/fai/class_faiVariableEntry.inc:102
-#: plugins/admin/fai/class_faiHookEntry.inc:148
-#: plugins/admin/fai/class_faiTemplateEntry.inc:192
+#: plugins/admin/fai/class_faiVariableEntry.inc:107
+#: plugins/admin/fai/class_faiHookEntry.inc:150
+#: plugins/admin/fai/class_faiTemplateEntry.inc:196
 msgid "Please enter a name."
 msgstr "Por favor introduzca un nombre."
 
@@ -13263,7 +13483,7 @@ msgstr "Ruta del Script"
 msgid "Script attributes"
 msgstr "Parámetros del script"
 
-#: plugins/admin/fai/faiScriptEntry.tpl:43 plugins/admin/fai/faiProfile.tpl:33
+#: plugins/admin/fai/faiScriptEntry.tpl:43 plugins/admin/fai/faiProfile.tpl:37
 msgid "Choose a priority"
 msgstr "Elija una prioridad"
 
@@ -13272,232 +13492,280 @@ msgstr "Elija una prioridad"
 msgid "Import script"
 msgstr "Script de importación"
 
-#: plugins/admin/fai/class_faiPackage.inc:399
+#: plugins/admin/fai/class_faiPackage.inc:380
 msgid "Please select a least one Package."
 msgstr "Por favor seleccione al menos un Paquete."
 
-#: plugins/admin/fai/class_faiPackage.inc:403
+#: plugins/admin/fai/class_faiPackage.inc:384
 msgid "Please choose a valid combination for your repository setup."
 msgstr ""
 "Por favor especifique una combinación valida para la configuración de su "
 "repositorio."
 
-#: plugins/admin/fai/class_faiPackage.inc:424
+#: plugins/admin/fai/class_faiPackage.inc:405
 msgid "package is configured"
 msgstr "El paquete está configurado"
 
-#: plugins/admin/fai/class_faiPackage.inc:430
+#: plugins/admin/fai/class_faiPackage.inc:411
 msgid "Package marked for removal"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:457
+#: plugins/admin/fai/class_faiPackage.inc:438
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:501
+#: plugins/admin/fai/class_faiPackage.inc:482
 #, fuzzy, php-format
 msgid "Saving of FAI/package list with dn '%s' failed."
 msgstr "Ha fallado la grabación de la tabla de particiones FAI"
 
-#: plugins/admin/fai/class_faiPackage.inc:547
+#: plugins/admin/fai/class_faiPackage.inc:528
 #: plugins/admin/fai/faiPackageConfiguration.tpl:1
 msgid "Package"
 msgstr "Paquete"
 
-#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiPackage.inc:529
 #, fuzzy
 msgid "FAI Package list"
 msgstr "Nueva lista de paquetes"
 
-#: plugins/admin/fai/class_faiPackage.inc:559
+#: plugins/admin/fai/class_faiPackage.inc:540
 #, fuzzy
 msgid "Install Method"
 msgstr "Método de instalación"
 
-#: plugins/admin/fai/class_faiProfile.inc:285
-#: plugins/admin/fai/class_faiProfileEntry.inc:152
+#: plugins/admin/fai/class_faiPackage.inc:541
+#, fuzzy
+msgid "Package configuration"
+msgstr "Base de datos de FAX"
+
+#: plugins/admin/fai/class_faiProfile.inc:290
+#: plugins/admin/fai/class_faiProfileEntry.inc:168
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:288
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfileEntry.inc:135
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:289
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfileEntry.inc:136
 msgid "Template bundle"
 msgstr "Plantilla de paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:290
-#: plugins/admin/fai/class_faiProfileEntry.inc:121
+#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfileEntry.inc:137
 msgid "Script bundle"
 msgstr "Script del paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:291
-#: plugins/admin/fai/class_faiProfileEntry.inc:122
+#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfileEntry.inc:138
 msgid "Variable bundle"
 msgstr "Variables del paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:297
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:293
-#: plugins/admin/fai/class_faiPartitionTable.inc:490
-#: plugins/admin/fai/class_faiProfileEntry.inc:124
+#: 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
 msgid "Partition table"
 msgstr "Tabla de particiones"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:301
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:386
+#: plugins/admin/fai/class_faiProfile.inc:392
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:390
+#: plugins/admin/fai/class_faiProfile.inc:396
 msgid "Please enter a valid name."
 msgstr "Por favor introduzca un nombre válido"
 
-#: plugins/admin/fai/class_faiProfile.inc:402
+#: plugins/admin/fai/class_faiProfile.inc:408
 msgid "There is already a profile with this class name defined."
 msgstr "Ya existe un perfil con este nombre de clase definido."
 
-#: plugins/admin/fai/class_faiProfile.inc:425
-#: plugins/admin/fai/class_faiProfile.inc:429
+#: plugins/admin/fai/class_faiProfile.inc:431
+#: plugins/admin/fai/class_faiProfile.inc:435
 #, fuzzy, php-format
 msgid "Saving of FAI/profile with dn '%s' failed."
 msgstr "Ha fallado la grabación de la tabla de particiones FAI"
 
-#: plugins/admin/fai/class_faiProfile.inc:437
+#: plugins/admin/fai/class_faiProfile.inc:443
 #, fuzzy
 msgid "Profile"
 msgstr "Perfiles"
 
-#: plugins/admin/fai/class_faiProfile.inc:438
+#: plugins/admin/fai/class_faiProfile.inc:444
 #, fuzzy
 msgid "FAI profile"
 msgstr "Nuevo perfil"
 
-#: plugins/admin/fai/class_faiHook.inc:402
+#: plugins/admin/fai/class_faiHook.inc:436
 #, fuzzy, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "Ha fallado la grabación del script FAI"
 
-#: plugins/admin/fai/class_faiHook.inc:493
+#: plugins/admin/fai/class_faiHook.inc:527
 #, fuzzy
 msgid "Hook"
 msgstr "ok"
 
-#: plugins/admin/fai/class_faiHook.inc:494
+#: plugins/admin/fai/class_faiHook.inc:528
 #, fuzzy
 msgid "FAI hook"
 msgstr "Mostrar acciones FAI"
 
-#: plugins/admin/fai/class_faiHook.inc:501
+#: plugins/admin/fai/class_faiHook.inc:535
+#: plugins/admin/fai/class_faiPartitionTable.inc:528
+#: plugins/admin/fai/class_faiVariable.inc:420
 #, fuzzy
 msgid "Read only"
 msgstr "Lectura"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
 #, fuzzy
 msgid "primary"
 msgstr "Grupo primario"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
 #, fuzzy
 msgid "logical"
 msgstr "Añadir Cuenta Local"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:188
 msgid "FS type"
 msgstr "Tipo de FS"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
-#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:189
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:459
 #: plugins/admin/fai/class_faiSummaryTab.inc:317
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:190
 #: plugins/admin/fai/class_faiSummaryTab.inc:316
 msgid "Size in MB"
 msgstr "Tamaño en Mb"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
-#: plugins/admin/fai/class_faiPartitionTable.inc:504
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:191
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:461
 #: plugins/admin/fai/class_faiSummaryTab.inc:315
 msgid "Mount options"
 msgstr "Opciones de Montaje"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 msgid "FS option"
 msgstr "Opciones de FS"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 msgid "Preserve"
 msgstr "Preservar"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:382
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
 #, 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:366
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:396
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:402
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:406
 #, 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:386
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:412
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:414
 #, 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:393
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
 #, 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:408
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:434
 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
+#, fuzzy
+msgid "Partition table entry"
+msgstr "Tabla de particiones"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:447
+#, fuzzy
+msgid "FAI partition table entry"
+msgstr "Nueva tabla de particiones"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:456
+#, fuzzy
+msgid "Partition type"
+msgstr "Tabla de particiones"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:457
+#, fuzzy
+msgid "Partition no."
+msgstr "Paticiones"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:458
+#, fuzzy
+msgid "File system type"
+msgstr "Tipo de sistema"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:460
+#, fuzzy
+msgid "Partition size"
+msgstr "Paticiones"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:462
+#, fuzzy
+msgid "File system options"
+msgstr "Ver la información de sistema"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:463
+#, fuzzy
+msgid "Partition flags"
+msgstr "Paticiones"
+
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 msgid "Device"
 msgstr "Dispositivo"
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:24
 msgid "Partition entries"
 msgstr "Entradas en la partición"
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:28
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:30
 msgid "Add partition"
 msgstr "Añadir partición"
 
@@ -13505,19 +13773,29 @@ msgstr "Añadir partición"
 msgid "List of scripts"
 msgstr "Lista de scripts"
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:98
+#: plugins/admin/fai/class_faiVariableEntry.inc:103
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Por favor especifique un valor para el atributo 'contenido'."
 
-#: plugins/admin/fai/faiVariableEntry.tpl:29
-msgid "Variable attributes"
-msgstr "Atributos de las variables"
+#: plugins/admin/fai/class_faiVariableEntry.inc:134
+#, fuzzy
+msgid "Variable entry"
+msgstr "Contenido de la Variable"
+
+#: plugins/admin/fai/class_faiVariableEntry.inc:135
+#, fuzzy
+msgid "FAI variable entry "
+msgstr "Mostrar variables FAI"
 
-#: plugins/admin/fai/faiVariableEntry.tpl:34
-#: plugins/admin/fai/class_faiVariable.inc:394
+#: plugins/admin/fai/class_faiVariableEntry.inc:144
+#: plugins/admin/fai/faiVariableEntry.tpl:38
 msgid "Variable content"
 msgstr "Contenido de la Variable"
 
+#: plugins/admin/fai/faiVariableEntry.tpl:33
+msgid "Variable attributes"
+msgstr "Atributos de las variables"
+
 #: plugins/admin/fai/faiSummary.tpl:4
 msgid "FAI object tree"
 msgstr "Árbol de objetos FAI"
@@ -13531,7 +13809,7 @@ msgstr ""
 msgid "You are not allowed to view the fai summary."
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/fai/faiTemplate.tpl:31
+#: plugins/admin/fai/faiTemplate.tpl:35
 msgid "List of template files"
 msgstr "Lista de ficheros plantillas"
 
@@ -13539,82 +13817,52 @@ msgstr "Lista de ficheros plantillas"
 msgid "List of hook scripts"
 msgstr "Lista de scripts de acciones"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:284
-#: plugins/admin/fai/class_faiPartitionTable.inc:290
+#: plugins/admin/fai/class_faiPartitionTable.inc:313
+#: plugins/admin/fai/class_faiPartitionTable.inc:319
 #, php-format
 msgid "%s partition"
 msgstr "partición %s"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:286
-#: plugins/admin/fai/class_faiPartitionTable.inc:292
+#: plugins/admin/fai/class_faiPartitionTable.inc:315
+#: plugins/admin/fai/class_faiPartitionTable.inc:321
 #, php-format
 msgid "%s partition(s)"
 msgstr "partición(es) %s"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:378
+#: plugins/admin/fai/class_faiPartitionTable.inc:408
 #, fuzzy, php-format
 msgid "Saving of FAI/partition table with dn '%s' failed."
 msgstr "Ha fallado la grabación de la base de la tabla de particiones FAI"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:491
+#: plugins/admin/fai/class_faiPartitionTable.inc:521
 #, fuzzy
 msgid "FAI partition table"
 msgstr "Nueva tabla de particiones"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:499
-#, fuzzy
-msgid "Partition type"
-msgstr "Tabla de particiones"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:500
-#, fuzzy
-msgid "Partition no."
-msgstr "Paticiones"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:501
-#, fuzzy
-msgid "File system type"
-msgstr "Tipo de sistema"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:503
-#, fuzzy
-msgid "Partition size"
-msgstr "Paticiones"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:505
-#, fuzzy
-msgid "File system options"
-msgstr "Ver la información de sistema"
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:506
-#, fuzzy
-msgid "Partition flags"
-msgstr "Paticiones"
-
-#: plugins/admin/fai/class_faiHookEntry.inc:144
+#: plugins/admin/fai/class_faiHookEntry.inc:146
 msgid "Please enter a value for script."
 msgstr "Por favor introduzca un valor para el script"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:178
+#: plugins/admin/fai/class_faiHookEntry.inc:180
 #, fuzzy
 msgid "Hook entry"
 msgstr "Eliminar entrada"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:179
+#: plugins/admin/fai/class_faiHookEntry.inc:181
 #, fuzzy
 msgid "FAI hook entry"
 msgstr "Mostrar acciones FAI"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:188
+#: plugins/admin/fai/class_faiHookEntry.inc:190
 #: plugins/admin/fai/faiHookEntry.tpl:38
 msgid "Task"
 msgstr "Tareas"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:123
+#: plugins/admin/fai/class_faiProfileEntry.inc:139
 msgid "Package bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:154
+#: plugins/admin/fai/class_faiProfileEntry.inc:170
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 msgid "Class name"
 msgstr "Nombre de la clase"
@@ -13698,97 +13946,127 @@ msgstr "Elija nombre de clase"
 msgid "A new class name."
 msgstr "Un nuevo nombre de clase."
 
-#: plugins/admin/fai/class_faiVariable.inc:306
+#: plugins/admin/fai/class_faiVariable.inc:334
 #, 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:385
+#: plugins/admin/fai/class_faiVariable.inc:413
 #, fuzzy
 msgid "FAI variable"
 msgstr "Mostrar variables FAI"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:88
+#: plugins/admin/fai/class_faiTemplateEntry.inc:95
 msgid "no file uploaded yet"
 msgstr "no se ha subido ningún archivo todavía"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:93
+#: plugins/admin/fai/class_faiTemplateEntry.inc:101
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:184
+#: plugins/admin/fai/class_faiTemplateEntry.inc:188
 msgid "Please specify a value for attribute 'file'."
 msgstr "Por favor especifique un valor para el atributo 'fichero'."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:188
+#: plugins/admin/fai/class_faiTemplateEntry.inc:192
 msgid "Please specify a value for attribute 'path'."
 msgstr "Por favor especifique un valor para el atributo 'ruta'."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:196
+#: plugins/admin/fai/class_faiTemplateEntry.inc:200
 msgid "Please enter a user."
 msgstr "Por favor introduzca un usuario."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:199
+#: plugins/admin/fai/class_faiTemplateEntry.inc:203
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
 msgstr ""
 "Por favor especifique un usuario valido. Solo están permitidos a-Z/0-9."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:203
+#: plugins/admin/fai/class_faiTemplateEntry.inc:207
 msgid "Please enter a group."
 msgstr "Por favor introduzca un grupo."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:206
+#: plugins/admin/fai/class_faiTemplateEntry.inc:210
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr "Por favor especifique un grupo valido. Solo están permitidos a-Z/0-9."
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:21
+#: plugins/admin/fai/class_faiTemplateEntry.inc:239
+#, fuzzy
+msgid "Template entry"
+msgstr "Plantilla de usuario"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:240
+#, fuzzy
+msgid "FAI template entry"
+msgstr "Nueva plantilla"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:249
+#, fuzzy
+msgid "Template file"
+msgstr "Plantilla de paquete"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:250
+#, fuzzy
+msgid "Template path"
+msgstr "Nombre de la plantilla"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:251
+#, fuzzy
+msgid "File owner"
+msgstr "Nombre del archivo"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:252
+#, fuzzy
+msgid "File permissions"
+msgstr "Permisos"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:25
 msgid "Template attributes"
 msgstr "Atributos de la plantilla"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:35
+#: plugins/admin/fai/faiTemplateEntry.tpl:40
 msgid "Save template"
 msgstr "Guardar plantilla"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:47
+#: plugins/admin/fai/faiTemplateEntry.tpl:57
 msgid "Destination path"
 msgstr "Ruta de destino"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
+#: plugins/admin/fai/faiTemplateEntry.tpl:74
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:564
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:80
+#: plugins/admin/fai/faiTemplateEntry.tpl:96
 msgid "Access"
 msgstr "Acceso"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:87
+#: plugins/admin/fai/faiTemplateEntry.tpl:103
 msgid "Read"
 msgstr "Lectura"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:88
+#: plugins/admin/fai/faiTemplateEntry.tpl:104
 msgid "Write"
 msgstr "Escritura"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:91
+#: plugins/admin/fai/faiTemplateEntry.tpl:107
 msgid "Special"
 msgstr "Especial"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:100
+#: plugins/admin/fai/faiTemplateEntry.tpl:124
 msgid "SUID"
 msgstr "SUID"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:109
+#: plugins/admin/fai/faiTemplateEntry.tpl:141
 msgid "SGID"
 msgstr "SGID"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:112
+#: plugins/admin/fai/faiTemplateEntry.tpl:144
 msgid "Others"
 msgstr "Otros"
 
-#: plugins/admin/fai/faiTemplateEntry.tpl:118
+#: plugins/admin/fai/faiTemplateEntry.tpl:158
 msgid "sticky"
 msgstr "estatico"
 
@@ -14012,72 +14290,72 @@ msgstr "Mostrar particiones FAI"
 msgid "Show partitions"
 msgstr "Mostrar particiones"
 
-#: plugins/admin/fai/class_divListFai.inc:134
+#: plugins/admin/fai/class_divListFai.inc:149
 msgid "New profile"
 msgstr "Nuevo perfil"
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:157
 msgid "New partition table"
 msgstr "Nueva tabla de particiones"
 
-#: plugins/admin/fai/class_divListFai.inc:142
+#: plugins/admin/fai/class_divListFai.inc:157
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:143
+#: plugins/admin/fai/class_divListFai.inc:158
 msgid "New scripts"
 msgstr "Nuevos scripts"
 
-#: plugins/admin/fai/class_divListFai.inc:143
+#: plugins/admin/fai/class_divListFai.inc:158
 msgid "S"
 msgstr "S"
 
-#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/admin/fai/class_divListFai.inc:159
 msgid "New hooks"
 msgstr "Nuevas acciones"
 
-#: plugins/admin/fai/class_divListFai.inc:144
+#: plugins/admin/fai/class_divListFai.inc:159
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:160
 msgid "New variables"
 msgstr "Nuevas variables"
 
-#: plugins/admin/fai/class_divListFai.inc:145
+#: plugins/admin/fai/class_divListFai.inc:160
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:146
+#: plugins/admin/fai/class_divListFai.inc:161
 #, fuzzy
 msgid "New templates "
 msgstr "Nuevas plantillas"
 
-#: plugins/admin/fai/class_divListFai.inc:146
+#: plugins/admin/fai/class_divListFai.inc:161
 #, fuzzy
 msgid "I"
 msgstr "NI"
 
-#: plugins/admin/fai/class_divListFai.inc:147
+#: plugins/admin/fai/class_divListFai.inc:162
 msgid "New package list"
 msgstr "Nueva lista de paquetes"
 
-#: plugins/admin/fai/class_divListFai.inc:147
+#: plugins/admin/fai/class_divListFai.inc:162
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_divListFai.inc:227
-#: plugins/admin/fai/class_divListFai.inc:230
+#: plugins/admin/fai/class_divListFai.inc:242
+#: plugins/admin/fai/class_divListFai.inc:245
 msgid "Edit class"
 msgstr "Editar clase"
 
-#: plugins/admin/fai/class_divListFai.inc:238
+#: plugins/admin/fai/class_divListFai.inc:253
 msgid "Delete class"
 msgstr "Eliminar clase"
 
 #: plugins/admin/mimetypes/generic.tpl:13
 #: plugins/admin/mimetypes/paste_generic.tpl:13
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
 #, fuzzy
 msgid "Mime type"
 msgstr "Tipo MIME"
@@ -14269,7 +14547,7 @@ msgstr "Tipo MIME"
 msgid "Display mime types matching"
 msgstr "Mostrar tipos de cartuchos que concuerdan con"
 
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:123
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:139
 #, fuzzy
 msgid "Create new mime type"
 msgstr "Crear nueva plantilla"
@@ -14308,8 +14586,8 @@ msgstr "sin definirse"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:259
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:656
-#: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:250
+#: plugins/gofon/macro/class_gofonMacro.inc:95
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:273
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -14412,7 +14690,7 @@ msgid "You need to specify at least one phone number!"
 msgstr "¡Necesita introducir al menos un número de teléfono!"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:943
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:336
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:342
 #, fuzzy, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
@@ -14444,7 +14722,7 @@ msgid "Phone account settings"
 msgstr "Configuración telefónica"
 
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1239
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:563
 #, fuzzy
 msgid "Telephone number"
 msgstr "Número de teléfono"
@@ -14463,7 +14741,7 @@ msgstr "Teléfono"
 msgid "Voicemail pin"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:114
+#: plugins/gofon/phoneaccount/main.inc:123
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr "Configuración telefónica"
@@ -14503,23 +14781,20 @@ msgstr "Mostrar grupos que concuerden con"
 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:7
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:9
+#: plugins/gofon/macro/class_gofonMacro.inc:483
 msgid "Macro name"
 msgstr "Nombre de la macro"
 
-#: plugins/gofon/macro/generic.tpl:12
+#: plugins/gofon/macro/generic.tpl:18
 msgid "Macro name to be displayed"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "Elija lugar del árbol para colocar la macro"
-
-#: plugins/gofon/macro/generic.tpl:48
+#: plugins/gofon/macro/generic.tpl:60
 msgid "Visible for user"
 msgstr "Visible para el usuario"
 
-#: plugins/gofon/macro/generic.tpl:57
+#: plugins/gofon/macro/generic.tpl:70
 msgid "Macro text"
 msgstr "macro de texto"
 
@@ -14527,143 +14802,138 @@ msgstr "macro de texto"
 msgid "Phone macros"
 msgstr "Macros telefónicas"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:208
 #, 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:217
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:244
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:214
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:239
 msgid "You are not allowed to delete this macro!"
 msgstr "¡No le está permitido eliminar esta macro!"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:103
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:197
+#: plugins/gofon/macro/class_gofonMacro.inc:101
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:202
 msgid "This 'dn' is no phone macro."
 msgstr "Esta 'dn' no es una macro de teléfono."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:187
+#: plugins/gofon/macro/class_gofonMacro.inc:185
 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:194
-#: plugins/gofon/macro/class_gofonMacro.inc:209
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+#: plugins/gofon/macro/class_gofonMacro.inc:192
+#: plugins/gofon/macro/class_gofonMacro.inc:207
+#: 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:222
+#: plugins/gofon/macro/class_gofonMacro.inc:220
 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:292
+#: plugins/gofon/macro/class_gofonMacro.inc:290
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:310
+#: plugins/gofon/macro/class_gofonMacro.inc:308
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:319
-#: plugins/gofon/macro/class_gofonMacro.inc:327
+#: plugins/gofon/macro/class_gofonMacro.inc:317
+#: plugins/gofon/macro/class_gofonMacro.inc:325
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:341
+#: plugins/gofon/macro/class_gofonMacro.inc:339
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:389
+#: plugins/gofon/macro/class_gofonMacro.inc:405
 #, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Ya existe un cn '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:394
+#: plugins/gofon/macro/class_gofonMacro.inc:410
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:398
+#: plugins/gofon/macro/class_gofonMacro.inc:414
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:403
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacro.inc:409
+#: plugins/gofon/macro/class_gofonMacro.inc:418
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:414
+#: plugins/gofon/macro/class_gofonMacro.inc:423
 msgid "Please choose a valid  base."
 msgstr "Por favor elija una base válida."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:457
+#: plugins/gofon/macro/class_gofonMacro.inc:466
 #, 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:466
+#: plugins/gofon/macro/class_gofonMacro.inc:475
 #, fuzzy
 msgid "Asterisk macro management"
 msgstr "Gestión de Asterisk PBX"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:477
+#: plugins/gofon/macro/class_gofonMacro.inc:487
 #, fuzzy
 msgid "Macro content"
 msgstr "macro de texto"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:478
+#: plugins/gofon/macro/class_gofonMacro.inc:488
 msgid "Visibility flag"
 msgstr ""
 
-#: plugins/gofon/macro/parameter.tpl:3
+#: plugins/gofon/macro/parameter.tpl:4
 #, fuzzy
 msgid "Argument"
 msgstr "Argumentos"
 
-#: plugins/gofon/macro/parameter.tpl:7
+#: plugins/gofon/macro/parameter.tpl:8
 #, fuzzy
 msgid "type"
 msgstr "Tipo"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:245
+#: plugins/gofon/macro/parameter.tpl:19
+#, fuzzy
+msgid "You are not allowed to view the marco parameter settings"
+msgstr "No le es permitido borrar este usuario"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:258
 msgid "String"
 msgstr "Cadena de texto"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:246
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:259
 msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:260
 msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:253
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:266
 msgid "Delete unused"
 msgstr "Eliminar sin usar"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:341
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:347
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:370
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:376
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -14685,34 +14955,34 @@ msgstr "Nombre de la macro"
 msgid "Visible"
 msgstr "Variable"
 
-#: plugins/gofon/macro/class_divListMacros.inc:90
+#: plugins/gofon/macro/class_divListMacros.inc:111
 #, fuzzy
 msgid "Create new phone macro"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/macro/class_divListMacros.inc:110
-#: plugins/gofon/macro/class_divListMacros.inc:129
+#: 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:112
-#: plugins/gofon/macro/class_divListMacros.inc:132
+#: 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:115
+#: plugins/gofon/macro/class_divListMacros.inc:137
 #, fuzzy
 msgid "Macro"
 msgstr "Nombre de la maquina"
 
-#: plugins/gofon/macro/class_divListMacros.inc:116
+#: plugins/gofon/macro/class_divListMacros.inc:138
 #, fuzzy
 msgid "visible"
 msgstr "Visible Publicamente"
 
-#: plugins/gofon/macro/class_divListMacros.inc:117
+#: plugins/gofon/macro/class_divListMacros.inc:139
 #, fuzzy
 msgid "invisible"
 msgstr "Visible Publicamente"
@@ -14741,68 +15011,66 @@ msgstr ""
 msgid "Regular expression for        matching user names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/gofon/conference/generic.tpl:13
+#: plugins/gofon/conference/generic.tpl:15
 #, fuzzy
 msgid "Conference name"
 msgstr "Referencias"
 
-#: plugins/gofon/conference/generic.tpl:18
+#: plugins/gofon/conference/generic.tpl:21
 #, fuzzy
 msgid "Name of conference to create"
 msgstr "Nombre del subárbol para crear"
 
-#: plugins/gofon/conference/generic.tpl:24
 #: plugins/gofon/conference/generic.tpl:35
 #, fuzzy
 msgid "Choose subtree to place conference in"
 msgstr "Elija el subárbol donde colocar el usuario"
 
-#: plugins/gofon/conference/generic.tpl:66
+#: plugins/gofon/conference/generic.tpl:90
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:104
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
+#: plugins/gofon/conference/generic.tpl:137
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:553
 #, fuzzy
 msgid "Preset PIN"
 msgstr "presente"
 
-#: plugins/gofon/conference/generic.tpl:112
+#: plugins/gofon/conference/generic.tpl:145
 #: plugins/gofon/conference/class_divListConferences.inc:54
 msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:118
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
+#: plugins/gofon/conference/generic.tpl:157
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:554
 #, fuzzy
 msgid "Record conference"
 msgstr "Referencias"
 
-#: plugins/gofon/conference/generic.tpl:126
+#: plugins/gofon/conference/generic.tpl:165
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:143
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
+#: plugins/gofon/conference/generic.tpl:188
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:555
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:149
+#: plugins/gofon/conference/generic.tpl:196
 #, fuzzy
 msgid "Activate session menu"
 msgstr "Activar mensaje de ausencia"
 
-#: plugins/gofon/conference/generic.tpl:155
+#: plugins/gofon/conference/generic.tpl:204
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:161
+#: plugins/gofon/conference/generic.tpl:212
 #, fuzzy
 msgid "Count users"
 msgstr "Pais"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 #, fuzzy
 msgid "Phone conferences"
 msgstr "Número de teléfono"
@@ -14812,86 +15080,92 @@ msgstr "Número de teléfono"
 msgid "Management"
 msgstr "Nombre de la maquina"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:196
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:239
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:220
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:243
 #, fuzzy
 msgid "Please enter a PIN."
 msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:247
 #, 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:228
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:251
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:232
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:262
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:285
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:395
 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:510
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
 #, php-format
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#: plugins/gofon/conference/class_divListConferences.inc:202
+#, fuzzy
+msgid "Conference"
+msgstr "Referencias"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
 #, fuzzy
 msgid "Phone conference management"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
 msgid "GOfon"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:551
 #, fuzzy
 msgid "Conference PIN"
 msgstr "Referencias"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:556
 #, fuzzy
 msgid "Activate menu"
 msgstr "Activar mensaje de ausencia"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:557
 msgid "Announce user activity"
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:558
 #, fuzzy
 msgid "Count user"
 msgstr "Pais"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:559
 #, fuzzy
 msgid "Conference type"
 msgstr "Referencias"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:561
 #, fuzzy
 msgid "Format"
 msgstr "formateo"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:562
 msgid "Lifetime"
 msgstr ""
 
@@ -14910,41 +15184,46 @@ 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:90
+#: plugins/gofon/conference/class_divListConferences.inc:109
 #, fuzzy
 msgid "Create new conference"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/gofon/conference/class_divListConferences.inc:90
+#: plugins/gofon/conference/class_divListConferences.inc:109
 #, fuzzy
 msgid "New conference"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/conference/class_divListConferences.inc:154
+#: plugins/gofon/conference/class_divListConferences.inc:196
+#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
+#: include/class_pluglist.inc:245
 #, fuzzy
-msgid "Conference"
-msgstr "Referencias"
+msgid "Unknown"
+msgstr "estado desconocido"
 
 #: plugins/gofon/fonreports/contents.tpl:31
+#: plugins/gofon/fonreports/class_fonreport.inc:399
 msgid "Source"
 msgstr "Fuente"
 
 #: plugins/gofon/fonreports/contents.tpl:32
+#: plugins/gofon/fonreports/class_fonreport.inc:400
 msgid "Destination"
 msgstr "Destino"
 
 #: plugins/gofon/fonreports/contents.tpl:33
+#: plugins/gofon/fonreports/class_fonreport.inc:401
 msgid "Channel"
 msgstr "Canal"
 
 #: plugins/gofon/fonreports/contents.tpl:36
+#: plugins/gofon/fonreports/class_fonreport.inc:404
 msgid "Duration"
 msgstr "Duración"
 
-#: plugins/gofon/fonreports/main.inc:21
-#: plugins/gofon/fonreports/class_fonreport.inc:356
-#: plugins/gofon/fonreports/class_fonreport.inc:357
-#: plugins/gofon/fonreports/class_fonreport.inc:365
+#: plugins/gofon/fonreports/main.inc:16
+#: plugins/gofon/fonreports/class_fonreport.inc:389
+#: plugins/gofon/fonreports/class_fonreport.inc:390
 msgid "Phone reports"
 msgstr "Informes telefónicos"
 
@@ -14952,24 +15231,34 @@ msgstr "Informes telefónicos"
 msgid "Phone Reports"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:157
-#: plugins/gofon/fonreports/class_fonreport.inc:167
+#: plugins/gofon/fonreports/class_fonreport.inc:160
+#: plugins/gofon/fonreports/class_fonreport.inc:170
 #, fuzzy
 msgid "Can't connect to phone 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/gofon/fonreports/class_fonreport.inc:171
+#: plugins/gofon/fonreports/class_fonreport.inc:174
 #, fuzzy
 msgid "Can't select phone database for report generation!"
 msgstr ""
 "¡No puedo seleccionar la base de datos de fax para la generación de informes!"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:189
+#: plugins/gofon/fonreports/class_fonreport.inc:192
 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
+#, fuzzy
+msgid "Application called"
+msgstr "Nombre de la aplicación"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:403
+#, fuzzy
+msgid "Disposition"
+msgstr "Desconexión"
+
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Cliente ligero"
@@ -15022,7 +15311,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:386
+#: include/php_setup.inc:71 html/main.php:388
 msgid "Toggle information"
 msgstr "Información de intercambio"
 
@@ -15145,44 +15434,44 @@ msgstr ""
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1120 include/functions.inc:1312
+#: include/functions.inc:1039 include/functions.inc:1226
 msgid "LDAP error:"
 msgstr "Error LDAP:"
 
-#: include/functions.inc:1121
+#: include/functions.inc:1040
 msgid ""
 "Problems with the LDAP server mean that you probably lost the last changes. "
 "Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/functions.inc:1129
+#: include/functions.inc:1048
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1138
+#: include/functions.inc:1057
 #, fuzzy
 msgid "An error occured while processing your request"
 msgstr ""
 "Un error ha ocurrido cuando se insertaba la entrada '%s' - El proceso ha "
 "sido abortado."
 
-#: include/functions.inc:1142 include/functions_setup.inc:254
+#: include/functions.inc:1061 include/functions_setup.inc:254
 msgid "OK"
 msgstr "Perfecto"
 
-#: include/functions.inc:1204
+#: include/functions.inc:1123
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Continuar"
 
-#: include/functions.inc:1206
+#: include/functions.inc:1125
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Editar entrada"
 
-#: include/functions.inc:1208
+#: include/functions.inc:1127
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -15191,28 +15480,28 @@ 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:1494
+#: include/functions.inc:1408
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1522
+#: include/functions.inc:1436
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1796
+#: include/functions.inc:1710
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1839
+#: include/functions.inc:1753
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Versión de desarrollo de GOsa (Rev %s)"
 
-#: include/class_mail-methods-cyrus.inc:39
+#: include/class_mail-methods-cyrus.inc:40
 msgid "Warning: Account has an invalid mailserver string!"
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:52
+#: include/class_mail-methods-cyrus.inc:53
 msgid ""
 "Warning: IMAP Server cannot be reached! If you save this account, some mail "
 "settings will not be stored on your server!"
@@ -15221,53 +15510,53 @@ msgstr ""
 "de los valores de la configuración del correo no serán guardados en el "
 "servidor"
 
-#: include/class_mail-methods-cyrus.inc:129
+#: include/class_mail-methods-cyrus.inc:151
 #, 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:148
+#: include/class_mail-methods-cyrus.inc:170
 #, 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:174
+#: include/class_mail-methods-cyrus.inc:196
 #, 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:192
+#: include/class_mail-methods-cyrus.inc:214
 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:214
+#: include/class_mail-methods-cyrus.inc:236
 #, 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:242
+#: include/class_mail-methods-cyrus.inc:264
 #, 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:255
+#: include/class_mail-methods-cyrus.inc:277
 #, 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:326
+#: include/class_mail-methods-cyrus.inc:348
 #, 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:330
+#: include/class_mail-methods-cyrus.inc:352
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
@@ -15349,16 +15638,16 @@ msgstr ""
 msgid "Ldap import with dn '%s' failed."
 msgstr "Ha fallado la grabación de la impresora"
 
-#: include/class_tabs.inc:195
+#: include/class_tabs.inc:188
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:310
+#: include/class_tabs.inc:306
 msgid "References"
 msgstr "Referencias"
 
-#: include/class_plugin.inc:418
+#: include/class_plugin.inc:420
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
@@ -15366,7 +15655,7 @@ msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:599
+#: include/class_plugin.inc:601
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -15374,7 +15663,7 @@ msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:633 include/class_password-methods.inc:181
+#: include/class_plugin.inc:635 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -15382,7 +15671,7 @@ msgstr ""
 "El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:667
+#: include/class_plugin.inc:669
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -15390,62 +15679,62 @@ msgstr ""
 "El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:973
+#: include/class_plugin.inc:975
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:980
+#: include/class_plugin.inc:982
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:994 include/class_plugin.inc:1023
+#: include/class_plugin.inc:996 include/class_plugin.inc:1025
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1010
+#: include/class_plugin.inc:1012
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:1071 include/class_plugin.inc:1117
-#: include/class_plugin.inc:1118
+#: include/class_plugin.inc:1073 include/class_plugin.inc:1119
+#: include/class_plugin.inc:1120
 #, fuzzy, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Ha fallado la grabación del objeto grupo"
 
-#: include/class_plugin.inc:1134 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1135
 #, fuzzy
 msgid "You are not allowed to delete this snapshot!"
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: include/class_plugin.inc:1149
+#: include/class_plugin.inc:1151
 #, 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:1161
+#: include/class_plugin.inc:1163
 #, 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:1193
+#: include/class_plugin.inc:1195
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1249
+#: include/class_plugin.inc:1251
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1313 include/class_plugin.inc:1327
+#: include/class_plugin.inc:1315 include/class_plugin.inc:1329
 #, fuzzy, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Ha fallado la eliminación del teléfono"
@@ -15467,12 +15756,6 @@ msgstr ""
 "El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
 "favor actualízela usando el script 'fix_config.sh'!"
 
-#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
-#: include/class_pluglist.inc:245
-#, fuzzy
-msgid "Unknown"
-msgstr "estado desconocido"
-
 #: include/class_pluglist.inc:153 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
@@ -16316,7 +16599,7 @@ msgid "Restore"
 msgstr "Reintentar"
 
 #: include/class_MultiSelectWindow.inc:523
-#: include/class_SnapShotDialog.inc:105
+#: include/class_SnapShotDialog.inc:106
 msgid "Restore snapshot"
 msgstr ""
 
@@ -16374,21 +16657,21 @@ msgstr ""
 msgid "Release management failed, can't save '%s'"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:47
+#: include/class_SnapShotDialog.inc:53
 #, 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:107
+#: include/class_SnapShotDialog.inc:108
 #, fuzzy
 msgid "Remove snapshot"
 msgstr "Crear cuenta de nagios"
 
-#: include/class_SnapShotDialog.inc:109 include/class_SnapShotDialog.inc:129
+#: include/class_SnapShotDialog.inc:110 include/class_SnapShotDialog.inc:130
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:141
+#: include/class_SnapShotDialog.inc:142
 #, fuzzy
 msgid "Please specify a valid description for this snapshot."
 msgstr "Por favor especifique un nombre de adjunto valido."
@@ -16446,17 +16729,17 @@ msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 "Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
 
-#: html/main.php:347
+#: 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:362
+#: html/main.php:364
 #, fuzzy
 msgid "Your password is about to expire, please change your password"
 msgstr "No tiene permisos para cambiar su contraseña."
 
-#: html/main.php:386
+#: html/main.php:388
 #, fuzzy
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
@@ -16533,112 +16816,102 @@ msgid ""
 "page before logging in!"
 msgstr ""
 
-#: html/getxls.php:65
+#: html/getxls.php:86
 msgid "Birthday"
 msgstr ""
 
-#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
-#: html/getxls.php:236
+#: html/getxls.php:86 html/getxls.php:227 html/getxls.php:281
+#: html/getxls.php:297
 #, fuzzy
 msgid "Surname"
 msgstr "Nombre del servidor"
 
-#: html/getxls.php:74
+#: html/getxls.php:94
 #, fuzzy, php-format
 msgid "User list of %s on %s"
 msgstr "Lista de usuarios"
 
-#: html/getxls.php:94 html/getxls.php:227 ihtml/themes/default/acl.tpl:41
+#: html/getxls.php:121 html/getxls.php:284 ihtml/themes/default/acl.tpl:41
 #, fuzzy
 msgid "Members"
 msgstr "Objetos miembro"
 
-#: html/getxls.php:104 html/getxls.php:295
+#: html/getxls.php:131 html/getxls.php:360
 #, fuzzy, php-format
 msgid "Groups of %s on %s"
 msgstr "Grupo de usuarios"
 
-#: html/getxls.php:124 html/getxls.php:246
+#: html/getxls.php:155 html/getxls.php:188 html/getxls.php:190
+#: html/getxls.php:197 html/getxls.php:233 html/getxls.php:310
+#: html/getxls.php:381
+msgid "Servers"
+msgstr "Servidores"
+
+#: html/getxls.php:159 html/getxls.php:311
 #, fuzzy
 msgid "Computers"
 msgstr "incompleto"
 
-#: html/getxls.php:133 html/getxls.php:174 html/getxls.php:336
-#: html/getxls.php:356
-#, fuzzy
-msgid "Common name"
-msgstr "Nombre de la localización"
-
-#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
-#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr "Servidores"
-
-#: html/getxls.php:156 html/getxls.php:314
+#: html/getxls.php:195 html/getxls.php:379
 #, fuzzy, php-format
 msgid "Servers of %s on %s"
 msgstr "Servidores"
 
-#: html/getxls.php:174
+#: html/getxls.php:225
 #, fuzzy
 msgid "Mobile phone"
 msgstr "Teléfono particular"
 
-#: html/getxls.php:174
+#: html/getxls.php:228
 #, fuzzy
 msgid "Function"
 msgstr "Función"
 
-#: html/getxls.php:177 html/getxls.php:247
+#: html/getxls.php:231 html/getxls.php:312
 #, fuzzy
 msgid "Adressbook"
 msgstr "Libreta de direcciones"
 
-#: html/getxls.php:184 html/getxls.php:349
+#: html/getxls.php:238 html/getxls.php:414
 #, fuzzy, php-format
 msgid "Adressbook of %s on %s"
 msgstr "Libreta de direcciones"
 
-#: html/getxls.php:190
+#: html/getxls.php:244
 #, fuzzy
 msgid "Common Name"
 msgstr "Nombre de la localización"
 
-#: html/getxls.php:224
+#: html/getxls.php:281
 #, fuzzy
 msgid "Day of birth"
 msgstr "Fecha de nacimiento"
 
-#: html/getxls.php:236
+#: html/getxls.php:299
 #, fuzzy
 msgid "Email address"
 msgstr "Cuenta Principal"
 
-#: html/getxls.php:236
+#: html/getxls.php:299
 #, fuzzy
 msgid "Organizational unit"
 msgstr "De organización"
 
-#: html/getxls.php:236
+#: html/getxls.php:300
 #, fuzzy
 msgid "Postal Code"
 msgstr "Código Postal"
 
-#: html/getxls.php:236
-#, fuzzy
-msgid "Title"
-msgstr "Archivo"
-
-#: html/getxls.php:239
+#: html/getxls.php:304
 msgid "Full"
 msgstr ""
 
-#: html/getxls.php:276
+#: html/getxls.php:341
 #, fuzzy, php-format
 msgid "User List of %s on %s"
 msgstr "Lista de usuarios"
 
-#: html/getxls.php:330
+#: html/getxls.php:395
 #, fuzzy, php-format
 msgid "Computers of %s on %s"
 msgstr "incompleto"
@@ -17088,7 +17361,7 @@ msgid "ACLs for this object"
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
+msgid "Copy & paste wizard"
 msgstr ""
 
 #: ihtml/themes/default/copyPasteDialog.tpl:4
@@ -17098,7 +17371,7 @@ msgid ""
 "maintain the values below to fullfill the policies."
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:21
+#: ihtml/themes/default/copyPasteDialog.tpl:20
 #, fuzzy
 msgid "Operation complete"
 msgstr "incompleto"
@@ -17154,27 +17427,52 @@ msgstr ""
 msgid "Choose a snapshot and click the folder image, to restore the snapshot"
 msgstr ""
 
-#: ihtml/themes/default/snapshotdialog.tpl:44
+#: ihtml/themes/default/snapshotdialog.tpl:43
 #, fuzzy
 msgid "Creating object snapshots"
 msgstr "Crear nuevo objeto grupo"
 
-#: ihtml/themes/default/snapshotdialog.tpl:47
+#: ihtml/themes/default/snapshotdialog.tpl:46
 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:62
+#: ihtml/themes/default/snapshotdialog.tpl:61
 #, fuzzy
 msgid "Timestamp"
 msgstr "Tiempo de espera"
 
-#: ihtml/themes/default/snapshotdialog.tpl:71
+#: ihtml/themes/default/snapshotdialog.tpl:70
 msgid "Reason for generating this snapshot"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Pgaer"
+#~ msgstr "Paginador"
+
+#~ msgid "Select subtree to place blocklist in"
+#~ msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
+
+#~ msgid "No permission to create a blocklist on this base."
+#~ msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
+
+#~ msgid ""
+#~ "You have no permissions to create or modify a global address book entry."
+#~ msgstr ""
+#~ "No tiene permisos para crear o modificar una entrada de libreta de "
+#~ "direcciones global."
+
+#~ msgid "You've no permission to do LDAP imports."
+#~ msgstr "No tiene permisos para hacer importaciones LDAP"
+
+#~ msgid "You've no permission to do LDAP exports."
+#~ msgstr "No tiene permisos para hacer exportaciones LDAP."
+
+#~ msgid "Choose subtree to place macro in"
+#~ msgstr "Elija lugar del árbol para colocar la macro"
+
 #, fuzzy
 #~ msgid "File servive (Shares)"
 #~ msgstr "Servidor de Archivos"
@@ -17327,10 +17625,6 @@ msgstr ""
 #~ msgid "Log"
 #~ msgstr "Inicio de sesión"
 
-#, fuzzy
-#~ msgid "Log service"
-#~ msgstr "Base de datos de acceso de usuarios"
-
 #, fuzzy
 #~ msgid "Removing server services/gokrb with dn '%s' failed."
 #~ msgstr "Ha fallado la grabación del objeto de servicio de servidor"
@@ -17486,10 +17780,6 @@ msgstr ""
 #~ msgid "mailEnabled"
 #~ msgstr "desactivado"
 
-#, fuzzy
-#~ msgid "Connectivity  account"
-#~ msgstr "Conectividad"
-
 #, fuzzy
 #~ msgid "GOsa intranet account"
 #~ msgstr "Crear cuenta de intranet"
@@ -17611,9 +17901,6 @@ msgstr ""
 #~ msgid "Removing FAX account failed"
 #~ msgstr "Ha fallado la eliminación de la cuenta de Fax"
 
-#~ msgid "Saving addressbook entry failed"
-#~ msgstr "Ha fallado la grabación de la cuenta de la libreta de direcciones"
-
 #~ msgid "Removing FAI script failed"
 #~ msgstr "Ha fallado la eliminación del script FAI"
 
@@ -17637,9 +17924,6 @@ msgstr ""
 #~ msgid "This 'dn' is no acl container."
 #~ msgstr "Este 'dn' no es un contenedor de listas de acceso."
 
-#~ msgid "All fields are writeable"
-#~ msgstr "Todos los campos son rellenarles."
-
 #~ msgid "Removing application information failed"
 #~ msgstr "Ha fallado la eliminación de información de la aplicación"