Fixed Translation String.

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

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 55b77c2bb4256e77a67e241bc155c3dbddadfcb7..f1d1710a838f6e632c2095ab66bd85fbe8044d6f 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -4,6 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-11-14 11:47+0100\n"
 "PO-Revision-Date: 2006-06-12 19:27GMT\n"
 "Last-Translator: Alejandro Escanero Blanco <thoth@bbvnet.com>\n"
 "Language-Team: Español\n"
@@ -35,20 +37,20 @@ msgstr "Agregados"
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: plugins/gofax/faxaccount/paste_generic.tpl:4
+#: plugins/admin/fai/faiVariable.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
-#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
-#: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
-#: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHook.tpl:4
+#: plugins/admin/fai/faiHookEntry.tpl:5
+#: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/groups/mail.tpl:7
+#: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/systems/servkolab.tpl:6 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/admin/ogroups/termgroup.tpl:6
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
@@ -70,7 +72,7 @@ msgstr "Entorno"
 #: plugins/admin/groups/class_divListGroup.inc:128
 #: plugins/admin/users/class_divListUsers.inc:166
 #: plugins/admin/ogroups/tabs_ogroups.inc:75
-#: plugins/admin/ogroups/tabs_ogroups.inc:178
+#: plugins/admin/ogroups/tabs_ogroups.inc:175
 #: plugins/admin/ogroups/class_divListOGroup.inc:146
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
@@ -89,7 +91,7 @@ msgstr "Samba"
 msgid "Netatalk"
 msgstr ""
 
-#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:140
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Conectividad"
@@ -109,15 +111,15 @@ msgstr "Fax"
 #: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:254
 #: plugins/personal/generic/generic.tpl:392
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:37
-#: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
+#: plugins/addons/addressbook/address_info.tpl:37
+#: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_divListGroup.inc:134
 #: plugins/admin/users/class_divListUsers.inc:168
 #: plugins/admin/departments/generic.tpl:63
+#: plugins/admin/systems/class_systemManagement.inc:841
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:742
 #: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
@@ -146,14 +148,14 @@ msgid "ACL"
 msgstr "ACL"
 
 #: contrib/gosa.conf:100 plugins/admin/applications/generic.tpl:73
+#: plugins/admin/systems/class_servRepository.inc:254
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:250
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:92
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:658
 msgid "Parameter"
 msgstr "Parámetro"
 
@@ -169,7 +171,7 @@ msgstr "Servicios"
 
 #: contrib/gosa.conf:119 contrib/gosa.conf:144
 #: plugins/personal/environment/environment.tpl:171
-#: plugins/admin/systems/class_systemManagement.inc:751
+#: plugins/admin/systems/class_systemManagement.inc:850
 #: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
@@ -181,13 +183,12 @@ msgstr "Impresora"
 #: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22
-#: plugins/admin/departments/headpage.tpl:20
 #: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
-#: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/admin/systems/glpiSelectUser.tpl:20
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
@@ -200,7 +201,7 @@ msgstr "Información"
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:26
+#: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:33
 msgid "Services"
 msgstr "Servicios"
 
@@ -218,12 +219,12 @@ msgstr ""
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:199 plugins/addons/ldapmanager/contentexport.tpl:16
-#: plugins/addons/ldapmanager/contentexport.tpl:29
-#: plugins/addons/ldapmanager/contentexport.tpl:44
-#: plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:199 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
+#: plugins/addons/ldapmanager/contentexport.tpl:16
+#: plugins/addons/ldapmanager/contentexport.tpl:29
+#: plugins/addons/ldapmanager/contentexport.tpl:44
 msgid "Export"
 msgstr "Exportar"
 
@@ -231,7 +232,7 @@ msgstr "Exportar"
 msgid "Excel Export"
 msgstr "Exportar en XLS"
 
-#: contrib/gosa.conf:201 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:201 plugins/personal/mail/generic.tpl:112
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
@@ -280,187 +281,95 @@ msgstr ""
 msgid "Packages"
 msgstr "Paquetes"
 
-#: contrib/gosa.conf:255
+#: contrib/gosa.conf:254
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:272 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:274
+#: contrib/gosa.conf:273
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:275
+#: contrib/gosa.conf:274
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:276
+#: contrib/gosa.conf:275
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:277
+#: contrib/gosa.conf:276
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:278
+#: contrib/gosa.conf:277
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:279
+#: contrib/gosa.conf:278
 msgid "Italian"
 msgstr "Italiano"
 
-#: contrib/gosa.conf:280
+#: contrib/gosa.conf:279
 msgid "Polish"
 msgstr "Polaco"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/godfs/class_dfsManagment.inc:11
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:29
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-msgid "This does something"
-msgstr "Esto hace algo"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
-msgid "This account has no nagios extensions."
-msgstr "Esta cuenta no tiene extensiones validas de nagios."
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
-msgid "Remove nagios account"
-msgstr "Borrar cuenta de nagios"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de nagios activas. Puede desactivarlas "
-"apretando a continuación."
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid "Create nagios account"
-msgstr "Crear cuenta de nagios"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de nagios desactivadas.Puede "
-"activarlas pulsando aqui."
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:147
-msgid "Saving nagios account failed"
-msgstr "Ha fallado al grabar la cuenta de nagios"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:167
-msgid "The required field 'NagiosAlias' is not set."
-msgstr "El campo requerido 'Alias de Nagios' no ha sido rellenado."
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:170
-msgid "The required field 'NagiosMail' is not set."
-msgstr "El campo requerido 'Correo de Nagios' no ha sido rellenado."
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:174
-#: plugins/personal/nagios/class_nagiosAccount.inc:178
-msgid "Please enter a valid email address in 'NagiosMail' field."
-msgstr ""
-"Por favor introduzca una dirección valida de correo electrónico en el campo "
-"'Cuenta Nagios'."
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:226
-msgid "Removing nagios account failed"
-msgstr "Ha fallado borrar cuenta de nagios"
-
-#: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
-#: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
-#: plugins/personal/environment/main.inc:104
+#: plugins/personal/nagios/main.inc:105 plugins/personal/mail/main.inc:105
+#: plugins/personal/posix/main.inc:111 plugins/personal/samba/main.inc:105
+#: plugins/personal/environment/main.inc:105
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/personal/generic/main.inc:159
 #: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:118
+#: plugins/personal/connectivity/main.inc:119
 #: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/class_faiManagement.inc:539
+#: plugins/admin/fai/class_faiManagement.inc:568
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 #: plugins/admin/groups/class_groupManagement.inc:326
-#: plugins/admin/users/class_userManagement.inc:623
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/applications/class_applicationManagement.inc:360
+#: plugins/admin/departments/class_departmentManagement.inc:303
 #: plugins/admin/systems/servnfs.tpl:120
-#: plugins/admin/systems/class_systemManagement.inc:476
-#: plugins/admin/systems/glpi_devices.tpl:760
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/goSpamServer.tpl:101
+#: plugins/admin/systems/goVirusServer.tpl:144
 #: plugins/admin/systems/servdnseditzone.tpl:119
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/goSpamServerRule.tpl:22
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/class_systemManagement.inc:575
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
 #: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
 #: plugins/gofon/phoneaccount/main.inc:105
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:239
 #: include/class_MultiSelectWindow.inc:78
-#: ihtml/themes/default/copyPasteDialog.tpl:14
+#: ihtml/themes/default/copyPasteDialog.tpl:13
 msgid "Save"
 msgstr "Guardar"
 
-#: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
-#: plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/nagios/main.inc:107
+#: plugins/personal/mail/mail_locals.tpl:77 plugins/personal/mail/main.inc:107
 #: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/main.inc:113 plugins/personal/netatalk/main.inc:106
+#: plugins/personal/samba/main.inc:107
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/samba/main.inc:106
+#: plugins/personal/environment/main.inc:107
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/environment/main.inc:106
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
+#: plugins/personal/generic/main.inc:161
 #: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:120
-#: plugins/personal/netatalk/main.inc:106
+#: plugins/personal/connectivity/main.inc:121
 #: plugins/gofax/blocklists/generic.tpl:87
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -469,104 +378,205 @@ msgstr "Guardar"
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/addons/godfs/class_dfsManagment.inc:249
-#: plugins/admin/fai/class_faiManagement.inc:541
-#: plugins/admin/fai/class_faiManagement.inc:546
-#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/admin/fai/class_faiManagement.inc:570
+#: plugins/admin/fai/class_faiManagement.inc:575
+#: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiVariableEntry.tpl:49 plugins/admin/fai/remove.tpl:17
-#: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiPackageNew.tpl:51
-#: plugins/admin/fai/faiNewBranch.tpl:20
+#: plugins/admin/fai/faiNewBranch.tpl:22
+#: plugins/admin/fai/faiVariableEntry.tpl:49
 #: plugins/admin/fai/faiPackageEntry.tpl:57
+#: plugins/admin/fai/faiHookEntry.tpl:71
 #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:328
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/group_objects.tpl:57
+#: plugins/admin/groups/class_groupManagement.inc:328
 #: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/application_options.tpl:13
-#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:625
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
+#: 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:627
+#: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/applications/class_applicationManagement.inc:362
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:300
-#: plugins/admin/systems/class_baseSelectDialog.inc:41
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/servnfs.tpl:121 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/departments/class_departmentManagement.inc:305
 #: plugins/admin/systems/glpi_edit_type.tpl:29
-#: plugins/admin/systems/glpi_edit_os.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
-#: plugins/admin/systems/servRepositorySetup.tpl:43
-#: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/class_systemManagement.inc:478
-#: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/SelectDeviceType.tpl:45
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/goSpamServer.tpl:103
+#: plugins/admin/systems/goVirusServer.tpl:146
+#: plugins/admin/systems/servdnseditzone.tpl:120
+#: plugins/admin/systems/glpiSelectUser.tpl:51
 #: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/goSpamServerRule.tpl:24
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/servdnseditzone.tpl:120
-#: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
+#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/glpiAttachmentPool.tpl:52
+#: plugins/admin/systems/gencd.tpl:11
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:56
 #: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/ogroups/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:269
 #: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:107
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/copyPasteDialog.tpl:15
+#: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: plugins/personal/nagios/main.inc:114 plugins/personal/mail/main.inc:114
-#: plugins/personal/posix/main.inc:120 plugins/personal/samba/main.inc:114
-#: plugins/personal/environment/main.inc:114
-#: plugins/personal/generic/main.inc:179
-#: plugins/personal/connectivity/main.inc:128
-#: plugins/personal/netatalk/main.inc:111 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
+#: plugins/personal/posix/main.inc:121 plugins/personal/netatalk/main.inc:111
+#: plugins/personal/samba/main.inc:115
+#: plugins/personal/environment/main.inc:115
+#: plugins/personal/generic/main.inc:181
+#: plugins/personal/connectivity/main.inc:129
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
-msgstr "Pulse en el botón - Editar - para cambiar la información de esta ventana"
+msgstr ""
+"Pulse en el botón - Editar - para cambiar la información de esta ventana"
 
-#: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
-#: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
+#: plugins/personal/nagios/main.inc:116 plugins/personal/mail/main.inc:116
+#: plugins/personal/posix/main.inc:123 plugins/personal/netatalk/main.inc:112
+#: plugins/personal/samba/main.inc:116
+#: plugins/personal/environment/main.inc:116
 #: plugins/personal/environment/environment.tpl:138
-#: plugins/personal/environment/main.inc:115
-#: plugins/personal/generic/main.inc:172
-#: plugins/personal/connectivity/main.inc:129
-#: plugins/personal/netatalk/main.inc:112
+#: plugins/personal/generic/main.inc:173
+#: plugins/personal/connectivity/main.inc:130
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/fai/faiPartitionTable.tpl:44
 #: plugins/admin/fai/faiVariable.tpl:45
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:52 plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/fai/faiPartitionTable.tpl:44
+#: plugins/admin/systems/glpiPrinter.tpl:73
+#: plugins/admin/systems/glpiPrinter.tpl:82 plugins/admin/systems/glpi.tpl:48
+#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
+#: plugins/admin/systems/servdns.tpl:7
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85 plugins/admin/systems/glpiPrinter.tpl:73
-#: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/glpiManufacturer.tpl:7
 #: plugins/admin/systems/servdnseditzone.tpl:31
+#: plugins/admin/systems/servservice.tpl:21
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
+#: plugins/admin/systems/printer.tpl:52
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Editar"
 
-#: plugins/personal/nagios/main.inc:124
+#: plugins/personal/nagios/main.inc:125
 msgid "Nagios settings"
 msgstr "Parámetros de Nagios"
 
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/godfs/class_dfsManagment.inc:11
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:29
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+msgid "This does something"
+msgstr "Esto hace algo"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:99
+msgid "This account has no nagios extensions."
+msgstr "Esta cuenta no tiene extensiones validas de nagios."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:108
+msgid "Remove nagios account"
+msgstr "Borrar cuenta de nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:109
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de nagios activas. Puede desactivarlas "
+"apretando a continuación."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:111
+msgid "Create nagios account"
+msgstr "Crear cuenta de nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:111
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de nagios desactivadas.Puede "
+"activarlas pulsando aqui."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:154
+msgid "Saving nagios account failed"
+msgstr "Ha fallado al grabar la cuenta de nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "El campo requerido 'Alias de Nagios' no ha sido rellenado."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:177
+msgid "The required field 'NagiosMail' is not set."
+msgstr "El campo requerido 'Correo de Nagios' no ha sido rellenado."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:181
+#: plugins/personal/nagios/class_nagiosAccount.inc:185
+msgid "Please enter a valid email address in 'NagiosMail' field."
+msgstr ""
+"Por favor introduzca una dirección valida de correo electrónico en el campo "
+"'Cuenta Nagios'."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:233
+msgid "Removing nagios account failed"
+msgstr "Ha fallado borrar cuenta de nagios"
+
 #: plugins/personal/nagios/nagios.tpl:4
 msgid "Nagios Account"
 msgstr "Cuenta Nagios"
@@ -598,8 +608,8 @@ msgstr "Opciones de Notificación de Host"
 
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/personal/generic/generic.tpl:265
-#: plugins/addons/addressbook/address_info.tpl:91
-#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
+#: plugins/addons/addressbook/address_edit.tpl:217
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Pager"
 msgstr "Paginador"
@@ -644,60 +654,84 @@ msgstr ""
 msgid "trigger all host commands"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
-#: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
-#: plugins/admin/ogroups/mail.tpl:10
-msgid "Primary address"
-msgstr "Cuenta Principal"
-
-#: plugins/personal/mail/generic.tpl:11
-#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/systems/class_systemManagement.inc:743
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/generic/references/class_reference.inc:44
-msgid "Server"
-msgstr "Servidor"
+#: plugins/personal/mail/mail_locals.tpl:7
+#: plugins/admin/groups/mail_locals.tpl:6
+msgid "Select addresses to add"
+msgstr "Seleccione dirección para añadir"
 
-#: plugins/personal/mail/generic.tpl:14
-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/mail_locals.tpl:25
+#: plugins/personal/posix/posix_groups.tpl:21
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/personal/environment/hotplugDialog.tpl:24
+#: plugins/personal/environment/selectPrinterDialog.tpl:24
+#: plugins/gofax/faxaccount/locals.tpl:19
+#: plugins/addons/addressbook/contents.tpl:58
+#: plugins/addons/godfs/contents.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:31
+#: plugins/admin/fai/faiPackageEntry.tpl:32
+#: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/mail_locals.tpl:22
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
+#: plugins/admin/systems/servRepository.tpl:36
+#: plugins/admin/systems/glpiSelectUser.tpl:27
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/glpiAttachmentPool.tpl:27
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:29
+#: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:35
+#: ihtml/themes/default/MultiSelectWindow.tpl:72
+msgid "Filters"
+msgstr "Filtros"
 
-#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
-msgid "Quota usage"
-msgstr "Uso de la Cola de Correo"
+#: plugins/personal/mail/mail_locals.tpl:35
+#, fuzzy
+msgid "Select department"
+msgstr "Seleccione para ver los departamentos"
 
-#: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
-#: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:485
-msgid "not defined"
-msgstr "sin definirse"
+#: plugins/personal/mail/mail_locals.tpl:38
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/personal/environment/selectPrinterDialog.tpl:34
+#: plugins/gofax/faxaccount/locals.tpl:29
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/mail_locals.tpl:33
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
+msgid "Choose the department the search will be based on"
+msgstr "Escoja el departamento base de la búsqueda"
 
-#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
-msgid "Quota size"
-msgstr "Tamaño de la Cola de correo"
+#: plugins/personal/mail/mail_locals.tpl:52
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:45
+msgid "Regular expression for matching addresses"
+msgstr "Expresiones regulares que concuerden con direcciones"
 
-#: plugins/personal/mail/generic.tpl:49 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/mail_locals.tpl:60
+#: plugins/admin/groups/mail_locals.tpl:52
+msgid "Display addresses of user"
+msgstr "Mostrar direcciones del usuario"
 
-#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:55
-#: plugins/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
-#: plugins/admin/systems/phonesettings.tpl:170
-#: plugins/admin/systems/phonesettings.tpl:185
-msgid "List of alternative mail addresses"
-msgstr "Lista de direcciones de correo alternativas."
+#: plugins/personal/mail/mail_locals.tpl:64
+#: plugins/admin/groups/mail_locals.tpl:55
+msgid "User name of which addresses are shown"
+msgstr "Nombre de usuario de las direcciones mostradas"
 
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
-#: plugins/personal/mail/mail_locals.tpl:41
+#: plugins/personal/mail/mail_locals.tpl:75
+#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:127
 #: plugins/personal/mail/copypaste.tpl:43
 #: plugins/personal/mail/copypaste.tpl:61
-#: plugins/personal/posix/posix_groups.tpl:79
-#: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/posix/paste_generic.tpl:61
+#: plugins/personal/posix/posix_groups.tpl:79
+#: plugins/personal/posix/paste_generic.tpl:63
+#: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/hotplugDialog.tpl:63
@@ -706,105 +740,153 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/personal/environment/environment.tpl:136
 #: plugins/personal/environment/environment.tpl:180
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/personal/connectivity/class_kolabAccount.inc:203
+#: plugins/personal/connectivity/kolab.tpl:33
+#: plugins/personal/connectivity/class_kolabAccount.inc:235
 #: plugins/gofax/blocklists/generic.tpl:68
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
-#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:41
-#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:41
+#: plugins/admin/fai/faiPackage.tpl:71 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/groups/application.tpl:27
 #: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
-#: plugins/admin/groups/class_groupMail.inc:540
-#: plugins/admin/groups/application.tpl:27
+#: plugins/admin/groups/class_groupMail.inc:558
+#: plugins/admin/groups/generic.tpl:108 plugins/admin/groups/paste_mail.tpl:30
+#: plugins/admin/groups/paste_mail.tpl:41
 #: plugins/admin/groups/group_objects.tpl:55
-#: plugins/admin/groups/generic.tpl:108
 #: plugins/admin/groups/mail_locals.tpl:66
-#: plugins/admin/groups/paste_mail.tpl:30
-#: plugins/admin/groups/paste_mail.tpl:41
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/terminal.tpl:99 plugins/admin/systems/servdns.tpl:6
-#: plugins/admin/systems/workstation.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
-#: plugins/admin/systems/glpi.tpl:100 plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
+#: plugins/admin/systems/glpi.tpl:100 plugins/admin/systems/terminal.tpl:99
 #: plugins/admin/systems/glpi_edit_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/workstation.tpl:78
+#: plugins/admin/systems/servdns.tpl:6
 #: plugins/admin/systems/workstationStartup.tpl:103
 #: plugins/admin/systems/workstationStartup.tpl:124
 #: plugins/admin/systems/workstationStartup.tpl:143
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/glpiManufacturer.tpl:6
+#: plugins/admin/systems/class_termDNS.inc:459
+#: plugins/admin/systems/class_termDNS.inc:479
+#: plugins/admin/systems/goSpamServer.tpl:36
+#: plugins/admin/systems/goSpamServer.tpl:88
 #: plugins/admin/systems/servdnseditzone.tpl:106
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
 #: plugins/admin/systems/class_servDNSeditZone.inc:486
-#: plugins/admin/systems/class_termDNS.inc:460
-#: plugins/admin/systems/class_termDNS.inc:480
-#: plugins/admin/ogroups/ogroup_objects.tpl:50
-#: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/ogroups/termgroup.tpl:23
 #: plugins/admin/ogroups/phonequeue.tpl:24
+#: plugins/admin/ogroups/generic.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:54
 #: plugins/gofon/phoneaccount/generic.tpl:13
 #: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
 msgstr "Añadir"
 
-#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
+#: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
+#: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
+#: plugins/admin/ogroups/mail.tpl:10
+msgid "Primary address"
+msgstr "Cuenta Principal"
+
+#: plugins/personal/mail/generic.tpl:11
+#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_systemManagement.inc:842
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/generic/references/class_reference.inc:44
+msgid "Server"
+msgstr "Servidor"
+
+#: plugins/personal/mail/generic.tpl:14
+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
+msgid "Quota usage"
+msgstr "Uso de la Cola de Correo"
+
+#: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:169
+#: plugins/admin/systems/class_printGeneric.inc:493
+msgid "not defined"
+msgstr "sin definirse"
+
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
+msgid "Quota size"
+msgstr "Tamaño de la Cola de correo"
+
+#: plugins/personal/mail/generic.tpl:49 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/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
+#: plugins/admin/systems/phonesettings.tpl:170
+#: plugins/admin/systems/phonesettings.tpl:185
+msgid "List of alternative mail addresses"
+msgstr "Lista de direcciones de correo alternativas."
+
+#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:131
 #: 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/paste_generic.tpl:62
+#: plugins/personal/posix/paste_generic.tpl:64
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/class_environment.inc:604
+#: plugins/personal/environment/class_environment.inc:635
 #: plugins/personal/environment/environment.tpl:137
 #: plugins/personal/environment/environment.tpl:165
 #: plugins/personal/environment/environment.tpl:181
-#: plugins/personal/connectivity/kolab.tpl:20
+#: plugins/personal/connectivity/kolab.tpl:35
 #: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiPartitionTable.tpl:45
 #: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiPartitionTable.tpl:45
 #: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/groups/mail.tpl:52
 #: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/remove.tpl:14
 #: plugins/admin/groups/generic.tpl:110 plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: 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/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/terminal.tpl:101
 #: plugins/admin/systems/glpi_edit_type.tpl:10
-#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
+#: plugins/admin/systems/workstation.tpl:80
 #: plugins/admin/systems/workstationStartup.tpl:104
 #: plugins/admin/systems/workstationStartup.tpl:125
 #: plugins/admin/systems/terminalStartup.tpl:62
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/class_termDNS.inc:473
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
 #: plugins/admin/systems/remove_glpi.tpl:14
+#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
+#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
 #: plugins/admin/systems/class_servDNSeditZone.inc:292
 #: plugins/admin/systems/class_servDNSeditZone.inc:480
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/class_termDNS.inc:474
-#: plugins/admin/ogroups/termgroup.tpl:25 plugins/admin/ogroups/generic.tpl:44
-#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/ogroups/termgroup.tpl:25
+#: plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/admin/ogroups/generic.tpl:44 plugins/admin/ogroups/remove.tpl:14
 #: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/conference/remove.tpl:14
@@ -824,7 +906,8 @@ msgid "No delivery to own mailbox"
 msgstr "No se enviara a su propia carpeta de correo"
 
 #: plugins/personal/mail/generic.tpl:75
-msgid "Select to automatically response with the vacation message defined below"
+msgid ""
+"Select to automatically response with the vacation message defined below"
 msgstr ""
 "Seleccione para responder automáticamente con el mensaje de ausencia "
 "definido aqui"
@@ -835,7 +918,8 @@ msgstr "Activar mensaje de ausencia"
 
 #: plugins/personal/mail/generic.tpl:82
 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"
+msgstr ""
+"Seleccione aquí si quiere que su correo se filtre a través de spamassassin"
 
 #: plugins/personal/mail/generic.tpl:82
 msgid "Move mails tagged with spam level greater than"
@@ -856,7 +940,7 @@ msgstr "rechazar correos mayores que"
 #: plugins/personal/mail/generic.tpl:96
 #: plugins/personal/environment/environment.tpl:45
 #: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:87
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "Mb"
@@ -865,137 +949,78 @@ msgstr "Mb"
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
-#: plugins/personal/mail/generic.tpl:119
+#: plugins/personal/mail/generic.tpl:118
 #: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr "reenviar mensajes a"
 
-#: plugins/personal/mail/generic.tpl:130
+#: plugins/personal/mail/generic.tpl:129
 #: 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:140
+#: plugins/personal/mail/generic.tpl:139
 msgid "Advanced mail options"
 msgstr "Opciones de correo avanzadas"
 
-#: plugins/personal/mail/generic.tpl:145
+#: plugins/personal/mail/generic.tpl:144
 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:146
+#: plugins/personal/mail/generic.tpl:145
 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"
+msgstr ""
+"El usuario solo esta permitido a enviar y recibir correo de forma local"
 
-#: plugins/personal/mail/generic.tpl:153
+#: plugins/personal/mail/generic.tpl:152
 msgid "Use custom sieve script"
 msgstr "Usar 'script sive' propios"
 
-#: plugins/personal/mail/generic.tpl:153
+#: plugins/personal/mail/generic.tpl:152
 msgid "disables all Mail options!"
 msgstr "¡Desactivar todas las opciones de correo!"
 
-#: plugins/personal/mail/main.inc:124
+#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
+msgid "Mail settings"
+msgstr "Parámetros de correo"
+
+#: plugins/personal/mail/main.inc:125
 msgid "User mail settings"
 msgstr "Parametros del correo de usuarios"
 
-#: plugins/personal/mail/mail_locals.tpl:6
-#: plugins/admin/groups/mail_locals.tpl:6
-msgid "Select addresses to add"
-msgstr "Seleccione dirección para añadir"
-
-#: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:21
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/personal/environment/hotplugDialog.tpl:24
-#: plugins/personal/environment/selectPrinterDialog.tpl:24
-#: plugins/gofax/faxaccount/locals.tpl:19
-#: plugins/addons/addressbook/contents.tpl:58
-#: plugins/addons/godfs/contents.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:31
-#: plugins/admin/fai/faiPackageEntry.tpl:32
-#: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/servRepository.tpl:36
-#: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiSelectUser.tpl:27
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/gofon/macro/headpage.tpl:29
-#: plugins/gofon/conference/headpage.tpl:29
-#: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:35
-#: ihtml/themes/default/MultiSelectWindow.tpl:72
-msgid "Filters"
-msgstr "Filtros"
-
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/personal/environment/selectPrinterDialog.tpl:34
-#: plugins/gofax/faxaccount/locals.tpl:29
-#: plugins/addons/addressbook/contents.tpl:80
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/mail_locals.tpl:33
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:34
-#: plugins/admin/ogroups/ogroup_objects.tpl:38
-msgid "Choose the department the search will be based on"
-msgstr "Escoja el departamento base de la búsqueda"
-
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:45
-msgid "Regular expression for matching addresses"
-msgstr "Expresiones regulares que concuerden con direcciones"
-
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:52
-msgid "Display addresses of user"
-msgstr "Mostrar direcciones del usuario"
-
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:55
-msgid "User name of which addresses are shown"
-msgstr "Nombre de usuario de las direcciones mostradas"
-
 #: plugins/personal/mail/class_mailAccount.inc:90
-#: plugins/admin/groups/class_groupMail.inc:75
+#: plugins/admin/groups/class_groupMail.inc:76
 #, php-format
 msgid "There is no mail method '%s' specified in your gosa.conf available."
 msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
 
-#: plugins/personal/mail/class_mailAccount.inc:143
-#: 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:205
+#: plugins/personal/mail/class_mailAccount.inc:212
 msgid "No DESC tag in vacation file:"
 msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
 
-#: plugins/personal/mail/class_mailAccount.inc:244
+#: plugins/personal/mail/class_mailAccount.inc:251
 msgid "This account has no mail extensions."
 msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/mail/class_mailAccount.inc:253
-#: plugins/admin/groups/class_groupMail.inc:320
+#: plugins/personal/mail/class_mailAccount.inc:261
+#: plugins/personal/mail/class_mailAccount.inc:264
+#: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:254
-#: plugins/admin/groups/class_groupMail.inc:321
+#: plugins/personal/mail/class_mailAccount.inc:262
+msgid ""
+"This account can't be removed while there are delegations configured. Remove "
+"those delegations first."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:265
+#: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -1003,14 +1028,14 @@ msgstr ""
 "Esta cuenta tiene las características de correo activas. Puede desactivarlas "
 "apretando a continuación."
 
-#: plugins/personal/mail/class_mailAccount.inc:256
-#: plugins/admin/groups/class_groupMail.inc:323
+#: plugins/personal/mail/class_mailAccount.inc:268
+#: plugins/admin/groups/class_groupMail.inc:326
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:256
-#: plugins/admin/groups/class_groupMail.inc:324
+#: plugins/personal/mail/class_mailAccount.inc:268
+#: plugins/admin/groups/class_groupMail.inc:327
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -1018,22 +1043,23 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/mail/class_mailAccount.inc:307
-msgid "You're trying to add an invalid email address to the list of forwarders."
+#: plugins/personal/mail/class_mailAccount.inc:318
+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:313
-#: plugins/admin/groups/class_groupMail.inc:383
+#: plugins/personal/mail/class_mailAccount.inc:324
+#: plugins/admin/groups/class_groupMail.inc:401
 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:351
-#: plugins/personal/mail/class_mailAccount.inc:356
-#: plugins/admin/groups/class_groupMail.inc:411
+#: plugins/personal/mail/class_mailAccount.inc:362
+#: plugins/personal/mail/class_mailAccount.inc:367
+#: plugins/admin/groups/class_groupMail.inc:429
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
@@ -1041,100 +1067,78 @@ msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "direcciones alternativas"
 
-#: plugins/personal/mail/class_mailAccount.inc:366
-#: plugins/admin/groups/class_groupMail.inc:416
+#: plugins/personal/mail/class_mailAccount.inc:377
+#: plugins/admin/groups/class_groupMail.inc:434
 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:619
+#: plugins/personal/mail/class_mailAccount.inc:646
 msgid "Removing mail account failed"
 msgstr "No se ha podido borrar la cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:723
+#: plugins/personal/mail/class_mailAccount.inc:750
 msgid "Saving mail account failed"
 msgstr "No se ha podido guardar la cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:771
-msgid "There is no valid mailserver specified, please add one in the system setup."
+#: plugins/personal/mail/class_mailAccount.inc:802
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:776
-#: plugins/admin/groups/class_groupMail.inc:803
+#: plugins/personal/mail/class_mailAccount.inc:807
+#: plugins/admin/groups/class_groupMail.inc:832
 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:780
-#: plugins/personal/mail/class_mailAccount.inc:784
-#: plugins/addons/addressbook/class_addressbook.inc:589
+#: plugins/personal/mail/class_mailAccount.inc:811
+#: plugins/personal/mail/class_mailAccount.inc:815
+#: plugins/addons/addressbook/class_addressbook.inc:598
 #: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/personal/mail/class_mailAccount.inc:790
-#: plugins/admin/groups/class_groupMail.inc:812
+#: plugins/personal/mail/class_mailAccount.inc:821
+#: plugins/admin/groups/class_groupMail.inc:841
 #: 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:796
-#: plugins/admin/groups/class_groupMail.inc:818
+#: plugins/personal/mail/class_mailAccount.inc:827
+#: plugins/admin/groups/class_groupMail.inc:847
 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:805
-#: plugins/admin/groups/class_groupMail.inc:827
+#: plugins/personal/mail/class_mailAccount.inc:836
+#: plugins/admin/groups/class_groupMail.inc:856
 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:815
-#: plugins/admin/groups/class_groupMail.inc:835
+#: plugins/personal/mail/class_mailAccount.inc:846
+#: plugins/admin/groups/class_groupMail.inc:864
 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:819
+#: plugins/personal/mail/class_mailAccount.inc:850
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:964
+#: plugins/personal/mail/class_mailAccount.inc:1004
 msgid "Waiting for kolab to remove mail properties."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:966
+#: plugins/personal/mail/class_mailAccount.inc:1006
 msgid ""
 "Please remove the mail account first, to allow kolab to call its remove "
 "methods."
 msgstr ""
 
-#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-msgid "Mail settings"
-msgstr "Parámetros de correo"
-
-#: plugins/personal/password/class_password.inc:5
-#: plugins/personal/generic/paste_generic.tpl:32
-#: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
-#: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: plugins/admin/systems/class_divListSystem.inc:173
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/default/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
-msgid "Password"
-msgstr "Contraseña"
-
 #: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_divListUsers.inc:146
-msgid "Change password"
-msgstr "Cambiar contraseña"
-
-#: plugins/personal/password/password.tpl:6
 msgid ""
 "To change your personal password use the fields below. The changes take "
 "effect immediately. Please memorize the new password, because you wouldn't "
@@ -1144,8 +1148,7 @@ msgstr ""
 "tendrán efecto inmediato. Por favor memorice la nueva contraseña, porque no "
 "podrá entrar sin ella."
 
-#: plugins/personal/password/password.tpl:10
-#: plugins/admin/users/password.tpl:6
+#: plugins/personal/password/password.tpl:6 plugins/admin/users/password.tpl:6
 msgid ""
 "Changing the password affects your authentification on mail, proxy, samba "
 "and unix services."
@@ -1153,33 +1156,33 @@ msgstr ""
 "Cambiar la contraseña modifica la autenticación del usuario para el correo, "
 "proxy, samba y los servicios unix."
 
-#: plugins/personal/password/password.tpl:15
+#: plugins/personal/password/password.tpl:11
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: plugins/personal/password/password.tpl:20
+#: plugins/personal/password/password.tpl:16
 #: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
 #: plugins/admin/systems/password.tpl:14
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: plugins/personal/password/password.tpl:25
+#: plugins/personal/password/password.tpl:21
 #: plugins/personal/generic/password.tpl:11
 #: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
 msgid "Repeat new password"
 msgstr "Repetir la nueva contraseña"
 
-#: plugins/personal/password/password.tpl:34
+#: plugins/personal/password/password.tpl:30
 #: plugins/personal/generic/password.tpl:17
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr "Poner Contraseña"
 
-#: plugins/personal/password/password.tpl:36
+#: plugins/personal/password/password.tpl:32
 msgid "Clear fields"
 msgstr "Limpiar campos"
 
-#: plugins/personal/password/changed.tpl:6
+#: plugins/personal/password/changed.tpl:3
 msgid ""
 "You've successfully changed your password. Remember to change all programms "
 "configured to use it as well."
@@ -1187,40 +1190,62 @@ msgstr ""
 "Su cambio de contraseña se ha realizado correctamente. Recuerde cambiarla en "
 "todos los programas configurados también."
 
-#: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:169
+#: plugins/personal/password/changed.tpl:9
+#: plugins/personal/generic/main.inc:170
 #: plugins/gofax/faxreports/detail.tpl:67
+#: plugins/addons/mailqueue/header.tpl:5
+#: plugins/addons/ldapmanager/contentexportxls.tpl:69
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
-#: plugins/addons/ldapmanager/contentexportxls.tpl:69
-#: plugins/admin/fai/faiNewBranch.tpl:50
-#: plugins/admin/departments/dep_iframe.tpl:19 include/functions.inc:1470
+#: plugins/admin/fai/faiNewBranch.tpl:52
+#: plugins/admin/departments/dep_iframe.tpl:19 include/functions.inc:1525
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
+#: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
 #: ihtml/themes/default/setup_step4.tpl:114
-#: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr "Atras"
 
-#: plugins/personal/password/main.inc:40
+#: plugins/personal/password/class_password.inc:5
+#: plugins/personal/generic/paste_generic.tpl:20
+#: plugins/admin/systems/class_divListSystem.inc:178
+#: 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
+#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+#: ihtml/themes/default/setup_useradmin.tpl:30
+msgid "Password"
+msgstr "Contraseña"
+
+#: plugins/personal/password/nochange.tpl:2
+msgid "Password change not allowed"
+msgstr "No se permite cambiar contraseña"
+
+#: plugins/personal/password/nochange.tpl:6
+msgid "You are not allowed to change your password at this time"
+msgstr "¡No tiene permisos para cambiar su contraseña! en este momento"
+
+#: plugins/personal/password/main.inc:38
 msgid ""
 "The password you've entered as your current password doesn't match the real "
 "one."
 msgstr "La contraseña introducida como contraseña actual no es correcta."
 
-#: plugins/personal/password/main.inc:43
+#: plugins/personal/password/main.inc:41
 msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
-#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:219
+#: plugins/personal/password/main.inc:46 plugins/personal/generic/main.inc:84
+#: plugins/admin/users/class_userManagement.inc:221
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1228,34 +1253,91 @@ 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/admin/users/class_userManagement.inc:224
+#: plugins/personal/password/main.inc:49 plugins/personal/generic/main.inc:89
+#: plugins/admin/users/class_userManagement.inc:226
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La contraseña que ingreso como 'Nueva contraseña' está vacia."
 
-#: plugins/personal/password/main.inc:59
+#: plugins/personal/password/main.inc:57
 msgid "The password used as new and current are too similar."
 msgstr "Las contraseñas antigua y nueva son demasiado parecidas."
 
-#: plugins/personal/password/main.inc:64
+#: plugins/personal/password/main.inc:62
 msgid "The password used as new is to short."
 msgstr "La nueva contraseña es demasiado corta."
 
-#: plugins/personal/password/main.inc:71
+#: plugins/personal/password/main.inc:69
 msgid "You have no permissions to change your password."
 msgstr "No tiene permisos para cambiar su contraseña."
 
-#: plugins/personal/password/main.inc:89
+#: plugins/personal/password/main.inc:87
 msgid "External password changer reported a problem: "
 msgstr "El programa externo de cambio de contraseña informo de un problema: "
 
-#: plugins/personal/password/nochange.tpl:2
-msgid "Password change not allowed"
-msgstr "No se permite cambiar contraseña"
+#: plugins/personal/password/main.inc:118
+#: plugins/admin/users/class_divListUsers.inc:146
+msgid "Change password"
+msgstr "Cambiar contraseña"
 
-#: plugins/personal/password/nochange.tpl:6
-msgid "You are not allowed to change your password at this time"
-msgstr "¡No tiene permisos para cambiar su contraseña! en este momento"
+#: plugins/personal/posix/generic.tpl:7
+#: plugins/personal/posix/paste_generic.tpl:8
+#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:658
+msgid "Home directory"
+msgstr "Directorio Principal"
+
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Shell"
+
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr "Grupo primario"
+
+#: plugins/personal/posix/generic.tpl:29
+#: plugins/gofax/faxreports/contents.tpl:32
+#: plugins/gofax/faxreports/detail.tpl:45
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:38
+#: plugins/gofon/fonreports/contents.tpl:35
+msgid "Status"
+msgstr "Estado"
+
+#: plugins/personal/posix/generic.tpl:39
+#: plugins/personal/posix/paste_generic.tpl:23
+msgid "Force UID/GID"
+msgstr "Forzar UID/GID"
+
+#: plugins/personal/posix/generic.tpl:43
+#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/generic.tpl:52
+#: plugins/personal/posix/paste_generic.tpl:37
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/generic.tpl:64
+#: plugins/personal/posix/paste_generic.tpl:49
+msgid "Group membership"
+msgstr "Miembros del grupo"
+
+#: plugins/personal/posix/generic.tpl:66
+#: plugins/personal/posix/paste_generic.tpl:56
+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
+msgid "Account"
+msgstr "Cuenta"
+
+#: plugins/personal/posix/generic.tpl:91
+msgid "System trust"
+msgstr "Autenticación del sistema"
+
+#: plugins/personal/posix/generic.tpl:92
+msgid "Trust mode"
+msgstr "Modo Autenticado"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
@@ -1271,7 +1353,8 @@ msgstr "Mostrar los grupos de departamentos"
 #: plugins/admin/users/class_divListUsers.inc:63
 #: plugins/admin/applications/class_divListApplication.inc:48
 #: plugins/admin/departments/class_divListDepartment.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:66
+#: plugins/admin/systems/class_divListSystem.inc:71
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:69
 #: plugins/gofon/macro/class_divListMacros.inc:51
 #: plugins/gofon/conference/class_divListConferences.inc:52
@@ -1300,13 +1383,18 @@ msgstr "Nombres de usuarios de los grupos que se muestran"
 
 #: plugins/personal/posix/posix_shadow.tpl:5
 msgid "User must change password on first login"
-msgstr "Los usuarios deben cambiar su contraseña en el próximo inicio de sesión"
+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
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
+#: plugins/personal/posix/paste_generic.tpl:1
+msgid "Posix settings"
+msgstr "Parámetros Posix"
+
 #: plugins/personal/posix/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr "Seleccione sistema a añadir"
@@ -1316,122 +1404,66 @@ msgid "Display systems of department"
 msgstr "Mostrar sistemas de departamentos"
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:69
+#: plugins/admin/systems/class_divListSystem.inc:74
 msgid "Display systems matching"
 msgstr "Mostrar sistemas que concuerden con"
 
-#: plugins/personal/posix/generic.tpl:7
-#: plugins/personal/posix/paste_generic.tpl:8
-#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:643
-msgid "Home directory"
-msgstr "Directorio Principal"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "Grupo primario"
-
-#: plugins/personal/posix/generic.tpl:29
-#: plugins/gofax/faxreports/detail.tpl:45
-#: plugins/gofax/faxreports/contents.tpl:32
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:38
-#: plugins/gofon/fonreports/contents.tpl:35
-msgid "Status"
-msgstr "Estado"
-
-#: plugins/personal/posix/generic.tpl:39
-#: plugins/personal/posix/paste_generic.tpl:23
-msgid "Force UID/GID"
-msgstr "Forzar UID/GID"
-
-#: plugins/personal/posix/generic.tpl:43
-#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/generic.tpl:52
-#: plugins/personal/posix/paste_generic.tpl:37
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/generic.tpl:64
-#: plugins/personal/posix/paste_generic.tpl:47
-msgid "Group membership"
-msgstr "Miembros del grupo"
-
-#: plugins/personal/posix/generic.tpl:66
-#: 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
-msgid "Account"
-msgstr "Cuenta"
-
-#: plugins/personal/posix/generic.tpl:91
-msgid "System trust"
-msgstr "Autenticación del sistema"
-
-#: plugins/personal/posix/generic.tpl:92
-msgid "Trust mode"
-msgstr "Modo Autenticado"
+#: plugins/personal/posix/main.inc:132
+msgid "Unix settings"
+msgstr "Parametros Unix"
 
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:125
+#: plugins/personal/posix/class_posixAccount.inc:131
 msgid "expired"
 msgstr "expiró"
 
-#: plugins/personal/posix/class_posixAccount.inc:127
+#: plugins/personal/posix/class_posixAccount.inc:133
 msgid "grace time active"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:130
+#: plugins/personal/posix/class_posixAccount.inc:136
 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:138
 msgid "active, password expired"
 msgstr "activo, la contraseña expiró"
 
-#: plugins/personal/posix/class_posixAccount.inc:134
+#: plugins/personal/posix/class_posixAccount.inc:140
 msgid "active"
 msgstr "activo"
 
-#: plugins/personal/posix/class_posixAccount.inc:145
-#: plugins/personal/posix/class_posixAccount.inc:973
+#: plugins/personal/posix/class_posixAccount.inc:151
+#: plugins/personal/posix/class_posixAccount.inc:998
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: plugins/personal/posix/class_posixAccount.inc:185
+#: plugins/personal/posix/class_posixAccount.inc:186
 msgid "unconfigured"
 msgstr "Desconfigurado"
 
-#: plugins/personal/posix/class_posixAccount.inc:203
-#: plugins/admin/systems/class_terminalService.inc:194
+#: plugins/personal/posix/class_posixAccount.inc:212
 #: plugins/admin/systems/class_workstationService.inc:182
-#: plugins/admin/systems/class_workstationStartup.inc:786
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
+#: plugins/admin/systems/class_workstationStartup.inc:793
+#: plugins/admin/systems/class_terminalService.inc:194
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:216
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:242
+#: plugins/personal/posix/class_posixAccount.inc:251
 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:271
+#: plugins/personal/posix/class_posixAccount.inc:274
 msgid "Remove posix account"
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:263
+#: plugins/personal/posix/class_posixAccount.inc:272
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
@@ -1439,7 +1471,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:275
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1447,11 +1479,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:278
 msgid "Create posix account"
 msgstr "Crear cuenta posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:270
+#: plugins/personal/posix/class_posixAccount.inc:279
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1459,238 +1491,299 @@ msgstr ""
 "Esta cuenta tiene la extensión posix desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/posix/class_posixAccount.inc:443
+#: plugins/personal/posix/class_posixAccount.inc:442
 #, 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"
+msgstr ""
+"La contraseñas no pueden ser cambiadas hasta %s días desde el último cambio"
 
-#: plugins/personal/posix/class_posixAccount.inc:445
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, 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:447
+#: plugins/personal/posix/class_posixAccount.inc:446
 #, 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:449
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, 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:473
-#: 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:480
+#: 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:245
 msgid "January"
 msgstr "Enero"
 
-#: plugins/personal/posix/class_posixAccount.inc:473
-#: 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:480
+#: 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:245
 msgid "February"
 msgstr "Febrero"
 
-#: plugins/personal/posix/class_posixAccount.inc:473
-#: 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:480
+#: 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:245
 msgid "March"
 msgstr "Marzo"
 
-#: plugins/personal/posix/class_posixAccount.inc:473
-#: 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:480
+#: 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:245
 msgid "April"
 msgstr "Abril"
 
-#: plugins/personal/posix/class_posixAccount.inc:474
-#: 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:481
+#: plugins/personal/samba/class_sambaAccount.inc:365
+#: plugins/personal/samba/class_sambaAccount.inc:383
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
 #: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr "Mayo"
 
-#: plugins/personal/posix/class_posixAccount.inc:474
-#: 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:481
+#: plugins/personal/samba/class_sambaAccount.inc:365
+#: plugins/personal/samba/class_sambaAccount.inc:383
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
 #: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr "Junio"
 
-#: plugins/personal/posix/class_posixAccount.inc:474
-#: 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:481
+#: plugins/personal/samba/class_sambaAccount.inc:365
+#: plugins/personal/samba/class_sambaAccount.inc:383
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
 #: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr "Julio"
 
-#: plugins/personal/posix/class_posixAccount.inc:474
-#: 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:481
+#: plugins/personal/samba/class_sambaAccount.inc:365
+#: plugins/personal/samba/class_sambaAccount.inc:383
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
 #: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr "Agosto"
 
-#: plugins/personal/posix/class_posixAccount.inc:474
-#: 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:481
+#: plugins/personal/samba/class_sambaAccount.inc:365
+#: plugins/personal/samba/class_sambaAccount.inc:383
+#: plugins/personal/samba/class_sambaAccount.inc:401
+#: plugins/personal/samba/class_sambaAccount.inc:419
 #: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr "Septiembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:475
-#: 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:482
+#: plugins/personal/samba/class_sambaAccount.inc:366
+#: plugins/personal/samba/class_sambaAccount.inc:384
+#: plugins/personal/samba/class_sambaAccount.inc:402
+#: plugins/personal/samba/class_sambaAccount.inc:420
 #: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr "Octubre"
 
-#: plugins/personal/posix/class_posixAccount.inc:475
-#: 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:482
+#: plugins/personal/samba/class_sambaAccount.inc:366
+#: plugins/personal/samba/class_sambaAccount.inc:384
+#: plugins/personal/samba/class_sambaAccount.inc:402
+#: plugins/personal/samba/class_sambaAccount.inc:420
 #: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr "Noviembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:475
-#: 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:482
+#: plugins/personal/samba/class_sambaAccount.inc:366
+#: plugins/personal/samba/class_sambaAccount.inc:384
+#: plugins/personal/samba/class_sambaAccount.inc:402
+#: plugins/personal/samba/class_sambaAccount.inc:420
 #: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr "Diciembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:557
-#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/personal/posix/class_posixAccount.inc:564
+#: plugins/personal/samba/class_sambaAccount.inc:462
 #: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/personal/posix/class_posixAccount.inc:557
+#: plugins/personal/posix/class_posixAccount.inc:564
 msgid "full access"
 msgstr "Acceso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:558
+#: plugins/personal/posix/class_posixAccount.inc:565
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/personal/posix/class_posixAccount.inc:604
+#: plugins/personal/posix/class_posixAccount.inc:611
 msgid "Removing UNIX account failed"
 msgstr "Ha fallado  al borrar la cuenta unix"
 
-#: plugins/personal/posix/class_posixAccount.inc:737
+#: plugins/personal/posix/class_posixAccount.inc:760
 msgid "Failed: overriding lock"
 msgstr "Fallo: Sobrepasado bloqueo"
 
-#: plugins/personal/posix/class_posixAccount.inc:826
+#: plugins/personal/posix/class_posixAccount.inc:849
 msgid "Saving UNIX account failed"
 msgstr "Ha fallado  al grabar la cuenta unix"
 
-#: plugins/personal/posix/class_posixAccount.inc:887
+#: plugins/personal/posix/class_posixAccount.inc:912
 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:890
+#: plugins/personal/posix/class_posixAccount.inc:915
 msgid "Please enter a valid path in 'Home directory' field."
-msgstr "Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
+msgstr ""
+"Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
 
-#: plugins/personal/posix/class_posixAccount.inc:898
+#: plugins/personal/posix/class_posixAccount.inc:923
 msgid "Value specified as 'UID' is not valid."
 msgstr "El valor especificado en 'UID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:901
+#: plugins/personal/posix/class_posixAccount.inc:926
 msgid "Value specified as 'UID' is too small."
 msgstr "El valor especificado como 'UID' es demasiado pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:905
-#: plugins/admin/groups/class_groupGeneric.inc:774
+#: plugins/personal/posix/class_posixAccount.inc:930
+#: plugins/admin/groups/class_groupGeneric.inc:785
 msgid "Value specified as 'GID' is not valid."
 msgstr "El valor especificado como 'GID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:908
-#: plugins/admin/groups/class_groupGeneric.inc:777
+#: plugins/personal/posix/class_posixAccount.inc:933
+#: plugins/admin/groups/class_groupGeneric.inc:788
 msgid "Value specified as 'GID' is too small."
 msgstr "El valor especificado como 'GID' es muy pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:916
+#: plugins/personal/posix/class_posixAccount.inc:941
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "El valor especificado en 'shadowMin' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:921
+#: plugins/personal/posix/class_posixAccount.inc:946
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "El valor especificado en 'shadowMax' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:926
+#: plugins/personal/posix/class_posixAccount.inc:951
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "El valor especificado en 'shadowWarning' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:929
+#: plugins/personal/posix/class_posixAccount.inc:954
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:932
+#: plugins/personal/posix/class_posixAccount.inc:957
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
-msgstr "El valor especificado como 'shadowWarning' debería ser menor que 'shadowMax'."
+msgstr ""
+"El valor especificado como 'shadowWarning' debería ser menor que 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:935
+#: plugins/personal/posix/class_posixAccount.inc:960
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
-msgstr "El valor especificado como 'shadowWarning' debería ser mayor que 'shadowMin'."
+msgstr ""
+"El valor especificado como 'shadowWarning' debería ser mayor que 'shadowMin'."
 
-#: plugins/personal/posix/class_posixAccount.inc:940
+#: plugins/personal/posix/class_posixAccount.inc:965
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "El valor especificado en 'shadowInactive' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:943
+#: plugins/personal/posix/class_posixAccount.inc:968
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "'shadowInactive' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:948
+#: plugins/personal/posix/class_posixAccount.inc:973
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
-msgstr "El valor especificado como 'shadowMin' debería ser menor que 'shadowMax'."
+msgstr ""
+"El valor especificado como 'shadowMin' debería ser menor que 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:1075
-#: plugins/admin/groups/class_groupGeneric.inc:813
+#: plugins/personal/posix/class_posixAccount.inc:1103
+#: plugins/admin/groups/class_groupGeneric.inc:824
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Parametros Unix"
+#: plugins/personal/netatalk/netatalk.tpl:4
+msgid "Share"
+msgstr "Compartido"
 
-#: plugins/personal/posix/paste_generic.tpl:4
-msgid "Posix settings"
-msgstr "Parámetros Posix"
+#: plugins/personal/netatalk/netatalk.tpl:14
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
+#: plugins/personal/netatalk/main.inc:104
+#: plugins/addons/godfs/class_dfsManagment.inc:247
+#: ihtml/themes/default/copyPasteDialog.tpl:22
+msgid "Finish"
+msgstr "Terminar"
+
+#: plugins/personal/netatalk/main.inc:121
+msgid "Netatalk settings"
+msgstr "Parámetros de Netatalk"
+
+#: plugins/personal/netatalk/class_netatalk.inc:37
+msgid "Manage netatalk account"
+msgstr "Gestionar cuenta Netatalk"
+
+#: plugins/personal/netatalk/class_netatalk.inc:167
+msgid "This account has no netatalk extensions."
+msgstr "Esta cuenta no tiene extensiones Netatalk"
+
+#: plugins/personal/netatalk/class_netatalk.inc:176
+msgid "Remove netatalk account"
+msgstr "Borrar cuenta Netatalk"
+
+#: plugins/personal/netatalk/class_netatalk.inc:177
+msgid ""
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características Netatalk activas. Puede desactivarlas "
+"pulsando a continuación."
+
+#: plugins/personal/netatalk/class_netatalk.inc:188
+#: plugins/personal/netatalk/class_netatalk.inc:191
+msgid "Create netatalk account"
+msgstr "Crear cuenta Netatalk"
+
+#: plugins/personal/netatalk/class_netatalk.inc:189
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características Netatalk desactivadas.Puede activarlas "
+"pulsando aqui."
+
+#: plugins/personal/netatalk/class_netatalk.inc:221
+msgid "You must select a share to use."
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:280
+msgid "Saving Netatalk account failed"
+msgstr "Ha fallado la grabación de la cuenta Netatalk"
+
+#: plugins/personal/netatalk/class_netatalk.inc:340
+msgid "Removing Netatalk account failed"
+msgstr "Ha fallado la eliminación de la cuenta Netatalk"
 
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
@@ -1702,7 +1795,7 @@ 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/class_sambaAccount.inc:659
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
@@ -1751,17 +1844,17 @@ 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/class_sambaAccount.inc:666
 msgid "Connection"
 msgstr "Conexión"
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:652
+#: plugins/personal/samba/class_sambaAccount.inc:667
 msgid "Disconnection"
 msgstr "Desconexión"
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:653
+#: plugins/personal/samba/class_sambaAccount.inc:668
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -1818,6 +1911,10 @@ msgstr "La cuenta expirará después de"
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
+#: plugins/personal/samba/main.inc:124
+msgid "Samba settings"
+msgstr "Parametros de samba"
+
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selecciones estaciones de trabajo para añadir"
@@ -1826,19 +1923,15 @@ msgstr "Selecciones estaciones de trabajo para añadir"
 msgid "Display workstations of department"
 msgstr "Mostrar estaciones de trabajo de departamentos"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Parametros de samba"
-
-#: plugins/personal/samba/class_sambaAccount.inc:198
+#: plugins/personal/samba/class_sambaAccount.inc:205
 msgid "This account has no samba extensions."
 msgstr "Esta cuenta no tiene extensión samba valida."
 
-#: plugins/personal/samba/class_sambaAccount.inc:207
+#: plugins/personal/samba/class_sambaAccount.inc:214
 msgid "Remove samba account"
 msgstr "Eliminar cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:208
+#: plugins/personal/samba/class_sambaAccount.inc:215
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1846,12 +1939,12 @@ msgstr ""
 "Esta cuenta tiene la extensión samba activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:218
-#: plugins/personal/samba/class_sambaAccount.inc:221
+#: plugins/personal/samba/class_sambaAccount.inc:225
+#: plugins/personal/samba/class_sambaAccount.inc:228
 msgid "Create samba account"
 msgstr "Crear cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:219
+#: plugins/personal/samba/class_sambaAccount.inc:226
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -1859,7 +1952,7 @@ msgstr ""
 "Esta cuenta tiene la extensión samba desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:222
+#: plugins/personal/samba/class_sambaAccount.inc:229
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1868,55 +1961,56 @@ 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:463
 msgid "input on, notify on"
 msgstr "Activación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:464
 msgid "input on, notify off"
 msgstr "Activación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:458
+#: plugins/personal/samba/class_sambaAccount.inc:465
 msgid "input off, notify on"
 msgstr "Desactivación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:466
 msgid "input off, nofify off"
 msgstr "Desactivación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:461
+#: plugins/personal/samba/class_sambaAccount.inc:468
 msgid "disconnect"
 msgstr "desconectar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:469
 msgid "reset"
 msgstr "Borrar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:464
+#: plugins/personal/samba/class_sambaAccount.inc:471
 msgid "from any client"
 msgstr "Desde cualquier cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:472
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:627
+#: plugins/personal/samba/class_sambaAccount.inc:642
 msgid "Removing Samba account failed"
 msgstr "Ha fallado al eliminar la cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:646
+#: plugins/personal/samba/class_sambaAccount.inc:661
 #, 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:671
 #, php-format
-msgid "The timeout property '%s' is checked and contains invalid or no characters!"
+msgid ""
+"The timeout property '%s' is checked and contains invalid or no characters!"
 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:677
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1924,7 +2018,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:861
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1932,7 +2026,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:885
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1940,27 +2034,43 @@ 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:989
 msgid "Saving Samba account failed"
 msgstr ""
 
-#: plugins/personal/environment/class_hotplugDialog.inc:113
+#: plugins/personal/environment/main.inc:125
+msgid "User environment settings"
+msgstr "Parámetros de estado de usuarios"
+
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Por favor especifique un nombre  valido: Solo se permiten 0-9 a-Z."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:116
+#: plugins/personal/environment/class_hotplugDialog.inc:130
 msgid "Invalid character in description. Please specify a valid description."
-msgstr "Caracteres no validos en la descripción, por favor especifique una descripción valida."
+msgstr ""
+"Caracteres no validos en la descripción, por favor especifique una "
+"descripción valida."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:119
+#: plugins/personal/environment/class_hotplugDialog.inc:134
 msgid "Please specify a valid id."
 msgstr "Por favor especifique un id valido."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:125
+#: plugins/personal/environment/class_hotplugDialog.inc:137
+#, fuzzy
+msgid "Please specify a valid vendor id. (2 byte hex like '0xFFFF')"
+msgstr "Por favor especifique un valor para el atributo 'fichero'."
+
+#: plugins/personal/environment/class_hotplugDialog.inc:140
+#, fuzzy
+msgid "Please specify a valid product id. (2 byte hex like '0xFFFF')"
+msgstr "Por favor especifique un nombre de archivo PPD valido."
+
+#: plugins/personal/environment/class_hotplugDialog.inc:145
 msgid "An Entry with this name already exists."
 msgstr "Ya existe una entrada con este 'Nombre'."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:130
+#: plugins/personal/environment/class_hotplugDialog.inc:150
 msgid "Please select an entry or press cancel."
 msgstr "¡Por favor seleccione una entrada o presione cancelar."
 
@@ -1997,124 +2107,123 @@ msgstr "Mostrar usuarios que concuerden con"
 
 #: plugins/personal/environment/hotplugDialog.tpl:48
 msgid "Regular expression for        matching hotplugs"
-msgstr "Expresiones regulares que concuerden con dispositivos de conexión en caliente (HotPlug)"
+msgstr ""
+"Expresiones regulares que concuerden con dispositivos de conexión en "
+"caliente (HotPlug)"
 
-#: plugins/personal/environment/class_environment.inc:185
+#: plugins/personal/environment/class_environment.inc:187
 msgid "auto"
 msgstr "automático"
 
-#: plugins/personal/environment/class_environment.inc:207
-#: plugins/admin/systems/class_terminalService.inc:95
+#: plugins/personal/environment/class_environment.inc:209
 #: plugins/admin/systems/class_workstationService.inc:88
+#: plugins/admin/systems/class_terminalService.inc:95
 #, php-format
 msgid ""
 "You have specified an external resolution hook which can't be read, please "
 "check the permission of the file '%s'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:284
-#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:337
 msgid "Remove environment extension"
 msgstr "Eliminar extensión de estado"
 
-#: plugins/personal/environment/class_environment.inc:285
-#: plugins/personal/environment/class_environment.inc:322
+#: plugins/personal/environment/class_environment.inc:302
+#: plugins/personal/environment/class_environment.inc:338
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
-"La extensión de estado está activada. Puede desactivarla pulsando "
-"aquí."
+"La extensión de estado está activada. Puede desactivarla pulsando aquí."
 
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
-#: plugins/personal/environment/class_environment.inc:327
-#: plugins/personal/environment/class_environment.inc:332
+#: plugins/personal/environment/class_environment.inc:311
+#: plugins/personal/environment/class_environment.inc:316
+#: plugins/personal/environment/class_environment.inc:343
+#: plugins/personal/environment/class_environment.inc:348
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:295
-#: plugins/personal/environment/class_environment.inc:328
+#: plugins/personal/environment/class_environment.inc:312
+#: plugins/personal/environment/class_environment.inc:344
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
-"La extensión de estado está desactivada. Puede activarla pulsando "
-"aquí."
+"La extensión de estado está desactivada. Puede activarla pulsando aquí."
 
-#: plugins/personal/environment/class_environment.inc:300
-#: plugins/personal/environment/class_environment.inc:333
+#: plugins/personal/environment/class_environment.inc:317
+#: plugins/personal/environment/class_environment.inc:349
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
-msgstr "La extensión de estado está desactivada. Debe crear una cuenta Posix antes de poder activarla."
+msgstr ""
+"La extensión de estado está desactivada. Debe crear una cuenta Posix antes "
+"de poder activarla."
 
-#: plugins/personal/environment/class_environment.inc:448
-#: plugins/personal/environment/class_environment.inc:751
+#: plugins/personal/environment/class_environment.inc:464
+#: plugins/personal/environment/class_environment.inc:782
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
 msgstr "Ninguno"
 
-#: plugins/personal/environment/class_environment.inc:531
-#: plugins/personal/environment/class_environment.inc:542
-#: plugins/admin/systems/class_terminalStartup.inc:187
-#: plugins/admin/systems/class_workstationStartup.inc:610
+#: plugins/personal/environment/class_environment.inc:547
+#: plugins/personal/environment/class_environment.inc:560
+#: plugins/admin/systems/class_workstationStartup.inc:611
+#: plugins/admin/systems/class_terminalStartup.inc:201
 msgid "You must specify a valid mount point."
 msgstr "Por favor especifique un punto de montaje válido."
 
-#: plugins/personal/environment/class_environment.inc:591
-#: plugins/personal/environment/class_environment.inc:592
-#: plugins/personal/environment/class_environment.inc:600
-#: plugins/personal/environment/class_environment.inc:601
+#: plugins/personal/environment/class_environment.inc:549
+#, fuzzy
+msgid "Spaces are not allowed in the mount path!"
+msgstr "¡No tiene permisos para cambiar su contraseña!"
+
+#: plugins/personal/environment/class_environment.inc:622
+#: plugins/personal/environment/class_environment.inc:623
+#: plugins/personal/environment/class_environment.inc:631
+#: plugins/personal/environment/class_environment.inc:632
 msgid "Reset password hash"
 msgstr "Reiniciar hash de la contraseña"
 
-#: plugins/personal/environment/class_environment.inc:605
+#: plugins/personal/environment/class_environment.inc:636
 msgid "Delete share entry"
 msgstr "Eliminar entrada compartida"
 
-#: plugins/personal/environment/class_environment.inc:754
+#: plugins/personal/environment/class_environment.inc:785
 #, php-format
 msgid ""
 "The selected kiosk profile '%s' is no longer available, setting current "
 "profile to 'none'."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:806
+#: plugins/personal/environment/class_environment.inc:836
 msgid "Removing environment information failed"
 msgstr "Ha fallado al eliminar la extensión de estado"
 
-#: plugins/personal/environment/class_environment.inc:859
+#: plugins/personal/environment/class_environment.inc:890
 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:866
+#: plugins/personal/environment/class_environment.inc:897
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:904
+#: plugins/personal/environment/class_environment.inc:935
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:998
-msgid "Error while writing printer"
-msgstr "¡Error mientras se guardaba la impresora"
-
-#: plugins/personal/environment/class_environment.inc:1068
-msgid "Error while writing printer settings"
-msgstr "¡Error mientras se guardaban los parámetros de la impresora"
-
-#: plugins/personal/environment/class_environment.inc:1137
+#: plugins/personal/environment/class_environment.inc:1084
 msgid "Adding environment information failed"
 msgstr "Ha fallado al añadir la información de estado"
 
-#: plugins/personal/environment/class_environment.inc:1150
+#: plugins/personal/environment/class_environment.inc:1097
 msgid "group share"
 msgstr "grupos compartidos"
 
-#: plugins/personal/environment/class_environment.inc:1182
+#: plugins/personal/environment/class_environment.inc:1129
 msgid "Administrator"
 msgstr "Administrador"
 
-#: plugins/personal/environment/class_environment.inc:1187
+#: plugins/personal/environment/class_environment.inc:1134
 msgid "Default printer"
 msgstr "Impresora por defecto"
 
@@ -2193,9 +2302,9 @@ msgid "Resolution"
 msgstr "Resolución"
 
 #: plugins/personal/environment/environment.tpl:106
-#: plugins/admin/systems/servservice.tpl:11
 #: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
+#: plugins/admin/systems/servservice.tpl:11
 msgid "Shares"
 msgstr "Recursos compartidos"
 
@@ -2216,17 +2325,19 @@ msgstr "Punto de montaje"
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:206
+#: plugins/personal/connectivity/class_kolabAccount.inc:238
 #: plugins/admin/fai/faiPackage.tpl:72
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
-#: plugins/admin/groups/class_groupMail.inc:544
-#: plugins/admin/applications/class_applicationParameters.inc:100
-#: plugins/admin/systems/printer.tpl:53 plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:279
+#: plugins/admin/groups/class_groupMail.inc:562
+#: plugins/admin/applications/class_applicationParameters.inc:106
 #: plugins/admin/systems/glpiPrinter.tpl:122
+#: plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/workstationStartup.tpl:144
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
+#: plugins/admin/systems/goSpamServer.tpl:37
+#: plugins/admin/systems/printer.tpl:53
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
 #: ihtml/themes/altlinux/islocked.tpl:13
 msgid "Remove"
 msgstr "Eliminar"
@@ -2271,15 +2382,15 @@ msgstr "Cambio de administrador"
 msgid "Toggle default"
 msgstr "Cambio por defecto"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:97
-msgid "Specified name is invalid."
-msgstr "El nombre especificado no es válido"
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
+msgid "Specified name should only consist of uper-/lowercase characters."
+msgstr ""
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:101
+#: plugins/personal/environment/class_logonManagementDialog.inc:104
 msgid "Please specify a valid script name."
 msgstr "Por favor especifique un nombre de script valido."
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:105
+#: plugins/personal/environment/class_logonManagementDialog.inc:108
 msgid "Specified description contains invalid characters."
 msgstr "La descripción especificada contiene caracteres no validos!"
 
@@ -2294,22 +2405,22 @@ 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/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
 #: 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/faiHookEntry.tpl:17
-#: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
+#: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
+#: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/faiTemplateEntry.tpl:11
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/server.tpl:10
-#: plugins/admin/systems/phone.tpl:30 plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/component.tpl:30 plugins/admin/systems/phone.tpl:30
+#: plugins/admin/systems/printer.tpl:13
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:41
 #: plugins/gofon/conference/generic.tpl:56
@@ -2342,44 +2453,47 @@ msgstr ""
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
 #: plugins/admin/fai/faiProfileEntry.tpl:70
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiNewBranch.tpl:21
 #: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiNewBranch.tpl:19
-#: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/groups/mail_admins.tpl:37
 #: plugins/admin/groups/application_options.tpl:11
-#: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
 msgid "Apply"
 msgstr "Aplicar"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:67
-#: plugins/personal/environment/class_kioskManagementDialog.inc:85
+#: plugins/personal/environment/class_kioskManagementDialog.inc:75
+#: plugins/personal/environment/class_kioskManagementDialog.inc:94
 #, php-format
 msgid "Can't delete '%s'. Error was: permission denied."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:70
-#: plugins/personal/environment/class_kioskManagementDialog.inc:88
+#: plugins/personal/environment/class_kioskManagementDialog.inc:78
+#: plugins/personal/environment/class_kioskManagementDialog.inc:97
 #, php-format
 msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:130
-msgid "There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+#: plugins/personal/environment/class_kioskManagementDialog.inc:139
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:136
+#: plugins/personal/environment/class_kioskManagementDialog.inc:145
 #, php-format
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
 msgid "Create new hotplug entry"
-msgstr "Crear una nueva entrada en dispositivos de conexión en caliente (HotPlug)"
+msgstr ""
+"Crear una nueva entrada en dispositivos de conexión en caliente (HotPlug)"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:8
 msgid "Create new hotplug device"
@@ -2391,8 +2505,32 @@ msgid "Device name"
 msgstr "Nombre del dispositivo"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
-msgid "Device ID"
-msgstr "Identificador de dispositivo"
+#: plugins/admin/systems/glpi_devices.tpl:76
+msgid "Serial number"
+msgstr "Número de serie"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:28
+#, fuzzy
+msgid "(iSerial)"
+msgstr "Serie"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:36
+#, fuzzy
+msgid "Vendor-ID"
+msgstr "ID del Remitente"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:36
+#, fuzzy
+msgid "(idVendor)"
+msgstr "ID del Remitente"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product-ID"
+msgstr ""
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "(idProduct)"
+msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
@@ -2407,48 +2545,184 @@ msgstr "Visualizar"
 
 #: plugins/personal/environment/kioskManagement.tpl:25
 #: plugins/admin/fai/class_faiSummaryTab.inc:219
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #: plugins/admin/systems/glpi_edit_type.tpl:15
-#: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #: plugins/admin/systems/glpiManufacturer.tpl:13
+#: plugins/admin/systems/glpi_edit_os.tpl:15
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: include/class_MultiSelectWindow.inc:79
 msgid "Close"
 msgstr "Cerrar"
 
-#: plugins/personal/environment/main.inc:124
-msgid "User environment settings"
-msgstr "Parámetros de estado de usuarios"
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
+msgstr "mujer"
 
-#: plugins/personal/generic/password.tpl:2
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
+msgstr "hombre"
+
+#: plugins/personal/generic/class_user.inc:272
+msgid "This account has no valid GOsa extensions."
+msgstr "Esta cuenta no tiene extensiones GOsa validas"
+
+#: plugins/personal/generic/class_user.inc:326
+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
+msgid "Please enter a valid serial number"
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/personal/generic/class_user.inc:462
 msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
+"(Some types of certificates are currently not supported and may be displayed "
+"as 'invalid'.)"
 msgstr ""
-"Ha cambiado el método en que su clave es guardada en la base de datos LDAP. "
-"Por esa razón tiene que volver a reintroducir su contraseña de nuevo. Gosa "
-"codificara esta con el nuevo método seleccionado."
 
-#: plugins/personal/generic/generic_picture.tpl:5
-#: plugins/personal/generic/generic_picture.tpl:15
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
-#: plugins/personal/generic/paste_generic.tpl:50
-msgid "Personal picture"
-msgstr "Foto Personal"
+#: plugins/personal/generic/class_user.inc:472
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr ""
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
-msgstr "Eliminar foto"
+#: plugins/personal/generic/class_user.inc:475
+msgid "valid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:476
+msgid "invalid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:480
+msgid "No certificate installed"
+msgstr "No hay certificados instalados"
+
+#: plugins/personal/generic/class_user.inc:563
+msgid "Removing generic user account failed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:852
+msgid "Saving generic user account failed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:899
+msgid "Kerberos database communication failed"
+msgstr "La comunicación con la base de datos Kerberos ha fallado"
+
+#: plugins/personal/generic/class_user.inc:916
+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:927
+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:971
+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:976
+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:982
+#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/admin/users/class_userManagement.inc:519
+msgid "The required field 'Name' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:991
+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:997
+#: plugins/addons/addressbook/class_addressbook.inc:559
+#: plugins/admin/users/class_userManagement.inc:522
+msgid "The required field 'Given name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:1000
+msgid "The required field 'Login' is not set."
+msgstr " El campo requerido 'Login' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:1007
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
+"base de datos."
+
+#: plugins/personal/generic/class_user.inc:1014
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
+"guiones están permitidos."
+
+#: plugins/personal/generic/class_user.inc:1017
+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:1020
+#: plugins/personal/generic/class_user.inc:1045
+#: plugins/addons/addressbook/class_addressbook.inc:565
+#: plugins/addons/addressbook/class_addressbook.inc:593
+#: plugins/admin/departments/class_departmentGeneric.inc:244
+msgid "The field 'Name' contains invalid characters."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
+
+#: plugins/personal/generic/class_user.inc:1023
+#: plugins/personal/generic/class_user.inc:1042
+#: plugins/addons/addressbook/class_addressbook.inc:568
+#: plugins/addons/addressbook/class_addressbook.inc:590
+msgid "The field 'Given name' contains invalid characters."
+msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
+
+#: plugins/personal/generic/class_user.inc:1028
+#: plugins/addons/addressbook/class_addressbook.inc:573
+#: plugins/addons/addressbook/class_addressbook.inc:576
+#: plugins/admin/departments/class_departmentGeneric.inc:247
+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:1031
+#: plugins/addons/addressbook/class_addressbook.inc:579
+#: plugins/admin/departments/class_departmentGeneric.inc:250
+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:1034
+#: plugins/addons/addressbook/class_addressbook.inc:582
+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:1037
+#: plugins/addons/addressbook/class_addressbook.inc:585
+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:1164
+msgid "Could not open specified certificate!"
+msgstr "¡No puedo abrir el certificado especificado!"
 
 #: 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_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
+#: plugins/personal/generic/paste_generic.tpl:37
+msgid "Personal picture"
+msgstr "Foto Personal"
+
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
@@ -2456,7 +2730,7 @@ msgstr "Cambiar foto"
 
 #: plugins/personal/generic/generic.tpl:43
 #: plugins/personal/generic/paste_generic.tpl:7
-#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/addons/addressbook/address_edit.tpl:30
 #: plugins/admin/users/template.tpl:23
 msgid "Last name"
 msgstr "Apellidos"
@@ -2467,7 +2741,7 @@ msgstr "Nombre de la plantilla"
 
 #: plugins/personal/generic/generic.tpl:55
 #: plugins/personal/generic/paste_generic.tpl:11
-#: plugins/addons/addressbook/address_edit.tpl:30
+#: plugins/addons/addressbook/address_edit.tpl:33
 #: plugins/admin/users/template.tpl:27
 msgid "First name"
 msgstr "Nombre"
@@ -2479,8 +2753,8 @@ msgid "Login"
 msgstr "Inicio de sesión"
 
 #: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_info.tpl:22
 #: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Título Personal"
 
@@ -2511,23 +2785,23 @@ msgstr "Lenguaje preferido"
 #: plugins/gofax/blocklists/generic.tpl:14
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:88
 #: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/fai/class_divListFai.inc:149
-#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/fai/class_divListFai.inc:161
 #: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/groups/generic.tpl:21
 #: plugins/admin/users/class_divListUsers.inc:107
 #: plugins/admin/applications/generic.tpl:32
 #: plugins/admin/applications/class_divListApplication.inc:104
 #: plugins/admin/departments/generic.tpl:27
 #: plugins/admin/departments/class_divListDepartment.inc:76
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/class_divListSystem.inc:112
+#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
 #: plugins/admin/systems/servservice.tpl:61
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:14
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:17
 #: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_divListSystem.inc:107
 #: plugins/admin/ogroups/generic.tpl:21
 #: plugins/admin/ogroups/class_divListOGroup.inc:111
 #: plugins/gofon/macro/generic.tpl:20
@@ -2550,14 +2824,14 @@ msgstr "Elija el subárbol donde colocar el usuario"
 #: plugins/admin/applications/generic.tpl:41
 #: plugins/admin/departments/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:36
-#: plugins/admin/systems/component.tpl:19
-#: plugins/admin/systems/component.tpl:21 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/terminal.tpl:23
-#: plugins/admin/systems/terminal.tpl:25 plugins/admin/systems/printer.tpl:26
-#: plugins/admin/systems/printer.tpl:28
+#: 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/workstation.tpl:29
 #: plugins/admin/systems/workstation.tpl:31
+#: plugins/admin/systems/component.tpl:19
+#: plugins/admin/systems/component.tpl:21 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/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:27 plugins/admin/ogroups/generic.tpl:29
 #: plugins/gofon/macro/generic.tpl:27 plugins/gofon/macro/generic.tpl:29
@@ -2568,10 +2842,10 @@ msgstr "Seleccione una base"
 
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/generic.tpl:295
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
 #: 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/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
@@ -2616,8 +2890,8 @@ msgstr "Organización"
 
 #: plugins/personal/generic/generic.tpl:217
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:46
-#: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/addons/addressbook/address_edit.tpl:138
+#: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/users/class_divListUsers.inc:50
 #: plugins/admin/applications/class_divListApplication.inc:44
 #: plugins/admin/ogroups/class_ogroupManagement.inc:366
@@ -2645,8 +2919,8 @@ msgstr "Habitación No."
 
 #: plugins/personal/generic/generic.tpl:261
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
+#: 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"
 
@@ -2697,8 +2971,8 @@ msgid "Street"
 msgstr "Calle"
 
 #: plugins/personal/generic/generic.tpl:369
-#: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
+#: 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"
 
@@ -2718,6 +2992,45 @@ msgstr "Último envío"
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+"Ha cambiado el método en que su clave es guardada en la base de datos LDAP. "
+"Por esa razón tiene que volver a reintroducir su contraseña de nuevo. Gosa "
+"codificara esta con el nuevo método seleccionado."
+
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:52
+msgid "Remove picture"
+msgstr "Eliminar foto"
+
+#: plugins/personal/generic/paste_generic.tpl:1
+msgid "User settings"
+msgstr "Parámetros del usuario"
+
+#: plugins/personal/generic/paste_generic.tpl:23
+msgid "Clear password"
+msgstr "Borrar contraseña"
+
+#: plugins/personal/generic/paste_generic.tpl:24
+msgid "Set new password"
+msgstr "Poner nueva Contraseña"
+
+#: plugins/personal/generic/paste_generic.tpl:47
+msgid "User picture"
+msgstr "Foto del usuario"
+
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "¡No tiene permisos para cambiar su contraseña!"
+
+#: plugins/personal/generic/main.inc:191
+msgid "Generic user information"
+msgstr "Información genérica del usuario"
+
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificado estandar"
@@ -2734,176 +3047,9 @@ msgstr "Certificado PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
-msgstr "mujer"
-
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
-msgstr "hombre"
-
-#: plugins/personal/generic/class_user.inc:272
-msgid "This account has no valid GOsa extensions."
-msgstr "Esta cuenta no tiene extensiones GOsa validas"
-
-#: plugins/personal/generic/class_user.inc:326
-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
-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
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:459
-msgid "valid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:459
-msgid "invalid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:463
-msgid "No certificate installed"
-msgstr "No hay certificados instalados"
-
-#: plugins/personal/generic/class_user.inc:546
-msgid "Removing generic user account failed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:835
-msgid "Saving generic user account failed"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:882
-msgid "Kerberos database communication failed"
-msgstr "La comunicación con la base de datos Kerberos ha fallado"
-
-#: plugins/personal/generic/class_user.inc:899
-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
-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
-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
-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/addons/addressbook/class_addressbook.inc:546
-#: plugins/admin/users/class_userManagement.inc:517
-msgid "The required field 'Name' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:974
-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/addons/addressbook/class_addressbook.inc:550
-#: plugins/admin/users/class_userManagement.inc:520
-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
-msgid "The required field 'Login' is not set."
-msgstr " El campo requerido 'Login' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:990
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-"Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
-"base de datos."
-
-#: plugins/personal/generic/class_user.inc:997
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-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
-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/addons/addressbook/class_addressbook.inc:556
-#: plugins/addons/addressbook/class_addressbook.inc:584
-#: plugins/admin/departments/class_departmentGeneric.inc:244
-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/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/addons/addressbook/class_addressbook.inc:564
-#: plugins/addons/addressbook/class_addressbook.inc:567
-#: plugins/admin/departments/class_departmentGeneric.inc:247
-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/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/departments/class_departmentGeneric.inc:250
-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/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/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
-msgid "Could not open specified certificate!"
-msgstr "¡No puedo abrir el certificado especificado!"
-
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "¡No tiene permisos para cambiar su contraseña!"
-
-#: plugins/personal/generic/main.inc:189
-msgid "Generic user information"
-msgstr "Información genérica del usuario"
-
-#: plugins/personal/generic/paste_generic.tpl:4
-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"
-
-#: plugins/personal/generic/paste_generic.tpl:36
-msgid "Set new password"
-msgstr "Poner nueva Contraseña"
+#: plugins/personal/connectivity/intranet.tpl:3
+msgid "Intranet account"
+msgstr "Crear cuenta de intranet"
 
 #: plugins/personal/connectivity/proxy.tpl:10
 msgid "Proxy account"
@@ -2925,72 +3071,9 @@ msgstr "Restringir el uso del proxy con cuota"
 msgid "per"
 msgstr "por"
 
-#: plugins/personal/connectivity/intranet.tpl:3
-msgid "Intranet account"
-msgstr "Crear cuenta de intranet"
-
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
-msgstr "WebDAV"
-
-#: plugins/personal/connectivity/class_webdavAccount.inc:68
-msgid "Removing webDAV account failed"
-msgstr "Ha fallado al eliminar la cuenta WebDAV"
-
-#: plugins/personal/connectivity/class_webdavAccount.inc:111
-msgid "Saving webDAV account failed"
-msgstr "Ha fallado al guardar la cuenta WebDAV"
-
-#: plugins/personal/connectivity/phpgw.tpl:3
-msgid "PHPGroupware account"
-msgstr "Cuenta PHPGroupware"
-
-#: plugins/personal/connectivity/kolab.tpl:1
-msgid "Kolab account"
-msgstr "Cuenta Kolab"
-
-#: plugins/personal/connectivity/kolab.tpl:4
-msgid ""
-"The kolab account is currently disabled. It's features can be adjusted if "
-"you add a mail account."
-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:10
-msgid "Delegations"
-msgstr "Delegaciones"
-
-#: plugins/personal/connectivity/kolab.tpl:23
-msgid "Mail size"
-msgstr "Tamaño del correo electrónico"
-
-#: plugins/personal/connectivity/kolab.tpl:24
-msgid "No mail size restriction for this account"
-msgstr "No hay restricción de correo para esta cuenta."
-
-#: plugins/personal/connectivity/kolab.tpl:32
-msgid "Free Busy information"
-msgstr "Información de estado de presencia"
-
-#: plugins/personal/connectivity/kolab.tpl:35
-#: plugins/admin/systems/servRepositorySetup.tpl:24
-msgid "URL"
-msgstr "URL"
-
-#: plugins/personal/connectivity/kolab.tpl:39
-msgid "Future"
-msgstr "Futuro"
-
-#: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:26
-#: plugins/personal/connectivity/oxchange.tpl:30
-msgid "days"
-msgstr "días"
-
-#: plugins/personal/connectivity/kolab.tpl:45
-msgid "Invitation policy"
-msgstr "Política de invitación"
+#: plugins/personal/connectivity/pptp.tpl:3
+msgid "PPTP account"
+msgstr "Cuenta PPTP"
 
 #: plugins/personal/connectivity/pureftpd.tpl:4
 msgid "FTP account"
@@ -3046,6 +3129,70 @@ msgstr "Active para desactivar acceso FTP"
 msgid "Temporary disable FTP access"
 msgstr "Acceso FTP desactivado temporalmente"
 
+#: plugins/personal/connectivity/phpgw.tpl:3
+msgid "PHPGroupware account"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:76
+msgid "Removing webDAV account failed"
+msgstr "Ha fallado al eliminar la cuenta WebDAV"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:119
+msgid "Saving webDAV account failed"
+msgstr "Ha fallado al guardar la cuenta WebDAV"
+
+#: plugins/personal/connectivity/kolab.tpl:3
+#: plugins/personal/connectivity/kolab.tpl:19
+msgid "Kolab account"
+msgstr "Cuenta Kolab"
+
+#: plugins/personal/connectivity/kolab.tpl:4
+msgid ""
+"The kolab account is currently disabled. It's features can be adjusted if "
+"you add a mail account."
+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
+msgid "Delegations"
+msgstr "Delegaciones"
+
+#: plugins/personal/connectivity/kolab.tpl:38
+msgid "Mail size"
+msgstr "Tamaño del correo electrónico"
+
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "No mail size restriction for this account"
+msgstr "No hay restricción de correo para esta cuenta."
+
+#: plugins/personal/connectivity/kolab.tpl:47
+msgid "Free Busy information"
+msgstr "Información de estado de presencia"
+
+#: plugins/personal/connectivity/kolab.tpl:50
+#: plugins/admin/systems/servRepositorySetup.tpl:24
+msgid "URL"
+msgstr "URL"
+
+#: plugins/personal/connectivity/kolab.tpl:54
+msgid "Future"
+msgstr "Futuro"
+
+#: plugins/personal/connectivity/kolab.tpl:55
+#: plugins/personal/connectivity/oxchange.tpl:26
+#: plugins/personal/connectivity/oxchange.tpl:30
+msgid "days"
+msgstr "días"
+
+#: plugins/personal/connectivity/kolab.tpl:60
+msgid "Invitation policy"
+msgstr "Política de invitación"
+
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr "Cuenta Open-Xchange"
@@ -3054,7 +3201,9 @@ msgstr "Cuenta Open-Xchange"
 msgid ""
 "disabled, no Postgresql support detected. Or the specified database can't be "
 "reached"
-msgstr "desactivado, No se ha detectado soporte Postgresql, o la base de datos especificada no puede ser alcanzada"
+msgstr ""
+"desactivado, No se ha detectado soporte Postgresql, o la base de datos "
+"especificada no puede ser alcanzada"
 
 #: plugins/personal/connectivity/oxchange.tpl:10
 msgid "Open-Xchange account"
@@ -3080,61 +3229,104 @@ msgstr "Información de Usuario"
 msgid "User Timezone"
 msgstr "Zona de uso horario del usuario"
 
+#: plugins/personal/connectivity/glpi.tpl:1
+msgid "GLPI account"
+msgstr "Cuenta GLPI"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:87
 msgid "KB"
 msgstr "Kb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:87
 msgid "GB"
 msgstr "Gb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:314
+#: plugins/personal/connectivity/class_proxyAccount.inc:88
+#: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "hora"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:88
 msgid "day"
 msgstr "día"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:88
 msgid "week"
 msgstr "semana"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:88
 msgid "month"
 msgstr "mes"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#: plugins/personal/connectivity/class_proxyAccount.inc:164
 msgid "Removing proxy account failed"
 msgstr "Se ha fallado al eliminar la cuenta del proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
+#: plugins/personal/connectivity/class_proxyAccount.inc:180
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:175
+#: plugins/personal/connectivity/class_proxyAccount.inc:183
 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:270
 msgid "Saving proxy account failed"
 msgstr "Ha fallado la grabación de la cuenta proxy"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:14
-msgid "Intranet"
-msgstr ""
+#: plugins/personal/connectivity/opengw.tpl:1
+msgid "Opengroupware"
+msgstr "Cuenta OpenGroupware"
 
-#: plugins/personal/connectivity/class_intranetAccount.inc:102
-msgid "Removing intranet account failed"
+#: plugins/personal/connectivity/opengw.tpl:8
+msgid "Location team"
+msgstr "Equipo de localización"
+
+#: plugins/personal/connectivity/opengw.tpl:21
+msgid "Template user"
+msgstr "Plantilla de usuario"
+
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_workstationGeneric.inc:103
+#: plugins/admin/systems/class_servGeneric.inc:44
+#: plugins/admin/ogroups/class_termgroup.inc:47
+msgid "Locked"
+msgstr "Bloqueado"
+
+#: plugins/personal/connectivity/opengw.tpl:49
+msgid "Teams"
+msgstr "Equipos"
+
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
+msgstr "PPTP"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:92
+msgid "Removing PPTP account failed"
+msgstr "Ha fallado la eliminación de la cuenta PPTP"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:135
+msgid "Saving PPTP account failed"
+msgstr "Ha fallado la grabación de la cuenta PPTP"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:14
+msgid "Intranet"
+msgstr ""
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:109
+msgid "Removing intranet account 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:164
 msgid "Saving intranet account failed"
 msgstr "Ha fallado la grabación de la cuenta de intranet"
 
@@ -3142,25 +3334,30 @@ msgstr "Ha fallado la grabación de la cuenta de intranet"
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#: plugins/personal/connectivity/class_phpgwAccount.inc:80
 msgid "Removing PHPgw account 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:123
 msgid "Saving PHPgw account failed"
 msgstr ""
 
+#: plugins/personal/connectivity/phpscheduleit.tpl:3
+msgid "PHPscheduleit account"
+msgstr "Cuenta PHPschedulñeit"
+
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
 msgid "Kolab"
 msgstr "Kolab"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:105
-msgid "You're trying to add an invalid email address to the list of delegations."
+#: plugins/personal/connectivity/class_kolabAccount.inc:123
+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:113
+#: plugins/personal/connectivity/class_kolabAccount.inc:131
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
@@ -3168,52 +3365,59 @@ msgstr ""
 "La dirección de correo primaria que esta intentando añadir, ya esta usada "
 "por otro usuario"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
+#: plugins/personal/connectivity/class_kolabAccount.inc:158
 msgid "Always accept"
 msgstr "Aceptar siempre"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
+#: plugins/personal/connectivity/class_kolabAccount.inc:159
 msgid "Always reject"
 msgstr "Denegar siempre"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:142
+#: plugins/personal/connectivity/class_kolabAccount.inc:160
 msgid "Reject if conflicts"
 msgstr "Denegar si hay conflictos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:143
+#: plugins/personal/connectivity/class_kolabAccount.inc:161
 msgid "Manual if conflicts"
 msgstr "Preguntar si hay conflictos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:144
+#: plugins/personal/connectivity/class_kolabAccount.inc:162
 msgid "Manual"
 msgstr "Manual"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:180
+#: plugins/personal/connectivity/class_kolabAccount.inc:212
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:233
+#: plugins/personal/connectivity/class_kolabAccount.inc:273
+#, 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:284
 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:238
+#: plugins/personal/connectivity/class_kolabAccount.inc:289
 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:252
+#: plugins/personal/connectivity/class_kolabAccount.inc:303
 #, 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."
+msgstr ""
+"La entrada de la política de invitación para la dirección '%s' no es valida."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:260
+#: plugins/personal/connectivity/class_kolabAccount.inc:311
 #, 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:325
-msgid "Saving Kolab account failed"
+#: plugins/personal/connectivity/class_kolabAccount.inc:390
+#, 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_pureftpdAccount.inc:6
@@ -3221,31 +3425,31 @@ msgstr "Ha fallado la eliminación de la cuenta de Kolab"
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:104
 msgid "Removing pureftpd account 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:146
 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:149
 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
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:152
 msgid "Value specified as 'Files' is not valid."
 msgstr "El valor especificado como 'Archivos' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:155
 msgid "Value specified as 'Size' is not valid."
 msgstr "El valor especificado como 'Tamaño' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:158
 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:175
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:183
 msgid "Saving pureftpd account failed"
 msgstr ""
 
@@ -3253,121 +3457,62 @@ msgstr ""
 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:726
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:822
 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:730
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:826
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
-"¡Los parámetros necesarios para extensión de conectividad open-xchange no "
-"se encuentran!"
+"¡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:734
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:830
 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:743
 msgid "Removing of oxchange addressbook failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:751
 msgid "Removing oxchange account 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:810
 msgid ""
 "The Open-Xchange accountname is empty and thus invalid! Check to make sure "
-"that "
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
-msgid "you are not using any strange characters in the loginname."
+"that you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:843
 msgid "Saving of oxchange account failed"
 msgstr ""
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:850
 msgid "Creating oxchange addressbook tree failed"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Cuenta WebDAV"
-
-#: plugins/personal/connectivity/class_connectivity.inc:65
-msgid "This account has no connectivity extensions."
-msgstr "Esta cuenta no tiene extensiones de conectividad"
-
-#: plugins/personal/connectivity/pptp.tpl:3
-msgid "PPTP account"
-msgstr "Cuenta PPTP"
-
-#: plugins/personal/connectivity/glpi.tpl:1
-msgid "GLPI account"
-msgstr "Cuenta GLPI"
-
-#: plugins/personal/connectivity/opengw.tpl:1
-msgid "Opengroupware"
-msgstr "Cuenta OpenGroupware"
-
-#: plugins/personal/connectivity/opengw.tpl:8
-msgid "Location team"
-msgstr "Equipo de localización"
-
-#: plugins/personal/connectivity/opengw.tpl:21
-msgid "Template user"
-msgstr "Plantilla de usuario"
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_servGeneric.inc:44
-#: plugins/admin/systems/class_workstationGeneric.inc:103
-#: plugins/admin/ogroups/class_termgroup.inc:39
-msgid "Locked"
-msgstr "Bloqueado"
-
-#: plugins/personal/connectivity/opengw.tpl:49
-msgid "Teams"
-msgstr "Equipos"
-
-#: plugins/personal/connectivity/class_pptpAccount.inc:26
-msgid "PPTP"
-msgstr "PPTP"
-
-#: plugins/personal/connectivity/class_pptpAccount.inc:84
-msgid "Removing PPTP account failed"
-msgstr "Ha fallado la eliminación de la cuenta PPTP"
-
-#: plugins/personal/connectivity/class_pptpAccount.inc:127
-msgid "Saving PPTP account failed"
-msgstr "Ha fallado la grabación de la cuenta PPTP"
-
-#: plugins/personal/connectivity/phpscheduleit.tpl:3
-msgid "PHPscheduleit account"
-msgstr "Cuenta PHPschedulñeit"
-
 #: 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:145
 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:150
 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:158
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
@@ -3385,69 +3530,53 @@ msgstr "Ha fallado la eliminación de la cuenta PHPscheduleit"
 msgid "Saving PHPscheduleit account failed"
 msgstr "Ha fallado la grabación de la cuenta PHPscheduleit"
 
-#: plugins/personal/netatalk/class_netatalk.inc:37
-msgid "Manage netatalk account"
-msgstr "Gestionar cuenta Netatalk"
-
-#: plugins/personal/netatalk/class_netatalk.inc:110
-msgid "This account has no netatalk extensions."
-msgstr "Esta cuenta no tiene extensiones Netatalk"
-
-#: plugins/personal/netatalk/class_netatalk.inc:133
-msgid "Remove netatalk account"
-msgstr "Borrar cuenta Netatalk"
-
-#: plugins/personal/netatalk/class_netatalk.inc:133
-msgid ""
-"This account has netatalk features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características Netatalk activas. Puede desactivarlas "
-"pulsando a continuación."
-
-#: plugins/personal/netatalk/class_netatalk.inc:144
-#: plugins/personal/netatalk/class_netatalk.inc:146
-msgid "Create netatalk account"
-msgstr "Crear cuenta Netatalk"
+#: plugins/personal/connectivity/class_connectivity.inc:65
+msgid "This account has no connectivity extensions."
+msgstr "Esta cuenta no tiene extensiones de conectividad"
 
-#: plugins/personal/netatalk/class_netatalk.inc:144
-msgid ""
-"This account has netatalk features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características Netatalk desactivadas.Puede "
-"activarlas pulsando aqui."
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Nombre de la lista"
 
-#: plugins/personal/netatalk/class_netatalk.inc:202
-msgid "You must select a share to use."
-msgstr ""
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/personal/netatalk/class_netatalk.inc:256
-msgid "Saving Netatalk account failed"
-msgstr "Ha fallado la grabación de la cuenta Netatalk"
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 
-#: plugins/personal/netatalk/class_netatalk.inc:316
-msgid "Removing Netatalk account failed"
-msgstr "Ha fallado la eliminación de la cuenta Netatalk"
+#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/admin/fai/class_faiSummaryTab.inc:326
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:205
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
+msgstr "Tipo"
 
-#: plugins/personal/netatalk/netatalk.tpl:4
-msgid "Share"
-msgstr "Compartido"
+#: plugins/gofax/blocklists/generic.tpl:39
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
 
-#: plugins/personal/netatalk/netatalk.tpl:11
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr ""
+#: plugins/gofax/blocklists/generic.tpl:48
+msgid "Descriptive text for this blocklist"
+msgstr "Descripción de esta lista de bloqueos"
 
-#: plugins/personal/netatalk/main.inc:104
-#: plugins/addons/godfs/class_dfsManagment.inc:247
-#: ihtml/themes/default/copyPasteDialog.tpl:23
-msgid "Finish"
-msgstr "Terminar"
+#: plugins/gofax/blocklists/generic.tpl:61
+msgid "Blocked numbers"
+msgstr "Números bloqueados"
 
-#: plugins/personal/netatalk/main.inc:121
-msgid "Netatalk settings"
-msgstr "Parámetros de Netatalk"
+#: plugins/gofax/blocklists/generic.tpl:77
+msgid "Numbers can also contain wild cards."
+msgstr "Los números pueden contener también comodínes"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
@@ -3478,169 +3607,89 @@ msgstr "recibir"
 msgid "Removing blocklist object failed"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:436
 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:438
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:442
 #: plugins/admin/departments/class_departmentGeneric.inc:233
 msgid "Required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:441
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:445
 msgid "Required field 'Name' contains invalid characters"
 msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:452
 msgid "Specified name is already used."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
 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:503
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:507
 msgid "Saving blocklist object failed"
 msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Nombre de la lista"
+#: 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/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Nombre de la lista 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."
 
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:46
+msgid "Blocklist name"
+msgstr "N0mbre de listas de bloqueo"
 
-#: plugins/gofax/blocklists/generic.tpl:37
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/fai/class_faiSummaryTab.inc:326
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/systems/servnfs.tpl:47
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr "Tipo"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:47
+#: plugins/addons/addressbook/contents.tpl:42
+#: plugins/admin/fai/class_divListFai.inc:60
+#: plugins/admin/groups/class_divListGroup.inc:51
+#: plugins/admin/users/class_divListUsers.inc:52
+#: plugins/admin/applications/class_divListApplication.inc:45
+#: plugins/admin/departments/class_divListDepartment.inc:42
+#: plugins/admin/systems/class_divListSystem.inc:58
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/ogroups/class_divListOGroup.inc:54
+#: plugins/gofon/macro/class_divListMacros.inc:48
+#: plugins/gofon/conference/class_divListConferences.inc:49
+msgid "Actions"
+msgstr "Acciones"
 
-#: plugins/gofax/blocklists/generic.tpl:39
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:50
+msgid "Select to see send blocklists"
+msgstr "Seleccione para mostrar listas de bloqueo salientes"
 
-#: plugins/gofax/blocklists/generic.tpl:48
-msgid "Descriptive text for this blocklist"
-msgstr "Descripción de esta lista de bloqueos"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:50
+msgid "Show send blocklists"
+msgstr "Mostrar listas de bloqueos salientes"
 
-#: plugins/gofax/blocklists/generic.tpl:61
-msgid "Blocked numbers"
-msgstr "Números bloqueados"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:51
+msgid "Select to see receive blocklists"
+msgstr "Seleccione para mostrar listas de bloqueo entrantes"
 
-#: plugins/gofax/blocklists/generic.tpl:77
-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/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2
-#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/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/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
-msgid "Warning"
-msgstr "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/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
-msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
-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_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."
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:46
-msgid "Blocklist name"
-msgstr "N0mbre de listas de bloqueo"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:47
-#: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_divListFai.inc:60
-#: plugins/admin/groups/class_divListGroup.inc:51
-#: plugins/admin/users/class_divListUsers.inc:52
-#: plugins/admin/applications/class_divListApplication.inc:45
-#: plugins/admin/departments/class_divListDepartment.inc:42
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/systems/class_divListSystem.inc:53
-#: plugins/admin/ogroups/class_divListOGroup.inc:54
-#: plugins/gofon/macro/class_divListMacros.inc:48
-#: plugins/gofon/conference/class_divListConferences.inc:49
-msgid "Actions"
-msgstr "Acciones"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:50
-msgid "Select to see send blocklists"
-msgstr "Seleccione para mostrar listas de bloqueo salientes"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:50
-msgid "Show send blocklists"
-msgstr "Mostrar listas de bloqueos salientes"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:51
-msgid "Select to see receive blocklists"
-msgstr "Seleccione para mostrar listas de bloqueo entrantes"
-
-#: plugins/gofax/blocklists/class_divListBlocklists.inc:51
-msgid "Show receive blocklists"
-msgstr "Mostrar listas de bloqueos entrantes"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:51
+msgid "Show receive blocklists"
+msgstr "Mostrar listas de bloqueos entrantes"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:54
 #: plugins/admin/groups/class_divListGroup.inc:62
 #: plugins/admin/users/class_divListUsers.inc:63
 #: plugins/admin/applications/class_divListApplication.inc:48
 #: plugins/admin/departments/class_divListDepartment.inc:46
-#: plugins/admin/systems/class_divListSystem.inc:66
+#: plugins/admin/systems/class_divListSystem.inc:71
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
 #: plugins/admin/ogroups/class_divListOGroup.inc:69
 #: plugins/gofon/macro/class_divListMacros.inc:51
 #: plugins/gofon/conference/class_divListConferences.inc:52
@@ -3652,14 +3701,14 @@ msgid "Regular expression for matching list names"
 msgstr "Expresiones regulares para encontrar nombres de listas"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:77
-#: plugins/admin/fai/class_divListFai.inc:111
+#: plugins/admin/fai/class_divListFai.inc:121
 #: plugins/admin/groups/class_divListGroup.inc:93
 #: plugins/admin/users/class_divListUsers.inc:93
 #: plugins/admin/applications/class_divListApplication.inc:92
 #: plugins/admin/departments/class_divListDepartment.inc:69
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:93
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_divListSystem.inc:88
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:99
 #: plugins/gofon/macro/class_divListMacros.inc:74
 #: plugins/gofon/conference/class_divListConferences.inc:75
@@ -3668,14 +3717,14 @@ msgstr "Ir al departamento raíz"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:77
 #: plugins/addons/godfs/class_dfsManagment.inc:214
-#: plugins/admin/fai/class_divListFai.inc:111
+#: plugins/admin/fai/class_divListFai.inc:121
 #: plugins/admin/groups/class_divListGroup.inc:93
 #: plugins/admin/users/class_divListUsers.inc:93
 #: plugins/admin/applications/class_divListApplication.inc:92
 #: plugins/admin/departments/class_divListDepartment.inc:69
-#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:93
 #: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_divListSystem.inc:88
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
 #: plugins/admin/ogroups/class_divListOGroup.inc:99
 #: plugins/gofon/macro/class_divListMacros.inc:74
 #: plugins/gofon/conference/class_divListConferences.inc:75
@@ -3683,14 +3732,14 @@ msgid "Root"
 msgstr "Raíz"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:79
-#: plugins/admin/fai/class_divListFai.inc:114
+#: plugins/admin/fai/class_divListFai.inc:124
 #: plugins/admin/groups/class_divListGroup.inc:94
 #: plugins/admin/users/class_divListUsers.inc:95
 #: plugins/admin/applications/class_divListApplication.inc:94
 #: plugins/admin/departments/class_divListDepartment.inc:70
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:95
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_divListSystem.inc:90
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/ogroups/class_divListOGroup.inc:101
 #: plugins/gofon/macro/class_divListMacros.inc:76
 #: plugins/gofon/conference/class_divListConferences.inc:77
@@ -3699,16 +3748,16 @@ msgstr "Subir un departamento"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:79
 #: plugins/addons/godfs/class_dfsManagment.inc:213
-#: plugins/admin/fai/class_faiProfile.inc:303
-#: plugins/admin/fai/class_divListFai.inc:114
+#: plugins/admin/fai/class_faiProfile.inc:309
+#: plugins/admin/fai/class_divListFai.inc:124
 #: plugins/admin/groups/class_divListGroup.inc:94
 #: plugins/admin/users/class_divListUsers.inc:95
 #: plugins/admin/applications/class_divListApplication.inc:94
 #: plugins/admin/departments/class_divListDepartment.inc:70
-#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:95
 #: plugins/admin/systems/class_glpiSelectUser.inc:162
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
-#: plugins/admin/systems/class_divListSystem.inc:90
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
 #: plugins/admin/ogroups/phonequeue.tpl:17
 #: plugins/admin/ogroups/class_divListOGroup.inc:101
 #: plugins/gofon/macro/class_divListMacros.inc:76
@@ -3720,9 +3769,9 @@ msgstr ""
 #: plugins/admin/groups/class_divListGroup.inc:95
 #: plugins/admin/users/class_divListUsers.inc:97
 #: plugins/admin/applications/class_divListApplication.inc:96
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:97
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_divListOGroup.inc:103
 #: plugins/gofon/macro/class_divListMacros.inc:78
 #: plugins/gofon/conference/class_divListConferences.inc:79
@@ -3730,14 +3779,14 @@ msgid "Go to users department"
 msgstr "Ir al departamento de los usuarios"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:81
-#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/fai/class_divListFai.inc:127
 #: plugins/admin/groups/class_divListGroup.inc:95
 #: plugins/admin/users/class_divListUsers.inc:97
 #: plugins/admin/applications/class_divListApplication.inc:96
 #: plugins/admin/departments/class_divListDepartment.inc:71
-#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:97
 #: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
 #: plugins/admin/ogroups/class_divListOGroup.inc:103
 #: plugins/gofon/macro/class_divListMacros.inc:78
 #: plugins/gofon/conference/class_divListConferences.inc:79
@@ -3745,14 +3794,14 @@ msgid "Home"
 msgstr "Inicio"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:83
-#: plugins/admin/fai/class_divListFai.inc:119
+#: plugins/admin/fai/class_divListFai.inc:129
 #: plugins/admin/groups/class_divListGroup.inc:96
 #: plugins/admin/users/class_divListUsers.inc:99
 #: plugins/admin/applications/class_divListApplication.inc:98
 #: plugins/admin/departments/class_divListDepartment.inc:72
-#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:98
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_divListSystem.inc:93
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: plugins/admin/ogroups/class_divListOGroup.inc:105
 #: plugins/gofon/macro/class_divListMacros.inc:80
 #: plugins/gofon/conference/class_divListConferences.inc:81
@@ -3762,8 +3811,8 @@ msgstr ""
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:83
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:90
 #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/fai/class_divListFai.inc:120
-#: plugins/admin/fai/class_divListFai.inc:150
+#: plugins/admin/fai/class_divListFai.inc:130
+#: plugins/admin/fai/class_divListFai.inc:162
 #: plugins/admin/groups/class_divListGroup.inc:96
 #: plugins/admin/groups/class_divListGroup.inc:102
 #: plugins/admin/users/class_divListUsers.inc:99
@@ -3772,11 +3821,11 @@ msgstr ""
 #: plugins/admin/applications/class_divListApplication.inc:106
 #: plugins/admin/departments/class_divListDepartment.inc:72
 #: plugins/admin/departments/class_divListDepartment.inc:77
-#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:115
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/systems/class_divListSystem.inc:93
-#: plugins/admin/systems/class_divListSystem.inc:110
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: plugins/admin/ogroups/class_divListOGroup.inc:105
 #: plugins/admin/ogroups/class_divListOGroup.inc:113
 #: plugins/gofon/macro/class_divListMacros.inc:80
@@ -3796,13 +3845,13 @@ msgstr "Nueva lista de bloqueo"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:90
 #: plugins/addons/godfs/class_dfsManagment.inc:218
-#: plugins/admin/fai/class_divListFai.inc:150
+#: plugins/admin/fai/class_divListFai.inc:162
 #: plugins/admin/groups/class_divListGroup.inc:102
 #: plugins/admin/users/class_divListUsers.inc:109
 #: plugins/admin/applications/class_divListApplication.inc:106
 #: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/systems/class_divListSystem.inc:115
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/systems/class_divListSystem.inc:110
 #: plugins/admin/ogroups/class_divListOGroup.inc:113
 #: plugins/gofon/macro/class_divListMacros.inc:87
 #: plugins/gofon/conference/class_divListConferences.inc:88
@@ -3810,24 +3859,24 @@ msgid "Submit department"
 msgstr "Enviar departamentos"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:104
-#: plugins/admin/fai/class_faiScript.inc:228
-#: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiTemplate.inc:198
-#: plugins/admin/fai/class_faiTemplate.inc:201
-#: plugins/admin/fai/class_faiHook.inc:252
-#: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/fai/class_divListFai.inc:209
-#: plugins/admin/fai/class_divListFai.inc:214
+#: plugins/admin/fai/class_faiScript.inc:248
+#: plugins/admin/fai/class_faiScript.inc:251
+#: plugins/admin/fai/class_faiTemplate.inc:244
+#: plugins/admin/fai/class_faiTemplate.inc:247
+#: plugins/admin/fai/class_faiHook.inc:270
+#: plugins/admin/fai/class_faiHook.inc:273
+#: plugins/admin/fai/class_divListFai.inc:231
+#: plugins/admin/fai/class_divListFai.inc:236
 #: plugins/admin/groups/class_divListGroup.inc:150
 #: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:159
 #: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/systems/glpiPrinter.tpl:15
+#: plugins/admin/systems/glpiPrinter.tpl:25 plugins/admin/systems/glpi.tpl:15
+#: plugins/admin/systems/glpi.tpl:25 plugins/admin/systems/glpi.tpl:35
+#: plugins/admin/systems/class_divListSystem.inc:140
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
-#: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
-#: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/systems/class_divListSystem.inc:135
 #: plugins/admin/ogroups/class_divListOGroup.inc:138
 #: plugins/gofon/macro/class_divListMacros.inc:102
 #: plugins/gofon/conference/class_divListConferences.inc:103
@@ -3836,21 +3885,20 @@ msgstr "Editar"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:104
 #: plugins/admin/users/class_divListUsers.inc:144
-#: plugins/gofon/macro/class_divListMacros.inc:103
 msgid "Edit user"
 msgstr "Editar usuario"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:105
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/fai/class_faiScript.inc:232
-#: plugins/admin/fai/class_faiTemplate.inc:202
-#: plugins/admin/fai/class_faiHook.inc:256
-#: plugins/admin/fai/class_divListFai.inc:216
+#: plugins/admin/fai/class_faiScript.inc:252
+#: plugins/admin/fai/class_faiTemplate.inc:248
+#: plugins/admin/fai/class_faiHook.inc:274
+#: plugins/admin/fai/class_divListFai.inc:238
 #: plugins/admin/groups/class_divListGroup.inc:152
 #: plugins/admin/users/class_divListUsers.inc:147
-#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/applications/class_divListApplication.inc:164
 #: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/systems/class_divListSystem.inc:136
+#: plugins/admin/systems/class_divListSystem.inc:141
 #: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/gofon/macro/class_divListMacros.inc:104
 #: plugins/gofon/conference/class_divListConferences.inc:105
@@ -3860,10 +3908,46 @@ msgstr "borrar"
 
 #: plugins/gofax/blocklists/class_divListBlocklists.inc:105
 #: plugins/admin/users/class_divListUsers.inc:148
-#: plugins/gofon/macro/class_divListMacros.inc:105
 msgid "Delete user"
 msgstr "Borrar usuario"
 
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:335 html/index.php:341
+#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
+#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
+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/fai/remove_branch.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+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/faxaccount/generic.tpl:12
 #: plugins/gofax/faxaccount/paste_generic.tpl:13
 msgid "Fax number for GOfax to trigger on"
@@ -3925,6 +4009,11 @@ msgstr "Listas de bloqueo para fax entrante"
 msgid "Blocklists for outgoing fax"
 msgstr "Listas de bloqueo para fax saliente"
 
+#: plugins/gofax/faxaccount/paste_generic.tpl:18
+#, fuzzy
+msgid "Alternate fax numbers will not be copied"
+msgstr "Intercambiar los números de fax"
+
 #: plugins/gofax/faxaccount/locals.tpl:6
 msgid "Select numbers to add"
 msgstr "Seleccione números para añadir"
@@ -3966,21 +4055,21 @@ msgid "FAX settings"
 msgstr "Parametros del Fax"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:137
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:145
 msgid "This account has no fax extensions."
 msgstr "Esta cuenta no tiene extensiones de fax."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:146
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:154
 msgid "Remove fax account"
 msgstr "Eliminar cuenta de fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:147
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:155
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
@@ -3988,11 +4077,11 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:149
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:157
 msgid "Create fax account"
 msgstr "Crear cuenta de fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:150
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:158
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
@@ -4000,41 +4089,40 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:218
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:226
 msgid "You're trying to add an invalid phone number."
 msgstr "Esta intentando añadir un número de teléfono no valido."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
-#: plugins/addons/mailqueue/header.tpl:5
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:439
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:521
 #: plugins/admin/groups/class_groupApplication.inc:632
 #: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
 msgstr "Atrás"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:625
 msgid "Removing FAX account failed"
 msgstr "Ha fallado la eliminación de la cuenta de Fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "The required field 'Fax' is not set."
 msgstr "No ha rellenado el campo requerido 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr "Por favor introduzca un numero de teléfono valido en el campo 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 "Envío de correo ha sido seleccionado, pero no se ha especificado ninguna "
 "dirección de correo."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:654
 msgid "The mail address you've entered is invalid."
 msgstr "La cuenta de correo electrónico que ha introducido no es válida."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:660
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -4044,98 +4132,6 @@ msgstr ""
 msgid "Saving FAX account failed"
 msgstr ""
 
-#: plugins/gofax/faxreports/detail.tpl:5
-msgid "FAX preview - please wait"
-msgstr "Previsualización del Fax - Por favor espere"
-
-#: plugins/gofax/faxreports/detail.tpl:8
-msgid "Click on fax to download"
-msgstr "Pulse en 'Fax' para descargar"
-
-#: plugins/gofax/faxreports/detail.tpl:17
-msgid "FAX ID"
-msgstr "FAX ID"
-
-#: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/gofax/faxreports/contents.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:758
-#: plugins/admin/ogroups/class_ogroupManagement.inc:363
-msgid "User"
-msgstr "Usuario"
-
-#: plugins/gofax/faxreports/detail.tpl:25
-msgid "Date / Time"
-msgstr "Fecha / Hora"
-
-#: plugins/gofax/faxreports/detail.tpl:29
-msgid "Sender MSN"
-msgstr "MSN del Remitente"
-
-#: plugins/gofax/faxreports/detail.tpl:33
-msgid "Sender ID"
-msgstr "ID del Remitente"
-
-#: plugins/gofax/faxreports/detail.tpl:37
-msgid "Receiver MSN"
-msgstr "MSN del Receptor"
-
-#: plugins/gofax/faxreports/detail.tpl:41
-msgid "Receiver ID"
-msgstr "ID del Receptor"
-
-#: plugins/gofax/faxreports/detail.tpl:49
-msgid "Status message"
-msgstr "Estado del mensaje"
-
-#: plugins/gofax/faxreports/detail.tpl:53
-msgid "Transfer time"
-msgstr "Tiempo de envio"
-
-#: plugins/gofax/faxreports/detail.tpl:57
-#: plugins/gofax/faxreports/contents.tpl:35
-msgid "# pages"
-msgstr "# páginas"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Informes de FAX"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:106
-#: plugins/gofax/faxreports/class_faxreport.inc:116
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
-"informes!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:160
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:120
-#: plugins/gofax/faxreports/class_faxreport.inc:125
-msgid "Can't select fax database for report generation!"
-msgstr "¡No puedo seleccionar la base de datos de fax para la generación de informes!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:148
-#: plugins/gofax/faxreports/class_faxreport.inc:266
-msgid "Query for fax database failed!"
-msgstr "¡La consulta a la base de datos de fax ha fallado!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:157
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-"¡No tiene permisos para recuperar información sobre el identificador (ID) "
-"del fax!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-#: plugins/gofon/fonreports/class_fonreport.inc:202
-msgid "Y-M-D"
-msgstr "Y-M-D"
-
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -4144,8 +4140,8 @@ msgstr "Filtro"
 
 #: plugins/gofax/faxreports/contents.tpl:6
 #: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/logview/contents.tpl:47
 #: plugins/addons/mailqueue/contents.tpl:11
+#: plugins/addons/logview/contents.tpl:47
 #: plugins/gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Buscar por"
@@ -4173,13 +4169,21 @@ msgid "during"
 msgstr "durante"
 
 #: plugins/gofax/faxreports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:67
 #: plugins/addons/mailqueue/contents.tpl:10
 #: plugins/addons/mailqueue/contents.tpl:26
+#: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
 msgid "Search"
 msgstr "Buscar"
 
+#: plugins/gofax/faxreports/contents.tpl:30
+#: plugins/gofax/faxreports/detail.tpl:21
+#: plugins/admin/fai/faiTemplateEntry.tpl:94
+#: plugins/admin/systems/class_printGeneric.inc:806
+#: plugins/admin/ogroups/class_ogroupManagement.inc:363
+msgid "User"
+msgstr "Usuario"
+
 #: plugins/gofax/faxreports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/fonreports/contents.tpl:30
@@ -4195,43 +4199,126 @@ msgstr "Remitente"
 msgid "Receiver"
 msgstr "Receptor"
 
+#: plugins/gofax/faxreports/contents.tpl:35
+#: plugins/gofax/faxreports/detail.tpl:57
+msgid "# pages"
+msgstr "# páginas"
+
 #: plugins/gofax/faxreports/contents.tpl:50
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/fonreports/contents.tpl:51
 msgid "Search returned no results..."
 msgstr "La búsqueda no ha encontrado resultados"
 
+#: plugins/gofax/faxreports/detail.tpl:5
+msgid "FAX preview - please wait"
+msgstr "Previsualización del Fax - Por favor espere"
+
+#: plugins/gofax/faxreports/detail.tpl:8
+msgid "Click on fax to download"
+msgstr "Pulse en 'Fax' para descargar"
+
+#: plugins/gofax/faxreports/detail.tpl:17
+msgid "FAX ID"
+msgstr "FAX ID"
+
+#: plugins/gofax/faxreports/detail.tpl:25
+msgid "Date / Time"
+msgstr "Fecha / Hora"
+
+#: plugins/gofax/faxreports/detail.tpl:29
+msgid "Sender MSN"
+msgstr "MSN del Remitente"
+
+#: plugins/gofax/faxreports/detail.tpl:33
+msgid "Sender ID"
+msgstr "ID del Remitente"
+
+#: plugins/gofax/faxreports/detail.tpl:37
+msgid "Receiver MSN"
+msgstr "MSN del Receptor"
+
+#: plugins/gofax/faxreports/detail.tpl:41
+msgid "Receiver ID"
+msgstr "ID del Receptor"
+
+#: plugins/gofax/faxreports/detail.tpl:49
+msgid "Status message"
+msgstr "Estado del mensaje"
+
+#: plugins/gofax/faxreports/detail.tpl:53
+msgid "Transfer time"
+msgstr "Tiempo de envio"
+
 #: plugins/gofax/faxreports/main.inc:18
 msgid "FAX reports"
 msgstr "Reportes de FAX"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Marcando conexión"
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
+msgstr "Informes de FAX"
 
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
-msgstr "Llamar"
+#: plugins/gofax/faxreports/class_faxreport.inc:106
+msgid ""
+"No fax extension defined in your sever configuration, no reports can be "
+"shown!"
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/addons/logview/class_logview.inc:71
+#: plugins/gofon/fonreports/class_fonreport.inc:160
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:116
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
+"informes!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:120
+msgid "Can't select fax database for report generation!"
+msgstr ""
+"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:125
+#, fuzzy
+msgid "Can't query fax table 'faxlog' for report generation!"
+msgstr ""
+"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:148
+#: plugins/gofax/faxreports/class_faxreport.inc:266
+msgid "Query for fax database failed!"
+msgstr "¡La consulta a la base de datos de fax ha fallado!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:157
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
+"¡No tiene permisos para recuperar información sobre el identificador (ID) "
+"del fax!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+#: plugins/gofon/fonreports/class_fonreport.inc:202
+msgid "Y-M-D"
+msgstr "Y-M-D"
 
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/class_addressbook.inc:522
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/fai/faiVariable.tpl:9
 #: plugins/admin/fai/faiPartitionTable.tpl:9
-#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
-#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/class_faiSummaryTab.inc:321
+#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.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/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
-#: plugins/admin/fai/class_faiSummaryTab.inc:321
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: 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/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
@@ -4245,14 +4332,17 @@ msgstr "Llamar"
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/goSpamServerRule.tpl:6
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Nombre"
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
 #: plugins/addons/addressbook/address_edit.tpl:66
+#: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privado"
 
@@ -4315,6 +4405,18 @@ msgstr "Elegir el objeto que sera buscado"
 msgid "Search string"
 msgstr "Cadena de búsqueda"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Marcando conexión"
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:369
+#: plugins/addons/addressbook/class_addressbook.inc:376
+#: plugins/addons/addressbook/class_addressbook.inc:380
+#: plugins/addons/addressbook/class_addressbook.inc:462
+msgid "Dial"
+msgstr "Llamar"
+
 #: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -4325,6 +4427,48 @@ msgstr ""
 "entrada. Por favor pulse dos veces si realmente quiere hacer esta, ya que no "
 "hay forma de que GOsa recupere la información."
 
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Elija un departamento para guardar la entrada"
+
+#: plugins/addons/addressbook/address_edit.tpl:24
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Personal"
+
+#: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr "Iniciales"
+
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: plugins/addons/addressbook/address_edit.tpl:119
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "De organización"
+
+#: plugins/addons/addressbook/address_edit.tpl:128
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Compañia"
+
+#: plugins/addons/addressbook/address_edit.tpl:148
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr "Ciudad"
+
+#: plugins/addons/addressbook/address_edit.tpl:168
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Pais"
+
 #: plugins/addons/addressbook/main.inc:37
 msgid "Address book"
 msgstr "Libreta de direcciones"
@@ -4333,12 +4477,12 @@ msgstr "Libreta de direcciones"
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
 
-#: plugins/addons/addressbook/class_addressbook.inc:153
+#: plugins/addons/addressbook/class_addressbook.inc:160
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "¿Llamar desde %s a %s ahora?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:157
+#: plugins/addons/addressbook/class_addressbook.inc:164
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -4346,410 +4490,641 @@ msgstr ""
 "No tiene configurado un numero de teléfono personal. Por favor cambie esto "
 "para permitir llamadas directas."
 
-#: plugins/addons/addressbook/class_addressbook.inc:180
+#: plugins/addons/addressbook/class_addressbook.inc:187
 msgid "Removing addressbook entry failed"
 msgstr "Ha fallado la eliminación de la cuenta de la libreta de direcciones"
 
-#: plugins/addons/addressbook/class_addressbook.inc:187
-#: plugins/addons/addressbook/class_addressbook.inc:288
+#: plugins/addons/addressbook/class_addressbook.inc:194
+#: plugins/addons/addressbook/class_addressbook.inc:297
 msgid "You are not allowed to delete this entry!"
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:282
+#: plugins/addons/addressbook/class_addressbook.inc:291
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Has decidido eliminar la entrada %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:377
+#: plugins/addons/addressbook/class_addressbook.inc:386
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Salvar el contacto %s como una vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:381
+#: plugins/addons/addressbook/class_addressbook.inc:390
 #, php-format
 msgid "Send mail to %s"
 msgstr "Enviar correo a %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:474
 msgid "global addressbook"
 msgstr "Directorio de contactos global"
 
-#: plugins/addons/addressbook/class_addressbook.inc:468
+#: plugins/addons/addressbook/class_addressbook.inc:477
 msgid "user database"
 msgstr "Usuario de Base de datos"
 
-#: plugins/addons/addressbook/class_addressbook.inc:472
+#: plugins/addons/addressbook/class_addressbook.inc:481
 #, php-format
 msgid "Contact stored in '%s'"
 msgstr "Contacto guardado en '%s'"
 
-#: plugins/addons/addressbook/class_addressbook.inc:474
+#: plugins/addons/addressbook/class_addressbook.inc:483
 msgid "Creating new entry in"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/logview/class_logview.inc:94
-#: plugins/addons/logview/class_logview.inc:111
-#: plugins/addons/mailqueue/class_mailqueue.inc:296
-#: plugins/addons/mailqueue/class_mailqueue.inc:361
+#: plugins/addons/addressbook/class_addressbook.inc:522
+#: plugins/addons/mailqueue/class_mailqueue.inc:305
+#: plugins/addons/mailqueue/class_mailqueue.inc:370
+#: plugins/addons/logview/class_logview.inc:99
+#: plugins/addons/logview/class_logview.inc:117
 msgid "All"
 msgstr "Todo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
+#: plugins/addons/addressbook/class_addressbook.inc:522 html/getxls.php:65
 #: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
 msgid "Given name"
 msgstr "Nombre"
 
-#: plugins/addons/addressbook/class_addressbook.inc:514
+#: plugins/addons/addressbook/class_addressbook.inc:523
 msgid "Work phone"
 msgstr "Teléfono del trabajo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:514
+#: plugins/addons/addressbook/class_addressbook.inc:523
 msgid "Cell phone"
 msgstr "Móvil"
 
-#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:174
+#: plugins/addons/addressbook/class_addressbook.inc:524 html/getxls.php:174
 msgid "Home phone"
 msgstr "Teléfono particular"
 
-#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
+#: plugins/addons/addressbook/class_addressbook.inc:524 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/addons/addressbook/class_addressbook.inc:597
-msgid "Cannot create a unique DN for your entry. Please fill more formular fields."
+#: plugins/addons/addressbook/class_addressbook.inc:606
+msgid ""
+"Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "No se puede crear un 'DN' único para esta entrada. Por favor rellene los "
 "campos del formulario."
 
-#: plugins/addons/addressbook/class_addressbook.inc:605
-msgid "You have no permissions to create or modify a global address book entry."
+#: plugins/addons/addressbook/class_addressbook.inc:614
+msgid ""
+"You have no permissions to create or modify a global address book entry."
 msgstr ""
 "No tiene permisos para crear o modificar una entrada de libreta de "
 "direcciones global."
 
-#: plugins/addons/addressbook/class_addressbook.inc:650
+#: plugins/addons/addressbook/class_addressbook.inc:659
 msgid "Saving addressbook entry failed"
 msgstr "Ha fallado la grabación de la cuenta de la libreta de direcciones"
 
-#: plugins/addons/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:24
-msgid "Personal"
-msgstr "Personal"
-
-#: plugins/addons/addressbook/address_info.tpl:19
-#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr "Iniciales"
+#: plugins/addons/godfs/contents.tpl:8
+msgid "DFS Shares"
+msgstr "Compartidos DFS"
 
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Correo Electrónico"
+#: plugins/addons/godfs/contents.tpl:26
+msgid ""
+"This menu allows you to create, delete and edit selected dfs shares. Having "
+"a large numbers of dfs shares, you might prefer the range selectors on top "
+"of the dfs share list."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los compartidos DFS "
+"seleccionados. Puede usar el selector de rango en la parte superior de la "
+"lista de compartidos DFS, cuando trabaja con un gran número de compartidos "
+"DFS."
 
-#: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:119
-msgid "Organizational"
-msgstr "De organización"
+#: plugins/addons/godfs/contents.tpl:40
+msgid "Display dfs shares matching"
+msgstr "Mostrar compartidos DFS que concuerden con"
 
-#: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:128
-msgid "Company"
-msgstr "Compañia"
+#: plugins/addons/godfs/contents.tpl:44
+msgid "Regular expression for matching dfs share names"
+msgstr "Expresión regular para encontrar nombre de compartidos DFS"
 
-#: plugins/addons/addressbook/address_info.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr "Ciudad"
+#: plugins/addons/godfs/generic.tpl:4
+msgid "DFS Properties"
+msgstr "Propiedades DFS"
 
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:168
-msgid "Country"
-msgstr "Pais"
+#: plugins/addons/godfs/generic.tpl:8
+msgid "Name of dfs Share"
+msgstr "Nombre del compartido DFS"
 
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Elija un departamento para guardar la entrada"
+#: plugins/addons/godfs/generic.tpl:16
+msgid "Fileserver"
+msgstr "Servidor de Archivos"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:6
-#: plugins/addons/ldapmanager/class_import.inc:6
-msgid "LDIF export"
-msgstr "Exportar a LDIF"
+#: plugins/addons/godfs/generic.tpl:20
+msgid "Share on Fileserver"
+msgstr "Compartido en el Servicio de Archivos"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:101
-msgid "You've no permission to do CSV imports."
-msgstr "No tiene permisos para hacer importaciones desde CVS."
+#: plugins/addons/godfs/generic.tpl:30
+msgid "DFS Location"
+msgstr "Localización del DFS"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:161
-msgid "Need 'sn','givenName' and 'uid' to create user."
-msgstr "Se necesita 'sn', 'givenName' y 'uid' para crear usuario."
+#: plugins/addons/godfs/class_dfsManagment.inc:10
+msgid "DFS Managment"
+msgstr "Gestión de DFS"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:209
-msgid "failed"
-msgstr "Fallado"
+#: plugins/addons/godfs/class_dfsManagment.inc:151
+msgid "Removing DFS share failed"
+msgstr "Ha fallado la eliminación del compartido DFS"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:213
-msgid "ok"
-msgstr "ok"
+#: plugins/addons/godfs/class_dfsManagment.inc:170
+msgid "No DFS entries found"
+msgstr ""
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:277
-msgid "status"
-msgstr "Estado"
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+msgid "Go up one dfsshare"
+msgstr "Subir un nivel en el compartido DFS"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:281
-#, php-format
-msgid "An Error Occured while inserting entry %s - process aborted"
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+msgid "Go to dfs root"
 msgstr ""
-"Un error ha ocurrido cuando se insertaba la entrada '%s' - El proceso ha "
-"sido abortado."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:319
-msgid "Nothing to import!"
-msgstr "¡No hay nada que importar!"
+#: plugins/addons/godfs/class_dfsManagment.inc:215
+msgid "Create new dfsshare"
+msgstr "Crear un nuevo compartido DFS"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:331
-#: plugins/addons/ldapmanager/class_csvimport.inc:342
-#: plugins/addons/ldapmanager/class_csvimport.inc:347
-#: plugins/addons/ldapmanager/class_import.inc:62
-#: plugins/addons/ldapmanager/class_import.inc:70
-msgid "There is no file uploaded."
-msgstr "No se ha subido ningún archivo."
+#: plugins/addons/godfs/class_dfsgeneric.inc:102
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+msgid "Dfs share already exists."
+msgstr "Ese compartido DFS ya existe."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:336
-#: plugins/addons/ldapmanager/class_import.inc:55
-msgid "The specified file is empty."
-msgstr "El archivo especificado está vacío."
+#: plugins/addons/godfs/class_dfsgeneric.inc:117
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr "El campo requerido 'Nombre del compartido DFS' no ha sido rellenado."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:490
-msgid "The selected file does not contain any CSV Data..."
-msgstr "El archivo seleccionado no contiene datos CSV..."
+#: plugins/addons/godfs/class_dfsgeneric.inc:120
+msgid "Required Field \"Description\" is not set."
+msgstr "El campo requerido 'Descripción' no ha sido rellenado."
 
-#: plugins/addons/ldapmanager/contentimport.tpl:3
-msgid ""
-"The LDIF import plugin provides methods to upload a set of entries to your "
-"running LDAP directory as ldif. You may use this to add new or modify "
-"existing entries. Remember that GOsa will not check your ldifs for GOsa "
-"conformance."
+#: plugins/addons/godfs/class_dfsgeneric.inc:123
+msgid "Required Field \"Fileserver\" is not set."
+msgstr "El campo requerido 'Servidor de ficheros' no ha sido rellenado."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:126
+msgid "Required Field \"Share on fileserver\" is not set."
 msgstr ""
-"La extensión importar LDIF provee de los metodos para cargar una copia "
-"espejo de parte o todo el directorio LDAP en formato LDIF. Puede utilizar "
-"esta opción para añadir, crear o modificar entradas existentes. Recuerde que "
-"GOsa NO comprobara su ldifs."
+"El campo requerido 'Compartido en el servidor de ficheros' no ha sido "
+"rellenado."
 
-#: plugins/addons/ldapmanager/contentimport.tpl:10
-msgid "Import LDIF File"
-msgstr "Importar archivo LDIF"
+#: plugins/addons/godfs/class_dfsgeneric.inc:129
+msgid "Required Field \"Location\" is not set."
+msgstr "El campo requerido 'Localización' no ha sido rellenado."
 
-#: plugins/addons/ldapmanager/contentimport.tpl:24
-msgid "Modify existing attributes"
-msgstr "Modificar los atributos existentes"
+#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
+msgid "Distributed File System Administration"
+msgstr ""
 
-#: plugins/addons/ldapmanager/contentimport.tpl:33
-msgid "Overwrite existing entry"
-msgstr "Sobreescribir la entrada actual"
+#: plugins/addons/mailqueue/contents.tpl:12
+msgid "Please enter a search string here."
+msgstr "Por favor introduzca una cadena de búsqueda aqui."
 
-#: plugins/addons/ldapmanager/contentimport.tpl:40
-msgid "Import successful"
-msgstr "Importación correcta"
+#: plugins/addons/mailqueue/contents.tpl:14
+msgid "Select a server"
+msgstr "Seleccione un servidor"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
+#: plugins/addons/mailqueue/contents.tpl:17
+msgid "with status"
+msgstr "Con estado"
+
+#: plugins/addons/mailqueue/contents.tpl:21
+msgid "within the last"
 msgstr ""
-"La extensión importar desde CSV provee de los metodos para generar cuentas "
-"desde un archivo que contiene valores separados por comas. El administrador "
-"puede decidir cuales columnas debería ser transferidas a que atributo. "
-"Fíjese que al menos debe tener 'UID', 'GIVENNAME' y 'SURENAME' configurados."
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-msgid "Select CSV file to import"
-msgstr "Seleccione el archivo CSV para importar"
+#: plugins/addons/mailqueue/contents.tpl:29
+msgid "Remove all messages"
+msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:19
-msgid "Select template"
-msgstr "Selecciona plantilla"
+#: plugins/addons/mailqueue/contents.tpl:30
+msgid "Remove all messages from selected servers queue"
+msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr "Todas las entradas han sido escritas correctamente en la base de datos LDAP."
+#: plugins/addons/mailqueue/contents.tpl:31
+msgid "Hold all messages"
+msgstr "Guardar todos los mensajes"
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr "Error: Ha habido un error durante la importación de los datos."
+#: plugins/addons/mailqueue/contents.tpl:32
+msgid "Hold all messages in selected servers queue"
+msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr "Este es el informe de estado de la importación:"
+#: plugins/addons/mailqueue/contents.tpl:33
+msgid "Release all messages"
+msgstr ""
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:80
-msgid "Selected Template"
-msgstr "Plantilla seleccionada"
+#: plugins/addons/mailqueue/contents.tpl:34
+msgid "Release all messages in selected servers queue"
+msgstr ""
 
-#: plugins/addons/ldapmanager/class_import.inc:41
-msgid "You've no permission to do LDAP imports."
-msgstr "No tiene permisos para hacer importaciones LDAP"
+#: plugins/addons/mailqueue/contents.tpl:35
+msgid "Requeue all messages"
+msgstr ""
 
-#: plugins/addons/ldapmanager/class_import.inc:108
-msgid "Unknown Error"
-msgstr "Error desconocido"
+#: plugins/addons/mailqueue/contents.tpl:36
+msgid "Requeue all messages in selected servers queue"
+msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:3
-msgid ""
-"The LDIF export plugin provides methods to download a complete snapshot of "
-"the running LDAP directory as ldif. You may save these files for backup "
-"purpose or when initializing a new server."
+#: plugins/addons/mailqueue/contents.tpl:46
+msgid "Search returned no results"
+msgstr "La búsqueda no ha devuelto resultados"
+
+#: plugins/addons/mailqueue/contents.tpl:52
+msgid "ID"
+msgstr "ID"
+
+#: plugins/addons/mailqueue/contents.tpl:55
+msgid "Arrival"
+msgstr "Llegada"
+
+#: plugins/addons/mailqueue/contents.tpl:57
+msgid "Recipient"
+msgstr "Recipiente"
+
+#: plugins/addons/mailqueue/contents.tpl:58
+msgid "Error"
 msgstr ""
-"La extensión exportar LDIF provee los metodos para descargar una copia "
-"espejo del directorio LDAP actual como un archivo LDIF. Puede grabar estos "
-"ficheros como copias de seguridad o para iniciar un nuevo servidor."
 
-#: plugins/addons/ldapmanager/contentexport.tpl:10
-#: plugins/addons/ldapmanager/contentexportxls.tpl:10
-msgid "Export single entry"
-msgstr "Exportar solo esta entrada"
+#: plugins/addons/mailqueue/contents.tpl:76
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
+msgid "Active"
+msgstr "Activo"
 
-#: plugins/addons/ldapmanager/contentexport.tpl:21
-msgid "Export complete LDIF for"
-msgstr "Exportación del LDIF completada para"
+#: plugins/addons/mailqueue/contents.tpl:93
+msgid "Delete this message"
+msgstr "Eliminar este mensaje"
 
-#: plugins/addons/ldapmanager/contentexport.tpl:24
-#: plugins/addons/ldapmanager/contentexport.tpl:39
-#: plugins/addons/ldapmanager/contentexportxls.tpl:27
-#: plugins/addons/ldapmanager/contentexportxls.tpl:42
-msgid "Choose the department you want to Export"
-msgstr "Elija el departamento que quiera exportar"
+#: plugins/addons/mailqueue/contents.tpl:97
+msgid "unhold"
+msgstr ""
 
-#: plugins/addons/ldapmanager/contentexport.tpl:36
-#: plugins/addons/ldapmanager/contentexportxls.tpl:39
-msgid "Export IVBB LDIF for"
-msgstr "Exportación IVBB LDIF para"
+#: plugins/addons/mailqueue/contents.tpl:97
+msgid "Release message"
+msgstr "Desbloquear el mensaje"
 
-#: plugins/addons/ldapmanager/contentexport.tpl:55
-#: plugins/addons/ldapmanager/contentexportxls.tpl:58
-msgid "Export successful"
-msgstr "Exportación completada"
+#: plugins/addons/mailqueue/contents.tpl:101
+msgid "hold"
+msgstr "Poner en espera"
 
-#: plugins/addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
+#: plugins/addons/mailqueue/contents.tpl:101
+msgid "Hold message"
+msgstr "Poner el mensaje en espera"
 
-#: plugins/addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the LDAP Export "
-msgstr "Pulse aquí para exportar la base de datos LDAP"
+#: plugins/addons/mailqueue/contents.tpl:105
+msgid "requeue"
+msgstr "reencolar"
 
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-#: plugins/addons/ldapmanager/main.inc:40
-msgid "LDAP manager"
-msgstr "Gestor LDAP"
+#: plugins/addons/mailqueue/contents.tpl:105
+msgid "Requeue this message"
+msgstr ""
 
-#: plugins/addons/ldapmanager/class_export.inc:6
-msgid "CSV import"
-msgstr "Importar desde CSV"
+#: plugins/addons/mailqueue/contents.tpl:108
+msgid "header"
+msgstr "cabecera"
 
-#: plugins/addons/ldapmanager/class_export.inc:38
-#: plugins/addons/ldapmanager/class_exportxls.inc:39
-msgid "You've no permission to do LDAP exports."
-msgstr "No tiene permisos para hacer exportaciones LDAP."
+#: plugins/addons/mailqueue/contents.tpl:108
+msgid "Display header from this message"
+msgstr "Mostrar cabeceras para este mensaje"
 
-#: plugins/addons/ldapmanager/class_export.inc:83
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
-msgid "Error while exporting the requested entries!"
-msgstr "¡Error mientras se exportaban las entradas indicadas!"
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
+#: plugins/addons/mailqueue/main.inc:38
+msgid "Mail queue"
+msgstr "Cola de correo"
 
-#: plugins/addons/ldapmanager/contentexportxls.tpl:3
+#: plugins/addons/mailqueue/class_mailqueue.inc:58
 msgid ""
-"The XLS export plugin provides methods to download a complete snapshot of "
-"the running LDAP directory as xls. You may save these files for "
-"documentation."
+"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
-"La extensión exportar XLS provee los métodos para descargar una copia "
-"espejo del directorio LDAP actual como un archivo XLS. Puede grabar estos "
-"ficheros como documentación."
 
-#: plugins/addons/ldapmanager/contentexportxls.tpl:14
-msgid "Choose the data you want to Export"
-msgstr "Elija la información que quiera exportar"
+#: plugins/addons/mailqueue/class_mailqueue.inc:85
+#: plugins/addons/mailqueue/class_mailqueue.inc:112
+#: plugins/addons/mailqueue/class_mailqueue.inc:171
+#: plugins/addons/mailqueue/class_mailqueue.inc:198
+#, fuzzy, php-format
+msgid ""
+"You do not have permission to execute the command '%s' on the mailqueue."
+msgstr "No tiene permisos para crear un usuario en esta 'Base'."
 
-#: plugins/addons/ldapmanager/contentexportxls.tpl:24
-msgid "Export complete XLS for"
-msgstr "Exportación del XLS completada para"
+#: plugins/addons/mailqueue/class_mailqueue.inc:93
+#: plugins/addons/mailqueue/class_mailqueue.inc:121
+#: plugins/addons/mailqueue/class_mailqueue.inc:181
+#: plugins/addons/mailqueue/class_mailqueue.inc:213
+#, php-format
+msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
+msgstr ""
 
-#: plugins/addons/ldapmanager/contentexportxls.tpl:62
-msgid "Click here to save the complete LDAP database to a xls file"
-msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo XLS"
+#: plugins/addons/mailqueue/class_mailqueue.inc:225
+msgid "There are no mail server specified."
+msgstr ""
 
-#: plugins/addons/ldapmanager/contentexportxls.tpl:62
-msgid "Click here to save the LDAP Export to a xls file"
-msgstr "Pulse aquí para exportar la base de datos LDAP a un fichero XLS"
+#: plugins/addons/mailqueue/class_mailqueue.inc:275
+msgid "up"
+msgstr "Arriba"
 
-#: plugins/addons/ldapmanager/class_exportxls.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:277
+msgid "down"
+msgstr "Abajo"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:320
+msgid "no limit"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:325
+msgid "hours"
+msgstr "horas"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
+msgid "Hold"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
+msgid "Un hold"
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
+msgid "Not active"
+msgstr ""
+
+#: plugins/addons/ldapmanager/main.inc:40
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+msgid "LDAP manager"
+msgstr "Gestor LDAP"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:3
+msgid ""
+"The XLS export plugin provides methods to download a complete snapshot of "
+"the running LDAP directory as xls. You may save these files for "
+"documentation."
+msgstr ""
+"La extensión exportar XLS provee los métodos para descargar una copia espejo "
+"del directorio LDAP actual como un archivo XLS. Puede grabar estos ficheros "
+"como documentación."
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:10
+#: plugins/addons/ldapmanager/contentexport.tpl:10
+msgid "Export single entry"
+msgstr "Exportar solo esta entrada"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:14
+msgid "Choose the data you want to Export"
+msgstr "Elija la información que quiera exportar"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:24
+msgid "Export complete XLS for"
+msgstr "Exportación del XLS completada para"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:27
+#: plugins/addons/ldapmanager/contentexportxls.tpl:42
+#: plugins/addons/ldapmanager/contentexport.tpl:24
+#: plugins/addons/ldapmanager/contentexport.tpl:39
+msgid "Choose the department you want to Export"
+msgstr "Elija el departamento que quiera exportar"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:39
+#: plugins/addons/ldapmanager/contentexport.tpl:36
+msgid "Export IVBB LDIF for"
+msgstr "Exportación IVBB LDIF para"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:58
+#: plugins/addons/ldapmanager/contentexport.tpl:55
+msgid "Export successful"
+msgstr "Exportación completada"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+msgid "Click here to save the complete LDAP database to a xls file"
+msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo XLS"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+msgid "Click here to save the LDAP Export to a xls file"
+msgstr "Pulse aquí para exportar la base de datos LDAP a un fichero XLS"
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:6
+#: plugins/addons/ldapmanager/class_import.inc:6
+msgid "LDIF export"
+msgstr "Exportar a LDIF"
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:101
+msgid "You've no permission to do CSV imports."
+msgstr "No tiene permisos para hacer importaciones desde CVS."
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:161
+msgid "Need 'sn','givenName' and 'uid' to create user."
+msgstr "Se necesita 'sn', 'givenName' y 'uid' para crear usuario."
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:209
+msgid "failed"
+msgstr "Fallado"
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:213
+msgid "ok"
+msgstr "ok"
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:277
+msgid "status"
+msgstr "Estado"
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:281
+#, php-format
+msgid "An Error Occured while inserting entry %s - process aborted"
+msgstr ""
+"Un error ha ocurrido cuando se insertaba la entrada '%s' - El proceso ha "
+"sido abortado."
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:319
+msgid "Nothing to import!"
+msgstr "¡No hay nada que importar!"
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:331
+#: plugins/addons/ldapmanager/class_csvimport.inc:342
+#: plugins/addons/ldapmanager/class_csvimport.inc:347
+#: plugins/addons/ldapmanager/class_import.inc:62
+#: plugins/addons/ldapmanager/class_import.inc:70
+msgid "There is no file uploaded."
+msgstr "No se ha subido ningún archivo."
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:336
+#: plugins/addons/ldapmanager/class_import.inc:55
+msgid "The specified file is empty."
+msgstr "El archivo especificado está vacío."
+
+#: plugins/addons/ldapmanager/class_csvimport.inc:490
+msgid "The selected file does not contain any CSV Data..."
+msgstr "El archivo seleccionado no contiene datos CSV..."
+
+#: plugins/addons/ldapmanager/contentimport.tpl:3
+msgid ""
+"The LDIF import plugin provides methods to upload a set of entries to your "
+"running LDAP directory as ldif. You may use this to add new or modify "
+"existing entries. Remember that GOsa will not check your ldifs for GOsa "
+"conformance."
+msgstr ""
+"La extensión importar LDIF provee de los metodos para cargar una copia "
+"espejo de parte o todo el directorio LDAP en formato LDIF. Puede utilizar "
+"esta opción para añadir, crear o modificar entradas existentes. Recuerde que "
+"GOsa NO comprobara su ldifs."
+
+#: plugins/addons/ldapmanager/contentimport.tpl:10
+msgid "Import LDIF File"
+msgstr "Importar archivo LDIF"
+
+#: plugins/addons/ldapmanager/contentimport.tpl:24
+msgid "Modify existing attributes"
+msgstr "Modificar los atributos existentes"
+
+#: plugins/addons/ldapmanager/contentimport.tpl:33
+msgid "Overwrite existing entry"
+msgstr "Sobreescribir la entrada actual"
+
+#: plugins/addons/ldapmanager/contentimport.tpl:40
+msgid "Import successful"
+msgstr "Importación correcta"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+"La extensión importar desde CSV provee de los metodos para generar cuentas "
+"desde un archivo que contiene valores separados por comas. El administrador "
+"puede decidir cuales columnas debería ser transferidas a que atributo. "
+"Fíjese que al menos debe tener 'UID', 'GIVENNAME' y 'SURENAME' configurados."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr "Seleccione el archivo CSV para importar"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+msgid "Select template"
+msgstr "Selecciona plantilla"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr ""
+"Todas las entradas han sido escritas correctamente en la base de datos LDAP."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr "Error: Ha habido un error durante la importación de los datos."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr "Este es el informe de estado de la importación:"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:80
+msgid "Selected Template"
+msgstr "Plantilla seleccionada"
+
+#: plugins/addons/ldapmanager/class_exportxls.inc:7
 msgid "XLS import"
 msgstr "Importar desde XLS"
 
+#: plugins/addons/ldapmanager/class_exportxls.inc:39
+#: plugins/addons/ldapmanager/class_export.inc:38
+msgid "You've no permission to do LDAP exports."
+msgstr "No tiene permisos para hacer exportaciones LDAP."
+
+#: plugins/addons/ldapmanager/class_exportxls.inc:89
+#: plugins/addons/ldapmanager/class_export.inc:83
+msgid "Error while exporting the requested entries!"
+msgstr "¡Error mientras se exportaban las entradas indicadas!"
+
+#: plugins/addons/ldapmanager/class_import.inc:41
+msgid "You've no permission to do LDAP imports."
+msgstr "No tiene permisos para hacer importaciones LDAP"
+
+#: plugins/addons/ldapmanager/class_import.inc:108
+msgid "Unknown Error"
+msgstr "Error desconocido"
+
+#: plugins/addons/ldapmanager/contentexport.tpl:3
+msgid ""
+"The LDIF export plugin provides methods to download a complete snapshot of "
+"the running LDAP directory as ldif. You may save these files for backup "
+"purpose or when initializing a new server."
+msgstr ""
+"La extensión exportar LDIF provee los metodos para descargar una copia "
+"espejo del directorio LDAP actual como un archivo LDIF. Puede grabar estos "
+"ficheros como copias de seguridad o para iniciar un nuevo servidor."
+
+#: plugins/addons/ldapmanager/contentexport.tpl:21
+msgid "Export complete LDIF for"
+msgstr "Exportación del LDIF completada para"
+
+#: plugins/addons/ldapmanager/contentexport.tpl:59
+msgid "Click here to save the complete LDAP database to a file"
+msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
+
+#: plugins/addons/ldapmanager/contentexport.tpl:59
+msgid "Click here to save the LDAP Export "
+msgstr "Pulse aquí para exportar la base de datos LDAP"
+
+#: plugins/addons/ldapmanager/class_export.inc:6
+msgid "CSV import"
+msgstr "Importar desde CSV"
+
+#: plugins/addons/logview/main.inc:33
+msgid "System log view"
+msgstr "Ver registro del sistema"
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr "Registro del sistema"
 
-#: plugins/addons/logview/class_logview.inc:63
+#: plugins/addons/logview/class_logview.inc:68
 msgid "No LOG servers defined!"
 msgstr "¡No se han definido servidores LOG!"
 
-#: plugins/addons/logview/class_logview.inc:73
-#: plugins/addons/logview/class_logview.inc:168
+#: plugins/addons/logview/class_logview.inc:78
+#: plugins/addons/logview/class_logview.inc:185
 msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
 "No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
 "registros!"
 
-#: plugins/addons/logview/class_logview.inc:77
-#: plugins/addons/logview/class_logview.inc:171
+#: plugins/addons/logview/class_logview.inc:82
+#: plugins/addons/logview/class_logview.inc:188
 msgid "Can't select log database for log generation!"
 msgstr ""
 "No puedo consultar la base de datos de registro para la generación de "
 "registros."
 
-#: plugins/addons/logview/class_logview.inc:86
-#: plugins/addons/logview/class_logview.inc:103
+#: plugins/addons/logview/class_logview.inc:91
+#: plugins/addons/logview/class_logview.inc:109
 msgid "Query for log database failed!"
 msgstr "¡Consulta a la base de datos de logs fallida!"
 
-#: plugins/addons/logview/class_logview.inc:118
+#: plugins/addons/logview/class_logview.inc:125
 msgid "one hour"
 msgstr "Una hora"
 
-#: plugins/addons/logview/class_logview.inc:118
+#: plugins/addons/logview/class_logview.inc:125
 msgid "6 hours"
 msgstr "6 horas"
 
-#: plugins/addons/logview/class_logview.inc:119
+#: plugins/addons/logview/class_logview.inc:126
 msgid "12 hours"
 msgstr "12 horas"
 
-#: plugins/addons/logview/class_logview.inc:119
+#: plugins/addons/logview/class_logview.inc:126
 msgid "24 hours"
 msgstr "24 horas"
 
-#: plugins/addons/logview/class_logview.inc:120
+#: plugins/addons/logview/class_logview.inc:127
 msgid "2 days"
 msgstr "2 días"
 
-#: plugins/addons/logview/class_logview.inc:120
+#: plugins/addons/logview/class_logview.inc:127
 msgid "one week"
 msgstr "una semana"
 
-#: plugins/addons/logview/class_logview.inc:121
+#: plugins/addons/logview/class_logview.inc:128
 msgid "2 weeks"
 msgstr "2 semanas"
 
-#: plugins/addons/logview/class_logview.inc:121
+#: plugins/addons/logview/class_logview.inc:128
 msgid "one month"
 msgstr "un mes"
 
@@ -4785,286 +5160,56 @@ msgstr "Nombre de Maquina"
 msgid "Message"
 msgstr "Mensaje"
 
-#: plugins/addons/logview/main.inc:33
-msgid "System log view"
-msgstr "Ver registro del sistema"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:6
-#: plugins/addons/mailqueue/main.inc:38
-msgid "Mail queue"
-msgstr "Cola de correo"
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.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:175
+msgid "Objects"
+msgstr "Objetos"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:58
-msgid "Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
-msgstr ""
+#: plugins/admin/fai/faiVariable.tpl:34
+msgid "List of assigned variables"
+msgstr "Lista de variables asignadas"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:86
-#: plugins/addons/mailqueue/class_mailqueue.inc:94
-#: plugins/addons/mailqueue/class_mailqueue.inc:113
-#: plugins/addons/mailqueue/class_mailqueue.inc:122
-#: plugins/addons/mailqueue/class_mailqueue.inc:177
-#: plugins/addons/mailqueue/class_mailqueue.inc:204
-#, php-format
-msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:216
-msgid "There are no mail server specified."
-msgstr ""
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:266
-msgid "up"
-msgstr "Arriba"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:268
-msgid "down"
-msgstr "Abajo"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:311
-msgid "no limit"
-msgstr ""
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:316
-msgid "hours"
-msgstr "horas"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:362
-msgid "Hold"
-msgstr ""
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:363
-msgid "Un hold"
-msgstr ""
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:364
-#: plugins/addons/mailqueue/contents.tpl:76
-msgid "Active"
-msgstr "Activo"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:365
-msgid "Not active"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:12
-msgid "Please enter a search string here."
-msgstr "Por favor introduzca una cadena de búsqueda aqui."
-
-#: plugins/addons/mailqueue/contents.tpl:14
-msgid "Select a server"
-msgstr "Seleccione un servidor"
-
-#: plugins/addons/mailqueue/contents.tpl:17
-msgid "with status"
-msgstr "Con estado"
-
-#: plugins/addons/mailqueue/contents.tpl:21
-msgid "within the last"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:29
-msgid "Remove all messages"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:30
-msgid "Remove all messages from selected servers queue"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:31
-msgid "Hold all messages"
-msgstr "Guardar todos los mensajes"
-
-#: plugins/addons/mailqueue/contents.tpl:32
-msgid "Hold all messages in selected servers queue"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:33
-msgid "Release all messages"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:34
-msgid "Release all messages in selected servers queue"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:35
-msgid "Requeue all messages"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:36
-msgid "Requeue all messages in selected servers queue"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:46
-msgid "Search returned no results"
-msgstr "La búsqueda no ha devuelto resultados"
-
-#: plugins/addons/mailqueue/contents.tpl:52
-msgid "ID"
-msgstr "ID"
-
-#: plugins/addons/mailqueue/contents.tpl:55
-msgid "Arrival"
-msgstr "Llegada"
-
-#: plugins/addons/mailqueue/contents.tpl:57
-msgid "Recipient"
-msgstr "Recipiente"
-
-#: plugins/addons/mailqueue/contents.tpl:58
-msgid "Error"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:93
-msgid "Delete this message"
-msgstr "Eliminar este mensaje"
-
-#: plugins/addons/mailqueue/contents.tpl:97
-msgid "unhold"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:97
-msgid "Release message"
-msgstr "Desbloquear el mensaje"
-
-#: plugins/addons/mailqueue/contents.tpl:101
-msgid "hold"
-msgstr "Poner en espera"
-
-#: plugins/addons/mailqueue/contents.tpl:101
-msgid "Hold message"
-msgstr "Poner el mensaje en espera"
-
-#: plugins/addons/mailqueue/contents.tpl:105
-msgid "requeue"
-msgstr "reencolar"
-
-#: plugins/addons/mailqueue/contents.tpl:105
-msgid "Requeue this message"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:108
-msgid "header"
-msgstr "cabecera"
-
-#: plugins/addons/mailqueue/contents.tpl:108
-msgid "Display header from this message"
-msgstr "Mostrar cabeceras para este mensaje"
-
-#: plugins/addons/godfs/class_dfsManagment.inc:10
-msgid "DFS Managment"
-msgstr "Gestión de DFS"
-
-#: plugins/addons/godfs/class_dfsManagment.inc:151
-msgid "Removing DFS share failed"
-msgstr "Ha fallado la eliminación del compartido DFS"
-
-#: plugins/addons/godfs/class_dfsManagment.inc:170
-msgid "No DFS entries found"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:213
-msgid "Go up one dfsshare"
-msgstr "Subir un nivel en el compartido DFS"
-
-#: plugins/addons/godfs/class_dfsManagment.inc:214
-msgid "Go to dfs root"
-msgstr ""
-
-#: plugins/addons/godfs/class_dfsManagment.inc:215
-msgid "Create new dfsshare"
-msgstr "Crear un nuevo compartido DFS"
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:102
-#: plugins/addons/godfs/class_dfsgeneric.inc:104
-msgid "Dfs share already exists."
-msgstr "Ese compartido DFS ya existe."
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:117
-msgid "Required Field \"Name of dfs Share\" is not set."
-msgstr "El campo requerido 'Nombre del compartido DFS' no ha sido rellenado."
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:120
-msgid "Required Field \"Description\" is not set."
-msgstr "El campo requerido 'Descripción' no ha sido rellenado."
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:123
-msgid "Required Field \"Fileserver\" is not set."
-msgstr "El campo requerido 'Servidor de ficheros' no ha sido rellenado."
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:126
-msgid "Required Field \"Share on fileserver\" is not set."
-msgstr "El campo requerido 'Compartido en el servidor de ficheros' no ha sido rellenado."
-
-#: plugins/addons/godfs/class_dfsgeneric.inc:129
-msgid "Required Field \"Location\" is not set."
-msgstr "El campo requerido 'Localización' no ha sido rellenado."
-
-#: plugins/addons/godfs/generic.tpl:4
-msgid "DFS Properties"
-msgstr "Propiedades DFS"
-
-#: plugins/addons/godfs/generic.tpl:8
-msgid "Name of dfs Share"
-msgstr "Nombre del compartido DFS"
-
-#: plugins/addons/godfs/generic.tpl:16
-msgid "Fileserver"
-msgstr "Servidor de Archivos"
-
-#: plugins/addons/godfs/generic.tpl:20
-msgid "Share on Fileserver"
-msgstr "Compartido en el Servicio de Archivos"
-
-#: plugins/addons/godfs/generic.tpl:30
-msgid "DFS Location"
-msgstr "Localización del DFS"
-
-#: plugins/addons/godfs/contents.tpl:8
-msgid "DFS Shares"
-msgstr "Compartidos DFS"
-
-#: plugins/addons/godfs/contents.tpl:26
-msgid ""
-"This menu allows you to create, delete and edit selected dfs shares. Having "
-"a large numbers of dfs shares, you might prefer the range selectors on top "
-"of the dfs share list."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los compartidos DFS seleccionados. "
-"Puede usar el selector de rango en la parte superior de la lista de "
-"compartidos DFS, cuando trabaja con un gran número de compartidos DFS."
-
-#: plugins/addons/godfs/contents.tpl:40
-msgid "Display dfs shares matching"
-msgstr "Mostrar compartidos DFS que concuerden con"
-
-#: plugins/addons/godfs/contents.tpl:44
-msgid "Regular expression for matching dfs share names"
-msgstr "Expresión regular para encontrar nombre de compartidos DFS"
-
-#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
-msgid "Distributed File System Administration"
-msgstr ""
+#: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
+msgid "Fully Automatic Installation"
+msgstr "Instalación Totalmente Automática"
 
-#: plugins/admin/fai/class_faiScript.inc:241
-#: plugins/admin/fai/class_faiTemplate.inc:214
+#: plugins/admin/fai/class_faiScript.inc:261
+#: plugins/admin/fai/class_faiTemplate.inc:260
 #: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:265
+#: plugins/admin/fai/class_faiHook.inc:283
 #: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/admin/applications/generic.tpl:103
 msgid "Download"
 msgstr "Descargar"
 
-#: plugins/admin/fai/class_faiScript.inc:303
+#: plugins/admin/fai/class_faiScript.inc:323
 msgid "Removing FAI script base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:354
+#: plugins/admin/fai/class_faiScript.inc:359
+#: plugins/admin/fai/class_faiProfile.inc:400
+#, php-format
+msgid ""
+"Can't insert a script named '%s' in '%s' there is already a script with the "
+"given name."
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:392
 msgid "Creating FAI script base failed"
 msgstr "Ha fallado la Creación de la base del script FAI"
 
-#: plugins/admin/fai/class_faiScript.inc:424
+#: plugins/admin/fai/class_faiScript.inc:476
 msgid "Removing FAI script failed"
 msgstr "Ha fallado la eliminación del script FAI"
 
-#: plugins/admin/fai/class_faiScript.inc:443
+#: plugins/admin/fai/class_faiScript.inc:495
 msgid "Saving FAI script failed"
 msgstr "Ha fallado la grabación del script FAI"
 
@@ -5076,16 +5221,23 @@ msgstr "Ha fallado la grabación del script FAI"
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:325
+#: plugins/admin/fai/class_faiTemplate.inc:356
+#, php-format
+msgid ""
+"Can't insert a fai template named '%s' in '%s' there is already a template "
+"with the given name."
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:389
 msgid "Saving FAI template base failed"
 msgstr "Ha fallado la grabación de la base de la plantilla FAI"
 
-#: plugins/admin/fai/class_faiTemplate.inc:386
+#: plugins/admin/fai/class_faiTemplate.inc:467
 msgid "Removing FAI template base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplate.inc:391
-#: plugins/admin/fai/class_faiTemplate.inc:404
+#: plugins/admin/fai/class_faiTemplate.inc:472
+#: plugins/admin/fai/class_faiTemplate.inc:485
 msgid "Saving FAI template failed"
 msgstr "Ha fallado la grabación de la la plantilla FAI"
 
@@ -5097,46 +5249,46 @@ msgstr "FAI"
 msgid "Fully Automatic Installation - management"
 msgstr "Gestión - Instalación totalmente automática"
 
-#: plugins/admin/fai/class_faiManagement.inc:153
+#: plugins/admin/fai/class_faiManagement.inc:179
 #, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr "Esta a punto de borrar toda la información sobre la clase FAI en '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:159
-#: plugins/admin/fai/class_faiManagement.inc:202
-#: plugins/admin/systems/class_systemManagement.inc:313
-#: plugins/admin/systems/class_systemManagement.inc:373
+#: plugins/admin/fai/class_faiManagement.inc:185
+#: plugins/admin/fai/class_faiManagement.inc:229
+#: plugins/admin/systems/class_systemManagement.inc:385
+#: plugins/admin/systems/class_systemManagement.inc:445
 msgid "You are not allowed to delete this component!"
 msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/fai/class_faiManagement.inc:255
+#: plugins/admin/fai/class_faiManagement.inc:282
 #, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr "Está a punto de borrar la rama FAI / suspendida '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:258
+#: plugins/admin/fai/class_faiManagement.inc:285
 msgid "You are not allowed to delete this release!"
 msgstr "¡No le es permitido borrar esta versión!"
 
-#: plugins/admin/fai/class_faiManagement.inc:313
+#: plugins/admin/fai/class_faiManagement.inc:341
 msgid "Specified branch name is invalid."
 msgstr "El nombre de la rama especificado no es válido."
 
-#: plugins/admin/fai/class_faiManagement.inc:315
+#: plugins/admin/fai/class_faiManagement.inc:343
 msgid "Specified freeze name is invalid."
 msgstr "El nombre de la rama suspendida especificada no es valido."
 
-#: plugins/admin/fai/class_faiManagement.inc:322
+#: plugins/admin/fai/class_faiManagement.inc:350
+#: plugins/admin/systems/class_servRepository.inc:212
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:351
-#: plugins/admin/systems/class_servRepository.inc:208
 msgid "This name is already in use."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/fai/class_faiManagement.inc:392
-#: plugins/admin/fai/class_faiManagement.inc:545
+#: plugins/admin/fai/class_faiManagement.inc:420
+#: plugins/admin/fai/class_faiManagement.inc:574
 #: plugins/admin/fai/faiPackageNew.tpl:50 plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:410
-#: plugins/admin/departments/class_departmentGeneric.inc:495
+#: plugins/admin/departments/class_departmentGeneric.inc:421
+#: plugins/admin/departments/class_departmentGeneric.inc:506
 #: plugins/admin/systems/SelectDeviceType.tpl:44
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
@@ -5149,24 +5301,78 @@ msgstr "El nombre especificado ya esta siendo usado"
 msgid "Continue"
 msgstr "Continuar"
 
-#: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
-msgid "Fully Automatic Installation"
-msgstr "Instalación Totalmente Automática"
-
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
-#: plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
-msgid "Objects"
-msgstr "Objetos"
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+msgid "Please enter your search string here"
+msgstr "Por favor introduzca una cadena de búsqueda"
 
-#: plugins/admin/fai/faiPartitionTable.tpl:34
-msgid "Discs"
-msgstr "Discos"
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr ""
 
-#: plugins/admin/fai/faiPartitionTable.tpl:40
-msgid "Choose a disk to delete or edit"
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
+
+#: plugins/admin/fai/branch_selector.tpl:3
+#: plugins/admin/applications/release_select.tpl:3
+msgid "Branches"
+msgstr "Ramas"
+
+#: plugins/admin/fai/branch_selector.tpl:9
+#: plugins/admin/applications/release_select.tpl:9
+msgid "Current release"
+msgstr "Versión actual"
+
+#: plugins/admin/fai/branch_selector.tpl:21
+msgid "Create new branch"
+msgstr "Crear una nueva rama"
+
+#: plugins/admin/fai/branch_selector.tpl:25
+msgid "Create new locked branch"
+msgstr "Crear una nueva rama bloqueada"
+
+#: plugins/admin/fai/branch_selector.tpl:30
+msgid "Delete current release"
+msgstr "Eliminar la versión actual"
+
+#: plugins/admin/fai/faiSummary.tpl:4
+msgid "FAI object tree"
+msgstr "Árbol de objetos FAI"
+
+#: plugins/admin/fai/faiSummary.tpl:9
+msgid "Reload class and release configuration from parent object."
+msgstr ""
+
+#: plugins/admin/fai/remove.tpl:7
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Esto incluye <b>todo</b> la información de objeto. Por favor pulse dos veces "
+"si realmente quiere hacer esto, ya que una vez hecho esto, no hay forma de "
+"que GOsa recupere la información."
+
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
+"actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
+"presione 'Eliminar' para continuar o 'Cancelar' para abortar."
+
+#: plugins/admin/fai/faiPartitionTable.tpl:34
+msgid "Discs"
+msgstr "Discos"
+
+#: plugins/admin/fai/faiPartitionTable.tpl:40
+msgid "Choose a disk to delete or edit"
 msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:6
@@ -5208,7 +5414,7 @@ msgstr "Mostrar solo clases con particiones"
 #: plugins/admin/fai/faiPackageEntry.tpl:42
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/systems/servRepository.tpl:46
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
+#: plugins/admin/ogroups/ogroup_objects.tpl:45
 msgid "Display objects matching"
 msgstr "Mostrar objetos que concuerden con"
 
@@ -5216,10 +5422,59 @@ msgstr "Mostrar objetos que concuerden con"
 #: plugins/admin/fai/faiPackageEntry.tpl:46
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/systems/servRepository.tpl:50
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
+#: plugins/admin/ogroups/ogroup_objects.tpl:46
 msgid "Regular expression for matching object names"
 msgstr "Expresiones regulares que concuerden con nombres de objetos"
 
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paquete"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:39
+msgid "Scripts"
+msgstr "Scripts"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:43
+#: plugins/admin/fai/class_faiProfile.inc:303
+#: plugins/admin/fai/class_faiProfileEntry.inc:144
+msgid "Partition table"
+msgstr "Tabla de particiones"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
+msgid "Package list"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:201
+msgid "This object has no FAI classes assigned."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:213
+msgid "Open"
+msgstr "Abierto"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:320
+msgid "No."
+msgstr "No."
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:322
+msgid "FS options"
+msgstr "Opciones FS"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:323
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:209
+msgid "Mount options"
+msgstr "Opciones de Montaje"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:324
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:208
+msgid "Size in MB"
+msgstr "Tamaño en Mb"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:325
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:207
+msgid "Mount point"
+msgstr "Punto de montaje"
+
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
 #: plugins/admin/fai/class_faiHookEntry.inc:71
 msgid "Please select a valid file."
@@ -5241,14 +5496,6 @@ msgstr "Por favor introduzca un nombre."
 msgid "Please enter a script."
 msgstr "Por favor introduzca un script."
 
-#: plugins/admin/fai/faiVariable.tpl:34
-msgid "List of assigned variables"
-msgstr "Lista de variables asignadas"
-
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr ""
-
 #: plugins/admin/fai/faiScriptEntry.tpl:29
 #: plugins/admin/groups/class_divListGroup.inc:50
 #: plugins/admin/users/class_divListUsers.inc:51
@@ -5274,45 +5521,54 @@ msgstr "Elija una prioridad"
 msgid "Import script"
 msgstr "Script de importación"
 
-#: plugins/admin/fai/class_faiPackage.inc:340
+#: plugins/admin/fai/class_faiPackage.inc:350
 msgid "Removing FAI package base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:369
+#: plugins/admin/fai/class_faiPackage.inc:379
 msgid "Please select a least one Package."
 msgstr "Por favor seleccione al menos un Paquete."
 
-#: plugins/admin/fai/class_faiPackage.inc:373
+#: plugins/admin/fai/class_faiPackage.inc:383
 msgid "Please choose a valid combination for your repository setup."
-msgstr "Por favor especifique una combinación valida para la configuración de su repositorio."
+msgstr ""
+"Por favor especifique una combinación valida para la configuración de su "
+"repositorio."
+
+#: plugins/admin/fai/class_faiPackage.inc:396
+#, php-format
+msgid ""
+"Can't insert a fai package list named '%s' in '%s' there is already a "
+"package list with the given name."
+msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:394
+#: plugins/admin/fai/class_faiPackage.inc:418
 msgid "package is configured"
 msgstr "El paquete está configurado"
 
-#: plugins/admin/fai/class_faiPackage.inc:400
+#: plugins/admin/fai/class_faiPackage.inc:424
 msgid "Package marked for removal"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:425
+#: plugins/admin/fai/class_faiPackage.inc:449
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:484
+#: plugins/admin/fai/class_faiPackage.inc:513
 msgid "Saving FAI package base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:529
+#: plugins/admin/fai/class_faiPackage.inc:558
 msgid "Saving FAI package entry failed"
 msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:21
 #: plugins/admin/fai/faiPackageNew.tpl:24
-#: plugins/admin/systems/class_servRepository.inc:248
-#: plugins/admin/systems/servRepositorySetup.tpl:17
 #: plugins/admin/systems/workstationStartup.tpl:45
 #: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/class_servRepository.inc:252
+#: plugins/admin/systems/servRepositorySetup.tpl:17
 msgid "Release"
 msgstr "Versión"
 
@@ -5341,85 +5597,86 @@ msgstr "Configurar"
 msgid "Toggle remove flag"
 msgstr "Cambiar la marca de eliminación"
 
-#: plugins/admin/fai/class_faiHook.inc:332
+#: plugins/admin/fai/class_faiHook.inc:350
 msgid "Removing FAI hook base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:383
+#: plugins/admin/fai/class_faiHook.inc:386
+#, php-format
+msgid ""
+"Can't insert a fai hook named '%s' in '%s' there is already a hook with the "
+"given name."
+msgstr ""
+
+#: plugins/admin/fai/class_faiHook.inc:419
 msgid "Saving FAI hook base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:451
+#: plugins/admin/fai/class_faiHook.inc:509
 msgid "Removing FAI hook failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiHook.inc:457
-#: plugins/admin/fai/class_faiHook.inc:467
+#: plugins/admin/fai/class_faiHook.inc:515
+#: plugins/admin/fai/class_faiHook.inc:525
 msgid "Saving FAI hook failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:289
-#: plugins/admin/fai/class_faiProfileEntry.inc:152
+#: plugins/admin/fai/class_faiProfile.inc:295
+#: plugins/admin/fai/class_faiProfileEntry.inc:172
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:292
-#: plugins/admin/fai/class_faiProfileEntry.inc:119
+#: plugins/admin/fai/class_faiProfile.inc:298
+#: plugins/admin/fai/class_faiProfileEntry.inc:139
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:293
-#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#: plugins/admin/fai/class_faiProfile.inc:299
+#: plugins/admin/fai/class_faiProfileEntry.inc:140
 msgid "Template bundle"
 msgstr "Plantilla de paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:294
-#: plugins/admin/fai/class_faiProfileEntry.inc:121
+#: plugins/admin/fai/class_faiProfile.inc:300
+#: plugins/admin/fai/class_faiProfileEntry.inc:141
 msgid "Script bundle"
 msgstr "Script del paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:295
-#: plugins/admin/fai/class_faiProfileEntry.inc:122
+#: plugins/admin/fai/class_faiProfile.inc:301
+#: plugins/admin/fai/class_faiProfileEntry.inc:142
 msgid "Variable bundle"
 msgstr "Variables del paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:296
+#: plugins/admin/fai/class_faiProfile.inc:302
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:297
-#: 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:306
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:304
+#: plugins/admin/fai/class_faiProfile.inc:310
 #: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
 msgid "Down"
 msgstr "Abajo"
 
-#: plugins/admin/fai/class_faiProfile.inc:359
+#: plugins/admin/fai/class_faiProfile.inc:365
 msgid "Removing FAI profile failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:383
+#: plugins/admin/fai/class_faiProfile.inc:405
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:387
+#: plugins/admin/fai/class_faiProfile.inc:409
 msgid "Please enter a valid name."
 msgstr "Por favor introduzca un nombre válido"
 
-#: plugins/admin/fai/class_faiProfile.inc:395
+#: plugins/admin/fai/class_faiProfile.inc:424
 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:429
+#: plugins/admin/fai/class_faiProfile.inc:463
 msgid "Saving FAI profile failed"
 msgstr ""
 
@@ -5427,72 +5684,70 @@ msgstr ""
 msgid "FAI classes"
 msgstr "Clases FAI"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
-msgid "FS type"
-msgstr "Tipo de FS"
-
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
-#: plugins/admin/fai/class_faiSummaryTab.inc:325
-msgid "Mount point"
-msgstr "Punto de montaje"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#, fuzzy
+msgid "primary"
+msgstr "Grupo primario"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
-#: plugins/admin/fai/class_faiSummaryTab.inc:324
-msgid "Size in MB"
-msgstr "Tamaño en Mb"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#, fuzzy
+msgid "logical"
+msgstr "Añadir Cuenta Local"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
-#: plugins/admin/fai/class_faiSummaryTab.inc:323
-msgid "Mount options"
-msgstr "Opciones de Montaje"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:206
+msgid "FS type"
+msgstr "Tipo de FS"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:210
 msgid "FS option"
 msgstr "Opciones de FS"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:211
 msgid "Preserve"
 msgstr "Preservar"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:367
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:372
 #, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr "Por favor introduzca un punto de montaje valido para la partición %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:377
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:381
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:391
 #, php-format
 msgid "Please enter a valid partition size for partition %s."
-msgstr "Por favor introduzca un tamaño de partición valido para la partición %s."
+msgstr ""
+"Por favor introduzca un tamaño de partición valido para la partición %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:397
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:399
 #, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr "Por favor introduzca un rango valido para la partición %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:393
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:404
 #, php-format
 msgid "Please enter a range for partition size for partition %s."
-msgstr "Por favor introduzca un rango para el tamaño de la partición valido para la partición %s."
+msgstr ""
+"Por favor introduzca un rango para el tamaño de la partición valido para la "
+"partición %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:408
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:419
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
@@ -5510,14 +5765,104 @@ 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"
 
+#: plugins/admin/fai/faiPackageNew.tpl:1
+msgid "Repository settings"
+msgstr "Parámetros del repositorio"
+
+#: plugins/admin/fai/faiPackageNew.tpl:3
+msgid ""
+"To add packages to your package list you have to setup the repository "
+"settings first."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:5
+msgid ""
+"Packages are usually stored on different servers called mirrors. These "
+"mirrors have different types of releases (for example woody/sarge/etch), "
+"which finally contain packages sorted by section."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:8
+msgid ""
+"Section and release can't be changed in future dialogs, but the mirror can "
+"be changed by editing the entry."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:14
+msgid ""
+"First select the preferred release, then the section and finally the mirror."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:26
+msgid "please choose a release..."
+msgstr "por favor elija una versión..."
+
+#: plugins/admin/fai/faiPackageNew.tpl:31 plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/servdnseditzone.tpl:67
+#: plugins/gofon/phoneaccount/generic.tpl:67
+msgid "Refresh"
+msgstr "Refrescar"
+
+#: plugins/admin/fai/faiPackageNew.tpl:37
+msgid "Sections for this release"
+msgstr "Secciones para esta versión"
+
 #: plugins/admin/fai/class_faiVariableEntry.inc:98
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Por favor especifique un valor para el atributo 'contenido'."
 
+#: plugins/admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:7
+msgid ""
+"Branches are created as subreleases of the currently selected branch. "
+"Creating a new branch named 1.0.2 in SARGE for example, will result in a new "
+"release called SARGE/1.0.2."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:13
+msgid "Please enter a name for the branch"
+msgstr "Por favor introduzca un nombre para la rama"
+
+#: plugins/admin/fai/faiNewBranch.tpl:35
+#: plugins/admin/departments/dep_iframe.tpl:1
+msgid "Processing the requested operation"
+msgstr "Procesando la operación pedida"
+
+#: plugins/admin/fai/faiNewBranch.tpl:36
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+#: plugins/admin/departments/dep_iframe.tpl:8
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:44
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:44
+msgid "Initiate operation"
+msgstr "Iniciando operación"
+
 #: plugins/admin/fai/faiVariableEntry.tpl:29
 msgid "Variable attributes"
 msgstr "Atributos de las variables"
@@ -5530,57 +5875,239 @@ msgstr "Contenido de la Variable"
 msgid "List of template files"
 msgstr "Lista de ficheros plantillas"
 
-#: plugins/admin/fai/remove.tpl:7
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Esto incluye <b>todo</b> la información de objeto. Por "
-"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
-"esto, no hay forma de que GOsa recupere la información."
+#: plugins/admin/fai/faiPackageEntry.tpl:6
+msgid "List of available packages"
+msgstr "Lista de paquetes disponibles"
 
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
+#: plugins/admin/fai/faiPackageEntry.tpl:26
 msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+"This menu allows you to select multiple packages to add them to the "
+"currently edited package list."
 msgstr ""
-"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
-"actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
-"presione 'Eliminar' para continuar o 'Cancelar' para abortar."
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:269
-#: plugins/admin/fai/class_faiPartitionTable.inc:275
-#, php-format
-msgid "%s partition"
-msgstr "partición %s"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:271
-#: plugins/admin/fai/class_faiPartitionTable.inc:277
-#, php-format
+#: plugins/admin/fai/class_divListFai.inc:43
+msgid "List of FAI classes"
+msgstr "Lista de clases FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:44
+#, fuzzy
+msgid "This table displays all FAI classes in the selected tree."
+msgstr "Esta tabla muestra todas las aplicaciones en el árbol seleccionado."
+
+#: plugins/admin/fai/class_divListFai.inc:48
+msgid "This menu allows you to create, delete and edit FAI classes."
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:58
+msgid "Name of FAI class"
+msgstr "Nombre de las clases FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:59
+msgid "Class type"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:62
+msgid "Display FAI profile objects"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:62
+msgid "Show profiles"
+msgstr "Mostrar perfiles"
+
+#: plugins/admin/fai/class_divListFai.inc:63
+msgid "Display FAI template objects"
+msgstr "Mostrar objetos de plantilla FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:63
+#: plugins/admin/users/class_divListUsers.inc:54
+msgid "Show templates"
+msgstr "Mostrar plantillas"
+
+#: plugins/admin/fai/class_divListFai.inc:64
+msgid "Display FAI scripts"
+msgstr "Mostrar scrips FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:64
+msgid "Show scripts"
+msgstr "Mostrar scrips"
+
+#: plugins/admin/fai/class_divListFai.inc:65
+msgid "Display FAI hooks"
+msgstr "Mostrar acciones FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:65
+msgid "Show hooks"
+msgstr "Mostrar acciones"
+
+#: plugins/admin/fai/class_divListFai.inc:66
+msgid "Display FAI variables"
+msgstr "Mostrar variables FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:66
+msgid "Show variables"
+msgstr "Mostrar variables"
+
+#: plugins/admin/fai/class_divListFai.inc:67
+msgid "Display FAI packages"
+msgstr "Mostrar paquetes FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:67
+msgid "Show packages"
+msgstr "Mostrar paquetes"
+
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Display FAI partitions"
+msgstr "Mostrar particiones FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Show partitions"
+msgstr "Mostrar particiones"
+
+#: plugins/admin/fai/class_divListFai.inc:127
+#: plugins/admin/departments/class_divListDepartment.inc:71
+msgid "Go to users home department"
+msgstr "Ir al departamento base de los usuarios"
+
+#: plugins/admin/fai/class_divListFai.inc:135
+msgid "New profile"
+msgstr "Nuevo perfil"
+
+#: plugins/admin/fai/class_divListFai.inc:135
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "P"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:140
+msgid "New partition table"
+msgstr "Nueva tabla de particiones"
+
+#: plugins/admin/fai/class_divListFai.inc:140
+msgid "PT"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:143
+msgid "New scripts"
+msgstr "Nuevos scripts"
+
+#: plugins/admin/fai/class_divListFai.inc:143
+msgid "S"
+msgstr "S"
+
+#: plugins/admin/fai/class_divListFai.inc:146
+msgid "New hooks"
+msgstr "Nuevas acciones"
+
+#: plugins/admin/fai/class_divListFai.inc:146
+msgid "H"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:149
+msgid "New variables"
+msgstr "Nuevas variables"
+
+#: plugins/admin/fai/class_divListFai.inc:149
+msgid "V"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:152
+msgid "New templates"
+msgstr "Nuevas plantillas"
+
+#: plugins/admin/fai/class_divListFai.inc:152
+msgid "T"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:155
+msgid "New package list"
+msgstr "Nueva lista de paquetes"
+
+#: plugins/admin/fai/class_divListFai.inc:155
+msgid "PK"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:224
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/users/class_divListUsers.inc:139
+#: plugins/admin/applications/class_divListApplication.inc:153
+#: plugins/admin/ogroups/class_divListOGroup.inc:133
+msgid "cut"
+msgstr "Cortar"
+
+#: plugins/admin/fai/class_divListFai.inc:224
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/users/class_divListUsers.inc:139
+#: plugins/admin/applications/class_divListApplication.inc:153
+#: plugins/admin/ogroups/class_divListOGroup.inc:133
+msgid "Cut this entry"
+msgstr "Cortar por esta entrada"
+
+#: plugins/admin/fai/class_divListFai.inc:227
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/applications/class_divListApplication.inc:155
+#: plugins/admin/ogroups/class_divListOGroup.inc:135
+msgid "copy"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:227
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/applications/class_divListApplication.inc:155
+#: plugins/admin/ogroups/class_divListOGroup.inc:135
+msgid "Copy this entry"
+msgstr "Copiar esta entrada"
+
+#: plugins/admin/fai/class_divListFai.inc:232
+#: plugins/admin/fai/class_divListFai.inc:237
+msgid "Edit class"
+msgstr "Editar clase"
+
+#: plugins/admin/fai/class_divListFai.inc:239
+msgid "Delete class"
+msgstr "Eliminar clase"
+
+#: plugins/admin/fai/faiHook.tpl:36
+msgid "List of hook scripts"
+msgstr "Lista de scripts de acciones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:274
+#: plugins/admin/fai/class_faiPartitionTable.inc:280
+#, php-format
+msgid "%s partition"
+msgstr "partición %s"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:276
+#: plugins/admin/fai/class_faiPartitionTable.inc:282
+#, php-format
 msgid "%s partition(s)"
 msgstr "partición(es) %s"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:348
+#: plugins/admin/fai/class_faiPartitionTable.inc:334
+#, php-format
+msgid ""
+"Can't insert a new fai partition table named '%s' in '%s' there is already "
+"one defined with the given name."
+msgstr ""
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:371
 msgid "Saving FAI partition table base failed"
 msgstr "Ha fallado la grabación de la base de la tabla de particiones FAI"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:390
+#: plugins/admin/fai/class_faiPartitionTable.inc:418
 msgid "Removing FAI partition table failed"
 msgstr "Ha fallado la eliminación de la tabla de particiones FAI"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:398
-#: plugins/admin/fai/class_faiPartitionTable.inc:407
+#: plugins/admin/fai/class_faiPartitionTable.inc:426
+#: plugins/admin/fai/class_faiPartitionTable.inc:435
 msgid "Saving FAI partition table failed"
 msgstr "Ha fallado la grabación de la tabla de particiones FAI"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:455
+#: plugins/admin/fai/class_faiPartitionTable.inc:504
 msgid "Removing FAI partition table entry failed"
 msgstr "Ha fallado la eliminación de la entrada en la tabla de particiones FAI"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:464
-#: plugins/admin/fai/class_faiPartitionTable.inc:472
+#: plugins/admin/fai/class_faiPartitionTable.inc:525
+#: plugins/admin/fai/class_faiPartitionTable.inc:536
 msgid "Saving FAI partition table entry failed"
 msgstr "Ha fallado la grabación de la entrada en la tabla de particiones FAI"
 
@@ -5588,11 +6115,11 @@ msgstr "Ha fallado la grabación de la entrada en la tabla de particiones FAI"
 msgid "Please enter a value for script."
 msgstr "Por favor introduzca un valor para el script"
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:123
+#: plugins/admin/fai/class_faiProfileEntry.inc:143
 msgid "Package bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfileEntry.inc:154
+#: plugins/admin/fai/class_faiProfileEntry.inc:174
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 msgid "Class name"
 msgstr "Nombre de la clase"
@@ -5609,16 +6136,28 @@ msgstr "Tareas"
 msgid "Choose an existing FAI task"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:294
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr ""
+
+#: plugins/admin/fai/class_faiVariable.inc:284
+#, php-format
+msgid ""
+"Can't insert a fai variable named '%s' in '%s' there is already a variable "
+"with the given name."
+msgstr ""
+
+#: plugins/admin/fai/class_faiVariable.inc:317
 msgid "Saving FAI variable base failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:356
+#: plugins/admin/fai/class_faiVariable.inc:383
 msgid "Removing FAI variable failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiVariable.inc:363
-#: plugins/admin/fai/class_faiVariable.inc:375
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/class_faiVariable.inc:402
 msgid "Saving FAI variable failed"
 msgstr ""
 
@@ -5690,12 +6229,12 @@ msgid "Choose class name"
 msgstr "Elija nombre de clase"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
-#: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/glpiDeviceManagement.tpl:51
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:51
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/glpiAttachmentPool.tpl:51
 msgid "Use"
 msgstr "Usa"
 
@@ -5703,6 +6242,16 @@ msgstr "Usa"
 msgid "A new class name."
 msgstr "Un nuevo nombre de clase."
 
+#: plugins/admin/fai/remove_branch.tpl:6
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
+"etc. de esta rama. Por favor pulse dos veces si quiere realmente hacer esto, "
+"ya que no hay manera de que GOsa recupere posteriormente la información."
+
 #: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
 msgstr "no se ha subido ningún archivo todavía"
@@ -5726,7 +6275,8 @@ msgstr "Por favor introduzca un usuario."
 
 #: plugins/admin/fai/class_faiTemplateEntry.inc:199
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
-msgstr "Por favor especifique un usuario valido. Solo están permitidos a-Z/0-9."
+msgstr ""
+"Por favor especifique un usuario valido. Solo están permitidos a-Z/0-9."
 
 #: plugins/admin/fai/class_faiTemplateEntry.inc:203
 msgid "Please enter a group."
@@ -5751,8 +6301,8 @@ msgstr "Guardar plantilla"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
 #: plugins/admin/applications/generic.tpl:102
-#: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 msgid "Upload"
 msgstr "Enviar"
 
@@ -5767,8 +6317,8 @@ msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:753
-#: plugins/admin/systems/class_printGeneric.inc:755
+#: plugins/admin/systems/class_printGeneric.inc:801
+#: plugins/admin/systems/class_printGeneric.inc:803
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
@@ -5793,7 +6343,7 @@ msgstr "Escritura"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/server.tpl:60 plugins/admin/systems/terminal.tpl:125
+#: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
 #: plugins/admin/systems/workstation.tpl:103
 #: plugins/admin/ogroups/termgroup.tpl:85
 msgid "Execute"
@@ -5819,607 +6369,350 @@ msgstr "Otros"
 msgid "sticky"
 msgstr "estatico"
 
-#: plugins/admin/fai/faiHook.tpl:34
-msgid "List of hook scripts"
-msgstr "Lista de scripts de acciones"
+#: plugins/admin/groups/application.tpl:3
+msgid "Release focus"
+msgstr "Enfocado a la versión"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
-msgid "Please enter your search string here"
-msgstr "Por favor introduzca una cadena de búsqueda"
+#: plugins/admin/groups/application.tpl:5
+msgid "Select release name"
+msgstr "Seleccione nombre de la versión"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid "This list displays all assigned package names for this repository settings."
-msgstr ""
+#: plugins/admin/groups/application.tpl:16
+msgid "Used applications"
+msgstr "Aplicaciones Usadas"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
-#, php-format
-msgid ""
-"Your specified search string '%s' returned too many results. Only the first "
-"200 entries are shown, to keep the memory usage low."
-msgstr ""
+#: plugins/admin/groups/application.tpl:19
+msgid "Add category"
+msgstr "Añadir categoría"
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-msgid "Package"
-msgstr "Paquete"
+#: plugins/admin/groups/application.tpl:24
+msgid "Available applications"
+msgstr "Aplicaciones disponibles"
 
-#: plugins/admin/fai/faiPackageNew.tpl:1
-msgid "Repository settings"
-msgstr "Parámetros del repositorio"
+#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
+msgid "Primary mail address for this shared folder"
+msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
 
-#: plugins/admin/fai/faiPackageNew.tpl:3
-msgid ""
-"To add packages to your package list you have to setup the repository "
-"settings first."
-msgstr ""
+#: plugins/admin/groups/mail.tpl:16
+msgid "Select mail server to place user on"
+msgstr "Seleccione el servidor de correo del usuario"
 
-#: plugins/admin/fai/faiPackageNew.tpl:5
-msgid ""
-"Packages are usually stored on different servers called mirrors. These "
-"mirrors have different types of releases (for example woody/sarge/etch), "
-"which finally contain packages sorted by section."
-msgstr ""
+#: plugins/admin/groups/mail.tpl:63
+msgid "IMAP shared folders"
+msgstr "Carpetas compartidas IMAP"
 
-#: plugins/admin/fai/faiPackageNew.tpl:8
-msgid ""
-"Section and release can't be changed in future dialogs, but the mirror can "
-"be changed by editing the entry."
-msgstr ""
+#: plugins/admin/groups/mail.tpl:67
+msgid "Default permission"
+msgstr "Permisos por defecto"
 
-#: plugins/admin/fai/faiPackageNew.tpl:14
-msgid "First select the preferred release, then the section and finally the mirror."
+#: plugins/admin/groups/mail.tpl:76
+msgid "Member permission"
+msgstr "Miembro con Permisos"
+
+#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
+msgid "Forward messages to non group members"
+msgstr "Reenviar mensajes a miembros que no sean del grupo"
+
+#: plugins/admin/groups/remove.tpl:6
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
 msgstr ""
+"Este puede ser un grupo primario. Por favor pinche dos veces si realmente "
+"quiere hacerlo, dado que GOsa no tiene manera de recuperar esta información."
 
-#: plugins/admin/fai/faiPackageNew.tpl:26
-msgid "please choose a release..."
-msgstr "por favor elija una versión..."
+#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
+msgid "Group administration"
+msgstr "Administración de grupos"
 
-#: plugins/admin/fai/faiPackageNew.tpl:31 plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/servdnseditzone.tpl:67
-#: plugins/gofon/phoneaccount/generic.tpl:67
-msgid "Refresh"
-msgstr "Refrescar"
+#: plugins/admin/groups/class_groupManagement.inc:25 html/getxls.php:97
+#: html/getxls.php:99 html/getxls.php:244
+msgid "Groups"
+msgstr "Grupos"
 
-#: plugins/admin/fai/faiPackageNew.tpl:37
-msgid "Sections for this release"
-msgstr "Secciones para esta versión"
+#: plugins/admin/groups/class_groupManagement.inc:244
+#, php-format
+msgid "You're about to delete the group '%s'."
+msgstr "Está a punto de borrar el grupo '%s'."
 
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
+#: plugins/admin/groups/class_groupManagement.inc:250
+#: plugins/admin/groups/class_groupManagement.inc:281
+msgid "You are not allowed to delete this group!"
+msgstr "¡No le está permitido eliminar este grupo!"
+
+#: plugins/admin/groups/class_groupGeneric.inc:123
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
+"¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
+"archivo de configuración!"
 
-#: plugins/admin/fai/faiNewBranch.tpl:11
-msgid "Please enter a name for the branch"
-msgstr "Por favor introduzca un nombre para la rama"
+#: plugins/admin/groups/class_groupGeneric.inc:179
+msgid "This 'dn' is no group."
+msgstr "Este 'dn' no es un grupo."
 
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/dep_iframe.tpl:1
-msgid "Processing the requested operation"
-msgstr "Procesando la operación pedida"
+#: plugins/admin/groups/class_groupGeneric.inc:319
+msgid "Samba group"
+msgstr "Grupo de samba"
 
-#: plugins/admin/fai/faiNewBranch.tpl:34
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management "
-"dialog."
-msgstr ""
+#: plugins/admin/groups/class_groupGeneric.inc:319
+msgid "Domain admins"
+msgstr "Administradores del dominio"
 
-#: plugins/admin/fai/faiNewBranch.tpl:40
-#: plugins/admin/departments/dep_iframe.tpl:8
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
+#: plugins/admin/groups/class_groupGeneric.inc:319
+msgid "Domain users"
+msgstr "Usuarios del dominio"
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid "Perform requested operation."
-msgstr ""
+#: plugins/admin/groups/class_groupGeneric.inc:320
+msgid "Domain guests"
+msgstr "Invitados del dominio"
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid "Initiate operation"
-msgstr "Iniciando operación"
+#: plugins/admin/groups/class_groupGeneric.inc:325
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
 
-#: plugins/admin/fai/faiPackageEntry.tpl:6
-msgid "List of available packages"
-msgstr "Lista de paquetes disponibles"
+#: plugins/admin/groups/class_groupGeneric.inc:437
+msgid "! unknown id"
+msgstr "! id desconocido"
 
-#: plugins/admin/fai/faiPackageEntry.tpl:26
+#: plugins/admin/groups/class_groupGeneric.inc:478
+#, php-format
 msgid ""
-"This menu allows you to select multiple packages to add them to the "
-"currently edited package list."
+"Your search method returned more than '%s' users, only '%s' users are shown."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
-#, php-format
-msgid "Debconf information for package '%s'"
+#: plugins/admin/groups/class_groupGeneric.inc:507
+msgid "Removing group failed"
 msgstr ""
 
-#: plugins/admin/fai/remove_branch.tpl:6
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
+#: plugins/admin/groups/class_groupGeneric.inc:614
+#, php-format
+msgid "No configured SID found for '%s'."
 msgstr ""
-"Esto incluye toda las información de cuentas, reglas de acceso al sistema, etc. de esta rama. Por favor pulse dos veces si "
-"quiere realmente hacer esto, ya que no hay manera de que GOsa recupere "
-"posteriormente la información."
-
-#: plugins/admin/fai/class_faiSummaryTab.inc:39
-msgid "Scripts"
-msgstr "Scripts"
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:44
-msgid "Package list"
+#: plugins/admin/groups/class_groupGeneric.inc:619
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:201
-msgid "This object has no FAI classes assigned."
+#: plugins/admin/groups/class_groupGeneric.inc:704
+msgid "Saving group failed"
 msgstr ""
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:213
-msgid "Open"
-msgstr "Abierto"
+#: plugins/admin/groups/class_groupGeneric.inc:733
+#: plugins/admin/ogroups/class_ogroup.inc:613
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr "No tiene permisos para crear un grupo en esta 'Base'."
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:320
-msgid "No."
-msgstr "No."
+#: plugins/admin/groups/class_groupGeneric.inc:743
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
+"numeros y guiones."
 
-#: plugins/admin/fai/class_faiSummaryTab.inc:322
-msgid "FS options"
-msgstr "Opciones FS"
+#: plugins/admin/groups/class_groupGeneric.inc:755
+#: plugins/admin/groups/class_groupGeneric.inc:769
+#: plugins/admin/groups/class_groupGeneric.inc:776
+msgid "Value specified as 'Name' is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/fai/faiSummary.tpl:4
-msgid "FAI object tree"
-msgstr "Árbol de objetos FAI"
+#: plugins/admin/groups/class_divListGroup.inc:35
+#: plugins/admin/groups/class_divListGroup.inc:36
+msgid "List of groups"
+msgstr "Lista de grupos"
 
-#: plugins/admin/fai/faiSummary.tpl:9
-msgid "Reload class and release configuration from parent object."
+#: plugins/admin/groups/class_divListGroup.inc:41
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
 msgstr ""
+"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
+"usar el selector de rango en la parte superior de la lista de grupos, cuando "
+"trabaja con un gran número de grupos."
 
-#: plugins/admin/fai/branch_selector.tpl:3
-#: plugins/admin/applications/release_select.tpl:3
-msgid "Branches"
-msgstr "Ramas"
+#: plugins/admin/groups/class_divListGroup.inc:49
+msgid "Groupname / Department"
+msgstr "Nombre de grupo / Departamento"
 
-#: plugins/admin/fai/branch_selector.tpl:9
-#: plugins/admin/applications/release_select.tpl:9
-msgid "Current release"
-msgstr "Versión actual"
+#: plugins/admin/groups/class_divListGroup.inc:54
+msgid "Select to see groups that are primary groups of users"
+msgstr "Seleccione para ver que grupos son grupos primarios de usuarios"
 
-#: plugins/admin/fai/branch_selector.tpl:21
-msgid "Create new branch"
-msgstr "Crear una nueva rama"
+#: plugins/admin/groups/class_divListGroup.inc:54
+msgid "Show primary groups"
+msgstr "Mostrar grupos primarios"
 
-#: plugins/admin/fai/branch_selector.tpl:25
-msgid "Create new locked branch"
-msgstr "Crear una nueva rama bloqueada"
+#: plugins/admin/groups/class_divListGroup.inc:55
+msgid "Select to see groups that have samba groups mappings"
+msgstr "Seleccione para ver que grupos tienen asignado un grupo samba"
 
-#: plugins/admin/fai/branch_selector.tpl:30
-msgid "Delete current release"
-msgstr "Eliminar la versión actual"
+#: plugins/admin/groups/class_divListGroup.inc:55
+msgid "Show samba groups"
+msgstr "Mostrar los grupos samba"
 
-#: plugins/admin/fai/class_divListFai.inc:43
-msgid "List of FAI classes"
-msgstr "Lista de clases FAI"
+#: plugins/admin/groups/class_divListGroup.inc:56
+msgid "Select to see groups that have applications configured"
+msgstr "Seleccione para ver que grupos tienen aplicaciones configuradas"
 
-#: plugins/admin/fai/class_divListFai.inc:44
-msgid "This table displays all systems, in the selected tree."
-msgstr ""
+#: plugins/admin/groups/class_divListGroup.inc:56
+msgid "Show application groups"
+msgstr "Mostrar los grupos de aplicaciones"
 
-#: plugins/admin/fai/class_divListFai.inc:48
-msgid "This menu allows you to create, delete and edit FAI classes."
+#: plugins/admin/groups/class_divListGroup.inc:57
+msgid "Select to see groups that have mail settings"
 msgstr ""
+"Seleccione para ver que grupos tienen configuración de correo electrónico"
 
-#: plugins/admin/fai/class_divListFai.inc:58
-msgid "Name of FAI class"
-msgstr "Nombre de las clases FAI"
+#: plugins/admin/groups/class_divListGroup.inc:57
+msgid "Show mail groups"
+msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/fai/class_divListFai.inc:59
-msgid "Class type"
-msgstr ""
+#: plugins/admin/groups/class_divListGroup.inc:58
+msgid "Select to see normal groups that have only functional aspects"
+msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
 
-#: plugins/admin/fai/class_divListFai.inc:62
-msgid "Display FAI profile objects"
-msgstr ""
+#: plugins/admin/groups/class_divListGroup.inc:58
+msgid "Show functional groups"
+msgstr "Mostrar grupos funcionales"
 
-#: plugins/admin/fai/class_divListFai.inc:62
-msgid "Show profiles"
-msgstr "Mostrar perfiles"
+#: plugins/admin/groups/class_divListGroup.inc:98
+msgid "Create new group"
+msgstr "Crear nuevo grupo"
 
-#: plugins/admin/fai/class_divListFai.inc:63
-msgid "Display FAI template objects"
-msgstr "Mostrar objetos de plantilla FAI"
+#: plugins/admin/groups/class_divListGroup.inc:126
+#: plugins/admin/users/class_divListUsers.inc:162
+msgid "Posix"
+msgstr "Posix"
 
-#: plugins/admin/fai/class_divListFai.inc:63
-#: plugins/admin/users/class_divListUsers.inc:54
-msgid "Show templates"
-msgstr "Mostrar plantillas"
+#: plugins/admin/groups/class_divListGroup.inc:132
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Aplicación"
 
-#: plugins/admin/fai/class_divListFai.inc:64
-msgid "Display FAI scripts"
-msgstr "Mostrar scrips FAI"
+#: plugins/admin/groups/class_divListGroup.inc:150
+#: plugins/admin/applications/class_divListApplication.inc:159
+#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/ogroups/class_divListOGroup.inc:138
+#: plugins/gofon/conference/class_divListConferences.inc:103
+msgid "Edit this entry"
+msgstr "Editar esta entrada"
 
-#: plugins/admin/fai/class_divListFai.inc:64
-msgid "Show scripts"
-msgstr "Mostrar scrips"
-
-#: plugins/admin/fai/class_divListFai.inc:65
-msgid "Display FAI hooks"
-msgstr "Mostrar acciones FAI"
-
-#: plugins/admin/fai/class_divListFai.inc:65
-msgid "Show hooks"
-msgstr "Mostrar acciones"
-
-#: plugins/admin/fai/class_divListFai.inc:66
-msgid "Display FAI variables"
-msgstr "Mostrar variables FAI"
-
-#: plugins/admin/fai/class_divListFai.inc:66
-msgid "Show variables"
-msgstr "Mostrar variables"
-
-#: plugins/admin/fai/class_divListFai.inc:67
-msgid "Display FAI packages"
-msgstr "Mostrar paquetes FAI"
-
-#: plugins/admin/fai/class_divListFai.inc:67
-msgid "Show packages"
-msgstr "Mostrar paquetes"
-
-#: plugins/admin/fai/class_divListFai.inc:68
-msgid "Display FAI partitions"
-msgstr "Mostrar particiones FAI"
-
-#: plugins/admin/fai/class_divListFai.inc:68
-msgid "Show partitions"
-msgstr "Mostrar particiones"
-
-#: plugins/admin/fai/class_divListFai.inc:117
-#: plugins/admin/departments/class_divListDepartment.inc:71
-msgid "Go to users home department"
-msgstr "Ir al departamento base de los usuarios"
-
-#: plugins/admin/fai/class_divListFai.inc:125
-msgid "New profile"
-msgstr "Nuevo perfil"
-
-#: plugins/admin/fai/class_divListFai.inc:125
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "P"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:130
-msgid "New partition table"
-msgstr "Nueva tabla de particiones"
-
-#: plugins/admin/fai/class_divListFai.inc:130
-msgid "PT"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:133
-msgid "New scripts"
-msgstr "Nuevos scripts"
-
-#: plugins/admin/fai/class_divListFai.inc:133
-msgid "S"
-msgstr "S"
-
-#: plugins/admin/fai/class_divListFai.inc:136
-msgid "New hooks"
-msgstr "Nuevas acciones"
-
-#: plugins/admin/fai/class_divListFai.inc:136
-msgid "H"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:139
-msgid "New variables"
-msgstr "Nuevas variables"
-
-#: plugins/admin/fai/class_divListFai.inc:139
-msgid "V"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:142
-msgid "New templates"
-msgstr "Nuevas plantillas"
-
-#: plugins/admin/fai/class_divListFai.inc:142
-msgid "T"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:145
-msgid "New package list"
-msgstr "Nueva lista de paquetes"
-
-#: plugins/admin/fai/class_divListFai.inc:145
-msgid "PK"
-msgstr ""
-
-#: plugins/admin/fai/class_divListFai.inc:210
-#: plugins/admin/fai/class_divListFai.inc:215
-msgid "Edit class"
-msgstr "Editar clase"
-
-#: plugins/admin/fai/class_divListFai.inc:217
-msgid "Delete class"
-msgstr "Eliminar clase"
-
-#: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
-msgid "Primary mail address for this shared folder"
-msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
-
-#: plugins/admin/groups/mail.tpl:16
-msgid "Select mail server to place user on"
-msgstr "Seleccione el servidor de correo del usuario"
-
-#: plugins/admin/groups/mail.tpl:63
-msgid "IMAP shared folders"
-msgstr "Carpetas compartidas IMAP"
-
-#: plugins/admin/groups/mail.tpl:67
-msgid "Default permission"
-msgstr "Permisos por defecto"
-
-#: plugins/admin/groups/mail.tpl:76
-msgid "Member permission"
-msgstr "Miembro con Permisos"
-
-#: plugins/admin/groups/mail.tpl:88 plugins/admin/groups/paste_mail.tpl:34
-msgid "Forward messages to non group members"
-msgstr "Reenviar mensajes a miembros que no sean del grupo"
-
-#: plugins/admin/groups/class_groupManagement.inc:25 html/getxls.php:97
-#: html/getxls.php:99 html/getxls.php:244
-msgid "Groups"
-msgstr "Grupos"
-
-#: plugins/admin/groups/class_groupManagement.inc:244
-#, php-format
-msgid "You're about to delete the group '%s'."
-msgstr "Está a punto de borrar el grupo '%s'."
-
-#: plugins/admin/groups/class_groupManagement.inc:250
-#: plugins/admin/groups/class_groupManagement.inc:281
-msgid "You are not allowed to delete this group!"
-msgstr "¡No le está permitido eliminar este grupo!"
-
-#: plugins/admin/groups/class_groupGeneric.inc:123
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-msgstr ""
-"¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
-"archivo de configuración!"
-
-#: plugins/admin/groups/class_groupGeneric.inc:177
-msgid "This 'dn' is no group."
-msgstr "Este 'dn' no es un grupo."
-
-#: plugins/admin/groups/class_groupGeneric.inc:317
-msgid "Samba group"
-msgstr "Grupo de samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:317
-msgid "Domain admins"
-msgstr "Administradores del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:317
-msgid "Domain users"
-msgstr "Usuarios del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:318
-msgid "Domain guests"
-msgstr "Invitados del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:323
-#, php-format
-msgid "Special group (%d)"
-msgstr "Grupo especial (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:435
-msgid "! unknown id"
-msgstr "! id desconocido"
-
-#: plugins/admin/groups/class_groupGeneric.inc:467
-#, php-format
-msgid "Your search method returned more than '%s' users, only '%s' users are shown."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:496
-msgid "Removing group failed"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:603
-#, php-format
-msgid "No configured SID found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:608
-#, php-format
-msgid "No configured RIDBASE found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:693
-msgid "Saving group failed"
-msgstr ""
+#: plugins/admin/groups/class_divListGroup.inc:152
+#: plugins/admin/applications/class_divListApplication.inc:164
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/gofon/conference/class_divListConferences.inc:105
+#: plugins/gofon/conference/class_divListConferences.inc:107
+msgid "Delete this entry"
+msgstr "Borrar esta entrada"
 
-#: plugins/admin/groups/class_groupGeneric.inc:722
-#: plugins/admin/ogroups/class_ogroup.inc:656
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "No tiene permisos para crear un grupo en esta 'Base'."
+#: plugins/admin/groups/acl.tpl:4
+#: plugins/admin/departments/class_departmentGeneric.inc:487
+#: include/class_ldap.inc:463
+msgid "Object"
+msgstr "Objeto"
 
-#: plugins/admin/groups/class_groupGeneric.inc:732
-msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
-"numeros y guiones."
+#: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
+msgid "Choose"
+msgstr "Elige"
 
-#: plugins/admin/groups/class_groupGeneric.inc:744
-#: plugins/admin/groups/class_groupGeneric.inc:758
-#: plugins/admin/groups/class_groupGeneric.inc:765
-msgid "Value specified as 'Name' is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+#: plugins/admin/groups/acl.tpl:17
+msgid "Apply this acl only for users own entries"
+msgstr "Aplicar esta lista de acceso a las entradas de los usuarios"
 
-#: plugins/admin/groups/remove.tpl:6
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Este puede ser un grupo primario. Por favor pinche dos veces si realmente "
-"quiere hacerlo, dado que GOsa no tiene manera de recuperar esta información."
+#: plugins/admin/groups/mail_admins.tpl:4
+msgid "Folder administrators"
+msgstr "Administradores de Carpetas"
 
-#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
-msgid "Group administration"
-msgstr "Administración de grupos"
+#: plugins/admin/groups/mail_admins.tpl:24
+msgid "Select a specific department"
+msgstr "Seleccionar un departamento especifico"
 
-#: plugins/admin/groups/class_groupMail.inc:284
+#: plugins/admin/groups/class_groupMail.inc:285
 msgid "read"
 msgstr "leer"
 
-#: plugins/admin/groups/class_groupMail.inc:285
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid "post"
 msgstr "post"
 
-#: plugins/admin/groups/class_groupMail.inc:286
+#: plugins/admin/groups/class_groupMail.inc:287
 msgid "external post"
 msgstr "post externo"
 
-#: plugins/admin/groups/class_groupMail.inc:287
+#: plugins/admin/groups/class_groupMail.inc:288
 msgid "append"
 msgstr "añadir"
 
-#: plugins/admin/groups/class_groupMail.inc:288
+#: plugins/admin/groups/class_groupMail.inc:289
 msgid "write"
 msgstr "escribir"
 
-#: plugins/admin/groups/class_groupMail.inc:312
+#: plugins/admin/groups/class_groupMail.inc:315
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Esta 'dn' no tiene extensiones validas de correo."
 
-#: plugins/admin/groups/class_groupMail.inc:377
+#: plugins/admin/groups/class_groupMail.inc:339
+msgid ""
+"Remove shared folder from mail server database when entry gets removed in "
+"LDAP"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:340
+msgid "Remove the shared folder and all its contents after saving this account"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:395
 msgid "You're trying to add an invalid email address "
 msgstr "Esta intentando añadir una dirección de correo no valida"
 
-#: plugins/admin/groups/class_groupMail.inc:378
+#: plugins/admin/groups/class_groupMail.inc:396
 msgid "to the list of forwarders."
 msgstr "a la lista de remitentes."
 
-#: plugins/admin/groups/class_groupMail.inc:613
+#: plugins/admin/groups/class_groupMail.inc:632
 msgid "Removing group mail settings failed"
 msgstr "Ha fallado la eliminación de parámetros de correo de grupo"
 
-#: plugins/admin/groups/class_groupMail.inc:777
+#: plugins/admin/groups/class_groupMail.inc:806
 msgid "Saving group mail settings failed"
 msgstr "Ha fallado la grabación de los parámetros de correo de grupos"
 
-#: plugins/admin/groups/class_groupMail.inc:806
+#: plugins/admin/groups/class_groupMail.inc:835
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/admin/groups/class_groupMail.inc:839
-msgid "Please choose valid permission settings. Default permission can't be emtpy."
+#: plugins/admin/groups/class_groupMail.inc:868
+msgid ""
+"Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:843
+#: plugins/admin/groups/class_groupMail.inc:872
 msgid "Please select a valid mail server."
 msgstr "Por favor seleccione un servidor de correo valido."
 
-#: plugins/admin/groups/acl.tpl:4
-#: plugins/admin/departments/class_departmentGeneric.inc:476
-#: include/class_ldap.inc:454
-msgid "Object"
-msgstr "Objeto"
-
-#: plugins/admin/groups/acl.tpl:12 plugins/admin/groups/mail_admins.tpl:30
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:61
-msgid "Choose"
-msgstr "Elige"
+#: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
+#: plugins/admin/ogroups/generic.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:694
+msgid "Group name"
+msgstr "Nombre del grupo"
 
-#: plugins/admin/groups/acl.tpl:17
-msgid "Apply this acl only for users own entries"
-msgstr "Aplicar esta lista de acceso a las entradas de los usuarios"
+#: plugins/admin/groups/generic.tpl:9 plugins/admin/groups/paste_generic.tpl:8
+msgid "Posix name of the group"
+msgstr "Nombre 'Posix' del grupo"
 
-#: plugins/admin/groups/application.tpl:3
-msgid "Release focus"
-msgstr "Enfocado a la versión"
-
-#: plugins/admin/groups/application.tpl:5
-msgid "Select release name"
-msgstr "Seleccione nombre de la versión"
-
-#: plugins/admin/groups/application.tpl:16
-msgid "Used applications"
-msgstr "Aplicaciones Usadas"
-
-#: plugins/admin/groups/application.tpl:19
-msgid "Add category"
-msgstr "Añadir categoría"
-
-#: plugins/admin/groups/application.tpl:24
-msgid "Available applications"
-msgstr "Aplicaciones disponibles"
-
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Seleccione usuarios que serán añadidos"
-
-#: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/systems/class_divListSystem.inc:56
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
-msgstr "Seleccione para ver los servidores"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr "Buscar dentro del subárbol"
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr "Mostrar usuarios del departamento"
-
-#: plugins/admin/groups/group_objects.tpl:47
-#: plugins/admin/systems/glpiSelectUser.tpl:37
-msgid "Regular expression for matching user names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
-
-#: plugins/admin/groups/class_groupAcl.inc:59
-msgid "This 'dn' is no acl container."
-msgstr "Este 'dn' no es un contenedor de listas de acceso."
-
-#: plugins/admin/groups/class_groupAcl.inc:100
-msgid "Removing ACL information failed"
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:196
-msgid "Saving ACL information failed"
-msgstr ""
-
-#: plugins/admin/groups/class_groupAcl.inc:206
-msgid "All fields are writeable"
-msgstr "Todos los campos son rellenarles."
-
-#: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
-#: plugins/admin/ogroups/class_ogroup.inc:737
-#: plugins/admin/ogroups/generic.tpl:7
-msgid "Group name"
-msgstr "Nombre del grupo"
-
-#: plugins/admin/groups/generic.tpl:9 plugins/admin/groups/paste_generic.tpl:8
-msgid "Posix name of the group"
-msgstr "Nombre 'Posix' del grupo"
-
-#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
-msgid "Descriptive text for this group"
-msgstr "Descripción del grupo"
+#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
+msgid "Descriptive text for this group"
+msgstr "Descripción del grupo"
 
 #: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
 msgid "Choose subtree to place group in"
@@ -6462,13 +6755,48 @@ msgstr "Miembros están en un grupo de Nagios"
 msgid "Group members"
 msgstr "Miembros del grupo"
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr "Administradores de Carpetas"
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr "Seleccione usuarios que serán añadidos"
 
-#: plugins/admin/groups/mail_admins.tpl:24
-msgid "Select a specific department"
-msgstr "Seleccionar un departamento especifico"
+#: plugins/admin/groups/group_objects.tpl:30
+#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see servers"
+msgstr "Seleccione para ver los servidores"
+
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Search within subtree"
+msgstr "Buscar dentro del subárbol"
+
+#: plugins/admin/groups/group_objects.tpl:37
+msgid "Display users of department"
+msgstr "Mostrar usuarios del departamento"
+
+#: plugins/admin/groups/group_objects.tpl:47
+#: plugins/admin/systems/glpiSelectUser.tpl:37
+msgid "Regular expression for matching user names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+
+#: plugins/admin/groups/paste_generic.tpl:1
+msgid "Group settings"
+msgstr "Parámetros de grupo"
+
+#: plugins/admin/groups/class_groupAcl.inc:59
+msgid "This 'dn' is no acl container."
+msgstr "Este 'dn' no es un contenedor de listas de acceso."
+
+#: plugins/admin/groups/class_groupAcl.inc:100
+msgid "Removing ACL information failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:196
+msgid "Saving ACL information failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:206
+msgid "All fields are writeable"
+msgstr "Todos los campos son rellenarles."
 
 #: plugins/admin/groups/application_options.tpl:2
 msgid "Application options"
@@ -6573,145 +6901,31 @@ msgstr "Comprobar parámetros"
 msgid "This application has changed parameters."
 msgstr "Los parámetros de la aplicación han cambiado."
 
-#: plugins/admin/groups/class_groupApplication.inc:832
+#: plugins/admin/groups/class_groupApplication.inc:838
 msgid "Removing application information failed"
 msgstr "Ha fallado la eliminación de información de la aplicación"
 
-#: plugins/admin/groups/class_groupApplication.inc:877
+#: plugins/admin/groups/class_groupApplication.inc:883
 msgid "Saving application information failed"
 msgstr "Ha fallado la grabación de información de la aplicación"
 
-#: plugins/admin/groups/class_groupApplication.inc:919
+#: plugins/admin/groups/class_groupApplication.inc:926
 #, php-format
 msgid ""
 "Can't resolve the release name '%s', setting release name to '%s'. Possibly "
 "the objects base has changed."
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
-msgid "Group settings"
-msgstr "Parámetros de grupo"
-
-#: plugins/admin/groups/class_divListGroup.inc:35
-#: plugins/admin/groups/class_divListGroup.inc:36
-msgid "List of groups"
-msgstr "Lista de grupos"
-
-#: plugins/admin/groups/class_divListGroup.inc:41
+#: plugins/admin/users/remove.tpl:6
 msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
-"usar el selector de rango en la parte superior de la lista de grupos, cuando "
-"trabaja con un gran número de grupos."
-
-#: plugins/admin/groups/class_divListGroup.inc:49
-msgid "Groupname / Department"
-msgstr "Nombre de grupo / Departamento"
-
-#: plugins/admin/groups/class_divListGroup.inc:54
-msgid "Select to see groups that are primary groups of users"
-msgstr "Seleccione para ver que grupos son grupos primarios de usuarios"
-
-#: plugins/admin/groups/class_divListGroup.inc:54
-msgid "Show primary groups"
-msgstr "Mostrar grupos primarios"
-
-#: plugins/admin/groups/class_divListGroup.inc:55
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Seleccione para ver que grupos tienen asignado un grupo samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:55
-msgid "Show samba groups"
-msgstr "Mostrar los grupos samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "Select to see groups that have applications configured"
-msgstr "Seleccione para ver que grupos tienen aplicaciones configuradas"
-
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "Show application groups"
-msgstr "Mostrar los grupos de aplicaciones"
-
-#: plugins/admin/groups/class_divListGroup.inc:57
-msgid "Select to see groups that have mail settings"
-msgstr "Seleccione para ver que grupos tienen configuración de correo electrónico"
-
-#: plugins/admin/groups/class_divListGroup.inc:57
-msgid "Show mail groups"
-msgstr "Mostrar grupos de correo"
-
-#: plugins/admin/groups/class_divListGroup.inc:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
-
-#: plugins/admin/groups/class_divListGroup.inc:58
-msgid "Show functional groups"
-msgstr "Mostrar grupos funcionales"
-
-#: plugins/admin/groups/class_divListGroup.inc:98
-msgid "Create new group"
-msgstr "Crear nuevo grupo"
-
-#: plugins/admin/groups/class_divListGroup.inc:126
-#: plugins/admin/users/class_divListUsers.inc:162
-msgid "Posix"
-msgstr "Posix"
-
-#: plugins/admin/groups/class_divListGroup.inc:132
-#: plugins/admin/applications/class_divListApplication.inc:130
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Aplicación"
-
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:133
-msgid "cut"
-msgstr "Cortar"
-
-#: plugins/admin/groups/class_divListGroup.inc:145
-#: plugins/admin/users/class_divListUsers.inc:139
-#: plugins/admin/applications/class_divListApplication.inc:138
-#: plugins/admin/ogroups/class_divListOGroup.inc:133
-msgid "Cut this entry"
-msgstr "Cortar por esta entrada"
-
-#: plugins/admin/groups/class_divListGroup.inc:147
-#: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
-#: plugins/admin/ogroups/class_divListOGroup.inc:135
-msgid "copy"
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
 msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:147
-#: plugins/admin/users/class_divListUsers.inc:141
-#: plugins/admin/applications/class_divListApplication.inc:140
-#: plugins/admin/ogroups/class_divListOGroup.inc:135
-msgid "Copy this entry"
-msgstr "Copiar esta entrada"
-
-#: plugins/admin/groups/class_divListGroup.inc:150
-#: plugins/admin/applications/class_divListApplication.inc:143
-#: plugins/admin/departments/class_divListDepartment.inc:92
-#: plugins/admin/ogroups/class_divListOGroup.inc:138
-#: plugins/gofon/conference/class_divListConferences.inc:103
-msgid "Edit this entry"
-msgstr "Editar esta entrada"
-
-#: plugins/admin/groups/class_divListGroup.inc:152
-#: plugins/admin/applications/class_divListApplication.inc:145
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/ogroups/class_divListOGroup.inc:140
-#: plugins/gofon/conference/class_divListConferences.inc:105
-#: plugins/gofon/conference/class_divListConferences.inc:107
-msgid "Delete this entry"
-msgstr "Borrar esta entrada"
+"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
+"configuración IMAP, etc. de este usuario. Por favor pulse dos veces si "
+"quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
+"posteriormente la información."
 
 #: plugins/admin/users/password.tpl:2
 msgid ""
@@ -6724,53 +6938,38 @@ msgstr ""
 "contraseña, el usuario no podrá autenticarse sin ella."
 
 #: plugins/admin/users/class_userManagement.inc:28
-#: plugins/admin/systems/printer.tpl:71
-#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/systems/printer.tpl:71 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr "Usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:197
-#: plugins/admin/users/class_userManagement.inc:273
+#: plugins/admin/users/class_userManagement.inc:199
+#: plugins/admin/users/class_userManagement.inc:275
 msgid "You are not allowed to set this users password!"
 msgstr "No le es permitido cambiarle la contraseña a estos usuarios."
 
-#: plugins/admin/users/class_userManagement.inc:312
+#: plugins/admin/users/class_userManagement.inc:314
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Esta a punto de borrar el usuario %s"
 
-#: plugins/admin/users/class_userManagement.inc:318
-#: plugins/admin/users/class_userManagement.inc:345
+#: plugins/admin/users/class_userManagement.inc:320
+#: plugins/admin/users/class_userManagement.inc:347
 msgid "You are not allowed to delete this user!"
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/users/class_userManagement.inc:451
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/users/class_userManagement.inc:453
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:393
-#: plugins/admin/ogroups/class_ogroup.inc:277
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroup.inc:281
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:529
+#: plugins/admin/users/class_userManagement.inc:531
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Una persona con el nombre elegido ya existe en el árbol"
 
-#: plugins/admin/users/remove.tpl:6
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
-"configuración IMAP, etc. de este usuario. Por favor pulse dos veces si "
-"quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
-"posteriormente la información."
-
-#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
-msgid "User administration"
-msgstr "Administración de Usuarios"
-
 #: plugins/admin/users/template.tpl:2
 msgid "Creating a new user using templates"
 msgstr "Crear un nuevo usuario usando plantillas"
@@ -6781,15 +6980,19 @@ msgid ""
 "records will be filled automatically. Choose 'none' to skip the usage of "
 "templates."
 msgstr ""
-"Para crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
-"valores en la base de datos serán introducidos automáticamente. Elegir "
-"'ninguno' para saltarse el uso de plantillas."
+"Para crear un nuevo usuario puede ser asistido a través de plantillas. "
+"Algunos valores en la base de datos serán introducidos automáticamente. "
+"Elegir 'ninguno' para saltarse el uso de plantillas."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_systemManagement.inc:835
 msgid "Template"
 msgstr "Plantilla"
 
+#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
+msgid "User administration"
+msgstr "Administración de Usuarios"
+
 #: plugins/admin/users/class_divListUsers.inc:35
 #: plugins/admin/users/class_divListUsers.inc:36
 #: plugins/admin/systems/glpiSelectUser.tpl:6
@@ -6807,11 +7010,10 @@ msgstr ""
 "selectores de rangos en la parte superior del listado."
 
 #: plugins/admin/users/class_divListUsers.inc:50
-#: plugins/gofon/macro/class_divListMacros.inc:46
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
+#: ihtml/themes/default/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Nombre de Usuario"
 
@@ -6931,52 +7133,10 @@ msgstr "En linea"
 msgid "Offline"
 msgstr "Fuera de linea"
 
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr "Eliminar opciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
-msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
-
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr "Crear opciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid "This application has options disabled. You can enable them by clicking below."
-msgstr "Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
-msgstr "Variable"
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Valor por defecto"
-
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
-msgstr "Añadir opción"
-
-#: plugins/admin/applications/class_applicationParameters.inc:128
-msgid "Removing application parameters failed"
-msgstr "Ha fallado la eliminación de parámetros de aplicaciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:159
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "El valor '%s' especificado como nombre de opción no es valido."
-
-#: plugins/admin/applications/class_applicationParameters.inc:190
-msgid "Saving applications parameters failed"
-msgstr "Ha fallado la grabación de parámetros de aplicaciones"
-
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationGeneric.inc:446
 #: plugins/admin/applications/class_divListApplication.inc:44
+#: plugins/admin/applications/class_applicationGeneric.inc:473
 msgid "Application name"
 msgstr "Nombre de la aplicación"
 
@@ -6986,9 +7146,10 @@ msgid "Display name"
 msgstr "Nombre mostrado"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:451
+#: plugins/admin/applications/class_applicationGeneric.inc:478
 msgid "Application name to be displayed (i.e. below icons)"
-msgstr "Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
+msgstr ""
+"Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
 
 #: plugins/admin/applications/generic.tpl:19
 msgid "Path and/or binary name of application"
@@ -7030,6 +7191,77 @@ msgstr "Colocar entrado en los menús de inicio de los miembros"
 msgid "Place entry in members launch bar"
 msgstr "Colocar entrada en los barra de inicio de los miembros"
 
+#: plugins/admin/applications/class_divListApplication.inc:29
+msgid "List of Applications"
+msgstr "Lista de aplicaciones"
+
+#: plugins/admin/applications/class_divListApplication.inc:30
+msgid "This table displays all applications in the selected tree."
+msgstr "Esta tabla muestra todas las aplicaciones en el árbol seleccionado."
+
+#: plugins/admin/applications/class_divListApplication.inc:34
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
+"Este menú permite añadir, editar o eliminar las aplicaciones seleccionadas. "
+"Puede usar el selector de rango en la parte superior de la lista de "
+"aplicaciones, cuando trabaja con un gran número de aplicaciones."
+
+#: plugins/admin/applications/class_divListApplication.inc:100
+#: plugins/admin/ogroups/class_divListOGroup.inc:108
+msgid "new"
+msgstr "nuevo"
+
+#: plugins/admin/applications/class_divListApplication.inc:101
+msgid "Create new application"
+msgstr "Crear nueva aplicación"
+
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
+msgstr "Eliminar opciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
+msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
+
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
+msgstr "Crear opciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
+
+#: plugins/admin/applications/class_applicationParameters.inc:99
+msgid "Variable"
+msgstr "Variable"
+
+#: plugins/admin/applications/class_applicationParameters.inc:99
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Valor por defecto"
+
+#: plugins/admin/applications/class_applicationParameters.inc:112
+msgid "Add option"
+msgstr "Añadir opción"
+
+#: plugins/admin/applications/class_applicationParameters.inc:137
+msgid "Removing application parameters failed"
+msgstr "Ha fallado la eliminación de parámetros de aplicaciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:168
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "El valor '%s' especificado como nombre de opción no es valido."
+
+#: plugins/admin/applications/class_applicationParameters.inc:199
+msgid "Saving applications parameters failed"
+msgstr "Ha fallado la grabación de parámetros de aplicaciones"
+
 #: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -7048,98 +7280,71 @@ msgstr "Mantenimiento de aplicaciones"
 msgid "no example"
 msgstr "sin ejemplo"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:116
+#: plugins/admin/applications/class_applicationGeneric.inc:128
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:199
+#: plugins/admin/applications/class_applicationGeneric.inc:211
 msgid "Removing application failed"
 msgstr "Ha fallado la eliminación de la aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:211
+#: plugins/admin/applications/class_applicationGeneric.inc:223
 #, php-format
 msgid "Removing application from objectgroup '%s' failed"
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:218
+#: plugins/admin/applications/class_applicationGeneric.inc:230
 #, php-format
 msgid "Removing application from group '%s' failed"
 msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:260
+#: plugins/admin/applications/class_applicationGeneric.inc:272
 msgid "The specified picture has not been uploaded correctly."
 msgstr "La foto indicada no ha sido subida correctamente."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:336
+#: plugins/admin/applications/class_applicationGeneric.inc:348
 msgid "Specified execute path must start with '/'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:350
+#: plugins/admin/applications/class_applicationGeneric.inc:362
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr "No tiene permisos para crear una aplicación en esta 'Base'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:355
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Name' is not filled."
 msgstr "El campo requerido 'Nombre' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:359
+#: plugins/admin/applications/class_applicationGeneric.inc:371
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:363
+#: plugins/admin/applications/class_applicationGeneric.inc:375
 msgid "Required field 'Execute' is not filled."
 msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:378
-#: plugins/admin/applications/class_applicationGeneric.inc:386
+#: plugins/admin/applications/class_applicationGeneric.inc:390
+#: plugins/admin/applications/class_applicationGeneric.inc:398
 msgid "There's already an application with this 'Name'."
 msgstr "Ya existe una aplicación con este 'Nombre'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:417
+#: plugins/admin/applications/class_applicationGeneric.inc:444
 msgid "Saving application failed"
 msgstr "Ha fallado la grabación de la aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:442
+#: plugins/admin/applications/class_applicationGeneric.inc:469
 msgid "Application settings"
 msgstr "Parámetros de aplicaciones"
 
-#: plugins/admin/applications/class_applicationManagement.inc:287
+#: plugins/admin/applications/class_applicationManagement.inc:299
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Va ha eliminar la aplicación '%s'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:293
-#: plugins/admin/applications/class_applicationManagement.inc:322
+#: plugins/admin/applications/class_applicationManagement.inc:305
+#: plugins/admin/applications/class_applicationManagement.inc:334
 msgid "You are not allowed to delete this application!"
 msgstr "¡No tiene permisos para eliminar esta aplicación!"
 
-#: plugins/admin/applications/class_divListApplication.inc:29
-msgid "List of Applications"
-msgstr "Lista de aplicaciones"
-
-#: plugins/admin/applications/class_divListApplication.inc:30
-msgid "This table displays all applications in the selected tree."
-msgstr "Esta tabla muestra todas las aplicaciones en el árbol seleccionado."
-
-#: plugins/admin/applications/class_divListApplication.inc:34
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
-msgstr ""
-"Este menú permite añadir, editar o eliminar las aplicaciones seleccionadas. "
-"Puede usar el selector de rango en la parte superior de la lista de "
-"aplicaciones, cuando trabaja con un gran número de aplicaciones."
-
-#: plugins/admin/applications/class_divListApplication.inc:100
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-msgid "new"
-msgstr "nuevo"
-
-#: plugins/admin/applications/class_divListApplication.inc:101
-msgid "Create new application"
-msgstr "Crear nueva aplicación"
-
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Nombre del departamento"
@@ -7194,40 +7399,46 @@ msgstr "Parámetros administrativos"
 msgid "Tag department as an independent administrative unit"
 msgstr ""
 
-#: plugins/admin/departments/remove.tpl:6
-#: plugins/gofon/conference/remove.tpl:6
-msgid ""
-"This includes 'all' accounts, systems, etc. in this subtree. Please double "
-"check if your really want to do this since there is no way for GOsa to get "
-"your data back."
-msgstr ""
-"Esto incluye 'todas' las cuentas, sistemas, etc. en este subárbol. Por "
-"favor pulse dos veces si quiere realmente hacer esto, ya que no hay forma de "
-"que GOsa recupere la información posteriormente."
-
-#: plugins/admin/departments/headpage.tpl:6
 #: plugins/admin/departments/class_divListDepartment.inc:27
 #: plugins/admin/departments/class_divListDepartment.inc:28
 msgid "List of departments"
 msgstr "Lista de Departamentos"
 
-#: plugins/admin/departments/headpage.tpl:24
+#: plugins/admin/departments/class_divListDepartment.inc:33
 msgid ""
 "This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on top of "
-"the department list."
+"a large size of departments, you might prefer the range selectors on   top "
+"of the department list."
 msgstr ""
 "Este menú permite añadir, editar o eliminar los departamentos seleccionados. "
 "Puede usar el selector de rango en la parte superior de la lista de "
 "departamentos, cuando trabaja con un gran número de departamentos."
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
-msgstr "Mostrar Departamentos que concuerden con"
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr "Nombre del departamento"
+
+#: plugins/admin/departments/class_divListDepartment.inc:74
+msgid "Create new department"
+msgstr "Crear nuevo departamento"
+
+#: plugins/admin/departments/dep_iframe.tpl:3
+msgid ""
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
+msgstr ""
 
-#: plugins/admin/departments/headpage.tpl:42
-msgid "Regular expression for matching department names"
-msgstr "Expresiones regulares para encontrar nombres de departamentos"
+#: plugins/admin/departments/remove.tpl:6
+#: plugins/gofon/conference/remove.tpl:6
+msgid ""
+"This includes 'all' accounts, systems, etc. in this subtree. Please double "
+"check if your really want to do this since there is no way for GOsa to get "
+"your data back."
+msgstr ""
+"Esto incluye 'todas' las cuentas, sistemas, etc. en este subárbol. Por favor "
+"pulse dos veces si quiere realmente hacer esto, ya que no hay forma de que "
+"GOsa recupere la información posteriormente."
 
 #: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
 msgid "Department management"
@@ -7252,28 +7463,31 @@ msgstr "El campo requerido 'Descripción' no ha sido rellenado."
 
 #: plugins/admin/departments/class_departmentGeneric.inc:240
 #, php-format
-msgid "The field 'Name' contains the reserved word '%s'. Please choose another name."
-msgstr "El campo 'Nombre' contiene la palabra reservada '%s'. Por favor elija otro nombre."
+msgid ""
+"The field 'Name' contains the reserved word '%s'. Please choose another name."
+msgstr ""
+"El campo 'Nombre' contiene la palabra reservada '%s'. Por favor elija otro "
+"nombre."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:284
+#: plugins/admin/departments/class_departmentGeneric.inc:286
 msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:326
+#: plugins/admin/departments/class_departmentGeneric.inc:331
 msgid "Saving department failed"
 msgstr "Ha fallado la grabación del departamento"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:363
+#: plugins/admin/departments/class_departmentGeneric.inc:373
 #, php-format
 msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:440
+#: plugins/admin/departments/class_departmentGeneric.inc:451
 #, php-format
 msgid "Moving '%s' to '%s'"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:479
+#: plugins/admin/departments/class_departmentGeneric.inc:490
 #, php-format
 msgid "FAILED to copy %s, aborting operation"
 msgstr ""
@@ -7295,62 +7509,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/dep_iframe.tpl:3
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
-msgstr ""
-
-#: plugins/admin/departments/class_divListDepartment.inc:33
-msgid ""
-"This menu allows you to create, delete and edit selected departments. Having "
-"a large size of departments, you might prefer the range selectors on   top "
-"of the department list."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los departamentos seleccionados. "
-"Puede usar el selector de rango en la parte superior de la lista de "
-"departamentos, cuando trabaja con un gran número de departamentos."
-
-#: plugins/admin/departments/class_divListDepartment.inc:41
-msgid "Department name"
-msgstr "Nombre del departamento"
-
-#: plugins/admin/departments/class_divListDepartment.inc:74
-msgid "Create new department"
-msgstr "Crear nuevo departamento"
-
-#: plugins/admin/systems/class_baseSelectDialog.inc:23
-msgid "Choose a base"
-msgstr "Seleccionar una base"
-
-#: plugins/admin/systems/class_baseSelectDialog.inc:34
-msgid ""
-"Step in the prefered tree and click save to use the current subtree as base. "
-"Or click the image at the end of each entry."
-msgstr ""
-
-#: plugins/admin/systems/class_baseSelectDialog.inc:45
-#: plugins/admin/systems/server.tpl:50 plugins/admin/systems/terminal.tpl:115
-#: plugins/admin/systems/workstation.tpl:93
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/ogroups/termgroup.tpl:75
-msgid "Action"
-msgstr "Acción"
-
-#: plugins/admin/systems/class_baseSelectDialog.inc:51
-msgid "Filter entries with this syntax"
-msgstr ""
-
-#: plugins/admin/systems/class_baseSelectDialog.inc:115
-#, php-format
-msgid "Select this base"
-msgstr "Seleccionar esta base"
-
 #: plugins/admin/systems/network.tpl:1
 msgid "Network\tsettings"
 msgstr "Red\tparámetros"
@@ -7376,8 +7538,8 @@ msgid "Zone"
 msgstr "Zona"
 
 #: plugins/admin/systems/network.tpl:58
-#: plugins/admin/systems/class_servDNS.inc:160
 #: plugins/admin/systems/servdnseditzone.tpl:85
+#: plugins/admin/systems/class_servDNS.inc:160
 msgid "TTL"
 msgstr ""
 
@@ -7385,27 +7547,132 @@ msgstr ""
 msgid "Dns records"
 msgstr "Registros DNS"
 
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
-msgstr "Información de sistema"
+#: plugins/admin/systems/class_terminalInfo.inc:54
+#: plugins/admin/systems/class_terminalInfo.inc:199
+msgid "present"
+msgstr "presente"
 
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
-msgstr "CPU"
+#: plugins/admin/systems/class_terminalInfo.inc:67
+#: plugins/admin/systems/class_workstationService.inc:252
+#: plugins/admin/systems/class_workstationStartup.inc:486
+#: plugins/admin/systems/class_terminalService.inc:254
+#: plugins/admin/systems/class_terminalStartup.inc:165
+#: plugins/admin/systems/class_terminalGeneric.inc:230
+msgid "This 'dn' has no terminal features."
+msgstr "Esta 'dn' no tiene características de terminal."
 
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
-msgstr "Memoria"
+#: plugins/admin/systems/class_terminalInfo.inc:74
+msgid "There is no php snmp module installed, can't gather any informations."
+msgstr ""
+"Aviso: no está instalado el módulo php_snmp, no se puede acceder a ninguna "
+"información."
 
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
-msgstr "MAC"
+#: plugins/admin/systems/class_terminalInfo.inc:80
+#: plugins/admin/systems/class_terminalInfo.inc:174
+msgid "unknown status"
+msgstr "estado desconocido"
 
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
-msgstr "Soporte USB"
+#: plugins/admin/systems/class_terminalInfo.inc:89
+msgid "This is a virtual terminal which has no properties to show here."
+msgstr ""
+"Este es un terminal virtual que no tiene propiedades que puedan ser mostradas"
 
-#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
+#: plugins/admin/systems/class_terminalInfo.inc:107
+msgid "online"
+msgstr "en linea"
+
+#: plugins/admin/systems/class_terminalInfo.inc:163
+msgid "running"
+msgstr "Activo"
+
+#: plugins/admin/systems/class_terminalInfo.inc:166
+msgid "not running"
+msgstr "no esta activo"
+
+#: plugins/admin/systems/class_terminalInfo.inc:191
+msgid "offline"
+msgstr "fuera de linea"
+
+#: plugins/admin/systems/glpiPrinter.tpl:9
+msgid "Printer type"
+msgstr "Tipo de impresora"
+
+#: plugins/admin/systems/glpiPrinter.tpl:19 plugins/admin/systems/glpi.tpl:29
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+msgid "Manufacturer"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:31
+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"
+
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:66 plugins/admin/systems/glpi.tpl:40
+msgid "Contacts"
+msgstr "Contactos"
+
+#: plugins/admin/systems/glpiPrinter.tpl:69 plugins/admin/systems/glpi.tpl:52
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+msgid "Contact person"
+msgstr "Persona de contacto"
+
+#: plugins/admin/systems/glpiPrinter.tpl:88 plugins/admin/systems/glpi.tpl:95
+msgid "Attachments"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/glpiPrinter.tpl:114
+msgid "Installed cartridges"
+msgstr "Cartuchos instalados"
+
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
+msgstr "Información de sistema"
+
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
+msgstr "CPU"
+
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
+msgstr "Memoria"
+
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
+msgstr "MAC"
+
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
+msgstr "Soporte USB"
+
+#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
 msgid "System status"
 msgstr "Estado del Sistema"
 
@@ -7483,670 +7750,660 @@ msgstr "Servicio de sonido"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/class_servKolab.inc:94
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
-msgstr "Incluye información desde hace '%s' días cuando cree listas de presencia"
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
+msgstr "Tipo de sistema"
 
-#: plugins/admin/systems/class_servKolab.inc:100
-#, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
-msgstr "Avisar a los usuarios de que están usando mas de %s%% de su cuota de correo"
+#: plugins/admin/systems/glpi.tpl:19
+msgid "Operating system"
+msgstr "Sistema operativo"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
-msgstr "Eliminar extensión Kolab"
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+msgid "Comment"
+msgstr "Comentario"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
+msgstr "Dispositivos instalados"
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
-msgstr "Añadir el servicio Kolab"
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
+msgstr "Comercial"
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
+msgstr "Software"
 
-#: plugins/admin/systems/class_servKolab.inc:199
-msgid "Removing kolab host entry failed"
-msgstr "Ha fallado la eliminación de la entrada de host Kolab"
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
+msgstr "Contratos"
 
-#: plugins/admin/systems/class_servKolab.inc:215
-msgid "Removing server from kolab object failed"
-msgstr "Ha fallado la eliminación del servidor del objeto Kolab"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Gestión del sistema"
 
-#: plugins/admin/systems/class_servKolab.inc:254
-msgid "Future days in Free/Busy settings must be set."
-msgstr "Se deben poner días futuros en la configuración de presencia"
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/class_servKolab.inc:256
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr "Días futuros en la configuración de presencia debe ser un número positivo."
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr "Nombre de terminal"
 
-#: plugins/admin/systems/class_servKolab.inc:260
-msgid "The given Quota settings value must be a number."
-msgstr "El valor introducido como cuota debe ser un número."
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/workstation.tpl:25
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/wingeneric.tpl:15
+msgid "Choose subtree to place terminal in"
+msgstr "Elija un subárbol donde colocar el terminal"
 
-#: plugins/admin/systems/class_servKolab.inc:262
-msgid "Please choose a value between 1 and 100 for Quota settings."
-msgstr "Por favor introduzca un valor entre 1 y 100 para el parámetro de cuota."
+#: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
+#: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/phonesettings.tpl:21
+#: plugins/admin/ogroups/termgroup.tpl:38
+msgid "Mode"
+msgstr "Modo"
 
-#: plugins/admin/systems/class_servKolab.inc:264
-msgid "Future days must be a value."
-msgstr "Días futuros debe ser un valor"
+#: plugins/admin/systems/terminal.tpl:36 plugins/admin/systems/server.tpl:34
+#: plugins/admin/systems/workstation.tpl:41
+#: plugins/admin/ogroups/termgroup.tpl:40
+msgid "Select terminal mode"
+msgstr "Seleccionar modo de terminal"
 
-#: plugins/admin/systems/class_servKolab.inc:268
-msgid "No SMTP privileged networks set."
-msgstr "No se han indicado redes privilegiadas SMTP."
+#: plugins/admin/systems/terminal.tpl:42
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:47
+msgid "Syslog server"
+msgstr "Servidor de Logs"
 
-#: plugins/admin/systems/class_servKolab.inc:340
-msgid "Saving server to kolab object failed"
-msgstr "Ha fallado la grabación del servidor del objeto Kolab"
+#: plugins/admin/systems/terminal.tpl:44
+#: plugins/admin/systems/workstation.tpl:49
+#: plugins/admin/ogroups/termgroup.tpl:49
+msgid "Choose server to use for logging"
+msgstr "Elija un servidor que será usado para registro"
 
-#: plugins/admin/systems/class_servGeneric.inc:43
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/ogroups/class_termgroup.inc:38
-msgid "Activated"
-msgstr "Activado"
+#: plugins/admin/systems/terminal.tpl:59
+msgid "Root server"
+msgstr "Servidor Raíz"
 
-#: plugins/admin/systems/class_servGeneric.inc:67
-msgid "This 'dn' has no server features."
-msgstr "Esta 'dn' no tiene características de servidor."
+#: plugins/admin/systems/terminal.tpl:61
+msgid "Select NFS root filesystem to use"
+msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
 
-#: plugins/admin/systems/class_servGeneric.inc:75
-#: plugins/admin/systems/class_workstationGeneric.inc:140
-#: plugins/admin/ogroups/class_termgroup.inc:154
-msgid "No ACTIONCMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'ACTIONCMD' en 'gosa.conf'"
+#: plugins/admin/systems/terminal.tpl:67
+msgid "Swap server"
+msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/class_servGeneric.inc:80
-#: plugins/admin/systems/class_workstationGeneric.inc:144
-#: plugins/admin/systems/class_terminalGeneric.inc:171
-#: plugins/admin/systems/class_terminalGeneric.inc:183
-#: plugins/admin/systems/class_terminalGeneric.inc:195
-#: plugins/admin/ogroups/class_termgroup.inc:158
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr "¡La ejecución de '%s' ha fallado!"
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+"Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
+"intercambio"
 
-#: plugins/admin/systems/class_servGeneric.inc:161
-#: plugins/admin/systems/class_workstationGeneric.inc:239
-#: plugins/admin/systems/class_terminalGeneric.inc:262
-#: plugins/admin/ogroups/class_termgroup.inc:204
-#: plugins/admin/ogroups/class_termgroup.inc:213
-msgid "Switch off"
-msgstr "Apagar"
+#: plugins/admin/systems/terminal.tpl:86
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Inherit time server attributes"
+msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:161
-#: plugins/admin/systems/class_workstationGeneric.inc:239
-#: plugins/admin/systems/class_terminalGeneric.inc:263
-#: plugins/admin/ogroups/class_termgroup.inc:205
-#: plugins/admin/ogroups/class_termgroup.inc:213
-msgid "Reboot"
-msgstr "Reiniciar"
-
-#: plugins/admin/systems/class_servGeneric.inc:162
-#: plugins/admin/systems/class_workstationGeneric.inc:240
-#: plugins/admin/ogroups/class_termgroup.inc:206
-msgid "Instant update"
-msgstr "Actualización instantánea"
-
-#: plugins/admin/systems/class_servGeneric.inc:163
-#: plugins/admin/systems/class_servGeneric.inc:171
-#: plugins/admin/systems/class_workstationGeneric.inc:241
-#: plugins/admin/systems/class_workstationGeneric.inc:249
-#: plugins/admin/ogroups/class_termgroup.inc:207
-msgid "Scheduled update"
-msgstr "Actualización programada"
-
-#: plugins/admin/systems/class_servGeneric.inc:164
-#: plugins/admin/systems/class_servGeneric.inc:170
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_workstationGeneric.inc:248
-#: plugins/admin/ogroups/class_termgroup.inc:208
-msgid "Reinstall"
-msgstr ""
-
-#: plugins/admin/systems/class_servGeneric.inc:165
-#: plugins/admin/systems/class_workstationGeneric.inc:243
-#: plugins/admin/ogroups/class_termgroup.inc:209
-msgid "Rescan hardware"
-msgstr "Buscar hardware"
-
-#: plugins/admin/systems/class_servGeneric.inc:166
-#: plugins/admin/systems/class_servGeneric.inc:172
-#: plugins/admin/systems/class_workstationGeneric.inc:244
-#: plugins/admin/systems/class_workstationGeneric.inc:250
-#: plugins/admin/systems/class_terminalGeneric.inc:264
-#: plugins/admin/systems/class_terminalGeneric.inc:268
-#: plugins/admin/ogroups/class_termgroup.inc:40
-msgid "Memory test"
-msgstr "Testeo de memoria"
-
-#: plugins/admin/systems/class_servGeneric.inc:167
-#: plugins/admin/systems/class_servGeneric.inc:173
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_workstationGeneric.inc:251
-#: plugins/admin/systems/class_terminalGeneric.inc:265
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-#: plugins/admin/ogroups/class_termgroup.inc:41
-msgid "System analysis"
-msgstr "Análisis del sistema"
-
-#: plugins/admin/systems/class_servGeneric.inc:169
-#: plugins/admin/systems/class_workstationGeneric.inc:247
-#: plugins/admin/systems/class_terminalGeneric.inc:267
-#: plugins/admin/ogroups/class_termgroup.inc:213
-msgid "Wake up"
-msgstr "Despertar"
-
-#: plugins/admin/systems/class_servGeneric.inc:188
-msgid "Removing server failed"
-msgstr "Ha fallado la eliminación del servidor"
-
-#: plugins/admin/systems/class_servGeneric.inc:224
-msgid "The required field 'Server name' is not set."
-msgstr "El campo requerido 'Nombre del servidor' no ha sido rellenado."
-
-#: plugins/admin/systems/class_servGeneric.inc:231
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr "No tiene permisos para crear un servidor en esta 'Base'."
-
-#: plugins/admin/systems/class_servGeneric.inc:242
-#: plugins/admin/systems/class_componentGeneric.inc:165
-#: plugins/admin/systems/class_winGeneric.inc:174
-#: plugins/admin/systems/class_phoneGeneric.inc:312
-#: plugins/admin/systems/class_workstationGeneric.inc:347
-#: plugins/admin/systems/class_terminalGeneric.inc:397
-#: plugins/admin/systems/class_printGeneric.inc:618
-#, php-format
-msgid "There is already an entry '%s' in the base choosen by you"
-msgstr "Ya hay una entrada '%s' en la base elegida"
-
-#: plugins/admin/systems/class_servGeneric.inc:300
-msgid "Saving server failed"
-msgstr "Ha fallado la grabación del servidor"
-
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Gestión del sistema"
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Servicio de Hora"
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Servicio LDAP"
-
-#: plugins/admin/systems/servservice.tpl:70
-msgid "Terminal Service"
-msgstr "Servidor de terminal"
-
-#: plugins/admin/systems/servservice.tpl:75
-msgid "Temporary disable login"
-msgstr "Desactivación temporal del acceso"
-
-#: plugins/admin/systems/servservice.tpl:78
-msgid "Font path"
-msgstr "Ruta a las fuentes tipográficas"
+#: plugins/admin/systems/terminal.tpl:90
+#: plugins/admin/systems/workstation.tpl:69
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr "Servidor NTP"
 
-#: plugins/admin/systems/servservice.tpl:91
-msgid "Syslog Service"
-msgstr "Servicio de Logs"
+#: plugins/admin/systems/terminal.tpl:92
+#: plugins/admin/systems/workstation.tpl:71
+#: plugins/admin/ogroups/termgroup.tpl:16
+msgid "Choose server to use for synchronizing time"
+msgstr "Elija un servidor que será usado para sincronización horaria"
 
-#: plugins/admin/systems/servservice.tpl:99
-msgid "Print Service"
-msgstr "Servicio de impresión"
+#: plugins/admin/systems/terminal.tpl:115 plugins/admin/systems/server.tpl:50
+#: plugins/admin/systems/workstation.tpl:93
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:75
+msgid "Action"
+msgstr "Acción"
 
-#: plugins/admin/systems/servservice.tpl:107
-msgid "Mail server"
-msgstr "Servidor de correo"
+#: plugins/admin/systems/terminal.tpl:119
+#: plugins/admin/systems/workstation.tpl:97
+#: plugins/admin/ogroups/termgroup.tpl:79
+msgid "Select action to execute for this terminal"
+msgstr "Seleccione una acción que se ejecutara en este terminal"
 
-#: 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/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr "Nombre del servidor"
 
-#: 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/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/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Plantilla de clientes ligeros Linux"
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr "Gestionar tipos de sistemas"
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Plantilla de estaciones de trabajo linux"
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+msgid "Rename"
+msgstr "Renombrar"
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Servidor Linux"
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+msgid "Please enter a new name"
+msgstr "Por favor introduzca un nuevo nombre"
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Estación de trabajo Windows"
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:121
+#: plugins/admin/systems/class_terminalService.inc:69
+msgid "unknown"
+msgstr "desconocido"
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Impresora de Red"
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:101
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+msgid "bit"
+msgstr "bit"
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Otros componentes de red"
+#: plugins/admin/systems/class_workstationService.inc:138
+#: plugins/admin/systems/class_terminalService.inc:156
+msgid "show chooser"
+msgstr "mostrar elegidos"
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Crear"
+#: plugins/admin/systems/class_workstationService.inc:139
+#: plugins/admin/systems/class_terminalService.inc:157
+msgid "direct"
+msgstr "Directo"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-msgid "Reference"
-msgstr "Referencia"
+#: plugins/admin/systems/class_workstationService.inc:142
+#: plugins/admin/systems/class_terminalService.inc:160
+msgid "load balanced"
+msgstr "balanceo de carga"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:17
-msgid "Comments"
-msgstr "Comentarios"
+#: plugins/admin/systems/class_workstationService.inc:145
+#: plugins/admin/systems/class_terminalService.inc:163
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-msgid "Comment"
-msgstr "Comentario"
+#: plugins/admin/systems/class_workstationService.inc:146
+#: plugins/admin/systems/class_terminalService.inc:164
+msgid "ICA client"
+msgstr "Cliente ICA"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-msgid "Manufacturer"
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_workstationService.inc:207
+#: plugins/admin/systems/class_workstationService.inc:210
+#: plugins/admin/systems/class_workstationService.inc:213
+#: plugins/admin/systems/class_workstationService.inc:216
+#: plugins/admin/systems/class_workstationService.inc:219
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+#: plugins/admin/systems/class_workstationStartup.inc:292
+#: plugins/admin/systems/class_workstationStartup.inc:296
+#: plugins/admin/systems/class_workstationStartup.inc:792
+#: plugins/admin/systems/class_workstationGeneric.inc:118
+#: plugins/admin/systems/class_terminalService.inc:72
+#: plugins/admin/systems/class_terminalService.inc:100
+#: plugins/admin/systems/class_terminalService.inc:106
+#: plugins/admin/systems/class_terminalService.inc:116
+#: plugins/admin/systems/class_terminalService.inc:117
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:123
+#: plugins/admin/systems/class_terminalService.inc:216
+#: plugins/admin/systems/class_terminalService.inc:219
+#: plugins/admin/systems/class_terminalService.inc:222
+#: plugins/admin/systems/class_terminalService.inc:225
+#: plugins/admin/systems/class_terminalService.inc:228
+#: plugins/admin/systems/class_terminalService.inc:231
+#: plugins/admin/systems/class_terminalService.inc:234
+#: plugins/admin/systems/class_terminalStartup.inc:122
+#: plugins/admin/systems/class_terminalStartup.inc:142
+#: plugins/admin/systems/class_terminalStartup.inc:145
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_terminalGeneric.inc:280
+msgid "inherited"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
-msgstr ""
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_terminalService.inc:219
+msgid "Bit"
+msgstr "Bit"
 
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/server.tpl:17
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:19
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/workstation.tpl:25
-#: plugins/admin/systems/wingeneric.tpl:15
-msgid "Choose subtree to place terminal in"
-msgstr "Elija un subárbol donde colocar el terminal"
+#: plugins/admin/systems/class_workstationService.inc:302
+#: plugins/admin/systems/class_terminalService.inc:305
+msgid "Choose the phone located at the current terminal"
+msgstr "Elija el teléfono localizado en el terminal actual"
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
-msgstr "Eliminar servicio DHCP"
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
+#: plugins/admin/systems/class_terminalService.inc:367
+#: plugins/admin/systems/class_terminalService.inc:372
+msgid "Please specify a valid VSync range."
+msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión DHCP activada. Puede desactivarla pulsando "
-"aquí."
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
+#: plugins/admin/systems/class_terminalService.inc:382
+#: plugins/admin/systems/class_terminalService.inc:387
+msgid "Please specify a valid HSync range."
+msgstr "Por favor especifique un rango HSync valido"
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
-msgstr "Añadir servicio DHCP"
+#: plugins/admin/systems/class_workstationService.inc:433
+msgid "Saving workstation services failed"
+msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
 
-#: plugins/admin/systems/class_servDHCP.inc:40
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
-"aquí."
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
+msgstr "Teclado"
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
-msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
-msgstr ""
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+msgid "Model"
+msgstr "Modelo"
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
-msgid ""
-"Be careful editing record types with this dialog. All changes will be saved "
-"immediately when using the save button."
-msgstr ""
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
+msgstr "Elija modelo de teclado"
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
-msgid ""
-"This dialog can't be used until the currently edited zone was saved or the "
-"zone entry exists in the ldap database."
-msgstr ""
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
+msgstr "Disposición"
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
-msgid "New entry"
-msgstr "Nueva entrada"
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
+msgstr "Elija localización del teclado"
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
-msgid "Create a new DNS zone entry"
-msgstr "Crear una nueva entrada de zona DNS"
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
+msgstr "Variante"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-msgid "Select entries to add"
-msgstr "Seleccione entradas para añadir"
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
+msgstr "Elija variante de teclado"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-msgid "Display members of department"
-msgstr "Mostrar miembros del departamento"
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
+msgstr "Ratón"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-msgid "Display members matching"
-msgstr "Mostrar miembros que concuerden con"
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-msgid "Regular expression for matching member names"
-msgstr "Expresiones regulares que concuerden con nombres de miembros"
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
+msgstr "Puerto"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
-msgid "Add/Edit manufacturer"
-msgstr "Añadir/Editar Fabricante"
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+msgid "Choose mouse port"
+msgstr "Elija el puerto del ratón"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
-msgid "Website"
-msgstr "Sitio web"
+#: 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/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:138
-#: plugins/admin/ogroups/class_phonequeue.inc:691
-#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Phone number"
-msgstr "Número de teléfono"
+#: 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/systems/class_componentGeneric.inc:50
-#: plugins/admin/systems/class_winGeneric.inc:73
-msgid "This 'dn' has no network features."
-msgstr "Esta 'dn' no tiene características de red."
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+#: plugins/admin/systems/printer.tpl:51
+msgid "Driver"
+msgstr "Controlador"
 
-#: plugins/admin/systems/class_componentGeneric.inc:101
-msgid "Removing generic component failed"
-msgstr "Ha fallado la eliminación de componente genérico"
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
+msgstr ""
+"Elija controlador gráfico que se necesita para la tarjeta gráfica instalada"
 
-#: plugins/admin/systems/class_componentGeneric.inc:139
-msgid "The required field 'Component name' is not set."
-msgstr "El campo requerido 'Nombre de componente' no ha sido rellenado."
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
+msgstr "Elija la resolución gráfica usada en modo gráfico"
 
-#: plugins/admin/systems/class_componentGeneric.inc:144
-#: plugins/admin/systems/class_phoneGeneric.inc:284
-msgid "The required field IP address is empty."
-msgstr " El campo requerido 'Dirección IP' no ha sido rellenado."
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
+msgstr "Profundidad del Color"
 
-#: plugins/admin/systems/class_componentGeneric.inc:147
-#: plugins/admin/systems/class_phoneGeneric.inc:287
-msgid "The field IP address contains an invalid address."
-msgstr "El campo 'Dirección IP' contiene una dirección no valida."
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
+msgstr "Elija la profundidad de color usada en modo gráfico"
 
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#: plugins/admin/systems/class_winGeneric.inc:164
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr "No tiene permisos para crear un componente en esta 'Base'."
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
+msgstr "Mostrar dispositivo"
 
-#: plugins/admin/systems/class_componentGeneric.inc:223
-msgid "Saving generic component failed"
-msgstr "Ha fallado la grabación de componente genérico"
+#: plugins/admin/systems/workstationService.tpl:125
+msgid "Use DDC for automatic detection"
+msgstr ""
 
-#: plugins/admin/systems/class_inventory.inc:36
-#: plugins/admin/systems/class_servDNS.inc:67
-msgid "Remove DNS service"
-msgstr "Eliminar servicio DNS"
+#: plugins/admin/systems/workstationService.tpl:128
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
+msgstr "HSync"
 
-#: plugins/admin/systems/class_inventory.inc:37
-#: plugins/admin/systems/class_servDNS.inc:68
-msgid "This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
+msgstr "Frecuencia de refresco horizontal para el monitor instalado"
+
+#: plugins/admin/systems/workstationService.tpl:133
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
+msgstr "VSync"
+
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
+msgstr "Frecuencia de refresco vertical para el monitor instalado"
+
+#: plugins/admin/systems/workstationService.tpl:147
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
+msgstr "Dispositivo de escaneo"
+
+#: plugins/admin/systems/workstationService.tpl:148
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
+msgstr "Seleccione para iniciar el servicio de escáner 'SANE' en el terminal"
+
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
+msgstr "Provee servicios de exploración"
+
+#: plugins/admin/systems/class_workstationStartup.inc:317
+#: plugins/admin/systems/class_terminalStartup.inc:91
+#, php-format
+msgid ""
+"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
+"exist."
 msgstr ""
-"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
-"aquí."
+"El comando '%s', especificado como acción 'KERNELS' para la extensión '%s' "
+"no parece existir."
 
-#: plugins/admin/systems/class_inventory.inc:39
-#: plugins/admin/systems/class_servDNS.inc:70
-msgid "Add DNS service"
-msgstr "Añadir servicio DNS"
+#: plugins/admin/systems/class_workstationStartup.inc:421
+msgid ""
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:466
+msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:524
+msgid ""
+"There is already a profile in your selection that contain partition table "
+"configurations."
+msgstr ""
+"Ya existe un usuario con este perfil en su selección que tiene "
+"configuraciones de tabla de particiones."
 
-#: plugins/admin/systems/class_inventory.inc:40
-#: plugins/admin/systems/class_servDNS.inc:71
-msgid "This server has DNS features disabled. You can enable them by clicking below."
+#: plugins/admin/systems/class_workstationStartup.inc:713
+msgid "Not available in current setup"
 msgstr ""
-"Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr "Nombre del servidor"
+#: plugins/admin/systems/class_workstationStartup.inc:864
+#, php-format
+msgid ""
+"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
+"Server was reset to 'auto'."
+msgstr ""
 
-#: plugins/admin/systems/server.tpl:32 plugins/admin/systems/terminal.tpl:34
-#: plugins/admin/systems/workstation.tpl:39
-#: plugins/admin/systems/phonesettings.tpl:21
-#: plugins/admin/ogroups/termgroup.tpl:38
-msgid "Mode"
-msgstr "Modo"
+#: plugins/admin/systems/class_workstationStartup.inc:877
+#, php-format
+msgid ""
+"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
+"configurations, possibly some classes where deleted or renamed. Server was "
+"reset to 'auto'."
+msgstr ""
 
-#: plugins/admin/systems/server.tpl:34 plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:41
-#: plugins/admin/ogroups/termgroup.tpl:40
-msgid "Select terminal mode"
-msgstr "Seleccionar modo de terminal"
+#: plugins/admin/systems/class_workstationStartup.inc:1037
+msgid "Saving workstation startup settings failed"
+msgstr ""
+"Ha fallado la grabación de los parámetros de inicio de la estación de trabajo"
 
-#: 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_workstationStartup.inc:1087
+#, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#: plugins/admin/systems/class_workstationStartup.inc:1089
+#: plugins/admin/systems/class_servRepositorySetup.inc:189
 #, php-format
-msgid "You're about to delete the glpi attachment component '%s'."
-msgstr "Va ha eliminar el componente adjunto glpi '%s'."
+msgid ""
+"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
+"empty string."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#: plugins/admin/systems/class_printerPPDDialog.inc:62
 #, php-format
-msgid "You can't delete this attachment, it is still in use by these system(s) '%s'"
+msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
-msgid "There is no valid file uploaded."
-msgstr "No se ha subido ningún archivo valido."
+#: plugins/admin/systems/class_printerPPDDialog.inc:87
+msgid "Can't get ppd informations."
+msgstr "No se puede acceder a la información PPD"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
-msgid "Upload wasn't successfull."
-msgstr "El envío no fue correcto."
+#: plugins/admin/systems/class_printerPPDDialog.inc:99
+#, php-format
+msgid ""
+"The specified path '%s' which results from PPD_PATH in your gosa.conf is "
+"invalid, can't read/write any ppd informations."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#: plugins/admin/systems/class_printerPPDDialog.inc:116
+msgid "Please specify a valid ppd file."
+msgstr "Por favor especifique un nombre de archivo PPD valido."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:186
+#, php-format
+msgid "Can't select PPD file '%s', the file is not readable"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
-msgid "There is already a file with the same name uploaded."
-msgstr "Ya existe un fichero con este nombre."
+#: plugins/admin/systems/class_printerPPDDialog.inc:203
+#: plugins/admin/systems/class_printerPPDDialog.inc:275
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#: plugins/admin/systems/class_printerPPDDialog.inc:211
 #, php-format
-msgid "Can't create file '%s'."
-msgstr "No puedo crear el fichero '%s'."
+msgid "Can't create file '%s' to store modifed ppd informations."
+msgstr ""
+"No se puede crear el archivo '%s' para guardar la información PPD modificada."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
-msgid "File is available."
+#: plugins/admin/systems/class_printerPPDDialog.inc:235
+#, php-format
+msgid "Can't add new ppd file, the source file '%s' is not accessible."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
-msgid "File is not readable, possibly the file is missing."
+#: plugins/admin/systems/class_printerPPDDialog.inc:253
+#, php-format
+msgid ""
+"The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
+"informations."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
-msgid "Currently no file uploaded."
-msgstr "No se ha subido ningún archivo actualmente."
+#: plugins/admin/systems/class_printerPPDDialog.inc:267
+#, php-format
+msgid "There is already a ppd file for this kind of printer."
+msgstr "Ya existe un archivo PPD para ese tipo de impresora."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
-msgid "Mime"
-msgstr "Mime"
+#: plugins/admin/systems/class_printerPPDDialog.inc:288
+#, php-format
+msgid "Can't save file '%s'."
+msgstr "No se puede grabar el archivo '%s'."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
-msgid "This table displays all available attachments."
+#: plugins/admin/systems/class_printerPPDDialog.inc:292
+msgid "Uploaded ppd file is empty, can't create new ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
-msgid "empty"
-msgstr "vacío"
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
-msgid "Create new attachment"
-msgstr "Crear nuevo adjunto"
+#: plugins/admin/systems/class_printerPPDDialog.inc:462
+#: plugins/admin/systems/class_printerPPDDialog.inc:465
+msgid "True"
+msgstr "Verdadero"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
-msgid "New Attachment"
-msgstr "Nuevo adjunto"
+#: plugins/admin/systems/class_printerPPDDialog.inc:463
+#: plugins/admin/systems/class_printerPPDDialog.inc:466
+msgid "False"
+msgstr "Falso"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
-msgid "Please specify a valid name for this attachment."
-msgstr "Por favor especifique un nombre de adjunto valido."
+#: plugins/admin/systems/class_printerPPDDialog.inc:471
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
+msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
-msgid "Printer driver"
-msgstr "Controlador de dispositivo de Impresión"
+#: plugins/admin/systems/class_printerPPDDialog.inc:485
+msgid ""
+"Please select a valid ppd file or use 'Cancel' to go back to printer "
+"configuration."
+msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-msgid "Model"
-msgstr "Modelo"
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
+msgstr "Plantilla de estación de trabajo"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-msgid "Select"
-msgstr "Seleccionar"
+#: plugins/admin/systems/workstation.tpl:10
+msgid "Workstation name"
+msgstr "Nombre de la estación de trabajo"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-msgid "New driver"
-msgstr "Nuevo controlador de dispositivo"
+#: plugins/admin/systems/servdns.tpl:1
+msgid "Zones"
+msgstr "Zonas"
 
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
-#: plugins/admin/systems/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_os.tpl:9
-#: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
-msgid "Rename"
-msgstr "Renombrar"
+#: plugins/admin/systems/workstationStartup.tpl:4
+#: plugins/admin/systems/terminalStartup.tpl:1
+msgid "Boot parameters"
+msgstr "Parametros de inicio"
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr "Kernel de inicio"
 
-#: plugins/admin/systems/terminal.tpl:8
-msgid "Terminal template"
-msgstr "Plantilla de terminal"
+#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:17
+msgid "Custom options"
+msgstr "Otras opciones"
 
-#: plugins/admin/systems/terminal.tpl:10
-msgid "Terminal name"
-msgstr "Nombre de terminal"
+#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:19
+msgid ""
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
+msgstr ""
+"Introducir que parámetros serán pasados a la configuración de arranque del "
+"nucleo"
 
-#: plugins/admin/systems/terminal.tpl:42
-#: plugins/admin/systems/workstation.tpl:47
-#: plugins/admin/ogroups/termgroup.tpl:47
-msgid "Syslog server"
-msgstr "Servidor de Logs"
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:22
+msgid "LDAP server"
+msgstr "Servidor LDAP"
 
-#: plugins/admin/systems/terminal.tpl:44
-#: plugins/admin/systems/workstation.tpl:49
-#: plugins/admin/ogroups/termgroup.tpl:49
-msgid "Choose server to use for logging"
-msgstr "Elija un servidor que será usado para registro"
+#: plugins/admin/systems/workstationStartup.tpl:41
+#: plugins/admin/systems/workstationStartup.tpl:71
+msgid "FAI server"
+msgstr "Servidor FAI"
 
-#: plugins/admin/systems/terminal.tpl:59
-msgid "Root server"
-msgstr "Servidor Raíz"
+#: plugins/admin/systems/workstationStartup.tpl:63
+#: plugins/admin/systems/workstationStartup.tpl:95
+msgid "Assigned FAI classes"
+msgstr "Asignar clases FAI"
 
-#: plugins/admin/systems/terminal.tpl:61
-msgid "Select NFS root filesystem to use"
-msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
+#: plugins/admin/systems/workstationStartup.tpl:85
+msgid "set"
+msgstr "poner"
 
-#: plugins/admin/systems/terminal.tpl:67
-msgid "Swap server"
-msgstr "Servidor de Intercambio"
+#: plugins/admin/systems/workstationStartup.tpl:116
+#: plugins/admin/systems/terminalStartup.tpl:53
+msgid "Kernel modules (format: name parameters)"
+msgstr "Módulos del núcleo (formato: nombre parámetros)"
 
-#: plugins/admin/systems/terminal.tpl:69
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-"Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
-"intercambio"
+#: plugins/admin/systems/workstationStartup.tpl:118
+#: plugins/admin/systems/terminalStartup.tpl:55
+msgid "Add additional modules to load on startup"
+msgstr "Añadir módulos adicionales que serán cargados al arrancar"
 
-#: plugins/admin/systems/terminal.tpl:86
-#: plugins/admin/systems/workstation.tpl:65
-msgid "Inherit time server attributes"
-msgstr ""
+#: plugins/admin/systems/workstationStartup.tpl:142
+#: plugins/admin/systems/terminalStartup.tpl:79
+msgid "Mountpoint"
+msgstr "Punto de montaje"
 
-#: plugins/admin/systems/terminal.tpl:90
-#: plugins/admin/systems/workstation.tpl:69
-#: plugins/admin/ogroups/termgroup.tpl:14
-msgid "NTP server"
-msgstr "Servidor NTP"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Lista de dispositivos"
 
-#: plugins/admin/systems/terminal.tpl:92
-#: plugins/admin/systems/workstation.tpl:71
-#: plugins/admin/ogroups/termgroup.tpl:16
-msgid "Choose server to use for synchronizing time"
-msgstr "Elija un servidor que será usado para sincronización horaria"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:119
-#: plugins/admin/systems/workstation.tpl:97
-#: plugins/admin/ogroups/termgroup.tpl:79
-msgid "Select action to execute for this terminal"
-msgstr "Seleccione una acción que se ejecutara en este terminal"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+msgid "Display devices matching"
+msgstr "Mostrar dispositivos que concuerden con"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Seleccione objetos a añadir"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+msgid "Regular expression for matching device names"
+msgstr "Expresiones regulares que concuerden con nombres de dispositivos"
 
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:156
 #: plugins/admin/systems/class_glpiAccount.inc:144
@@ -8156,12 +8413,16 @@ msgstr ""
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:166
 #: plugins/admin/systems/class_glpiAccount.inc:154
 msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr "No puedo conectar a la base de datos glpi, la extensión php-mysql no se encuentra."
+msgstr ""
+"No puedo conectar a la base de datos glpi, la extensión php-mysql no se "
+"encuentra."
 
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:176
 #: plugins/admin/systems/class_glpiAccount.inc:164
 msgid "Can't connect to glpi database, check configuration twice."
-msgstr "No puedo conectar a la base de datos glpi, compruebe la configuración de nuevo."
+msgstr ""
+"No puedo conectar a la base de datos glpi, compruebe la configuración de "
+"nuevo."
 
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:199
 #: plugins/admin/systems/class_glpiAccount.inc:565
@@ -8173,8 +8434,8 @@ msgid ""
 "This server has inventory features enabled. You can disable them by clicking "
 "below."
 msgstr ""
-"Este servidor tiene la extensión inventario activada. Puede desactivarla pulsando "
-"aquí."
+"Este servidor tiene la extensión inventario activada. Puede desactivarla "
+"pulsando aquí."
 
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:202
 #: plugins/admin/systems/class_glpiAccount.inc:568
@@ -8186,8 +8447,8 @@ msgid ""
 "This server has inventory features disabled. You can enable them by clicking "
 "below."
 msgstr ""
-"Este servidor tiene la extensión inventario desactivada. Puede activarla pulsando "
-"aquí."
+"Este servidor tiene la extensión inventario desactivada. Puede activarla "
+"pulsando aquí."
 
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:226
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:264
@@ -8214,234 +8475,446 @@ msgstr ""
 msgid "since"
 msgstr "desde"
 
-#: plugins/admin/systems/class_servRepository.inc:97
-msgid "Remove FAI repository extension."
-msgstr "Eliminar extensión de repositorio FAI."
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Seleccione objetos a añadir"
 
-#: plugins/admin/systems/class_servRepository.inc:98
-msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
+#: plugins/admin/systems/class_workstationGeneric.inc:102
+#: plugins/admin/systems/class_servGeneric.inc:43
+#: plugins/admin/ogroups/class_termgroup.inc:46
+msgid "Activated"
+msgstr "Activado"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:140
+#: plugins/admin/systems/class_servGeneric.inc:75
+#: plugins/admin/ogroups/class_termgroup.inc:211
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'ACTIONCMD' en 'gosa.conf'"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:144
+#: plugins/admin/systems/class_terminalGeneric.inc:171
+#: plugins/admin/systems/class_terminalGeneric.inc:183
+#: plugins/admin/systems/class_terminalGeneric.inc:195
+#: plugins/admin/systems/class_servGeneric.inc:80
+#: plugins/admin/ogroups/class_termgroup.inc:215
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr "¡La ejecución de '%s' ha fallado!"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:184
+msgid "This 'dn' has no workstation features."
+msgstr "Esta 'dn' no tiene características de estación de trabajo."
+
+#: plugins/admin/systems/class_workstationGeneric.inc:239
+#: plugins/admin/systems/class_terminalGeneric.inc:262
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/ogroups/class_termgroup.inc:261
+msgid "Switch off"
+msgstr "Apagar"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:239
+#: plugins/admin/systems/class_terminalGeneric.inc:263
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/ogroups/class_termgroup.inc:262
+msgid "Reboot"
+msgstr "Reiniciar"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:240
+#: plugins/admin/systems/class_servGeneric.inc:162
+#: plugins/admin/ogroups/class_termgroup.inc:263
+msgid "Instant update"
+msgstr "Actualización instantánea"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:241
+#: plugins/admin/systems/class_workstationGeneric.inc:249
+#: plugins/admin/systems/class_servGeneric.inc:163
+#: plugins/admin/systems/class_servGeneric.inc:171
+#: plugins/admin/ogroups/class_termgroup.inc:264
+msgid "Scheduled update"
+msgstr "Actualización programada"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_workstationGeneric.inc:248
+#: plugins/admin/systems/class_servGeneric.inc:164
+#: plugins/admin/systems/class_servGeneric.inc:170
+#: plugins/admin/ogroups/class_termgroup.inc:265
+msgid "Reinstall"
 msgstr ""
-"Este servidor tiene la extensión repositorio FAI activada. Puede desactivarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
+#: plugins/admin/systems/class_workstationGeneric.inc:243
+#: plugins/admin/systems/class_servGeneric.inc:165
+#: plugins/admin/ogroups/class_termgroup.inc:266
+msgid "Rescan hardware"
+msgstr "Buscar hardware"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:244
+#: plugins/admin/systems/class_workstationGeneric.inc:250
+#: plugins/admin/systems/class_terminalGeneric.inc:264
+#: plugins/admin/systems/class_terminalGeneric.inc:268
+#: plugins/admin/systems/class_servGeneric.inc:166
+#: plugins/admin/systems/class_servGeneric.inc:172
+#: plugins/admin/ogroups/class_termgroup.inc:48
+msgid "Memory test"
+msgstr "Testeo de memoria"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:245
+#: plugins/admin/systems/class_workstationGeneric.inc:251
+#: plugins/admin/systems/class_terminalGeneric.inc:265
+#: plugins/admin/systems/class_terminalGeneric.inc:269
+#: plugins/admin/systems/class_servGeneric.inc:167
+#: plugins/admin/systems/class_servGeneric.inc:173
+#: plugins/admin/ogroups/class_termgroup.inc:49
+msgid "System analysis"
+msgstr "Análisis del sistema"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/systems/class_terminalGeneric.inc:267
+#: plugins/admin/systems/class_servGeneric.inc:169
+msgid "Wake up"
+msgstr "Despertar"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:279
+msgid "Removing workstation failed"
+msgstr "Ha fallado la eliminación de la estación de trabajo"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:330
+#: plugins/admin/ogroups/class_termgroup.inc:114
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr "No tiene permisos para crear una estación de trabajo en esta 'Base'."
+
+#: plugins/admin/systems/class_workstationGeneric.inc:334
+msgid "The required field 'Workstation name' is not set."
 msgstr ""
+" El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
 
-#: plugins/admin/systems/class_servRepository.inc:101
+#: plugins/admin/systems/class_workstationGeneric.inc:347
+#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_winGeneric.inc:174
+#: plugins/admin/systems/class_terminalGeneric.inc:388
+#: plugins/admin/systems/class_servGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:642
+#: plugins/admin/systems/class_phoneGeneric.inc:312
+#, php-format
+msgid "There is already an entry '%s' in the base choosen by you"
+msgstr "Ya hay una entrada '%s' en la base elegida"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:357
+#: plugins/admin/systems/class_terminalGeneric.inc:398
 msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
 msgstr ""
-"Este servidor tiene la extensión repositorio FAI desactivada. Puede activarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_servRepository.inc:144
-#, php-format
-msgid ""
-"You can't delete this release, it is still used by these workstations [%s]. "
-"Please solve this dependencies first, to keep data base consistency."
-msgstr ""
+#: plugins/admin/systems/class_workstationGeneric.inc:423
+#: plugins/admin/systems/class_workstationGeneric.inc:441
+#: plugins/admin/ogroups/class_termgroup.inc:333
+msgid "Saving workstation failed"
+msgstr "Ha fallado la grabación de la estación de trabajo"
+
+#: plugins/admin/systems/class_divListSystem.inc:42
+#: plugins/admin/systems/class_divListSystem.inc:43
+msgid "List of systems"
+msgstr "Lista de sistemas"
+
+#: plugins/admin/systems/class_divListSystem.inc:47
+msgid ""
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
+msgstr ""
+"Este menú permite añadir, modificar o eliminar las propiedades de sistemas "
+"específicos. Solo puede añadir sistemas que han sido ya iniciados alguna vez."
+
+#: plugins/admin/systems/class_divListSystem.inc:57
+msgid "System / Department"
+msgstr "Sistema / Departamento"
+
+#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Mostrar servidores"
+
+#: plugins/admin/systems/class_divListSystem.inc:62
+msgid "Select to see Linux terminals"
+msgstr "Seleccione para ver los terminales Linux"
+
+#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Mostrar terminales"
+
+#: plugins/admin/systems/class_divListSystem.inc:63
+msgid "Select to see Linux workstations"
+msgstr "Seleccione para ver las estaciones de trabajo Linux"
+
+#: plugins/admin/systems/class_divListSystem.inc:63
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Mostrar estaciones de trabajo"
+
+#: plugins/admin/systems/class_divListSystem.inc:64
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
+
+#: plugins/admin/systems/class_divListSystem.inc:64
+msgid "Show windows based workstations"
+msgstr "Mostrara estaciones de trabajo basadas en windows"
+
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Select to see network printers"
+msgstr "Seleccione para ver impresoras de red"
+
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Show network printers"
+msgstr "Mostrar impresoras de red"
+
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Select to see VOIP phones"
+msgstr "Seleccione para ver teléfonos VOIP"
+
+#: plugins/admin/systems/class_divListSystem.inc:66
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Mostrar teléfonos"
+
+#: plugins/admin/systems/class_divListSystem.inc:67
+msgid "Select to see network devices"
+msgstr "Seleccione para ver los dispositivos de red"
+
+#: plugins/admin/systems/class_divListSystem.inc:67
+msgid "Show network devices"
+msgstr "Mostrar dispositivos de Red"
+
+#: plugins/admin/systems/class_divListSystem.inc:75
+msgid "Display systems of user"
+msgstr "Mostrar sistemas del usuario"
+
+#: plugins/admin/systems/class_divListSystem.inc:101
+msgid "New Terminal template"
+msgstr "Nueva plantilla de terminal"
+
+#: plugins/admin/systems/class_divListSystem.inc:101
+#: plugins/admin/systems/class_systemManagement.inc:848
+msgid "New Terminal"
+msgstr "Nuevo terminal"
+
+#: plugins/admin/systems/class_divListSystem.inc:103
+msgid "New Workstation template"
+msgstr "Nueva plantilla de estación de trabajo"
+
+#: plugins/admin/systems/class_divListSystem.inc:103
+#: plugins/admin/systems/class_systemManagement.inc:849
+msgid "New Workstation"
+msgstr "Nueva estación de trabajo"
+
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/systems/class_divListSystem.inc:105
+msgid "New Server"
+msgstr "Nuevo servidor"
+
+#: plugins/admin/systems/class_divListSystem.inc:106
+#: plugins/admin/systems/class_divListSystem.inc:107
+msgid "New Printer"
+msgstr "Nueva impresora"
+
+#: plugins/admin/systems/class_divListSystem.inc:108
+#: plugins/admin/systems/class_divListSystem.inc:109
+msgid "New Phone"
+msgstr "Nuevo teléfono"
 
-#: plugins/admin/systems/class_servRepository.inc:176
-#, php-format
-msgid "Be careful editing this release, it is still used by these workstations [%s]."
+#: plugins/admin/systems/class_divListSystem.inc:110
+#: plugins/admin/systems/class_divListSystem.inc:111
+msgid "New Component"
+msgstr "Nuevo componente"
+
+#: plugins/admin/systems/class_divListSystem.inc:128
+msgid "Cups Server"
+msgstr "Servidor CUPS"
+
+#: plugins/admin/systems/class_divListSystem.inc:129
+msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:249
-#: plugins/admin/systems/class_servRepository.inc:270
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-msgid "Sections"
-msgstr "Secciones"
+#: plugins/admin/systems/class_divListSystem.inc:130
+msgid "Syslog Server"
+msgstr "Servidor SYSLOG"
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "General"
-msgstr "General"
+#: plugins/admin/systems/class_divListSystem.inc:131
+msgid "Mail Server"
+msgstr "Servidor de correo"
 
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Nombre de la impresora"
+#: plugins/admin/systems/class_divListSystem.inc:132
+msgid "Imap Server"
+msgstr "Servidor IMAP"
 
-#: plugins/admin/systems/printer.tpl:36
-msgid "Details"
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:133
+msgid "Nfs Server"
+msgstr "Servidor NFS"
 
-#: plugins/admin/systems/printer.tpl:39
-msgid "Printer location"
-msgstr "Localización de la impresora"
+#: plugins/admin/systems/class_divListSystem.inc:134
+msgid "Kerberos Server"
+msgstr "Servidor Kerberos"
 
-#: plugins/admin/systems/printer.tpl:43
-msgid "Printer URL"
-msgstr "URL de la impresora"
+#: plugins/admin/systems/class_divListSystem.inc:135
+msgid "Asterisk Server"
+msgstr "Servidor Asterisk"
 
-#: plugins/admin/systems/printer.tpl:51
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-msgstr "Controlador"
+#: plugins/admin/systems/class_divListSystem.inc:136
+msgid "Fax Server"
+msgstr "Servidor FAX"
 
-#: plugins/admin/systems/printer.tpl:63
-msgid "Permissions"
-msgstr "Permisos"
+#: plugins/admin/systems/class_divListSystem.inc:137
+msgid "Ldap Server"
+msgstr "Servidor LDAP"
 
-#: 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"
+#: plugins/admin/systems/class_divListSystem.inc:140
+msgid "Edit system"
+msgstr "Editar sistema"
 
-#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
-msgid "Add user"
-msgstr "Añadir usuario"
+#: plugins/admin/systems/class_divListSystem.inc:141
+msgid "Delete system"
+msgstr "Eliminar sistema"
 
-#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
-msgid "Add group"
-msgstr "Añadir grupo"
+#: plugins/admin/systems/class_divListSystem.inc:178
+msgid "Set root       password"
+msgstr "Poner Contraseña de root"
 
-#: plugins/admin/systems/printer.tpl:86
-msgid "Users which are allowed to administrate this printer"
-msgstr "usuarios que tienen permisos para administrar esta impresora"
+#: plugins/admin/systems/class_divListSystem.inc:184
+#, fuzzy
+msgid "Create CD"
+msgstr "Crear"
 
-#: plugins/admin/systems/printer.tpl:87
-msgid "Admins"
-msgstr "Administradores"
+#: plugins/admin/systems/class_divListSystem.inc:184
+#, fuzzy
+msgid "Create FAI CD"
+msgstr "Crear nuevo objeto FAI."
 
-#: plugins/admin/systems/class_terminalStartup.inc:39
-#: plugins/admin/systems/class_terminalStartup.inc:111
-#: plugins/admin/systems/class_terminalStartup.inc:131
-#: plugins/admin/systems/class_terminalService.inc:72
-#: plugins/admin/systems/class_terminalService.inc:100
-#: plugins/admin/systems/class_terminalService.inc:106
-#: plugins/admin/systems/class_terminalService.inc:116
-#: plugins/admin/systems/class_terminalService.inc:117
-#: plugins/admin/systems/class_terminalService.inc:119
-#: plugins/admin/systems/class_terminalService.inc:123
-#: plugins/admin/systems/class_terminalService.inc:214
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_terminalService.inc:220
-#: plugins/admin/systems/class_terminalService.inc:223
-#: plugins/admin/systems/class_terminalService.inc:226
-#: plugins/admin/systems/class_terminalService.inc:229
-#: plugins/admin/systems/class_terminalService.inc:232
-#: plugins/admin/systems/class_workstationGeneric.inc:118
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_terminalGeneric.inc:291
-#: plugins/admin/systems/class_workstationService.inc:201
-#: plugins/admin/systems/class_workstationService.inc:204
-#: plugins/admin/systems/class_workstationService.inc:207
-#: plugins/admin/systems/class_workstationService.inc:210
-#: plugins/admin/systems/class_workstationService.inc:213
-#: plugins/admin/systems/class_workstationService.inc:216
-#: plugins/admin/systems/class_workstationService.inc:219
-#: plugins/admin/systems/class_workstationStartup.inc:263
-#: plugins/admin/systems/class_workstationStartup.inc:281
-#: plugins/admin/systems/class_workstationStartup.inc:285
-#: plugins/admin/systems/class_workstationStartup.inc:785
-msgid "inherited"
+#: plugins/admin/systems/class_goVirusServer.inc:46
+#: plugins/admin/systems/class_goVirusServer.inc:244
+msgid "Anti virus"
 msgstr ""
 
-#: plugins/admin/systems/class_terminalStartup.inc:93
-#: plugins/admin/systems/class_workstationStartup.inc:306
-#, php-format
+#: plugins/admin/systems/class_goVirusServer.inc:80
+#, fuzzy
+msgid "Remove anti virus extension"
+msgstr "Eliminar extensión de impresión"
+
+#: plugins/admin/systems/class_goVirusServer.inc:81
+#, fuzzy
 msgid ""
-"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
-"exist."
+"This server has anti virus features enabled. You can disable them by "
+"clicking below."
 msgstr ""
-"El comando '%s', especificado como acción 'KERNELS' para la extensión '%s' no "
-"parece existir."
-
-#: plugins/admin/systems/class_terminalStartup.inc:151
-#: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:252
-#: plugins/admin/systems/class_terminalGeneric.inc:230
-#: plugins/admin/systems/class_workstationService.inc:241
-#: plugins/admin/systems/class_workstationStartup.inc:478
-msgid "This 'dn' has no terminal features."
-msgstr "Esta 'dn' no tiene características de terminal."
-
-#: plugins/admin/systems/class_terminalStartup.inc:386
-msgid "Saving terminal startup settings failed"
-msgstr "Ha fallado la grabación de los parámetros de inicio de terminal"
-
-#: plugins/admin/systems/servdns.tpl:1
-msgid "Zones"
-msgstr "Zonas"
+"Este servidor tiene la extensión inventario activada. Puede desactivarla "
+"pulsando aquí."
 
-#: plugins/admin/systems/workstation.tpl:8
-msgid "Workstation template"
-msgstr "Plantilla de estación de trabajo"
+#: plugins/admin/systems/class_goVirusServer.inc:84
+#, fuzzy
+msgid "Add anti virus service"
+msgstr "Añadir el servicio Kolab"
 
-#: plugins/admin/systems/workstation.tpl:10
-msgid "Workstation name"
-msgstr "Nombre de la estación de trabajo"
+#: plugins/admin/systems/class_goVirusServer.inc:85
+#, fuzzy
+msgid ""
+"This server has anti virus features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión inventario desactivada. Puede activarla "
+"pulsando aquí."
 
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr "Acceso a Kerberos kadmin"
+#: plugins/admin/systems/class_goVirusServer.inc:151
+#, fuzzy, php-format
+msgid "Removing of server services/anti virus with dn '%s' failed."
+msgstr "Ha fallado al eliminar la cuenta samba"
 
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr "Dominio Kerberos"
+#: plugins/admin/systems/class_goVirusServer.inc:196
+#, fuzzy, php-format
+msgid "Saving of server services/anti virus with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de Kolab"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr "Usuario administrador"
+#: plugins/admin/systems/class_goVirusServer.inc:204
+msgid "Maximum directory recursions"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
-msgstr "Base de datos de FAX"
+#: plugins/admin/systems/class_goVirusServer.inc:205
+#: plugins/admin/systems/goVirusServer.tpl:37
+msgid "Maximum threads"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
-msgstr "Base de datos de usuarios de FAX"
+#: plugins/admin/systems/class_goVirusServer.inc:206
+#: plugins/admin/systems/goVirusServer.tpl:114
+#, fuzzy
+msgid "Maximum file size"
+msgstr "Tamaño del correo electrónico"
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
-msgstr "Gestión de Asterisk PBX"
+#: plugins/admin/systems/class_goVirusServer.inc:207
+msgid "Maximum recursions"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
-msgstr "Base de datos de usuarios Asterisk"
+#: plugins/admin/systems/class_goVirusServer.inc:208
+#: plugins/admin/systems/goVirusServer.tpl:128
+msgid "Maximum compression ratio"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
-msgstr "Prefijo de marcado nacional"
+#: plugins/admin/systems/class_goVirusServer.inc:209
+#: plugins/admin/systems/goVirusServer.tpl:61
+#, fuzzy
+msgid "Checks per day"
+msgstr "Comprobar parámetros"
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
-msgstr "Prefijo de marcado local"
+#: plugins/admin/systems/class_goVirusServer.inc:213
+#, fuzzy, php-format
+msgid "The specified value for '%s' must be a numeric value."
+msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr "Acceso administrador imap"
+#: plugins/admin/systems/class_goVirusServer.inc:305
+#: plugins/admin/systems/class_goSpamServer.inc:451
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como acción 'CHECK' para la extensión '%s' no "
+"parece existir."
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
-msgstr "Identificador de servidor"
+#: plugins/admin/systems/class_goVirusServer.inc:329
+#, php-format
+msgid "Set status flag for server services/anti virus with dn '%s' failed."
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
-msgstr "Conectar a la URL"
+#: plugins/admin/systems/class_servDB.inc:136
+#: plugins/admin/systems/class_servDB.inc:145
+#: plugins/admin/systems/class_servDB.inc:162
+#: plugins/admin/systems/class_servDB.inc:172
+#: plugins/admin/systems/class_servDB.inc:177
+#: plugins/admin/systems/class_servDB.inc:183
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
-msgstr "Puerto de Sieve"
+#: plugins/admin/systems/class_servDB.inc:152
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
-msgstr "Base de datos de Logs"
+#: plugins/admin/systems/class_servDB.inc:156
+msgid "The sieve port needs to be numeric."
+msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
-msgstr "Base de datos de acceso de usuarios"
+#: plugins/admin/systems/class_servDB.inc:167
+#, php-format
+msgid "The specified kerberos password is empty."
+msgstr "la clave kerberos especificada está vacía."
 
-#: plugins/admin/systems/servdb.tpl:119
-msgid "Glpi database"
-msgstr "Base de datos Glpi"
+#: plugins/admin/systems/class_servDB.inc:191
+#, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr ""
+"La cadena del nombre IMAP necesita ser un nombre de host o una dirección IP."
 
-#: plugins/admin/systems/servdb.tpl:133
-msgid "Database"
-msgstr "Bases de datos"
+#: plugins/admin/systems/class_servDB.inc:245
+msgid "Saving server db settings failed"
+msgstr ""
+"Ha fallado la grabación de los parámetros del servidor de base de datos"
 
 #: plugins/admin/systems/servnfs.tpl:1
 msgid "Edit share"
@@ -8467,34 +8940,43 @@ msgstr "Pagina de códigos"
 msgid "Option"
 msgstr "Opción"
 
-#: plugins/admin/systems/class_winGeneric.inc:126
-msgid "Removing Samba workstation failed"
-msgstr "Ha fallado la eliminación de la estación de trabajo Samba"
+#: plugins/admin/systems/class_servNfs.inc:46
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:224
-msgid "Saving Samba workstation failed"
-msgstr "Ha fallado la grabación de la estación de trabajo Samba"
+#: plugins/admin/systems/class_servNfs.inc:49
+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_servRepositorySetup.inc:119
-msgid "Please enter a value for 'release'."
-msgstr "Por favor introduzca un valor para esta 'versión'."
+#: 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_servRepositorySetup.inc:123
-msgid "Please specify a valid value for 'url'."
-msgstr "Por favor especifique un valor para la 'url' valido."
+#: 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: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:194
+msgid "Description contains invalid characters."
+msgstr "¡La descripción contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:170
-#, php-format
-msgid "Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
-msgstr "No puedo ejecutar el REPOSITORY_HOOK '%s' indicado. Por favor compruebe el archivo gosa.conf."
+#: plugins/admin/systems/class_servNfs.inc:198
+msgid "Volume contains invalid characters."
+msgstr "El volumen contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:172
-#: plugins/admin/systems/class_workstationStartup.inc:1086
-#, php-format
-msgid ""
-"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
-"empty string."
-msgstr ""
+#: 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:206
+msgid "Option contains invalid characters."
+msgstr "La opción contiene caracteres no validos."
 
 #: plugins/admin/systems/servkolab.tpl:9
 msgid "Postfix mydomain"
@@ -8504,262 +8986,304 @@ msgstr "Postfix mydomain"
 msgid "Postfix mydestination"
 msgstr "Postfix mydestination"
 
-#: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/servkolab.tpl:23
+msgid "Cyrus admins"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:40
 msgid "POP3 service"
 msgstr "Servicio POP3"
 
-#: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/servkolab.tpl:48
 msgid "POP3/SSL service"
 msgstr "Servicio POP3/SSL"
 
-#: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/servkolab.tpl:56
 msgid "IMAP service"
 msgstr "Servicio IMAP"
 
-#: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/servkolab.tpl:64
 msgid "IMAP/SSL service"
 msgstr "Servicio IMAP/SSL"
 
-#: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/servkolab.tpl:72
 msgid "Sieve service"
 msgstr "Servicio Sieve"
 
-#: plugins/admin/systems/servkolab.tpl:73
+#: plugins/admin/systems/servkolab.tpl:80
 msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
 "Servicio de presencia de FTP (propio, no tiene interacción con el servicio "
 "de presencia de Kolab2)"
 
-#: plugins/admin/systems/servkolab.tpl:81
+#: plugins/admin/systems/servkolab.tpl:88
 msgid "HTTP FreeBusy service (legacy)"
 msgstr "Servicio de presencia HTTP (propio)"
 
-#: plugins/admin/systems/servkolab.tpl:89
+#: plugins/admin/systems/servkolab.tpl:96
 msgid "Amavis email scanning (virus/spam)"
 msgstr "Desinfectado de correo Amavis (virus/spam)"
 
-#: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/servkolab.tpl:107
 msgid "Quota settings"
 msgstr "Parámetros de quotas"
 
-#: plugins/admin/systems/servkolab.tpl:116
+#: plugins/admin/systems/servkolab.tpl:123
 msgid "Free/Busy settings"
 msgstr "Parámetros de Presencia"
 
-#: plugins/admin/systems/servkolab.tpl:121
+#: plugins/admin/systems/servkolab.tpl:128
 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/servkolab.tpl:143
 msgid "SMTP privileged networks"
 msgstr "Redes privilegiadas SMTP"
 
-#: plugins/admin/systems/servkolab.tpl:141
+#: plugins/admin/systems/servkolab.tpl:148
 msgid "Hosts/networks allowed to relay"
 msgstr "Equipos/Redes que son permitidos para hacer relay"
 
-#: plugins/admin/systems/servkolab.tpl:144
+#: plugins/admin/systems/servkolab.tpl:151
 msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:157
+#: plugins/admin/systems/servkolab.tpl:164
 msgid "SMTP smarthost/relayhost"
 msgstr "SMTP smarthost/relayhos"
 
-#: plugins/admin/systems/servkolab.tpl:163
+#: plugins/admin/systems/servkolab.tpl:170
 msgid "Enable MX lookup for relayhost"
 msgstr "Permitir búsquedas MX para los relayhost"
 
-#: plugins/admin/systems/servkolab.tpl:168
+#: plugins/admin/systems/servkolab.tpl:175
 msgid "Host used to relay mails"
 msgstr "Equipo usado para reenviar correos"
 
-#: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/servkolab.tpl:189
 msgid "Accept Internet Mail"
 msgstr "Aceptar correo desde internet"
 
-#: plugins/admin/systems/servkolab.tpl:188
+#: plugins/admin/systems/servkolab.tpl:195
 msgid "Accept mail from other domains over non-authenticated SMTP"
-msgstr "Aceptar correo desde otros dominios que usen ninguna autentificación SMTP"
-
-#: plugins/admin/systems/phonesettings.tpl:1
-msgid "Advanced phone settings"
-msgstr "Configuración telefónica avanzada"
-
-#: plugins/admin/systems/phonesettings.tpl:6
-msgid "Phone type"
-msgstr "Tipo de teléfono"
+msgstr ""
+"Aceptar correo desde otros dominios que usen ninguna autentificación SMTP"
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
-msgid "Choose a phone type"
-msgstr "Elija tipo de teléfono"
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
+#: plugins/admin/systems/class_servKolab.inc:94
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
+"Incluye información desde hace '%s' días cuando cree listas de presencia"
 
-#: plugins/admin/systems/phonesettings.tpl:32
-msgid "DTMF mode"
-msgstr "Modo DTMF"
+#: plugins/admin/systems/class_servKolab.inc:100
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+"Avisar a los usuarios de que están usando mas de %s%% de su cuota de correo"
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
-msgid "Default IP"
-msgstr "Dirección IP por defecto"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Remove Kolab extension"
+msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
 msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/phonesettings.tpl:75
-msgid "Modus"
-msgstr "Modo"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid "Add Kolab service"
+msgstr "Añadir el servicio Kolab"
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
 msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/phonesettings.tpl:116
-msgid "Secret"
-msgstr "Secreto"
+#: plugins/admin/systems/class_servKolab.inc:199
+msgid "Removing kolab host entry failed"
+msgstr "Ha fallado la eliminación de la entrada de host Kolab"
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
+#: plugins/admin/systems/class_servKolab.inc:215
+msgid "Removing server from kolab object failed"
+msgstr "Ha fallado la eliminación del servidor del objeto Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:254
+msgid "Future days in Free/Busy settings must be set."
+msgstr "Se deben poner días futuros en la configuración de presencia"
+
+#: plugins/admin/systems/class_servKolab.inc:256
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
+"Días futuros en la configuración de presencia debe ser un número positivo."
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/class_servKolab.inc:260
+msgid "The given Quota settings value must be a number."
+msgstr "El valor introducido como cuota debe ser un número."
+
+#: plugins/admin/systems/class_servKolab.inc:262
+msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
+"Por favor introduzca un valor entre 1 y 100 para el parámetro de cuota."
 
-#: plugins/admin/systems/phonesettings.tpl:145
-msgid "Account code"
-msgstr "Código de cuenta"
+#: plugins/admin/systems/class_servKolab.inc:264
+msgid "Future days must be a value."
+msgstr "Días futuros debe ser un valor"
 
-#: plugins/admin/systems/phonesettings.tpl:153
-msgid "Trunk lines"
-msgstr "Lineas troncales"
+#: plugins/admin/systems/class_servKolab.inc:268
+msgid "No SMTP privileged networks set."
+msgstr "No se han indicado redes privilegiadas SMTP."
 
-#: plugins/admin/systems/phonesettings.tpl:168
-msgid "Hosts that are allowed to connect"
-msgstr "Equipos/Redes que tienen permiso para conectar"
+#: plugins/admin/systems/class_servKolab.inc:340
+msgid "Saving server to kolab object failed"
+msgstr "Ha fallado la grabación del servidor del objeto Kolab"
 
-#: plugins/admin/systems/phonesettings.tpl:183
-msgid "Hosts that are not allowed to connect"
-msgstr "Equipos/Redes que no tienen permisos para conectar"
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
-msgstr ""
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr "Método de conexión"
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Nombre de la maquina"
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr "Elija el método de conexión con el servidor de terminal"
 
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
-msgstr ""
-"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
-"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
-"esto, no hay forma de que GOsa recupere la información."
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-msgid "use"
-msgstr "uso"
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr "Seleccione específicamente que servidor de terminal usará"
 
-#: plugins/admin/systems/password.tpl:2
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr "Servidor de fuentes"
+
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr "Seleccione específicamente que servidor de fuentes usará"
+
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr "Dispositivo de Impresión"
+
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
 msgstr ""
-"Para cambiar la contraseña del administrador del terminal use los campos a continuación. Los "
-"cambios tomarán efecto en el próxima reinicio. Por favor, recuerde la nueva "
-"contraseña, porque no podrá autenticarse sin ella."
+"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
+"terminal"
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
+#: plugins/admin/systems/terminalService.tpl:183
+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 ""
+"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
-msgstr "Cambiar la contraseña afecta solamente a la autenticación."
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Seleccione que controladores de escáner se usaran"
 
-#: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:199
-msgid "present"
-msgstr "presente"
+#: plugins/admin/systems/class_componentGeneric.inc:50
+#: plugins/admin/systems/class_winGeneric.inc:73
+msgid "This 'dn' has no network features."
+msgstr "Esta 'dn' no tiene características de red."
 
-#: plugins/admin/systems/class_terminalInfo.inc:74
-msgid "There is no php snmp module installed, can't gather any informations."
-msgstr "Aviso: no está instalado el módulo php_snmp, no se puede acceder a ninguna información."
+#: plugins/admin/systems/class_componentGeneric.inc:101
+msgid "Removing generic component failed"
+msgstr "Ha fallado la eliminación de componente genérico"
 
-#: plugins/admin/systems/class_terminalInfo.inc:80
-#: plugins/admin/systems/class_terminalInfo.inc:174
-msgid "unknown status"
-msgstr "estado desconocido"
+#: plugins/admin/systems/class_componentGeneric.inc:139
+msgid "The required field 'Component name' is not set."
+msgstr "El campo requerido 'Nombre de componente' no ha sido rellenado."
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
-msgid "This is a virtual terminal which has no properties to show here."
-msgstr "Este es un terminal virtual que no tiene propiedades que puedan ser mostradas"
+#: plugins/admin/systems/class_componentGeneric.inc:144
+#: plugins/admin/systems/class_phoneGeneric.inc:284
+msgid "The required field IP address is empty."
+msgstr " El campo requerido 'Dirección IP' no ha sido rellenado."
 
-#: plugins/admin/systems/class_terminalInfo.inc:107
-msgid "online"
-msgstr "en linea"
+#: plugins/admin/systems/class_componentGeneric.inc:147
+#: plugins/admin/systems/class_phoneGeneric.inc:287
+msgid "The field IP address contains an invalid address."
+msgstr "El campo 'Dirección IP' contiene una dirección no valida."
 
-#: plugins/admin/systems/class_terminalInfo.inc:163
-msgid "running"
-msgstr "Activo"
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:164
+msgid "You have no permissions to create a component on this 'Base'."
+msgstr "No tiene permisos para crear un componente en esta 'Base'."
 
-#: plugins/admin/systems/class_terminalInfo.inc:166
-msgid "not running"
-msgstr "no esta activo"
+#: plugins/admin/systems/class_componentGeneric.inc:223
+msgid "Saving generic component failed"
+msgstr "Ha fallado la grabación de componente genérico"
+
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr "Seleccione si el terminal soporta inicio gráfico con barra de progreso"
+
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "Usar arranque gráfico"
+
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Seleccione si el terminal debería arrancar en modo texto"
+
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "Usar arranque en modo texto"
 
-#: plugins/admin/systems/class_terminalInfo.inc:191
-msgid "offline"
-msgstr "fuera de linea"
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
+msgstr ""
+"Seleccione para obtener una información mas prolija durante el arranque"
 
-#: plugins/admin/systems/class_servDB.inc:136
-#: plugins/admin/systems/class_servDB.inc:145
-#: plugins/admin/systems/class_servDB.inc:162
-#: plugins/admin/systems/class_servDB.inc:172
-#: plugins/admin/systems/class_servDB.inc:177
-#: plugins/admin/systems/class_servDB.inc:183
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr "Usar el modo de depuración durante el arranque"
 
-#: plugins/admin/systems/class_servDB.inc:152
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
+#: plugins/admin/systems/SelectDeviceType.tpl:3
+msgid ""
+"This is a new system which currently has no system type defined. Please "
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
+msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:156
-msgid "The sieve port needs to be numeric."
-msgstr "El puerto sieve necesita ser un numero."
+#: plugins/admin/systems/SelectDeviceType.tpl:9
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
+msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:167
-#, php-format
-msgid "The specified kerberos password is empty."
-msgstr "la clave kerberos especificada está vacía."
+#: plugins/admin/systems/SelectDeviceType.tpl:21
+msgid "Choose a system type"
+msgstr "Elija tipo de sistema"
 
-#: plugins/admin/systems/class_servDB.inc:191
-#, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr "La cadena del nombre IMAP necesita ser un nombre de host o una dirección IP."
+#: plugins/admin/systems/SelectDeviceType.tpl:32
+msgid "Choose an object group as template"
+msgstr "Elija un grupo de objetos como plantilla"
 
-#: plugins/admin/systems/class_servDB.inc:245
-msgid "Saving server db settings failed"
-msgstr "Ha fallado la grabación de los parámetros del servidor de base de datos"
+#: plugins/admin/systems/SelectDeviceType.tpl:33
+msgid "Choose an object group"
+msgstr "Elija un grupo de objetos"
 
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
 #, php-format
@@ -8787,256 +9311,222 @@ msgstr "Nuevo monitor"
 msgid "M"
 msgstr "M"
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-msgid "System type"
-msgstr "Tipo de sistema"
-
-#: plugins/admin/systems/glpi.tpl:19
-msgid "Operating system"
-msgstr "Sistema operativo"
-
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-msgid "Contacts"
-msgstr "Contactos"
-
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-msgid "Contact person"
-msgstr "Persona de contacto"
-
-#: plugins/admin/systems/glpi.tpl:78
-msgid "Installed devices"
-msgstr "Dispositivos instalados"
-
-#: plugins/admin/systems/glpi.tpl:90
-msgid "Trading"
-msgstr "Comercial"
-
-#: plugins/admin/systems/glpi.tpl:91
-msgid "Software"
-msgstr "Software"
-
-#: plugins/admin/systems/glpi.tpl:92
-msgid "Contracts"
-msgstr "Contratos"
-
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
-msgid "Attachments"
-msgstr "Adjuntos"
+#: plugins/admin/systems/class_glpiAccount.inc:178
+#: plugins/admin/systems/class_glpiAccount.inc:184
+#: plugins/admin/systems/class_glpiAccount.inc:190
+msgid "This feature is not implemented yet."
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
-msgid "Printer type"
-msgstr "Tipo de impresora"
+#: plugins/admin/systems/class_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
-msgid "Supported interfaces"
-msgstr "Interfaces soportados"
+#: plugins/admin/systems/class_glpiAccount.inc:312
+#, php-format
+msgid ""
+"You can't delete this system type, it is still in use by these system(s) '%s'"
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-msgid "Serial"
-msgstr "Serie"
+#: plugins/admin/systems/class_glpiAccount.inc:323
+msgid "Rename failed, this system type name is already used."
+msgstr ""
+"El cambio de nombre ha fallado, ha especificado uno que está siendo usado."
 
-#: plugins/admin/systems/glpiPrinter.tpl:46
-msgid "Parallel"
-msgstr "Paralelo"
+#: plugins/admin/systems/class_glpiAccount.inc:379
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr ""
+"Añadir nuevo sistema operativo ha fallado, el valor especificado esta siendo "
+"utilizado."
 
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
+#: plugins/admin/systems/class_glpiAccount.inc:401
+#, php-format
+msgid ""
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
-msgid "Installed cartridges"
-msgstr "Cartuchos instalados"
+#: plugins/admin/systems/class_glpiAccount.inc:413
+msgid "Updating operating system failed, specifed name is already used."
+msgstr ""
+"Actualizar sistema operativo ha fallado, el valor especificado esta siendo "
+"utilizado."
 
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/systems/class_systemManagement.inc:738
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Estación de trabajo"
+#: plugins/admin/systems/class_glpiAccount.inc:566
+msgid ""
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Este dispositivo tiene información de inventario activada. Puede "
+"desactivarla pulsando aquí."
 
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/systems/class_systemManagement.inc:737
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-msgid "Terminal"
-msgstr "Terminal"
+#: plugins/admin/systems/class_glpiAccount.inc:569
+msgid ""
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Este dispositivo tiene información de inventario desactivada. Puede "
+"activarla pulsando aquí."
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
-msgid "Manage System-types"
-msgstr "Gestionar tipos de sistemas"
+#: plugins/admin/systems/class_glpiAccount.inc:667
+msgid "Can't remove glpi account, while mysql extension is missing."
+msgstr ""
+"Mientras no se encuentra la extensión php_mysql no se puede eliminar la "
+"cuenta glpi."
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_os.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
-msgid "Please enter a new name"
-msgstr "Por favor introduzca un nuevo nombre"
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
+msgstr "Gestione fabricantes"
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr ""
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Adjuntos"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:8
-msgid "Parent server"
-msgstr "Servidor Origen"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+msgid "Filename"
+msgstr "Nombre del archivo"
 
-#: plugins/admin/systems/class_servDNS.inc:159
-msgid "Reverse zone"
-msgstr "Zona Inversa"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+msgid "Mime-type"
+msgstr "Tipo MIME"
 
-#: plugins/admin/systems/class_servDNS.inc:223
+#: plugins/admin/systems/class_termDNS.inc:132
 #, php-format
 msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
+"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:261
-msgid "Removing DNS service failed"
-msgstr "Ha fallado la eliminación del servicio DNS"
-
-#: plugins/admin/systems/class_servDNS.inc:282
-msgid "Updating DNS service failed"
-msgstr "Ha fallado la actualización del servicio DNS"
+#: plugins/admin/systems/class_termDNS.inc:298
+msgid "The required field 'IP-address' is not set."
+msgstr " El campo requerido 'Dirección IP' no ha sido rellenado."
 
-#: plugins/admin/systems/class_servDNS.inc:291
-msgid "Removing DNS entries failed"
-msgstr "Ha fallado la eliminación de las entradas DNS"
+#: plugins/admin/systems/class_termDNS.inc:305
+msgid "Wrong IP format in field IP-address."
+msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:312
-msgid "Saving DNS entries failed"
-msgstr "Ha fallado la grabación de las entradas DNS"
+#: plugins/admin/systems/class_termDNS.inc:311
+msgid "The required field 'MAC-address' is not set."
+msgstr " El campo requerido 'Dirección MAC' no ha sido rellenado."
 
-#: plugins/admin/systems/workstationStartup.tpl:4
-#: plugins/admin/systems/terminalStartup.tpl:1
-msgid "Boot parameters"
-msgstr "Parametros de inicio"
+#: plugins/admin/systems/class_termDNS.inc:317
+msgid ""
+"The given macaddress is invalid. There must be 6 2byte segments seperated by "
+"':'."
+msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "Boot kernel"
-msgstr "Kernel de inicio"
+#: plugins/admin/systems/class_termDNS.inc:338
+#, php-format
+msgid "Found duplicate value for record type '%s'."
+msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:17
-#: plugins/admin/systems/terminalStartup.tpl:17
-msgid "Custom options"
-msgstr "Otras opciones"
+#: plugins/admin/systems/class_termDNS.inc:346
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
+msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:19
+#: plugins/admin/systems/class_termDNS.inc:357
+#, php-format
 msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
 msgstr ""
-"Introducir que parámetros serán pasados a la configuración de arranque del "
-"nucleo"
-
-#: plugins/admin/systems/workstationStartup.tpl:22
-#: plugins/admin/systems/terminalStartup.tpl:22
-msgid "LDAP server"
-msgstr "Servidor LDAP"
 
-#: plugins/admin/systems/workstationStartup.tpl:41
-#: plugins/admin/systems/workstationStartup.tpl:71
-msgid "FAI server"
-msgstr "Servidor FAI"
+#: plugins/admin/systems/class_termDNS.inc:364
+#: plugins/admin/systems/class_servDNSeditZone.inc:409
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
+msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:63
-#: plugins/admin/systems/workstationStartup.tpl:95
-msgid "Assigned FAI classes"
-msgstr "Asignar clases FAI"
+#: plugins/admin/systems/class_termDNS.inc:447
+msgid "Saving terminal to DNS object failed"
+msgstr "Ha fallado la grabación del terminal en el objeto DNS."
 
-#: plugins/admin/systems/workstationStartup.tpl:85
-msgid "set"
-msgstr "poner"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
+msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:116
-#: plugins/admin/systems/terminalStartup.tpl:53
-msgid "Kernel modules (format: name parameters)"
-msgstr "Módulos del núcleo (formato: nombre parámetros)"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
+msgid "The selected name is already in use."
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/workstationStartup.tpl:118
-#: plugins/admin/systems/terminalStartup.tpl:55
-msgid "Add additional modules to load on startup"
-msgstr "Añadir módulos adicionales que serán cargados al arrancar"
+#: plugins/admin/systems/goSpamServer.tpl:8
+#, fuzzy
+msgid "Rewrite header"
+msgstr "cabecera"
 
-#: plugins/admin/systems/workstationStartup.tpl:142
-#: plugins/admin/systems/terminalStartup.tpl:79
-msgid "Mountpoint"
-msgstr "Punto de montaje"
+#: plugins/admin/systems/goSpamServer.tpl:16
+msgid "Required score"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:69
-#: plugins/admin/systems/workstationService.tpl:121
-#: plugins/admin/systems/class_workstationService.inc:92
-msgid "unknown"
-msgstr "desconocido"
+#: plugins/admin/systems/goSpamServer.tpl:19
+msgid "Select required score to tag mail as spam"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:101
-#: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:95
-#: plugins/admin/systems/class_workstationService.inc:96
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_workstationService.inc:98
-msgid "bit"
-msgstr "bit"
+#: plugins/admin/systems/goSpamServer.tpl:56
+msgid "Enable use of bayes filtering"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:155
-msgid "default"
-msgstr "por defecto"
+#: plugins/admin/systems/goSpamServer.tpl:57
+msgid "Enable bayes auto learning"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:156
-#: plugins/admin/systems/class_workstationService.inc:138
-msgid "show chooser"
-msgstr "mostrar elegidos"
+#: plugins/admin/systems/goSpamServer.tpl:58
+msgid "Enable RBL checks"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:157
-#: plugins/admin/systems/class_workstationService.inc:139
-msgid "direct"
-msgstr "Directo"
+#: plugins/admin/systems/goSpamServer.tpl:67
+msgid "Enable use of Razor"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:160
-#: plugins/admin/systems/class_workstationService.inc:142
-msgid "load balanced"
-msgstr "balanceo de carga"
+#: plugins/admin/systems/goSpamServer.tpl:68
+msgid "Enable use of DDC"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:163
-#: plugins/admin/systems/class_workstationService.inc:145
-msgid "Windows RDP"
-msgstr "Windows RDP"
+#: plugins/admin/systems/goSpamServer.tpl:69
+msgid "Enable use of Pyzer"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:164
-#: plugins/admin/systems/class_workstationService.inc:146
-msgid "ICA client"
-msgstr "Cliente ICA"
+#: plugins/admin/systems/class_servRepository.inc:97
+msgid "Remove FAI repository extension."
+msgstr "Eliminar extensión de repositorio FAI."
 
-#: plugins/admin/systems/class_terminalService.inc:217
-#: plugins/admin/systems/class_workstationService.inc:204
-msgid "Bit"
-msgstr "Bit"
+#: plugins/admin/systems/class_servRepository.inc:98
+msgid ""
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión repositorio FAI activada. Puede "
+"desactivarla pulsando aquí."
 
-#: plugins/admin/systems/class_terminalService.inc:303
-#: plugins/admin/systems/class_workstationService.inc:291
-msgid "Choose the phone located at the current terminal"
-msgstr "Elija el teléfono localizado en el terminal actual"
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:365
-#: plugins/admin/systems/class_terminalService.inc:370
-#: plugins/admin/systems/class_workstationService.inc:354
-#: plugins/admin/systems/class_workstationService.inc:359
-msgid "Please specify a valid VSync range."
-msgstr "Por favor especifique un rango VSync valido"
+#: plugins/admin/systems/class_servRepository.inc:101
+msgid ""
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión repositorio FAI desactivada. Puede "
+"activarla pulsando aquí."
 
-#: plugins/admin/systems/class_terminalService.inc:380
-#: plugins/admin/systems/class_terminalService.inc:385
-#: plugins/admin/systems/class_workstationService.inc:369
-#: plugins/admin/systems/class_workstationService.inc:374
-msgid "Please specify a valid HSync range."
-msgstr "Por favor especifique un rango HSync valido"
+#: plugins/admin/systems/class_servRepository.inc:145
+#, php-format
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalService.inc:416
-msgid "Saving terminal service information failed"
-msgstr "Ha fallado la grabación de la información del servicio de terminal"
+#: plugins/admin/systems/class_servRepository.inc:179
+#, php-format
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:253
+#: plugins/admin/systems/class_servRepository.inc:274
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+msgid "Sections"
+msgstr "Secciones"
 
 #: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
@@ -9050,217 +9540,297 @@ msgstr "Añadir repositorio"
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
-msgid "This feature is not implemented yet."
+#: plugins/admin/systems/goVirusServer.tpl:5
+#, fuzzy
+msgid "Generic virus filtering"
+msgstr "Información genérica del usuario"
+
+#: plugins/admin/systems/goVirusServer.tpl:13
+#, fuzzy
+msgid "Database user"
+msgstr "Bases de datos"
+
+#: plugins/admin/systems/goVirusServer.tpl:21
+#, fuzzy
+msgid "Database mirror"
+msgstr "Bases de datos"
+
+#: plugins/admin/systems/goVirusServer.tpl:29
+msgid "Http proxy URL"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:292
-msgid "Adding new sytem type failed, this system type name is already used."
+#: plugins/admin/systems/goVirusServer.tpl:40
+#, fuzzy
+msgid "Select number of maximal threads"
+msgstr "Seleccione números para añadir"
+
+#: plugins/admin/systems/goVirusServer.tpl:53
+msgid "Max directory recursions"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:312
-#, php-format
-msgid "You can't delete this system type, it is still in use by these system(s) '%s'"
+#: plugins/admin/systems/goVirusServer.tpl:70
+msgid "Enable debugging"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:323
-msgid "Rename failed, this system type name is already used."
-msgstr "El cambio de nombre ha fallado, ha especificado uno que está siendo usado."
+#: plugins/admin/systems/goVirusServer.tpl:76
+msgid "Enable mail scanning"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:379
-msgid "Adding new operating system failed, specifed name is already used."
-msgstr "Añadir nuevo sistema operativo ha fallado, el valor especificado esta siendo utilizado."
+#: plugins/admin/systems/goVirusServer.tpl:85
+msgid "Archive scanning"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:401
-#, php-format
-msgid ""
-"You can't delete this operating system, it is still in use by these system"
-"(s) '%s'"
+#: plugins/admin/systems/goVirusServer.tpl:99
+msgid "Enable scanning of archives"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
-msgid "Updating operating system failed, specifed name is already used."
-msgstr "Actualizar sistema operativo ha fallado, el valor especificado esta siendo utilizado."
+#: plugins/admin/systems/goVirusServer.tpl:105
+msgid "Block encrypted archives"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:566
-msgid ""
-"This device has inventory informations enabled. You can disable them by "
-"clicking below."
+#: plugins/admin/systems/goVirusServer.tpl:121
+msgid "Maximum recursion"
 msgstr ""
-"Este dispositivo tiene información de inventario activada. Puede desactivarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_glpiAccount.inc:569
-msgid ""
-"This device has inventory informations disabled. You can enable them by "
-"clicking below."
+#: 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 ""
-"Este dispositivo tiene información de inventario desactivada. Puede activarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_glpiAccount.inc:667
-msgid "Can't remove glpi account, while mysql extension is missing."
-msgstr "Mientras no se encuentra la extensión php_mysql no se puede eliminar la cuenta glpi."
+#: plugins/admin/systems/servdnseditzone.tpl:39
+msgid "SOA record"
+msgstr "Registros SOA"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:176
-#, php-format
-msgid ""
-"Can't rename '%s' to '%s' there is already an entry with the same name in "
-"our zone editing dialog."
+#: plugins/admin/systems/servdnseditzone.tpl:45
+msgid "Primary dns server for this zone"
+msgstr "Servidor DNS primario para esta zona"
+
+#: plugins/admin/systems/servdnseditzone.tpl:57
+msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
-#, php-format
-msgid "Entry name '%s' contains invalid characters."
-msgstr "¡El nombre de la entrada '%s' contiene caracteres no validos!"
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Reintentar"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
-#, php-format
-msgid "Can not rename '%s' to '%s',the destination name already exists."
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr "Expira"
+
+#: plugins/admin/systems/servdnseditzone.tpl:100
+msgid "MxRecords"
+msgstr "Registros MX"
+
+#: plugins/admin/systems/servdnseditzone.tpl:112
+msgid "Global zone records"
+msgstr "Registros de zona global"
+
+#: plugins/admin/systems/class_winGeneric.inc:126
+msgid "Removing Samba workstation failed"
+msgstr "Ha fallado la eliminación de la estación de trabajo Samba"
+
+#: plugins/admin/systems/class_winGeneric.inc:224
+msgid "Saving Samba workstation failed"
+msgstr "Ha fallado la grabación de la estación de trabajo Samba"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+msgid "use"
+msgstr "uso"
+
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
 msgstr ""
-"No se puede renombrar '%s' a '%s',"
-"ya existe el nombre de destino."
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
-#, php-format
-msgid "Can not create '%s',the destination name already exists."
-msgstr "No se puede crear '%s', el nombre de destino ya existe."
+#: plugins/admin/systems/class_terminalService.inc:155
+msgid "default"
+msgstr "por defecto"
+
+#: plugins/admin/systems/class_terminalService.inc:421
+msgid "Saving terminal service information failed"
+msgstr "Ha fallado la grabación de la información del servicio de terminal"
+
+#: plugins/admin/systems/glpi_devices.tpl:2
+msgid "Add/Edit monitor"
+msgstr "Añadir/Editar monitor"
+
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+msgid "Comments"
+msgstr "Comentarios"
+
+#: plugins/admin/systems/glpi_devices.tpl:33
+msgid "Monitor size"
+msgstr "Tamaño del monitor"
+
+#: plugins/admin/systems/glpi_devices.tpl:36
+msgid "Inch"
+msgstr "Pulgada"
+
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
+msgstr "Micrófono integrado"
+
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
+msgid "Yes"
+msgstr "Si"
+
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
+msgid "No"
+msgstr "No"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
-#, php-format
-msgid "The name '%s' is used more than once."
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
-#, php-format
-msgid "The record type '%s' is a unique type and can't be defined twice."
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
-#, php-format
-msgid "There is an empty '%s' for host '%s'."
-msgstr "Hay un '%s' vacío para el host '%s'."
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
-#, php-format
-msgid "There is a duplicate entry in '%s' for '%s'."
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:83
+msgid "Additional serial number"
+msgstr "Número de serie adicional"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
-msgid "List of attachments"
-msgstr "Lista de Adjuntos"
+#: plugins/admin/systems/glpi_devices.tpl:97
+msgid "Add/Edit other device"
+msgstr "Añadir/Editar otro dispositivo"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
-msgid "Display attachments matching"
-msgstr "Mostrar adjuntos que concuerden con"
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
+msgstr "ATX"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-msgid "Regular expression for matching attachment names"
-msgstr "Expresiones regulares para encontrar nombres de adjuntos"
+#: plugins/admin/systems/glpi_devices.tpl:181
+msgid "Power"
+msgstr "Potencia"
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Sistemas"
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:211
-msgid "You can't edit this object type yet!"
-msgstr "¡No puede editar este tipo de objeto todavía!"
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:236
-msgid "Passwords entered as new and repeated do not match!"
-msgstr "!Las contraseñas introducidas como 'nuevo' y 'repetir' no son iguales¡"
+#: plugins/admin/systems/glpi_devices.tpl:237
+msgid "Ram"
+msgstr "RAM"
 
-#: plugins/admin/systems/class_systemManagement.inc:253
-msgid "You are not allowed to set this systems password!"
-msgstr "¡No tiene permisos para cambiar contraseñas de sistema!"
+#: plugins/admin/systems/glpi_devices.tpl:249
+msgid "Add/Edit controller"
+msgstr "Añadir/Editar controlador"
 
-#: plugins/admin/systems/class_systemManagement.inc:307
-#, php-format
-msgid "You're about to delete all information about the component at '%s'."
-msgstr "Esta a punto de borrar toda la información sobre el componente en '%s'."
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:616
-msgid "New terminal"
-msgstr "Nuevo terminal"
+#: plugins/admin/systems/glpi_devices.tpl:342
+msgid "Speed"
+msgstr "Velocidad"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
-msgid "New workstation"
-msgstr "Nueva estación de trabajo"
+#: plugins/admin/systems/glpi_devices.tpl:358
+msgid "Writeable"
+msgstr "Grabable"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
-msgid "New Device"
-msgstr "Nuevo dispositivo"
+#: plugins/admin/systems/glpi_devices.tpl:371
+msgid "Add/Edit harddisk"
+msgstr "Añadir/Editar Disco Duro"
 
-#: plugins/admin/systems/class_systemManagement.inc:635
-msgid "Terminal template for"
-msgstr "Plantilla de terminal para"
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:647
-msgid "Workstation template for"
-msgstr "Plantilla de estación de trabajo para"
+#: plugins/admin/systems/glpi_devices.tpl:413
+msgid "Cache"
+msgstr "Cache"
 
-#: plugins/admin/systems/class_systemManagement.inc:735
-msgid "New System from incoming"
-msgstr "Nuevo sistema desde la entrada"
+#: plugins/admin/systems/glpi_devices.tpl:443
+msgid "Add/Edit memory"
+msgstr "Añadir/Editar memoria"
 
-#: plugins/admin/systems/class_systemManagement.inc:739
-msgid "Workstation is installing"
-msgstr "La estación de trabajo se está instalando"
+#: plugins/admin/systems/glpi_devices.tpl:478
+msgid "Frequenz"
+msgstr "Frecuencia"
 
-#: plugins/admin/systems/class_systemManagement.inc:740
-msgid "Workstation is waiting for action"
-msgstr "la estación de trabajo esta esperando por una acción"
+#: plugins/admin/systems/glpi_devices.tpl:507
+msgid "Add/Edit sound card"
+msgstr "Añadir/Editar tarjeta de sonido"
 
-#: plugins/admin/systems/class_systemManagement.inc:741
-msgid "Workstation installation failed"
-msgstr "Ha fallado la instalación de la estación de trabajo"
+#: plugins/admin/systems/glpi_devices.tpl:553
+msgid "Add/Edit network interface"
+msgstr "Añadir/Editar dispositivo de red"
 
-#: plugins/admin/systems/class_systemManagement.inc:744
-msgid "Server is installing"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:589
+msgid "MAC address"
+msgstr "Dirección MAC"
 
-#: plugins/admin/systems/class_systemManagement.inc:745
-msgid "Server is waiting for action"
-msgstr "El servidor está esperando por una acción"
+#: plugins/admin/systems/glpi_devices.tpl:607
+msgid "Add/Edit processor"
+msgstr "Añadir/Editar procesador"
 
-#: plugins/admin/systems/class_systemManagement.inc:746
-msgid "Server installation failed"
-msgstr "Ha fallado la instalación del servidor"
+#: plugins/admin/systems/glpi_devices.tpl:642
+msgid "Frequence"
+msgstr "Frecuencia"
 
-#: plugins/admin/systems/class_systemManagement.inc:747
-msgid "Winstation"
-msgstr "Estación de trabajo Windows"
+#: plugins/admin/systems/glpi_devices.tpl:649
+msgid "Default frequence"
+msgstr "Frecuencia por defecto"
 
-#: plugins/admin/systems/class_systemManagement.inc:748
-msgid "Network Device"
-msgstr "Dispositivo de Red"
+#: plugins/admin/systems/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
+msgstr "Añadir/Editar placa base"
 
-#: plugins/admin/systems/class_systemManagement.inc:749
-#: plugins/admin/systems/class_divListSystem.inc:96
-msgid "New Terminal"
-msgstr "Nuevo terminal"
+#: plugins/admin/systems/glpi_devices.tpl:696
+msgid "Chipset"
+msgstr "Chipset"
 
-#: plugins/admin/systems/class_systemManagement.inc:750
-#: plugins/admin/systems/class_divListSystem.inc:98
-msgid "New Workstation"
-msgstr "Nueva estación de trabajo"
+#: plugins/admin/systems/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
+msgstr "Añadir/Editar Caja de ordenador"
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
-msgid "This dialog allows you to select a user as technical responsible person."
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:742
+msgid "format"
+msgstr "formateo"
+
+#: plugins/admin/systems/class_terminalStartup.inc:400
+msgid "Saving terminal startup settings failed"
+msgstr "Ha fallado la grabación de los parámetros de inicio de terminal"
 
 #: plugins/admin/systems/class_servService.inc:320
 msgid "Terminal server, must have fontpath specified."
@@ -9282,616 +9852,700 @@ msgstr "Ha fallado la eliminación del contenedor de montaje"
 msgid "Saving mount container failed"
 msgstr "Ha fallado la grabación del contenedor de montaje"
 
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
-msgstr "Teclado"
+#: plugins/admin/systems/servRepositorySetup.tpl:8
+msgid "Parent server"
+msgstr "Servidor Origen"
+
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Servicio de Hora"
+
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Servicio LDAP"
+
+#: plugins/admin/systems/servservice.tpl:70
+msgid "Terminal Service"
+msgstr "Servidor de terminal"
+
+#: plugins/admin/systems/servservice.tpl:75
+msgid "Temporary disable login"
+msgstr "Desactivación temporal del acceso"
+
+#: plugins/admin/systems/servservice.tpl:78
+msgid "Font path"
+msgstr "Ruta a las fuentes tipográficas"
+
+#: plugins/admin/systems/servservice.tpl:91
+msgid "Syslog Service"
+msgstr "Servicio de Logs"
+
+#: plugins/admin/systems/servservice.tpl:99
+msgid "Print Service"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/servservice.tpl:107
+msgid "Mail server"
+msgstr "Servidor de correo"
+
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr ""
+
+#: plugins/admin/systems/goSpamServerRule.tpl:14
+#, fuzzy
+msgid "Rule"
+msgstr "Papel desempeñado"
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
+msgid ""
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+msgid "Display cartridge types matching"
+msgstr "Mostrar tipos de cartuchos que concuerdan con"
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+msgid "Regular expression for matching cartridge types"
+msgstr "Expresiones regulares que concuerden con tipos de cartuchos"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:98
+msgid "text"
+msgstr "texto"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:99
+msgid "graphic"
+msgstr "Gráfico"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:167
+msgid "No WAKECMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:179
+msgid "No REBOOTCMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'REBOOTCMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
-msgstr "Elija modelo de teclado"
+#: plugins/admin/systems/class_terminalGeneric.inc:191
+msgid "No HALTCMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
-msgstr "Disposición"
+#: plugins/admin/systems/class_terminalGeneric.inc:314
+msgid "Removing terminal failed"
+msgstr "Ha fallado la eliminación del terminal"
 
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
-msgstr "Elija localización del teclado"
+#: plugins/admin/systems/class_terminalGeneric.inc:371
+msgid "You have no permissions to create a terminal on this 'Base'."
+msgstr "No tiene permisos para crear un terminal en esta 'Base'."
 
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
-msgstr "Variante"
+#: plugins/admin/systems/class_terminalGeneric.inc:375
+msgid "The required field 'Terminal name' is not set."
+msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
 
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
-msgstr "Elija variante de teclado"
+#: plugins/admin/systems/class_terminalGeneric.inc:475
+msgid "Saving terminal failed"
+msgstr "Ha fallado la grabación del terminal"
 
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
-msgstr "Ratón"
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+msgid "Printer driver"
+msgstr "Controlador de dispositivo de Impresión"
 
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
-msgstr "Elija tipo de ratón"
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+msgid "Select"
+msgstr "Seleccionar"
 
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
-msgstr "Puerto"
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+msgid "New driver"
+msgstr "Nuevo controlador de dispositivo"
 
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-msgid "Choose mouse port"
-msgstr "Elija el puerto del ratón"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
+msgstr ""
 
-#: 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_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, php-format
+msgid "You're about to delete the glpi device '%s'."
+msgstr "Está a punto de borrar el dispositivo glpi '%s'."
 
-#: 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/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
+msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:88
-#: plugins/admin/systems/terminalService.tpl:88
-msgid "Choose graphic driver that is needed by the installed graphic board"
-msgstr "Elija controlador gráfico que se necesita para la tarjeta gráfica instalada"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
+msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr "Elija la resolución gráfica usada en modo gráfico"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+msgid "devices"
+msgstr "dispositivos"
 
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
-msgstr "Profundidad del Color"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+msgid "New mainbord"
+msgstr "Nueva placa base"
 
-#: plugins/admin/systems/workstationService.tpl:104
-#: plugins/admin/systems/terminalService.tpl:104
-msgid "Choose colordepth used in graphic mode"
-msgstr "Elija la profundidad de color usada en modo gráfico"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "New processor"
+msgstr "Nuevo procesador"
 
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
-msgstr "Mostrar dispositivo"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "New case"
+msgstr "Nueva caja"
 
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
-msgstr "HSync"
-
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
-msgstr "Frecuencia de refresco horizontal para el monitor instalado"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "New network interface"
+msgstr "Nuevo dispositivo de red"
 
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
-msgstr "VSync"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+msgid "NI"
+msgstr "NI"
 
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
-msgstr "Frecuencia de refresco vertical para el monitor instalado"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "New ram"
+msgstr "Nueva memoria"
 
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
-msgstr "Dispositivo de escaneo"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
+msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:150
-#: plugins/admin/systems/terminalService.tpl:204
-msgid "Select to start SANE scan service on terminal"
-msgstr "Seleccione para iniciar el servicio de escáner 'SANE' en el terminal"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "New hard disk"
+msgstr "Nuevo disco duro"
 
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
-msgstr "Provee servicios de exploración"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
+msgstr "HDD"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
-msgstr "Esta 'dn' no tiene características de teléfono."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "New drive"
+msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_divListMacros.inc:109
-msgid "yes"
-msgstr "si"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+msgid "D"
+msgstr "D"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:203
-#: plugins/gofon/macro/class_divListMacros.inc:110
-msgid "no"
-msgstr "no"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "New controller"
+msgstr "Nueva controladora"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:225
-msgid "dynamic"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:225
-msgid "Networksettings"
-msgstr "Configuración de red"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:240
-#, php-format
-msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:247
-msgid "Removing phone failed"
-msgstr "Ha fallado la eliminación del teléfono"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
+msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:292
-msgid "The required field 'Phone name' is not set."
-msgstr "El campo requerido 'Nombre del teléfono' no ha sido rellenado."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "New sound card"
+msgstr "Nueva tarjeta de sonido"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:295
-msgid "The 'Phone name' '0' is reserved and cannot be used."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:302
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
+msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:397
-msgid "Saving phone failed"
-msgstr "Ha fallado la grabación del nombre de teléfono"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
+msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
-msgid "List of devices"
-msgstr "Lista de dispositivos"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "New misc device"
+msgstr "Nuevo dispositivo (otros)"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
-msgid "This dialog allows you to attach a device to your currently edited computer."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
-msgid "Display devices matching"
-msgstr "Mostrar dispositivos que concuerden con"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
+msgid "You have to specify a valid name for this device."
+msgstr "Por favor especifique un nombre valido para este dispositivo."
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:367
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:370
+msgid "This device name is already in use."
+msgstr "El nombre de dispositivo especificado ya esta siendo usado"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
+msgid "Other"
+msgstr "Otro"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-msgid "Regular expression for matching device names"
-msgstr "Expresiones regulares que concuerden con nombres de dispositivos"
+#: plugins/admin/systems/remove_glpi.tpl:10
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
+"actual de su base de datos MySql en un fichero. Entonces - Y solo si lo ha "
+"hecho - presione 'Eliminar' para continuar o 'Cancelar' para abortar."
 
-#: plugins/admin/systems/glpi_devices.tpl:2
-msgid "Add/Edit monitor"
-msgstr "Añadir/Editar monitor"
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
+msgstr "General"
 
-#: plugins/admin/systems/glpi_devices.tpl:33
-msgid "Monitor size"
-msgstr "Tamaño del monitor"
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Nombre de la impresora"
 
-#: plugins/admin/systems/glpi_devices.tpl:36
-msgid "Inch"
-msgstr "Pulgada"
+#: plugins/admin/systems/printer.tpl:36
+msgid "Details"
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
-msgstr "Micrófono integrado"
+#: plugins/admin/systems/printer.tpl:39
+msgid "Printer location"
+msgstr "Localización de la impresora"
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
-msgid "Yes"
-msgstr "Si"
+#: plugins/admin/systems/printer.tpl:43
+msgid "Printer URL"
+msgstr "URL de la impresora"
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
-msgid "No"
-msgstr "No"
+#: plugins/admin/systems/printer.tpl:63
+msgid "Permissions"
+msgstr "Permisos"
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
-msgstr ""
+#: 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"
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
-msgstr ""
+#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
+msgid "Add user"
+msgstr "Añadir usuario"
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
-msgstr ""
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
+msgid "Add group"
+msgstr "Añadir grupo"
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-msgid "Serial number"
-msgstr "Número de serie"
+#: plugins/admin/systems/printer.tpl:86
+msgid "Users which are allowed to administrate this printer"
+msgstr "usuarios que tienen permisos para administrar esta impresora"
 
-#: plugins/admin/systems/glpi_devices.tpl:83
-msgid "Additional serial number"
-msgstr "Número de serie adicional"
+#: plugins/admin/systems/printer.tpl:87
+msgid "Admins"
+msgstr "Administradores"
 
-#: plugins/admin/systems/glpi_devices.tpl:97
-msgid "Add/Edit other device"
-msgstr "Añadir/Editar otro dispositivo"
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr "Acceso a Kerberos kadmin"
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr "Dominio Kerberos"
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
-msgstr "ATX"
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
+msgstr "Usuario administrador"
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-msgid "Power"
-msgstr "Potencia"
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
+msgstr "Base de datos de FAX"
 
-#: plugins/admin/systems/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
+msgstr "Base de datos de usuarios de FAX"
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
+msgstr "Gestión de Asterisk PBX"
 
-#: plugins/admin/systems/glpi_devices.tpl:237
-msgid "Ram"
-msgstr "RAM"
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
+msgstr "Base de datos de usuarios Asterisk"
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-msgid "Add/Edit controller"
-msgstr "Añadir/Editar controlador"
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
+msgstr "Prefijo de marcado nacional"
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
+msgstr "Prefijo de marcado local"
 
-#: plugins/admin/systems/glpi_devices.tpl:342
-msgid "Speed"
-msgstr "Velocidad"
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr "Acceso administrador imap"
 
-#: plugins/admin/systems/glpi_devices.tpl:358
-msgid "Writeable"
-msgstr "Grabable"
+#: plugins/admin/systems/servdb.tpl:74
+msgid "Server identifier"
+msgstr "Identificador de servidor"
 
-#: plugins/admin/systems/glpi_devices.tpl:371
-msgid "Add/Edit harddisk"
-msgstr "Añadir/Editar Disco Duro"
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
+msgstr "Conectar a la URL"
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
-msgstr ""
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
+msgstr "Puerto de Sieve"
 
-#: plugins/admin/systems/glpi_devices.tpl:413
-msgid "Cache"
-msgstr "Cache"
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
+msgstr "Base de datos de Logs"
 
-#: plugins/admin/systems/glpi_devices.tpl:443
-msgid "Add/Edit memory"
-msgstr "Añadir/Editar memoria"
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
+msgstr "Base de datos de acceso de usuarios"
 
-#: plugins/admin/systems/glpi_devices.tpl:478
-msgid "Frequenz"
-msgstr "Frecuencia"
+#: plugins/admin/systems/servdb.tpl:119
+msgid "Glpi database"
+msgstr "Base de datos Glpi"
 
-#: plugins/admin/systems/glpi_devices.tpl:507
-msgid "Add/Edit sound card"
-msgstr "Añadir/Editar tarjeta de sonido"
+#: plugins/admin/systems/servdb.tpl:133
+msgid "Database"
+msgstr "Bases de datos"
 
-#: plugins/admin/systems/glpi_devices.tpl:553
-msgid "Add/Edit network interface"
-msgstr "Añadir/Editar dispositivo de red"
+#: plugins/admin/systems/class_servGeneric.inc:67
+msgid "This 'dn' has no server features."
+msgstr "Esta 'dn' no tiene características de servidor."
 
-#: plugins/admin/systems/glpi_devices.tpl:589
-msgid "MAC address"
-msgstr "Dirección MAC"
+#: plugins/admin/systems/class_servGeneric.inc:188
+msgid "Removing server failed"
+msgstr "Ha fallado la eliminación del servidor"
 
-#: plugins/admin/systems/glpi_devices.tpl:607
-msgid "Add/Edit processor"
-msgstr "Añadir/Editar procesador"
+#: plugins/admin/systems/class_servGeneric.inc:224
+msgid "The required field 'Server name' is not set."
+msgstr "El campo requerido 'Nombre del servidor' no ha sido rellenado."
 
-#: plugins/admin/systems/glpi_devices.tpl:642
-msgid "Frequence"
-msgstr "Frecuencia"
+#: plugins/admin/systems/class_servGeneric.inc:231
+msgid "You have no permissions to create a server on this 'Base'."
+msgstr "No tiene permisos para crear un servidor en esta 'Base'."
 
-#: plugins/admin/systems/glpi_devices.tpl:649
-msgid "Default frequence"
-msgstr "Frecuencia por defecto"
+#: plugins/admin/systems/class_servGeneric.inc:300
+msgid "Saving server failed"
+msgstr "Ha fallado la grabación del servidor"
 
-#: plugins/admin/systems/glpi_devices.tpl:661
-msgid "Add/Edit motherboard"
-msgstr "Añadir/Editar placa base"
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+msgid "Reference"
+msgstr "Referencia"
 
-#: plugins/admin/systems/glpi_devices.tpl:696
-msgid "Chipset"
-msgstr "Chipset"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr "Eliminar servicio DHCP"
 
-#: plugins/admin/systems/glpi_devices.tpl:707
-msgid "Add/Edit computer case"
-msgstr "Añadir/Editar Caja de ordenador"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión DHCP activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/glpi_devices.tpl:742
-msgid "format"
-msgstr "formateo"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
+msgstr "Añadir servicio DHCP"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
-msgstr "Seleccione si el terminal soporta inicio gráfico con barra de progreso"
+#: plugins/admin/systems/class_servDHCP.inc:40
+msgid ""
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
-msgstr "Usar arranque gráfico"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "New entry"
+msgstr "Nueva entrada"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr "Seleccione si el terminal debería arrancar en modo texto"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:176
+#, php-format
+msgid ""
+"Can't rename '%s' to '%s' there is already an entry with the same name in "
+"our zone editing dialog."
+msgstr ""
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr "Usar arranque en modo texto"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:203
+#, php-format
+msgid "Entry name '%s' contains invalid characters."
+msgstr "¡El nombre de la entrada '%s' contiene caracteres no validos!"
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
-msgstr "Seleccione para obtener una información mas prolija durante el arranque"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:212
+#, php-format
+msgid "Can not rename '%s' to '%s',the destination name already exists."
+msgstr "No se puede renombrar '%s' a '%s',ya existe el nombre de destino."
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
-msgstr "Usar el modo de depuración durante el arranque"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:218
+#, php-format
+msgid "Can not create '%s',the destination name already exists."
+msgstr "No se puede crear '%s', el nombre de destino ya existe."
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#, php-format
+msgid "The name '%s' is used more than once."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
-msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
+#, php-format
+msgid "The host name '%s' should be written in lowercase."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
-msgid "Display cartridge types matching"
-msgstr "Mostrar tipos de cartuchos que concuerdan con"
-
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-msgid "Regular expression for matching cartridge types"
-msgstr "Expresiones regulares que concuerden con tipos de cartuchos"
-
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
 #, php-format
-msgid "Selected vendor '%s' does not exists in our list of ppds."
+msgid "The record type '%s' is a unique type and can't be defined twice."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
-msgid "Printer ppd selection."
-msgstr "Seleccionar impresora ppd"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#, php-format
+msgid "There is an empty '%s' for host '%s'."
+msgstr "Hay un '%s' vacío para el host '%s'."
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:265
+#, php-format
+msgid "There is a duplicate entry in '%s' for '%s'."
+msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
-msgstr "Método de conexión"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
-msgstr "Elija el método de conexión con el servidor de terminal"
+#: plugins/admin/systems/class_systemManagement.inc:220
+msgid "You can't edit this object type yet!"
+msgstr "¡No puede editar este tipo de objeto todavía!"
 
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
-msgstr "Servidor de terminal"
+#: plugins/admin/systems/class_systemManagement.inc:272
+msgid "Creating the image failed. Please see the report below."
+msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
-msgstr "Seleccione específicamente que servidor de terminal usará"
+#: plugins/admin/systems/class_systemManagement.inc:277
+#, fuzzy, php-format
+msgid "Command '%s', specified for ISO creation doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
+"parece existir."
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
-msgstr "Servidor de fuentes"
+#: plugins/admin/systems/class_systemManagement.inc:281
+msgid "Disable auto scroll"
+msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
-msgstr "Seleccione específicamente que servidor de fuentes usará"
+#: plugins/admin/systems/class_systemManagement.inc:308
+msgid "Passwords entered as new and repeated do not match!"
+msgstr "!Las contraseñas introducidas como 'nuevo' y 'repetir' no son iguales¡"
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
-msgstr "Dispositivo de Impresión"
+#: plugins/admin/systems/class_systemManagement.inc:325
+msgid "You are not allowed to set this systems password!"
+msgstr "¡No tiene permisos para cambiar contraseñas de sistema!"
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
+#: plugins/admin/systems/class_systemManagement.inc:379
+#, php-format
+msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
-"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
-"terminal"
+"Esta a punto de borrar toda la información sobre el componente en '%s'."
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
-msgstr "Proveer servicios de impresión"
+#: plugins/admin/systems/class_systemManagement.inc:478
+#, php-format
+msgid ""
+"Can't set gotoMode to status 'avtice', the current object couldn't be "
+"identified."
+msgstr ""
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Servidor de Cola"
+#: plugins/admin/systems/class_systemManagement.inc:715
+msgid "New terminal"
+msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr "Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
+#: plugins/admin/systems/class_systemManagement.inc:717
+msgid "New workstation"
+msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Seleccione que controladores de escáner se usaran"
+#: plugins/admin/systems/class_systemManagement.inc:719
+msgid "New Device"
+msgstr "Nuevo dispositivo"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-msgid "Attachment"
-msgstr "Adjuntos"
+#: plugins/admin/systems/class_systemManagement.inc:734
+msgid "Terminal template for"
+msgstr "Plantilla de terminal para"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-msgid "Filename"
-msgstr "Nombre del archivo"
+#: plugins/admin/systems/class_systemManagement.inc:746
+msgid "Workstation template for"
+msgstr "Plantilla de estación de trabajo para"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-msgid "Mime-type"
-msgstr "Tipo MIME"
+#: plugins/admin/systems/class_systemManagement.inc:834
+msgid "New System from incoming"
+msgstr "Nuevo sistema desde la entrada"
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
-"actual de su base de datos MySql en un fichero. Entonces - Y solo si lo ha hecho - "
-"presione 'Eliminar' para continuar o 'Cancelar' para abortar."
+#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:370
+msgid "Terminal"
+msgstr "Terminal"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:184
-msgid "This 'dn' has no workstation features."
-msgstr "Esta 'dn' no tiene características de estación de trabajo."
+#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:369
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:279
-msgid "Removing workstation failed"
-msgstr "Ha fallado la eliminación de la estación de trabajo"
+#: plugins/admin/systems/class_systemManagement.inc:838
+msgid "Workstation is installing"
+msgstr "La estación de trabajo se está instalando"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:330
-#: plugins/admin/ogroups/class_termgroup.inc:106
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr "No tiene permisos para crear una estación de trabajo en esta 'Base'."
+#: plugins/admin/systems/class_systemManagement.inc:839
+msgid "Workstation is waiting for action"
+msgstr "la estación de trabajo esta esperando por una acción"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:334
-msgid "The required field 'Workstation name' is not set."
-msgstr " El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
+#: plugins/admin/systems/class_systemManagement.inc:840
+msgid "Workstation installation failed"
+msgstr "Ha fallado la instalación de la estación de trabajo"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:357
-#: plugins/admin/systems/class_terminalGeneric.inc:407
-msgid ""
-"There must be at least one NTP server selected, or the inherit mode "
-"activated."
+#: plugins/admin/systems/class_systemManagement.inc:843
+msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:424
-#: plugins/admin/systems/class_workstationGeneric.inc:442
-#: plugins/admin/ogroups/class_termgroup.inc:290
-msgid "Saving workstation failed"
-msgstr "Ha fallado la grabación de la estación de trabajo"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:98
-msgid "text"
-msgstr "texto"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:99
-msgid "graphic"
-msgstr "Gráfico"
+#: plugins/admin/systems/class_systemManagement.inc:844
+msgid "Server is waiting for action"
+msgstr "El servidor está esperando por una acción"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:167
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
+#: plugins/admin/systems/class_systemManagement.inc:845
+msgid "Server installation failed"
+msgstr "Ha fallado la instalación del servidor"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:179
-msgid "No REBOOTCMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'REBOOTCMD' en 'gosa.conf'"
+#: plugins/admin/systems/class_systemManagement.inc:846
+msgid "Winstation"
+msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:191
-msgid "No HALTCMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
+#: plugins/admin/systems/class_systemManagement.inc:847
+msgid "Network Device"
+msgstr "Dispositivo de Red"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:325
-msgid "Removing terminal failed"
-msgstr "Ha fallado la eliminación del terminal"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
+msgid ""
+"This dialog allows you to configure all components of this DNS zone on a "
+"single list."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:380
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr "No tiene permisos para crear un terminal en esta 'Base'."
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
+msgid ""
+"Be careful editing record types with this dialog. All changes will be saved "
+"immediately when using the save button."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:384
-msgid "The required field 'Terminal name' is not set."
-msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+msgid ""
+"This dialog can't be used until the currently edited zone was saved or the "
+"zone entry exists in the ldap database."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:481
-msgid "Saving terminal failed"
-msgstr "Ha fallado la grabación del terminal"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "Create a new DNS zone entry"
+msgstr "Crear una nueva entrada de zona DNS"
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-msgid "Manage manufacturers"
-msgstr "Gestione fabricantes"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
+msgstr "Añadir/Editar Fabricante"
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-msgid "Zone name"
-msgstr "Nombre de la zona"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+msgid "Website"
+msgstr "Sitio web"
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
-msgid "Network address"
-msgstr "Dirección de red"
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:138
+#: plugins/admin/ogroups/class_phonequeue.inc:691
+#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Phone number"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
-msgid "Zone records"
-msgstr "Registros de zona"
+#: plugins/admin/systems/class_servDNS.inc:67
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
+msgstr "Eliminar servicio DNS"
 
-#: plugins/admin/systems/servdnseditzone.tpl:27
-msgid "Can't be edited because the zone wasn't saved right now."
+#: plugins/admin/systems/class_servDNS.inc:68
+#: plugins/admin/systems/class_inventory.inc:37
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
+"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/servdnseditzone.tpl:39
-msgid "SOA record"
-msgstr "Registros SOA"
+#: plugins/admin/systems/class_servDNS.inc:70
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
+msgstr "Añadir servicio DNS"
 
-#: plugins/admin/systems/servdnseditzone.tpl:45
-msgid "Primary dns server for this zone"
-msgstr "Servidor DNS primario para esta zona"
+#: plugins/admin/systems/class_servDNS.inc:71
+#: plugins/admin/systems/class_inventory.inc:40
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
+msgstr ""
+"Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/servdnseditzone.tpl:57
-msgid "Serial number (automatically incremented)"
+#: plugins/admin/systems/class_servDNS.inc:159
+msgid "Reverse zone"
+msgstr "Zona Inversa"
+
+#: plugins/admin/systems/class_servDNS.inc:223
+#, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:73
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Reintentar"
+#: plugins/admin/systems/class_servDNS.inc:261
+msgid "Removing DNS service failed"
+msgstr "Ha fallado la eliminación del servicio DNS"
 
-#: plugins/admin/systems/servdnseditzone.tpl:79
-msgid "Expire"
-msgstr "Expira"
+#: plugins/admin/systems/class_servDNS.inc:282
+msgid "Updating DNS service failed"
+msgstr "Ha fallado la actualización del servicio DNS"
 
-#: plugins/admin/systems/servdnseditzone.tpl:100
-msgid "MxRecords"
-msgstr "Registros MX"
+#: plugins/admin/systems/class_servDNS.inc:291
+msgid "Removing DNS entries failed"
+msgstr "Ha fallado la eliminación de las entradas DNS"
 
-#: plugins/admin/systems/servdnseditzone.tpl:112
-msgid "Global zone records"
-msgstr "Registros de zona global"
+#: plugins/admin/systems/class_servDNS.inc:312
+msgid "Saving DNS entries failed"
+msgstr "Ha fallado la grabación de las entradas DNS"
+
+#: plugins/admin/systems/password.tpl:2
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
+msgstr ""
+"Para cambiar la contraseña del administrador del terminal use los campos a "
+"continuación. Los cambios tomarán efecto en el próxima reinicio. Por favor, "
+"recuerde la nueva contraseña, porque no podrá autenticarse sin ella."
+
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:351
-msgid "This zoneName is already in use"
-msgstr "El nombre de zona especificado ya esta siendo usado"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+msgstr "Cambiar la contraseña afecta solamente a la autenticación."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:354
-msgid "This reverse zone is already in use"
-msgstr "El nombre de zona inversa especificado ya esta siendo usado"
+#: plugins/admin/systems/remove.tpl:6
+#, fuzzy
+msgid ""
+"This includes 'all' system and setup informations. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
+"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
+"esto, no hay forma de que GOsa recupere la información."
 
 #: plugins/admin/systems/class_servDNSeditZone.inc:359
 #, php-format
@@ -9942,839 +10596,971 @@ msgstr "Por favor especifique un valor numérico para expiración."
 msgid "Please specify a numeric value for retry."
 msgstr "Por favor especifique un valor numérico para reintento."
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:409
-#: plugins/admin/systems/class_termDNS.inc:365
+#: plugins/admin/systems/class_printGeneric.inc:108
 #, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationService.inc:415
-msgid "Saving workstation services failed"
-msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
+#: plugins/admin/systems/class_printGeneric.inc:250
+#: plugins/admin/systems/class_printGeneric.inc:258
+#: plugins/admin/systems/class_printGeneric.inc:263
+#: plugins/admin/systems/class_printGeneric.inc:302
+#: plugins/admin/systems/class_printGeneric.inc:318
+#: plugins/admin/systems/class_printGeneric.inc:321
+msgid "Add printer extension"
+msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:62
-#, php-format
-msgid "Can't open '%s', ppd settings resetted."
+#: plugins/admin/systems/class_printGeneric.inc:251
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construction."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:87
-msgid "Can't get ppd informations."
-msgstr "No se puede acceder a la información PPD"
+#: plugins/admin/systems/class_printGeneric.inc:259
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:99
-#, php-format
+#: plugins/admin/systems/class_printGeneric.inc:264
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:295
+msgid "This 'dn' has no printer features."
+msgstr "Esta 'dn' no tiene características de impresora."
+
+#: plugins/admin/systems/class_printGeneric.inc:303
 msgid ""
-"The specified path '%s' which results from PPD_PATH in your gosa.conf is "
-"invalid, can't read/write any ppd informations."
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
 msgstr ""
+"Este servidor tiene la extensión impresora desactivada. Puede activarla "
+"siempre que 'cn' no este presente en esta entrada. Posiblemente está "
+"actualmente creando una nueva plantilla de terminal"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:116
-msgid "Please specify a valid ppd file."
-msgstr "Por favor especifique un nombre de archivo PPD valido."
+#: plugins/admin/systems/class_printGeneric.inc:310
+#: plugins/admin/systems/class_printGeneric.inc:313
+msgid "Remove printer extension"
+msgstr "Eliminar extensión de impresión"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:186
+#: plugins/admin/systems/class_printGeneric.inc:311
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
+msgstr ""
+"Esta estación de trabajo tiene la extensión impresora activada. Puede "
+"desactivarla pulsando aquí."
+
+#: plugins/admin/systems/class_printGeneric.inc:314
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
+msgstr ""
+"Este terminal tiene la extensión impresora activada. Puede desactivarla "
+"pulsando aquí."
+
+#: plugins/admin/systems/class_printGeneric.inc:319
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
+msgstr ""
+"Esta estación de trabajo tiene la extensión impresora desactivada. Puede "
+"activarla pulsando aquí."
+
+#: plugins/admin/systems/class_printGeneric.inc:322
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
+msgstr ""
+"Este terminal tiene la extensión impresora desactivada. Puede activarla "
+"pulsando aquí."
+
+#: plugins/admin/systems/class_printGeneric.inc:488
 #, php-format
-msgid "Can't select PPD file '%s', the file is not readable"
+msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:203
-#: plugins/admin/systems/class_printerPPDDialog.inc:275
+#: plugins/admin/systems/class_printGeneric.inc:496
+msgid "can't get ppd informations."
+msgstr "no puedo acceder a la información PPD"
+
+#: plugins/admin/systems/class_printGeneric.inc:509
 #, php-format
-msgid "Can't create folder '%s' for the uploaded ppd file."
+msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:211
+#: plugins/admin/systems/class_printGeneric.inc:511
 #, php-format
-msgid "Can't create file '%s' to store modifed ppd informations."
-msgstr "No se puede crear el archivo '%s' para guardar la información PPD modificada."
+msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:235
+#: plugins/admin/systems/class_printGeneric.inc:566
+msgid "Removing printer failed"
+msgstr "Ha fallado la eliminación de la impresora"
+
+#: plugins/admin/systems/class_printGeneric.inc:624
+#, fuzzy
+msgid "You have no permissions to create a printer on this 'Base'."
+msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
+
+#: plugins/admin/systems/class_printGeneric.inc:780
+msgid "Saving printer failed"
+msgstr "Ha fallado la grabación de la impresora"
+
+#: plugins/admin/systems/class_printGeneric.inc:826
 #, php-format
-msgid "Can't add new ppd file, the source file '%s' is not accessible."
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:253
+#: plugins/admin/systems/class_printGeneric.inc:848
 #, php-format
-msgid ""
-"The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
-"informations."
+msgid "Can't add '%s' to the list of members, it is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:267
+#: plugins/admin/systems/class_printGeneric.inc:856
 #, php-format
-msgid "There is already a ppd file for this kind of printer."
-msgstr "Ya existe un archivo PPD para ese tipo de impresora."
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:288
+#: plugins/admin/systems/class_baseSelectDialog.inc:23
+msgid "Choose a base"
+msgstr "Seleccionar una base"
+
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
+msgstr ""
+
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
+msgid "Filter entries with this syntax"
+msgstr ""
+
+#: plugins/admin/systems/class_baseSelectDialog.inc:117
 #, php-format
-msgid "Can't save file '%s'."
-msgstr "No se puede grabar el archivo '%s'."
+msgid "Select this base"
+msgstr "Seleccionar esta base"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:292
-msgid "Uploaded ppd file is empty, can't create new ppd file."
+#: plugins/admin/systems/phonesettings.tpl:1
+msgid "Advanced phone settings"
+msgstr "Configuración telefónica avanzada"
+
+#: plugins/admin/systems/phonesettings.tpl:6
+msgid "Phone type"
+msgstr "Tipo de teléfono"
+
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
+msgid "Choose a phone type"
+msgstr "Elija tipo de teléfono"
+
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:462
-#: plugins/admin/systems/class_printerPPDDialog.inc:465
-msgid "True"
-msgstr "Verdadero"
+#: plugins/admin/systems/phonesettings.tpl:32
+msgid "DTMF mode"
+msgstr "Modo DTMF"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:463
-#: plugins/admin/systems/class_printerPPDDialog.inc:466
-msgid "False"
-msgstr "Falso"
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
+msgid "Default IP"
+msgstr "Dirección IP por defecto"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:471
-#, php-format
-msgid "Unsupported ppd type '%s' used for '%s' "
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:46
-msgid "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
-msgstr ""
+#: plugins/admin/systems/phonesettings.tpl:75
+msgid "Modus"
+msgstr "Modo"
 
-#: plugins/admin/systems/class_servNfs.inc:49
-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/phonesettings.tpl:106
+msgid "Authtype"
+msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:179
-msgid "Please specify a valid path for your setup."
-msgstr "Por favor especifique una ruta valida para su configuración."
+#: plugins/admin/systems/phonesettings.tpl:116
+msgid "Secret"
+msgstr "Secreto"
 
-#: plugins/admin/systems/class_servNfs.inc:185
-msgid "Please specify a valid name for your share."
-msgstr "Por favor especifique un nombre valido para su recurso compartido."
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
+msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:188
-msgid "Please specify a name for your share."
-msgstr "Por favor especifique un nombre para su recurso compartido."
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
+msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:193
-msgid "Description contains invalid characters."
-msgstr "¡La descripción contiene caracteres no validos."
+#: plugins/admin/systems/phonesettings.tpl:145
+msgid "Account code"
+msgstr "Código de cuenta"
 
-#: plugins/admin/systems/class_servNfs.inc:197
-msgid "Volume contains invalid characters."
-msgstr "El volumen contiene caracteres no validos."
+#: plugins/admin/systems/phonesettings.tpl:153
+msgid "Trunk lines"
+msgstr "Lineas troncales"
 
-#: plugins/admin/systems/class_servNfs.inc:201
-msgid "Path contains invalid characters."
-msgstr "La ruta contiene caracteres no validos."
+#: plugins/admin/systems/phonesettings.tpl:168
+msgid "Hosts that are allowed to connect"
+msgstr "Equipos/Redes que tienen permiso para conectar"
 
-#: plugins/admin/systems/class_servNfs.inc:205
-msgid "Option contains invalid characters."
-msgstr "La opción contiene caracteres no validos."
+#: plugins/admin/systems/phonesettings.tpl:183
+msgid "Hosts that are not allowed to connect"
+msgstr "Equipos/Redes que no tienen permisos para conectar"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
-#, php-format
-msgid "Internal Error can't create device of type '%s'"
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, php-format
-msgid "You're about to delete the glpi device '%s'."
-msgstr "Está a punto de borrar el dispositivo glpi '%s'."
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Nombre de la maquina"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
-msgstr ""
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
+msgstr "Va ha eliminar el componente adjunto glpi '%s'."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
 #, php-format
-msgid "You can't delete this device, it is still in use by these system(s) '%s'"
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-msgid "devices"
-msgstr "dispositivos"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
-msgid "New mainbord"
-msgstr "Nueva placa base"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "New processor"
-msgstr "Nuevo procesador"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+msgid "There is no valid file uploaded."
+msgstr "No se ha subido ningún archivo valido."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "New case"
-msgstr "Nueva caja"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+msgid "Upload wasn't successfull."
+msgstr "El envío no fue correcto."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "New network interface"
-msgstr "Nuevo dispositivo de red"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+msgid "There is already a file with the same name uploaded."
+msgstr "Ya existe un fichero con este nombre."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-msgid "NI"
-msgstr "NI"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#, php-format
+msgid "Can't create file '%s'."
+msgstr "No puedo crear el fichero '%s'."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "New ram"
-msgstr "Nueva memoria"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "New hard disk"
-msgstr "Nuevo disco duro"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+msgid "Currently no file uploaded."
+msgstr "No se ha subido ningún archivo actualmente."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
-msgstr "HDD"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+msgid "Mime"
+msgstr "Mime"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "New drive"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-msgid "D"
-msgstr "D"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "New controller"
-msgstr "Nueva controladora"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+msgid "empty"
+msgstr "vacío"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
-msgstr ""
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+msgid "Create new attachment"
+msgstr "Crear nuevo adjunto"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
-msgstr ""
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+msgid "New Attachment"
+msgstr "Nuevo adjunto"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
-msgstr ""
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
+msgid "Please specify a valid name for this attachment."
+msgstr "Por favor especifique un nombre de adjunto valido."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "New sound card"
-msgstr "Nueva tarjeta de sonido"
+#: 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/class_glpiDeviceManagement.inc:245
-msgid "SC"
+#: 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/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
-msgstr ""
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Plantilla de clientes ligeros Linux"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
-msgstr ""
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Plantilla de estaciones de trabajo linux"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "New misc device"
-msgstr "Nuevo dispositivo (otros)"
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Servidor Linux"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
-msgstr ""
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
-msgid "You have to specify a valid name for this device."
-msgstr "Por favor especifique un nombre valido para este dispositivo."
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Impresora de Red"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:367
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:370
-msgid "This device name is already in use."
-msgstr "El nombre de dispositivo especificado ya esta siendo usado"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
-msgid "Other"
-msgstr "Otro"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Crear"
 
-#: plugins/admin/systems/class_workstationStartup.inc:413
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+msgid "List of attachments"
+msgstr "Lista de Adjuntos"
+
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
 msgid ""
-"There are packages in your configuration, which can't be resolved with "
-"current server/release settings."
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:458
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
-msgstr ""
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+msgid "Display attachments matching"
+msgstr "Mostrar adjuntos que concuerden con"
 
-#: plugins/admin/systems/class_workstationStartup.inc:516
-msgid ""
-"There is already a profile in your selection that contain partition table "
-"configurations."
-msgstr "Ya existe un usuario con este perfil en su selección que tiene configuraciones de tabla de particiones."
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+msgid "Regular expression for matching attachment names"
+msgstr "Expresiones regulares para encontrar nombres de adjuntos"
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:136
+msgid "Please enter a value for 'release'."
+msgstr "Por favor introduzca un valor para esta 'versión'."
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:140
+msgid "Please specify a valid value for 'url'."
+msgstr "Por favor especifique un valor para la 'url' valido."
 
-#: plugins/admin/systems/class_workstationStartup.inc:856
+#: plugins/admin/systems/class_servRepositorySetup.inc:187
 #, php-format
 msgid ""
-"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
-"Server was reset to 'auto'."
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
+"No puedo ejecutar el REPOSITORY_HOOK '%s' indicado. Por favor compruebe el "
+"archivo gosa.conf."
 
-#: plugins/admin/systems/class_workstationStartup.inc:867
-#, php-format
-msgid ""
-"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
+#: plugins/admin/systems/gencd.tpl:2
+msgid "CD-Install-Image generation"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:1034
-msgid "Saving workstation startup settings failed"
-msgstr "Ha fallado la grabación de los parámetros de inicio de la estación de trabajo"
-
-#: plugins/admin/systems/class_workstationStartup.inc:1084
-#, php-format
-msgid "Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
+#: plugins/admin/systems/gencd.tpl:5
+msgid ""
+"This option enables you to generate FAI install CD images for the selected "
+"workstation. The procedure may take about 10 minutes to complete, so please "
+"be patient after pressing the 'Create ISO-Image' button."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:132
-#, php-format
-msgid "Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
+#: plugins/admin/systems/gencd.tpl:9
+msgid "Create ISO-Image"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:298
-msgid "The required field 'IP-address' is not set."
-msgstr " El campo requerido 'Dirección IP' no ha sido rellenado."
-
-#: plugins/admin/systems/class_termDNS.inc:305
-msgid "Wrong IP format in field IP-address."
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
+msgstr "Esta 'dn' no tiene características de teléfono."
 
-#: plugins/admin/systems/class_termDNS.inc:312
-msgid "The required field 'MAC-address' is not set."
-msgstr " El campo requerido 'Dirección MAC' no ha sido rellenado."
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:109
+msgid "yes"
+msgstr "si"
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid ""
-"The given macaddress is invalid. There must be 6 2byte segments seperated by "
-"':'."
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:110
+msgid "no"
+msgstr "no"
 
-#: plugins/admin/systems/class_termDNS.inc:339
-#, php-format
-msgid "Found duplicate value for record type '%s'."
+#: plugins/admin/systems/class_phoneGeneric.inc:225
+msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:347
-#, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:225
+msgid "Networksettings"
+msgstr "Configuración de red"
 
-#: plugins/admin/systems/class_termDNS.inc:358
+#: plugins/admin/systems/class_phoneGeneric.inc:240
 #, php-format
 msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:448
-msgid "Saving terminal to DNS object failed"
-msgstr "Ha fallado la grabación del terminal en el objeto DNS."
+#: plugins/admin/systems/class_phoneGeneric.inc:247
+msgid "Removing phone failed"
+msgstr "Ha fallado la eliminación del teléfono"
 
-#: plugins/admin/systems/class_printGeneric.inc:103
-#, php-format
-msgid "Can't extract a valid base out of object dn, setting base to '%s'."
-msgstr ""
+#: plugins/admin/systems/class_phoneGeneric.inc:292
+msgid "The required field 'Phone name' is not set."
+msgstr "El campo requerido 'Nombre del teléfono' no ha sido rellenado."
 
-#: plugins/admin/systems/class_printGeneric.inc:234
-#: plugins/admin/systems/class_printGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:247
-#: plugins/admin/systems/class_printGeneric.inc:286
-#: plugins/admin/systems/class_printGeneric.inc:302
-#: plugins/admin/systems/class_printGeneric.inc:305
-msgid "Add printer extension"
+#: plugins/admin/systems/class_phoneGeneric.inc:295
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:235
+#: plugins/admin/systems/class_phoneGeneric.inc:302
+msgid "You have no permissions to create a phone on this 'Base'."
+msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
+
+#: plugins/admin/systems/class_phoneGeneric.inc:397
+msgid "Saving phone failed"
+msgstr "Ha fallado la grabación del nombre de teléfono"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+msgid "Select entries to add"
+msgstr "Seleccione entradas para añadir"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+msgid "Display members of department"
+msgstr "Mostrar miembros del departamento"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+msgid "Display members matching"
+msgstr "Mostrar miembros que concuerden con"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+msgid "Regular expression for matching member names"
+msgstr "Expresiones regulares que concuerden con nombres de miembros"
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
 msgid ""
-"Could not intialize printer tab, parameter parent was missing while "
-"construction."
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+msgid "Please specify a name."
+msgstr "Por favor especifique un nombre"
 
-#: plugins/admin/systems/class_printGeneric.inc:248
-msgid "This is a terminal template, printer tab is disabled."
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+msgid "Specified name is already in use, please choose another one."
 msgstr ""
+"El valor especificado como 'Nombre' esta siendo utilizado. Por favor elija "
+"otro."
 
-#: plugins/admin/systems/class_printGeneric.inc:279
-msgid "This 'dn' has no printer features."
-msgstr "Esta 'dn' no tiene características de impresora."
-
-#: plugins/admin/systems/class_printGeneric.inc:287
-msgid ""
-"This object has printer extension disabled. You can't enable it while 'cn' "
-"is not present in entry. Possibly you are currently creating a new terminal "
-"template"
-msgstr "Este servidor tiene la extensión impresora desactivada. Puede activarla siempre que 'cn' no este presente en esta entrada. Posiblemente está actualmente creando una nueva plantilla de terminal"
+#: plugins/admin/systems/class_goSpamServer.inc:47
+#: plugins/admin/systems/class_goSpamServer.inc:391
+msgid "Spamassassin"
+msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:294
-#: plugins/admin/systems/class_printGeneric.inc:297
-msgid "Remove printer extension"
+#: plugins/admin/systems/class_goSpamServer.inc:102
+#, fuzzy
+msgid "Remove spamassassin extension"
 msgstr "Eliminar extensión de impresión"
 
-#: plugins/admin/systems/class_printGeneric.inc:295
+#: plugins/admin/systems/class_goSpamServer.inc:103
+#, fuzzy
 msgid ""
-"This workstation has printer extension enabled.You can disable it by "
+"This server has spamassassin features enabled. You can disable them by "
 "clicking below."
 msgstr ""
-"Esta estación de trabajo tiene la extensión impresora activada. Puede desactivarla pulsando "
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:298
-msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
-msgstr ""
-"Este terminal tiene la extensión impresora activada. Puede desactivarla pulsando "
-"aquí."
+#: plugins/admin/systems/class_goSpamServer.inc:106
+#, fuzzy
+msgid "Add spamassassin service"
+msgstr "Añadir el servicio Kolab"
 
-#: plugins/admin/systems/class_printGeneric.inc:303
+#: plugins/admin/systems/class_goSpamServer.inc:107
+#, fuzzy
 msgid ""
-"This workstation has printer extension disabled. You can enable it by "
+"This server has spamassassin features disabled. You can enable them by "
 "clicking below."
 msgstr ""
-"Esta estación de trabajo tiene la extensión impresora desactivada. Puede activarla pulsando "
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:306
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr ""
-"Este terminal tiene la extensión impresora desactivada. Puede activarla pulsando "
-"aquí."
+#: plugins/admin/systems/class_goSpamServer.inc:233
+#, fuzzy
+msgid "Specified value is not a valid 'trusted network' value."
+msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/systems/class_printGeneric.inc:480
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
+#: plugins/admin/systems/class_goSpamServer.inc:274
+#, fuzzy, php-format
+msgid "Removing of server services/spamassassin with dn '%s' failed."
+msgstr "Ha fallado al eliminar la cuenta samba"
 
-#: plugins/admin/systems/class_printGeneric.inc:488
-msgid "can't get ppd informations."
-msgstr "no puedo acceder a la información PPD"
+#: plugins/admin/systems/class_goSpamServer.inc:322
+#, fuzzy, php-format
+msgid "Saving of server services/spamassassin with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de Kolab"
+
+#: plugins/admin/systems/class_goSpamServer.inc:331
+#, fuzzy
+msgid "Required score must be a numeric value."
+msgstr "Días futuros debe ser un valor"
 
-#: plugins/admin/systems/class_printGeneric.inc:501
+#: plugins/admin/systems/class_goSpamServer.inc:475
 #, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgid "Set status flag for server services/spamassassin with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:503
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
 #, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgid "Selected vendor '%s' does not exists in our list of ppds."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:554
-msgid "Removing printer failed"
-msgstr "Ha fallado la eliminación de la impresora"
-
-#: plugins/admin/systems/class_printGeneric.inc:736
-msgid "Saving printer failed"
-msgstr "Ha fallado la grabación de la impresora"
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
+msgid "Printer ppd selection."
+msgstr "Seleccionar impresora ppd"
 
-#: plugins/admin/systems/SelectDeviceType.tpl:3
+#: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
-"This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry and press the 'continue' button. If this "
-"system should be added to a group of system settings, specify the preferred "
-"object group below."
+"Actions you choose here influence all systems in this object group. "
+"Additionally, all values editable here can be inherited by the clients "
+"assigned to this object group."
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid ""
-"Please select a system type and an optional bundle of predefined settings to "
-"be inherited."
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
 msgstr ""
 
-#: plugins/admin/systems/SelectDeviceType.tpl:21
-msgid "Choose a system type"
-msgstr "Elija tipo de sistema"
+#: plugins/admin/ogroups/mail.tpl:11
+msgid "Primary mail address for this distribution list"
+msgstr ""
+"Dirección de correo electrónica primaria para esta lista de distribución"
 
-#: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Choose an object group as template"
-msgstr "Elija un grupo de objetos como plantilla"
+#: plugins/admin/ogroups/tabs_ogroups.inc:61
+#: plugins/admin/ogroups/tabs_ogroups.inc:165
+msgid "Phone queue"
+msgstr "Cola de teléfono"
 
-#: plugins/admin/systems/SelectDeviceType.tpl:33
-msgid "Choose an object group"
-msgstr "Elija un grupo de objetos"
+#: plugins/admin/ogroups/tabs_ogroups.inc:87
+msgid "System"
+msgstr "Sistema"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
+#: plugins/admin/ogroups/tabs_ogroups.inc:145
+msgid "Terminals"
+msgstr "Terminales"
+
+#: plugins/admin/ogroups/phonequeue.tpl:1
+msgid "Queue Settings"
+msgstr "Parámetros de la cola"
+
+#: plugins/admin/ogroups/phonequeue.tpl:4
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
+#: plugins/gofon/phoneaccount/paste_generic.tpl:2
+#: plugins/gofon/phoneaccount/paste_generic.tpl:6
+msgid "Phone numbers"
+msgstr "Números de teléfonos"
+
+#: plugins/admin/ogroups/phonequeue.tpl:8
+#: plugins/admin/ogroups/phonequeue.tpl:96
+msgid "Generic queue Settings"
+msgstr "Parámetros genéricos de la cola"
+
+#: plugins/admin/ogroups/phonequeue.tpl:46
+msgid "Timeout"
+msgstr "Tiempo de espera"
+
+#: plugins/admin/ogroups/phonequeue.tpl:62
+msgid "Strategy"
+msgstr "Estrategia"
+
+#: plugins/admin/ogroups/phonequeue.tpl:74
+msgid "Max queue length"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
-msgid "The selected name is already in use."
-msgstr "El nombre especificado ya esta siendo usado"
+#: plugins/admin/ogroups/phonequeue.tpl:82
+msgid "Announce frequency"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
-#, php-format
-msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+#: plugins/admin/ogroups/phonequeue.tpl:86
+msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
-msgid "Please specify a name."
-msgstr "Por favor especifique un nombre"
+#: plugins/admin/ogroups/phonequeue.tpl:94
+msgid "Queue sound setup"
+msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
-msgid "Specified name is already in use, please choose another one."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado. Por favor elija otro."
+#: plugins/admin/ogroups/phonequeue.tpl:99
+msgid "Use music on hold instead of ringing"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:37
-#: plugins/admin/systems/class_divListSystem.inc:38
-msgid "List of systems"
-msgstr "Lista de sistemas"
+#: plugins/admin/ogroups/phonequeue.tpl:108
+msgid "Music on hold"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:116
+msgid "Welcome sound file"
+msgstr "Archivo de sonido de Bienvenida"
+
+#: plugins/admin/ogroups/phonequeue.tpl:124
+msgid "Announce message"
+msgstr "Mensaje de presentación"
 
-#: plugins/admin/systems/class_divListSystem.inc:42
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
+#: plugins/admin/ogroups/phonequeue.tpl:132
+msgid "Sound file for 'You are next ...'"
 msgstr ""
-"Este menú permite añadir, modificar o eliminar las propiedades de sistemas "
-"específicos. Solo puede añadir sistemas que han sido ya iniciados alguna vez."
-
-#: plugins/admin/systems/class_divListSystem.inc:52
-msgid "System / Department"
-msgstr "Sistema / Departamento"
 
-#: plugins/admin/systems/class_divListSystem.inc:56
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Mostrar servidores"
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "'There are ...'"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:57
-msgid "Select to see Linux terminals"
-msgstr "Seleccione para ver los terminales Linux"
+#: plugins/admin/ogroups/phonequeue.tpl:148
+msgid "'... calls waiting'"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:57
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Mostrar terminales"
+#: plugins/admin/ogroups/phonequeue.tpl:156
+msgid "'Thank you' message"
+msgstr "Mensaje de Despedida"
 
-#: plugins/admin/systems/class_divListSystem.inc:58
-msgid "Select to see Linux workstations"
-msgstr "Seleccione para ver las estaciones de trabajo Linux"
+#: plugins/admin/ogroups/phonequeue.tpl:164
+msgid "'minutes' sound file"
+msgstr "Archivo de sonido 'minutos'"
 
-#: plugins/admin/systems/class_divListSystem.inc:58
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
+#: plugins/admin/ogroups/phonequeue.tpl:172
+msgid "'seconds' sound file"
+msgstr "Archivo de sonido 'segundos'"
 
-#: plugins/admin/systems/class_divListSystem.inc:59
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
+#: plugins/admin/ogroups/phonequeue.tpl:180
+msgid "Hold sound file"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:59
-msgid "Show windows based workstations"
-msgstr "Mostrara estaciones de trabajo basadas en windows"
+#: plugins/admin/ogroups/phonequeue.tpl:188
+msgid "Less Than sound file"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:60
-msgid "Select to see network printers"
-msgstr "Seleccione para ver impresoras de red"
+#: plugins/admin/ogroups/phonequeue.tpl:204
+msgid "Phone attributes "
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:60
-msgid "Show network printers"
-msgstr "Mostrar impresoras de red"
+#: plugins/admin/ogroups/phonequeue.tpl:212
+msgid "Announce holdtime"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:61
-msgid "Select to see VOIP phones"
-msgstr "Seleccione para ver teléfonos VOIP"
+#: plugins/admin/ogroups/phonequeue.tpl:218
+msgid "Allow the called user to transfer his call"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:61
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Mostrar teléfonos"
+#: plugins/admin/ogroups/phonequeue.tpl:224
+msgid "Allows calling user to transfer call"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:62
-msgid "Select to see network devices"
-msgstr "Seleccione para ver los dispositivos de red"
+#: plugins/admin/ogroups/phonequeue.tpl:234
+msgid "Allow the called to hangup by pressing *"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:62
-msgid "Show network devices"
-msgstr "Mostrar dispositivos de Red"
+#: plugins/admin/ogroups/phonequeue.tpl:240
+msgid "Allows calling to hangup by pressing *"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:70
-msgid "Display systems of user"
-msgstr "Mostrar sistemas del usuario"
+#: plugins/admin/ogroups/phonequeue.tpl:246
+msgid "Ring instead of playing background music"
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:96
-msgid "New Terminal template"
-msgstr "Nueva plantilla de terminal"
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr "Nombre del grupo"
 
-#: plugins/admin/systems/class_divListSystem.inc:98
-msgid "New Workstation template"
-msgstr "Nueva plantilla de estación de trabajo"
+#: plugins/admin/ogroups/generic.tpl:37
+msgid "Member objects"
+msgstr "Objetos miembro"
 
-#: plugins/admin/systems/class_divListSystem.inc:99
-#: plugins/admin/systems/class_divListSystem.inc:100
-msgid "New Server"
-msgstr "Nuevo servidor"
+#: plugins/admin/ogroups/class_termgroup.inc:119
+msgid "There must be at least one NTP server selected."
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:101
-#: plugins/admin/systems/class_divListSystem.inc:102
-msgid "New Printer"
-msgstr "Nueva impresora"
+#: plugins/admin/ogroups/class_termgroup.inc:173
+#, php-format
+msgid "Setting action state (FAIstate) failed for object '%s', value was '%s'."
+msgstr ""
 
-#: plugins/admin/systems/class_divListSystem.inc:103
-#: plugins/admin/systems/class_divListSystem.inc:104
-msgid "New Phone"
-msgstr "Nuevo teléfono"
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Select to see departments"
+msgstr "Seleccione para ver los departamentos"
 
-#: plugins/admin/systems/class_divListSystem.inc:105
-#: plugins/admin/systems/class_divListSystem.inc:106
-msgid "New Component"
-msgstr "Nuevo componente"
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
+msgid "Show departments"
+msgstr "Mostrar departamentos"
 
-#: plugins/admin/systems/class_divListSystem.inc:123
-msgid "Cups Server"
-msgstr "Servidor CUPS"
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Select to see GOsa accounts"
+msgstr "Seleccione para ver las cuentas GOsa"
 
-#: plugins/admin/systems/class_divListSystem.inc:124
-msgid "Log Db"
-msgstr ""
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
+msgid "Show people"
+msgstr "Mostrar personal"
 
-#: plugins/admin/systems/class_divListSystem.inc:125
-msgid "Syslog Server"
-msgstr "Servidor SYSLOG"
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Select to see GOsa groups"
+msgstr "Seleccione para ver los grupos GOsa"
 
-#: plugins/admin/systems/class_divListSystem.inc:126
-msgid "Mail Server"
-msgstr "Servidor de correo"
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Show groups"
+msgstr "Mostrar grupos"
 
-#: plugins/admin/systems/class_divListSystem.inc:127
-msgid "Imap Server"
-msgstr "Servidor IMAP"
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
+msgid "Select to see applications"
+msgstr "Seleccione para ver las aplicaciones"
 
-#: plugins/admin/systems/class_divListSystem.inc:128
-msgid "Nfs Server"
-msgstr "Servidor NFS"
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
+msgid "Show applications"
+msgstr "Mostrar aplicaciones"
 
-#: plugins/admin/systems/class_divListSystem.inc:129
-msgid "Kerberos Server"
-msgstr "Servidor Kerberos"
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Select to see workstations"
+msgstr "Seleccione para ver las estaciones de trabajo"
 
-#: plugins/admin/systems/class_divListSystem.inc:130
-msgid "Asterisk Server"
-msgstr "Servidor Asterisk"
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Select to see terminals"
+msgstr "Seleccione para ver los terminales"
 
-#: plugins/admin/systems/class_divListSystem.inc:131
-msgid "Fax Server"
-msgstr "Servidor FAX"
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
+msgid "Select to see printers"
+msgstr "Seleccione para ver impresoras"
 
-#: plugins/admin/systems/class_divListSystem.inc:132
-msgid "Ldap Server"
-msgstr "Servidor LDAP"
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
+msgid "Show printers"
+msgstr "Mostrar impresoras"
 
-#: plugins/admin/systems/class_divListSystem.inc:135
-msgid "Edit system"
-msgstr "Editar sistema"
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Select to see phones"
+msgstr "Seleccione para ver teléfonos"
 
-#: plugins/admin/systems/class_divListSystem.inc:136
-msgid "Delete system"
-msgstr "Eliminar sistema"
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+msgid "Display objects of department"
+msgstr "Mostrar objetos de departamentos"
 
-#: plugins/admin/systems/class_divListSystem.inc:173
-msgid "Set root       password"
-msgstr "Poner Contraseña de root"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
+msgid "Object groups"
+msgstr "Grupos de objetos"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:61
-#: plugins/admin/ogroups/tabs_ogroups.inc:168
-msgid "Phone queue"
-msgstr "Cola de teléfono"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "Has decidido eliminar el objeto grupo '%s'."
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:87
-msgid "System"
-msgstr "Sistema"
+#: plugins/admin/ogroups/class_ogroupManagement.inc:193
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
+msgid "You are not allowed to delete this object group!"
+msgstr "¡No tiene permisos para eliminar este objeto grupo!"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:148
-msgid "Terminals"
-msgstr "Terminales"
+#: plugins/admin/ogroups/class_divListOGroup.inc:38
+#: plugins/admin/ogroups/class_divListOGroup.inc:39
+msgid "List of object groups"
+msgstr "Lista de objetos grupo"
 
-#: plugins/admin/ogroups/mail.tpl:7
-msgid "Mail distribution list"
+#: plugins/admin/ogroups/class_divListOGroup.inc:44
+msgid ""
+"This menu allows you to add, edit or remove selected groups. You may want to "
+"use the range selector on top of the group listbox, when working with  a "
+"large number of groups."
 msgstr ""
+"Este menú le permite añadir, editar o eliminar los grupos seleccionados. "
+"Puede usar el selector de rango en la parte superior de la lista de grupos, "
+"cuando trabaja con un gran número de grupos."
 
-#: plugins/admin/ogroups/mail.tpl:11
-msgid "Primary mail address for this distribution list"
-msgstr "Dirección de correo electrónica primaria para esta lista de distribución"
+#: plugins/admin/ogroups/class_divListOGroup.inc:52
+msgid "Name of object groups"
+msgstr "Nombre del objeto grupo"
 
-#: plugins/admin/ogroups/class_termgroup.inc:111
-msgid "There must be at least one NTP server selected."
-msgstr ""
+#: plugins/admin/ogroups/class_divListOGroup.inc:57
+msgid "Select to see groups containing users"
+msgstr "Seleccione para mostrar grupos que tienen usuarios"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Select to see departments"
-msgstr "Seleccione para ver los departamentos"
+#: plugins/admin/ogroups/class_divListOGroup.inc:57
+msgid "Show groups containing users"
+msgstr "Mostrar grupos que tienen usuarios"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:27
-msgid "Show departments"
-msgstr "Mostrar departamentos"
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
+msgid "Select to see groups containing groups"
+msgstr "Seleccione para mostrar grupos que contienen grupos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
+msgid "Show groups containing groups"
+msgstr "Mostrar grupos que contienen grupos"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Select to see GOsa accounts"
-msgstr "Seleccione para ver las cuentas GOsa"
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
+msgid "Select to see groups containing applications"
+msgstr "seleccione para mostrar grupos que contienen aplicaciones"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:28
-msgid "Show people"
-msgstr "Mostrar personal"
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
+msgid "Show groups containing applications"
+msgstr "Mostrar grupos que contienen aplicaciones"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Select to see GOsa groups"
-msgstr "Seleccione para ver los grupos GOsa"
+#: plugins/admin/ogroups/class_divListOGroup.inc:60
+msgid "Select to see groups containing departments"
+msgstr "Seleccione para mostrar grupos que contienen departamentos"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Show groups"
-msgstr "Mostrar grupos"
+#: plugins/admin/ogroups/class_divListOGroup.inc:60
+msgid "Show groups containing departments"
+msgstr "Mostrar grupos que contienen departamentos"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Select to see applications"
-msgstr "Seleccione para ver las aplicaciones"
+#: plugins/admin/ogroups/class_divListOGroup.inc:61
+msgid "Select to see groups containing servers"
+msgstr "Seleccione para mostrar grupos que contienen servidores"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Show applications"
-msgstr "Mostrar aplicaciones"
+#: plugins/admin/ogroups/class_divListOGroup.inc:61
+msgid "Show groups containing servers"
+msgstr "Mostrar grupos que contienen servidores"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Select to see workstations"
-msgstr "Seleccione para ver las estaciones de trabajo"
+#: plugins/admin/ogroups/class_divListOGroup.inc:62
+msgid "Select to see groups containing workstations"
+msgstr "Seleccione para mostrar grupos que contienen estaciones de trabajo"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Select to see terminals"
-msgstr "Seleccione para ver los terminales"
+#: plugins/admin/ogroups/class_divListOGroup.inc:62
+msgid "Show groups containing workstations"
+msgstr "Mostrar grupos que contienen estaciones de trabajo"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Select to see printers"
-msgstr "Seleccione para ver impresoras"
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Select to see groups containing terminals"
+msgstr "Seleccione para mostrar grupos que contienen terminales"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
-msgid "Show printers"
-msgstr "Mostrar impresoras"
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Show groups containing terminals"
+msgstr "Mostrar grupos que contienen terminales"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Select to see phones"
-msgstr "Seleccione para ver teléfonos"
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+msgid "Select to see groups containing printer"
+msgstr "Seleccione para mostrar grupos que contienen impresoras"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-msgid "Display objects of department"
-msgstr "Mostrar objetos de departamentos"
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+msgid "Show groups containing printer"
+msgstr "Mostrar grupos que contienen impresoras"
 
-#: plugins/admin/ogroups/termgroup.tpl:2
-msgid ""
-"Actions you choose here influence all systems in this object group. "
-"Additionally, all values editable here can be inherited by the clients "
-"assigned to this object group."
-msgstr ""
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+msgid "Select to see groups containing phones"
+msgstr "Seleccione para mostrar grupos que contienen teléfonos"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
-msgid "Object groups"
-msgstr "Grupos de objetos"
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+msgid "Show groups containing phones"
+msgstr "Mostrar grupos que contienen teléfonos"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:187
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Has decidido eliminar el objeto grupo '%s'."
+#: plugins/admin/ogroups/class_divListOGroup.inc:108
+msgid "Create new object group"
+msgstr "Crear nuevo objeto grupo"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:193
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-msgid "You are not allowed to delete this object group!"
-msgstr "¡No tiene permisos para eliminar este objeto grupo!"
+#: plugins/admin/ogroups/class_divListOGroup.inc:163
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Grupo de objetos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:144
+#: plugins/admin/ogroups/class_ogroup.inc:148
 msgid "This 'dn' is no object group."
 msgstr "Este 'dn' no es un objeto tipo grupo."
 
-#: plugins/admin/ogroups/class_ogroup.inc:279
+#: plugins/admin/ogroups/class_ogroup.inc:283
 msgid "too many different objects!"
 msgstr "¡Demasiados objetos diferentes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:281
+#: plugins/admin/ogroups/class_ogroup.inc:285
 msgid "users"
 msgstr "usuarios"
 
-#: plugins/admin/ogroups/class_ogroup.inc:282
+#: plugins/admin/ogroups/class_ogroup.inc:286
 msgid "groups"
 msgstr "grupos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:283
+#: plugins/admin/ogroups/class_ogroup.inc:287
 msgid "applications"
 msgstr "Aplicaciones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:284
+#: plugins/admin/ogroups/class_ogroup.inc:288
 msgid "departments"
 msgstr "departamentos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:285
+#: plugins/admin/ogroups/class_ogroup.inc:289
 msgid "servers"
 msgstr "servidores"
 
-#: plugins/admin/ogroups/class_ogroup.inc:286
+#: plugins/admin/ogroups/class_ogroup.inc:290
 msgid "workstations"
 msgstr "estaciones de trabajo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:287
+#: plugins/admin/ogroups/class_ogroup.inc:291
 msgid "terminals"
 msgstr "terminales"
 
-#: plugins/admin/ogroups/class_ogroup.inc:288
+#: plugins/admin/ogroups/class_ogroup.inc:292
 msgid "phones"
 msgstr "teléfonos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:289
+#: plugins/admin/ogroups/class_ogroup.inc:293
 msgid "printers"
 msgstr "servidores de Impresión"
 
-#: plugins/admin/ogroups/class_ogroup.inc:296
+#: plugins/admin/ogroups/class_ogroup.inc:300
 msgid "and"
 msgstr "y"
 
-#: plugins/admin/ogroups/class_ogroup.inc:508
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "Non existing dn:"
 msgstr "No existe 'dn':"
 
-#: plugins/admin/ogroups/class_ogroup.inc:649
+#: plugins/admin/ogroups/class_ogroup.inc:606
 msgid "There is already an object with this cn."
 msgstr "Ya existe un objeto con este 'cn'."
 
-#: plugins/admin/ogroups/class_ogroup.inc:666
+#: plugins/admin/ogroups/class_ogroup.inc:623
 msgid "You can combine two different object types at maximum only!"
 msgstr "¡Solo se pueden combinar dos objetos diferentes hasta un máximo!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:715
+#: plugins/admin/ogroups/class_ogroup.inc:672
 msgid "Saving object group failed"
 msgstr "Ha fallado la grabación del objeto grupo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:728
+#: plugins/admin/ogroups/class_ogroup.inc:685
 msgid "Removing object group failed"
 msgstr "Ha fallado la eliminación del objeto grupo"
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "Nombre del grupo"
-
-#: plugins/admin/ogroups/generic.tpl:37
-msgid "Member objects"
-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 "
+"GOsa to get your data back."
+msgstr ""
+"Por favor pulse dos veces si quiere hacer esto, ya que no hay forma de que "
+"GOsa pueda recuperar posteriormente esa información"
 
 #: plugins/admin/ogroups/class_mailogroup.inc:41
-msgid "This group has mail features enabled. You can disable them by clicking below."
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
 "Este grupo tiene las características de correo activas. Puede desactivarlas "
 "apretando a continuación."
 
 #: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "This group has mail features disabled. You can enable them by clicking below."
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
-"Este grupo tiene las características de correo desactivadas.Puede "
-"activarlas pulsando aqui."
+"Este grupo tiene las características de correo desactivadas.Puede activarlas "
+"pulsando aqui."
 
 #: plugins/admin/ogroups/class_mailogroup.inc:98
 msgid "Saving mail objectgroup settings failed"
@@ -10782,7 +11568,8 @@ msgstr "Ha fallado la grabación de los parámetros de correo del objeto grupo"
 
 #: plugins/admin/ogroups/class_mailogroup.inc:131
 msgid "Removing mail objectgroup settings failed"
-msgstr "Ha fallado la eliminación de los parámetros del correo del objeto grupo"
+msgstr ""
+"Ha fallado la eliminación de los parámetros del correo del objeto grupo"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
@@ -10813,10 +11600,11 @@ msgid "Remove the phone queue from this Account"
 msgstr "Eliminar la cola telefónica de esta cuenta"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:114
-msgid "Phone queue is enabled for this group. You can disable it by clicking below."
+msgid ""
+"Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
-"Esta cuenta tiene la cola telefónica activada. Puede desactivarla "
-"pulsando aquí."
+"Esta cuenta tiene la cola telefónica activada. Puede desactivarla pulsando "
+"aquí."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:116
 msgid "Create phone queue"
@@ -10851,7 +11639,8 @@ msgid "There must be least one queue number defined."
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:227
-msgid "There is currently no asterisk server defined. Your settings can't be saved."
+msgid ""
+"There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:240
@@ -10865,9 +11654,9 @@ msgstr ""
 #: plugins/admin/ogroups/class_phonequeue.inc:250
 #: plugins/admin/ogroups/class_phonequeue.inc:625
 #: plugins/gofon/macro/class_gofonMacro.inc:246
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:87
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1049
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:91
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:311
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1053
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:281
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:397
 #, php-format
@@ -10883,276 +11672,181 @@ msgstr "No puedo eliminar de la base de datos '%s' en servidor '%s'."
 
 #: plugins/admin/ogroups/class_phonequeue.inc:525
 #: plugins/admin/ogroups/class_phonequeue.inc:527
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1156
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1158
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1160
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:437
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:439
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:587
-msgid "Saving phone queue failed"
-msgstr "Ha fallado la grabación de la cola telefónica"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:615
-#: plugins/gofon/macro/class_gofonMacro.inc:235
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:80
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:296
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:386
-#, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:684
-msgid "Removing phone queue failed"
-msgstr "Ha fallado la eliminación de la cola telefónica"
-
-#: plugins/admin/ogroups/remove.tpl:7
-msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Por favor pulse dos veces si quiere hacer esto, ya que no hay forma de que "
-"GOsa pueda recuperar posteriormente esa información"
-
-#: plugins/admin/ogroups/phonequeue.tpl:1
-msgid "Queue Settings"
-msgstr "Parámetros de la cola"
-
-#: plugins/admin/ogroups/phonequeue.tpl:4
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
-#: plugins/gofon/phoneaccount/paste_generic.tpl:2
-#: plugins/gofon/phoneaccount/paste_generic.tpl:6
-msgid "Phone numbers"
-msgstr "Números de teléfonos"
-
-#: plugins/admin/ogroups/phonequeue.tpl:8
-#: plugins/admin/ogroups/phonequeue.tpl:96
-msgid "Generic queue Settings"
-msgstr "Parámetros genéricos de la cola"
-
-#: plugins/admin/ogroups/phonequeue.tpl:46
-msgid "Timeout"
-msgstr "Tiempo de espera"
-
-#: plugins/admin/ogroups/phonequeue.tpl:62
-msgid "Strategy"
-msgstr "Estrategia"
-
-#: plugins/admin/ogroups/phonequeue.tpl:74
-msgid "Max queue length"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:82
-msgid "Announce frequency"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:86
-msgid "(in seconds)"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:94
-msgid "Queue sound setup"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:99
-msgid "Use music on hold instead of ringing"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:108
-msgid "Music on hold"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:116
-msgid "Welcome sound file"
-msgstr "Archivo de sonido de Bienvenida"
-
-#: plugins/admin/ogroups/phonequeue.tpl:124
-msgid "Announce message"
-msgstr "Mensaje de presentación"
-
-#: plugins/admin/ogroups/phonequeue.tpl:132
-msgid "Sound file for 'You are next ...'"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:140
-msgid "'There are ...'"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:148
-msgid "'... calls waiting'"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:156
-msgid "'Thank you' message"
-msgstr "Mensaje de Despedida"
-
-#: plugins/admin/ogroups/phonequeue.tpl:164
-msgid "'minutes' sound file"
-msgstr "Archivo de sonido 'minutos'"
-
-#: plugins/admin/ogroups/phonequeue.tpl:172
-msgid "'seconds' sound file"
-msgstr "Archivo de sonido 'segundos'"
-
-#: plugins/admin/ogroups/phonequeue.tpl:180
-msgid "Hold sound file"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:188
-msgid "Less Than sound file"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:439
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:204
-msgid "Phone attributes "
-msgstr ""
+#: plugins/admin/ogroups/class_phonequeue.inc:587
+msgid "Saving phone queue failed"
+msgstr "Ha fallado la grabación de la cola telefónica"
 
-#: plugins/admin/ogroups/phonequeue.tpl:212
-msgid "Announce holdtime"
+#: plugins/admin/ogroups/class_phonequeue.inc:615
+#: plugins/gofon/macro/class_gofonMacro.inc:235
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:84
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:300
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1042
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:386
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:218
-msgid "Allow the called user to transfer his call"
-msgstr ""
+#: plugins/admin/ogroups/class_phonequeue.inc:684
+msgid "Removing phone queue failed"
+msgstr "Ha fallado la eliminación de la cola telefónica"
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
-msgid "Allows calling user to transfer call"
-msgstr ""
+#: plugins/gofon/fonreports/main.inc:21
+msgid "Phone reports"
+msgstr "Informes telefónicos"
 
-#: plugins/admin/ogroups/phonequeue.tpl:234
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Informes telefónicos"
 
-#: plugins/admin/ogroups/phonequeue.tpl:240
-msgid "Allows calling to hangup by pressing *"
+#: plugins/gofon/fonreports/class_fonreport.inc:157
+#: plugins/gofon/fonreports/class_fonreport.inc:167
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
+"No puedo conectar a la de base de datos de teléfonos. ¡No se pueden mostrar "
+"los informes!"
 
-#: plugins/admin/ogroups/phonequeue.tpl:246
-msgid "Ring instead of playing background music"
+#: plugins/gofon/fonreports/class_fonreport.inc:171
+msgid "Can't select phone database for report generation!"
 msgstr ""
+"¡No puedo seleccionar la base de datos de teléfonos para la generación de "
+"informes!"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:38
-#: plugins/admin/ogroups/class_divListOGroup.inc:39
-msgid "List of object groups"
-msgstr "Lista de objetos grupo"
+#: plugins/gofon/fonreports/class_fonreport.inc:189
+msgid "Query for phone database failed!"
+msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:44
-msgid ""
-"This menu allows you to add, edit or remove selected groups. You may want to "
-"use the range selector on top of the group listbox, when working with  a "
-"large number of groups."
-msgstr ""
-"Este menú le permite añadir, editar o eliminar los grupos seleccionados. "
-"Puede usar el selector de rango en la parte superior de la lista de grupos, "
-"cuando trabaja con un gran número de grupos."
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr "Fuente"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:52
-msgid "Name of object groups"
-msgstr "Nombre del objeto grupo"
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr "Destino"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:57
-msgid "Select to see groups containing users"
-msgstr "Seleccione para mostrar grupos que tienen usuarios"
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr "Canal"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:57
-msgid "Show groups containing users"
-msgstr "Mostrar grupos que tienen usuarios"
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr "Duración"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:58
-msgid "Select to see groups containing groups"
-msgstr "Seleccione para mostrar grupos que contienen grupos"
+#: plugins/gofon/macro/headpage.tpl:6
+#: plugins/gofon/macro/class_divListMacros.inc:31
+#: plugins/gofon/macro/class_divListMacros.inc:32
+msgid "List of macros"
+msgstr "Lista de macros"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:58
-msgid "Show groups containing groups"
-msgstr "Mostrar grupos que contienen grupos"
+#: plugins/gofon/macro/headpage.tpl:24
+#: plugins/gofon/macro/class_divListMacros.inc:36
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+"Este menú permite añadir, editar o eliminar las macros seleccionadas. Puede "
+"usar el selector de rango en la parte superior de la lista de grupos, cuando "
+"trabaja con un gran número de macros."
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-msgid "Select to see groups containing applications"
-msgstr "seleccione para mostrar grupos que contienen aplicaciones"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros matching"
+msgstr "Mostrar macros que concuerden con"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-msgid "Show groups containing applications"
-msgstr "Mostrar grupos que contienen aplicaciones"
+#: plugins/gofon/macro/headpage.tpl:38
+msgid "Display macros  matching"
+msgstr "Mostrar macros que concuerden con"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "Select to see groups containing departments"
-msgstr "Seleccione para mostrar grupos que contienen departamentos"
+#: plugins/gofon/macro/headpage.tpl:41
+#: plugins/gofon/macro/class_divListMacros.inc:54
+msgid "Regular expression for matching macro names"
+msgstr "Expresión regular que concuerde con nombres de macros"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "Show groups containing departments"
-msgstr "Mostrar grupos que contienen departamentos"
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+msgid "Macro name"
+msgstr "Nombre de la macro"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:61
-msgid "Select to see groups containing servers"
-msgstr "Seleccione para mostrar grupos que contienen servidores"
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:61
-msgid "Show groups containing servers"
-msgstr "Mostrar grupos que contienen servidores"
+#: plugins/gofon/macro/generic.tpl:22
+msgid "Choose subtree to place macro in"
+msgstr "Elija lugar del árbol para colocar la macro"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:62
-msgid "Select to see groups containing workstations"
-msgstr "Seleccione para mostrar grupos que contienen estaciones de trabajo"
+#: plugins/gofon/macro/generic.tpl:48
+msgid "Visible for user"
+msgstr "Visible para el usuario"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:62
-msgid "Show groups containing workstations"
-msgstr "Mostrar grupos que contienen estaciones de trabajo"
+#: plugins/gofon/macro/generic.tpl:57
+msgid "Macro text"
+msgstr "macro de texto"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:63
-msgid "Select to see groups containing terminals"
-msgstr "Seleccione para mostrar grupos que contienen terminales"
+#: plugins/gofon/macro/class_divListMacros.inc:46
+#, fuzzy
+msgid "macro name"
+msgstr "Nombre de la macro"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:63
-msgid "Show groups containing terminals"
-msgstr "Mostrar grupos que contienen terminales"
+#: plugins/gofon/macro/class_divListMacros.inc:47
+msgid "Visible"
+msgstr "Visible"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:64
-msgid "Select to see groups containing printer"
-msgstr "Seleccione para mostrar grupos que contienen impresoras"
+#: plugins/gofon/macro/class_divListMacros.inc:83
+msgid "Create new phone macro"
+msgstr "Crear nueva macro telefónica"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:64
-msgid "Show groups containing printer"
-msgstr "Mostrar grupos que contienen impresoras"
+#: plugins/gofon/macro/class_divListMacros.inc:103
+#, fuzzy
+msgid "Edit macro"
+msgstr "Editar recurso compartido"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:65
-msgid "Select to see groups containing phones"
-msgstr "Seleccione para mostrar grupos que contienen teléfonos"
+#: plugins/gofon/macro/class_divListMacros.inc:105
+#, fuzzy
+msgid "Delete macro"
+msgstr "Borrar usuario"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:65
-msgid "Show groups containing phones"
-msgstr "Mostrar grupos que contienen teléfonos"
+#: plugins/gofon/macro/class_divListMacros.inc:108
+msgid "Macro"
+msgstr "Macro"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-msgid "Create new object group"
-msgstr "Crear nuevo objeto grupo"
+#: plugins/gofon/macro/class_divListMacros.inc:109
+msgid "visible"
+msgstr "visible"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:163
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Grupo de objetos"
+#: plugins/gofon/macro/class_divListMacros.inc:110
+msgid "invisible"
+msgstr "invisible"
 
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 msgid "Phone macros"
 msgstr "Macros telefónicas"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:209
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
 #, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr "Está a punto de borrar la macro '%s'."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:215
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:242
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:244
 msgid "You are not allowed to delete this macro!"
 msgstr "¡No le está permitido eliminar esta macro!"
 
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
+msgid "Ok"
+msgstr ""
+
 #: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:646
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:255
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:650
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:249
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
@@ -11236,25 +11930,13 @@ msgstr "Por favor elija una base válida."
 msgid "Saving phone macro failed"
 msgstr "Ha fallado la grabación de la macro telefónica"
 
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-msgid "Macro name"
-msgstr "Nombre de la macro"
-
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: plugins/gofon/macro/generic.tpl:22
-msgid "Choose subtree to place macro in"
-msgstr "Elija lugar del árbol para colocar la macro"
-
-#: plugins/gofon/macro/generic.tpl:48
-msgid "Visible for user"
-msgstr "Visible para el usuario"
+#: plugins/gofon/macro/parameter.tpl:3
+msgid "Argument"
+msgstr "Argumento"
 
-#: plugins/gofon/macro/generic.tpl:57
-msgid "Macro text"
-msgstr "macro de texto"
+#: plugins/gofon/macro/parameter.tpl:7
+msgid "type"
+msgstr "tipo"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 msgid "String"
@@ -11278,123 +11960,82 @@ msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:336
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:916
-#, php-format
-msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
-msgstr "¡El parámetro '%s' contiene caracteres no validos: '!,#' son usados como delimitadores"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:341
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:370
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:920
 #, php-format
-msgid ""
-"Parameter count of the macro changed, you must update each user which are "
-"using this macro '%s'."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
-msgid "Saving phone macro parameters failed"
-msgstr "Ha fallado la grabación de los parámetros de la macro telefónica"
-
-#: plugins/gofon/macro/headpage.tpl:6
-#: plugins/gofon/macro/class_divListMacros.inc:31
-#: plugins/gofon/macro/class_divListMacros.inc:32
-msgid "List of macros"
-msgstr "Lista de macros"
-
-#: plugins/gofon/macro/headpage.tpl:24
-#: plugins/gofon/macro/class_divListMacros.inc:36
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr ""
-"Este menú permite añadir, editar o eliminar las macros seleccionadas. Puede "
-"usar el selector de rango en la parte superior de la lista de grupos, cuando "
-"trabaja con un gran número de macros."
+"¡El parámetro '%s' contiene caracteres no validos: '!,#' son usados como "
+"delimitadores"
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros matching"
-msgstr "Mostrar macros que concuerden con"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:341
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
+msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
-msgid "Display macros  matching"
-msgstr "Mostrar macros que concuerden con"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:370
+#, php-format
+msgid ""
+"Parameter count of the macro changed, you must update each user which are "
+"using this macro '%s'."
+msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:41
-#: plugins/gofon/macro/class_divListMacros.inc:54
-msgid "Regular expression for matching macro names"
-msgstr "Expresión regular que concuerde con nombres de macros"
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+msgid "Saving phone macro parameters failed"
+msgstr "Ha fallado la grabación de los parámetros de la macro telefónica"
 
 #: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
 msgid "Phone macro management"
 msgstr "Gestión de macros telefónicas"
 
-#: plugins/gofon/macro/parameter.tpl:3
-msgid "Argument"
-msgstr "Argumento"
-
-#: plugins/gofon/macro/parameter.tpl:7
-msgid "type"
-msgstr "tipo"
-
-#: plugins/gofon/macro/class_divListMacros.inc:47
-msgid "Visible"
-msgstr "Visible"
-
-#: plugins/gofon/macro/class_divListMacros.inc:83
-msgid "Create new phone macro"
-msgstr "Crear nueva macro telefónica"
-
-#: plugins/gofon/macro/class_divListMacros.inc:108
-msgid "Macro"
-msgstr "Macro"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+#: plugins/gofon/phoneaccount/paste_generic.tpl:32
+msgid "Voicemail PIN"
+msgstr ""
 
-#: plugins/gofon/macro/class_divListMacros.inc:109
-msgid "visible"
-msgstr "visible"
+#: plugins/gofon/phoneaccount/generic.tpl:41
+#: plugins/gofon/phoneaccount/paste_generic.tpl:40
+msgid "Phone PIN"
+msgstr "PIN del teléfono"
 
-#: plugins/gofon/macro/class_divListMacros.inc:110
-msgid "invisible"
-msgstr "invisible"
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:60
+msgid "Phone macro"
+msgstr "Macro telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:123
 msgid "no macro"
 msgstr "no macro"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:136
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:140
 msgid "undefined"
 msgstr "sin definir"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:257
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:261
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:561
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:565
 msgid "Error while performing query:"
 msgstr "Ha habido un error mientras se ejecutaba la consulta:"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:617
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:745
 msgid "This account has no phone extensions."
 msgstr "Esta cuenta no tiene extensiones telefónicas"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:637
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:641
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
 msgid "Remove phone account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:752
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -11402,12 +12043,12 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:762
 msgid "Create phone account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:760
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
 "is set."
@@ -11415,7 +12056,7 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "mientras no se haya indicado ningún uid."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:763
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -11423,89 +12064,92 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:776
 msgid "Please enter a valid phone number!"
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:802
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:806
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:888
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:892
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:891
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:895
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
-msgstr "El campo 'PIN del buzón de voz' contiene caracteres no validos. Solo están permitidos números."
+msgstr ""
+"El campo 'PIN del buzón de voz' contiene caracteres no validos. Solo están "
+"permitidos números."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:896
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:900
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:899
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:903
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
 "are allowed here."
-msgstr "El campo 'PIN del teléfono' contiene caracteres no validos. Solo están permitidos números y letras."
+msgstr ""
+"El campo 'PIN del teléfono' contiene caracteres no validos. Solo están "
+"permitidos números y letras."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:909
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:913
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "¡Necesita introducir al menos un número de teléfono!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:964
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:968
 msgid "Saving phone account failed"
 msgstr "Ha fallado la grabación de la cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1084
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1085
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1089
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1118
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1122
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1125
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1129
 msgid "Removing phone account failed"
 msgstr "Ha fallado la eliminación de la cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/generic.tpl:33
-#: plugins/gofon/phoneaccount/paste_generic.tpl:32
-msgid "Voicemail PIN"
-msgstr ""
-
-#: plugins/gofon/phoneaccount/generic.tpl:41
-#: plugins/gofon/phoneaccount/paste_generic.tpl:40
-msgid "Phone PIN"
-msgstr "PIN del teléfono"
-
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:60
-msgid "Phone macro"
-msgstr "Macro telefónica"
-
-#: plugins/gofon/phoneaccount/main.inc:122
 #: plugins/gofon/phoneaccount/paste_generic.tpl:1
+#: plugins/gofon/phoneaccount/main.inc:122
 msgid "Phone settings"
 msgstr "Configuración telefónica"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-msgid "Phone conferences"
-msgstr "Conferencia telefónica"
+#: plugins/gofon/conference/headpage.tpl:6
+#: plugins/gofon/conference/class_divListConferences.inc:31
+#: plugins/gofon/conference/class_divListConferences.inc:32
+msgid "List of conference rooms"
+msgstr "Lista de habitaciones de conferencias"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-msgid "Management"
-msgstr "Gestión"
+#: plugins/gofon/conference/headpage.tpl:24
+#: plugins/gofon/conference/class_divListConferences.inc:36
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
+msgstr ""
+"Este menú permite añadir, editar o eliminar las conferencias telefónicas "
+"seleccionadas. Puede usar el selector de rango en la parte superior de la "
+"lista de conferencias telefónicas, cuando trabaja con un gran número de "
+"conferencias telefónicas."
+
+#: plugins/gofon/conference/headpage.tpl:36
+msgid "Regular expression for        matching user names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
 #: plugins/gofon/conference/generic.tpl:13
 msgid "Conference name"
@@ -11557,6 +12201,34 @@ msgstr ""
 msgid "Count users"
 msgstr "Cuenta de usuarios"
 
+#: plugins/gofon/conference/class_divListConferences.inc:46
+msgid "Name - Number"
+msgstr "Nombre - Número"
+
+#: plugins/gofon/conference/class_divListConferences.inc:55
+msgid "Regular expression for matching conference names"
+msgstr "Expresiones regulares que concuerden con nombres de conferencias"
+
+#: plugins/gofon/conference/class_divListConferences.inc:84
+msgid "Create new conference"
+msgstr "Crear una nueva conferencia"
+
+#: plugins/gofon/conference/class_divListConferences.inc:84
+msgid "New conference"
+msgstr "Nueva conferencia"
+
+#: plugins/gofon/conference/class_divListConferences.inc:140
+msgid "Conference"
+msgstr "Conferencia"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+msgid "Phone conferences"
+msgstr "Conferencia telefónica"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+msgid "Management"
+msgstr "Gestión"
+
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:215
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
@@ -11590,90 +12262,10 @@ msgstr ""
 msgid "Saving phone conference failed"
 msgstr "Ha fallado la grabación de la conferencia telefónica"
 
-#: plugins/gofon/conference/headpage.tpl:6
-#: plugins/gofon/conference/class_divListConferences.inc:31
-#: plugins/gofon/conference/class_divListConferences.inc:32
-msgid "List of conference rooms"
-msgstr "Lista de habitaciones de conferencias"
-
-#: plugins/gofon/conference/headpage.tpl:24
-#: plugins/gofon/conference/class_divListConferences.inc:36
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
-msgstr ""
-"Este menú permite añadir, editar o eliminar las conferencias telefónicas seleccionadas. "
-"Puede usar el selector de rango en la parte superior de la lista de "
-"conferencias telefónicas, cuando trabaja con un gran número de conferencias telefónicas."
-
-#: plugins/gofon/conference/headpage.tpl:36
-msgid "Regular expression for        matching user names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
-
 #: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 msgid "Conference management"
 msgstr "Gestión de conferencias"
 
-#: plugins/gofon/conference/class_divListConferences.inc:46
-msgid "Name - Number"
-msgstr "Nombre - Número"
-
-#: plugins/gofon/conference/class_divListConferences.inc:55
-msgid "Regular expression for matching conference names"
-msgstr "Expresiones regulares que concuerden con nombres de conferencias"
-
-#: plugins/gofon/conference/class_divListConferences.inc:84
-msgid "Create new conference"
-msgstr "Crear una nueva conferencia"
-
-#: plugins/gofon/conference/class_divListConferences.inc:84
-msgid "New conference"
-msgstr "Nueva conferencia"
-
-#: plugins/gofon/conference/class_divListConferences.inc:135
-msgid "Conference"
-msgstr "Conferencia"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Informes telefónicos"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:157
-#: plugins/gofon/fonreports/class_fonreport.inc:167
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"No puedo conectar a la de base de datos de teléfonos. ¡No se pueden mostrar los "
-"informes!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:171
-msgid "Can't select phone database for report generation!"
-msgstr "¡No puedo seleccionar la base de datos de teléfonos para la generación de informes!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:189
-msgid "Query for phone database failed!"
-msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
-
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
-msgstr "Fuente"
-
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
-msgstr "Destino"
-
-#: plugins/gofon/fonreports/contents.tpl:33
-msgid "Channel"
-msgstr "Canal"
-
-#: plugins/gofon/fonreports/contents.tpl:36
-msgid "Duration"
-msgstr "Duración"
-
-#: plugins/gofon/fonreports/main.inc:21
-msgid "Phone reports"
-msgstr "Informes telefónicos"
-
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Cliente ligero"
@@ -11696,74 +12288,160 @@ msgid ""
 "left, or by choosing one of the pictograms below. All changes apply directly "
 "to your companies LDAP server."
 msgstr ""
-"Esta es la pantalla principal de GOsa. Puede seleccionar las tareas del menú "
-"en la izquierda, o eligiendo entre los iconos siguientes. Todos los cambios "
-"se aplican directamente sobre los servidores LDAP de su empresa."
+"Esta es la pantalla principal de GOsa. Puede seleccionar las tareas del menú "
+"en la izquierda, o eligiendo entre los iconos siguientes. Todos los cambios "
+"se aplican directamente sobre los servidores LDAP de su empresa."
+
+#: plugins/generic/welcome/welcome.tpl:8
+msgid ""
+"Use 'Sign out' on the upper left to close the connection and 'Main' to get "
+"back to the pictogram view."
+msgstr ""
+"Para cerrar la conexión use 'Cerrar' en la parte superior izquierda y para "
+"volver a la vista de iconos use 'Principal'"
+
+#: plugins/generic/welcome/welcome.tpl:15
+msgid "The GOsa team"
+msgstr "El equipo de GOsa"
+
+#: plugins/generic/welcome/main.inc:24
+#, php-format
+msgid "Welcome %s!"
+msgstr "¡Bienvenido %s!"
+
+#: include/class_mail-methods-cyrus.inc:40
+msgid "Warning: Account has an invalid mailserver string!"
+msgstr ""
+
+#: include/class_mail-methods-cyrus.inc:53
+msgid ""
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
+msgstr ""
+"Aviso: ¡No se puede acceder al servidor IMAP! Si guarda esta cuenta, algunos "
+"de los valores de la configuración del correo no serán guardados en el "
+"servidor"
+
+#: include/class_mail-methods-cyrus.inc:151
+#, php-format
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr ""
+"No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:170
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr "No se puede activar una cuota IMAP. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:196
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgstr ""
+"Aviso: imap_getacl no ha sido implementado, no se eliminara información "
+"sobre las listas de acceso."
+
+#: include/class_mail-methods-cyrus.inc:214
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+"Aviso: no esta disponible imap_getacl, ¡no se puede acceder a los permisos "
+"IMAP!"
 
-#: plugins/generic/welcome/welcome.tpl:8
-msgid ""
-"Use 'Sign out' on the upper left to close the connection and 'Main' to get "
-"back to the pictogram view."
+#: include/class_mail-methods-cyrus.inc:236
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
-"Para cerrar la conexión use 'Cerrar' en la parte superior izquierda y "
-"para volver a la vista de iconos use 'Principal'"
+"No se puede eliminar la carpeta de correo IMAP. El error del servidor es: '%"
+"s'"
 
-#: plugins/generic/welcome/welcome.tpl:15
-msgid "The GOsa team"
-msgstr "El equipo de GOsa"
+#: include/class_mail-methods-cyrus.inc:264
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr "No se puede conectar al servidor SIEVE. El error del servidor es: '%s'"
 
-#: plugins/generic/welcome/main.inc:24
+#: include/class_mail-methods-cyrus.inc:277
 #, php-format
-msgid "Welcome %s!"
-msgstr "¡Bienvenido %s!"
+msgid "Can't get sieve script. Server says '%s'."
+msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:348
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr "No puedo subir un 'script' SIEVE. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:352
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr ""
+"No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
+"s'"
+
+#: include/class_debconfTemplate.inc:260
+msgid "This package has no debconf options."
+msgstr "Este paquete no tiene opciones debconf"
 
-#: include/class_plugin.inc:400
+#: include/class_plugin.inc:404
 #, php-format
-msgid "Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
 msgstr ""
 "El comando '%s', especificado como acción 'CHECK' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:546
+#: include/class_plugin.inc:550
 #, php-format
-msgid "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:580 include/class_password-methods.inc:181
+#: include/class_plugin.inc:584 include/class_password-methods.inc:181
 #, php-format
-msgid "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:614
+#: include/class_plugin.inc:618
 #, php-format
-msgid "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
 "El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:920
+#: include/class_plugin.inc:926
 #, php-format
 msgid "Object '%s' is already tagged"
 msgstr ""
 
-#: include/class_plugin.inc:927
+#: include/class_plugin.inc:933
 #, php-format
 msgid "Adding tag (%s) to object '%s'"
 msgstr ""
 
-#: include/class_plugin.inc:941 include/class_plugin.inc:970
+#: include/class_plugin.inc:947 include/class_plugin.inc:976
 msgid "Handle object tagging failed"
 msgstr ""
 
-#: include/class_plugin.inc:957
+#: include/class_plugin.inc:963
 #, php-format
 msgid "Removing tag from object '%s'"
 msgstr ""
 
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
+
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgstr ""
+"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
+"pueden cambiar las contraseñas de SAMBA."
+
 #: include/functions_setup.inc:84
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
@@ -11781,7 +12459,8 @@ msgstr ""
 
 #: include/functions_setup.inc:103
 #, php-format
-msgid "Optional objectclass '%s' required by plugin '%s' does not have version %s"
+msgid ""
+"Optional objectclass '%s' required by plugin '%s' does not have version %s"
 msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no tiene la versión %s"
@@ -11856,8 +12535,8 @@ msgstr "El soporte para phpgroupware está activado"
 #: include/functions_setup.inc:184
 msgid "Support for trustAccount disabled, no schema seems to be installed"
 msgstr ""
-"El soporte para trustAccount se encuentra desactivado, no parece haber esquemas "
-"instalados"
+"El soporte para trustAccount se encuentra desactivado, no parece haber "
+"esquemas instalados"
 
 #: include/functions_setup.inc:189
 msgid "Support for trustAccount enabled"
@@ -11905,7 +12584,7 @@ msgstr ""
 msgid "Support for Kolab enabled"
 msgstr "Soporte de KOLAB activado"
 
-#: include/functions_setup.inc:254 include/functions.inc:1084
+#: include/functions_setup.inc:254 include/functions.inc:1137
 msgid "OK"
 msgstr "Perfecto"
 
@@ -11982,7 +12661,8 @@ msgstr "Comprobando el soporte de gettext"
 
 #: include/functions_setup.inc:299
 msgid "Gettext support is required for internationalized GOsa."
-msgstr "El soporte de gettext es requerido para la intenacionalización de GOsa."
+msgstr ""
+"El soporte de gettext es requerido para la intenacionalización de GOsa."
 
 #: include/functions_setup.inc:302
 msgid "Checking for iconv support"
@@ -12074,34 +12754,51 @@ msgid "Checking for snmp Module"
 msgstr "Comprobando el módulo de snmp"
 
 #: include/functions_setup.inc:331
-msgid "Simple Network Management Protocol (SNMP) is required for client monitoring."
+msgid ""
+"Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:367
+#: include/functions_setup.inc:368
 msgid "PHP detailed function inspection"
 msgstr "Comprobación detallada de las funciones de PHP"
 
-#: include/functions_setup.inc:371
+#: include/functions_setup.inc:372
 #, php-format
 msgid "Checking for function %s"
 msgstr "Comprobando la función %s"
 
-#: include/functions_setup.inc:372
+#: include/functions_setup.inc:373
 #, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
 "required yet."
-msgstr "La función %s es usada por GOsa. Todavía no hay información de si es opcional o requerido"
+msgstr ""
+"La función %s es usada por GOsa. Todavía no hay información de si es "
+"opcional o requerido"
 
-#: include/functions_setup.inc:383
+#: include/functions_setup.inc:384
 msgid "Checking for some additional programms"
 msgstr "Comprobando programas adicionales"
 
-#: include/functions_setup.inc:392
+#: include/functions_setup.inc:395
+#, fuzzy
+msgid "Checking for GraphicsMagick (>=1.1.2)"
+msgstr "Comprobando por ImageMagick (>=5.4.0)"
+
+#: include/functions_setup.inc:396
+#, fuzzy
+msgid ""
+"GraphicsMagick is used to convert user supplied images to fit the suggested "
+"size and the unified JPEG format."
+msgstr ""
+"ImageMagick se usa para convertir las imagenes de los usuarios para que "
+"encajen en el tamaño sugerido y el formato JPEG."
+
+#: include/functions_setup.inc:399
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Comprobando por ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:400
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -12109,11 +12806,11 @@ msgstr ""
 "ImageMagick se usa para convertir las imagenes de los usuarios para que "
 "encajen en el tamaño sugerido y el formato JPEG."
 
-#: include/functions_setup.inc:396
+#: include/functions_setup.inc:404
 msgid "Checking imagick module for PHP"
 msgstr "Comprobando el módulo PHP de imagick"
 
-#: include/functions_setup.inc:397
+#: include/functions_setup.inc:405
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
@@ -12121,11 +12818,11 @@ msgstr ""
 "ImageMagick se usa para convertir las imagenes de los usuarios para que "
 "encajen en el tamaño sugerido y tengan formato JPEG."
 
-#: include/functions_setup.inc:404
+#: include/functions_setup.inc:412
 msgid "Checking for fping utility"
 msgstr "Comprobando la herramienta fping"
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:413
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -12133,11 +12830,11 @@ msgstr ""
 "La herramienta fping solo se usa si tiene un entorno de terminales clientes "
 "delgados (thinclient)."
 
-#: include/functions_setup.inc:420
+#: include/functions_setup.inc:428
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Buscando una manera de generar hashes de contraseñas LM/NT"
 
-#: include/functions_setup.inc:421
+#: include/functions_setup.inc:429
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -12145,11 +12842,11 @@ msgstr ""
 "Para poder usar SAMBA 2/3, tiene que instalar algunos paquetes adicionales "
 "para generar los hashes de contraseñas."
 
-#: include/functions_setup.inc:434
+#: include/functions_setup.inc:442
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini comprobación -> session.auto_register"
 
-#: include/functions_setup.inc:435
+#: include/functions_setup.inc:443
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -12157,11 +12854,11 @@ msgstr ""
 "Para poder usar GOsa sin ningún problema la opción session.auto_register de "
 "su php.ini debe estar puesta en 'Off'."
 
-#: include/functions_setup.inc:438
+#: include/functions_setup.inc:446
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini comprobación -> implicit_flush"
 
-#: include/functions_setup.inc:439
+#: include/functions_setup.inc:447
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -12169,11 +12866,11 @@ msgstr ""
 "Esta opción controla el manejador de salida. Desactive esta opción para "
 "mejorar el rendimiento."
 
-#: include/functions_setup.inc:446
+#: include/functions_setup.inc:454
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini comprobación -> max_execution_time"
 
-#: include/functions_setup.inc:447
+#: include/functions_setup.inc:455
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -12181,24 +12878,23 @@ msgstr ""
 "El tiempo máximo de ejecución debe ser de al menos 30 segundos, algunas "
 "acciones pueden consumir mucho tiempo."
 
-#: include/functions_setup.inc:454
+#: include/functions_setup.inc:462
 msgid "php.ini check -> memory_limit"
 msgstr "pnp.ini comprobación -> memory_limit"
 
-#: include/functions_setup.inc:455
+#: include/functions_setup.inc:463
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
 "Increase it for larger setups."
 msgstr ""
 "GOsa necesita la menos 16Mb de memoria, ¡menos memoria causara errores "
-"impredecibles! Para sitios con grandes "
-"cargas sera aún mayor."
+"impredecibles! Para sitios con grandes cargas sera aún mayor."
 
-#: include/functions_setup.inc:459
+#: include/functions_setup.inc:467
 msgid "php.ini check -> expose_php"
 msgstr "php.ini comprobación -> expose_php"
 
-#: include/functions_setup.inc:460
+#: include/functions_setup.inc:468
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
@@ -12207,11 +12903,11 @@ msgstr ""
 "debería enviar ninguna información sobre el servidor sobre el que está "
 "funcionando en ningún caso."
 
-#: include/functions_setup.inc:464
+#: include/functions_setup.inc:472
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini comprobación -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:465
+#: include/functions_setup.inc:473
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -12219,11 +12915,7 @@ msgstr ""
 "Aumenta la seguridad de su servidor poniendo 'magic_quotes_gpc' en 'on'. PHP "
 "escapara en este caso todas las comillas que encuentre en las cadenas."
 
-#: include/functions_setup.inc:711
-msgid "You've to specify an ldap server before continuing!"
-msgstr "Tiene que especificar un servidor ldap antes de continuar."
-
-#: include/functions_setup.inc:720 include/functions_setup.inc:803
+#: include/functions_setup.inc:720 include/functions_setup.inc:831
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -12231,8 +12923,7 @@ msgstr ""
 "No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
 "este accesible para GOsa."
 
-#: include/functions_setup.inc:734 include/functions_setup.inc:808
-#: include/functions_setup.inc:813
+#: include/functions_setup.inc:734
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -12240,55 +12931,69 @@ msgstr ""
 "¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
 "asegure que este accesible para GOsa."
 
-#: include/functions_setup.inc:823
-msgid ""
-"Bind to server successful, but the server seems to be completly empty, "
-"please check all information twice"
-msgstr ""
-"Conexión al servidor correcta, pero el servidor aparenta estar completamente "
-"vacío, por favor compruebe la información de nuevo."
-
-#: include/functions_setup.inc:879
+#: include/functions_setup.inc:784
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
 "complete!"
-msgstr "Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
+msgstr ""
+"Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
+
+#: include/functions_setup.inc:836
+msgid "Can't set ldap protocol version 3."
+msgstr ""
+
+#: include/functions_setup.inc:841
+#, fuzzy
+msgid ""
+"Could not bind to the specified LDAP server! Please make sure that it is "
+"reachable for GOsa."
+msgstr ""
+"¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
+"asegure que este accesible para GOsa."
 
-#: include/functions_setup.inc:910
+#: include/functions_setup.inc:909
 msgid ""
 "Can't read schema informations, GOsa needs to know your schema setup. Please "
 "verify that it is readable for GOsa"
 msgstr ""
 
-#: include/functions_setup.inc:919
+#: include/functions_setup.inc:918
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
 
 #: include/functions_setup.inc:1029 include/functions_setup.inc:1052
-#: include/functions_setup.inc:1061 html/index.php:244
+#: include/functions_setup.inc:1061 html/index.php:248
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
-msgstr "No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
-
-#: include/class_password-methods.inc:165
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
-msgstr "Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
-
-#: include/class_password-methods.inc:202
-msgid "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
-"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
-"pueden cambiar las contraseñas de SAMBA."
+"No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
 
 #: include/class_password-methods-sha.inc:50
 msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr "No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
+msgstr ""
+"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
+
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
+"soporte Kerberos, la contraseña no ha sido cambiada."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "¡La comunicación con la base de datos Kerberos fallo!."
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
 
 #: include/functions_helpviewer.inc:43
 #, php-format
@@ -12317,22 +13022,6 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
-"soporte Kerberos, la contraseña no ha sido cambiada."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "¡La comunicación con la base de datos Kerberos fallo!."
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr "¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
-
 #: include/class_ppdManager.inc:13
 #, php-format
 msgid "PPD manager : The specified path '%s' doesn't exists."
@@ -12380,6 +13069,12 @@ msgstr ""
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
+#: include/class_MultiSelectWindow.inc:394
+msgid ""
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
+msgstr ""
+
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -12410,7 +13105,7 @@ msgstr ""
 "¡La generación de esta página provoca que el interprete PHP muestre algunos "
 "errores!"
 
-#: include/php_setup.inc:71 html/main.php:375
+#: include/php_setup.inc:71 html/main.php:380
 msgid "Toggle information"
 msgstr "Información de intercambio"
 
@@ -12450,8 +13145,8 @@ msgstr "Argumentos"
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
-"FATAL: Hay un error tratando de conectarse al servidor LDAP. El error del servidor "
-"es: '%s'"
+"FATAL: Hay un error tratando de conectarse al servidor LDAP. El error del "
+"servidor es: '%s'"
 
 #: include/functions.inc:315
 #, php-format
@@ -12533,35 +13228,35 @@ msgstr ""
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1062 include/functions.inc:1251
+#: include/functions.inc:1115 include/functions.inc:1306
 msgid "LDAP error:"
 msgstr "Error LDAP:"
 
-#: include/functions.inc:1063
+#: include/functions.inc:1116
 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:1071
+#: include/functions.inc:1124
 msgid ""
 "Please check your input and fix the error. Press 'OK' to close this message "
 "box."
 msgstr ""
 
-#: include/functions.inc:1080
+#: include/functions.inc:1133
 msgid "An error occured while processing your request"
 msgstr "Un error ha ocurrido mientras se procesaba su petición"
 
-#: include/functions.inc:1145
+#: include/functions.inc:1198
 msgid "Continue anyway"
 msgstr "Continuar de cualquier modo"
 
-#: include/functions.inc:1147
+#: include/functions.inc:1200
 msgid "Edit anyway"
 msgstr "Editar de cualquier modo"
 
-#: include/functions.inc:1149
+#: include/functions.inc:1202
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -12570,31 +13265,44 @@ 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:1433
+#: include/functions.inc:1488
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1461
+#: include/functions.inc:1516
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1735
+#: include/functions.inc:1790
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1778
+#: include/functions.inc:1833
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Versión de desarrollo de GOsa (Rev %s)"
 
-#: include/class_tabs.inc:182
+#: include/functions_dns.inc:166
+#, php-format
+msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+msgstr ""
+
+#: include/functions_dns.inc:171
+#, php-format
+msgid ""
+"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
+"zone."
+msgstr ""
+
+#: include/class_tabs.inc:190
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
 #: include/class_password-methods-ssha.inc:51
 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)"
+msgstr ""
+"No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
 
 #: include/class_pluglist.inc:115
 msgid ""
@@ -12619,54 +13327,67 @@ msgstr ""
 "Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
 "los cambios?"
 
-#: include/class_config.inc:70
+#: include/class_CopyPasteHandler.inc:161
+#, php-format
+msgid "You are going to copy the entry '%s'."
+msgstr "Has decidido copiar la entrada %s"
+
+#: include/class_CopyPasteHandler.inc:225
+msgid "Paste"
+msgstr "Pegar"
+
+#: include/class_CopyPasteHandler.inc:227
+msgid "Can't paste"
+msgstr "No se puede pegar"
+
+#: include/class_config.inc:71
 #, php-format
 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:197 html/index.php:203
+#: include/class_config.inc:207 html/index.php:207
 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 "
 "sistemas."
 
-#: include/class_config.inc:456
+#: include/class_config.inc:469
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID y/o RIDBASE no se encuentran en su configuración."
 
-#: include/class_ldap.inc:195
+#: include/class_ldap.inc:196
 #, php-format
 msgid ""
 "The LDAP server is slow (%.2fs for the last query). This may be responsible "
 "for performance breakdowns."
 msgstr ""
 
-#: include/class_ldap.inc:227
+#: include/class_ldap.inc:230
 #, php-format
 msgid ""
 "The ldapserver is answering very slow (%.2f), this may be responsible for "
 "performance breakdowns."
 msgstr ""
 
-#: include/class_ldap.inc:447
+#: include/class_ldap.inc:456
 #, php-format
 msgid "Creating copy of %s"
 msgstr "Creando copia de %s"
 
-#: include/class_ldap.inc:450
+#: include/class_ldap.inc:459
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:490
+#: include/class_ldap.inc:499
 msgid "Error while fetching source dn - aborted!"
 msgstr "Ha habido un error mientras se accedía al dn origen - ¡Abortado!"
 
-#: include/class_ldap.inc:553
+#: include/class_ldap.inc:562 include/class_ldap.inc:576
 #, php-format
 msgid "Unknown FAIstate %s"
 msgstr "Estado FAI desconocido %s"
 
-#: include/class_ldap.inc:701
+#: include/class_ldap.inc:723
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -12675,155 +13396,62 @@ msgstr ""
 "Actualmente no esta soportada la creación automática del tipo '%s'. Por "
 "favor, informe de esto al equipo de desarrollo de GOsa."
 
-#: include/class_ldap.inc:770
+#: include/class_ldap.inc:792
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:772
-#, php-format
-msgid "while operating on LDAP server %s"
-msgstr "Mientras se conectaba al servidor LDAP '%s'"
-
-#: include/class_ldap.inc:968
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
-"en la linea %s"
-
-#: include/class_ldap.inc:981
-#, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
-msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
-
-#: include/class_ldap.inc:997
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
-"el LDIF desde la linea %s en adelante!"
-
-#: include/class_debconfTemplate.inc:260
-msgid "This package has no debconf options."
-msgstr "Este paquete no tiene opciones debconf"
-
-#: include/class_mail-methods-cyrus.inc:39
-msgid "Warning: Account has an invalid mailserver string!"
-msgstr ""
-
-#: include/class_mail-methods-cyrus.inc:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-"Aviso: ¡No se puede acceder al servidor IMAP! Si guarda esta cuenta, algunos "
-"de los valores de la configuración del correo no serán guardados en el "
-"servidor"
-
-#: include/class_mail-methods-cyrus.inc:127
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
-msgstr "No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
-
-#: include/class_mail-methods-cyrus.inc:146
-#, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr "No se puede activar una cuota IMAP. El error del servidor es: '%s'"
-
-#: include/class_mail-methods-cyrus.inc:172
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
-msgstr ""
-"Aviso: imap_getacl no ha sido implementado, no se eliminara información "
-"sobre las listas de acceso."
-
-#: include/class_mail-methods-cyrus.inc:190
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
-msgstr ""
-"Aviso: no esta disponible imap_getacl, ¡no se puede acceder a los permisos "
-"IMAP!"
-
-#: include/class_mail-methods-cyrus.inc:212
-#, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
-msgstr ""
-"No se puede eliminar la carpeta de correo IMAP. El error del servidor es: '%"
-"s'"
-
-#: include/class_mail-methods-cyrus.inc:240
-#, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr "No se puede conectar al servidor SIEVE. El error del servidor es: '%s'"
-
-#: include/class_mail-methods-cyrus.inc:253
-#, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
-
-#: include/class_mail-methods-cyrus.inc:324
-#, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "No puedo subir un 'script' SIEVE. El error del servidor es: '%s'"
-
-#: include/class_mail-methods-cyrus.inc:328
-#, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
-msgstr ""
-"No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
-"s'"
-
-#: include/class_MultiSelectWindow.inc:399
-msgid ""
-"Error: The requested subtree has an inconsistent DN encoding, check your "
-"LDAP!"
-msgstr ""
-
-#: include/class_CopyPasteHandler.inc:152
-#, php-format
-msgid "You are going to copy the entry '%s'."
-msgstr "Has decidido copiar la entrada %s"
-
-#: include/class_CopyPasteHandler.inc:216
-msgid "Paste"
-msgstr "Pegar"
-
-#: include/class_CopyPasteHandler.inc:218
-msgid "Can't paste"
-msgstr "No se puede pegar"
+#: include/class_ldap.inc:794
+#, php-format
+msgid "while operating on LDAP server %s"
+msgstr "Mientras se conectaba al servidor LDAP '%s'"
 
-#: include/functions_dns.inc:166
+#: include/class_ldap.inc:990
 #, php-format
-msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
 msgstr ""
+"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
+"en la linea %s"
 
-#: include/functions_dns.inc:171
+#: include/class_ldap.inc:1003
 #, php-format
-msgid ""
-"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
-"zone."
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
+
+#: include/class_ldap.inc:1019
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
+"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
+"el LDIF desde la linea %s en adelante!"
 
-#: include/functions_dns.inc:363
+#: html/setup.php:89
 #, php-format
 msgid ""
-"Found more than one dns zone which contains an entry named '%s'. Aborting "
-"getting dns informations for this device."
+"Directory '%s' specified as smarty compile directory is not accessible, "
+"please check existence and rights of this directory!"
 msgstr ""
+"El directorio '%s' especificado como directorio de compilación para smarty  "
+"no es accesible, ¡compruebe la existencia y los permisos de este directorio!"
 
 #: html/getvcard.php:36
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr "Error: getcvard.php necesita un parametro para exportar a vcard."
 
-#: html/setup.php:86
+#: html/helpviewer.php:67
+msgid "Help browser"
+msgstr ""
+
+#: html/helpviewer.php:118
+msgid "There is no helpfile specified for this class"
+msgstr "No hay archivo de ayuda para esta clase"
+
+#: html/helpviewer.php:265
 #, php-format
-msgid ""
-"Directory '%s' specified as smarty compile directory is not accessible, "
-"please check existence and rights of this directory!"
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
-"El directorio '%s' especificado como directorio de compilación para smarty  "
-"no es accesible, ¡compruebe la existencia y los permisos de este directorio!"
 
 #: html/getxls.php:65
 msgid "Birthday"
@@ -12934,74 +13562,71 @@ msgstr "Lista de usuarios de %s en %s"
 msgid "Computers of %s on %s"
 msgstr "Ordenadores de %s en %s"
 
-#: html/index.php:49 html/index.php:331
+#: html/index.php:49 html/index.php:335
 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:335
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
-#: html/index.php:113
+#: html/index.php:117
 #, 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:138
 #, 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:219
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:224
-msgid "Your ldap setup contains old schema definitions. Please re-run the setup."
+#: html/index.php:228
+msgid ""
+"Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:252
+#: html/index.php:256
 msgid "Please specify a valid username!"
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: html/index.php:254
+#: html/index.php:258
 msgid "Please specify your password!"
 msgstr "Por favor especifique su contraseña."
 
-#: html/index.php:261
+#: html/index.php:265
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/index.php:285
+#: html/index.php:289
 msgid "Account locked. Please contact your system administrator."
 msgstr ""
-"Cuenta bloqueada. Por favor, contacte con su administrador de "
-"sistemas."
+"Cuenta bloqueada. Por favor, contacte con su administrador de sistemas."
 
-#: html/index.php:337
+#: html/index.php:341
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
-#: html/helpviewer.php:67
-msgid "Help browser"
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
 msgstr ""
 
-#: html/helpviewer.php:118
-msgid "There is no helpfile specified for this class"
-msgstr "No hay archivo de ayuda para esta clase"
-
-#: html/helpviewer.php:265
+#: html/getkiosk.php:30
 #, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
-msgstr ""
+msgid "Can't read file '%s', check permissions."
+msgstr "No puedo acceder al archivo '%s', por favor compruebe los permisos."
 
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
@@ -13015,50 +13640,50 @@ msgstr "No puedo seleccionar la base de datos."
 msgid "Database query failed!"
 msgstr "La consulta a la base de datos ha fallado."
 
-#: html/main.php:159
+#: html/main.php:164
 msgid ""
 "FATAL: Register globals is on. GOsa will refuse to login unless this is "
 "fixed by an administrator."
-msgstr "FATAL: 'Register globals' está activado. No se permitirá ningún acceso hasta que sea solucionado por un administrador."
+msgstr ""
+"FATAL: 'Register globals' está activado. No se permitirá ningún acceso hasta "
+"que sea solucionado por un administrador."
 
-#: html/main.php:201
+#: html/main.php:206
 msgid "Warning: memory is getting low - please increase the memory_limit!"
-msgstr "Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
+msgstr ""
+"Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
 
-#: html/main.php:336
+#: html/main.php:341
 #, php-format
 msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
 msgstr "FATAL: No se pudo encontrar ninguna definición de extensión para '%s'"
 
-#: html/main.php:351
+#: html/main.php:356
 msgid "Your password is about to expire, please change your password"
 msgstr "Su contraseña está a punto de expirar, por favor cambiela."
 
-#: html/main.php:375
+#: html/main.php:380
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
 "some errors!"
-msgstr "¡La generación de esta página provoca que el comprobador de especificaciones para W3C muestre algunos errores!"
-
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
 msgstr ""
-
-#: html/getkiosk.php:30
-#, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr "No puedo acceder al archivo '%s', por favor compruebe los permisos."
+"¡La generación de esta página provoca que el comprobador de especificaciones "
+"para W3C muestre algunos errores!"
 
 #: html/get_attachment.php:47
 msgid ""
 "Can't connect to glpi database, there is no mysl extension available in your "
 "php setup."
-msgstr "No puedo conectar a la base de datos glpi, no hay extensión mysql configurada en su configuración PHP."
+msgstr ""
+"No puedo conectar a la base de datos glpi, no hay extensión mysql "
+"configurada en su configuración PHP."
 
 #: html/get_attachment.php:55
-msgid "Can't connect to specified database, please check your glpi configuration."
-msgstr "No puedo conectar a la base de datos especificada, por favor compruebe la configuración de GLPI."
+msgid ""
+"Can't connect to specified database, please check your glpi configuration."
+msgstr ""
+"No puedo conectar a la base de datos especificada, por favor compruebe la "
+"configuración de GLPI."
 
 #: html/get_attachment.php:64
 msgid "Can't get specified attachment file, there is no entry with this id."
@@ -13069,16 +13694,67 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "No se puede acceder al archivo '%s'."
 
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
+"protege al servidor LDAP de alcanzar una mayor carga. La manera mas fácil de "
+"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
+"la búsqueda a valores pequeños y usar filtros para encontrar las entradas "
+"que está buscando."
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Por favor elije la manera en que la sesión reaccione"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+"ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+"ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
+"limite' definido y active el uso de filtros en su lugar"
+
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:14
+#, fuzzy
+msgid "Please use your username and password to log in"
+msgstr ""
+"Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+msgid "Sign in"
+msgstr "Entrando"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+msgid "Click here to log in"
+msgstr "Pulse aquí para entrar"
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Detectado conflicto de sesiones."
 
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
+#: ihtml/themes/altlinux/conflict.tpl:6
+#, fuzzy
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
 "you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
-"possible. Pressing the <b>Logout</b> button will close this session."
+"possible. Pressing the 'Logout' button will close this session."
 msgstr ""
 "Probablemente hay otra instancia de su sesión. Las operaciones con múltiples "
 "ventanas son técnicamente imposibles y dependen altamente del navegador que "
@@ -13136,53 +13812,6 @@ msgstr ""
 "configuración puede ayudarle en esta tarea. Introduzca el nombre y "
 "contraseñas deseadas para crear las entradas necesarias."
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:14
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr "Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-msgid "Directory"
-msgstr "Directorio"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-msgid "Sign in"
-msgstr "Entrando"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-msgid "Click here to log in"
-msgstr "Pulse aquí para entrar"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
-"protege al servidor LDAP de alcanzar una mayor carga. La manera mas fácil de "
-"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
-"la búsqueda a valores pequeños y usar filtros para encontrar las entradas "
-"que está buscando."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Por favor elije la manera en que la sesión reaccione"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr "ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-"ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
-"limite' definido y active el uso de filtros en su lugar"
-
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
@@ -13208,10 +13837,11 @@ msgid "Locking conflict detected"
 msgstr "Detectado conflicto de Bloqueos"
 
 #: ihtml/themes/altlinux/islocked.tpl:9
+#, fuzzy
 msgid ""
 "If this lock detection is false, the other person has obviously closed the "
 "webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
+"case by pressing the 'Remove' button."
 msgstr ""
 "Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
 "mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
@@ -13253,9 +13883,10 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_step3.tpl:10
 #: ihtml/themes/default/setup_step3.tpl:10
+#, fuzzy
 msgid ""
 "Please enter the server URI to allow the setup to connect your LDAP server "
-"<i>(Example: ldap://your.server:389).</i>"
+"(Example: ldap://your.server:389)."
 msgstr ""
 "Por favor introduzca la dirección URI del servidor para que el programa de "
 "configuración pueda conectar con su servidor LDAP <i>(Ejemplo: ldap://su."
@@ -13451,6 +14082,53 @@ msgstr ""
 "servidor web pueda leer gosa.conf y que los otros no deberían poder leerlo. "
 "Para cumplir con este requerimiento puede ejecutar estos comandos:"
 
+#: ihtml/themes/default/islocked.tpl:9
+#, fuzzy
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may want to take over the lock by "
+"pressing the 'Edit anyway' button."
+msgstr ""
+"Si esta detección de bloqueo es falsa, otra persona cerro su navegador "
+"mientras estaba editando. Puede eliminar el bloqueo en ese caso, pulsando en "
+"el botón <i>Editar de cualquier modo</i>."
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
+
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:4
+msgid ""
+"Some values need to be unique in the complete directory while some "
+"combinations make no sense. GOsa shows the relevant attributes. Please "
+"maintain the values below to fullfill the policies."
+msgstr ""
+
+#: ihtml/themes/default/copyPasteDialog.tpl:20
+msgid "Operation complete"
+msgstr "Operación completada"
+
+#: ihtml/themes/default/conflict.tpl:6
+#, fuzzy
+msgid ""
+"Probably there's another active instance of your session. Multiple window "
+"operation is technical not possible and heavily depends on the browser "
+"you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
+"possible. Pressing the 'Logout'button will close this session."
+msgstr ""
+"Probablemente hay otra instancia de su sesión. Las operaciones con múltiples "
+"ventanas son técnicamente imposibles y dependen altamente del navegador que "
+"este usando. Es posible usar distintos navegadores al mismo tiempo (es "
+"decir, IE y Mozilla). Apretando el botón <b>Salir</b> cerrará está sesión."
+
 #: ihtml/themes/default/setup_introduction.tpl:4
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
@@ -13461,7 +14139,9 @@ msgid ""
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 "Parece que esta ejecutando GOsa por primera vez - no se ha encontrado la "
-"configuración. Este asistente le ayudara en los siguientes pasos para crear una configuración funcional a través de tres pasos: Primero: comprobar la instalación de PHP y de los módulos necesarios, luego comprobar los "
+"configuración. Este asistente le ayudara en los siguientes pasos para crear "
+"una configuración funcional a través de tres pasos: Primero: comprobar la "
+"instalación de PHP y de los módulos necesarios, luego comprobar los "
 "programas opcionales y, por último introducir la información necesaria para "
 "conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
 
@@ -13477,30 +14157,6 @@ msgstr ""
 msgid "Toggle Show/Hide"
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr ""
-
-#: ihtml/themes/default/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may want to take over the lock by "
-"pressing the <i>Edit anyway</i> button."
-msgstr ""
-"Si esta detección de bloqueo es falsa, otra persona cerro su navegador "
-"mientras estaba editando. Puede eliminar el bloqueo en ese caso, "
-"pulsando en el botón <i>Editar de cualquier modo</i>."
-
-#: ihtml/themes/default/setup_step4.tpl:100
-msgid ""
-"GOsa may cause PHP interpreter errors, particularly in case of Beta "
-"versions. In some cases it would be helpful to enable the error reporting."
-msgstr ""
-
 #: ihtml/themes/default/logout.tpl:5
 msgid "Your GOsa session has expired!"
 msgstr ""
@@ -13516,21 +14172,6 @@ msgstr ""
 msgid "Sign in again"
 msgstr "Acceder de nuevo"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
-msgstr ""
-
-#: ihtml/themes/default/copyPasteDialog.tpl:4
-msgid ""
-"Some values need to be unique in the complete directory while some "
-"combinations make no sense. GOsa shows the relevant attributes. Please "
-"maintain the values below to fullfill the policies."
-msgstr ""
-
-#: ihtml/themes/default/copyPasteDialog.tpl:21
-msgid "Operation complete"
-msgstr "Operación completada"
-
 #: ihtml/themes/default/accountexpired.tpl:15
 msgid "Your Password has expired !! Choose a new Password"
 msgstr ""
@@ -13558,3 +14199,63 @@ msgstr "Cambiar contraseña"
 msgid "Click here to Change your password"
 msgstr "Pulse aquí para cambiar su contraseña."
 
+#: ihtml/themes/default/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting."
+msgstr ""
+
+#~ msgid "This zoneName is already in use"
+#~ msgstr "El nombre de zona especificado ya esta siendo usado"
+
+#~ msgid "This reverse zone is already in use"
+#~ msgstr "El nombre de zona inversa especificado ya esta siendo usado"
+
+#~ msgid "You've to specify an ldap server before continuing!"
+#~ msgstr "Tiene que especificar un servidor ldap antes de continuar."
+
+#~ msgid ""
+#~ "Bind to server successful, but the server seems to be completly empty, "
+#~ "please check all information twice"
+#~ msgstr ""
+#~ "Conexión al servidor correcta, pero el servidor aparenta estar "
+#~ "completamente vacío, por favor compruebe la información de nuevo."
+
+#~ msgid "Can't get quota information for '%s'."
+#~ msgstr "No se pueden conseguir los datos de la cuota de '%s'."
+
+#~ msgid "Specified name is invalid."
+#~ msgstr "El nombre especificado no es válido"
+
+#~ msgid "Device ID"
+#~ msgstr "Identificador de dispositivo"
+
+#~ msgid "Error while writing printer"
+#~ msgstr "¡Error mientras se guardaba la impresora"
+
+#~ msgid "Error while writing printer settings"
+#~ msgstr "¡Error mientras se guardaban los parámetros de la impresora"
+
+#~ msgid ""
+#~ "This menu allows you to create, delete and edit selected departments. "
+#~ "Having a large size of departments, you might prefer the range selectors "
+#~ "on top of the department list."
+#~ msgstr ""
+#~ "Este menú permite añadir, editar o eliminar los departamentos "
+#~ "seleccionados. Puede usar el selector de rango en la parte superior de la "
+#~ "lista de departamentos, cuando trabaja con un gran número de "
+#~ "departamentos."
+
+#~ msgid "Display departments matching"
+#~ msgstr "Mostrar Departamentos que concuerden con"
+
+#~ msgid "Regular expression for matching department names"
+#~ msgstr "Expresiones regulares para encontrar nombres de departamentos"
+
+#~ msgid ""
+#~ "Please enter the server URI to allow the setup to connect your LDAP "
+#~ "server <i>(Example: ldap://your.server:389).</i>"
+#~ msgstr ""
+#~ "Por favor introduzca la dirección URI del servidor para que el programa "
+#~ "de configuración pueda conectar con su servidor LDAP <i>(Ejemplo: ldap://"
+#~ "su.servidor:389).</i>"