Added Translation Strings.

[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 fcceca22fc035bffa5d5767f7f189e9447bc439c..3d54b9152dea9811264c84cb2087138ab2c5fa4b 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1,13 +1,15 @@
 # translation of messages.po to Español
 # Alejandro Escanero Blanco <alex@ofmin.com>, 2003, 2005.
 # Alejandro Escanero Blanco <thoth@bbvnet.com>, 2006.
-#: plugins/personal/generic/class_user.inc:1301 include/class_plugin.inc:112
-#: include/class_plugin.inc:113
+#: plugins/personal/generic/class_user.inc:1338
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:115 include/class_plugin.inc:116
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-07-12 15:31+0200\n"
+"POT-Creation-Date: 2006-08-01 13:33+0200\n"
 "PO-Revision-Date: 2006-06-10 19:06GMT\n"
 "Last-Translator: Alejandro Escanero Blanco <thoth@bbvnet.com>\n"
 "Language-Team: Español\n"
@@ -16,7 +18,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.2\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1350
 msgid "My account"
 msgstr "Mi cuenta"
 
@@ -25,6 +27,7 @@ msgid "Administration"
 msgstr "Administradores"
 
 #: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr "Agregados"
 
@@ -36,18 +39,29 @@ msgstr "Agregados"
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1345
 #: 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/systems/servkolab.tpl:6
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:790
+#: plugins/admin/systems/class_componentGeneric.inc:233
 #: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
 #: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/goMailServer.tpl:1
 #: plugins/admin/systems/goImapServer.tpl:1
-#: plugins/admin/ogroups/termgroup.tpl:6 plugins/admin/fai/faiVariable.tpl:4
-#: plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: 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
@@ -57,7 +71,9 @@ msgstr "Agregados"
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
 #: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
 #: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Genérico"
@@ -68,6 +84,7 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
+#: plugins/personal/environment/class_environment.inc:1149
 #: plugins/admin/groups/class_divListGroup.inc:149
 #: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
@@ -75,16 +92,21 @@ msgstr "Entorno"
 
 #: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/admin/groups/class_groupMail.inc:980
 #: plugins/admin/groups/class_divListGroup.inc:141
 #: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
 #: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Correo Electrónico"
 
 #: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1016
 #: plugins/admin/groups/class_divListGroup.inc:143
 #: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
@@ -99,23 +121,28 @@ msgstr ""
 
 #: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:176
 msgid "Connectivity"
 msgstr "Conectividad"
 
-#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:271
-#: plugins/personal/generic/generic.tpl:402
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
 #: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/admin/users/class_divListUsers.inc:169
 #: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:254
-#: plugins/personal/generic/generic.tpl:392
+#: 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
@@ -124,26 +151,29 @@ msgstr "Fax"
 #: plugins/admin/groups/class_divListGroup.inc:147
 #: plugins/admin/users/class_divListUsers.inc:167
 #: plugins/admin/departments/generic.tpl:63
-#: plugins/admin/systems/class_systemManagement.inc:764
+#: plugins/admin/systems/class_systemManagement.inc:774
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Teléfono"
 
 #: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:99
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/mimetypes/generic.tpl:90
 #: plugins/admin/mimetypes/generic.tpl:131
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: contrib/gosa.conf:101 include/class_tabs.inc:294
+#: contrib/gosa.conf:101 include/class_tabs.inc:295
 msgid "ACL"
 msgstr "ACL"
 
@@ -160,6 +190,8 @@ msgid "Parameter"
 msgstr "Parámetro"
 
 #: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
 #: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr "Inicio"
@@ -170,9 +202,9 @@ msgid "Devices"
 msgstr "Servicios"
 
 #: contrib/gosa.conf:122 contrib/gosa.conf:138
-#: plugins/personal/environment/environment.tpl:173
-#: plugins/personal/environment/class_environment.inc:1260
-#: plugins/admin/systems/class_systemManagement.inc:773
+#: plugins/personal/environment/environment.tpl:228
+#: plugins/admin/systems/class_systemManagement.inc:783
+#: plugins/admin/systems/class_printGeneric.inc:796
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -222,7 +254,7 @@ msgstr "Exportar"
 msgid "Excel Export"
 msgstr "Exportar en XLS"
 
-#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:112
+#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:145
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
@@ -242,6 +274,7 @@ msgstr "Paticiones"
 
 #: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
 msgid "Script"
@@ -259,7 +292,7 @@ msgstr "Variables"
 msgid "Templates"
 msgstr "Plantillas"
 
-#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:11
 #: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
 msgstr "Perfiles"
@@ -269,7 +302,7 @@ msgstr "Perfiles"
 msgid "Summary"
 msgstr ""
 
-#: contrib/gosa.conf:236
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
 msgstr "Paquetes"
 
@@ -373,21 +406,21 @@ 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:57 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:164
 #: plugins/personal/mail/copypaste.tpl:43
 #: plugins/personal/mail/copypaste.tpl:61
-#: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:102
+#: plugins/personal/posix/generic.tpl:88
+#: plugins/personal/posix/generic.tpl:126
 #: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/paste_generic.tpl:61
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/samba/samba3.tpl:407
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:33
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
-#: plugins/personal/environment/environment.tpl:119
-#: plugins/personal/environment/environment.tpl:136
-#: plugins/personal/environment/environment.tpl:182
+#: plugins/personal/connectivity/kolab.tpl:53
+#: plugins/personal/connectivity/class_kolabAccount.inc:245
+#: plugins/personal/environment/environment.tpl:150
+#: plugins/personal/environment/environment.tpl:174
+#: plugins/personal/environment/environment.tpl:241
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
@@ -430,19 +463,19 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/systems/goMailServer.tpl:56
 #: plugins/admin/systems/goMailServer.tpl:79
 #: plugins/admin/systems/goMailServer.tpl:96
 #: plugins/admin/systems/goMailServer.tpl:120
 #: plugins/admin/systems/goMailServer.tpl:136
-#: plugins/admin/systems/goShareServer.tpl:10
 #: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
 #: 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:41
-#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:41
+#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:43
+#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:43
 #: plugins/admin/mimetypes/generic.tpl:87
 #: plugins/admin/mimetypes/generic.tpl:93
 #: plugins/admin/mimetypes/generic.tpl:134
@@ -454,18 +487,18 @@ msgstr "Añadir"
 #: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/posix/main.inc:102 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/main.inc:148
+#: plugins/personal/generic/generic_certs.tpl:94
 #: plugins/personal/connectivity/main.inc:120
-#: plugins/personal/environment/main.inc:106
+#: plugins/personal/environment/main.inc:97
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:52
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:91
 #: plugins/gofax/blocklists/remove.tpl:16
@@ -482,18 +515,18 @@ msgstr "Añadir"
 #: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/users/class_userManagement.inc:633
 #: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
 #: plugins/admin/applications/class_applicationManagement.inc:356
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_systemManagement.inc:484
+#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/systems/class_systemManagement.inc:494
 #: plugins/admin/systems/servdns.tpl:23
 #: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/systems/goNtpServer.tpl:24
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
@@ -517,8 +550,8 @@ msgstr "Añadir"
 #: plugins/admin/systems/ServiceAddDialog.tpl:31
 #: plugins/admin/systems/goKrbServer.tpl:21
 #: plugins/admin/systems/goLdapServer.tpl:9
-#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
 #: plugins/admin/systems/goImapServer.tpl:96
 #: plugins/admin/systems/goSyslogServer.tpl:8
 #: plugins/admin/systems/goGlpiServer.tpl:26
@@ -529,8 +562,8 @@ msgstr "Añadir"
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
 #: plugins/admin/ogroups/class_ogroupManagement.inc:338
 #: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:587
-#: plugins/admin/fai/class_faiManagement.inc:592
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
@@ -562,9 +595,10 @@ msgstr "Cancelar"
 msgid "Primary address"
 msgstr "Cuenta Principal"
 
-#: plugins/personal/mail/generic.tpl:11
+#: plugins/personal/mail/generic.tpl:15
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:765
+#: plugins/admin/systems/class_servGeneric.inc:321
+#: plugins/admin/systems/class_systemManagement.inc:775
 #: plugins/admin/systems/servnfs.tpl:33
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
 #: plugins/admin/ogroups/class_ogroupManagement.inc:386
@@ -572,50 +606,51 @@ msgstr "Cuenta Principal"
 msgid "Server"
 msgstr "Servidor"
 
-#: plugins/personal/mail/generic.tpl:14
+#: plugins/personal/mail/generic.tpl:18
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Especificar el servidor de correo donde el usuario estará hospedado."
 
-#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
+#: plugins/personal/mail/generic.tpl:28 plugins/admin/groups/mail.tpl:25
 msgid "Quota usage"
 msgstr "Uso de la Cola de Correo"
 
-#: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:483
+#: plugins/admin/systems/class_printGeneric.inc:480
 msgid "not defined"
 msgstr "sin definirse"
 
-#: plugins/personal/mail/generic.tpl:35
-#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/personal/mail/generic.tpl:40
+#: plugins/personal/mail/class_mailAccount.inc:997
 #: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr "Tamaño de la Cola de correo"
 
-#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:25
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/copypaste.tpl:25
 #: plugins/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
-#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:55
+#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/copypaste.tpl:55
 #: plugins/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
 #: plugins/admin/systems/phonesettings.tpl:172
 #: plugins/admin/systems/phonesettings.tpl:187
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
 
-#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:131
+#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:170
 #: plugins/personal/mail/copypaste.tpl:45
 #: plugins/personal/mail/copypaste.tpl:62
-#: plugins/personal/posix/generic.tpl:74
-#: plugins/personal/posix/generic.tpl:104
+#: plugins/personal/posix/generic.tpl:91
+#: plugins/personal/posix/generic.tpl:129
 #: plugins/personal/posix/paste_generic.tpl:62
-#: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/connectivity/kolab.tpl:35
-#: plugins/personal/environment/environment.tpl:138
-#: plugins/personal/environment/environment.tpl:166
-#: plugins/personal/environment/environment.tpl:183
-#: plugins/personal/environment/class_environment.inc:626
+#: 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:639
 #: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
@@ -628,9 +663,9 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/terminal.tpl:101
+#: plugins/admin/systems/terminal.tpl:101 plugins/admin/systems/printer.tpl:76
+#: plugins/admin/systems/printer.tpl:92
 #: plugins/admin/systems/workstation.tpl:80
-#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
 #: plugins/admin/systems/remove.tpl:14
 #: plugins/admin/systems/goNtpServer.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
@@ -662,112 +697,112 @@ msgstr "Lista de direcciones de correo alternativas."
 msgid "Delete"
 msgstr "Borrar"
 
-#: plugins/personal/mail/generic.tpl:67
+#: plugins/personal/mail/generic.tpl:80
 msgid "Mail options"
 msgstr "Opciones de correo"
 
-#: plugins/personal/mail/generic.tpl:72
+#: plugins/personal/mail/generic.tpl:86
 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:72
+#: plugins/personal/mail/generic.tpl:86
 msgid "No delivery to own mailbox"
 msgstr "No se enviara a su propia carpeta de correo"
 
-#: plugins/personal/mail/generic.tpl:75
+#: plugins/personal/mail/generic.tpl:91
 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:75
+#: plugins/personal/mail/generic.tpl:91
 msgid "Activate vacation message"
 msgstr "Activar mensaje de ausencia"
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:99
 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:82
+#: plugins/personal/mail/generic.tpl:101
 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:84
+#: plugins/personal/mail/generic.tpl:104
 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:87
+#: plugins/personal/mail/generic.tpl:108
 msgid "to folder"
 msgstr "a la carpeta"
 
-#: plugins/personal/mail/generic.tpl:94
+#: plugins/personal/mail/generic.tpl:118
 msgid "Reject mails bigger than"
 msgstr "rechazar correos mayores que"
 
-#: plugins/personal/mail/generic.tpl:96
-#: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
-#: plugins/personal/environment/environment.tpl:45
+#: plugins/personal/mail/generic.tpl:122
+#: plugins/personal/connectivity/pureftpd.tpl:60
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
+#: plugins/personal/environment/environment.tpl:55
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "Mb"
 
-#: plugins/personal/mail/generic.tpl:102
-#: plugins/personal/mail/class_mailAccount.inc:999
+#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/class_mailAccount.inc:1000
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
-#: plugins/personal/mail/generic.tpl:118
+#: plugins/personal/mail/generic.tpl:151
 #: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr "reenviar mensajes a"
 
-#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/generic.tpl:167
 #: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
 #: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr "Añadir Cuenta Local"
 
-#: plugins/personal/mail/generic.tpl:139
+#: plugins/personal/mail/generic.tpl:178
 msgid "Advanced mail options"
 msgstr "Opciones de correo avanzadas"
 
-#: plugins/personal/mail/generic.tpl:144
+#: plugins/personal/mail/generic.tpl:184
 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:145
+#: plugins/personal/mail/generic.tpl:186
 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:152
-#: plugins/personal/mail/class_mailAccount.inc:993
+#: plugins/personal/mail/generic.tpl:195
+#: plugins/personal/mail/class_mailAccount.inc:1015
 msgid "Use custom sieve script"
 msgstr "Usar 'script sive' propios"
 
-#: plugins/personal/mail/generic.tpl:152
+#: plugins/personal/mail/generic.tpl:195
 msgid "disables all Mail options!"
 msgstr "¡Desactivar todas las opciones de correo!"
 
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:100
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:146
 #: plugins/personal/connectivity/main.inc:118
-#: plugins/personal/environment/main.inc:104
+#: plugins/personal/environment/main.inc:95
 #: plugins/personal/nagios/main.inc:104 plugins/personal/netatalk/main.inc:104
 #: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/admin/groups/class_groupManagement.inc:330
-#: plugins/admin/users/class_userManagement.inc:626
+#: plugins/admin/users/class_userManagement.inc:627
 #: plugins/admin/applications/class_applicationManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:478
+#: plugins/admin/systems/class_systemManagement.inc:488
 #: plugins/admin/ogroups/class_ogroupManagement.inc:332
-#: plugins/admin/fai/class_faiManagement.inc:581
+#: plugins/admin/fai/class_faiManagement.inc:585
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:263
@@ -775,10 +810,10 @@ msgstr "¡Desactivar todas las opciones de correo!"
 msgid "Ok"
 msgstr ""
 
-#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
+#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:111
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:167
 #: plugins/personal/connectivity/main.inc:128
-#: plugins/personal/environment/main.inc:114
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
 #: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
@@ -786,11 +821,11 @@ 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:115 plugins/personal/posix/main.inc:122
-#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:172
+#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:113
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:160
 #: plugins/personal/connectivity/main.inc:129
-#: plugins/personal/environment/environment.tpl:137
-#: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:177
+#: plugins/personal/environment/main.inc:107
 #: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
@@ -816,7 +851,7 @@ msgid "User mail settings"
 msgstr "Parametros del correo de usuarios"
 
 #: plugins/personal/mail/copypaste.tpl:1
-#: plugins/personal/mail/class_mailAccount.inc:980
+#: plugins/personal/mail/class_mailAccount.inc:986
 #: plugins/admin/groups/paste_mail.tpl:1
 msgid "Mail settings"
 msgstr "Parámetros de correo"
@@ -871,27 +906,21 @@ msgstr "Esto hace algo"
 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'."
 
-#: plugins/personal/mail/class_mailAccount.inc:150
-#: plugins/admin/groups/class_groupMail.inc:173
-#, php-format
-msgid "Can't get quota information for '%s'."
-msgstr "No se pueden conseguir los datos de la cuota de '%s'."
-
-#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
 
-#: plugins/personal/mail/class_mailAccount.inc:248
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/mail/class_mailAccount.inc:257
+#: plugins/personal/mail/class_mailAccount.inc:258
 #: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/personal/mail/class_mailAccount.inc:259
 #: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -900,13 +929,13 @@ msgstr ""
 "Esta cuenta tiene las características de correo activas. Puede desactivarlas "
 "apretando a continuación."
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:261
 #: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -915,22 +944,22 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/mail/class_mailAccount.inc:311
+#: plugins/personal/mail/class_mailAccount.inc:313
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "reenvíos."
 
-#: plugins/personal/mail/class_mailAccount.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:319
 #: plugins/admin/groups/class_groupMail.inc:383
 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 "
 "sentido."
 
-#: plugins/personal/mail/class_mailAccount.inc:355
-#: plugins/personal/mail/class_mailAccount.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:349
+#: plugins/personal/mail/class_mailAccount.inc:354
 #: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
@@ -939,35 +968,35 @@ msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "direcciones alternativas"
 
-#: plugins/personal/mail/class_mailAccount.inc:370
+#: plugins/personal/mail/class_mailAccount.inc:364
 #: plugins/admin/groups/class_groupMail.inc:416
 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:623
+#: plugins/personal/mail/class_mailAccount.inc:614
 #, 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:727
+#: plugins/personal/mail/class_mailAccount.inc:716
 #, 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:775
+#: plugins/personal/mail/class_mailAccount.inc:764
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:769
 #: plugins/admin/groups/class_groupMail.inc:803
 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:784
-#: plugins/personal/mail/class_mailAccount.inc:788
+#: plugins/personal/mail/class_mailAccount.inc:773
+#: plugins/personal/mail/class_mailAccount.inc:777
 #: plugins/addons/addressbook/class_addressbook.inc:589
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
@@ -975,99 +1004,116 @@ msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/personal/mail/class_mailAccount.inc:794
+#: plugins/personal/mail/class_mailAccount.inc:783
 #: plugins/admin/groups/class_groupMail.inc:812
 #: plugins/admin/ogroups/class_mailogroup.inc:78
 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:800
+#: plugins/personal/mail/class_mailAccount.inc:789
 #: plugins/admin/groups/class_groupMail.inc:818
 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:809
+#: plugins/personal/mail/class_mailAccount.inc:798
 #: plugins/admin/groups/class_groupMail.inc:827
 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:819
+#: plugins/personal/mail/class_mailAccount.inc:808
 #: plugins/admin/groups/class_groupMail.inc:835
 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:823
+#: plugins/personal/mail/class_mailAccount.inc:812
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:968
+#: plugins/personal/mail/class_mailAccount.inc:852
+#: plugins/personal/mail/class_mailAccount.inc:864
+#, 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:896
+#: plugins/personal/mail/class_mailAccount.inc:907
+#, 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:972
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:970
+#: plugins/personal/mail/class_mailAccount.inc:974
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:984
+#: plugins/personal/mail/class_mailAccount.inc:995
 #: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
 msgid "Mail address"
 msgstr "Dirección correo electrónico"
 
-#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/admin/groups/class_groupMail.inc:992
 #: plugins/admin/systems/servservice.tpl:107
 msgid "Mail server"
 msgstr "Servidor de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:987
+#: plugins/personal/mail/class_mailAccount.inc:999
 #, fuzzy
-msgid "Mail max size"
-msgstr "Tamaño del correo electrónico"
+msgid "Add vacation information"
+msgstr "Información organizativa"
 
-#: plugins/personal/mail/class_mailAccount.inc:988
-#: plugins/personal/mail/class_mailAccount.inc:1000
+#: plugins/personal/mail/class_mailAccount.inc:1002
+msgid "Use spam filter"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1003
 #, fuzzy
-msgid "Forwarding address"
-msgstr "Cuenta Principal"
+msgid "Spam level"
+msgstr "Nivel de log"
 
-#: plugins/personal/mail/class_mailAccount.inc:989
+#: plugins/personal/mail/class_mailAccount.inc:1004
 #, fuzzy
-msgid "Local delivery"
-msgstr "Último envío"
+msgid "Spam mail box"
+msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/mail/class_mailAccount.inc:990
+#: plugins/personal/mail/class_mailAccount.inc:1006
 #, fuzzy
 msgid "Reject due to mailsize"
 msgstr "rechazar correos mayores que"
 
-#: plugins/personal/mail/class_mailAccount.inc:991
-msgid "Use spam filter"
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:992
+#: plugins/personal/mail/class_mailAccount.inc:1007
 #, fuzzy
-msgid "Add vacation information"
-msgstr "Información organizativa"
-
-#: plugins/personal/mail/class_mailAccount.inc:994
-msgid "Only insider delivery"
-msgstr ""
+msgid "Mail max size"
+msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/mail/class_mailAccount.inc:1009
+#: plugins/personal/mail/class_mailAccount.inc:1014
 #, fuzzy
-msgid "Spam level"
-msgstr "Nivel de log"
+msgid "Forwarding address"
+msgstr "Cuenta Principal"
 
-#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/personal/mail/class_mailAccount.inc:1010
 #, fuzzy
-msgid "Spam mail box"
-msgstr "Tamaño del correo electrónico"
+msgid "Local delivery"
+msgstr "Último envío"
 
-#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/personal/mail/class_mailAccount.inc:1011
+msgid "Only insider delivery"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1012
 #, fuzzy
 msgid "Mail alternative addresses"
 msgstr "Direcciones alternativas"
@@ -1132,7 +1178,7 @@ msgstr ""
 "todos los programas configurados también."
 
 #: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:169
+#: plugins/personal/generic/main.inc:157
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentimport.tpl:45
@@ -1140,7 +1186,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:1475
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1477
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -1154,10 +1200,15 @@ msgstr "Atras"
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
 #: plugins/admin/systems/goFonServer.tpl:8
 #: plugins/admin/systems/class_divListSystem.inc:189
 #: plugins/admin/systems/goKrbServer.tpl:12
 #: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
 #: plugins/admin/systems/goGlpiServer.tpl:9
 #: plugins/admin/systems/goFaxServer.tpl:8
 #: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
@@ -1184,7 +1235,7 @@ msgstr "La contraseña introducida como contraseña actual no es correcta."
 msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
-#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
+#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:74
 #: plugins/admin/users/class_userManagement.inc:219
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
@@ -1193,7 +1244,7 @@ msgstr ""
 "Las contraseñas ingresadas como 'Nueva contraseña' y 'Repetir nueva "
 "contraseña' no concuerdan."
 
-#: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
+#: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:79
 #: plugins/admin/users/class_userManagement.inc:224
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La contraseña que ingreso como 'Nueva contraseña' está vacia."
@@ -1215,25 +1266,24 @@ msgid "External password changer reported a problem: "
 msgstr "El programa externo de cambio de contraseña informo de un problema: "
 
 #: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/class_posixAccount.inc:1223
-#: plugins/personal/posix/class_posixAccount.inc:1226
+#: plugins/personal/posix/class_posixAccount.inc:1259
 #: plugins/personal/posix/paste_generic.tpl:8
-#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
+#: plugins/personal/samba/class_sambaAccount.inc:621
 msgid "Home directory"
 msgstr "Directorio Principal"
 
-#: plugins/personal/posix/generic.tpl:13
-#: plugins/personal/posix/class_posixAccount.inc:1229
+#: plugins/personal/posix/generic.tpl:15
+#: plugins/personal/posix/class_posixAccount.inc:1260
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/generic.tpl:21
-#: plugins/personal/posix/class_posixAccount.inc:1227
+#: plugins/personal/posix/generic.tpl:25
 msgid "Primary group"
 msgstr "Grupo primario"
 
-#: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/posix/generic.tpl:35
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:219
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1241,41 +1291,41 @@ msgstr "Grupo primario"
 msgid "Status"
 msgstr "Estado"
 
-#: plugins/personal/posix/generic.tpl:39
+#: plugins/personal/posix/generic.tpl:47
 #: plugins/personal/posix/paste_generic.tpl:23
 msgid "Force UID/GID"
 msgstr "Forzar UID/GID"
 
-#: plugins/personal/posix/generic.tpl:43
+#: plugins/personal/posix/generic.tpl:51
 #: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/generic.tpl:52
+#: plugins/personal/posix/generic.tpl:62
 #: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/generic.tpl:64
+#: plugins/personal/posix/generic.tpl:76
 #: plugins/personal/posix/paste_generic.tpl:47
 msgid "Group membership"
 msgstr "Miembros del grupo"
 
-#: plugins/personal/posix/generic.tpl:66
+#: plugins/personal/posix/generic.tpl:78
 #: plugins/personal/posix/paste_generic.tpl:54
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
 
-#: plugins/personal/posix/generic.tpl:84
+#: plugins/personal/posix/generic.tpl:102
 msgid "Account"
 msgstr "Cuenta"
 
-#: plugins/personal/posix/generic.tpl:91
-#: plugins/personal/posix/class_posixAccount.inc:1241
+#: plugins/personal/posix/generic.tpl:109
 msgid "System trust"
 msgstr "Autenticación del sistema"
 
-#: plugins/personal/posix/generic.tpl:92
+#: plugins/personal/posix/generic.tpl:110
 msgid "Trust mode"
 msgstr "Modo Autenticado"
 
@@ -1321,13 +1371,13 @@ msgstr "Mostrar grupos de usuarios"
 msgid "User name of which groups are shown"
 msgstr "Nombres de usuarios de los grupos que se muestran"
 
-#: plugins/personal/posix/posix_shadow.tpl:5
+#: plugins/personal/posix/posix_shadow.tpl:9
 msgid "User must change password on first login"
 msgstr ""
 "Los usuarios deben cambiar su contraseña en el próximo inicio de sesión"
 
-#: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/posix/posix_shadow.tpl:34
+#: plugins/personal/samba/samba2.tpl:87 plugins/personal/samba/samba3.tpl:311
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
@@ -1344,7 +1394,7 @@ msgstr "Mostrar sistemas de departamentos"
 msgid "Display systems matching"
 msgstr "Mostrar sistemas que concuerden con"
 
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:121
 msgid "Unix settings"
 msgstr "Parametros Unix"
 
@@ -1353,36 +1403,36 @@ msgstr "Parametros Unix"
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:125
+#: plugins/personal/posix/class_posixAccount.inc:129
 msgid "expired"
 msgstr "expiró"
 
-#: plugins/personal/posix/class_posixAccount.inc:127
+#: plugins/personal/posix/class_posixAccount.inc:131
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:130
+#: plugins/personal/posix/class_posixAccount.inc:134
 msgid "active, password not changable"
 msgstr "activo, no puede cambiar la contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:132
+#: plugins/personal/posix/class_posixAccount.inc:136
 msgid "active, password expired"
 msgstr "activo, la contraseña expiró"
 
-#: plugins/personal/posix/class_posixAccount.inc:134
+#: plugins/personal/posix/class_posixAccount.inc:138
 msgid "active"
 msgstr "activo"
 
-#: plugins/personal/posix/class_posixAccount.inc:145
-#: plugins/personal/posix/class_posixAccount.inc:979
+#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:1008
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: plugins/personal/posix/class_posixAccount.inc:185
+#: plugins/personal/posix/class_posixAccount.inc:189
 msgid "unconfigured"
 msgstr "Desconfigurado"
 
-#: plugins/personal/posix/class_posixAccount.inc:203
+#: plugins/personal/posix/class_posixAccount.inc:206
 #: plugins/admin/systems/class_terminalService.inc:194
 #: plugins/admin/systems/class_workstationStartup.inc:759
 #: plugins/admin/systems/class_workstationService.inc:182
@@ -1390,16 +1440,16 @@ msgstr "Desconfigurado"
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:242
+#: plugins/personal/posix/class_posixAccount.inc:254
 msgid "This account has no unix extensions."
 msgstr "Este cuenta no tiene extensiones unix."
 
-#: plugins/personal/posix/class_posixAccount.inc:262
-#: plugins/personal/posix/class_posixAccount.inc:265
+#: plugins/personal/posix/class_posixAccount.inc:274
+#: plugins/personal/posix/class_posixAccount.inc:277
 msgid "Remove posix account"
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:263
+#: plugins/personal/posix/class_posixAccount.inc:275
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
@@ -1407,7 +1457,7 @@ msgstr ""
 "Esta cuenta tiene las características unix activadas. Para desactivarlas, "
 "necesita eliminar la cuenta samba primero."
 
-#: plugins/personal/posix/class_posixAccount.inc:266
+#: plugins/personal/posix/class_posixAccount.inc:278
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1415,11 +1465,11 @@ msgstr ""
 "Esta cuenta tiene características posix activadas. Puede desactivarla "
 "pulsando aqui"
 
-#: plugins/personal/posix/class_posixAccount.inc:269
+#: plugins/personal/posix/class_posixAccount.inc:281
 msgid "Create posix account"
 msgstr "Crear cuenta posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:270
+#: plugins/personal/posix/class_posixAccount.inc:282
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1427,285 +1477,285 @@ msgstr ""
 "Esta cuenta tiene la extensión posix desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/posix/class_posixAccount.inc:433
+#: plugins/personal/posix/class_posixAccount.inc:451
 #, 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:435
+#: plugins/personal/posix/class_posixAccount.inc:455
 #, 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:437
+#: plugins/personal/posix/class_posixAccount.inc:459
 #, 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:439
+#: plugins/personal/posix/class_posixAccount.inc:463
 #, 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:463
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr "Enero"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr "Febrero"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr "Marzo"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
 #: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr "Abril"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr "Mayo"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr "Junio"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr "Julio"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr "Agosto"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:358
-#: plugins/personal/samba/class_sambaAccount.inc:376
-#: plugins/personal/samba/class_sambaAccount.inc:394
-#: plugins/personal/samba/class_sambaAccount.inc:412
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr "Septiembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
-#: plugins/personal/samba/class_sambaAccount.inc:359
-#: plugins/personal/samba/class_sambaAccount.inc:377
-#: plugins/personal/samba/class_sambaAccount.inc:395
-#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr "Octubre"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
-#: plugins/personal/samba/class_sambaAccount.inc:359
-#: plugins/personal/samba/class_sambaAccount.inc:377
-#: plugins/personal/samba/class_sambaAccount.inc:395
-#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr "Noviembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:465
-#: plugins/personal/samba/class_sambaAccount.inc:359
-#: plugins/personal/samba/class_sambaAccount.inc:377
-#: plugins/personal/samba/class_sambaAccount.inc:395
-#: plugins/personal/samba/class_sambaAccount.inc:413
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr "Diciembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:547
-#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/personal/posix/class_posixAccount.inc:577
+#: plugins/personal/samba/class_sambaAccount.inc:459
 #: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/personal/posix/class_posixAccount.inc:547
+#: plugins/personal/posix/class_posixAccount.inc:577
 msgid "full access"
 msgstr "Acceso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:548
+#: plugins/personal/posix/class_posixAccount.inc:578
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/personal/posix/class_posixAccount.inc:594
+#: plugins/personal/posix/class_posixAccount.inc:624
 #, 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:743
+#: plugins/personal/posix/class_posixAccount.inc:772
 msgid "Failed: overriding lock"
 msgstr "Fallo: Sobrepasado bloqueo"
 
-#: plugins/personal/posix/class_posixAccount.inc:832
+#: plugins/personal/posix/class_posixAccount.inc:861
 #, 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:893
+#: plugins/personal/posix/class_posixAccount.inc:922
 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:896
+#: plugins/personal/posix/class_posixAccount.inc:925
 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:904
+#: plugins/personal/posix/class_posixAccount.inc:933
 msgid "Value specified as 'UID' is not valid."
 msgstr "El valor especificado en 'UID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:907
+#: plugins/personal/posix/class_posixAccount.inc:936
 msgid "Value specified as 'UID' is too small."
 msgstr "El valor especificado como 'UID' es demasiado pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:911
+#: plugins/personal/posix/class_posixAccount.inc:940
 #: plugins/admin/groups/class_groupGeneric.inc:774
 msgid "Value specified as 'GID' is not valid."
 msgstr "El valor especificado como 'GID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:914
+#: plugins/personal/posix/class_posixAccount.inc:943
 #: plugins/admin/groups/class_groupGeneric.inc:777
 msgid "Value specified as 'GID' is too small."
 msgstr "El valor especificado como 'GID' es muy pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:951
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "El valor especificado en 'shadowMin' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:956
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "El valor especificado en 'shadowMax' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:932
+#: plugins/personal/posix/class_posixAccount.inc:961
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "El valor especificado en 'shadowWarning' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:964
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:938
+#: plugins/personal/posix/class_posixAccount.inc:967
 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:941
+#: plugins/personal/posix/class_posixAccount.inc:970
 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:946
+#: plugins/personal/posix/class_posixAccount.inc:975
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "El valor especificado en 'shadowInactive' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:949
+#: plugins/personal/posix/class_posixAccount.inc:978
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "'shadowInactive' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:954
+#: plugins/personal/posix/class_posixAccount.inc:983
 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:1081
+#: plugins/personal/posix/class_posixAccount.inc:1110
 #: plugins/admin/groups/class_groupGeneric.inc:813
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1219
+#: plugins/personal/posix/class_posixAccount.inc:1249
 #, fuzzy
 msgid "POSIX account"
 msgstr "Cuenta GLPI"
 
-#: plugins/personal/posix/class_posixAccount.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1261
 #: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
 #: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
 #: html/getxls.php:299
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: plugins/personal/posix/class_posixAccount.inc:1225
+#: plugins/personal/posix/class_posixAccount.inc:1262
 #, fuzzy
 msgid "Group ID"
 msgstr "Grupo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1232
+#: plugins/personal/posix/class_posixAccount.inc:1264
+#, fuzzy
+msgid "Force password change on login"
+msgstr "No se permite cambiar contraseña"
+
+#: plugins/personal/posix/class_posixAccount.inc:1265
 #, fuzzy
 msgid "Shadow min"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1233
+#: plugins/personal/posix/class_posixAccount.inc:1266
 #, fuzzy
 msgid "Shadow max"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1234
+#: plugins/personal/posix/class_posixAccount.inc:1267
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1235
+#: plugins/personal/posix/class_posixAccount.inc:1268
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Ocultamiento"
 
-#: plugins/personal/posix/class_posixAccount.inc:1236
-#, fuzzy
-msgid "Shadow last change"
-msgstr "Mostrar paquetes"
-
-#: plugins/personal/posix/class_posixAccount.inc:1238
+#: plugins/personal/posix/class_posixAccount.inc:1269
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Mostrar personal"
 
-#: plugins/personal/posix/class_posixAccount.inc:1242
+#: plugins/personal/posix/class_posixAccount.inc:1270
 #, fuzzy
 msgid "System trust model"
 msgstr "Autenticación del sistema"
@@ -1718,137 +1768,137 @@ msgstr "Parámetros Posix"
 msgid "Samba home"
 msgstr "Directorio Samba"
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba2.tpl:37 plugins/personal/samba/samba3.tpl:44
 msgid "Script path"
 msgstr "Ruta del Script"
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:644
+#: plugins/personal/samba/samba2.tpl:45 plugins/personal/samba/samba3.tpl:52
+#: plugins/personal/samba/samba3.tpl:111
+#: plugins/personal/samba/class_sambaAccount.inc:622
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
+#: plugins/personal/samba/samba2.tpl:59 plugins/personal/samba/samba3.tpl:288
 msgid "Access options"
 msgstr "Opciones de acceso"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
+#: plugins/personal/samba/samba2.tpl:67 plugins/personal/samba/samba3.tpl:296
 msgid "Allow user to change password from client"
 msgstr "Permitir al usuario cambiar las opciones desde el cliente"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
-#: plugins/personal/samba/class_sambaAccount.inc:1043
+#: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
+#: plugins/personal/samba/class_sambaAccount.inc:1030
 msgid "Login from windows client requires no password"
 msgstr "El inicio de sesión en window no requiere contraseña"
 
-#: plugins/personal/samba/samba2.tpl:60
+#: plugins/personal/samba/samba2.tpl:77
 msgid "Temporary disable samba account"
 msgstr "Desactivar temporalmente la cuenta samba"
 
-#: plugins/personal/samba/samba3.tpl:23
-#: plugins/personal/samba/class_sambaAccount.inc:1055
+#: plugins/personal/samba/samba3.tpl:27
+#: plugins/personal/samba/class_sambaAccount.inc:1044
 msgid "Domain"
 msgstr "Dominio"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:66
 msgid "Terminal Server"
 msgstr "Servidor de terminal"
 
-#: plugins/personal/samba/samba3.tpl:91
-#: plugins/personal/samba/class_sambaAccount.inc:1041
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:1026
 msgid "Allow login on terminal server"
 msgstr "Permitir entrada en el servidor de terminal"
 
-#: plugins/personal/samba/samba3.tpl:118
-#: plugins/personal/samba/class_sambaAccount.inc:1042
+#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/class_sambaAccount.inc:1027
 msgid "Inherit client config"
 msgstr "Configuración del cliente por defecto"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:134
 msgid "Initial program"
 msgstr "Programa inicial"
 
-#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/samba3.tpl:142
 msgid "Working directory"
 msgstr "Directorio de trabajo"
 
-#: plugins/personal/samba/samba3.tpl:153
+#: plugins/personal/samba/samba3.tpl:159
 msgid "Timeout settings (in minutes)"
 msgstr "Características de tiempo de desconexión (en minutos)"
 
-#: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:651
+#: plugins/personal/samba/samba3.tpl:169
+#: plugins/personal/samba/class_sambaAccount.inc:629
 msgid "Connection"
 msgstr "Conexión"
 
-#: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:652
+#: plugins/personal/samba/samba3.tpl:183
+#: plugins/personal/samba/class_sambaAccount.inc:630
 msgid "Disconnection"
 msgstr "Desconexión"
 
-#: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:653
+#: plugins/personal/samba/samba3.tpl:197
+#: plugins/personal/samba/class_sambaAccount.inc:631
 msgid "IDLE"
 msgstr "IDLE"
 
-#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/samba3.tpl:213
 msgid "Client devices"
 msgstr "Dispositivos clientes"
 
-#: plugins/personal/samba/samba3.tpl:194
+#: plugins/personal/samba/samba3.tpl:220
 msgid "Connect client drives at logon"
 msgstr "Conectar los discos clientes al iniciar"
 
-#: plugins/personal/samba/samba3.tpl:200
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Connect client printers at logon"
 msgstr "Conectar las impresoras clientes al iniciar"
 
-#: plugins/personal/samba/samba3.tpl:206
+#: plugins/personal/samba/samba3.tpl:236
 msgid "Default to main client printer"
 msgstr "Por defecto a la impresora principal del cliente"
 
-#: plugins/personal/samba/samba3.tpl:216
-#: plugins/personal/connectivity/pureftpd.tpl:68
+#: plugins/personal/samba/samba3.tpl:246
+#: plugins/personal/connectivity/pureftpd.tpl:93
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/personal/samba/samba3.tpl:220
+#: plugins/personal/samba/samba3.tpl:250
 msgid "Shadowing"
 msgstr "Ocultamiento"
 
-#: plugins/personal/samba/samba3.tpl:229
+#: plugins/personal/samba/samba3.tpl:261
 msgid "On broken or timed out"
 msgstr "Desconexión o tiempo excedido"
 
-#: plugins/personal/samba/samba3.tpl:237
+#: plugins/personal/samba/samba3.tpl:271
 msgid "Reconnect if disconnected"
 msgstr "Reconexión si se ha desconectado"
 
-#: plugins/personal/samba/samba3.tpl:264
-#: plugins/personal/samba/class_sambaAccount.inc:1044
+#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/class_sambaAccount.inc:1031
 msgid "Lock samba account"
 msgstr "Bloquear cuenta samba"
 
-#: plugins/personal/samba/samba3.tpl:279
-#: plugins/personal/samba/class_sambaAccount.inc:1046
+#: plugins/personal/samba/samba3.tpl:331
+#: plugins/personal/samba/class_sambaAccount.inc:1037
 msgid "Limit Logon Time"
 msgstr "Tiempo de entrada límite"
 
-#: plugins/personal/samba/samba3.tpl:291
-#: plugins/personal/samba/class_sambaAccount.inc:1047
+#: plugins/personal/samba/samba3.tpl:351
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 msgid "Limit Logoff Time"
 msgstr "Tiempo de salida límite"
 
-#: plugins/personal/samba/samba3.tpl:304
+#: plugins/personal/samba/samba3.tpl:372
 msgid "Account expires after"
 msgstr "La cuenta expirará después de"
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:398
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
 #: plugins/personal/samba/main.inc:123
-#: plugins/personal/samba/class_sambaAccount.inc:1037
+#: plugins/personal/samba/class_sambaAccount.inc:1017
 msgid "Samba settings"
 msgstr "Parametros de samba"
 
@@ -1898,49 +1948,49 @@ msgstr ""
 "características Posix son necesarias para las cuentas samba, activelas "
 "primero."
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "input on, notify on"
 msgstr "Activación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:461
 msgid "input on, notify off"
 msgstr "Activación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:458
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "input off, notify on"
 msgstr "Desactivación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:463
 msgid "input off, nofify off"
 msgstr "Desactivación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:461
+#: plugins/personal/samba/class_sambaAccount.inc:465
 msgid "disconnect"
 msgstr "desconectar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:466
 msgid "reset"
 msgstr "Borrar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:468
 msgid "from any client"
 msgstr "Desde cualquier cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:469
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:627
+#: plugins/personal/samba/class_sambaAccount.inc:605
 #, fuzzy, php-format
 msgid "Removing of user/samba account with dn '%s' failed."
 msgstr "Ha fallado al eliminar la cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:646
+#: plugins/personal/samba/class_sambaAccount.inc:624
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "¡El valor especificado como '%s' contiene caracteres no validos!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:656
+#: plugins/personal/samba/class_sambaAccount.inc:634
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1948,7 +1998,7 @@ msgstr ""
 "¡La propiedad 'tiempo de desconexión' '%s' esta activada y contiene "
 "caracteres no validos o no caracteres!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:662
+#: plugins/personal/samba/class_sambaAccount.inc:640
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1956,7 +2006,7 @@ msgstr ""
 "El gestor de usuarios de windows solo permite ocho clientes. Ha especificado "
 "mas de ocho."
 
-#: plugins/personal/samba/class_sambaAccount.inc:846
+#: plugins/personal/samba/class_sambaAccount.inc:824
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1964,7 +2014,7 @@ msgstr ""
 "Aviso: Esta cuenta tiene asignado un SID indefinido. ¡El problema no puede "
 "ser solucionado por GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:870
+#: plugins/personal/samba/class_sambaAccount.inc:848
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1972,46 +2022,46 @@ msgstr ""
 "Aviso: No puedo identificar el grupo primario de usuarios - ¡No se puede "
 "realizar una conversión a grupo de samba!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:974
+#: plugins/personal/samba/class_sambaAccount.inc:952
 #, fuzzy, php-format
 msgid "Saving of user/samba account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de Kolab"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1048
-#, fuzzy
-msgid "Account expires"
-msgstr "La cuenta expirará después de"
-
-#: plugins/personal/samba/class_sambaAccount.inc:1049
+#: plugins/personal/samba/class_sambaAccount.inc:1029
 #, fuzzy
 msgid "Allow user to change password"
 msgstr "Permitir al usuario cambiar las opciones desde el cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1050
+#: plugins/personal/samba/class_sambaAccount.inc:1034
+#, fuzzy
+msgid "Account expires"
+msgstr "La cuenta expirará después de"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1035
 #, fuzzy
 msgid "Password expires"
 msgstr "La contraseña expira en"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1051
+#: plugins/personal/samba/class_sambaAccount.inc:1040
 #, fuzzy
 msgid "Generic home directory"
 msgstr "Directorio Principal"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1052
+#: plugins/personal/samba/class_sambaAccount.inc:1041
 msgid "Generic samba home drive"
 msgstr ""
 
-#: plugins/personal/samba/class_sambaAccount.inc:1053
+#: plugins/personal/samba/class_sambaAccount.inc:1042
 #, fuzzy
 msgid "Generic script path"
 msgstr "Ruta del Script"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1054
+#: plugins/personal/samba/class_sambaAccount.inc:1043
 #, fuzzy
 msgid "Generic profile path"
 msgstr "Ruta del Perfil"
 
-#: plugins/personal/samba/class_sambaAccount.inc:1056
+#: plugins/personal/samba/class_sambaAccount.inc:1045
 #, fuzzy
 msgid "Allow connection from"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
@@ -2028,83 +2078,88 @@ msgstr "hombre"
 msgid "This account has no valid GOsa extensions."
 msgstr "Esta cuenta no tiene extensiones GOsa validas"
 
-#: plugins/personal/generic/class_user.inc:326
+#: plugins/personal/generic/class_user.inc:330
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 "¡El archivo especificado no ha podido ser subido vía HTTP POST! Abortado."
 
-#: plugins/personal/generic/class_user.inc:422
+#: plugins/personal/generic/class_user.inc:428
 msgid "Please enter a valid serial number"
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/personal/generic/class_user.inc:459
+#: plugins/personal/generic/class_user.inc:468
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:459
+#: plugins/personal/generic/class_user.inc:468
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:459
+#: plugins/personal/generic/class_user.inc:468
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:463
+#: plugins/personal/generic/class_user.inc:472
 msgid "No certificate installed"
 msgstr "No hay certificados instalados"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:563
 #, fuzzy, php-format
 msgid "Removing of user/generic account with dn '%s' failed."
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/personal/generic/class_user.inc:835
+#: plugins/personal/generic/class_user.inc:631
+#, 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:874
 #, fuzzy, php-format
 msgid "Saving of user/generic account with dn '%s' failed."
 msgstr "Cuenta proxy"
 
-#: plugins/personal/generic/class_user.inc:882
+#: plugins/personal/generic/class_user.inc:921
 msgid "Kerberos database communication failed"
 msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/class_user.inc:899
+#: plugins/personal/generic/class_user.inc:938
 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:910
+#: plugins/personal/generic/class_user.inc:949
 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:954
+#: plugins/personal/generic/class_user.inc:990
 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:959
+#: plugins/personal/generic/class_user.inc:993
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "No tiene permisos para transladar a un usuario de su base original"
 
-#: plugins/personal/generic/class_user.inc:965
+#: plugins/personal/generic/class_user.inc:999
 #: plugins/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:519
+#: plugins/admin/users/class_userManagement.inc:520
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:974
+#: plugins/personal/generic/class_user.inc:1008
 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:980
+#: plugins/personal/generic/class_user.inc:1014
 #: plugins/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:522
+#: plugins/admin/users/class_userManagement.inc:523
 msgid "The required field 'Given name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:1017
 msgid "The required field 'Login' is not set."
 msgstr " El campo requerido 'Login' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:1024
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2112,7 +2167,7 @@ msgstr ""
 "Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
 "base de datos."
 
-#: plugins/personal/generic/class_user.inc:997
+#: plugins/personal/generic/class_user.inc:1031
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2120,184 +2175,226 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:1034
 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:1003
-#: plugins/personal/generic/class_user.inc:1028
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1062
 #: plugins/addons/addressbook/class_addressbook.inc:556
 #: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/personal/generic/class_user.inc:1006
-#: plugins/personal/generic/class_user.inc:1025
+#: plugins/personal/generic/class_user.inc:1040
+#: plugins/personal/generic/class_user.inc:1059
 #: plugins/addons/addressbook/class_addressbook.inc:559
 #: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
 
-#: plugins/personal/generic/class_user.inc:1011
+#: plugins/personal/generic/class_user.inc:1045
 #: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 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:1014
+#: plugins/personal/generic/class_user.inc:1048
 #: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 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:1017
+#: plugins/personal/generic/class_user.inc:1051
 #: plugins/addons/addressbook/class_addressbook.inc:573
 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:1020
+#: plugins/personal/generic/class_user.inc:1054
 #: plugins/addons/addressbook/class_addressbook.inc:576
 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:1147
+#: plugins/personal/generic/class_user.inc:1184
 msgid "Could not open specified certificate!"
 msgstr "¡No puedo abrir el certificado especificado!"
 
-#: plugins/personal/generic/class_user.inc:1293
-#: plugins/personal/generic/generic.tpl:356
+#: plugins/personal/generic/class_user.inc:1330
+#: plugins/personal/generic/generic.tpl:442
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/class_user.inc:1294
-#: plugins/personal/generic/generic.tpl:375
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/generic.tpl:467
 msgid "House identifier"
 msgstr "Tipo de Vía"
 
-#: plugins/personal/generic/class_user.inc:1295
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/class_user.inc:1332
+#: plugins/personal/generic/generic.tpl:384
 msgid "Vocation"
 msgstr "Intereses"
 
-#: plugins/personal/generic/class_user.inc:1296
-#: plugins/personal/generic/generic.tpl:410
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:511
 msgid "Last delivery"
 msgstr "Último envío"
 
-#: plugins/personal/generic/class_user.inc:1297
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:433
 msgid "Person locality"
 msgstr "Población de la Persona"
 
-#: plugins/personal/generic/class_user.inc:1298
-#: plugins/personal/generic/generic.tpl:313
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:392
 msgid "Unit description"
 msgstr "Descripción de la unidad"
 
-#: plugins/personal/generic/class_user.inc:1299
-#: plugins/personal/generic/generic.tpl:321
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:401
 msgid "Subject area"
 msgstr "Adjunto al area"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/generic.tpl:410
 msgid "Functional title"
 msgstr "Título Funcional"
 
-#: plugins/personal/generic/class_user.inc:1302
-#: plugins/personal/generic/generic.tpl:417
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/generic.tpl:520
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
-#: plugins/personal/generic/class_user.inc:1303
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/generic.tpl:451
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/class_user.inc:1304
-#: plugins/personal/generic/generic.tpl:336
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/generic/generic.tpl:419
 msgid "Role"
 msgstr "Papel desempeñado"
 
-#: plugins/personal/generic/class_user.inc:1305
-#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/generic.tpl:459
 #: plugins/addons/addressbook/address_edit.tpl:158
 #: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1346
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Parámetros genéricos de la cola"
 
-#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1351
 #: plugins/addons/notifications/class_msgplug.inc:35
 #: plugins/admin/users/class_userManagement.inc:28
 #: plugins/admin/systems/printer.tpl:71
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: include/class_acl.inc:140 html/getxls.php:68 html/getxls.php:70
+#: include/class_acl.inc:164 html/getxls.php:68 html/getxls.php:70
 #: html/getxls.php:243
 msgid "Users"
 msgstr "Usuarios"
 
-#: plugins/personal/generic/class_user.inc:1313
+#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/generic.tpl:143
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: 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
+msgid "Base"
+msgstr "Base"
+
+#: plugins/personal/generic/class_user.inc:1356
 #, fuzzy
 msgid "User password"
 msgstr "Borrar contraseña"
 
-#: plugins/personal/generic/class_user.inc:1314 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1357 html/getxls.php:236
 #, fuzzy
 msgid "Surename"
 msgstr "Nombre del servidor"
 
-#: plugins/personal/generic/class_user.inc:1315
+#: plugins/personal/generic/class_user.inc:1358
 #: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/class_user.inc:1316
+#: plugins/personal/generic/class_user.inc:1359
 #, fuzzy
 msgid "User identification"
 msgstr "Información de Usuario"
 
-#: plugins/personal/generic/class_user.inc:1317
-#: plugins/personal/generic/generic.tpl:67
+#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/generic.tpl:73
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Título Personal"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/generic.tpl:75
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/generic.tpl:83
 msgid "Academic title"
 msgstr "Títulos academicos"
 
-#: plugins/personal/generic/class_user.inc:1319 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1362 html/getxls.php:174
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1363
 #, fuzzy
 msgid "Home phone number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/generic.tpl:159
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/generic.tpl:183
 msgid "Homepage"
 msgstr "Página Web Principal"
 
-#: plugins/personal/generic/class_user.inc:1322
-#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/class_user.inc:1323
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/class_user.inc:1366
+#: 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
@@ -2310,189 +2407,161 @@ msgstr "Organización"
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/class_user.inc:1324
-#: plugins/personal/generic/generic.tpl:83
+#: plugins/personal/generic/class_user.inc:1367
+#: plugins/personal/generic/generic.tpl:93
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: plugins/personal/generic/class_user.inc:1325
+#: plugins/personal/generic/class_user.inc:1368
 #, fuzzy
 msgid "Gender"
 msgstr "Remitente"
 
-#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1369
 #, fuzzy
 msgid "Preferred language"
 msgstr "Lenguaje preferido"
 
-#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1370
 #, fuzzy
 msgid "Department number"
 msgstr "Nombre del departamento"
 
-#: plugins/personal/generic/class_user.inc:1328
+#: plugins/personal/generic/class_user.inc:1371
 #, fuzzy
 msgid "Employee number"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/class_user.inc:1329
-#: plugins/personal/generic/generic.tpl:233
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/generic/generic.tpl:282
 msgid "Employee type"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/class_user.inc:1330
-#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/class_user.inc:1373
+#: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:47
 #: plugins/admin/departments/generic.tpl:55
-#: plugins/admin/departments/class_departmentManagement.inc:417
-#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:801
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/class_user.inc:1375
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr "Foto del usuario"
+
+#: plugins/personal/generic/class_user.inc:1376
 #, fuzzy
 msgid "Room number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/class_user.inc:1377
 #, fuzzy
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/class_user.inc:1378
 #, fuzzy
 msgid "Mobile number"
 msgstr "Teléfono particular"
 
-#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
 #, fuzzy
 msgid "Pager number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/class_user.inc:1380
 #, fuzzy
-msgid "User certificate PKCS12"
+msgid "User certificates"
 msgstr "Certificado estandar"
 
-#: plugins/personal/generic/class_user.inc:1339 html/getxls.php:174
+#: plugins/personal/generic/class_user.inc:1382 html/getxls.php:174
 #: html/getxls.php:236
 #, fuzzy
 msgid "Postal address"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/class_user.inc:1383
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
 #, fuzzy
 msgid "Fax number"
 msgstr "Número de serie"
 
-#: plugins/personal/generic/class_user.inc:1341
-#, fuzzy
-msgid "User certificate SMIME"
-msgstr "Certificado estandar"
-
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:22
+#: 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
 msgid "Personal picture"
 msgstr "Foto Personal"
 
-#: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/generic/generic.tpl:34
+#: plugins/personal/generic/generic.tpl:29
+#: plugins/personal/generic/generic.tpl:40
 msgid "Change picture"
 msgstr "Cambiar foto"
 
-#: plugins/personal/generic/generic.tpl:43
+#: plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:23
 msgid "Last name"
 msgstr "Apellidos"
 
-#: plugins/personal/generic/generic.tpl:48
+#: plugins/personal/generic/generic.tpl:54
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
-#: plugins/personal/generic/generic.tpl:55
+#: plugins/personal/generic/generic.tpl:61
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr "Nombre"
 
-#: plugins/personal/generic/generic.tpl:59
+#: plugins/personal/generic/generic.tpl:65
 #: plugins/personal/generic/paste_generic.tpl:15
 #: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Inicio de sesión"
 
-#: plugins/personal/generic/generic.tpl:100
+#: plugins/personal/generic/generic.tpl:111
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "por debajo"
 
-#: plugins/personal/generic/generic.tpl:106 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:118 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/generic.tpl:116
+#: plugins/personal/generic/generic.tpl:130
 msgid "Preferred langage"
 msgstr "Lenguaje preferido"
 
-#: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/groups/class_divListGroup.inc:108
-#: plugins/admin/users/class_divListUsers.inc:115
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_divListApplication.inc:112
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/systems/class_divListSystem.inc:114
-#: plugins/admin/systems/goLdapServer.tpl:2
-#: plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_divListOGroup.inc:118
-#: plugins/admin/acl/class_divListACL.inc:92
-#: plugins/admin/fai/class_divListFai.inc:155
-#: plugins/admin/mimetypes/generic.tpl:38
-#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_divListMacros.inc:92
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_divListConferences.inc:93
-msgid "Base"
-msgstr "Base"
-
-#: plugins/personal/generic/generic.tpl:131
+#: plugins/personal/generic/generic.tpl:148
 msgid "Choose subtree to place user in"
 msgstr "Elija el subárbol donde colocar el usuario"
 
-#: plugins/personal/generic/generic.tpl:135
-#: plugins/personal/generic/generic.tpl:137
+#: plugins/personal/generic/generic.tpl:153
 #: plugins/gofax/blocklists/generic.tpl:21
 #: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
 #: plugins/admin/groups/generic.tpl:29
@@ -2503,9 +2572,9 @@ msgstr "Elija el subárbol donde colocar el usuario"
 #: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/terminal.tpl:25
 #: plugins/admin/systems/server.tpl:21 plugins/admin/systems/server.tpl:23
 #: plugins/admin/systems/phone.tpl:19 plugins/admin/systems/phone.tpl:21
+#: plugins/admin/systems/printer.tpl:26 plugins/admin/systems/printer.tpl:28
 #: plugins/admin/systems/workstation.tpl:29
 #: plugins/admin/systems/workstation.tpl:31
-#: plugins/admin/systems/printer.tpl:26 plugins/admin/systems/printer.tpl:28
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/systems/component.tpl:19
 #: plugins/admin/systems/component.tpl:21 plugins/admin/ogroups/generic.tpl:27
@@ -2516,67 +2585,69 @@ msgstr "Elija el subárbol donde colocar el usuario"
 msgid "Select a base"
 msgstr "Seleccione una base"
 
-#: plugins/personal/generic/generic.tpl:151
-#: plugins/personal/generic/generic.tpl:295
+#: 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/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr "Numero privado"
 
-#: plugins/personal/generic/generic.tpl:168
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr "Carpeta de almacenamiento de Contraseñas"
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificados"
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/generic.tpl:184
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:185
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr "Editar propiedades"
 
-#: plugins/personal/generic/generic.tpl:201
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr "Información organizativa"
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr "Departamento No."
 
-#: plugins/personal/generic/generic.tpl:227
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr "Empleado No."
 
-#: plugins/personal/generic/generic.tpl:249
-#: plugins/personal/generic/generic.tpl:388
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr "Habitación No."
 
-#: plugins/personal/generic/generic.tpl:261
+#: 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
 msgid "Mobile"
 msgstr "Teléfono Móvil"
 
-#: plugins/personal/generic/generic.tpl:265
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
@@ -2584,7 +2655,7 @@ msgstr "Teléfono Móvil"
 msgid "Pager"
 msgstr "Paginador"
 
-#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr "Por favor use la casilla teléfono"
 
@@ -2604,10 +2675,10 @@ msgid "Remove picture"
 msgstr "Eliminar foto"
 
 #: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:51
+#: plugins/personal/generic/generic_certs.tpl:91
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/servdns.tpl:21
 #: plugins/admin/systems/servkolab.tpl:203
 #: plugins/admin/systems/goNtpServer.tpl:22
@@ -2622,8 +2693,8 @@ msgstr "Eliminar foto"
 #: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
 #: plugins/admin/systems/goKrbServer.tpl:19
 #: plugins/admin/systems/goLdapServer.tpl:7
-#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
 #: plugins/admin/systems/goImapServer.tpl:94
 #: plugins/admin/systems/goSyslogServer.tpl:6
 #: plugins/admin/systems/goGlpiServer.tpl:24
@@ -2637,11 +2708,11 @@ msgstr "Eliminar foto"
 msgid "Save"
 msgstr "Guardar"
 
-#: plugins/personal/generic/main.inc:107
+#: plugins/personal/generic/main.inc:97
 msgid "You are not allowed to set your password!"
 msgstr "¡No tiene permisos para cambiar su contraseña!"
 
-#: plugins/personal/generic/main.inc:189
+#: plugins/personal/generic/main.inc:177
 msgid "Generic user information"
 msgstr "Información genérica del usuario"
 
@@ -2649,11 +2720,11 @@ msgstr "Información genérica del usuario"
 msgid "Standard certificate"
 msgstr "Certificado estandar"
 
-#: plugins/personal/generic/generic_certs.tpl:17
-#: plugins/personal/generic/generic_certs.tpl:37
-#: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:231
-#: plugins/personal/environment/environment.tpl:120
+#: plugins/personal/generic/generic_certs.tpl:21
+#: plugins/personal/generic/generic_certs.tpl:45
+#: plugins/personal/generic/generic_certs.tpl:69
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#: plugins/personal/environment/environment.tpl:152
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/admin/groups/class_groupMail.inc:544
 #: plugins/admin/applications/class_applicationParameters.inc:100
@@ -2670,15 +2741,15 @@ msgstr "Certificado estandar"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: plugins/personal/generic/generic_certs.tpl:28
+#: plugins/personal/generic/generic_certs.tpl:33
 msgid "S/MIME certificate"
 msgstr "Certificado S/MIME"
 
-#: plugins/personal/generic/generic_certs.tpl:48
+#: plugins/personal/generic/generic_certs.tpl:57
 msgid "PKCS12 certificate"
 msgstr "Certificado PKCS12"
 
-#: plugins/personal/generic/generic_certs.tpl:65
+#: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
@@ -2686,10 +2757,6 @@ msgstr "Numero de serie del certificado"
 msgid "User settings"
 msgstr "Parámetros del usuario"
 
-#: plugins/personal/generic/paste_generic.tpl:22
-msgid "User picture"
-msgstr "Foto del usuario"
-
 #: plugins/personal/generic/paste_generic.tpl:35
 msgid "Clear password"
 msgstr "Borrar contraseña"
@@ -2711,24 +2778,24 @@ msgstr "Ancho de banda"
 msgid "Upload bandwidth"
 msgstr "Ancho de banda ascendente"
 
-#: plugins/personal/connectivity/pureftpd.tpl:20
 #: plugins/personal/connectivity/pureftpd.tpl:24
+#: plugins/personal/connectivity/pureftpd.tpl:32
 msgid "kb/s"
 msgstr "Kb/s"
 
-#: plugins/personal/connectivity/pureftpd.tpl:23
+#: plugins/personal/connectivity/pureftpd.tpl:27
 msgid "Download bandwidth"
 msgstr "Ancho de banda descendente"
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
+#: plugins/personal/connectivity/pureftpd.tpl:43
 msgid "Quota"
 msgstr "Cuota"
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
+#: plugins/personal/connectivity/pureftpd.tpl:47
 msgid "Files"
 msgstr "Archivos"
 
-#: plugins/personal/connectivity/pureftpd.tpl:43
+#: plugins/personal/connectivity/pureftpd.tpl:55
 #: plugins/addons/mailqueue/contents.tpl:54
 #: plugins/admin/systems/glpi_devices.tpl:293
 #: plugins/admin/systems/glpi_devices.tpl:420
@@ -2736,39 +2803,41 @@ msgstr "Archivos"
 msgid "Size"
 msgstr "Tamaño"
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
+#: plugins/personal/connectivity/pureftpd.tpl:71
 msgid "Ratio"
 msgstr "Relación"
 
-#: plugins/personal/connectivity/pureftpd.tpl:58
+#: plugins/personal/connectivity/pureftpd.tpl:75
 msgid "Uploaded / downloaded files"
 msgstr "Archivos Subidos / Descargados"
 
-#: plugins/personal/connectivity/pureftpd.tpl:71
+#: plugins/personal/connectivity/pureftpd.tpl:98
 msgid "Check to disable FTP Access"
 msgstr "Active para desactivar acceso FTP"
 
-#: plugins/personal/connectivity/pureftpd.tpl:71
+#: plugins/personal/connectivity/pureftpd.tpl:100
 msgid "Temporary disable FTP access"
 msgstr "Acceso FTP desactivado temporalmente"
 
-#: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/proxy.tpl:17
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
 msgid "Proxy account"
 msgstr "Cuenta proxy"
 
-#: plugins/personal/connectivity/proxy.tpl:18
+#: plugins/personal/connectivity/proxy.tpl:28
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr "Filtrar contenido indeseable (p.e. pornografía o contenido violento)"
 
-#: plugins/personal/connectivity/proxy.tpl:24
+#: plugins/personal/connectivity/proxy.tpl:38
 msgid "Limit proxy access to working time"
 msgstr "Limitar acceso al proxy al horario laboral"
 
-#: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/proxy.tpl:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:300
 msgid "Restrict proxy usage by quota"
 msgstr "Restringir el uso del proxy con cuota"
 
-#: plugins/personal/connectivity/proxy.tpl:86
+#: plugins/personal/connectivity/proxy.tpl:93
 msgid "per"
 msgstr "por"
 
@@ -2781,17 +2850,26 @@ msgstr "PHPGroupware"
 msgid "Removing of user/PHPgw account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de PHPgw"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+#: plugins/personal/connectivity/class_phpgwAccount.inc:118
 #, fuzzy, php-format
 msgid "Saving of user/PHPgw account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de PHPgw"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:135
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:136
+#, fuzzy
+msgid "PHP GW account settings"
+msgstr "Parámetros de grupo"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Cuenta PHPGroupware"
 
 #: plugins/personal/connectivity/kolab.tpl:3
-#: plugins/personal/connectivity/kolab.tpl:19
+#: plugins/personal/connectivity/kolab.tpl:35
 msgid "Kolab account"
 msgstr "Cuenta Kolab"
 
@@ -2803,53 +2881,57 @@ msgstr ""
 "La cuenta kolab está actualmente desactivada. Sus características serán "
 "modificadas si añade una cuenta de correo."
 
-#: plugins/personal/connectivity/kolab.tpl:25
+#: plugins/personal/connectivity/kolab.tpl:41
+#: plugins/personal/connectivity/class_kolabAccount.inc:449
 msgid "Delegations"
 msgstr "Delegaciones"
 
-#: plugins/personal/connectivity/kolab.tpl:38
+#: plugins/personal/connectivity/kolab.tpl:59
 msgid "Mail size"
 msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/connectivity/kolab.tpl:40
+#: plugins/personal/connectivity/kolab.tpl:62
 msgid "No mail size restriction for this account"
 msgstr "No hay restricción de correo para esta cuenta."
 
-#: plugins/personal/connectivity/kolab.tpl:48
+#: plugins/personal/connectivity/kolab.tpl:71
 msgid "Free Busy information"
 msgstr "Información de estado de presencia"
 
-#: plugins/personal/connectivity/kolab.tpl:51
+#: plugins/personal/connectivity/kolab.tpl:74
 #: plugins/admin/systems/servRepositorySetup.tpl:24
 msgid "URL"
 msgstr "URL"
 
-#: plugins/personal/connectivity/kolab.tpl:55
+#: plugins/personal/connectivity/kolab.tpl:82
 msgid "Future"
 msgstr "Futuro"
 
-#: plugins/personal/connectivity/kolab.tpl:56
-#: plugins/personal/connectivity/oxchange.tpl:26
-#: plugins/personal/connectivity/oxchange.tpl:30
+#: plugins/personal/connectivity/kolab.tpl:86
+#: plugins/personal/connectivity/oxchange.tpl:39
+#: plugins/personal/connectivity/oxchange.tpl:49
 msgid "days"
 msgstr "días"
 
-#: plugins/personal/connectivity/kolab.tpl:61
+#: plugins/personal/connectivity/kolab.tpl:93
+#: plugins/personal/connectivity/class_kolabAccount.inc:450
 msgid "Invitation policy"
 msgstr "Política de invitación"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:436
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr "Kolab"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:117
+#: plugins/personal/connectivity/class_kolabAccount.inc:133
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "reenvíos."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:125
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
@@ -2857,62 +2939,82 @@ msgstr ""
 "La dirección de correo primaria que esta intentando añadir, ya esta usada "
 "por otro usuario"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:152
+#: plugins/personal/connectivity/class_kolabAccount.inc:166
 msgid "Always accept"
 msgstr "Aceptar siempre"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:153
+#: plugins/personal/connectivity/class_kolabAccount.inc:167
 msgid "Always reject"
 msgstr "Denegar siempre"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:154
+#: plugins/personal/connectivity/class_kolabAccount.inc:168
 msgid "Reject if conflicts"
 msgstr "Denegar si hay conflictos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:155
+#: plugins/personal/connectivity/class_kolabAccount.inc:169
 msgid "Manual if conflicts"
 msgstr "Preguntar si hay conflictos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:156
+#: plugins/personal/connectivity/class_kolabAccount.inc:170
 msgid "Manual"
 msgstr "Manual"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:205
+#: plugins/personal/connectivity/class_kolabAccount.inc:218
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:262
+#: plugins/personal/connectivity/class_kolabAccount.inc:279
 #, fuzzy, php-format
 msgid "Removing of user/kolab account with dn '%s' failed."
 msgstr "Ha fallado al eliminar la cuenta samba"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#: plugins/personal/connectivity/class_kolabAccount.inc:290
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr "El valor especificado como presencia futura necesita ser un entero."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:278
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "El valor especificado como Dirección URL de  no es válido"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:292
+#: plugins/personal/connectivity/class_kolabAccount.inc:309
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 "La entrada de la política de invitación para la dirección '%s' no es valida."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:300
+#: plugins/personal/connectivity/class_kolabAccount.inc:317
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 "¡No hay ningún usuario con cuenta de correo '%s' para su política de "
 "invitación!"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:379
+#: plugins/personal/connectivity/class_kolabAccount.inc:401
 #, fuzzy, php-format
 msgid "Saving of user/kolab account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de Kolab"
 
+#: plugins/personal/connectivity/class_kolabAccount.inc:437
+#, fuzzy
+msgid "Kolab account settings"
+msgstr "Cuenta Kolab"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:446
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:447
+#, fuzzy
+msgid "Mail size restriction"
+msgstr "Parámetros de correo"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:448
+#, fuzzy
+msgid "Free busy information"
+msgstr "Información de estado de presencia"
+
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:133
 msgid "WebDAV"
 msgstr "WebDAV"
 
@@ -2921,49 +3023,98 @@ msgstr "WebDAV"
 msgid "Removing of user/webDAV account with dn '%s' failed."
 msgstr "Ha fallado al eliminar la cuenta WebDAV"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#: plugins/personal/connectivity/class_webdavAccount.inc:115
 #, fuzzy, php-format
 msgid "Saving of user/webDAV account with dn '%s' failed."
 msgstr "Ha fallado al guardar la cuenta WebDAV"
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
+
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:99
 #, fuzzy, php-format
 msgid "Removing of user/pureftpd account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de pureftpd"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
-msgid "Value specified as 'Files' is not valid."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+#, fuzzy
+msgid "Value specified as 'Quota files' is not valid."
 msgstr "El valor especificado como 'Archivos' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
-msgid "Value specified as 'Size' is not valid."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:152
+#, fuzzy
+msgid "Value specified as 'Quota size' is not valid."
 msgstr "El valor especificado como 'Tamaño' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "El valor especificado como 'relación' no es válido"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:155
+#, fuzzy
+msgid "Value specified as 'Upload ratio' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:158
+#, fuzzy
+msgid "Value specified as 'Download ratio' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:184
 #, fuzzy, php-format
 msgid "Saving of user/pureftpd account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de pureftpd"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Cuenta WebDAV"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+#, fuzzy
+msgid "Ftp"
+msgstr "Tipo de FS"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+#, fuzzy
+msgid "Pure ftp account"
+msgstr "Crear cuenta de fax"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:213
+#, fuzzy
+msgid "Quota files"
+msgstr "Tamaño de la Cola de correo"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:214
+#, fuzzy
+msgid "Upload ratio"
+msgstr "Enviar"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:215
+#, fuzzy
+msgid "Quota MBytes"
+msgstr "Tamaño de la Cola de correo"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:216
+#, fuzzy
+msgid "Download ratio"
+msgstr "Descargar configuración"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:217
+#, fuzzy
+msgid "Upload bandwith"
+msgstr "Ancho de banda ascendente"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:218
+#, fuzzy
+msgid "Download bandwith"
+msgstr "Ancho de banda descendente"
 
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
@@ -2977,27 +3128,27 @@ msgstr ""
 "desactivado, No se ha detectado soporte Postgresql, o la base de datos "
 "especificada no puede ser alcanzada"
 
-#: plugins/personal/connectivity/oxchange.tpl:10
+#: plugins/personal/connectivity/oxchange.tpl:18
 msgid "Open-Xchange account"
 msgstr "Cuenta de Open-Xchange"
 
-#: plugins/personal/connectivity/oxchange.tpl:21
+#: plugins/personal/connectivity/oxchange.tpl:29
 msgid "Remember"
 msgstr "Recordar"
 
-#: plugins/personal/connectivity/oxchange.tpl:25
+#: plugins/personal/connectivity/oxchange.tpl:33
 msgid "Appointment Days"
 msgstr "Días de recordatorio"
 
-#: plugins/personal/connectivity/oxchange.tpl:29
+#: plugins/personal/connectivity/oxchange.tpl:42
 msgid "Task Days"
 msgstr "Días para tareas"
 
-#: plugins/personal/connectivity/oxchange.tpl:41
+#: plugins/personal/connectivity/oxchange.tpl:61
 msgid "User Information"
 msgstr "Información de Usuario"
 
-#: plugins/personal/connectivity/oxchange.tpl:45
+#: plugins/personal/connectivity/oxchange.tpl:65
 msgid "User Timezone"
 msgstr "Zona de uso horario del usuario"
 
@@ -3005,49 +3156,74 @@ msgstr "Zona de uso horario del usuario"
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:709
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:817
 msgid "Couldn't connect to postgresql database!"
 msgstr "No puedo conectar al servidor de base de datos postgresql."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:713
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:821
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 "¡Los parámetros necesarios para extensión de conectividad open-xchange no se "
 "encuentran!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:717
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:825
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "¡El módulo de PHP4 para la base de datos Postgresql no está instalado!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
 #, fuzzy, php-format
 msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de open-xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
 "that "
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:805
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:838
 #, fuzzy, php-format
 msgid "Saving of user/oxchange account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de open-xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:845
 #, fuzzy, php-format
 msgid "Creating of user/oxchange account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de open-xchange"
 
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:885
+#, fuzzy
+msgid "Open xchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:886
+#, fuzzy
+msgid "Open xchange account settings"
+msgstr "Cuenta de Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:895
+#, fuzzy
+msgid "OXAppointmentDays"
+msgstr "Días de recordatorio"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:896
+#, fuzzy
+msgid "OXTaskDays"
+msgstr "Días para tareas"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:897
+#, fuzzy
+msgid "OXTimeZone"
+msgstr "Zona de uso horario del usuario"
+
 #: plugins/personal/connectivity/intranet.tpl:3
 msgid "Intranet account"
 msgstr "Crear cuenta de intranet"
@@ -3056,113 +3232,157 @@ msgstr "Crear cuenta de intranet"
 msgid "This account has no connectivity extensions."
 msgstr "Esta cuenta no tiene extensiones de conectividad"
 
+#: plugins/personal/connectivity/class_connectivity.inc:177
+#, fuzzy
+msgid "Connectivity settings"
+msgstr "Conectividad"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:286
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
 #: plugins/admin/systems/goMailServer.tpl:18
 #: plugins/admin/systems/goMailServer.tpl:26
 #: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr "Kb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
 msgid "GB"
 msgstr "Gb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 #: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "hora"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "day"
 msgstr "día"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "week"
 msgstr "semana"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "month"
 msgstr "mes"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#: plugins/personal/connectivity/class_proxyAccount.inc:150
 #, fuzzy, php-format
 msgid "Removing of user/proxy account with dn '%s' failed."
 msgstr "Se ha fallado al eliminar la cuenta del proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:168
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "El valor numérico para cuota no es valido."
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#: plugins/personal/connectivity/class_proxyAccount.inc:268
 #, fuzzy, php-format
 msgid "Saving of user/proxy account with dn '%s' failed."
 msgstr "Ha fallado la grabación de la cuenta proxy"
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#, fuzzy
+msgid "gosaProxyID"
+msgstr "Proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:298
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:299
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#, fuzzy
+msgid "Limit proxy access"
+msgstr "Limitar acceso al proxy al horario laboral"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
+#, fuzzy
+msgid "Limit quota"
+msgstr "Cuota del Perfil"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
+#, fuzzy
+msgid "Quota limit period"
+msgstr "Periodo de Notificación de Host"
+
 #: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 msgid "PPTP account"
 msgstr "Cuenta PPTP"
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:169
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#: plugins/personal/connectivity/class_intranetAccount.inc:100
 #, fuzzy, php-format
 msgid "Removing of user/intranet account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta de intranet"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#: plugins/personal/connectivity/class_intranetAccount.inc:158
 #, fuzzy, php-format
 msgid "Saving of user/intranet account with dn '%s' failed."
 msgstr "Ha fallado la grabación de la cuenta de intranet"
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:176
+#, fuzzy
+msgid "Intranet account settings"
+msgstr "Crear cuenta de intranet"
+
 #: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
 msgstr "Cuenta GLPI"
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:150
 msgid "PPTP"
 msgstr "PPTP"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#: plugins/personal/connectivity/class_pptpAccount.inc:85
 #, fuzzy, php-format
 msgid "Removing of user/PPTP account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta PPTP"
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#: plugins/personal/connectivity/class_pptpAccount.inc:132
 #, fuzzy, php-format
 msgid "Saving of user/PPTP account with dn '%s' failed."
 msgstr "Ha fallado la grabación de la cuenta PPTP"
 
 #: plugins/personal/connectivity/opengw.tpl:1
+#: plugins/personal/connectivity/class_opengwAccount.inc:302
 msgid "Opengroupware"
 msgstr "Cuenta OpenGroupware"
 
 #: plugins/personal/connectivity/opengw.tpl:8
+#: plugins/personal/connectivity/class_opengwAccount.inc:312
 msgid "Location team"
 msgstr "Equipo de localización"
 
 #: plugins/personal/connectivity/opengw.tpl:21
+#: plugins/personal/connectivity/class_opengwAccount.inc:313
 msgid "Template user"
 msgstr "Plantilla de usuario"
 
-#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/personal/connectivity/opengw.tpl:33
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
 #: plugins/admin/systems/class_servGeneric.inc:44
 #: plugins/admin/systems/class_workstationGeneric.inc:103
 #: plugins/admin/ogroups/class_termgroup.inc:46
 msgid "Locked"
 msgstr "Bloqueado"
 
-#: plugins/personal/connectivity/opengw.tpl:49
+#: plugins/personal/connectivity/opengw.tpl:48
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
 msgid "Teams"
 msgstr "Equipos"
 
@@ -3174,7 +3394,7 @@ msgstr "Cuenta PHPschedulñeit"
 msgid "PHPscheduleit"
 msgstr "PHPscheduleit"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
 #, fuzzy, php-format
 msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta PHPscheduleit"
@@ -3184,151 +3404,169 @@ msgstr "Ha fallado la eliminación de la cuenta PHPscheduleit"
 msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
 msgstr "Ha fallado la grabación de la cuenta PHPscheduleit"
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:143
+#, fuzzy
+msgid "PHP Schedule it"
+msgstr "PHPscheduleit"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
+#, fuzzy
+msgid "PHP Schedule it settings"
+msgstr "PHPscheduleit"
+
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
 msgstr "Cuenta OpenGroupware"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:136
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:141
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:149
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:303
+#, fuzzy
+msgid "Open groupware account settings"
+msgstr "Cuenta OpenGroupware"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:103
-#: plugins/personal/environment/environment.tpl:149
+#: plugins/personal/environment/environment.tpl:14
+#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/environment/environment.tpl:191
 msgid "Environment managment settings"
 msgstr "Parámetros de gestión de estado"
 
-#: plugins/personal/environment/environment.tpl:11
+#: plugins/personal/environment/environment.tpl:17
 msgid "Profile managment"
 msgstr "Gestión de perfiles"
 
-#: plugins/personal/environment/environment.tpl:18
+#: plugins/personal/environment/environment.tpl:26
 msgid "Use profile managment"
 msgstr "Gestión de perfiles de usuario"
 
-#: plugins/personal/environment/environment.tpl:25
+#: plugins/personal/environment/environment.tpl:33
 msgid "Profile server managment"
 msgstr "Gestión de perfiles de servidor"
 
-#: plugins/personal/environment/environment.tpl:28
+#: plugins/personal/environment/environment.tpl:36
 msgid "Profil path"
 msgstr "Ruta del Perfil"
 
-#: plugins/personal/environment/environment.tpl:40
+#: plugins/personal/environment/environment.tpl:49
 msgid "Profil quota"
 msgstr "Cuota del Perfil"
 
-#: plugins/personal/environment/environment.tpl:54
-#: plugins/personal/environment/class_environment.inc:1256
+#: plugins/personal/environment/environment.tpl:66
+#: plugins/personal/environment/class_environment.inc:1162
 msgid "Cache profile localy"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:63
+#: plugins/personal/environment/environment.tpl:75
 msgid "Kiosk profile settings"
 msgstr "Parámetros del perfil de Kiosk"
 
-#: plugins/personal/environment/environment.tpl:66
-#: plugins/personal/environment/class_environment.inc:1262
+#: plugins/personal/environment/environment.tpl:78
+#: plugins/personal/environment/class_environment.inc:1168
 msgid "Kiosk profile"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:72
+#: plugins/personal/environment/environment.tpl:88
 msgid "Manage"
 msgstr "Gestionar"
 
-#: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/class_environment.inc:1255
+#: plugins/personal/environment/environment.tpl:98
+#: plugins/personal/environment/class_environment.inc:1161
 msgid "Resolution changeable during session"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:87
-#: plugins/personal/environment/class_environment.inc:1257
+#: plugins/personal/environment/environment.tpl:103
+#: plugins/personal/environment/class_environment.inc:1167
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Resolución"
 
-#: plugins/personal/environment/environment.tpl:106
-#: plugins/personal/environment/class_environment.inc:1263
+#: plugins/personal/environment/environment.tpl:126
+#: plugins/personal/environment/class_environment.inc:1173
 #: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
 #: plugins/admin/systems/goShareServer.tpl:1
 #: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 msgid "Shares"
 msgstr "Recursos compartidos"
 
-#: plugins/personal/environment/environment.tpl:111
+#: plugins/personal/environment/environment.tpl:136
 msgid "User used to connect to the share"
 msgstr "Usuario utilizado para conectarse con el recurso compartido"
 
-#: plugins/personal/environment/environment.tpl:112
+#: plugins/personal/environment/environment.tpl:139
 msgid "Select a share"
 msgstr "Seleccione un recurso compartido"
 
-#: plugins/personal/environment/environment.tpl:118
+#: plugins/personal/environment/environment.tpl:147
 msgid "Mount path"
 msgstr "Punto de montaje"
 
-#: plugins/personal/environment/environment.tpl:126
+#: plugins/personal/environment/environment.tpl:160
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:127
+#: plugins/personal/environment/environment.tpl:162
 #: 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:152
+#: plugins/personal/environment/environment.tpl:196
+#: plugins/personal/environment/class_environment.inc:1172
 msgid "Hotplug devices"
 msgstr "Dispositivos de conexión en caliente (HotPlug)"
 
-#: plugins/personal/environment/environment.tpl:153
+#: plugins/personal/environment/environment.tpl:198
 msgid "Hotplug device settings"
 msgstr "Parámetros dispositivos de conexión en caliente (HotPlug)"
 
-#: plugins/personal/environment/environment.tpl:164
+#: plugins/personal/environment/environment.tpl:212
 #: plugins/admin/groups/class_divListGroup.inc:105
 #: plugins/gofon/macro/class_divListMacros.inc:90
 msgid "New"
 msgstr "Nuevo"
 
-#: plugins/personal/environment/environment.tpl:165
+#: plugins/personal/environment/environment.tpl:215
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:174
+#: plugins/personal/environment/environment.tpl:230
 msgid "Printer settings"
 msgstr "Parámetros de impresora"
 
-#: plugins/personal/environment/environment.tpl:184
+#: plugins/personal/environment/environment.tpl:247
 msgid "Toggle admin"
 msgstr "Cambio de administrador"
 
-#: plugins/personal/environment/environment.tpl:185
+#: plugins/personal/environment/environment.tpl:250
 msgid "Toggle default"
 msgstr "Cambio por defecto"
 
-#: plugins/personal/environment/main.inc:124
+#: plugins/personal/environment/main.inc:116
 msgid "User environment settings"
 msgstr "Parámetros de estado de usuarios"
 
@@ -3357,7 +3595,7 @@ 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/admin/systems/class_selectUserToPrinterDialog.inc:101
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:102
 msgid "Please select a printer or press cancel."
 msgstr "¡Por favor seleccione una impresora o presione cancelar."
 
@@ -3393,11 +3631,11 @@ msgstr ""
 "Expresiones regulares que concuerden con dispositivos de conexión en "
 "caliente (HotPlug)"
 
-#: plugins/personal/environment/class_environment.inc:198
+#: plugins/personal/environment/class_environment.inc:205
 msgid "auto"
 msgstr "automático"
 
-#: plugins/personal/environment/class_environment.inc:220
+#: plugins/personal/environment/class_environment.inc:227
 #: plugins/admin/systems/class_terminalService.inc:95
 #: plugins/admin/systems/class_workstationService.inc:88
 #, php-format
@@ -3406,32 +3644,32 @@ msgid ""
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:297
-#: plugins/personal/environment/class_environment.inc:334
+#: plugins/personal/environment/class_environment.inc:305
+#: plugins/personal/environment/class_environment.inc:345
 msgid "Remove environment extension"
 msgstr "Eliminar extensión de estado"
 
-#: plugins/personal/environment/class_environment.inc:298
-#: plugins/personal/environment/class_environment.inc:335
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:346
 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:307
-#: plugins/personal/environment/class_environment.inc:312
-#: plugins/personal/environment/class_environment.inc:340
-#: plugins/personal/environment/class_environment.inc:345
+#: plugins/personal/environment/class_environment.inc:315
+#: plugins/personal/environment/class_environment.inc:320
+#: plugins/personal/environment/class_environment.inc:351
+#: plugins/personal/environment/class_environment.inc:356
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:308
-#: plugins/personal/environment/class_environment.inc:341
+#: plugins/personal/environment/class_environment.inc:316
+#: plugins/personal/environment/class_environment.inc:352
 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:313
-#: plugins/personal/environment/class_environment.inc:346
+#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:357
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
@@ -3439,99 +3677,99 @@ msgstr ""
 "La extensión de estado está desactivada. Debe crear una cuenta Posix antes "
 "de poder activarla."
 
-#: plugins/personal/environment/class_environment.inc:461
-#: plugins/personal/environment/class_environment.inc:777
+#: plugins/personal/environment/class_environment.inc:460
+#: plugins/personal/environment/class_environment.inc:805
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "Ninguno"
 
-#: plugins/personal/environment/class_environment.inc:544
-#: plugins/personal/environment/class_environment.inc:555
+#: plugins/personal/environment/class_environment.inc:474
+#, fuzzy
+msgid "You are not allowed to write Logon scripts."
+msgstr "No le es permitido borrar este usuario"
+
+#: plugins/personal/environment/class_environment.inc:553
+#: plugins/personal/environment/class_environment.inc:564
 #: plugins/admin/systems/class_terminalStartup.inc:187
 #: plugins/admin/systems/class_workstationStartup.inc:588
 msgid "You must specify a valid mount point."
 msgstr "Por favor especifique un punto de montaje válido."
 
-#: plugins/personal/environment/class_environment.inc:613
-#: plugins/personal/environment/class_environment.inc:614
-#: plugins/personal/environment/class_environment.inc:622
-#: plugins/personal/environment/class_environment.inc:623
+#: plugins/personal/environment/class_environment.inc:626
+#: plugins/personal/environment/class_environment.inc:627
+#: plugins/personal/environment/class_environment.inc:635
+#: plugins/personal/environment/class_environment.inc:636
 msgid "Reset password hash"
 msgstr "Reiniciar hash de la contraseña"
 
-#: plugins/personal/environment/class_environment.inc:627
+#: plugins/personal/environment/class_environment.inc:640
 msgid "Delete share entry"
 msgstr "Eliminar entrada compartida"
 
-#: plugins/personal/environment/class_environment.inc:780
+#: plugins/personal/environment/class_environment.inc:808
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:831
+#: plugins/personal/environment/class_environment.inc:846
 #, 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:884
+#: plugins/personal/environment/class_environment.inc:899
 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:891
+#: plugins/personal/environment/class_environment.inc:906
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:929
+#: plugins/personal/environment/class_environment.inc:944
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1037
-#, fuzzy, php-format
-msgid "Saving printer membership with dn %s failed "
-msgstr "Ha fallado la grabación de la impresora"
-
-#: plugins/personal/environment/class_environment.inc:1106
-msgid "Error while writing printer settings"
-msgstr "¡Error mientras se guardaban los parámetros de la impresora"
-
-#: plugins/personal/environment/class_environment.inc:1176
+#: plugins/personal/environment/class_environment.inc:1073
 #, 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:1189
+#: plugins/personal/environment/class_environment.inc:1086
 msgid "group share"
 msgstr "grupos compartidos"
 
-#: plugins/personal/environment/class_environment.inc:1222
+#: plugins/personal/environment/class_environment.inc:1119
 msgid "Administrator"
 msgstr "Administrador"
 
-#: plugins/personal/environment/class_environment.inc:1227
-#: plugins/personal/environment/class_environment.inc:1261
+#: plugins/personal/environment/class_environment.inc:1124
+#: plugins/personal/environment/class_environment.inc:1170
 msgid "Default printer"
 msgstr "Impresora por defecto"
 
-#: plugins/personal/environment/class_environment.inc:1250
+#: plugins/personal/environment/class_environment.inc:1150
 #, fuzzy
 msgid "Environment settings"
 msgstr "Parámetros de estado de usuarios"
 
-#: plugins/personal/environment/class_environment.inc:1254
-#, fuzzy
-msgid "Profile server"
-msgstr "Servidor de Archivos"
+#: plugins/personal/environment/class_environment.inc:1157
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:1258
+#: plugins/personal/environment/class_environment.inc:1164
 #, fuzzy
 msgid "Profile quota"
 msgstr "Cuota del Perfil"
 
-#: plugins/personal/environment/class_environment.inc:1259
+#: plugins/personal/environment/class_environment.inc:1165
+#, fuzzy
+msgid "Profile server"
+msgstr "Servidor de Archivos"
+
+#: plugins/personal/environment/class_environment.inc:1171
 #: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
@@ -3576,28 +3814,51 @@ msgstr "Nombre del Script"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/departments/class_departmentManagement.inc:415
+#: plugins/admin/departments/class_departmentGeneric.inc:537
 #: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/class_servGeneric.inc:325
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:800
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:272
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
 #: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
 #: plugins/admin/mimetypes/paste_generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:41 plugins/gofon/conference/generic.tpl:56
+#: 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
 msgid "Description"
@@ -3627,13 +3888,13 @@ msgstr ""
 #: plugins/admin/groups/class_groupManagement.inc:333
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/users/class_userManagement.inc:629
+#: plugins/admin/users/class_userManagement.inc:630
 #: plugins/admin/applications/class_applicationManagement.inc:353
-#: plugins/admin/systems/class_systemManagement.inc:481
+#: plugins/admin/systems/class_systemManagement.inc:491
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
 #: plugins/admin/ogroups/class_ogroupManagement.inc:335
-#: plugins/admin/fai/class_faiManagement.inc:584
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
@@ -3691,14 +3952,14 @@ msgstr "Nombre del dispositivo"
 msgid "Vendor ID"
 msgstr "ID del Remitente"
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:33
-msgid "Product ID"
-msgstr ""
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:40
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
 msgid "Device ID"
 msgstr "Identificador de dispositivo"
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr ""
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 msgid "Kiosk profile management"
@@ -3728,30 +3989,37 @@ msgid "Nagios Account"
 msgstr "Cuenta Nagios"
 
 #: plugins/personal/nagios/nagios.tpl:7
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 msgid "Alias"
 msgstr "Alias"
 
 #: plugins/personal/nagios/nagios.tpl:17
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 msgid "Host notification period"
 msgstr "Periodo de Notificación de Host"
 
 #: plugins/personal/nagios/nagios.tpl:25
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 msgid "Service notification period"
 msgstr "Periodo de Notificación de Servicio"
 
 #: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Service notification options"
 msgstr "Opciones de Notificación de Servicio"
 
 #: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 msgid "Host notification options"
 msgstr "Opciones de Notificación de Host"
 
 #: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Service notification commands"
 msgstr "Comandos de Notificación de Servicio"
 
 #: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 msgid "Host notification commands"
 msgstr "Comandos de Notificación de Host"
 
@@ -3840,6 +4108,46 @@ msgstr ""
 msgid "Removing of user/nagios account with dn '%s' failed."
 msgstr "Ha fallado borrar cuenta de nagios"
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+#, fuzzy
+msgid "Nagios account settings"
+msgstr "Parámetros de Nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
+#, fuzzy
+msgid "View all hosts"
+msgstr "Ver todos los hosts"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#, fuzzy
+msgid "View all services"
+msgstr "Ver todos los servicios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+#, fuzzy
+msgid "Trigger system commands"
+msgstr "Ver la información de sistema"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+#, fuzzy
+msgid "Trigger all host commands"
+msgstr "Ver todos los hosts"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#, fuzzy
+msgid "Trigger all service commands"
+msgstr "Ver todos los servicios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#, fuzzy
+msgid "View configuration information"
+msgstr "Ver la información de configuración"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#, fuzzy
+msgid "View system informations"
+msgstr "Ver la información de sistema"
+
 #: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
 msgstr "Parámetros de Nagios"
@@ -3895,12 +4203,26 @@ msgstr "Ha fallado la grabación de la cuenta Netatalk"
 msgid "Removing of user/netatalk account with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la cuenta Netatalk"
 
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+#, fuzzy
+msgid "apple-user-homeDirectory"
+msgstr "Directorio Principal"
+
 #: plugins/personal/netatalk/netatalk.tpl:4
 msgid "Share"
 msgstr "Compartido"
 
 #: plugins/personal/netatalk/netatalk.tpl:11
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:275
 msgid "Path"
 msgstr ""
 
@@ -3918,13 +4240,16 @@ msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 
 #: plugins/gofax/blocklists/generic.tpl:37
 #: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:273
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/class_glpiAccount.inc:783
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
 #: plugins/admin/fai/class_faiSummaryTab.inc:309
@@ -3948,7 +4273,47 @@ msgstr "Números bloqueados"
 msgid "Numbers can also contain wild cards."
 msgstr "Los números pueden contener también comodínes"
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr "Aviso"
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Por favor pulse dos veces si realmente quiere hacer esto, ya que no hay "
+"manera de que GOsa recupere posteriormente la información."
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
+"<i>Cancelar</i> para Abortar."
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr "Gestión de listas de bloqueo"
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr "Lista de bloqueos de FAX"
 
@@ -3978,83 +4343,108 @@ msgstr "recibir"
 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:450
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
 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:456
-#: plugins/admin/departments/class_departmentGeneric.inc:233
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
 msgid "Required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
 msgid "Required field 'Name' contains invalid characters"
 msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:466
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
 msgid "Specified name is already used."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:473
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
 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:521
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
 #, 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/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:49 html/index.php:331 html/index.php:337
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-#: ihtml/themes/default/remove.tpl:2
-msgid "Warning"
-msgstr "Aviso"
-
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Por favor pulse dos veces si realmente quiere hacer esto, ya que no hay "
-"manera de que GOsa recupere posteriormente la información."
-
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
-#: ihtml/themes/default/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
-"<i>Cancelar</i> para Abortar."
-
-#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
-msgid "Blocklist management"
-msgstr "Gestión de listas de bloqueo"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:31
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:32
-msgid "List of blocklists"
-msgstr "Lista de listas de bloqueos"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
+#, fuzzy
+msgid "Fax Blocklists"
+msgstr "Lista de bloqueos de FAX"
 
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:36
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-"Este menú permite añadir, editar o eliminar las listas de bloqueo "
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:799
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Nombre"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
+#, fuzzy
+msgid "Blocklist type"
+msgstr "N0mbre de listas de bloqueo"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:31
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:32
+msgid "List of blocklists"
+msgstr "Lista de listas de bloqueos"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:36
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+"Este menú permite añadir, editar o eliminar las listas de bloqueo "
 "seleccionadas. Puede usar el selector de rango en la parte superior de la "
 "lista de bloqueos, cuando trabaja con un gran número de bloqueos."
 
@@ -4180,12 +4570,12 @@ msgstr "Subir un departamento"
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:107
 #: plugins/admin/acl/class_divListACL.inc:84
-#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfile.inc:299
 #: plugins/admin/fai/class_divListFai.inc:120
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
 #: plugins/gofon/macro/class_divListMacros.inc:82
 #: plugins/gofon/conference/class_divListConferences.inc:83
-#: include/class_acl.inc:330
+#: include/class_acl.inc:362
 msgid "Up"
 msgstr ""
 
@@ -4319,7 +4709,7 @@ msgstr "Enviar departamentos"
 #: plugins/gofon/macro/class_divListMacros.inc:109
 #: plugins/gofon/macro/class_divListMacros.inc:128
 #: plugins/gofon/conference/class_divListConferences.inc:124
-#: include/class_acl.inc:332 include/class_acl.inc:369
+#: include/class_acl.inc:364 include/class_acl.inc:409
 msgid "edit"
 msgstr "Editar"
 
@@ -4346,7 +4736,7 @@ msgstr "Editar usuario"
 #: plugins/gofon/macro/class_divListMacros.inc:131
 #: plugins/gofon/conference/class_divListConferences.inc:127
 #: plugins/gofon/conference/class_divListConferences.inc:129
-#: include/class_acl.inc:333 include/class_acl.inc:370
+#: include/class_acl.inc:365 include/class_acl.inc:410
 msgid "delete"
 msgstr "borrar"
 
@@ -4361,7 +4751,9 @@ msgid "Fax number for GOfax to trigger on"
 msgstr "Numero de fax que activa GOfax"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr "Lenguaje"
@@ -4373,6 +4765,7 @@ msgstr ""
 "correo"
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Formato de envío"
 
@@ -4397,6 +4790,7 @@ msgid "Deliver fax as mail"
 msgstr "Enviar fax como correo electrónico"
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Enviar fax a la impresora"
 
@@ -4536,6 +4930,25 @@ msgstr ""
 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:814
+#, fuzzy
+msgid "Fax account settings"
+msgstr "Parametros de samba"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#, fuzzy
+msgid "Receive blocklist"
+msgstr "Mostrar listas de bloqueos entrantes"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#, fuzzy
+msgid "Send blocklist"
+msgstr "Mostrar listas de bloqueos salientes"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4582,7 +4995,7 @@ msgstr "Buscar"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:760
+#: plugins/admin/systems/class_printGeneric.inc:778
 #: plugins/admin/ogroups/class_ogroupManagement.inc:382
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
@@ -4698,39 +5111,16 @@ msgstr ""
 msgid "Y-M-D"
 msgstr "Y-M-D"
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiProfile.tpl:9
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
-#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/admin/fai/class_faiSummaryTab.inc:304
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Nombre"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+#, fuzzy
+msgid "Fax report"
+msgstr "Reportes de FAX"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+#, fuzzy
+msgid "Detailed view"
+msgstr "Dispositivos instalados"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:66
@@ -4858,7 +5248,7 @@ msgstr "Ciudad"
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/admin/departments/class_departmentManagement.inc:416
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr "Pais"
 
@@ -5570,7 +5960,8 @@ msgid "Notifications"
 msgstr "Intereses"
 
 #: plugins/addons/notifications/class_msgplug.inc:35
-#: plugins/admin/groups/class_groupManagement.inc:25 include/class_acl.inc:140
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:164
 #: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Grupos"
@@ -5653,12 +6044,12 @@ msgstr ""
 
 #: plugins/addons/notifications/contents.tpl:74
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:421
-#: plugins/admin/departments/class_departmentGeneric.inc:506
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: plugins/admin/systems/ServiceAddDialog.tpl:29
 #: plugins/admin/fai/class_faiManagement.inc:430
-#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:595
 #: plugins/admin/fai/faiPackageNew.tpl:50
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
@@ -5790,6 +6181,36 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
+#: plugins/admin/groups/class_groupGeneric.inc:862
+#, fuzzy
+msgid "Generic group settings"
+msgstr "Parámetros genéricos de la cola"
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+#, fuzzy
+msgid "Phone pickup group"
+msgstr "Miembros están en un grupo de salto telefónico"
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+#, fuzzy
+msgid "Nagios group"
+msgstr "Cuenta Nagios"
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#, fuzzy
+msgid "Group member"
+msgstr "Miembros del grupo"
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+#, fuzzy
+msgid "Samba group type"
+msgstr "Grupo de samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+#, fuzzy
+msgid "Samba SID"
+msgstr "Samba"
+
 #: plugins/admin/groups/application.tpl:3
 msgid "Release focus"
 msgstr "Enfocado a la versión"
@@ -5810,7 +6231,8 @@ msgstr "Añadir categoría"
 msgid "Available applications"
 msgstr "Aplicaciones disponibles"
 
-#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:527
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:520
+#: include/class_acl.inc:596
 msgid "read"
 msgstr "leer"
 
@@ -5826,7 +6248,8 @@ msgstr "post externo"
 msgid "append"
 msgstr "añadir"
 
-#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:528
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:521
+#: include/class_acl.inc:597
 msgid "write"
 msgstr "escribir"
 
@@ -5867,6 +6290,27 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Por favor seleccione un servidor de correo valido."
 
+#: plugins/admin/groups/class_groupMail.inc:981
+#, fuzzy
+msgid "Group mail"
+msgstr "Nombre del grupo"
+
+#: plugins/admin/groups/class_groupMail.inc:989
+#, fuzzy
+msgid "Alternate addresses"
+msgstr "Direcciones alternativas"
+
+#: plugins/admin/groups/class_groupMail.inc:990
+#, fuzzy
+msgid "Forwarding addresses"
+msgstr "Cuenta Principal"
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:804
+msgid "Permissions"
+msgstr "Permisos"
+
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
 msgstr "Administradores de Carpetas"
@@ -5958,18 +6402,6 @@ msgstr "Mostrar usuarios del departamento"
 msgid "Regular expression for matching user names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/admin/groups/application_options.tpl:2
-msgid "Application options"
-msgstr "Opciones de aplicaciones"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Mostrar las direcciones de los departamentos"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Mostrar direcciones que concuerden con"
-
 #: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Esta'dn' no es un grupo de aplicaciones."
@@ -6078,6 +6510,40 @@ msgid ""
 "the objects base has changed."
 msgstr ""
 
+#: plugins/admin/groups/class_groupApplication.inc:1063
+#, fuzzy
+msgid "Group applications"
+msgstr "Mostrar aplicaciones"
+
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Aplicación"
+
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+#, fuzzy
+msgid "Application parameter"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Mostrar las direcciones de los departamentos"
+
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Mostrar direcciones que concuerden con"
+
 #: plugins/admin/groups/paste_generic.tpl:1
 msgid "Group settings"
 msgstr "Parámetros de grupo"
@@ -6162,14 +6628,6 @@ msgstr "Crear nuevo grupo"
 msgid "Posix"
 msgstr "Posix"
 
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_ogroupManagement.inc:384
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Aplicación"
-
 #: plugins/admin/groups/class_divListGroup.inc:164
 #: plugins/admin/users/class_divListUsers.inc:217
 #: plugins/admin/applications/class_divListApplication.inc:157
@@ -6264,7 +6722,7 @@ msgstr "No le es permitido borrar este usuario"
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:531
+#: plugins/admin/users/class_userManagement.inc:532
 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"
 
@@ -6283,7 +6741,8 @@ msgstr ""
 "Elegir 'ninguno' para saltarse el uso de plantillas."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/fai/class_faiTemplate.inc:414
 msgid "Template"
 msgstr "Plantilla"
 
@@ -6442,7 +6901,9 @@ msgid "Application name"
 msgstr "Nombre de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr "Nombre mostrado"
 
@@ -6453,6 +6914,7 @@ msgstr ""
 "Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
 
 #: plugins/admin/applications/generic.tpl:17
+#: plugins/admin/applications/class_applicationGeneric.inc:489
 #: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/systems/goMailServer.tpl:160
@@ -6472,7 +6934,9 @@ msgid "Choose subtree to place application in"
 msgstr "Elija lugar del árbol para colocar la aplicación"
 
 #: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
 #: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr "Icono"
 
@@ -6486,22 +6950,27 @@ msgid "Reload picture from LDAP"
 msgstr "Recargar imagen desde LDAP"
 
 #: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr "Solo ejecutables para los miembros"
 
 #: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr "Reemplazar la configuración del usuario en el inicio"
 
 #: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr "Colocar icono en los escritorios de los miembros "
 
 #: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
 #: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
 msgstr "Colocar entrada en los barra de inicio de los miembros"
 
@@ -6540,6 +7009,7 @@ msgstr ""
 "Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
 
 #: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr "Variable"
 
@@ -6644,6 +7114,20 @@ msgstr "Ha fallado la grabación de la aplicación"
 msgid "Application settings"
 msgstr "Parámetros de aplicaciones"
 
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+#, fuzzy
+msgid "Application generic"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+#, fuzzy
+msgid "Script content"
+msgstr "Contenido de la Variable"
+
 #: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
@@ -6708,6 +7192,7 @@ msgid "Descriptive text for department"
 msgstr "Descripción del departamento"
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr "Categoría"
 
@@ -6741,6 +7226,7 @@ msgid "Base facsimile telephone number of this subtree"
 msgstr "Número base de fax de este subarbol"
 
 #: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
 msgid "Administrative settings"
 msgstr "Parámetros administrativos"
 
@@ -6749,10 +7235,10 @@ msgid "Tag department as an independent administrative unit"
 msgstr ""
 
 #: plugins/admin/departments/tabs_department.inc:34
-#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
-#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
-#: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
-#: plugins/admin/fai/tabsTemplate.inc:34
+#: plugins/admin/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
@@ -6802,25 +7288,25 @@ msgstr ""
 msgid "Department management"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:170
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 #, fuzzy, php-format
 msgid "Removing of department with dn '%s' failed."
 msgstr "Ha fallado la eliminación del departamento"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:219
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr "No tiene permisos para crear un departamento en esta 'Base'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:226
 #: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:236
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr "El campo requerido 'Descripción' no ha sido rellenado."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:240
+#: plugins/admin/departments/class_departmentGeneric.inc:242
 #, php-format
 msgid ""
 "The field 'Name' contains the reserved word '%s'. Please choose another name."
@@ -6828,45 +7314,60 @@ msgstr ""
 "El campo 'Nombre' contiene la palabra reservada '%s'. Por favor elija otro "
 "nombre."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:286
+#: plugins/admin/departments/class_departmentGeneric.inc:294
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:340
 #, fuzzy, php-format
 msgid "Saving of department with dn '%s' failed."
 msgstr "Ha fallado la grabación del departamento"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:373
+#: plugins/admin/departments/class_departmentGeneric.inc:382
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:451
+#: plugins/admin/departments/class_departmentGeneric.inc:460
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:487
-#: include/class_ldap.inc:455 include/class_acl.inc:448
-#: ihtml/themes/default/snapshotdialog.tpl:14
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:492
+#: include/class_acl.inc:494 include/class_acl.inc:496
+#: include/class_acl.inc:499 ihtml/themes/default/snapshotdialog.tpl:14
 #: ihtml/themes/default/snapshotdialog.tpl:54
 msgid "Object"
 msgstr "Objeto"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:490
+#: plugins/admin/departments/class_departmentGeneric.inc:499
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_departmentManagement.inc:412
-#: plugins/admin/departments/class_departmentManagement.inc:414
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Departamentos"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Teléfono"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr "Nombre del departamento"
+
 #: plugins/admin/departments/class_departmentManagement.inc:158
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
@@ -6878,24 +7379,10 @@ msgstr "Esta a punto de borrar todo el subárbol LDAP colocado bajo '%s'."
 msgid "You have no permission to remove this department."
 msgstr "No tiene permisos para eliminar este departamento."
 
-#: plugins/admin/departments/class_departmentManagement.inc:334
+#: plugins/admin/departments/class_departmentManagement.inc:339
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:418
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:29
-msgid "Telephone"
-msgstr "Teléfono"
-
-#: plugins/admin/departments/class_departmentManagement.inc:419
-#: plugins/admin/departments/class_divListDepartment.inc:41
-msgid "Department name"
-msgstr "Nombre del departamento"
-
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
@@ -6946,6 +7433,7 @@ msgid "Enable DNS for this device"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
 #: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/admin/fai/faiPackageNew.tpl:31
 #: plugins/gofon/phoneaccount/generic.tpl:68
@@ -6958,6 +7446,8 @@ msgstr "Zona"
 
 #: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
@@ -6976,7 +7466,7 @@ msgstr "presente"
 #: plugins/admin/systems/class_terminalStartup.inc:151
 #: plugins/admin/systems/class_terminalGeneric.inc:230
 #: plugins/admin/systems/class_workstationStartup.inc:456
-#: plugins/admin/systems/class_workstationService.inc:241
+#: plugins/admin/systems/class_workstationService.inc:252
 msgid "This 'dn' has no terminal features."
 msgstr "Esta 'dn' no tiene características de terminal."
 
@@ -7026,11 +7516,14 @@ msgid "Terminal Service"
 msgstr "Servidor de terminal"
 
 #: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
 #: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr "Desactivación temporal del acceso"
 
 #: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
 #: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr "Ruta a las fuentes tipográficas"
@@ -7164,7 +7657,7 @@ msgstr "No tiene permisos para crear un componente en esta 'Base'."
 #: plugins/admin/systems/class_terminalGeneric.inc:391
 #: plugins/admin/systems/class_servGeneric.inc:242
 #: plugins/admin/systems/class_workstationGeneric.inc:361
-#: plugins/admin/systems/class_printGeneric.inc:616
+#: plugins/admin/systems/class_printGeneric.inc:619
 #: plugins/admin/systems/class_componentGeneric.inc:165
 #: plugins/admin/systems/class_phoneGeneric.inc:312
 #, php-format
@@ -7189,8 +7682,8 @@ msgid "Terminal name"
 msgstr "Nombre de terminal"
 
 #: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
-#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
@@ -7198,8 +7691,11 @@ msgstr "Elija un subárbol donde colocar el terminal"
 
 #: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
 #: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
 #: plugins/admin/systems/phonesettings.tpl:23
 #: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr "Modo"
 
@@ -7211,7 +7707,9 @@ msgstr "Seleccionar modo de terminal"
 
 #: plugins/admin/systems/terminal.tpl:42
 #: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
 #: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
 msgid "Syslog server"
 msgstr "Servidor de Logs"
 
@@ -7222,6 +7720,7 @@ msgid "Choose server to use for logging"
 msgstr "Elija un servidor que será usado para registro"
 
 #: plugins/admin/systems/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr "Servidor Raíz"
 
@@ -7230,6 +7729,7 @@ msgid "Select NFS root filesystem to use"
 msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
 
 #: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
 
@@ -7307,6 +7807,13 @@ msgstr "desconocido"
 #: plugins/admin/systems/class_workstationService.inc:213
 #: plugins/admin/systems/class_workstationService.inc:216
 #: plugins/admin/systems/class_workstationService.inc:219
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
 msgid "inherited"
 msgstr ""
 
@@ -7356,21 +7863,21 @@ msgid "Bit"
 msgstr "Bit"
 
 #: plugins/admin/systems/class_terminalService.inc:303
-#: plugins/admin/systems/class_workstationService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:302
 msgid "Choose the phone located at the current terminal"
 msgstr "Elija el teléfono localizado en el terminal actual"
 
 #: plugins/admin/systems/class_terminalService.inc:365
 #: plugins/admin/systems/class_terminalService.inc:370
-#: plugins/admin/systems/class_workstationService.inc:359
-#: plugins/admin/systems/class_workstationService.inc:364
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
 msgid "Please specify a valid VSync range."
 msgstr "Por favor especifique un rango VSync valido"
 
 #: plugins/admin/systems/class_terminalService.inc:380
 #: plugins/admin/systems/class_terminalService.inc:385
-#: plugins/admin/systems/class_workstationService.inc:374
-#: plugins/admin/systems/class_workstationService.inc:379
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
 msgid "Please specify a valid HSync range."
 msgstr "Por favor especifique un rango HSync valido"
 
@@ -7379,42 +7886,180 @@ msgstr "Por favor especifique un rango HSync valido"
 msgid "Saving of object system terminal/service with dn '%s' failed."
 msgstr "Ha fallado la grabación de la información del servicio de terminal"
 
-#: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:309
-#, php-format
-msgid ""
-"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
-"exist."
-msgstr ""
-"El comando '%s', especificado como acción 'KERNELS' para la extensión '%s' "
-"no parece existir."
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:440
+#, fuzzy
+msgid "Service"
+msgstr "Servicios"
 
-#: plugins/admin/systems/class_terminalStartup.inc:386
-#, fuzzy, php-format
-msgid "Saving of system terminal/startup with dn '%s' failed."
-msgstr "Ha fallado la grabación de los parámetros de inicio de terminal"
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#, fuzzy
+msgid "Terminal service"
+msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr "Nombre del servidor"
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:449
+#, fuzzy
+msgid "Monitor"
+msgstr "Tamaño del monitor"
 
-#: plugins/admin/systems/server.tpl:54
-msgid "Select action to execute for this server"
-msgstr "Seleccione una acción que se ejecutara en este servidor"
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+#, fuzzy
+msgid "Method"
+msgstr "método"
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: plugins/admin/systems/workstation.tpl:8
-msgid "Workstation template"
-msgstr "Plantilla de estación de trabajo"
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:450
+#, fuzzy
+msgid "Gfx driver"
+msgstr "Nuevo controlador de dispositivo"
 
-#: plugins/admin/systems/workstation.tpl:10
-msgid "Workstation name"
-msgstr "Nombre de la estación de trabajo"
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:451
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Resolución"
 
-#: plugins/admin/systems/printer.tpl:6
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:452
+#, fuzzy
+msgid "Gfx color depth"
+msgstr "Profundidad del Color"
+
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:453
+#, fuzzy
+msgid "Hsync"
+msgstr "HSync"
+
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:454
+#, fuzzy
+msgid "Vsync"
+msgstr "VSync"
+
+#: plugins/admin/systems/class_terminalService.inc:443
+#, fuzzy
+msgid "Printer service enabled"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Servidor de Cola"
+
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:455
+#, fuzzy
+msgid "Scanner enabled"
+msgstr "desactivado"
+
+#: plugins/admin/systems/class_terminalService.inc:446
+#, fuzzy
+msgid "Scanner model"
+msgstr "desactivado"
+
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:456
+#, fuzzy
+msgid "Keyboard model"
+msgstr "Elija modelo de teclado"
+
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:457
+#, fuzzy
+msgid "Keyboard layout"
+msgstr "Elija localización del teclado"
+
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:458
+#, fuzzy
+msgid "Keyboard variant"
+msgstr "Elija variante de teclado"
+
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:459
+#, fuzzy
+msgid "Mouse type"
+msgstr "Tipo MIME"
+
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:460
+#, fuzzy
+msgid "Mouse port"
+msgstr "Punto de montaje"
+
+#: plugins/admin/systems/class_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:461
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Componente telefónico"
+
+#: plugins/admin/systems/class_terminalStartup.inc:93
+#: plugins/admin/systems/class_workstationStartup.inc:309
+#, php-format
+msgid ""
+"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
+"exist."
+msgstr ""
+"El comando '%s', especificado como acción 'KERNELS' para la extensión '%s' "
+"no parece existir."
+
+#: plugins/admin/systems/class_terminalStartup.inc:386
+#, fuzzy, php-format
+msgid "Saving of system terminal/startup with dn '%s' failed."
+msgstr "Ha fallado la grabación de los parámetros de inicio de terminal"
+
+#: plugins/admin/systems/class_terminalStartup.inc:432
+#, fuzzy
+msgid "Terminal startup"
+msgstr "Plantilla de terminal"
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+#, fuzzy
+msgid "Ldap server"
+msgstr "Servidor LDAP"
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: 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:442
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+#, fuzzy
+msgid "Kernel parameter"
+msgstr "Comprobar parámetros"
+
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr "Nombre del servidor"
+
+#: plugins/admin/systems/server.tpl:54
+msgid "Select action to execute for this server"
+msgstr "Seleccione una acción que se ejecutara en este servidor"
+
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/printer.tpl:6
 msgid "General"
 msgstr "General"
 
@@ -7440,10 +8085,6 @@ msgstr "URL de la impresora"
 msgid "Driver"
 msgstr "Controlador"
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr "Permisos"
-
 #: plugins/admin/systems/printer.tpl:70
 msgid "Users which are allowed to use this printer"
 msgstr "Usuarios que tienen permiso para acceder a esta impresora"
@@ -7464,6 +8105,15 @@ msgstr "usuarios que tienen permisos para administrar esta impresora"
 msgid "Admins"
 msgstr "Administradores"
 
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
+msgstr "Plantilla de estación de trabajo"
+
+#: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
+msgid "Workstation name"
+msgstr "Nombre de la estación de trabajo"
+
 #: plugins/admin/systems/class_terminalGeneric.inc:98
 msgid "text"
 msgstr "texto"
@@ -7554,6 +8204,38 @@ msgstr ""
 msgid "Saving of object system terminal/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+#, fuzzy
+msgid "Terminal generic"
+msgstr "Servidor de terminal"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#, fuzzy
+msgid "Syslog server enabled"
+msgstr "Servidor de Logs"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+#, fuzzy
+msgid "Ntp server settings"
+msgstr "Parámetros del usuario"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+#, fuzzy
+msgid "Action flag"
+msgstr "Acción"
+
 #: plugins/admin/systems/class_servGeneric.inc:43
 #: plugins/admin/systems/class_workstationGeneric.inc:102
 #: plugins/admin/ogroups/class_termgroup.inc:45
@@ -7621,6 +8303,17 @@ msgstr "No tiene permisos para crear un servidor en esta 'Base'."
 msgid "Saving of system server/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servGeneric.inc:316
+#, fuzzy
+msgid "Server generic"
+msgstr "Nombre del servidor"
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+#, fuzzy
+msgid "Goto mode"
+msgstr "a la carpeta"
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr "Eliminar servicio DHCP"
@@ -7677,6 +8370,25 @@ msgstr ""
 msgid "Saving of system workstation/generic with dn '%s' failed."
 msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
 
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+#, fuzzy
+msgid "Workstation generic"
+msgstr "Nombre de la estación de trabajo"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Estación de trabajo"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+#, fuzzy
+msgid "Ntp server"
+msgstr "Servidor NTP"
+
 #: plugins/admin/systems/class_systemManagement.inc:32
 msgid "Systems"
 msgstr "Sistemas"
@@ -7706,81 +8418,68 @@ msgstr ""
 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:648
 msgid "New terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:640
+#: plugins/admin/systems/class_systemManagement.inc:650
 msgid "New workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:642
+#: plugins/admin/systems/class_systemManagement.inc:652
 msgid "New Device"
 msgstr "Nuevo dispositivo"
 
-#: plugins/admin/systems/class_systemManagement.inc:657
+#: plugins/admin/systems/class_systemManagement.inc:667
 msgid "Terminal template for"
 msgstr "Plantilla de terminal para"
 
-#: plugins/admin/systems/class_systemManagement.inc:669
+#: plugins/admin/systems/class_systemManagement.inc:679
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/systems/class_systemManagement.inc:767
 msgid "New System from incoming"
 msgstr "Nuevo sistema desde la entrada"
 
-#: plugins/admin/systems/class_systemManagement.inc:759
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:760
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:388
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Estación de trabajo"
-
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:771
 msgid "Workstation is installing"
 msgstr "La estación de trabajo se está instalando"
 
-#: plugins/admin/systems/class_systemManagement.inc:762
+#: plugins/admin/systems/class_systemManagement.inc:772
 msgid "Workstation is waiting for action"
 msgstr "la estación de trabajo esta esperando por una acción"
 
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:773
 msgid "Workstation installation failed"
 msgstr "Ha fallado la instalación de la estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:766
+#: plugins/admin/systems/class_systemManagement.inc:776
 msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:777
 msgid "Server is waiting for action"
 msgstr "El servidor está esperando por una acción"
 
-#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/systems/class_systemManagement.inc:778
 msgid "Server installation failed"
 msgstr "Ha fallado la instalación del servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_systemManagement.inc:779
 msgid "Winstation"
 msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_systemManagement.inc:780
 msgid "Network Device"
 msgstr "Dispositivo de Red"
 
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:781
 #: plugins/admin/systems/class_divListSystem.inc:103
 msgid "New Terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/systems/class_systemManagement.inc:782
 #: plugins/admin/systems/class_divListSystem.inc:105
 msgid "New Workstation"
 msgstr "Nueva estación de trabajo"
@@ -7790,6 +8489,7 @@ msgid "Zones"
 msgstr "Zonas"
 
 #: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
 msgid "Postfix mydomain"
 msgstr "Postfix mydomain"
 
@@ -7798,22 +8498,27 @@ msgid "Postfix mydestination"
 msgstr "Postfix mydestination"
 
 #: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr "Servicio POP3"
 
 #: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr "Servicio POP3/SSL"
 
 #: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr "Servicio IMAP"
 
 #: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr "Servicio IMAP/SSL"
 
 #: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr "Servicio Sieve"
 
@@ -7832,6 +8537,7 @@ msgid "Amavis email scanning (virus/spam)"
 msgstr "Desinfectado de correo Amavis (virus/spam)"
 
 #: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr "Parámetros de quotas"
 
@@ -7844,6 +8550,7 @@ msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Permite descarga no autentificada de información de presencia."
 
 #: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr "Redes privilegiadas SMTP"
 
@@ -7868,6 +8575,7 @@ msgid "Host used to relay mails"
 msgstr "Equipo usado para reenviar correos"
 
 #: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr "Aceptar correo desde internet"
 
@@ -7907,6 +8615,7 @@ msgstr ""
 "aquí."
 
 #: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
 msgid "Reverse zone"
 msgstr "Zona Inversa"
 
@@ -7944,10 +8653,50 @@ msgid "Set status flag for system server/dns with dn '%s' failed."
 msgstr ""
 
 #: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
 #, fuzzy
 msgid "DNS service"
 msgstr "Añadir servicio DNS"
 
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Nombre de la zona"
+
+#: plugins/admin/systems/class_servDNS.inc:401
+#, fuzzy
+msgid "Primary dns server"
+msgstr "Servidor DNS primario para esta zona"
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Serie"
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Reintentar"
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr "Expira"
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr "Registros de zona"
+
 #: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr "Acceso a Kerberos kadmin"
@@ -7959,6 +8708,7 @@ msgstr "Dominio Kerberos"
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
 #: plugins/admin/systems/goKrbServer.tpl:8
 #: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr "Usuario administrador"
 
@@ -7995,16 +8745,19 @@ msgstr "Acceso administrador imap"
 
 #: plugins/admin/systems/servdb.tpl:74
 #: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr "Identificador de servidor"
 
 #: plugins/admin/systems/servdb.tpl:78
 #: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr "Conectar a la URL"
 
 #: plugins/admin/systems/servdb.tpl:91
 #: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr "Puerto de Sieve"
 
@@ -8025,6 +8778,7 @@ msgid "Glpi database"
 msgstr "Base de datos Glpi"
 
 #: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/class_goGlpiServer.inc:227
 #: plugins/admin/systems/goGlpiServer.tpl:14
 msgid "Database"
 msgstr "Bases de datos"
@@ -8033,6 +8787,78 @@ msgstr "Bases de datos"
 msgid "Machine name"
 msgstr "Nombre de la maquina"
 
+#: plugins/admin/systems/class_goFaxServer.inc:29
+#, fuzzy
+msgid "FAX service"
+msgstr "Servicio IMAP"
+
+#: plugins/admin/systems/class_goFaxServer.inc:49
+#, fuzzy
+msgid "FAX database configuration"
+msgstr "Base de datos de FAX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goFaxServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+#, fuzzy
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, fuzzy, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, 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_goFaxServer.inc:215
+#, fuzzy
+msgid "Fax server"
+msgstr "Servidor FAX"
+
+#: plugins/admin/systems/class_goFaxServer.inc:216
+#, fuzzy
+msgid "Fax server service"
+msgstr "Servicio Sieve"
+
+#: plugins/admin/systems/class_goFaxServer.inc:224
+#, fuzzy
+msgid "Login name"
+msgstr "Nombre de la localización"
+
 #: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
 #, fuzzy
 msgid ""
@@ -8102,39 +8928,72 @@ msgstr "Añadir el servicio Kolab"
 msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:103
+#: plugins/admin/systems/class_servKolab.inc:414
+#, fuzzy
+msgid "Kolab service"
+msgstr "Añadir el servicio Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:423
+#, fuzzy
+msgid "My destination"
+msgstr "Destino"
+
+#: plugins/admin/systems/class_servKolab.inc:424
+#, fuzzy
+msgid "FTP FreeBusy service"
+msgstr "Servicio de presencia HTTP (propio)"
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
+msgstr ""
+
+#: plugins/admin/systems/class_servKolab.inc:427
+#, fuzzy
+msgid "Relayhost"
+msgstr "Enfocado a la versión"
+
+#: plugins/admin/systems/class_servKolab.inc:428
+#, fuzzy
+msgid "HTTP FreeBusy service"
+msgstr "Servicio de presencia HTTP (propio)"
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
 msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:240
+#: plugins/admin/systems/class_printGeneric.inc:237
 #: plugins/admin/systems/class_printGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:284
-#: plugins/admin/systems/class_printGeneric.inc:300
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_printGeneric.inc:250
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:305
+#: plugins/admin/systems/class_printGeneric.inc:308
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_printGeneric.inc:238
 msgid ""
 "Could not intialize printer tab, parameter parent was missing while "
 "construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_printGeneric.inc:246
 msgid "This is a workstation template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:246
+#: plugins/admin/systems/class_printGeneric.inc:251
 msgid "This is a terminal template, printer tab is disabled."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:277
+#: plugins/admin/systems/class_printGeneric.inc:282
 msgid "This 'dn' has no printer features."
 msgstr "Esta 'dn' no tiene características de impresora."
 
-#: plugins/admin/systems/class_printGeneric.inc:285
+#: plugins/admin/systems/class_printGeneric.inc:290
 msgid ""
 "This object has printer extension disabled. You can't enable it while 'cn' "
 "is not present in entry. Possibly you are currently creating a new terminal "
@@ -8144,12 +9003,12 @@ msgstr ""
 "siempre que 'cn' no este presente en esta entrada. Posiblemente está "
 "actualmente creando una nueva plantilla de terminal"
 
-#: plugins/admin/systems/class_printGeneric.inc:292
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
 msgid "Remove printer extension"
 msgstr "Eliminar extensión de impresión"
 
-#: plugins/admin/systems/class_printGeneric.inc:293
+#: plugins/admin/systems/class_printGeneric.inc:298
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
@@ -8157,7 +9016,7 @@ msgstr ""
 "Esta estación de trabajo tiene la extensión impresora activada. Puede "
 "desactivarla pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:296
+#: plugins/admin/systems/class_printGeneric.inc:301
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
@@ -8165,7 +9024,7 @@ msgstr ""
 "Este terminal tiene la extensión impresora activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:301
+#: plugins/admin/systems/class_printGeneric.inc:306
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
@@ -8173,7 +9032,7 @@ msgstr ""
 "Esta estación de trabajo tiene la extensión impresora desactivada. Puede "
 "activarla pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:304
+#: plugins/admin/systems/class_printGeneric.inc:309
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
@@ -8181,37 +9040,37 @@ msgstr ""
 "Este terminal tiene la extensión impresora desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:478
+#: plugins/admin/systems/class_printGeneric.inc:475
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:486
+#: plugins/admin/systems/class_printGeneric.inc:483
 msgid "can't get ppd informations."
 msgstr "no puedo acceder a la información PPD"
 
-#: plugins/admin/systems/class_printGeneric.inc:499
+#: plugins/admin/systems/class_printGeneric.inc:496
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_printGeneric.inc:498
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:552
+#: plugins/admin/systems/class_printGeneric.inc:553
 #, fuzzy, php-format
 msgid "Removing of system print/generic with dn '%s' failed."
 msgstr "Ha fallado la eliminación de la impresora"
 
-#: plugins/admin/systems/class_printGeneric.inc:738
+#: plugins/admin/systems/class_printGeneric.inc:751
 #, php-format
 msgid "Saving of system print/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:755
-#: plugins/admin/systems/class_printGeneric.inc:757
+#: plugins/admin/systems/class_printGeneric.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:775
 #: plugins/admin/ogroups/class_ogroupManagement.inc:383
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
@@ -8219,6 +9078,49 @@ msgstr ""
 msgid "Group"
 msgstr "Grupo"
 
+#: plugins/admin/systems/class_printGeneric.inc:791
+#, fuzzy
+msgid "Print generic"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/class_printGeneric.inc:802
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:803
+#, fuzzy
+msgid "Printer PPD"
+msgstr "Impresora"
+
+#: plugins/admin/systems/class_printGeneric.inc:820
+#, php-format
+msgid ""
+"You are not allowed to remove the given object '%s' from the list of members "
+"of printer '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:837
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:842
+#, php-format
+msgid ""
+"You are not allowed to add the given object '%s' to the list of members of '%"
+"s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:864
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:872
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
+
 #: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
@@ -8261,6 +9163,65 @@ msgstr "El campo 'Dirección IP' contiene una dirección no valida."
 msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_componentGeneric.inc:234
+#, fuzzy
+msgid "Component generic"
+msgstr "Nuevo componente"
+
+#: plugins/admin/systems/class_componentGeneric.inc:239
+#, fuzzy
+msgid "Network device"
+msgstr "Dispositivos de Red"
+
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr "Elija el tipo de componente del sistema que desea crear"
+
+#: plugins/admin/systems/chooser.tpl:4
+msgid ""
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
+msgstr ""
+"Terminales linux y estaciones de trabajo son autocreadas en el inicio. Por "
+"esta razón solo se pueden crear plantillas para un árbol específico. "
+"Normalmente los servidores son añadidos también automáticamente, pero en "
+"algunos casos especiales, puede necesitar crear un servidor virtual para "
+"proveer de cierta información a GOsa. Otros componentes de red pueden ser "
+"usados para que la configuración de 'Nagios' creen las dependencias de "
+"componentes."
+
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Plantilla de clientes ligeros Linux"
+
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Plantilla de estaciones de trabajo linux"
+
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Servidor Linux"
+
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Estación de trabajo Windows"
+
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Impresora de Red"
+
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Otros componentes de red"
+
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Crear"
+
 #: plugins/admin/systems/goNtpServer.tpl:2
 #, fuzzy
 msgid "Time server"
@@ -8271,6 +9232,7 @@ msgid "Printer type"
 msgstr "Tipo de impresora"
 
 #: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/class_glpiAccount.inc:784
 #: plugins/admin/systems/glpi_devices.tpl:24
 #: plugins/admin/systems/glpi_devices.tpl:123
 #: plugins/admin/systems/glpi_devices.tpl:164
@@ -8284,6 +9246,7 @@ msgstr "Tipo de impresora"
 #: plugins/admin/systems/glpi_devices.tpl:633
 #: plugins/admin/systems/glpi_devices.tpl:687
 #: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:781
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
 msgid "Manufacturer"
 msgstr ""
@@ -8292,10 +9255,6 @@ msgstr ""
 msgid "Supported interfaces"
 msgstr "Interfaces soportados"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr "Serie"
-
 #: plugins/admin/systems/glpiPrinter.tpl:46
 msgid "Parallel"
 msgstr "Paralelo"
@@ -8309,11 +9268,15 @@ msgid "Contacts"
 msgstr "Contactos"
 
 #: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
 msgid "Technical responsible"
 msgstr ""
 
 #: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
 msgid "Contact person"
 msgstr "Persona de contacto"
 
@@ -8325,55 +9288,6 @@ msgstr "Adjuntos"
 msgid "Installed cartridges"
 msgstr "Cartuchos instalados"
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr "Elija el tipo de componente del sistema que desea crear"
-
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
-msgstr ""
-"Terminales linux y estaciones de trabajo son autocreadas en el inicio. Por "
-"esta razón solo se pueden crear plantillas para un árbol específico. "
-"Normalmente los servidores son añadidos también automáticamente, pero en "
-"algunos casos especiales, puede necesitar crear un servidor virtual para "
-"proveer de cierta información a GOsa. Otros componentes de red pueden ser "
-"usados para que la configuración de 'Nagios' creen las dependencias de "
-"componentes."
-
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Plantilla de clientes ligeros Linux"
-
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Plantilla de estaciones de trabajo linux"
-
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Servidor Linux"
-
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Estación de trabajo Windows"
-
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Impresora de Red"
-
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Otros componentes de red"
-
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Crear"
-
 #: plugins/admin/systems/servnfs.tpl:1
 msgid "Edit share"
 msgstr "Editar recurso compartido"
@@ -8383,6 +9297,7 @@ msgid "NFS setup"
 msgstr ""
 
 #: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:277
 msgid "Volume"
 msgstr "Volumen"
 
@@ -8395,6 +9310,7 @@ msgid "Codepage"
 msgstr "Pagina de códigos"
 
 #: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:276
 msgid "Option"
 msgstr "Opción"
 
@@ -8404,10 +9320,12 @@ msgid "System type"
 msgstr "Tipo de sistema"
 
 #: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
 msgid "Operating system"
 msgstr "Sistema operativo"
 
 #: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #: plugins/admin/systems/glpi_devices.tpl:112
 #: plugins/admin/systems/glpi_devices.tpl:153
@@ -8502,6 +9420,35 @@ msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 msgid "Saving of system phone/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+#, fuzzy
+msgid "Phone generic"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+#, fuzzy
+msgid "Phone hardware"
+msgstr "Componente telefónico"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr "Modo DTMF"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+#, fuzzy
+msgid "Default ip"
+msgstr "Dirección IP por defecto"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
 #: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
@@ -8512,34 +9459,48 @@ msgid "Can't read '/etc/gosa/encodings', please check permissions."
 msgstr ""
 "No se puede leer '/etc/gosa/encodings', por favor compruebe los permisos."
 
-#: plugins/admin/systems/class_servNfs.inc:179
+#: plugins/admin/systems/class_servNfs.inc:180
 msgid "Please specify a valid path for your setup."
 msgstr "Por favor especifique una ruta valida para su configuración."
 
-#: plugins/admin/systems/class_servNfs.inc:185
+#: plugins/admin/systems/class_servNfs.inc:186
 msgid "Please specify a valid name for your share."
 msgstr "Por favor especifique un nombre valido para su recurso compartido."
 
-#: plugins/admin/systems/class_servNfs.inc:188
+#: plugins/admin/systems/class_servNfs.inc:189
 msgid "Please specify a name for your share."
 msgstr "Por favor especifique un nombre para su recurso compartido."
 
-#: plugins/admin/systems/class_servNfs.inc:193
+#: plugins/admin/systems/class_servNfs.inc:194
 msgid "Description contains invalid characters."
 msgstr "¡La descripción contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servNfs.inc:197
+#: plugins/admin/systems/class_servNfs.inc:198
 msgid "Volume contains invalid characters."
 msgstr "El volumen contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servNfs.inc:201
+#: plugins/admin/systems/class_servNfs.inc:202
 msgid "Path contains invalid characters."
 msgstr "La ruta contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servNfs.inc:205
+#: plugins/admin/systems/class_servNfs.inc:206
 msgid "Option contains invalid characters."
 msgstr "La opción contiene caracteres no validos."
 
+#: plugins/admin/systems/class_servNfs.inc:263
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:264
+#, fuzzy
+msgid "NFS service"
+msgstr "Añadir servicio DNS"
+
+#: plugins/admin/systems/class_servNfs.inc:274
+#, fuzzy
+msgid "Charset"
+msgstr "Chipset"
+
 #: plugins/admin/systems/class_workstationStartup.inc:391
 msgid ""
 "There are packages in your configuration, which can't be resolved with "
@@ -8594,6 +9555,30 @@ msgid ""
 "empty string."
 msgstr ""
 
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+#, fuzzy
+msgid "System startup"
+msgstr "Estado del Sistema"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
+msgstr "Clases FAI"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
+#, fuzzy
+msgid "Debian release"
+msgstr "Versión actual"
+
 #: plugins/admin/systems/phonesettings.tpl:1
 msgid "Advanced phone settings"
 msgstr "Configuración telefónica avanzada"
@@ -8616,10 +9601,6 @@ msgstr "Elija tipo de teléfono"
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:34
-msgid "DTMF mode"
-msgstr "Modo DTMF"
-
 #: plugins/admin/systems/phonesettings.tpl:48
 #: plugins/admin/systems/phonesettings.tpl:87
 msgid "Default IP"
@@ -8751,6 +9732,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Section"
 msgstr "Sección"
 
@@ -8777,6 +9759,7 @@ msgstr "Controlador de dispositivo de Impresión"
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr "Modelo"
 
@@ -8819,11 +9802,16 @@ msgstr ""
 msgid "Printer ppd selection."
 msgstr "Seleccionar impresora ppd"
 
-#: plugins/admin/systems/class_workstationService.inc:421
+#: plugins/admin/systems/class_workstationService.inc:432
 #, fuzzy, php-format
 msgid "Saving of system workstation/service with dn '%s' failed."
 msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
 
+#: plugins/admin/systems/class_workstationService.inc:441
+#, fuzzy
+msgid "Workstation service"
+msgstr "Nombre de la estación de trabajo"
+
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
 msgid "Keyboard"
@@ -8874,13 +9862,6 @@ msgstr "Puerto"
 msgid "Choose mouse port"
 msgstr "Elija el puerto del ratón"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:27
-msgid "Telephone hardware"
-msgstr "Componente telefónico"
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -8951,11 +9932,6 @@ msgstr "Provee servicios de exploración"
 msgid "Boot parameters"
 msgstr "Parametros de inicio"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr "Kernel de inicio"
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
@@ -8984,7 +9960,9 @@ msgstr "Servidor FAI"
 #: plugins/admin/systems/workstationStartup.tpl:75
 #: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/class_servRepository.inc:244
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
 msgid "Release"
 msgstr "Versión"
@@ -9038,10 +10016,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr "Usar el modo de depuración durante el arranque"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr "Método de conexión"
@@ -9080,10 +10054,6 @@ msgstr ""
 msgid "Provide print services"
 msgstr "Proveer servicios de impresión"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Servidor de Cola"
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
@@ -9094,11 +10064,13 @@ msgid "Select scanner driver to use"
 msgstr "Seleccione que controladores de escáner se usaran"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
 #: plugins/admin/fai/faiPackage.tpl:29
 msgid "Repository"
 msgstr "Repositorio"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 msgid "Parent server"
 msgstr "Servidor Origen"
 
@@ -9126,6 +10098,7 @@ msgstr ""
 
 #: plugins/admin/systems/class_servRepository.inc:35
 #: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
 #, fuzzy
 msgid "Repository service"
 msgstr "Parámetros del repositorio"
@@ -9154,6 +10127,15 @@ msgstr "El nombre especificado ya esta siendo usado"
 msgid "Set status flag for server services/repository with dn '%s' failed."
 msgstr ""
 
+#: plugins/admin/systems/class_servRepository.inc:441
+#, fuzzy
+msgid "Releases"
+msgstr "Versión"
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
 msgstr "Lista de repositorios configurados."
@@ -9166,6 +10148,54 @@ msgstr "Añadir repositorio"
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
+#: plugins/admin/systems/class_goGlpiServer.inc:31
+#, fuzzy
+msgid "Inventory database"
+msgstr "Usuario de Base de datos"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:51
+#, fuzzy
+msgid "Glpi management"
+msgstr "Gestión de listas de bloqueo"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, fuzzy, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, fuzzy, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+#, fuzzy
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+#, fuzzy
+msgid "Glpi server"
+msgstr "Servidor de correo"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+#, fuzzy
+msgid "Glpi server service"
+msgstr "Servicio Sieve"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+#, fuzzy
+msgid "Admin"
+msgstr "Administradores"
+
 #: plugins/admin/systems/glpi_edit_type.tpl:1
 msgid "Manage System-types"
 msgstr "Gestionar tipos de sistemas"
@@ -9317,6 +10347,45 @@ msgstr ""
 "Mientras no se encuentra la extensión php_mysql no se puede eliminar la "
 "cuenta glpi."
 
+#: plugins/admin/systems/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
+#, fuzzy
+msgid "Inventory extension"
+msgstr "Eliminar extensión de impresión"
+
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
+#, fuzzy
+msgid "Attachment name"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+#, fuzzy
+msgid "Attachment comment"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+#, fuzzy
+msgid "Attachment mime type"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+#, fuzzy
+msgid "Attachment filename"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+#, fuzzy
+msgid "Peripheral devices"
+msgstr "Dispositivo de Impresión"
+
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 msgid "Manage manufacturers"
 msgstr "Gestione fabricantes"
@@ -9353,6 +10422,7 @@ msgstr "Añadir/Editar monitor"
 
 #: plugins/admin/systems/glpi_devices.tpl:17
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
 msgid "Comments"
 msgstr "Comentarios"
@@ -9484,6 +10554,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:523
 msgid "MAC address"
 msgstr "Dirección MAC"
 
@@ -9814,6 +10885,31 @@ msgstr ""
 msgid "since"
 msgstr "desde"
 
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Eliminar extensión de impresión"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Interfaces soportados"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Interfaces soportados"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Interfaces soportados"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Parámetros de correo"
+
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
@@ -9882,6 +10978,21 @@ msgstr ""
 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:511
+#, fuzzy
+msgid "DNS settings"
+msgstr "Parametros de samba"
+
+#: plugins/admin/systems/class_termDNS.inc:519
+#, fuzzy
+msgid "DNS records"
+msgstr "Registros DNS"
+
+#: plugins/admin/systems/class_termDNS.inc:522
+#, fuzzy
+msgid "IP address"
+msgstr "Dirección IP"
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
 msgstr ""
@@ -9915,18 +11026,10 @@ msgstr "Expresiones regulares que concuerden con tipos de cartuchos"
 msgid "Reference"
 msgstr "Referencia"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr "Nombre de la zona"
-
 #: plugins/admin/systems/servdnseditzone.tpl:13
 msgid "Network address"
 msgstr "Dirección de red"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone records"
-msgstr "Registros de zona"
-
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
@@ -9943,16 +11046,6 @@ msgstr "Servidor DNS primario para esta zona"
 msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Reintentar"
-
-#: plugins/admin/systems/servdnseditzone.tpl:79
-msgid "Expire"
-msgstr "Expira"
-
 #: plugins/admin/systems/servdnseditzone.tpl:100
 msgid "MxRecords"
 msgstr "Registros MX"
@@ -9989,7 +11082,7 @@ msgstr "Elija un grupo de objetos"
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:304 include/class_acl.inc:331
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:363
 msgid "Down"
 msgstr "Abajo"
 
@@ -10322,62 +11415,30 @@ msgstr "Seleccione impresora para añadir"
 msgid "All available services are already in use."
 msgstr "El nombre de dispositivo especificado ya esta siendo usado"
 
-#: plugins/admin/systems/class_goFaxServer.inc:29
-#, fuzzy
-msgid "FAX service"
-msgstr "Servicio IMAP"
-
-#: plugins/admin/systems/class_goFaxServer.inc:49
-#, fuzzy
-msgid "FAX database configuration"
-msgstr "Base de datos de FAX"
-
-#: plugins/admin/systems/class_goFaxServer.inc:79
+#: plugins/admin/systems/class_goCupsServer.inc:76
 #, fuzzy, php-format
-msgid "Removing server services/gofax with dn '%s' failed."
+msgid "Removing of server services/cups with dn '%s' failed."
 msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/class_goFaxServer.inc:102
+#: plugins/admin/systems/class_goCupsServer.inc:100
 #, fuzzy, php-format
-msgid "Saving server services/gofax with dn '%s' failed."
+msgid "Saving of server services/cups with dn '%s' failed."
 msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/class_goFaxServer.inc:125
+#: plugins/admin/systems/class_goCupsServer.inc:122
 #, php-format
-msgid "Set status flag for server services/gofax with dn '%s' failed."
+msgid "Set status flag for server services/cups with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goFaxServer.inc:135
-#: plugins/admin/systems/class_goGlpiServer.inc:136
+#: plugins/admin/systems/class_goCupsServer.inc:206
 #, fuzzy
-msgid "The attribute user is empty or contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
-
-#: plugins/admin/systems/class_goFaxServer.inc:138
-#: plugins/admin/systems/class_goFonServer.inc:140
-#, fuzzy, php-format
-msgid "The attribute password is empty or contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+msgid "Cups"
+msgstr "Arriba"
 
-#: plugins/admin/systems/class_goFaxServer.inc:186
-#: plugins/admin/systems/class_goGlpiServer.inc:187
-#: plugins/admin/systems/class_goCupsServer.inc:176
-#: plugins/admin/systems/class_goTerminalServer.inc:193
-#: plugins/admin/systems/class_goNtpServer.inc:189
-#: plugins/admin/systems/class_goLdapServer.inc:181
-#: plugins/admin/systems/class_goSyslogServer.inc:175
-#: plugins/admin/systems/class_goFonServer.inc:195
-#: plugins/admin/systems/class_goLogDBServer.inc:185
-#: plugins/admin/systems/class_goKrbServer.inc:190
-#: plugins/admin/systems/class_goMailServer.inc:737
-#: plugins/admin/systems/class_goImapServer.inc:243
-#: plugins/admin/systems/class_goShareServer.inc:352
-#, 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_goCupsServer.inc:207
+#, fuzzy
+msgid "Cups service"
+msgstr "Servicio de sonido"
 
 #: plugins/admin/systems/goLdapServer.tpl:1
 #: plugins/admin/systems/class_goLdapServer.inc:27
@@ -10385,6 +11446,25 @@ msgstr ""
 msgid "LDAP service"
 msgstr "Servicio LDAP"
 
+#: plugins/admin/systems/class_goTerminalServer.inc:79
+#, php-format
+msgid "Removing server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:129
+#, php-format
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
 #: plugins/admin/systems/class_divListSystemService.inc:17
 #: plugins/admin/systems/class_divListSystemService.inc:18
 #, fuzzy
@@ -10482,36 +11562,100 @@ msgstr "Servicio de impresión"
 msgid "Remove service"
 msgstr "Eliminar servicio DNS"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:31
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:8
+#, fuzzy
+msgid "Start"
+msgstr "Inicio"
+
+#: plugins/admin/systems/class_serverService.inc:9
+#, fuzzy
+msgid "Restart"
+msgstr "Reintentar"
+
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:27
+#, fuzzy
+msgid "Time service"
+msgstr "Servicio de Hora"
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+#, fuzzy
+msgid "NTP service"
+msgstr "Servidor NTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
+#, fuzzy, php-format
+msgid "Removing server services/goNtpServer with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goNtpServer.inc:122
+#, fuzzy, php-format
+msgid "Saving server services/goNtpServer with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goNtpServer.inc:149
+#, php-format
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:219
 #, fuzzy
-msgid "Inventory database"
-msgstr "Usuario de Base de datos"
+msgid "NTP"
+msgstr "FTP"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:51
+#: plugins/admin/systems/class_goNtpServer.inc:228
 #, fuzzy
-msgid "Glpi management"
-msgstr "Gestión de listas de bloqueo"
+msgid "Ntp source"
+msgstr "Servicio de sonido"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:81
+#: plugins/admin/systems/class_goLdapServer.inc:77
 #, fuzzy, php-format
-msgid "Removing server services/glpi with dn '%s' failed."
+msgid "Removing server services/ldap with dn '%s' failed."
 msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:99
+#: plugins/admin/systems/class_goLdapServer.inc:95
 #, fuzzy, php-format
-msgid "Saving server services/glpi with dn '%s' failed."
+msgid "Saving server services/ldap with dn '%s' failed."
 msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/class_goGlpiServer.inc:126
+#: plugins/admin/systems/class_goLdapServer.inc:123
 #, php-format
-msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgid "Set status flag for server services/ldap with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_goGlpiServer.inc:139
+#: plugins/admin/systems/class_goLdapServer.inc:133
 #, fuzzy
-msgid "The attribute database is empty or contains invalid characters."
+msgid "The given base is empty or contains invalid characters."
 msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+#, fuzzy
+msgid "Ldap service"
+msgstr "Servidor LDAP"
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+#, fuzzy
+msgid "Ldap base"
+msgstr "Servidor LDAP"
+
 #: plugins/admin/systems/goMailServer.tpl:7
 msgid "Visible full qualified hostname"
 msgstr ""
@@ -10531,6 +11675,7 @@ msgid "This value specifies the maximal header size."
 msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
 #: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
 #, fuzzy
 msgid "Max mailbox size"
 msgstr "Tamaño del correo electrónico"
@@ -10540,6 +11685,7 @@ msgid "Defines the maximal size of mail box."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
 #, fuzzy
 msgid "Max message size"
 msgstr "Mensaje"
@@ -10549,6 +11695,7 @@ msgid "Specify the maximal size of a message."
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
 #, fuzzy
 msgid "Relay host"
 msgstr "Enfocado a la versión"
@@ -10558,6 +11705,7 @@ msgid "Relay messages to following host:"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
 msgid "Local networks"
 msgstr ""
 
@@ -10572,6 +11720,7 @@ msgid "Domains and routing"
 msgstr "Administradores del dominio"
 
 #: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
 msgid "Domains to accept mail for"
 msgstr ""
 
@@ -10594,6 +11743,7 @@ msgid "Restrictions"
 msgstr "Secciones"
 
 #: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
 #, fuzzy
 msgid "Restrictions for sender"
 msgstr "Secciones para esta versión"
@@ -10604,6 +11754,7 @@ msgid "Restriction filter"
 msgstr ""
 
 #: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
 msgid "Restrictions for recipient"
 msgstr ""
 
@@ -10629,142 +11780,37 @@ msgstr "Estado del Sistema"
 msgid "Set status"
 msgstr "Estado del Sistema"
 
-#: plugins/admin/systems/class_serverService.inc:7
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
-msgid "Stop"
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:8
-#, fuzzy
-msgid "Start"
-msgstr "Inicio"
-
-#: plugins/admin/systems/class_serverService.inc:9
-#, fuzzy
-msgid "Restart"
-msgstr "Reintentar"
-
-#: plugins/admin/systems/class_serverService.inc:262
-msgid "Can't set status while this server is not saved."
-msgstr ""
-
-#: plugins/admin/systems/class_serverService.inc:274
-#, php-format
-msgid "The specified method '%s' can't executed for services."
-msgstr ""
-
-#: plugins/admin/systems/class_goCupsServer.inc:76
-#, fuzzy, php-format
-msgid "Removing of server services/cups with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goCupsServer.inc:100
-#, fuzzy, php-format
-msgid "Saving of server services/cups with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goCupsServer.inc:122
-#, php-format
-msgid "Set status flag for server services/cups with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:29
-#: plugins/admin/systems/class_goTerminalServer.inc:49
-#: plugins/admin/systems/goTerminalServer.tpl:1
-#, fuzzy
-msgid "Terminal service"
-msgstr "Servidor de terminal"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:79
-#, php-format
-msgid "Removing server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:102
-#, fuzzy, php-format
-msgid "Saving server services/terminalServer with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goTerminalServer.inc:129
-#, php-format
-msgid "Set status flag for server services/terminalServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goTerminalServer.inc:139
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
 #: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
 #, fuzzy
 msgid "Start IMAP service"
 msgstr "Servicio IMAP"
 
 #: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
 #, fuzzy
 msgid "Start IMAP SSL service"
 msgstr "Servicio IMAP/SSL"
 
 #: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
 #, fuzzy
 msgid "Start POP3 service"
 msgstr "Servicio POP3"
 
 #: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
 #, fuzzy
 msgid "Start POP3 SSL service"
 msgstr "Servicio POP3/SSL"
 
-#: plugins/admin/systems/class_goNtpServer.inc:27
-#, fuzzy
-msgid "Time service"
-msgstr "Servicio de Hora"
-
-#: plugins/admin/systems/class_goNtpServer.inc:70
-#, fuzzy
-msgid "NTP service"
-msgstr "Servidor NTP"
-
-#: plugins/admin/systems/class_goNtpServer.inc:100
-#, fuzzy, php-format
-msgid "Removing server services/goNtpServer with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goNtpServer.inc:122
-#, fuzzy, php-format
-msgid "Saving server services/goNtpServer with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goNtpServer.inc:149
-#, php-format
-msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:77
-#, fuzzy, php-format
-msgid "Removing server services/ldap with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goLdapServer.inc:95
-#, fuzzy, php-format
-msgid "Saving server services/ldap with dn '%s' failed."
-msgstr "Ha fallado la grabación del objeto de servicio de servidor"
-
-#: plugins/admin/systems/class_goLdapServer.inc:123
-#, php-format
-msgid "Set status flag for server services/ldap with dn '%s' failed."
-msgstr ""
-
-#: plugins/admin/systems/class_goLdapServer.inc:133
-#, fuzzy
-msgid "The given base is empty or contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
-
 #: plugins/admin/systems/class_goSyslogServer.inc:26
 #, fuzzy
 msgid "Logging service"
 msgstr "Base de datos de acceso de usuarios"
 
 #: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
 #, fuzzy
 msgid "Syslog service"
 msgstr "Servicio de Logs"
@@ -10784,11 +11830,10 @@ msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 msgid "Set status flag for server services/goSysLog with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goSyslogServer.tpl:1
-#: plugins/admin/systems/goCupsServer.tpl:1
+#: plugins/admin/systems/class_goSyslogServer.inc:204
 #, fuzzy
-msgid "enabled"
-msgstr "desactivado"
+msgid "Syslog"
+msgstr "Registro del sistema"
 
 #: plugins/admin/systems/class_goFonServer.inc:32
 #, fuzzy
@@ -10827,6 +11872,26 @@ msgid ""
 "The attribute country 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:224
+#, fuzzy
+msgid "GoFon server"
+msgstr "Servidor de fuentes"
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+#, fuzzy
+msgid "GoFon server service"
+msgstr "Servidor Kerberos"
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+#, fuzzy
+msgid "Area code"
+msgstr "Registros SOA"
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+#, fuzzy
+msgid "Country code"
+msgstr "Código de cuenta"
+
 #: plugins/admin/systems/class_goLogDBServer.inc:79
 #, fuzzy, php-format
 msgid "Removing server services/goLogDB with dn '%s' failed."
@@ -10842,12 +11907,24 @@ msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 msgid "Set status flag for server services/goLogDB with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/goGlpiServer.tpl:1
+#: plugins/admin/systems/class_goLogDBServer.inc:215
 #, fuzzy
-msgid "GLPI database information"
-msgstr "Información genérica del usuario"
+msgid "Log"
+msgstr "Inicio de sesión"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+#, fuzzy
+msgid "Log service"
+msgstr "Base de datos de acceso de usuarios"
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "desactivado"
 
 #: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
 #, fuzzy
 msgid "Kerberos service"
 msgstr "Servidor Kerberos"
@@ -10887,10 +11964,10 @@ msgstr "la clave kerberos especificada está vacía."
 msgid "The specified kerberos realm is empty."
 msgstr "la clave kerberos especificada está vacía."
 
-#: plugins/admin/systems/goFaxServer.tpl:1
+#: plugins/admin/systems/class_goKrbServer.inc:228
 #, fuzzy
-msgid "FAX database information"
-msgstr "Base de datos de FAX"
+msgid "Realm"
+msgstr "RAM"
 
 #: plugins/admin/systems/class_goMailServer.inc:44
 #, fuzzy
@@ -10932,6 +12009,25 @@ msgstr "Por favor especifique un valor numérico para expiración."
 msgid "Please specify a numeric value for message size limit."
 msgstr "Por favor especifique un valor numérico para expiración."
 
+#: plugins/admin/systems/class_goMailServer.inc:774
+#, fuzzy
+msgid "Mail service"
+msgstr "Servidor de correo"
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+#, fuzzy
+msgid "Transport table"
+msgstr "Tiempo de envio"
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+#, fuzzy
+msgid "GLPI database information"
+msgstr "Información genérica del usuario"
+
 #: plugins/admin/systems/class_goImapServer.inc:48
 #, fuzzy
 msgid "IMAP/POP3 service"
@@ -10991,10 +12087,25 @@ msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 msgid "The sieve port needs to be numeric."
 msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/systems/goLogDBServer.tpl:1
+#: plugins/admin/systems/class_goImapServer.inc:273
 #, fuzzy
-msgid "Logging database information"
-msgstr "Base de datos de Logs"
+msgid "Imap"
+msgstr "Importar"
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+#, fuzzy
+msgid "Imap service"
+msgstr "Servidor IMAP"
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr "Nueva contraseña"
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+#, fuzzy
+msgid "FAX database information"
+msgstr "Base de datos de FAX"
 
 #: plugins/admin/systems/class_goShareServer.inc:31
 #, fuzzy
@@ -11032,6 +12143,21 @@ msgstr "Ha fallado la eliminación del contenedor de montaje"
 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:449
+#, fuzzy
+msgid "Share service"
+msgstr "Servicio de exploración"
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+#, fuzzy
+msgid "Share entry"
+msgstr "Nueva entrada"
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "Base de datos de Logs"
+
 #: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
 "Actions you choose here influence all systems in this object group. "
@@ -11053,6 +12179,7 @@ msgid "Phone queue"
 msgstr "Cola de teléfono"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
 msgid "System"
 msgstr "Sistema"
 
@@ -11070,6 +12197,11 @@ msgid "Removing of object group/workstation with dn '%s' failed."
 msgstr ""
 "Ha fallado la eliminación de los parámetros del correo del objeto grupo"
 
+#: plugins/admin/ogroups/class_termgroup.inc:350
+#, fuzzy
+msgid "System group"
+msgstr "Estado del Sistema"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Seleccione para ver los departamentos"
@@ -11127,6 +12259,7 @@ msgid "Display objects of department"
 msgstr "Mostrar objetos de departamentos"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:759
 #: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Grupos de objetos"
@@ -11211,6 +12344,16 @@ msgstr "Ha fallado la grabación del objeto grupo"
 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:754
+#, fuzzy
+msgid "Object group generic"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+#, fuzzy
+msgid "Member"
+msgstr "Objetos miembro"
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -11237,6 +12380,7 @@ msgid "Generic queue Settings"
 msgstr "Parámetros genéricos de la cola"
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 msgid "Timeout"
 msgstr "Tiempo de espera"
 
@@ -11245,10 +12389,12 @@ msgid "Strategy"
 msgstr "Estrategia"
 
 #: plugins/admin/ogroups/phonequeue.tpl:74
+#: plugins/admin/ogroups/class_phonequeue.inc:718
 msgid "Max queue length"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:82
+#: plugins/admin/ogroups/class_phonequeue.inc:719
 msgid "Announce frequency"
 msgstr ""
 
@@ -11265,6 +12411,7 @@ msgid "Use music on hold instead of ringing"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr ""
 
@@ -11313,26 +12460,32 @@ msgid "Phone attributes "
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr ""
 
@@ -11369,6 +12522,11 @@ msgstr "Ha fallado la grabación del objeto grupo"
 msgid "Removing of object group/mail with dn '%s' failed."
 msgstr "Ha fallado la eliminación del objeto grupo"
 
+#: plugins/admin/ogroups/class_mailogroup.inc:156
+#, fuzzy
+msgid "Mail group"
+msgstr "Grupo primario"
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
 msgstr "llamar a todos"
@@ -11499,7 +12657,62 @@ msgstr ""
 #, fuzzy, php-format
 msgid "Removing of object group/phone queue with dn '%s' failed."
 msgstr ""
-"Ha fallado la eliminación de los parámetros del correo del objeto grupo"
+"Ha fallado la eliminación de los parámetros del correo del objeto grupo"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:709
+#, fuzzy
+msgid "Phone group"
+msgstr "Miembros están en un grupo de salto telefónico"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:727
+#, fuzzy
+msgid "Welcome music"
+msgstr "¡Bienvenido %s!"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+msgid "Report hold time"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+msgid "'There are' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+msgid "'Call waiting' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:732
+#, fuzzy
+msgid "'Thank you' sound"
+msgstr "Mensaje de Despedida"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:733
+#, fuzzy
+msgid "'Minutes' sound"
+msgstr "Archivo de sonido 'minutos'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:734
+#, fuzzy
+msgid "'Seconds' sound"
+msgstr "Archivo de sonido 'segundos'"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+msgid "'Less than' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:736
+#, fuzzy
+msgid "Queue phone number"
+msgstr "Número de teléfono"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:740
+#, fuzzy
+msgid "Announce"
+msgstr "Mensaje de presentación"
 
 #: plugins/admin/ogroups/class_divListOGroup.inc:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:39
@@ -11668,8 +12881,8 @@ msgstr "Gestión de listas de bloqueo"
 
 #: plugins/admin/fai/faiVariable.tpl:32
 #: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiHook.tpl:34
 #: plugins/admin/fai/class_faiProfileEntry.inc:155
 msgid "Objects"
 msgstr "Objetos"
@@ -11691,12 +12904,50 @@ msgstr "Instalación Totalmente Automática"
 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:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
+#, fuzzy
+msgid "FAI script"
+msgstr "Script de importación"
+
+#: plugins/admin/fai/class_faiScript.inc:460
+#, fuzzy
+msgid "Script priority"
+msgstr "Ruta del Script"
+
 #: plugins/admin/fai/class_faiTemplate.inc:336
 #, 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:415
+#, fuzzy
+msgid "FAI template"
+msgstr "Nueva plantilla"
+
+#: plugins/admin/fai/class_faiTemplate.inc:424
+#, fuzzy
+msgid "Template file"
+msgstr "Plantilla de paquete"
+
+#: plugins/admin/fai/class_faiTemplate.inc:425
+#, fuzzy
+msgid "Template path"
+msgstr "Nombre de la plantilla"
+
+#: plugins/admin/fai/class_faiTemplate.inc:426
+#, fuzzy
+msgid "File owner"
+msgstr "Nombre del archivo"
+
+#: plugins/admin/fai/class_faiTemplate.inc:427
+#, fuzzy
+msgid "File permissions"
+msgstr "Permisos"
+
 #: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
 msgid "FAI"
 msgstr "FAI"
 
@@ -11733,6 +12984,17 @@ msgstr "El nombre de la rama especificado no es válido."
 msgid "Specified freeze name is invalid."
 msgstr "El nombre de la rama suspendida especificada no es valido."
 
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+#, fuzzy
+msgid "Management"
+msgstr "Nombre de la maquina"
+
+#: plugins/admin/fai/class_faiManagement.inc:809
+#, fuzzy
+msgid "FAI management"
+msgstr "Gestión de listas de bloqueo"
+
 #: plugins/admin/fai/faiPackage.tpl:49
 msgid "Install method"
 msgstr "Método de instalación"
@@ -11745,7 +13007,7 @@ msgstr "Paquetes usados"
 msgid "Choosen packages"
 msgstr "Paquetes elegidos"
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:667
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:669
 msgid "Configure"
 msgstr "Configurar"
 
@@ -11867,71 +13129,108 @@ msgstr ""
 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_faiProfile.inc:289
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paquete"
+
+#: plugins/admin/fai/class_faiPackage.inc:541
+#, fuzzy
+msgid "FAI Package list"
+msgstr "Nueva lista de paquetes"
+
+#: plugins/admin/fai/class_faiPackage.inc:552
+#, fuzzy
+msgid "Install Method"
+msgstr "Método de instalación"
+
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:292
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
 msgid "Template bundle"
 msgstr "Plantilla de paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:294
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
 msgid "Script bundle"
 msgstr "Script del paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
 msgid "Variable bundle"
 msgstr "Variables del paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #: plugins/admin/fai/class_faiSummaryTab.inc:43
 msgid "Partition table"
 msgstr "Tabla de particiones"
 
-#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:389
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:389
 msgid "Please enter a valid name."
 msgstr "Por favor introduzca un nombre válido"
 
-#: plugins/admin/fai/class_faiProfile.inc:401
+#: plugins/admin/fai/class_faiProfile.inc:397
 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:420
 #: plugins/admin/fai/class_faiProfile.inc:424
-#: plugins/admin/fai/class_faiProfile.inc:428
 #, 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:432
+#, fuzzy
+msgid "Profile"
+msgstr "Perfiles"
+
+#: plugins/admin/fai/class_faiProfile.inc:433
+#, fuzzy
+msgid "FAI profile"
+msgstr "Nuevo perfil"
+
 #: plugins/admin/fai/class_faiHook.inc:392
 #, fuzzy, php-format
 msgid "Saving of FAI/hook with dn '%s' failed."
 msgstr "Ha fallado la grabación del script FAI"
 
-#: plugins/admin/fai/faiProfile.tpl:32
-msgid "FAI classes"
-msgstr "Clases FAI"
+#: plugins/admin/fai/class_faiHook.inc:474
+#, fuzzy
+msgid "Hook"
+msgstr "ok"
+
+#: plugins/admin/fai/class_faiHook.inc:475
+#, fuzzy
+msgid "FAI hook"
+msgstr "Mostrar acciones FAI"
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr "Tareas"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
@@ -11948,6 +13247,7 @@ msgid "FS type"
 msgstr "Tipo de FS"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/fai/class_faiPartitionTable.inc:499
 #: plugins/admin/fai/class_faiSummaryTab.inc:308
 msgid "Mount point"
 msgstr "Punto de montaje"
@@ -11958,6 +13258,7 @@ msgid "Size in MB"
 msgstr "Tamaño en Mb"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
 #: plugins/admin/fai/class_faiSummaryTab.inc:306
 msgid "Mount options"
 msgstr "Opciones de Montaje"
@@ -12029,7 +13330,7 @@ msgstr "Entradas en la partición"
 msgid "Add partition"
 msgstr "Añadir partición"
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiScript.tpl:36
 msgid "List of scripts"
 msgstr "Lista de scripts"
 
@@ -12042,6 +13343,7 @@ msgid "Variable attributes"
 msgstr "Atributos de las variables"
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
+#: plugins/admin/fai/class_faiVariable.inc:392
 msgid "Variable content"
 msgstr "Contenido de la Variable"
 
@@ -12057,7 +13359,7 @@ msgstr "Árbol de objetos FAI"
 msgid "Reload class and release configuration from parent object."
 msgstr ""
 
-#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/faiHook.tpl:36
 msgid "List of hook scripts"
 msgstr "Lista de scripts de acciones"
 
@@ -12078,6 +13380,41 @@ msgstr "partición(es) %s"
 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:488
+#, fuzzy
+msgid "FAI partition table"
+msgstr "Nueva tabla de particiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+#, fuzzy
+msgid "Partition type"
+msgstr "Tabla de particiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+#, fuzzy
+msgid "Partition no."
+msgstr "Paticiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+#, fuzzy
+msgid "File system type"
+msgstr "Tipo de sistema"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
+#, fuzzy
+msgid "Partition size"
+msgstr "Paticiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#, fuzzy
+msgid "File system options"
+msgstr "Ver la información de sistema"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+#, fuzzy
+msgid "Partition flags"
+msgstr "Paticiones"
+
 #: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
 msgstr "Por favor introduzca un valor para el script"
@@ -12095,10 +13432,6 @@ msgstr "Nombre de la clase"
 msgid "Hook attributes"
 msgstr "Atributos de acción"
 
-#: plugins/admin/fai/faiHookEntry.tpl:34
-msgid "Task"
-msgstr "Tareas"
-
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr ""
@@ -12179,6 +13512,11 @@ msgstr "Un nuevo nombre de clase."
 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:383
+#, fuzzy
+msgid "FAI variable"
+msgstr "Mostrar variables FAI"
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr "no se ha subido ningún archivo todavía"
@@ -12226,6 +13564,7 @@ msgid "Destination path"
 msgstr "Ruta de destino"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
 #: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
@@ -12288,10 +13627,6 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr "Paquete"
-
 #: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
@@ -12556,6 +13891,7 @@ msgid "Please enter a name for the mime type here"
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
 #: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
 #, fuzzy
 msgid "Mime group"
 msgstr "Grupo primario"
@@ -12567,7 +13903,7 @@ msgstr "Categoría de este subarbol"
 
 #: plugins/admin/mimetypes/generic.tpl:34
 #, fuzzy
-msgid "Please sepecify a description"
+msgid "Please specify a description"
 msgstr "Por favor especifique un nombre de script valido."
 
 #: plugins/admin/mimetypes/generic.tpl:66
@@ -12579,6 +13915,7 @@ msgid "Left click"
 msgstr ""
 
 #: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
 #, fuzzy
 msgid "File patterns"
 msgstr "Filtros"
@@ -12660,11 +13997,27 @@ msgstr "Ya existe una aplicación con este 'Nombre'."
 msgid "You have no permissions to create a mime type on this 'Base'."
 msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+#, fuzzy
+msgid "Mime type generic"
+msgstr "Tipo MIME"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
 #, fuzzy
 msgid "Mime types"
 msgstr "Tipo MIME"
 
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+#, fuzzy
+msgid "Left click action"
+msgstr "Crear aplicaciones"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#, fuzzy
+msgid "Embedded applications"
+msgstr "Aplicaciones Usadas"
+
 #: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
 #, fuzzy
 msgid "Manage mime types"
@@ -12683,7 +14036,7 @@ msgstr "¡No tiene permisos para eliminar esta entrada!"
 
 #: plugins/admin/mimetypes/paste_generic.tpl:24
 #, fuzzy
-msgid "Please sepecify a description for this mime type here"
+msgid "Please specify a description for this mime type here"
 msgstr "Por favor especifique un nombre de adjunto valido."
 
 #: plugins/admin/mimetypes/class_divListMimeTypes.inc:35
@@ -12882,6 +14235,36 @@ msgstr ""
 msgid "Removing of user/phone account with dn '%s' failed."
 msgstr "Eliminar cuenta Posix"
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+#, fuzzy
+msgid "Phone account settings"
+msgstr "Configuración telefónica"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#, fuzzy
+msgid "Delivery mode"
+msgstr "Metodos de envío"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+#, fuzzy
+msgid "Telephone pin"
+msgstr "Teléfono"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+msgid "Voicemail pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#, fuzzy
+msgid "Telephone number"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+#, fuzzy
+msgid "Macro settings"
+msgstr "Parámetros de correo"
+
 #: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
@@ -13032,6 +14415,20 @@ msgstr "Por favor elija una base válida."
 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
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Gestión de Asterisk PBX"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+#, fuzzy
+msgid "Macro content"
+msgstr "macro de texto"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
+
 #: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
 msgid "Argument"
@@ -13167,6 +14564,7 @@ msgid "Lifetime (in days)"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 #, fuzzy
 msgid "Preset PIN"
 msgstr "presente"
@@ -13177,6 +14575,7 @@ msgid "PIN"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 #, fuzzy
 msgid "Record conference"
 msgstr "Referencias"
@@ -13186,6 +14585,7 @@ msgid "Sound file format"
 msgstr ""
 
 #: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr ""
 
@@ -13204,15 +14604,11 @@ 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"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-#, fuzzy
-msgid "Management"
-msgstr "Nombre de la maquina"
-
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
 #, php-format
 msgid "Removing of goFonConference/generic with dn '%s' failed."
@@ -13254,6 +14650,48 @@ msgstr ""
 msgid "Saving of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#, fuzzy
+msgid "Phone conference management"
+msgstr "Mantenimiento de Departamentos"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#, fuzzy
+msgid "Conference PIN"
+msgstr "Referencias"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#, fuzzy
+msgid "Activate menu"
+msgstr "Activar mensaje de ausencia"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+msgid "Announce user activity"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#, fuzzy
+msgid "Count user"
+msgstr "Pais"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#, fuzzy
+msgid "Conference type"
+msgstr "Referencias"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#, fuzzy
+msgid "Format"
+msgstr "formateo"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+msgid "Lifetime"
+msgstr ""
+
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 #, fuzzy
 msgid "Conference management"
@@ -13301,6 +14739,9 @@ 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
 msgid "Phone reports"
 msgstr "Informes telefónicos"
 
@@ -13483,12 +14924,12 @@ msgstr ""
 "Se encontraron varios bloqueos para el objeto a bloquear. Esto no debería "
 "ser posible, eliminando referencias múltiples."
 
-#: include/functions.inc:653
+#: include/functions.inc:655
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡Ha excedido el tamaño máximo de %d entradas!"
 
-#: include/functions.inc:655
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -13497,48 +14938,48 @@ msgstr ""
 "Indique el nuevo tamaño limite a %s y enséñame este mensaje si el tamaño "
 "limite es todavía superado"
 
-#: include/functions.inc:672
+#: include/functions.inc:674
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1066 include/functions.inc:1256
+#: include/functions.inc:1068 include/functions.inc:1258
 msgid "LDAP error:"
 msgstr "Error LDAP:"
 
-#: include/functions.inc:1067
+#: include/functions.inc:1069
 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:1075
+#: include/functions.inc:1077
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1084
+#: include/functions.inc:1086
 #, 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:1088 include/functions_setup.inc:254
+#: include/functions.inc:1090 include/functions_setup.inc:254
 msgid "OK"
 msgstr "Perfecto"
 
-#: include/functions.inc:1150
+#: include/functions.inc:1152
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Continuar"
 
-#: include/functions.inc:1152
+#: include/functions.inc:1154
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Editar entrada"
 
-#: include/functions.inc:1154
+#: include/functions.inc:1156
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -13547,19 +14988,19 @@ msgstr ""
 "Va ha editar la entrada LDAP '%s' que parece estar siendo usada por '%s'. "
 "Por favor, contacte con esta persona para clarificar los procedimientos."
 
-#: include/functions.inc:1438
+#: include/functions.inc:1440
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1466
+#: include/functions.inc:1468
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1740
+#: include/functions.inc:1742
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1783
+#: include/functions.inc:1785
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Versión de desarrollo de GOsa (Rev %s)"
@@ -13705,16 +15146,16 @@ msgstr ""
 msgid "Ldap import with dn '%s' failed."
 msgstr "Ha fallado la grabación de la impresora"
 
-#: include/class_tabs.inc:182
+#: include/class_tabs.inc:183
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:297
+#: include/class_tabs.inc:298
 msgid "References"
 msgstr "Referencias"
 
-#: include/class_plugin.inc:405
+#: include/class_plugin.inc:414
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
@@ -13722,7 +15163,7 @@ msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:551
+#: include/class_plugin.inc:597
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -13730,7 +15171,7 @@ msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:585 include/class_password-methods.inc:181
+#: include/class_plugin.inc:631 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -13738,7 +15179,7 @@ msgstr ""
 "El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:619
+#: include/class_plugin.inc:665
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -13746,62 +15187,62 @@ msgstr ""
 "El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:925
+#: include/class_plugin.inc:971
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:932
+#: include/class_plugin.inc:978
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:946 include/class_plugin.inc:975
+#: include/class_plugin.inc:992 include/class_plugin.inc:1021
 #, php-format
 msgid "Handle object tagging with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:962
+#: include/class_plugin.inc:1008
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:1023 include/class_plugin.inc:1069
-#: include/class_plugin.inc:1070
+#: include/class_plugin.inc:1069 include/class_plugin.inc:1115
+#: include/class_plugin.inc:1116
 #, fuzzy, php-format
 msgid "Saving object snapshot with dn '%s' failed."
 msgstr "Ha fallado la grabación del objeto grupo"
 
-#: include/class_plugin.inc:1085 include/class_SnapShotDialog.inc:53
+#: include/class_plugin.inc:1132 include/class_SnapShotDialog.inc:53
 #, fuzzy
-msgid "You are not allowed to delete this snap shot!"
+msgid "You are not allowed to delete this snapshot!"
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: include/class_plugin.inc:1100
+#: include/class_plugin.inc:1147
 #, 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:1112
+#: include/class_plugin.inc:1159
 #, 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:1144
+#: include/class_plugin.inc:1191
 #, php-format
 msgid "Method get available snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1200
+#: include/class_plugin.inc:1247
 #, php-format
 msgid "Method get deleted snapshots with dn '%s' failed."
 msgstr ""
 
-#: include/class_plugin.inc:1264 include/class_plugin.inc:1278
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1325
 #, fuzzy, php-format
 msgid "Restore snapshot with dn '%s' failed."
 msgstr "Ha fallado la eliminación del teléfono"
@@ -13811,7 +15252,11 @@ msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
 "No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
 
-#: include/class_pluglist.inc:120
+#: include/class_pluglist.inc:53
+msgid "All objects in this category"
+msgstr ""
+
+#: include/class_pluglist.inc:131
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
@@ -13819,13 +15264,13 @@ 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:134 include/class_pluglist.inc:135
-#: include/class_pluglist.inc:234
+#: 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:142 ihtml/themes/default/framework.tpl:14
+#: include/class_pluglist.inc:153 ihtml/themes/default/framework.tpl:14
 #: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
@@ -13901,7 +15346,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Error XML en 'gosa.conf': %s en la linea %d"
 
-#: include/class_config.inc:208 html/index.php:203
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
@@ -14475,7 +15920,7 @@ msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:252
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -14580,12 +16025,12 @@ msgstr "Fecha"
 msgid "Can't paste"
 msgstr "Crear cuenta telefónica"
 
-#: include/functions_FAI.inc:358
+#: include/functions_FAI.inc:362
 #, php-format
 msgid "Error, following objects should be equal '%s' and '%s'"
 msgstr ""
 
-#: include/functions_FAI.inc:464
+#: include/functions_FAI.inc:468
 #, php-format
 msgid "Release management failed, can't save '%s'"
 msgstr ""
@@ -14595,119 +16040,133 @@ msgstr ""
 msgid "Access control"
 msgstr "Opciones de acceso"
 
-#: include/class_acl.inc:129
+#: include/class_acl.inc:145
+#, fuzzy
+msgid "All categories"
+msgstr "Añadir categoría"
+
+#: include/class_acl.inc:153
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:130
+#: include/class_acl.inc:154
 #, fuzzy
 msgid "One level"
 msgstr "Nivel de log"
 
-#: include/class_acl.inc:131 include/class_acl.inc:136
+#: include/class_acl.inc:155 include/class_acl.inc:160
 #, fuzzy
 msgid "Current object"
 msgstr "Crear nuevo objeto FAI."
 
-#: include/class_acl.inc:132
+#: include/class_acl.inc:156
 msgid "Complete subtree"
 msgstr ""
 
-#: include/class_acl.inc:133
+#: include/class_acl.inc:157
 msgid "Complete subtree (permanent)"
 msgstr ""
 
-#: include/class_acl.inc:134 include/class_acl.inc:137
+#: include/class_acl.inc:161
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: include/class_acl.inc:332
+#: include/class_acl.inc:364
 #, fuzzy
 msgid "Edit ACL"
 msgstr "Editar"
 
-#: include/class_acl.inc:333
+#: include/class_acl.inc:365
 #, fuzzy
 msgid "Delete ACL"
 msgstr "Borrar"
 
-#: include/class_acl.inc:362
+#: include/class_acl.inc:402
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: include/class_acl.inc:364
+#: include/class_acl.inc:404
 #, php-format
 msgid "Contains ACLs for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:369
+#: include/class_acl.inc:409
 #, fuzzy
 msgid "Edit categories ACLs"
 msgstr "Editar clase"
 
-#: include/class_acl.inc:370
+#: include/class_acl.inc:410
 msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/class_acl.inc:409
+#: include/class_acl.inc:449
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:453
+#: include/class_acl.inc:459
+msgid "All objects in current subtree"
+msgstr ""
+
+#: include/class_acl.inc:492 include/class_acl.inc:494
+#, fuzzy
+msgid "Show/Hide Advanced Settings"
+msgstr "Configuración telefónica avanzada"
+
+#: include/class_acl.inc:505
 #, fuzzy
 msgid "Create objects"
 msgstr "Crear nuevo objeto FAI."
 
-#: include/class_acl.inc:454
+#: include/class_acl.inc:506
 #, fuzzy
 msgid "Move objects"
 msgstr "Objetos miembro"
 
-#: include/class_acl.inc:455
+#: include/class_acl.inc:507
 #, fuzzy
 msgid "Remove objects"
 msgstr "Objetos miembro"
 
-#: include/class_acl.inc:457 include/class_acl.inc:463
+#: include/class_acl.inc:509 include/class_acl.inc:515
 msgid "Modifyable by owner"
 msgstr ""
 
-#: include/class_acl.inc:460
+#: include/class_acl.inc:512
 #, fuzzy
 msgid "Move object"
 msgstr "Objetos miembro"
 
-#: include/class_acl.inc:461
+#: include/class_acl.inc:513
 #, fuzzy
 msgid "Remove object"
 msgstr "Objetos miembro"
 
-#: include/class_acl.inc:556
+#: include/class_acl.inc:625
 #, php-format
 msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/class_acl.inc:596
+#: include/class_acl.inc:665
 #, fuzzy, php-format
 msgid "Unknown entry '%s'!"
 msgstr "estado desconocido"
 
-#: include/class_acl.inc:655
+#: include/class_acl.inc:726
 #, php-format
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:663
+#: include/class_acl.inc:734
 #, fuzzy
 msgid "Members:"
 msgstr "Objetos miembro"
 
-#: include/class_acl.inc:669
+#: include/class_acl.inc:740
 msgid "ACL is valid for all users"
 msgstr ""
 
-#: include/class_acl.inc:773
+#: include/class_acl.inc:848
 #, fuzzy, php-format
 msgid "Saving ACLs with dn '%s' failed."
 msgstr "Ha fallado la grabación del script FAI"
@@ -14813,59 +16272,59 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr "Borrar"
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Session will not be encrypted."
 msgstr "La sesion no sera encriptada."
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:339
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
-#: html/index.php:113
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 "No se puede leer la configuración de GOsa (%s/gosa.conf). Se ha abortado la "
 "operación."
 
-#: html/index.php:134
+#: html/index.php:142
 #, fuzzy, php-format
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "El directorio '%s' especificado como directorio de compilación no es "
 "accesible."
 
-#: html/index.php:215
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:224
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: html/index.php:254
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr "Por favor especifique su contraseña."
 
-#: html/index.php:261
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/index.php:285
+#: html/index.php:293
 #, fuzzy
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
 "NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
 "sistemas."
 
-#: html/index.php:337
+#: html/index.php:345
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -15202,10 +16661,6 @@ msgstr ""
 msgid "Admin DN"
 msgstr "DN del administrador"
 
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr "Nueva contraseña"
-
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -15518,8 +16973,125 @@ msgid "Reason for generating this snapshot"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Quota sizw"
-#~ msgstr "Tamaño de la Cola de correo"
+#~ msgid "phpgwAccountExpires"
+#~ msgstr "La cuenta expirará después de"
+
+#, fuzzy
+#~ msgid "phpgwAccountType"
+#~ msgstr "Cuenta"
+
+#~ msgid "Value specified as 'Ratio' is not valid."
+#~ msgstr "El valor especificado como 'relación' no es válido"
+
+#, fuzzy
+#~ msgid "mailEnabled"
+#~ msgstr "desactivado"
+
+#, fuzzy
+#~ msgid "Connectivity  account"
+#~ msgstr "Conectividad"
+
+#, fuzzy
+#~ msgid "GOsa intranet account"
+#~ msgstr "Crear cuenta de intranet"
+
+#, fuzzy
+#~ msgid "Open groupware account"
+#~ msgstr "Cuenta OpenGroupware"
+
+#~ msgid "Can't get quota information for '%s'."
+#~ msgstr "No se pueden conseguir los datos de la cuota de '%s'."
+
+#, fuzzy
+#~ msgid "Shadow last change"
+#~ msgstr "Mostrar paquetes"
+
+#, fuzzy
+#~ msgid "Device monitor"
+#~ msgstr "Nuevo monitor"
+
+#, fuzzy
+#~ msgid "Device case"
+#~ msgstr "Nombre del dispositivo"
+
+#, fuzzy
+#~ msgid "Device motherboard"
+#~ msgstr "Añadir/Editar placa base"
+
+#, fuzzy
+#~ msgid "Device soundcard"
+#~ msgstr "Nueva tarjeta de sonido"
+
+#, fuzzy
+#~ msgid "Device processor"
+#~ msgstr "Nuevo procesador"
+
+#, fuzzy
+#~ msgid "Device misc device"
+#~ msgstr "Nuevo dispositivo (otros)"
+
+#, fuzzy
+#~ msgid "Device ram"
+#~ msgstr "Nombre del dispositivo"
+
+#, fuzzy
+#~ msgid "Device hard disk drive"
+#~ msgstr "Nuevo disco duro"
+
+#, fuzzy
+#~ msgid "Device drive"
+#~ msgstr "Nombre del dispositivo"
+
+#, fuzzy
+#~ msgid "Device controler"
+#~ msgstr "Nueva controladora"
+
+#, fuzzy
+#~ msgid "Device pci device"
+#~ msgstr "Mostrar dispositivo"
+
+#, fuzzy
+#~ msgid "Saving printer membership with dn %s failed "
+#~ msgstr "Ha fallado la grabación de la impresora"
+
+#~ msgid "Error while writing printer settings"
+#~ msgstr "¡Error mientras se guardaban los parámetros de la impresora"
+
+#, fuzzy
+#~ msgid "Kernel paramenter"
+#~ msgstr "Comprobar parámetros"
+
+#, fuzzy
+#~ msgid "Max queue lenght"
+#~ msgstr "Cola de correo"
+
+#, fuzzy
+#~ msgid " Announce frequency"
+#~ msgstr "Mensaje de presentación"
+
+#, fuzzy
+#~ msgid "Day"
+#~ msgstr "día"
+
+#, fuzzy
+#~ msgid "Keyboard modell"
+#~ msgstr "Elija modelo de teclado"
+
+#, fuzzy
+#~ msgid "Keyborad variant"
+#~ msgstr "Elija variante de teclado"
+
+#, fuzzy
+#~ msgid "Valume"
+#~ msgstr "Volumen"
+
+#, fuzzy
+#~ msgid "Server indentifier"
+#~ msgstr "Identificador de servidor"
+
+#, fuzzy
+#~ msgid "User certificate PKCS12"
+#~ msgstr "Certificado estandar"
 
 #, fuzzy
 #~ msgid "Vocation message"