Added Translation Strings.

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

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 51227dda0ec26d359812bb6bfc8258d5e9af753c..3d54b9152dea9811264c84cb2087138ab2c5fa4b 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1,219 +1,247 @@
-# translation of messages.po to 
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to es_ES
+# translation of messages.po to Español
 # Alejandro Escanero Blanco <alex@ofmin.com>, 2003, 2005.
+# Alejandro Escanero Blanco <thoth@bbvnet.com>, 2006.
+#: plugins/personal/generic/class_user.inc:1338
+#: plugins/admin/systems/class_terminalService.inc:447
+#: plugins/admin/systems/class_terminalService.inc:448
+#: include/class_plugin.inc:115 include/class_plugin.inc:116
 msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
-"PO-Revision-Date: 2005-05-25 19:07+0200\n"
-"Last-Translator: Alejandro Escanero Blanco <alex@ofmin.com>\n"
-"Language-Team:  <es@li.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2006-08-01 13:33+0200\n"
+"PO-Revision-Date: 2006-06-10 19:06GMT\n"
+"Last-Translator: Alejandro Escanero Blanco <thoth@bbvnet.com>\n"
+"Language-Team: Español\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.2\n"
 
-#: contrib/gosa.conf:4
+#: contrib/gosa.conf:4 plugins/personal/generic/class_user.inc:1350
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr "Administradores"
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:61
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:526
 msgid "Addons"
 msgstr "Agregados"
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:89 contrib/gosa.conf:98
-#: contrib/gosa.conf:104 contrib/gosa.conf:109 contrib/gosa.conf:115
-#: contrib/gosa.conf:124 contrib/gosa.conf:134 contrib/gosa.conf:143
-#: contrib/gosa.conf:148 contrib/gosa.conf:153 contrib/gosa.conf:158
-#: contrib/gosa.conf:163 contrib/gosa.conf:168
+#: contrib/gosa.conf:80 contrib/gosa.conf:93 contrib/gosa.conf:97
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:114
+#: contrib/gosa.conf:119 contrib/gosa.conf:127 contrib/gosa.conf:135
+#: contrib/gosa.conf:144 contrib/gosa.conf:148 contrib/gosa.conf:170
+#: contrib/gosa.conf:174 contrib/gosa.conf:178 contrib/gosa.conf:182
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
+#: plugins/personal/generic/class_user.inc:1345
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
-#: plugins/admin/systems/glpi.tpl:6 plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/paste_generic.tpl:4
+#: plugins/admin/groups/mail.tpl:7
+#: plugins/admin/groups/class_groupGeneric.inc:861
+#: plugins/admin/applications/class_applicationGeneric.inc:478
+#: plugins/admin/departments/class_departmentGeneric.inc:528
+#: plugins/admin/systems/class_servGeneric.inc:315
+#: plugins/admin/systems/class_workstationGeneric.inc:465
+#: plugins/admin/systems/servkolab.tpl:6
+#: plugins/admin/systems/class_printGeneric.inc:790
+#: plugins/admin/systems/class_componentGeneric.inc:233
+#: plugins/admin/systems/glpiPrinter.tpl:6 plugins/admin/systems/glpi.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:409
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
-#: plugins/admin/fai/faiVariable.tpl:4
+#: plugins/admin/systems/servdnseditzone.tpl:1
+#: plugins/admin/systems/goMailServer.tpl:1
+#: plugins/admin/systems/goImapServer.tpl:1
+#: plugins/admin/ogroups/termgroup.tpl:6
+#: plugins/admin/ogroups/class_ogroup.inc:753
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiPackage.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
-#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
+#: plugins/admin/fai/faiScriptEntry.tpl:5 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/faiHook.tpl:4
 #: plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3
+#: plugins/admin/mimetypes/generic.tpl:4
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:652
+#: plugins/admin/mimetypes/paste_generic.tpl:4
+#: plugins/gofon/macro/class_gofonMacro.inc:465
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Genérico"
 
-#: contrib/gosa.conf:77
+#: contrib/gosa.conf:81
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:78 contrib/gosa.conf:90
+#: contrib/gosa.conf:82 contrib/gosa.conf:98
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:383
-#: plugins/admin/users/class_userManagement.inc:730
+#: plugins/personal/environment/class_environment.inc:1149
+#: plugins/admin/groups/class_divListGroup.inc:149
+#: plugins/admin/users/class_divListUsers.inc:163
 msgid "Environment"
 msgstr "Entorno"
 
-#: contrib/gosa.conf:79 contrib/gosa.conf:92
+#: contrib/gosa.conf:83 contrib/gosa.conf:100
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:379
-#: plugins/admin/users/class_userManagement.inc:732
-#: plugins/admin/ogroups/tabs_ogroups.inc:73
-#: plugins/admin/ogroups/tabs_ogroups.inc:161
-#: plugins/admin/ogroups/class_ogroupManagement.inc:382
+#: plugins/personal/mail/class_mailAccount.inc:985
+#: plugins/admin/groups/class_groupMail.inc:980
+#: plugins/admin/groups/class_divListGroup.inc:141
+#: plugins/admin/users/class_divListUsers.inc:165
+#: plugins/admin/systems/class_goMailServer.inc:773
+#: plugins/admin/ogroups/tabs_ogroups.inc:75
+#: plugins/admin/ogroups/tabs_ogroups.inc:176
+#: plugins/admin/ogroups/class_mailogroup.inc:155
+#: plugins/admin/ogroups/class_divListOGroup.inc:140
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Correo Electrónico"
 
-#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:380
-#: plugins/admin/users/class_userManagement.inc:738
+#: contrib/gosa.conf:84 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/personal/samba/class_sambaAccount.inc:1016
+#: plugins/admin/groups/class_divListGroup.inc:143
+#: plugins/admin/users/class_divListUsers.inc:171
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:81 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:85 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_divListUsers.inc:173
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:86 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/class_connectivity.inc:176
 msgid "Connectivity"
 msgstr "Conectividad"
 
-#: contrib/gosa.conf:82 plugins/personal/generic/generic.tpl:248
-#: plugins/personal/generic/generic.tpl:379
+#: contrib/gosa.conf:87 plugins/personal/generic/generic.tpl:334
+#: plugins/personal/generic/generic.tpl:502
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:563
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:570
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:813
+#: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:736
-#: plugins/admin/departments/generic.tpl:62
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:38 html/getxls.php:174
+#: plugins/admin/users/class_divListUsers.inc:169
+#: plugins/admin/departments/generic.tpl:67
+#: plugins/admin/departments/class_departmentGeneric.inc:546
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:231
-#: plugins/personal/generic/generic.tpl:369
+#: contrib/gosa.conf:88 plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:490
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:85
 #: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:382
-#: plugins/admin/users/class_userManagement.inc:734
-#: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:709
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:167
+#: plugins/admin/departments/generic.tpl:63
+#: plugins/admin/systems/class_systemManagement.inc:774
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/ogroups/class_ogroupManagement.inc:48
-#: plugins/admin/ogroups/class_ogroupManagement.inc:486
+#: plugins/admin/ogroups/class_ogroupManagement.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:708
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1202
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Teléfono"
 
-#: contrib/gosa.conf:84 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:89 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: plugins/personal/nagios/class_nagiosAccount.inc:240
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:85 contrib/gosa.conf:94 contrib/gosa.conf:100
-#: contrib/gosa.conf:105 contrib/gosa.conf:111 contrib/gosa.conf:120
-#: contrib/gosa.conf:130 contrib/gosa.conf:139 contrib/gosa.conf:144
-#: contrib/gosa.conf:149 contrib/gosa.conf:154 contrib/gosa.conf:159
-#: contrib/gosa.conf:164 contrib/gosa.conf:169
-msgid "References"
-msgstr "Referencias"
-
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:99 plugins/admin/groups/class_groupApplication.inc:1062
 #: plugins/admin/applications/class_applicationManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:44
+#: plugins/admin/mimetypes/generic.tpl:90
+#: plugins/admin/mimetypes/generic.tpl:131
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: contrib/gosa.conf:93
+#: contrib/gosa.conf:101 include/class_tabs.inc:295
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:99 plugins/admin/applications/generic.tpl:66
+#: contrib/gosa.conf:106 plugins/admin/applications/generic.tpl:73
 #: plugins/admin/systems/printerPPDDialog.tpl:17
-#: plugins/admin/systems/class_servRepository.inc:198
+#: plugins/admin/systems/class_servRepository.inc:246
 #: plugins/admin/ogroups/phonequeue.tpl:31
-#: plugins/gofon/conference/generic.tpl:87
+#: plugins/gofon/conference/generic.tpl:92
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:110 plugins/admin/systems/servdns.tpl:100
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:652
-#, fuzzy
+#: contrib/gosa.conf:115 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 msgid "Parameter"
-msgstr "Parametros de inicio"
+msgstr "Parámetro"
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:135
-#: plugins/admin/ogroups/tabs_ogroups.inc:93
+#: contrib/gosa.conf:120 contrib/gosa.conf:128 contrib/gosa.conf:136
+#: plugins/admin/systems/class_terminalStartup.inc:431
+#: plugins/admin/systems/class_workstationStartup.inc:1082
+#: plugins/admin/ogroups/tabs_ogroups.inc:98
 msgid "Startup"
 msgstr "Inicio"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:136
-#: plugins/admin/ogroups/tabs_ogroups.inc:97
+#: contrib/gosa.conf:121 contrib/gosa.conf:137
+#: plugins/admin/ogroups/tabs_ogroups.inc:102
 msgid "Devices"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:118 contrib/gosa.conf:137
-#: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:715
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:489
+#: contrib/gosa.conf:122 contrib/gosa.conf:138
+#: plugins/personal/environment/environment.tpl:228
+#: plugins/admin/systems/class_systemManagement.inc:783
+#: plugins/admin/systems/class_printGeneric.inc:796
+#: plugins/admin/ogroups/class_ogroupManagement.inc:390
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Impresora"
 
-#: contrib/gosa.conf:119 contrib/gosa.conf:129 contrib/gosa.conf:138
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/gofax/blocklists/generic.tpl:70
+#: contrib/gosa.conf:123 contrib/gosa.conf:131 contrib/gosa.conf:139
+#: plugins/gofax/blocklists/generic.tpl:75
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
-#: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
+#: plugins/addons/godfs/contents.tpl:22
 #: plugins/admin/systems/glpiPrinter.tpl:104
 #: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/glpiSelectUser.tpl:20
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:20 plugins/admin/fai/headpage.tpl:20
 #: plugins/admin/fai/faiProfileEntry.tpl:21
 #: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
+#: ihtml/themes/default/MultiSelectWindow.tpl:24
+#: ihtml/themes/default/MultiSelectWindow.tpl:64
 msgid "Information"
 msgstr "Información"
 
-#: contrib/gosa.conf:125
-msgid "Databases"
-msgstr "Bases de datos"
-
-#: contrib/gosa.conf:126 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:129 plugins/admin/systems/servkolab.tpl:26
 msgid "Services"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:128 plugins/admin/systems/servRepositorySetup.tpl:1
-#: plugins/admin/fai/faiPackage.tpl:29
-#, fuzzy
-msgid "Repository"
-msgstr "Reintentar"
+#: contrib/gosa.conf:130 contrib/gosa.conf:140
+msgid "FAI summary"
+msgstr ""
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:193
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:191 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:204 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 #: plugins/addons/ldapmanager/contentexportxls.tpl:19
@@ -222,144 +250,143 @@ msgstr ""
 msgid "Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:192
-#, fuzzy
+#: contrib/gosa.conf:205
 msgid "Excel Export"
-msgstr "Exportar"
+msgstr "Exportar en XLS"
 
-#: contrib/gosa.conf:193 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:206 plugins/personal/mail/generic.tpl:145
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
-#: plugins/addons/ldapmanager/contentimport.tpl:49
-#: plugins/admin/applications/generic.tpl:94
+#: plugins/addons/ldapmanager/contentimport.tpl:50
+#: plugins/addons/notifications/contents.tpl:52
+#: plugins/admin/applications/generic.tpl:101
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:194
+#: contrib/gosa.conf:207
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:198
-#, fuzzy
+#: contrib/gosa.conf:211
 msgid "Partitions"
-msgstr "Destino"
+msgstr "Paticiones"
 
-#: contrib/gosa.conf:202 plugins/personal/environment/logonManagement.tpl:55
-#: plugins/admin/applications/generic.tpl:92
+#: contrib/gosa.conf:215 plugins/personal/environment/logonManagement.tpl:55
+#: plugins/admin/applications/generic.tpl:99
+#: plugins/admin/fai/class_faiScript.inc:450
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
-#, fuzzy
 msgid "Script"
-msgstr "Ruta del Script"
+msgstr "Script"
 
-#: contrib/gosa.conf:206 plugins/admin/fai/class_faiManagement.inc:753
-#: plugins/admin/fai/class_faiManagement.inc:754
+#: contrib/gosa.conf:219 plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:746
-#: plugins/admin/fai/class_faiManagement.inc:747
-#, fuzzy
+#: contrib/gosa.conf:223 plugins/admin/fai/class_faiSummaryTab.inc:41
 msgid "Variables"
-msgstr "Variable"
+msgstr "Variables"
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:767
-#: plugins/admin/fai/class_faiManagement.inc:768
-#, fuzzy
+#: contrib/gosa.conf:227 plugins/admin/fai/class_faiSummaryTab.inc:42
 msgid "Templates"
-msgstr "Plantilla"
+msgstr "Plantillas"
 
-#: contrib/gosa.conf:218 plugins/personal/environment/environment.tpl:7
-#, fuzzy
+#: contrib/gosa.conf:231 plugins/personal/environment/environment.tpl:11
+#: plugins/admin/fai/class_faiSummaryTab.inc:45
 msgid "Profiles"
-msgstr "Ruta del Perfil"
+msgstr "Perfiles"
 
-#: contrib/gosa.conf:222
-#, fuzzy
+#: contrib/gosa.conf:232 plugins/admin/ogroups/tabs_ogroups.inc:107
+#: plugins/admin/acl/class_divListACL.inc:49
+msgid "Summary"
+msgstr ""
+
+#: contrib/gosa.conf:236 plugins/admin/fai/class_faiPackage.inc:550
 msgid "Packages"
-msgstr "Mostrar teléfonos"
+msgstr "Paquetes"
 
-#: contrib/gosa.conf:242
+#: contrib/gosa.conf:258
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:260 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:277 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:261
+#: contrib/gosa.conf:278
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:262
+#: contrib/gosa.conf:279
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:263
+#: contrib/gosa.conf:280
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:264
+#: contrib/gosa.conf:281
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:265
+#: contrib/gosa.conf:282
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:266
+#: contrib/gosa.conf:283
 msgid "Italian"
 msgstr "Italiano"
 
+#: contrib/gosa.conf:284
+msgid "Polish"
+msgstr "Polaco"
+
 #: 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: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/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:30
+#: plugins/addons/godfs/contents.tpl:31
 #: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:29
-#: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/headpage.tpl:29
+#: plugins/admin/groups/mail_locals.tpl:22
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
 #: plugins/admin/systems/servRepository.tpl:36
-#: plugins/admin/systems/glpiDeviceManagement.tpl:29
-#: plugins/admin/systems/glpiSelectUser.tpl:29
-#: plugins/admin/systems/glpiAttachmentPool.tpl:29
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:29
-#: plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/glpiSelectUser.tpl:27
+#: plugins/admin/systems/glpiAttachmentPool.tpl:27
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/fai/headpage.tpl:64 plugins/admin/fai/faiProfileEntry.tpl:31
+#: plugins/admin/fai/faiProfileEntry.tpl:31
 #: plugins/admin/fai/faiPackageEntry.tpl:32
 #: plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
+#: ihtml/themes/default/MultiSelectWindow.tpl:35
+#: ihtml/themes/default/MultiSelectWindow.tpl:75
 msgid "Filters"
 msgstr "Filtros"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
+#: 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:32
+#: 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 busqueda"
+msgstr "Escoja el departamento base de la búsqueda"
 
 #: plugins/personal/mail/mail_locals.tpl:31
 #: plugins/personal/posix/trust_machines.tpl:31
@@ -379,360 +406,443 @@ msgid "User name of which addresses are shown"
 msgstr "Nombre de usuario de las direcciones mostradas"
 
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
-#: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/posix/posix_groups.tpl:65
+#: plugins/personal/mail/generic.tpl:69 plugins/personal/mail/generic.tpl:164
+#: plugins/personal/mail/copypaste.tpl:43
+#: plugins/personal/mail/copypaste.tpl:61
+#: plugins/personal/posix/generic.tpl:88
+#: plugins/personal/posix/generic.tpl:126
+#: plugins/personal/posix/posix_groups.tpl:79
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:330
+#: plugins/personal/posix/paste_generic.tpl:61
+#: plugins/personal/samba/samba3.tpl:407
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/personal/connectivity/class_kolabAccount.inc:203
-#: plugins/personal/environment/environment.tpl:120
-#: plugins/personal/environment/environment.tpl:137
-#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/connectivity/kolab.tpl:53
+#: plugins/personal/connectivity/class_kolabAccount.inc:245
+#: plugins/personal/environment/environment.tpl:150
+#: plugins/personal/environment/environment.tpl:174
+#: plugins/personal/environment/environment.tpl:241
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
 #: plugins/personal/environment/kioskManagement.tpl:14
-#: plugins/gofax/blocklists/generic.tpl:63
-#: plugins/gofax/faxaccount/lists.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:68
 #: plugins/gofax/faxaccount/generic.tpl:76
-#: plugins/gofax/faxaccount/locals.tpl:60 plugins/admin/groups/mail.tpl:51
-#: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/application.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:483
-#: plugins/admin/groups/generic.tpl:103
-#: plugins/admin/groups/group_objects.tpl:47
+#: plugins/gofax/faxaccount/locals.tpl:60
+#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/groups/mail.tpl:51
+#: plugins/admin/groups/mail.tpl:95 plugins/admin/groups/application.tpl:27
+#: plugins/admin/groups/class_groupMail.inc:540
+#: plugins/admin/groups/generic.tpl:108
+#: plugins/admin/groups/group_objects.tpl:55
 #: 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/servdns.tpl:7 plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/terminal.tpl:99
+#: plugins/admin/systems/workstation.tpl:78
+#: plugins/admin/systems/servdns.tpl:6
+#: plugins/admin/systems/goNtpServer.tpl:13
 #: plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/phonesettings.tpl:178
+#: plugins/admin/systems/phonesettings.tpl:193
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:50
-#: plugins/admin/systems/workstationStartup.tpl:70
-#: plugins/admin/systems/workstationStartup.tpl:89
+#: plugins/admin/systems/workstationStartup.tpl:103
+#: plugins/admin/systems/workstationStartup.tpl:124
+#: plugins/admin/systems/workstationStartup.tpl:143
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/glpi_edit_type.tpl:6
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:6
+#: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/glpi_edit_os.tpl:6
+#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
+#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:480
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/ogroups/generic.tpl:38
+#: plugins/admin/systems/servdnseditzone.tpl:106
+#: plugins/admin/systems/class_servDNSeditZone.inc:486
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/goShareServer.tpl:10
+#: plugins/admin/systems/goMailServer.tpl:56
+#: plugins/admin/systems/goMailServer.tpl:79
+#: plugins/admin/systems/goMailServer.tpl:96
+#: plugins/admin/systems/goMailServer.tpl:120
+#: plugins/admin/systems/goMailServer.tpl:136
+#: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/phonequeue.tpl:24
-#: plugins/admin/fai/faiVariable.tpl:43
+#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiPackage.tpl:61 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:43 plugins/admin/fai/faiTemplate.tpl:40
-#: plugins/admin/fai/faiHook.tpl:43 plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:43
+#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:43
+#: plugins/admin/mimetypes/generic.tpl:87
+#: plugins/admin/mimetypes/generic.tpl:93
+#: plugins/admin/mimetypes/generic.tpl:134
+#: plugins/gofon/phoneaccount/generic.tpl:13
+#: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
 msgstr "Añadir"
 
 #: plugins/personal/mail/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
-#: plugins/personal/posix/posix_groups.tpl:67
+#: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/posix/main.inc:102 plugins/personal/samba/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/generic/generic_certs.tpl:78
+#: plugins/personal/generic/generic_picture.tpl:35
+#: plugins/personal/generic/main.inc:148
+#: plugins/personal/generic/generic_certs.tpl:94
 #: plugins/personal/connectivity/main.inc:120
-#: plugins/personal/environment/main.inc:106
+#: plugins/personal/environment/main.inc:97
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
-#: plugins/personal/environment/hotplugDialogNew.tpl:39
-#: plugins/personal/nagios/main.inc:106
-#: plugins/gofax/blocklists/generic.tpl:82
+#: plugins/personal/environment/hotplugDialogNew.tpl:54
+#: plugins/personal/nagios/main.inc:106 plugins/personal/netatalk/main.inc:106
+#: plugins/gofax/blocklists/generic.tpl:91
 #: plugins/gofax/blocklists/remove.tpl:16
-#: plugins/gofax/faxaccount/lists.tpl:33
-#: plugins/gofax/faxaccount/locals.tpl:62 plugins/gofax/faxaccount/main.inc:91
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
 #: plugins/addons/addressbook/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
+#: plugins/addons/godfs/class_dfsManagment.inc:249
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:338
+#: plugins/admin/groups/class_groupManagement.inc:336
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/group_objects.tpl:49
-#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/group_objects.tpl:57
+#: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/remove.tpl:16
 #: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:635
-#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:633
+#: plugins/admin/users/template.tpl:50
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:306
+#: plugins/admin/applications/class_applicationManagement.inc:356
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:349
-#: plugins/admin/systems/class_systemManagement.inc:542
-#: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:76
+#: plugins/admin/departments/class_departmentManagement.inc:305
+#: plugins/admin/systems/class_systemManagement.inc:494
+#: plugins/admin/systems/servdns.tpl:23
+#: plugins/admin/systems/servkolab.tpl:205 plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/goNtpServer.tpl:24
+#: plugins/admin/systems/servnfs.tpl:121
 #: plugins/admin/systems/remove_glpi.tpl:16
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
 #: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/servRepositorySetup.tpl:43
-#: plugins/admin/systems/glpiDeviceManagement.tpl:54
+#: plugins/admin/systems/servRepository.tpl:66
+#: plugins/admin/systems/glpi_edit_type.tpl:29
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/goFonServer.tpl:26
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:70
-#: plugins/admin/systems/glpiSelectUser.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:734
-#: plugins/admin/systems/glpiAttachmentPool.tpl:54
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:54
+#: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/glpi_devices.tpl:761
+#: plugins/admin/systems/glpi_edit_os.tpl:29
+#: plugins/admin/systems/glpiAttachmentPool.tpl:52
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:30
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:52
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/servdnseditzone.tpl:120
+#: plugins/admin/systems/SelectDeviceType.tpl:45
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: plugins/admin/systems/ServiceAddDialog.tpl:31
+#: plugins/admin/systems/goKrbServer.tpl:21
+#: plugins/admin/systems/goLdapServer.tpl:9
+#: plugins/admin/systems/goShareServer.tpl:23
+#: plugins/admin/systems/goMailServer.tpl:169
+#: plugins/admin/systems/goImapServer.tpl:96
+#: plugins/admin/systems/goSyslogServer.tpl:8
+#: plugins/admin/systems/goGlpiServer.tpl:26
+#: plugins/admin/systems/goCupsServer.tpl:8
+#: plugins/admin/systems/goTerminalServer.tpl:19
+#: plugins/admin/systems/goFaxServer.tpl:18
+#: plugins/admin/systems/goLogDBServer.tpl:18
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:340
-#: plugins/admin/ogroups/remove.tpl:16
-#: plugins/admin/fai/class_faiManagement.inc:595
-#: plugins/admin/fai/class_faiManagement.inc:600
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/remove.tpl:16 plugins/admin/acl/remove.tpl:16
+#: plugins/admin/fai/class_faiManagement.inc:591
+#: plugins/admin/fai/class_faiManagement.inc:596
 #: plugins/admin/fai/remove.tpl:17 plugins/admin/fai/faiProfileEntry.tpl:71
-#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
 #: plugins/admin/fai/faiVariableEntry.tpl:49
-#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiHookEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiPackageEntry.tpl:62
+#: plugins/admin/fai/faiPackageEntry.tpl:57
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
-#: plugins/admin/fai/faiPackageNew.tpl:45
-#: plugins/admin/fai/faiNewBranch.tpl:18
+#: plugins/admin/fai/faiPackageNew.tpl:51
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:351
+#: plugins/admin/mimetypes/remove.tpl:15
 #: plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:269
 #: plugins/gofon/macro/remove.tpl:15
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:268
-#: plugins/gofon/conference/remove.tpl:16
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:247
+#: plugins/gofon/conference/remove.tpl:16 ihtml/themes/default/islocked.tpl:15
+#: ihtml/themes/default/remove.tpl:15 ihtml/themes/default/acl.tpl:71
+#: ihtml/themes/default/acl.tpl:85 ihtml/themes/default/copyPasteDialog.tpl:15
+#: ihtml/themes/default/snapshotdialog.tpl:39
+#: ihtml/themes/default/snapshotdialog.tpl:82
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
+#: 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/personal/mail/generic.tpl:15
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:710
-#: plugins/admin/ogroups/class_ogroupManagement.inc:485
+#: plugins/admin/systems/class_servGeneric.inc:321
+#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/admin/systems/servnfs.tpl:33
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:386
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Servidor"
 
-#: plugins/personal/mail/generic.tpl:14
+#: plugins/personal/mail/generic.tpl:18
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Especificar el servidor de correo donde el usuario estará hospedado."
 
-#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
+#: plugins/personal/mail/generic.tpl:28 plugins/admin/groups/mail.tpl:25
 msgid "Quota usage"
 msgstr "Uso de la Cola de Correo"
 
-#: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:169
-#: plugins/admin/systems/class_printGeneric.inc:394
+#: plugins/admin/systems/class_printGeneric.inc:480
 msgid "not defined"
 msgstr "sin definirse"
 
-#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
+#: plugins/personal/mail/generic.tpl:40
+#: plugins/personal/mail/class_mailAccount.inc:997
+#: plugins/admin/groups/mail.tpl:37
+#: plugins/admin/groups/class_groupMail.inc:991
 msgid "Quota size"
 msgstr "Tamaño de la Cola de correo"
 
-#: plugins/personal/mail/generic.tpl:49 plugins/admin/groups/mail.tpl:44
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/copypaste.tpl:25
+#: plugins/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
-#: plugins/personal/mail/generic.tpl:51 plugins/admin/groups/mail.tpl:45
-#: plugins/admin/systems/phonesettings.tpl:170
-#: plugins/admin/systems/phonesettings.tpl:185
+#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/copypaste.tpl:55
+#: plugins/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
+#: plugins/admin/systems/phonesettings.tpl:172
+#: plugins/admin/systems/phonesettings.tpl:187
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
 
-#: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
-#: plugins/personal/posix/generic.tpl:74
-#: plugins/personal/posix/generic.tpl:104
-#: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/connectivity/kolab.tpl:20
-#: plugins/personal/environment/environment.tpl:138
-#: plugins/personal/environment/environment.tpl:166
-#: plugins/personal/environment/environment.tpl:182
-#: plugins/gofax/blocklists/generic.tpl:64
+#: plugins/personal/mail/generic.tpl:72 plugins/personal/mail/generic.tpl:170
+#: plugins/personal/mail/copypaste.tpl:45
+#: plugins/personal/mail/copypaste.tpl:62
+#: plugins/personal/posix/generic.tpl:91
+#: plugins/personal/posix/generic.tpl:129
+#: plugins/personal/posix/paste_generic.tpl:62
+#: plugins/personal/samba/samba3.tpl:410
+#: plugins/personal/connectivity/kolab.tpl:56
+#: plugins/personal/environment/environment.tpl:180
+#: plugins/personal/environment/environment.tpl:218
+#: plugins/personal/environment/environment.tpl:244
+#: plugins/personal/environment/class_environment.inc:639
+#: plugins/gofax/blocklists/generic.tpl:69
 #: plugins/gofax/blocklists/remove.tpl:14
-#: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
+#: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.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:105 plugins/admin/users/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/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+#: 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/remove.tpl:14
+#: plugins/admin/systems/goNtpServer.tpl:14
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/workstationStartup.tpl:51
-#: plugins/admin/systems/workstationStartup.tpl:71
+#: plugins/admin/systems/phonesettings.tpl:179
+#: plugins/admin/systems/phonesettings.tpl:194
+#: plugins/admin/systems/workstationStartup.tpl:104
+#: plugins/admin/systems/workstationStartup.tpl:125
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/glpi_edit_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:8
+#: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
+#: plugins/admin/systems/class_termDNS.inc:474
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:14
-#: plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
-#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/fai/remove_branch.tpl:14
-#: plugins/gofon/phoneaccount/generic.tpl:15 plugins/gofon/macro/remove.tpl:13
-#: plugins/gofon/conference/remove.tpl:14
+#: plugins/admin/systems/class_servDNSeditZone.inc:292
+#: plugins/admin/systems/class_servDNSeditZone.inc:480
+#: plugins/admin/systems/goShareServer.tpl:12
+#: 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/acl/remove.tpl:14 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/mimetypes/remove.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/gofon/phoneaccount/paste_generic.tpl:19
+#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/conference/remove.tpl:14
+#: ihtml/themes/default/remove.tpl:13
 msgid "Delete"
 msgstr "Borrar"
 
-#: plugins/personal/mail/generic.tpl:67
+#: plugins/personal/mail/generic.tpl:80
 msgid "Mail options"
 msgstr "Opciones de correo"
 
-#: plugins/personal/mail/generic.tpl:72
+#: plugins/personal/mail/generic.tpl:86
 msgid "Select if you want to forward mails without getting own copies of them"
-msgstr "Seleccione si quiere reenviar correos sin quedarse copias de ellos"
+msgstr "Seleccione si quiere reenviar nagios sin quedarse copias de ellos"
 
-#: plugins/personal/mail/generic.tpl:72
+#: plugins/personal/mail/generic.tpl:86
 msgid "No delivery to own mailbox"
 msgstr "No se enviara a su propia carpeta de correo"
 
-#: plugins/personal/mail/generic.tpl:75
+#: plugins/personal/mail/generic.tpl:91
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 "Seleccione para responder automáticamente con el mensaje de ausencia "
 "definido aqui"
 
-#: plugins/personal/mail/generic.tpl:75
+#: plugins/personal/mail/generic.tpl:91
 msgid "Activate vacation message"
 msgstr "Activar mensaje de ausencia"
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:99
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 "Seleccione aquí si quiere que su correo se filtre a través de spamassassin"
 
-#: plugins/personal/mail/generic.tpl:82
+#: plugins/personal/mail/generic.tpl:101
 msgid "Move mails tagged with spam level greater than"
 msgstr "Mover los correos etiquetados con nivel de spam mayor que"
 
-#: plugins/personal/mail/generic.tpl:84
+#: plugins/personal/mail/generic.tpl:104
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr "Elija el nivele de spam - los mas bajos son mas sensibles"
 
-#: plugins/personal/mail/generic.tpl:87
+#: plugins/personal/mail/generic.tpl:108
 msgid "to folder"
 msgstr "a la carpeta"
 
-#: plugins/personal/mail/generic.tpl:94
+#: plugins/personal/mail/generic.tpl:118
 msgid "Reject mails bigger than"
 msgstr "rechazar correos mayores que"
 
-#: plugins/personal/mail/generic.tpl:96
-#: plugins/personal/connectivity/pureftpd.tpl:44
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
-#: plugins/personal/environment/environment.tpl:45
+#: plugins/personal/mail/generic.tpl:122
+#: plugins/personal/connectivity/pureftpd.tpl:60
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
+#: plugins/personal/environment/environment.tpl:55
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 msgid "MB"
 msgstr "Mb"
 
-#: plugins/personal/mail/generic.tpl:102
+#: plugins/personal/mail/generic.tpl:129
+#: plugins/personal/mail/class_mailAccount.inc:1000
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
-#: plugins/personal/mail/generic.tpl:119
+#: plugins/personal/mail/generic.tpl:151
+#: plugins/personal/mail/copypaste.tpl:13
 msgid "Forward messages to"
 msgstr "reenviar mensajes a"
 
-#: plugins/personal/mail/generic.tpl:130
+#: plugins/personal/mail/generic.tpl:167
+#: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
+#: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
 msgstr "Añadir Cuenta Local"
 
-#: plugins/personal/mail/generic.tpl:140
+#: plugins/personal/mail/generic.tpl:178
 msgid "Advanced mail options"
 msgstr "Opciones de correo avanzadas"
 
-#: plugins/personal/mail/generic.tpl:145
+#: plugins/personal/mail/generic.tpl:184
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Seleccione si el usuario solo puede enviar y recibir dentro de su propio "
 "dominio"
 
-#: plugins/personal/mail/generic.tpl:146
+#: plugins/personal/mail/generic.tpl:186
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 "El usuario solo esta permitido a enviar y recibir correo de forma local"
 
-#: plugins/personal/mail/generic.tpl:153
+#: plugins/personal/mail/generic.tpl:195
+#: plugins/personal/mail/class_mailAccount.inc:1015
 msgid "Use custom sieve script"
 msgstr "Usar 'script sive' propios"
 
-#: plugins/personal/mail/generic.tpl:153
+#: plugins/personal/mail/generic.tpl:195
 msgid "disables all Mail options!"
 msgstr "¡Desactivar todas las opciones de correo!"
 
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:158
-#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:100
+#: plugins/personal/samba/main.inc:104 plugins/personal/generic/main.inc:146
 #: plugins/personal/connectivity/main.inc:118
-#: plugins/personal/environment/main.inc:104
-#: plugins/personal/nagios/main.inc:104
-#: plugins/gofax/blocklists/generic.tpl:80
+#: plugins/personal/environment/main.inc:95
+#: plugins/personal/nagios/main.inc:104 plugins/personal/netatalk/main.inc:104
+#: plugins/gofax/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:336
-#: plugins/admin/users/class_userManagement.inc:633
-#: plugins/admin/applications/class_applicationManagement.inc:304
-#: plugins/admin/departments/class_departmentManagement.inc:347
-#: plugins/admin/systems/class_systemManagement.inc:540
-#: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/fai/class_faiManagement.inc:593
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/users/class_userManagement.inc:627
+#: plugins/admin/applications/class_applicationManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:488
+#: plugins/admin/ogroups/class_ogroupManagement.inc:332
+#: plugins/admin/fai/class_faiManagement.inc:585
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:345
 #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
-msgid "Finish"
-msgstr "Terminar"
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:241
+msgid "Ok"
+msgstr ""
 
-#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
+#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:111
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:167
 #: plugins/personal/connectivity/main.inc:128
-#: plugins/personal/environment/main.inc:114
-#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/environment/main.inc:106
+#: plugins/personal/nagios/main.inc:114 plugins/personal/netatalk/main.inc:111
+#: plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Pulse en el botón - Editar - para cambiar la información de esta ventana"
 
-#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:122
-#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:172
+#: plugins/personal/mail/main.inc:115 plugins/personal/posix/main.inc:113
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:160
 #: plugins/personal/connectivity/main.inc:129
-#: plugins/personal/environment/environment.tpl:139
-#: plugins/personal/environment/main.inc:115
-#: plugins/personal/nagios/main.inc:115
+#: plugins/personal/environment/environment.tpl:177
+#: plugins/personal/environment/main.inc:107
+#: plugins/personal/nagios/main.inc:115 plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
 #: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:46 plugins/admin/systems/servdns.tpl:8
-#: 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/printer.tpl:52 plugins/admin/systems/servdns.tpl:7
+#: 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/glpiManufacturer.tpl:7
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
-#: plugins/admin/fai/faiVariable.tpl:44
+#: plugins/admin/systems/servdnseditzone.tpl:31
+#: plugins/admin/systems/goShareServer.tpl:11
+#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiScript.tpl:44 plugins/admin/fai/faiTemplate.tpl:41
-#: plugins/admin/fai/faiHook.tpl:44 plugins/gofon/phoneaccount/main.inc:113
+#: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Editar"
 
@@ -740,6 +850,12 @@ msgstr "Editar"
 msgid "User mail settings"
 msgstr "Parametros del correo de usuarios"
 
+#: plugins/personal/mail/copypaste.tpl:1
+#: plugins/personal/mail/class_mailAccount.inc:986
+#: plugins/admin/groups/paste_mail.tpl:1
+msgid "Mail settings"
+msgstr "Parámetros de correo"
+
 #: plugins/personal/mail/class_mailAccount.inc:23
 #: plugins/personal/password/class_password.inc:6
 #: plugins/personal/posix/class_posixAccount.inc:17
@@ -769,40 +885,43 @@ msgstr "Parametros del correo de usuarios"
 #: 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/addons/notifications/class_msgplug.inc:7
 #: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.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/admin/acl/class_aclManagement.inc:26
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/fonreports/class_fonreport.inc:7
+#: plugins/gofon/fonreports/class_fonreport.inc:7 include/class_acl.inc:7
 msgid "This does something"
 msgstr "Esto hace algo"
 
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
+#: plugins/personal/mail/class_mailAccount.inc:90
+#: plugins/admin/groups/class_groupMail.inc:75
 #, 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:170
+#: plugins/personal/mail/class_mailAccount.inc:210
 msgid "No DESC tag in vacation file:"
 msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
 
-#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/personal/mail/class_mailAccount.inc:249
 msgid "This account has no mail extensions."
 msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/mail/class_mailAccount.inc:219
-#: plugins/admin/groups/class_groupMail.inc:264
+#: plugins/personal/mail/class_mailAccount.inc:258
+#: plugins/admin/groups/class_groupMail.inc:320
 #: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:220
-#: plugins/admin/groups/class_groupMail.inc:265
+#: plugins/personal/mail/class_mailAccount.inc:259
+#: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -810,14 +929,14 @@ msgstr ""
 "Esta cuenta tiene las características de correo activas. Puede desactivarlas "
 "apretando a continuación."
 
-#: plugins/personal/mail/class_mailAccount.inc:222
-#: plugins/admin/groups/class_groupMail.inc:267
+#: plugins/personal/mail/class_mailAccount.inc:261
+#: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:222
-#: plugins/admin/groups/class_groupMail.inc:268
+#: plugins/personal/mail/class_mailAccount.inc:261
+#: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -825,23 +944,23 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/mail/class_mailAccount.inc:270
+#: plugins/personal/mail/class_mailAccount.inc:313
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "reenvíos."
 
-#: plugins/personal/mail/class_mailAccount.inc:276
-#: plugins/admin/groups/class_groupMail.inc:327
+#: plugins/personal/mail/class_mailAccount.inc:319
+#: plugins/admin/groups/class_groupMail.inc:383
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
 "sentido."
 
-#: plugins/personal/mail/class_mailAccount.inc:311
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:355
+#: plugins/personal/mail/class_mailAccount.inc:349
+#: plugins/personal/mail/class_mailAccount.inc:354
+#: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
@@ -849,62 +968,159 @@ msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "direcciones alternativas"
 
-#: plugins/personal/mail/class_mailAccount.inc:326
-#: plugins/admin/groups/class_groupMail.inc:360
+#: plugins/personal/mail/class_mailAccount.inc:364
+#: plugins/admin/groups/class_groupMail.inc:416
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "La dirección de correo que esta intentando añadir, ya esta usada por otro "
 "usuario"
 
-#: plugins/personal/mail/class_mailAccount.inc:700
+#: plugins/personal/mail/class_mailAccount.inc:614
+#, fuzzy, php-format
+msgid "Removing of user/mail account with dn '%s' failed."
+msgstr "No se ha podido borrar la cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:716
+#, fuzzy, php-format
+msgid "Saving of user/mail account with dn '%s' failed."
+msgstr "No se ha podido guardar la cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:764
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:705
-#: plugins/admin/groups/class_groupMail.inc:808
+#: plugins/personal/mail/class_mailAccount.inc:769
+#: plugins/admin/groups/class_groupMail.inc:803
 msgid "The required field 'Primary address' is not set."
 msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/personal/mail/class_mailAccount.inc:709
-#: plugins/personal/mail/class_mailAccount.inc:713
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
+#: plugins/personal/mail/class_mailAccount.inc:773
+#: plugins/personal/mail/class_mailAccount.inc:777
+#: plugins/addons/addressbook/class_addressbook.inc:589
+#: plugins/admin/ogroups/class_mailogroup.inc:71
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/personal/mail/class_mailAccount.inc:719
-#: plugins/admin/groups/class_groupMail.inc:817
-#: plugins/admin/ogroups/class_mailogroup.inc:77
+#: plugins/personal/mail/class_mailAccount.inc:783
+#: plugins/admin/groups/class_groupMail.inc:812
+#: plugins/admin/ogroups/class_mailogroup.inc:78
 msgid "The primary address you've entered is already in use."
 msgstr "La cuenta principal que ha introducido ya esta en uso."
 
-#: plugins/personal/mail/class_mailAccount.inc:725
-#: plugins/admin/groups/class_groupMail.inc:823
+#: plugins/personal/mail/class_mailAccount.inc:789
+#: plugins/admin/groups/class_groupMail.inc:818
 msgid "Value in 'Quota size' is not valid."
 msgstr "El valor de 'Tamaño de Cola' no es valido."
 
-#: plugins/personal/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:832
+#: plugins/personal/mail/class_mailAccount.inc:798
+#: plugins/admin/groups/class_groupMail.inc:827
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/personal/mail/class_mailAccount.inc:744
-#: plugins/admin/groups/class_groupMail.inc:840
+#: plugins/personal/mail/class_mailAccount.inc:808
+#: plugins/admin/groups/class_groupMail.inc:835
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
 "Necesita poner un valor máximo en el tamaño de mensaje de correo para poder "
 "rechazar mensajes."
 
-#: plugins/personal/mail/class_mailAccount.inc:748
+#: plugins/personal/mail/class_mailAccount.inc:812
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
+#: plugins/personal/mail/class_mailAccount.inc:852
+#: plugins/personal/mail/class_mailAccount.inc:864
+#, fuzzy
+msgid "You are not allowed to write mail forwarding."
+msgstr "¡No tiene permisos para cambiar su contraseña!"
+
+#: plugins/personal/mail/class_mailAccount.inc:896
+#: plugins/personal/mail/class_mailAccount.inc:907
+#, fuzzy
+msgid "You are not allowed to write mail alternate address."
+msgstr "¡No tiene permisos para eliminar esta entrada!"
+
+#: plugins/personal/mail/class_mailAccount.inc:972
+msgid "Waiting for kolab to remove mail properties."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:974
+msgid ""
+"Please remove the mail account first, to allow kolab to call its remove "
+"methods."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:995
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/personal/nagios/class_nagiosAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:988
+#: plugins/admin/systems/class_servDNS.inc:402
+#: plugins/admin/systems/servdnseditzone.tpl:51
+#: plugins/admin/ogroups/class_mailogroup.inc:163 html/getxls.php:174
+msgid "Mail address"
+msgstr "Dirección correo electrónico"
+
+#: plugins/personal/mail/class_mailAccount.inc:996
+#: plugins/admin/groups/class_groupMail.inc:992
+#: plugins/admin/systems/servservice.tpl:107
+msgid "Mail server"
+msgstr "Servidor de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:999
+#, fuzzy
+msgid "Add vacation information"
+msgstr "Información organizativa"
+
+#: plugins/personal/mail/class_mailAccount.inc:1002
+msgid "Use spam filter"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1003
+#, fuzzy
+msgid "Spam level"
+msgstr "Nivel de log"
+
+#: plugins/personal/mail/class_mailAccount.inc:1004
+#, fuzzy
+msgid "Spam mail box"
+msgstr "Tamaño del correo electrónico"
+
+#: plugins/personal/mail/class_mailAccount.inc:1006
+#, fuzzy
+msgid "Reject due to mailsize"
+msgstr "rechazar correos mayores que"
+
+#: plugins/personal/mail/class_mailAccount.inc:1007
+#, fuzzy
+msgid "Mail max size"
+msgstr "Tamaño del correo electrónico"
+
+#: plugins/personal/mail/class_mailAccount.inc:1009
+#: plugins/personal/mail/class_mailAccount.inc:1014
+#, fuzzy
+msgid "Forwarding address"
+msgstr "Cuenta Principal"
+
+#: plugins/personal/mail/class_mailAccount.inc:1010
+#, fuzzy
+msgid "Local delivery"
+msgstr "Último envío"
+
+#: plugins/personal/mail/class_mailAccount.inc:1011
+msgid "Only insider delivery"
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:1012
+#, fuzzy
+msgid "Mail alternative addresses"
+msgstr "Direcciones alternativas"
+
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/users/class_divListUsers.inc:224
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
@@ -945,7 +1161,6 @@ msgstr "Repetir la nueva contraseña"
 
 #: plugins/personal/password/password.tpl:34
 #: plugins/personal/generic/password.tpl:17
-#: plugins/personal/connectivity/opengw.tpl:49
 #: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr "Poner Contraseña"
@@ -963,17 +1178,15 @@ msgstr ""
 "todos los programas configurados también."
 
 #: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:169
+#: plugins/personal/generic/main.inc:157
 #: plugins/gofax/faxreports/detail.tpl:67
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
-#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentimport.tpl:45
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/addons/ldapmanager/contentexportxls.tpl:69
-#: include/functions.inc:1322 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/altlinux/setup_useradmin.tpl:40
+#: plugins/addons/mailqueue/header.tpl:5
+#: plugins/admin/departments/dep_iframe.tpl:19
+#: plugins/admin/fai/faiNewBranch.tpl:50 include/functions.inc:1477
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
@@ -983,17 +1196,35 @@ msgid "Back"
 msgstr "Atras"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:661
+#: 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
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
+#: plugins/admin/systems/class_goFaxServer.inc:225
+#: plugins/admin/systems/class_goGlpiServer.inc:228
+#: plugins/admin/systems/goFonServer.tpl:8
+#: plugins/admin/systems/class_divListSystem.inc:189
+#: plugins/admin/systems/goKrbServer.tpl:12
+#: plugins/admin/systems/goImapServer.tpl:25
+#: plugins/admin/systems/class_goFonServer.inc:234
+#: plugins/admin/systems/class_goLogDBServer.inc:225
+#: plugins/admin/systems/class_goKrbServer.inc:230
+#: plugins/admin/systems/goGlpiServer.tpl:9
+#: plugins/admin/systems/goFaxServer.tpl:8
+#: plugins/admin/systems/goLogDBServer.tpl:8 ihtml/themes/default/login.tpl:37
+#: 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:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -1004,8 +1235,8 @@ msgstr "La contraseña introducida como contraseña actual no es correcta."
 msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
-#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:264
+#: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:74
+#: plugins/admin/users/class_userManagement.inc:219
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1013,8 +1244,8 @@ 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:269
+#: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:79
+#: plugins/admin/users/class_userManagement.inc:224
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La contraseña que ingreso como 'Nueva contraseña' está vacia."
 
@@ -1034,21 +1265,25 @@ msgstr "No tiene permisos para cambiar su contraseña."
 msgid "External password changer reported a problem: "
 msgstr "El programa externo de cambio de contraseña informo de un problema: "
 
-#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
-#: plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:638
+#: plugins/personal/posix/generic.tpl:7
+#: plugins/personal/posix/class_posixAccount.inc:1259
+#: plugins/personal/posix/paste_generic.tpl:8
+#: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:97
+#: plugins/personal/samba/class_sambaAccount.inc:621
 msgid "Home directory"
 msgstr "Directorio Principal"
 
-#: plugins/personal/posix/generic.tpl:13
+#: plugins/personal/posix/generic.tpl:15
+#: plugins/personal/posix/class_posixAccount.inc:1260
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/generic.tpl:21
+#: plugins/personal/posix/generic.tpl:25
 msgid "Primary group"
 msgstr "Grupo primario"
 
-#: plugins/personal/posix/generic.tpl:29
+#: plugins/personal/posix/generic.tpl:35
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:219
 #: plugins/gofax/faxreports/contents.tpl:32
 #: plugins/gofax/faxreports/detail.tpl:45
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:38
@@ -1056,74 +1291,93 @@ msgstr "Grupo primario"
 msgid "Status"
 msgstr "Estado"
 
-#: plugins/personal/posix/generic.tpl:39
+#: plugins/personal/posix/generic.tpl:47
+#: plugins/personal/posix/paste_generic.tpl:23
 msgid "Force UID/GID"
 msgstr "Forzar UID/GID"
 
-#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
+#: plugins/personal/posix/generic.tpl:51
+#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/generic.tpl:52
+#: plugins/personal/posix/generic.tpl:62
+#: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/admin/groups/class_groupGeneric.inc:877
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/generic.tpl:64
+#: plugins/personal/posix/generic.tpl:76
+#: plugins/personal/posix/paste_generic.tpl:47
 msgid "Group membership"
 msgstr "Miembros del grupo"
 
-#: plugins/personal/posix/generic.tpl:66
+#: plugins/personal/posix/generic.tpl:78
+#: plugins/personal/posix/paste_generic.tpl:54
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
 
-#: plugins/personal/posix/generic.tpl:84
+#: plugins/personal/posix/generic.tpl:102
 msgid "Account"
 msgstr "Cuenta"
 
-#: plugins/personal/posix/generic.tpl:91
+#: plugins/personal/posix/generic.tpl:109
 msgid "System trust"
-msgstr "Autentificación del sistema"
+msgstr "Autenticación del sistema"
 
-#: plugins/personal/posix/generic.tpl:92
-#, fuzzy
+#: plugins/personal/posix/generic.tpl:110
 msgid "Trust mode"
-msgstr "Modo"
+msgstr "Modo Autenticado"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Seleccione grupo a añadir"
 
-#: plugins/personal/posix/posix_groups.tpl:29
+#: plugins/personal/posix/posix_groups.tpl:32
 msgid "Display groups of department"
 msgstr "Mostrar los grupos de departamentos"
 
-#: plugins/personal/posix/posix_groups.tpl:41
-#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/personal/posix/posix_groups.tpl:46
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:60
+#: plugins/admin/groups/class_divListGroup.inc:68
+#: plugins/admin/users/class_divListUsers.inc:69
+#: plugins/admin/applications/class_divListApplication.inc:55
+#: plugins/admin/departments/class_divListDepartment.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/ogroups/class_divListOGroup.inc:75
+#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
+#: plugins/gofon/macro/class_divListMacros.inc:57
+#: plugins/gofon/conference/class_divListConferences.inc:58
+msgid "Ignore subtrees"
+msgstr ""
+
+#: plugins/personal/posix/posix_groups.tpl:53
 msgid "Display groups matching"
 msgstr "Mostrar grupos que concuerden con"
 
-#: plugins/personal/posix/posix_groups.tpl:44
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/personal/posix/posix_groups.tpl:57
+#: plugins/admin/groups/class_divListGroup.inc:71
+#: plugins/admin/ogroups/class_divListOGroup.inc:78
 msgid "Regular expression for matching group names"
 msgstr "Expresión regular que concuerde con nombres de grupos"
 
-#: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:75
+#: plugins/personal/posix/posix_groups.tpl:64
 msgid "Display groups of user"
 msgstr "Mostrar grupos de usuarios"
 
-#: plugins/personal/posix/posix_groups.tpl:54
-#: plugins/admin/groups/headpage.tpl:78
+#: plugins/personal/posix/posix_groups.tpl:68
+#: plugins/admin/groups/class_divListGroup.inc:72
 msgid "User name of which groups are shown"
 msgstr "Nombres de usuarios de los grupos que se muestran"
 
-#: plugins/personal/posix/posix_shadow.tpl:5
+#: plugins/personal/posix/posix_shadow.tpl:9
 msgid "User must change password on first login"
 msgstr ""
 "Los usuarios deben cambiar su contraseña en el próximo inicio de sesión"
 
-#: plugins/personal/posix/posix_shadow.tpl:14
-#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:267
+#: plugins/personal/posix/posix_shadow.tpl:34
+#: plugins/personal/samba/samba2.tpl:87 plugins/personal/samba/samba3.tpl:311
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
@@ -1136,11 +1390,11 @@ msgid "Display systems of department"
 msgstr "Mostrar sistemas de departamentos"
 
 #: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:75
 msgid "Display systems matching"
 msgstr "Mostrar sistemas que concuerden con"
 
-#: plugins/personal/posix/main.inc:131
+#: plugins/personal/posix/main.inc:121
 msgid "Unix settings"
 msgstr "Parametros Unix"
 
@@ -1149,42 +1403,61 @@ msgstr "Parametros Unix"
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:137
-#: plugins/personal/posix/class_posixAccount.inc:970
+#: plugins/personal/posix/class_posixAccount.inc:129
+msgid "expired"
+msgstr "expiró"
+
+#: plugins/personal/posix/class_posixAccount.inc:131
+msgid "grace time active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:134
+msgid "active, password not changable"
+msgstr "activo, no puede cambiar la contraseña"
+
+#: plugins/personal/posix/class_posixAccount.inc:136
+msgid "active, password expired"
+msgstr "activo, la contraseña expiró"
+
+#: plugins/personal/posix/class_posixAccount.inc:138
+msgid "active"
+msgstr "activo"
+
+#: plugins/personal/posix/class_posixAccount.inc:149
+#: plugins/personal/posix/class_posixAccount.inc:1008
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: plugins/personal/posix/class_posixAccount.inc:177
+#: plugins/personal/posix/class_posixAccount.inc:189
 msgid "unconfigured"
 msgstr "Desconfigurado"
 
-#: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/admin/systems/class_workstationStartup.inc:466
-#: plugins/admin/systems/class_workstationService.inc:114
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
+#: plugins/personal/posix/class_posixAccount.inc:206
+#: plugins/admin/systems/class_terminalService.inc:194
+#: plugins/admin/systems/class_workstationStartup.inc:759
+#: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:227
+#: plugins/personal/posix/class_posixAccount.inc:254
 msgid "This account has no unix extensions."
 msgstr "Este cuenta no tiene extensiones unix."
 
-#: plugins/personal/posix/class_posixAccount.inc:248
-#: plugins/personal/posix/class_posixAccount.inc:251
+#: plugins/personal/posix/class_posixAccount.inc:274
+#: plugins/personal/posix/class_posixAccount.inc:277
 msgid "Remove posix account"
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:249
-#, fuzzy
+#: plugins/personal/posix/class_posixAccount.inc:275
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
 "remove the samba / environment account first."
 msgstr ""
-"Esta cuenta tiene características unix activadas. Para desactivarlas, "
+"Esta cuenta tiene las características unix activadas. Para desactivarlas, "
 "necesita eliminar la cuenta samba primero."
 
-#: plugins/personal/posix/class_posixAccount.inc:252
+#: plugins/personal/posix/class_posixAccount.inc:278
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1192,11 +1465,11 @@ msgstr ""
 "Esta cuenta tiene características posix activadas. Puede desactivarla "
 "pulsando aqui"
 
-#: plugins/personal/posix/class_posixAccount.inc:255
+#: plugins/personal/posix/class_posixAccount.inc:281
 msgid "Create posix account"
 msgstr "Crear cuenta posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:256
+#: plugins/personal/posix/class_posixAccount.inc:282
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1204,379 +1477,428 @@ msgstr ""
 "Esta cuenta tiene la extensión posix desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/posix/class_posixAccount.inc:440
+#: plugins/personal/posix/class_posixAccount.inc:451
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "La contraseñas no pueden ser cambiadas hasta %s días desde el último cambio"
 
-#: plugins/personal/posix/class_posixAccount.inc:442
+#: plugins/personal/posix/class_posixAccount.inc:455
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "La contraseñas deben ser cambiadas despues de %s días"
 
-#: plugins/personal/posix/class_posixAccount.inc:444
+#: plugins/personal/posix/class_posixAccount.inc:459
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 "Desactivar cuente despues de %s días de inactividad despues de expirar la "
 "contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:446
+#: plugins/personal/posix/class_posixAccount.inc:463
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr "Avisar al usuario %s días antes de expirar la contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:470
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
-#: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/generic/class_user.inc:245
 msgid "January"
 msgstr "Enero"
 
-#: plugins/personal/posix/class_posixAccount.inc:470
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
-#: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/generic/class_user.inc:245
 msgid "February"
 msgstr "Febrero"
 
-#: plugins/personal/posix/class_posixAccount.inc:470
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
-#: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/generic/class_user.inc:245
 msgid "March"
 msgstr "Marzo"
 
-#: plugins/personal/posix/class_posixAccount.inc:470
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
-#: plugins/personal/generic/class_user.inc:240
-#: plugins/gofax/faxreports/class_faxreport.inc:76
-#: plugins/gofon/fonreports/class_fonreport.inc:71
+#: plugins/personal/posix/class_posixAccount.inc:495
+#: plugins/personal/samba/class_sambaAccount.inc:362
+#: plugins/personal/samba/class_sambaAccount.inc:380
+#: plugins/personal/samba/class_sambaAccount.inc:398
+#: plugins/personal/samba/class_sambaAccount.inc:416
+#: plugins/personal/generic/class_user.inc:245
 msgid "April"
 msgstr "Abril"
 
-#: plugins/personal/posix/class_posixAccount.inc:471
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
-#: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/generic/class_user.inc:246
 msgid "May"
 msgstr "Mayo"
 
-#: plugins/personal/posix/class_posixAccount.inc:471
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
-#: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/generic/class_user.inc:246
 msgid "June"
 msgstr "Junio"
 
-#: plugins/personal/posix/class_posixAccount.inc:471
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
-#: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/generic/class_user.inc:246
 msgid "July"
 msgstr "Julio"
 
-#: plugins/personal/posix/class_posixAccount.inc:471
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
-#: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/faxreports/class_faxreport.inc:77
-#: plugins/gofon/fonreports/class_fonreport.inc:72
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/generic/class_user.inc:246
 msgid "August"
 msgstr "Agosto"
 
-#: plugins/personal/posix/class_posixAccount.inc:471
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
-#: plugins/personal/generic/class_user.inc:241
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
+#: plugins/personal/posix/class_posixAccount.inc:496
+#: plugins/personal/samba/class_sambaAccount.inc:363
+#: plugins/personal/samba/class_sambaAccount.inc:381
+#: plugins/personal/samba/class_sambaAccount.inc:399
+#: plugins/personal/samba/class_sambaAccount.inc:417
+#: plugins/personal/generic/class_user.inc:246
 msgid "September"
 msgstr "Septiembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:472
-#: 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/generic/class_user.inc:242
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/generic/class_user.inc:247
 msgid "October"
 msgstr "Octubre"
 
-#: plugins/personal/posix/class_posixAccount.inc:472
-#: 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/generic/class_user.inc:242
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/generic/class_user.inc:247
 msgid "November"
 msgstr "Noviembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:472
-#: 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/generic/class_user.inc:242
-#: plugins/gofax/faxreports/class_faxreport.inc:78
-#: plugins/gofon/fonreports/class_fonreport.inc:73
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:364
+#: plugins/personal/samba/class_sambaAccount.inc:382
+#: plugins/personal/samba/class_sambaAccount.inc:400
+#: plugins/personal/samba/class_sambaAccount.inc:418
+#: plugins/personal/generic/class_user.inc:247
 msgid "December"
 msgstr "Diciembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:554
-#: plugins/personal/samba/class_sambaAccount.inc:453
-#: plugins/admin/systems/class_terminalGeneric.inc:60
-#: ihtml/themes/altlinux/setup_step4.tpl:91
+#: plugins/personal/posix/class_posixAccount.inc:577
+#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/admin/systems/class_terminalGeneric.inc:97
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/personal/posix/class_posixAccount.inc:554
+#: plugins/personal/posix/class_posixAccount.inc:577
 msgid "full access"
 msgstr "Acceso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:555
+#: plugins/personal/posix/class_posixAccount.inc:578
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/personal/posix/class_posixAccount.inc:725
+#: plugins/personal/posix/class_posixAccount.inc:624
+#, fuzzy, php-format
+msgid "Removing of user/posix account with dn '%s' failed."
+msgstr "Se ha fallado al eliminar la cuenta del proxy"
+
+#: plugins/personal/posix/class_posixAccount.inc:772
 msgid "Failed: overriding lock"
 msgstr "Fallo: Sobrepasado bloqueo"
 
-#: plugins/personal/posix/class_posixAccount.inc:884
+#: plugins/personal/posix/class_posixAccount.inc:861
+#, fuzzy, php-format
+msgid "Saving of user/posix account with dn '%s' failed."
+msgstr "Ha fallado la grabación de la cuenta proxy"
+
+#: plugins/personal/posix/class_posixAccount.inc:922
 msgid "The required field 'Home directory' is not set."
 msgstr "El campo requerido 'Directorio de usuario' no esta rellenado."
 
-#: plugins/personal/posix/class_posixAccount.inc:887
+#: plugins/personal/posix/class_posixAccount.inc:925
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 "Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
 
-#: plugins/personal/posix/class_posixAccount.inc:895
+#: plugins/personal/posix/class_posixAccount.inc:933
 msgid "Value specified as 'UID' is not valid."
 msgstr "El valor especificado en 'UID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:898
+#: plugins/personal/posix/class_posixAccount.inc:936
 msgid "Value specified as 'UID' is too small."
 msgstr "El valor especificado como 'UID' es demasiado pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:902
-#: plugins/admin/groups/class_groupGeneric.inc:658
+#: plugins/personal/posix/class_posixAccount.inc:940
+#: plugins/admin/groups/class_groupGeneric.inc:774
 msgid "Value specified as 'GID' is not valid."
 msgstr "El valor especificado como 'GID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:905
-#: plugins/admin/groups/class_groupGeneric.inc:661
+#: plugins/personal/posix/class_posixAccount.inc:943
+#: plugins/admin/groups/class_groupGeneric.inc:777
 msgid "Value specified as 'GID' is too small."
 msgstr "El valor especificado como 'GID' es muy pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:913
+#: plugins/personal/posix/class_posixAccount.inc:951
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "El valor especificado en 'shadowMin' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:918
+#: plugins/personal/posix/class_posixAccount.inc:956
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "El valor especificado en 'shadowMax' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:923
+#: plugins/personal/posix/class_posixAccount.inc:961
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "El valor especificado en 'shadowWarning' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:926
+#: plugins/personal/posix/class_posixAccount.inc:964
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:929
+#: plugins/personal/posix/class_posixAccount.inc:967
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "El valor especificado como 'shadowWarning' debería ser menor que 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:932
+#: plugins/personal/posix/class_posixAccount.inc:970
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "El valor especificado como 'shadowWarning' debería ser mayor que 'shadowMin'."
 
-#: plugins/personal/posix/class_posixAccount.inc:937
+#: plugins/personal/posix/class_posixAccount.inc:975
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "El valor especificado en 'shadowInactive' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:940
+#: plugins/personal/posix/class_posixAccount.inc:978
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "'shadowInactive' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:945
+#: plugins/personal/posix/class_posixAccount.inc:983
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 "El valor especificado como 'shadowMin' debería ser menor que 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:1072
-#: plugins/admin/groups/class_groupGeneric.inc:697
+#: plugins/personal/posix/class_posixAccount.inc:1110
+#: plugins/admin/groups/class_groupGeneric.inc:813
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
+#: plugins/personal/posix/class_posixAccount.inc:1249
+#, fuzzy
+msgid "POSIX account"
+msgstr "Cuenta GLPI"
+
+#: plugins/personal/posix/class_posixAccount.inc:1261
+#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
+#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
+#: html/getxls.php:299
+msgid "User ID"
+msgstr "Identificador (ID) de usuario"
+
+#: plugins/personal/posix/class_posixAccount.inc:1262
+#, fuzzy
+msgid "Group ID"
+msgstr "Grupo"
+
+#: plugins/personal/posix/class_posixAccount.inc:1264
+#, fuzzy
+msgid "Force password change on login"
+msgstr "No se permite cambiar contraseña"
+
+#: plugins/personal/posix/class_posixAccount.inc:1265
+#, fuzzy
+msgid "Shadow min"
+msgstr "Ocultamiento"
+
+#: plugins/personal/posix/class_posixAccount.inc:1266
+#, fuzzy
+msgid "Shadow max"
+msgstr "Ocultamiento"
+
+#: plugins/personal/posix/class_posixAccount.inc:1267
+#, fuzzy
+msgid "Shadow warning"
+msgstr "Ocultamiento"
+
+#: plugins/personal/posix/class_posixAccount.inc:1268
+#, fuzzy
+msgid "Shadow inactive"
+msgstr "Ocultamiento"
+
+#: plugins/personal/posix/class_posixAccount.inc:1269
+#, fuzzy
+msgid "Shadow expire"
+msgstr "Mostrar personal"
+
+#: plugins/personal/posix/class_posixAccount.inc:1270
+#, fuzzy
+msgid "System trust model"
+msgstr "Autenticación del sistema"
+
+#: plugins/personal/posix/paste_generic.tpl:4
+msgid "Posix settings"
+msgstr "Parámetros Posix"
+
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr "Directorio Samba"
 
-#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
+#: plugins/personal/samba/samba2.tpl:37 plugins/personal/samba/samba3.tpl:44
 msgid "Script path"
 msgstr "Ruta del Script"
 
-#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
-#: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:639
+#: plugins/personal/samba/samba2.tpl:45 plugins/personal/samba/samba3.tpl:52
+#: plugins/personal/samba/samba3.tpl:111
+#: plugins/personal/samba/class_sambaAccount.inc:622
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
-#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:252
+#: plugins/personal/samba/samba2.tpl:59 plugins/personal/samba/samba3.tpl:288
 msgid "Access options"
 msgstr "Opciones de acceso"
 
-#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:258
+#: plugins/personal/samba/samba2.tpl:67 plugins/personal/samba/samba3.tpl:296
 msgid "Allow user to change password from client"
 msgstr "Permitir al usuario cambiar las opciones desde el cliente"
 
-#: plugins/personal/samba/samba2.tpl:57 plugins/personal/samba/samba3.tpl:261
+#: plugins/personal/samba/samba2.tpl:72 plugins/personal/samba/samba3.tpl:301
+#: plugins/personal/samba/class_sambaAccount.inc:1030
 msgid "Login from windows client requires no password"
 msgstr "El inicio de sesión en window no requiere contraseña"
 
-#: plugins/personal/samba/samba2.tpl:60
+#: plugins/personal/samba/samba2.tpl:77
 msgid "Temporary disable samba account"
 msgstr "Desactivar temporalmente la cuenta samba"
 
-#: plugins/personal/samba/samba3.tpl:23
+#: plugins/personal/samba/samba3.tpl:27
+#: plugins/personal/samba/class_sambaAccount.inc:1044
 msgid "Domain"
 msgstr "Dominio"
 
-#: plugins/personal/samba/samba3.tpl:56
+#: plugins/personal/samba/samba3.tpl:66
 msgid "Terminal Server"
 msgstr "Servidor de terminal"
 
-#: plugins/personal/samba/samba3.tpl:91
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:1026
 msgid "Allow login on terminal server"
 msgstr "Permitir entrada en el servidor de terminal"
 
-#: plugins/personal/samba/samba3.tpl:118
+#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/class_sambaAccount.inc:1027
 msgid "Inherit client config"
 msgstr "Configuración del cliente por defecto"
 
-#: plugins/personal/samba/samba3.tpl:121
+#: plugins/personal/samba/samba3.tpl:134
 msgid "Initial program"
 msgstr "Programa inicial"
 
-#: plugins/personal/samba/samba3.tpl:131
+#: plugins/personal/samba/samba3.tpl:142
 msgid "Working directory"
 msgstr "Directorio de trabajo"
 
-#: plugins/personal/samba/samba3.tpl:153
+#: plugins/personal/samba/samba3.tpl:159
 msgid "Timeout settings (in minutes)"
 msgstr "Características de tiempo de desconexión (en minutos)"
 
-#: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:646
+#: plugins/personal/samba/samba3.tpl:169
+#: plugins/personal/samba/class_sambaAccount.inc:629
 msgid "Connection"
 msgstr "Conexión"
 
-#: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:647
+#: plugins/personal/samba/samba3.tpl:183
+#: plugins/personal/samba/class_sambaAccount.inc:630
 msgid "Disconnection"
 msgstr "Desconexión"
 
-#: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:648
+#: plugins/personal/samba/samba3.tpl:197
+#: plugins/personal/samba/class_sambaAccount.inc:631
 msgid "IDLE"
 msgstr "IDLE"
 
-#: plugins/personal/samba/samba3.tpl:189
+#: plugins/personal/samba/samba3.tpl:213
 msgid "Client devices"
 msgstr "Dispositivos clientes"
 
-#: plugins/personal/samba/samba3.tpl:194
+#: plugins/personal/samba/samba3.tpl:220
 msgid "Connect client drives at logon"
 msgstr "Conectar los discos clientes al iniciar"
 
-#: plugins/personal/samba/samba3.tpl:200
+#: plugins/personal/samba/samba3.tpl:228
 msgid "Connect client printers at logon"
 msgstr "Conectar las impresoras clientes al iniciar"
 
-#: plugins/personal/samba/samba3.tpl:206
+#: plugins/personal/samba/samba3.tpl:236
 msgid "Default to main client printer"
 msgstr "Por defecto a la impresora principal del cliente"
 
-#: plugins/personal/samba/samba3.tpl:216
-#: plugins/personal/connectivity/pureftpd.tpl:68
+#: plugins/personal/samba/samba3.tpl:246
+#: plugins/personal/connectivity/pureftpd.tpl:93
 msgid "Miscellaneous"
 msgstr "Varios"
 
-#: plugins/personal/samba/samba3.tpl:220
+#: plugins/personal/samba/samba3.tpl:250
 msgid "Shadowing"
 msgstr "Ocultamiento"
 
-#: plugins/personal/samba/samba3.tpl:229
+#: plugins/personal/samba/samba3.tpl:261
 msgid "On broken or timed out"
-msgstr "Desconexion"
+msgstr "Desconexión o tiempo excedido"
 
-#: plugins/personal/samba/samba3.tpl:237
+#: plugins/personal/samba/samba3.tpl:271
 msgid "Reconnect if disconnected"
 msgstr "Reconexión si se ha desconectado"
 
-#: plugins/personal/samba/samba3.tpl:264
+#: plugins/personal/samba/samba3.tpl:306
+#: plugins/personal/samba/class_sambaAccount.inc:1031
 msgid "Lock samba account"
 msgstr "Bloquear cuenta samba"
 
-#: plugins/personal/samba/samba3.tpl:279
+#: plugins/personal/samba/samba3.tpl:331
+#: plugins/personal/samba/class_sambaAccount.inc:1037
 msgid "Limit Logon Time"
 msgstr "Tiempo de entrada límite"
 
-#: plugins/personal/samba/samba3.tpl:291
+#: plugins/personal/samba/samba3.tpl:351
+#: plugins/personal/samba/class_sambaAccount.inc:1038
 msgid "Limit Logoff Time"
 msgstr "Tiempo de salida límite"
 
-#: plugins/personal/samba/samba3.tpl:304
+#: plugins/personal/samba/samba3.tpl:372
 msgid "Account expires after"
 msgstr "La cuenta expirará después de"
 
-#: plugins/personal/samba/samba3.tpl:324
+#: plugins/personal/samba/samba3.tpl:398
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
 #: plugins/personal/samba/main.inc:123
+#: plugins/personal/samba/class_sambaAccount.inc:1017
 msgid "Samba settings"
 msgstr "Parametros de samba"
 
@@ -1588,15 +1910,15 @@ msgstr "Selecciones estaciones de trabajo para añadir"
 msgid "Display workstations of department"
 msgstr "Mostrar estaciones de trabajo de departamentos"
 
-#: plugins/personal/samba/class_sambaAccount.inc:196
+#: plugins/personal/samba/class_sambaAccount.inc:198
 msgid "This account has no samba extensions."
 msgstr "Esta cuenta no tiene extensión samba valida."
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaAccount.inc:207
 msgid "Remove samba account"
 msgstr "Eliminar cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:206
+#: plugins/personal/samba/class_sambaAccount.inc:208
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1604,12 +1926,12 @@ msgstr ""
 "Esta cuenta tiene la extensión samba activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:216
-#: plugins/personal/samba/class_sambaAccount.inc:219
+#: plugins/personal/samba/class_sambaAccount.inc:218
+#: plugins/personal/samba/class_sambaAccount.inc:221
 msgid "Create samba account"
 msgstr "Crear cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:217
+#: plugins/personal/samba/class_sambaAccount.inc:219
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -1617,7 +1939,7 @@ msgstr ""
 "Esta cuenta tiene la extensión samba desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:220
+#: plugins/personal/samba/class_sambaAccount.inc:222
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1626,44 +1948,49 @@ msgstr ""
 "características Posix son necesarias para las cuentas samba, activelas "
 "primero."
 
-#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "input on, notify on"
 msgstr "Activación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/personal/samba/class_sambaAccount.inc:461
 msgid "input on, notify off"
 msgstr "Activación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "input off, notify on"
 msgstr "Desactivación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:463
 msgid "input off, nofify off"
 msgstr "Desactivación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:465
 msgid "disconnect"
 msgstr "desconectar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:460
+#: plugins/personal/samba/class_sambaAccount.inc:466
 msgid "reset"
 msgstr "Borrar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:468
 msgid "from any client"
 msgstr "Desde cualquier cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:469
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:641
+#: plugins/personal/samba/class_sambaAccount.inc:605
+#, fuzzy, php-format
+msgid "Removing of user/samba account with dn '%s' failed."
+msgstr "Ha fallado al eliminar la cuenta samba"
+
+#: plugins/personal/samba/class_sambaAccount.inc:624
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "¡El valor especificado como '%s' contiene caracteres no validos!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:651
+#: plugins/personal/samba/class_sambaAccount.inc:634
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1671,7 +1998,7 @@ msgstr ""
 "¡La propiedad 'tiempo de desconexión' '%s' esta activada y contiene "
 "caracteres no validos o no caracteres!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:657
+#: plugins/personal/samba/class_sambaAccount.inc:640
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1679,7 +2006,7 @@ msgstr ""
 "El gestor de usuarios de windows solo permite ocho clientes. Ha especificado "
 "mas de ocho."
 
-#: plugins/personal/samba/class_sambaAccount.inc:841
+#: plugins/personal/samba/class_sambaAccount.inc:824
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1687,7 +2014,7 @@ msgstr ""
 "Aviso: Esta cuenta tiene asignado un SID indefinido. ¡El problema no puede "
 "ser solucionado por GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:865
+#: plugins/personal/samba/class_sambaAccount.inc:848
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1695,86 +2022,144 @@ msgstr ""
 "Aviso: No puedo identificar el grupo primario de usuarios - ¡No se puede "
 "realizar una conversión a grupo de samba!"
 
-#: plugins/personal/generic/class_user.inc:251
+#: plugins/personal/samba/class_sambaAccount.inc:952
+#, fuzzy, php-format
+msgid "Saving of user/samba account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de Kolab"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1029
+#, fuzzy
+msgid "Allow user to change password"
+msgstr "Permitir al usuario cambiar las opciones desde el cliente"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1034
+#, fuzzy
+msgid "Account expires"
+msgstr "La cuenta expirará después de"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1035
+#, fuzzy
+msgid "Password expires"
+msgstr "La contraseña expira en"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1040
+#, fuzzy
+msgid "Generic home directory"
+msgstr "Directorio Principal"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1041
+msgid "Generic samba home drive"
+msgstr ""
+
+#: plugins/personal/samba/class_sambaAccount.inc:1042
+#, fuzzy
+msgid "Generic script path"
+msgstr "Ruta del Script"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1043
+#, fuzzy
+msgid "Generic profile path"
+msgstr "Ruta del Perfil"
+
+#: plugins/personal/samba/class_sambaAccount.inc:1045
+#, fuzzy
+msgid "Allow connection from"
+msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
+
+#: plugins/personal/generic/class_user.inc:256
 msgid "female"
 msgstr "mujer"
 
-#: plugins/personal/generic/class_user.inc:251
+#: plugins/personal/generic/class_user.inc:256
 msgid "male"
 msgstr "hombre"
 
-#: plugins/personal/generic/class_user.inc:265
+#: 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:294
+#: plugins/personal/generic/class_user.inc:330
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 "¡El archivo especificado no ha podido ser subido vía HTTP POST! Abortado."
 
-#: plugins/personal/generic/class_user.inc:390
+#: plugins/personal/generic/class_user.inc:428
 msgid "Please enter a valid serial number"
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:468
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:468
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:427
+#: plugins/personal/generic/class_user.inc:468
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:431
-#, fuzzy
+#: plugins/personal/generic/class_user.inc:472
 msgid "No certificate installed"
-msgstr "Editar certificados"
+msgstr "No hay certificados instalados"
+
+#: plugins/personal/generic/class_user.inc:563
+#, fuzzy, php-format
+msgid "Removing of user/generic account with dn '%s' failed."
+msgstr "Eliminar cuenta Posix"
+
+#: plugins/personal/generic/class_user.inc:631
+#, fuzzy, php-format
+msgid "You are not allowed to move this object to '%s'."
+msgstr "¡No tiene permisos para eliminar este objeto grupo!"
+
+#: plugins/personal/generic/class_user.inc:874
+#, fuzzy, php-format
+msgid "Saving of user/generic account with dn '%s' failed."
+msgstr "Cuenta proxy"
 
-#: plugins/personal/generic/class_user.inc:840
+#: plugins/personal/generic/class_user.inc:921
 msgid "Kerberos database communication failed"
 msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/class_user.inc:857
+#: plugins/personal/generic/class_user.inc:938
 msgid "Can't remove user from kerberos database."
 msgstr "No se puede eliminar el usuario de la base de datos Kerberos"
 
-#: plugins/personal/generic/class_user.inc:868
+#: plugins/personal/generic/class_user.inc:949
 msgid "Can't add user to kerberos database."
 msgstr "No se puede añadir el usuario de la base de datos Kerberos"
 
-#: plugins/personal/generic/class_user.inc:908
+#: plugins/personal/generic/class_user.inc:990
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr "No tiene permisos para crear un usuario en esta 'Base'."
 
-#: plugins/personal/generic/class_user.inc:913
+#: plugins/personal/generic/class_user.inc:993
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "No tiene permisos para transladar a un usuario de su base original"
 
-#: plugins/personal/generic/class_user.inc:919
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:547
+#: plugins/personal/generic/class_user.inc:999
+#: plugins/addons/addressbook/class_addressbook.inc:546
+#: plugins/admin/users/class_userManagement.inc:520
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:928
+#: plugins/personal/generic/class_user.inc:1008
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
-#: plugins/personal/generic/class_user.inc:934
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:550
+#: plugins/personal/generic/class_user.inc:1014
+#: plugins/addons/addressbook/class_addressbook.inc:550
+#: plugins/admin/users/class_userManagement.inc:523
 msgid "The required field 'Given name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:937
+#: plugins/personal/generic/class_user.inc:1017
 msgid "The required field 'Login' is not set."
 msgstr " El campo requerido 'Login' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:944
+#: plugins/personal/generic/class_user.inc:1024
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -1782,7 +2167,7 @@ msgstr ""
 "Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
 "base de datos."
 
-#: plugins/personal/generic/class_user.inc:951
+#: plugins/personal/generic/class_user.inc:1031
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -1790,312 +2175,490 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/personal/generic/class_user.inc:954
+#: plugins/personal/generic/class_user.inc:1034
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "El campo 'Pagina web principal' contiene un URL no valida"
 
-#: plugins/personal/generic/class_user.inc:957
-#: plugins/personal/generic/class_user.inc:985
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:176
+#: plugins/personal/generic/class_user.inc:1037
+#: plugins/personal/generic/class_user.inc:1062
+#: plugins/addons/addressbook/class_addressbook.inc:556
+#: plugins/addons/addressbook/class_addressbook.inc:584
+#: plugins/admin/departments/class_departmentGeneric.inc:246
 msgid "The field 'Name' contains invalid characters."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/personal/generic/class_user.inc:960
-#: plugins/personal/generic/class_user.inc:982
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
+#: plugins/personal/generic/class_user.inc:1040
+#: plugins/personal/generic/class_user.inc:1059
+#: plugins/addons/addressbook/class_addressbook.inc:559
+#: plugins/addons/addressbook/class_addressbook.inc:581
 msgid "The field 'Given name' contains invalid characters."
 msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
 
-#: plugins/personal/generic/class_user.inc:965
-#: plugins/personal/generic/class_user.inc:968
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:179
+#: plugins/personal/generic/class_user.inc:1045
+#: plugins/addons/addressbook/class_addressbook.inc:564
+#: plugins/addons/addressbook/class_addressbook.inc:567
+#: plugins/admin/departments/class_departmentGeneric.inc:249
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "El campo 'Teléfono' contiene un número de teléfono no valido."
 
-#: plugins/personal/generic/class_user.inc:971
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:182
+#: plugins/personal/generic/class_user.inc:1048
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/departments/class_departmentGeneric.inc:252
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "El campo 'Fax' contiene un número de teléfono no valido."
 
-#: plugins/personal/generic/class_user.inc:974
-#: plugins/addons/addressbook/class_addressbook.inc:572
+#: plugins/personal/generic/class_user.inc:1051
+#: plugins/addons/addressbook/class_addressbook.inc:573
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "El campo 'Teléfono móvil' contiene un número de teléfono invalido."
 
-#: plugins/personal/generic/class_user.inc:977
-#: plugins/addons/addressbook/class_addressbook.inc:575
+#: plugins/personal/generic/class_user.inc:1054
+#: plugins/addons/addressbook/class_addressbook.inc:576
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
-"El campo 'Dispositivo de Busqueda' contiene un número de teléfono invalido."
+"El campo 'Dispositivo de Búsqueda' contiene un número de teléfono invalido."
 
-#: plugins/personal/generic/class_user.inc:1104
-#, fuzzy
+#: plugins/personal/generic/class_user.inc:1184
 msgid "Could not open specified certificate!"
-msgstr "No puedo seleccionar la base de datos."
+msgstr "¡No puedo abrir el certificado especificado!"
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Información personal"
+#: plugins/personal/generic/class_user.inc:1330
+#: plugins/personal/generic/generic.tpl:442
+msgid "Unit"
+msgstr "Unidad"
 
-#: plugins/personal/generic/generic.tpl:15
-#: plugins/personal/generic/generic_picture.tpl:6
-msgid "Personal picture"
-msgstr "Foto Personal"
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/generic.tpl:467
+msgid "House identifier"
+msgstr "Tipo de Vía"
 
-#: plugins/personal/generic/generic.tpl:17
-msgid "Change picture"
-msgstr "Cambiar foto"
+#: plugins/personal/generic/class_user.inc:1332
+#: plugins/personal/generic/generic.tpl:384
+msgid "Vocation"
+msgstr "Intereses"
 
-#: plugins/personal/generic/generic.tpl:25
-#: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/admin/users/template.tpl:23
-#, fuzzy
-msgid "Last name"
-msgstr "Nombre de la lista"
+#: plugins/personal/generic/class_user.inc:1333
+#: plugins/personal/generic/generic.tpl:511
+msgid "Last delivery"
+msgstr "Último envío"
 
-#: plugins/personal/generic/generic.tpl:30
-#, fuzzy
-msgid "Template name"
-msgstr "Plantilla"
+#: plugins/personal/generic/class_user.inc:1334
+#: plugins/personal/generic/generic.tpl:433
+msgid "Person locality"
+msgstr "Población de la Persona"
 
-#: plugins/personal/generic/generic.tpl:37
-#: plugins/addons/addressbook/address_edit.tpl:30
-#: plugins/admin/users/template.tpl:19
-#, fuzzy
-msgid "First name"
-msgstr "Nombre de la lista"
+#: plugins/personal/generic/class_user.inc:1335
+#: plugins/personal/generic/generic.tpl:392
+msgid "Unit description"
+msgstr "Descripción de la unidad"
 
-#: plugins/personal/generic/generic.tpl:41 plugins/admin/users/template.tpl:28
-msgid "Login"
-msgstr "Inicio"
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/generic.tpl:401
+msgid "Subject area"
+msgstr "Adjunto al area"
 
-#: plugins/personal/generic/generic.tpl:49
+#: plugins/personal/generic/class_user.inc:1337
+#: plugins/personal/generic/generic.tpl:410
+msgid "Functional title"
+msgstr "Título Funcional"
+
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/generic.tpl:520
+msgid "Public visible"
+msgstr "Visible Publicamente"
+
+#: plugins/personal/generic/class_user.inc:1340
+#: plugins/personal/generic/generic.tpl:451
+msgid "Street"
+msgstr "Calle"
+
+#: plugins/personal/generic/class_user.inc:1341
+#: plugins/personal/generic/generic.tpl:419
+msgid "Role"
+msgstr "Papel desempeñado"
+
+#: plugins/personal/generic/class_user.inc:1342
+#: plugins/personal/generic/generic.tpl:459
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
+msgid "Postal code"
+msgstr "Código Postal"
+
+#: plugins/personal/generic/class_user.inc:1346
+#, fuzzy
+msgid "Generic user settings"
+msgstr "Parámetros genéricos de la cola"
+
+#: plugins/personal/generic/class_user.inc:1351
+#: plugins/addons/notifications/class_msgplug.inc:35
+#: plugins/admin/users/class_userManagement.inc:28
+#: plugins/admin/systems/printer.tpl:71
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: include/class_acl.inc:164 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
+msgid "Users"
+msgstr "Usuarios"
+
+#: plugins/personal/generic/class_user.inc:1355
+#: plugins/personal/generic/generic.tpl:143
+#: plugins/gofax/blocklists/generic.tpl:14
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:578
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:95
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/groups/class_groupGeneric.inc:872
+#: plugins/admin/groups/generic.tpl:21
+#: plugins/admin/groups/class_divListGroup.inc:108
+#: plugins/admin/users/class_divListUsers.inc:115
+#: plugins/admin/applications/generic.tpl:32
+#: plugins/admin/applications/class_divListApplication.inc:112
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_divListDepartment.inc:76
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/terminal.tpl:17 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/class_terminalGeneric.inc:501
+#: plugins/admin/systems/class_servGeneric.inc:327
+#: plugins/admin/systems/wingeneric.tpl:13
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/class_divListSystem.inc:114
+#: plugins/admin/systems/goLdapServer.tpl:2
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/admin/ogroups/class_divListOGroup.inc:118
+#: plugins/admin/acl/class_divListACL.inc:92
+#: plugins/admin/fai/class_divListFai.inc:155
+#: plugins/admin/mimetypes/generic.tpl:38
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:664
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:121
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/macro/class_gofonMacro.inc:474
+#: plugins/gofon/macro/class_divListMacros.inc:92
+#: plugins/gofon/conference/generic.tpl:33
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:531
+#: plugins/gofon/conference/class_divListConferences.inc:93
+msgid "Base"
+msgstr "Base"
+
+#: plugins/personal/generic/class_user.inc:1356
+#, fuzzy
+msgid "User password"
+msgstr "Borrar contraseña"
+
+#: plugins/personal/generic/class_user.inc:1357 html/getxls.php:236
+#, fuzzy
+msgid "Surename"
+msgstr "Nombre del servidor"
+
+#: plugins/personal/generic/class_user.inc:1358
+#: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
+#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
+msgid "Given name"
+msgstr "Nombre"
+
+#: plugins/personal/generic/class_user.inc:1359
+#, fuzzy
+msgid "User identification"
+msgstr "Información de Usuario"
+
+#: plugins/personal/generic/class_user.inc:1360
+#: plugins/personal/generic/generic.tpl:73
 #: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Título Personal"
 
-#: plugins/personal/generic/generic.tpl:57
+#: plugins/personal/generic/class_user.inc:1361
+#: plugins/personal/generic/generic.tpl:83
 msgid "Academic title"
 msgstr "Títulos academicos"
 
-#: plugins/personal/generic/generic.tpl:65
+#: plugins/personal/generic/class_user.inc:1362 html/getxls.php:174
+msgid "Home postal address"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:1363
+#, fuzzy
+msgid "Home phone number"
+msgstr "Número de teléfono"
+
+#: plugins/personal/generic/class_user.inc:1364
+#: plugins/personal/generic/generic.tpl:183
+msgid "Homepage"
+msgstr "Página Web Principal"
+
+#: plugins/personal/generic/class_user.inc:1365
+#: plugins/personal/generic/generic.tpl:250 html/getxls.php:236
+msgid "Organization"
+msgstr "Organización"
+
+#: plugins/personal/generic/class_user.inc:1366
+#: plugins/personal/generic/generic.tpl:258
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
+#: plugins/addons/addressbook/address_edit.tpl:138
+#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/applications/class_divListApplication.inc:51
+#: plugins/admin/ogroups/class_ogroupManagement.inc:385
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:55
+#: plugins/gofon/macro/class_divListMacros.inc:52
+#: plugins/generic/references/class_reference.inc:38
+msgid "Department"
+msgstr "Departamento"
+
+#: plugins/personal/generic/class_user.inc:1367
+#: plugins/personal/generic/generic.tpl:93
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: plugins/personal/generic/generic.tpl:82
-#: ihtml/themes/altlinux/sizelimit.tpl:14
+#: plugins/personal/generic/class_user.inc:1368
+#, fuzzy
+msgid "Gender"
+msgstr "Remitente"
+
+#: plugins/personal/generic/class_user.inc:1369
+#, fuzzy
+msgid "Preferred language"
+msgstr "Lenguaje preferido"
+
+#: plugins/personal/generic/class_user.inc:1370
+#, fuzzy
+msgid "Department number"
+msgstr "Nombre del departamento"
+
+#: plugins/personal/generic/class_user.inc:1371
+#, fuzzy
+msgid "Employee number"
+msgstr "Tipo de empleado"
+
+#: plugins/personal/generic/class_user.inc:1372
+#: plugins/personal/generic/generic.tpl:282
+msgid "Employee type"
+msgstr "Tipo de empleado"
+
+#: plugins/personal/generic/class_user.inc:1373
+#: plugins/personal/generic/generic.tpl:352
+#: plugins/addons/godfs/generic.tpl:34
+#: plugins/admin/departments/generic.tpl:47
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/class_departmentGeneric.inc:539
+#: plugins/admin/systems/workstation.tpl:17
+#: plugins/admin/systems/class_printGeneric.inc:801
+#: plugins/admin/systems/class_glpiAccount.inc:780
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:778 html/getxls.php:174
+msgid "Location"
+msgstr "Localización"
+
+#: plugins/personal/generic/class_user.inc:1374
+#: plugins/personal/generic/generic.tpl:360
+#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/class_departmentGeneric.inc:543
+#: html/getxls.php:174 html/getxls.php:236
+msgid "State"
+msgstr "Estado"
+
+#: plugins/personal/generic/class_user.inc:1375
+#: plugins/personal/generic/paste_generic.tpl:22
+msgid "User picture"
+msgstr "Foto del usuario"
+
+#: plugins/personal/generic/class_user.inc:1376
+#, fuzzy
+msgid "Room number"
+msgstr "Número de teléfono"
+
+#: plugins/personal/generic/class_user.inc:1377
+#, fuzzy
+msgid "Telefon number"
+msgstr "Número de teléfono"
+
+#: plugins/personal/generic/class_user.inc:1378
+#, fuzzy
+msgid "Mobile number"
+msgstr "Teléfono particular"
+
+#: plugins/personal/generic/class_user.inc:1379
+#: plugins/personal/nagios/class_nagiosAccount.inc:252
+#, fuzzy
+msgid "Pager number"
+msgstr "Número de teléfono"
+
+#: plugins/personal/generic/class_user.inc:1380
+#, fuzzy
+msgid "User certificates"
+msgstr "Certificado estandar"
+
+#: plugins/personal/generic/class_user.inc:1382 html/getxls.php:174
+#: html/getxls.php:236
+#, fuzzy
+msgid "Postal address"
+msgstr "Código Postal"
+
+#: plugins/personal/generic/class_user.inc:1383
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:826
+#, fuzzy
+msgid "Fax number"
+msgstr "Número de serie"
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr "Información personal"
+
+#: plugins/personal/generic/generic.tpl:20
+#: plugins/personal/generic/generic.tpl:22
+#: plugins/personal/generic/generic.tpl:38
+#: plugins/personal/generic/generic_picture.tpl:5
+#: plugins/personal/generic/generic_picture.tpl:15
+#: plugins/personal/generic/paste_generic.tpl:50
+msgid "Personal picture"
+msgstr "Foto Personal"
+
+#: plugins/personal/generic/generic.tpl:29
+#: plugins/personal/generic/generic.tpl:40
+msgid "Change picture"
+msgstr "Cambiar foto"
+
+#: plugins/personal/generic/generic.tpl:49
+#: plugins/personal/generic/paste_generic.tpl:7
+#: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/admin/users/template.tpl:23
+msgid "Last name"
+msgstr "Apellidos"
+
+#: plugins/personal/generic/generic.tpl:54
+msgid "Template name"
+msgstr "Nombre de la plantilla"
+
+#: plugins/personal/generic/generic.tpl:61
+#: plugins/personal/generic/paste_generic.tpl:11
+#: plugins/addons/addressbook/address_edit.tpl:30
+#: plugins/admin/users/template.tpl:27
+msgid "First name"
+msgstr "Nombre"
+
+#: plugins/personal/generic/generic.tpl:65
+#: plugins/personal/generic/paste_generic.tpl:15
+#: plugins/admin/users/template.tpl:32
+msgid "Login"
+msgstr "Inicio de sesión"
+
+#: plugins/personal/generic/generic.tpl:111
 #: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "por debajo"
 
-#: plugins/personal/generic/generic.tpl:88 html/getxls.php:65
+#: plugins/personal/generic/generic.tpl:118 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/generic.tpl:98
-#, fuzzy
+#: plugins/personal/generic/generic.tpl:130
 msgid "Preferred langage"
-msgstr "Lenguaje por defecto"
-
-#: plugins/personal/generic/generic.tpl:109
-#: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
-#: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:677
-#: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:332
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/class_systemManagement.inc:577
-#: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
-#: plugins/admin/ogroups/class_ogroupManagement.inc:366
-#: plugins/admin/fai/class_faiManagement.inc:664
-#: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
-msgid "Base"
-msgstr "Base"
+msgstr "Lenguaje preferido"
 
-#: plugins/personal/generic/generic.tpl:113
+#: plugins/personal/generic/generic.tpl:148
 msgid "Choose subtree to place user in"
 msgstr "Elija el subárbol donde colocar el usuario"
 
-#: plugins/personal/generic/generic.tpl:128
-#: plugins/personal/generic/generic.tpl:272
+#: plugins/personal/generic/generic.tpl:153
+#: plugins/gofax/blocklists/generic.tpl:21
+#: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
+#: plugins/admin/groups/generic.tpl:29
+#: plugins/admin/applications/generic.tpl:39
+#: plugins/admin/applications/generic.tpl:41
+#: plugins/admin/departments/generic.tpl:34
+#: plugins/admin/departments/generic.tpl:36
+#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/terminal.tpl:25
+#: plugins/admin/systems/server.tpl:21 plugins/admin/systems/server.tpl:23
+#: plugins/admin/systems/phone.tpl:19 plugins/admin/systems/phone.tpl:21
+#: plugins/admin/systems/printer.tpl:26 plugins/admin/systems/printer.tpl:28
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/workstation.tpl:31
+#: plugins/admin/systems/wingeneric.tpl:18
+#: plugins/admin/systems/component.tpl:19
+#: plugins/admin/systems/component.tpl:21 plugins/admin/ogroups/generic.tpl:27
+#: plugins/admin/ogroups/generic.tpl:29 plugins/admin/mimetypes/generic.tpl:45
+#: plugins/admin/mimetypes/generic.tpl:47 plugins/gofon/macro/generic.tpl:27
+#: plugins/gofon/macro/generic.tpl:29 plugins/gofon/conference/generic.tpl:39
+#: plugins/gofon/conference/generic.tpl:41
+msgid "Select a base"
+msgstr "Seleccione una base"
+
+#: plugins/personal/generic/generic.tpl:167
+#: plugins/personal/generic/generic.tpl:368
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
-#: plugins/admin/departments/generic.tpl:54
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:20 html/getxls.php:174
+#: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/class_departmentGeneric.inc:544
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/generic.tpl:132
+#: plugins/personal/generic/generic.tpl:175
 msgid "Private phone"
 msgstr "Numero privado"
 
-#: plugins/personal/generic/generic.tpl:136
-msgid "Homepage"
-msgstr "Página Web Principal"
-
-#: plugins/personal/generic/generic.tpl:145
+#: plugins/personal/generic/generic.tpl:196
 msgid "Password storage"
 msgstr "Carpeta de almacenamiento de Contraseñas"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:208
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificados"
 
-#: plugins/personal/generic/generic.tpl:157
+#: plugins/personal/generic/generic.tpl:211
 msgid "Edit certificates"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/generic.tpl:161
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/admin/systems/class_goKrbServer.inc:219
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:162
+#: plugins/personal/generic/generic.tpl:220
 msgid "Edit properties"
 msgstr "Editar propiedades"
 
-#: plugins/personal/generic/generic.tpl:178
+#: plugins/personal/generic/generic.tpl:238
 msgid "Organizational information"
 msgstr "Información organizativa"
 
-#: plugins/personal/generic/generic.tpl:190 html/getxls.php:236
-msgid "Organization"
-msgstr "Organización"
-
-#: plugins/personal/generic/generic.tpl:194
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/addons/addressbook/address_edit.tpl:138
-#: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:391
-#: plugins/admin/users/class_userManagement.inc:690
-#: plugins/admin/applications/class_applicationManagement.inc:357
-#: plugins/admin/systems/class_systemManagement.inc:587
-#: plugins/admin/ogroups/class_ogroupManagement.inc:416
-#: plugins/admin/ogroups/class_ogroupManagement.inc:484
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: plugins/generic/references/class_reference.inc:38
-msgid "Department"
-msgstr "Departamento"
-
-#: plugins/personal/generic/generic.tpl:198
+#: plugins/personal/generic/generic.tpl:266
 msgid "Department No."
 msgstr "Departamento No."
 
-#: plugins/personal/generic/generic.tpl:204
+#: plugins/personal/generic/generic.tpl:274
 msgid "Employee No."
 msgstr "Empleado No."
 
-#: plugins/personal/generic/generic.tpl:210
-msgid "Employee type"
-msgstr "Tipo de empleado"
-
-#: plugins/personal/generic/generic.tpl:226
-#: plugins/personal/generic/generic.tpl:365
+#: plugins/personal/generic/generic.tpl:300
+#: plugins/personal/generic/generic.tpl:482
 msgid "Room No."
 msgstr "Habitación No."
 
-#: plugins/personal/generic/generic.tpl:238
+#: plugins/personal/generic/generic.tpl:318
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Teléfono Móvil"
 
-#: plugins/personal/generic/generic.tpl:242
+#: plugins/personal/generic/generic.tpl:326
 #: plugins/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:217
 #: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Pager"
-msgstr "Dispositivo de aviso"
-
-#: plugins/personal/generic/generic.tpl:264
-#: plugins/admin/departments/generic.tpl:42
-#: plugins/admin/departments/generic.tpl:50
-#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
-msgid "Location"
-msgstr "Localización"
-
-#: plugins/personal/generic/generic.tpl:268
-#: plugins/admin/departments/generic.tpl:46 html/getxls.php:174
-#: html/getxls.php:236
-msgid "State"
-msgstr "Estado"
-
-#: plugins/personal/generic/generic.tpl:286
-msgid "Vocation"
-msgstr "Intereses"
-
-#: plugins/personal/generic/generic.tpl:290
-msgid "Unit description"
-msgstr "Descripción de la unidad"
-
-#: plugins/personal/generic/generic.tpl:298
-msgid "Subject area"
-msgstr "Adjunto al area"
-
-#: plugins/personal/generic/generic.tpl:306
-msgid "Functional title"
-msgstr "Título Funcional"
-
-#: plugins/personal/generic/generic.tpl:313
-msgid "Role"
-msgstr "Papel desempeñado"
-
-#: plugins/personal/generic/generic.tpl:325
-msgid "Person locality"
-msgstr "Población de la Persona"
-
-#: plugins/personal/generic/generic.tpl:333
-msgid "Unit"
-msgstr "Unidad"
-
-#: plugins/personal/generic/generic.tpl:340
-msgid "Street"
-msgstr "Calle"
-
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/addons/addressbook/address_edit.tpl:158
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
-msgid "Postal code"
-msgstr "Código Postal"
-
-#: plugins/personal/generic/generic.tpl:352
-msgid "House identifier"
-msgstr "Tipo de Vía"
+msgstr "Paginador"
 
-#: plugins/personal/generic/generic.tpl:374
+#: plugins/personal/generic/generic.tpl:496
 msgid "Please use the phone tab"
 msgstr "Por favor use la casilla teléfono"
 
-#: plugins/personal/generic/generic.tpl:387
-msgid "Last delivery"
-msgstr "Último envío"
-
-#: plugins/personal/generic/generic.tpl:394
-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. "
@@ -2106,26 +2669,50 @@ msgstr ""
 "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:23
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
 msgid "Remove picture"
 msgstr "Eliminar foto"
 
-#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/personal/generic/generic_picture.tpl:33
+#: plugins/personal/generic/generic_certs.tpl:91
+#: plugins/personal/environment/hotplugDialogNew.tpl:53
 #: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/systems/servnfs.tpl:75
+#: plugins/admin/departments/class_departmentManagement.inc:303
+#: plugins/admin/systems/servdns.tpl:21
+#: plugins/admin/systems/servkolab.tpl:203
+#: plugins/admin/systems/goNtpServer.tpl:22
+#: plugins/admin/systems/servnfs.tpl:120
+#: plugins/admin/systems/servRepository.tpl:64
+#: plugins/admin/systems/goFonServer.tpl:24
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/glpi_devices.tpl:733
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:79
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/servdnseditzone.tpl:119
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/systems/goKrbServer.tpl:19
+#: plugins/admin/systems/goLdapServer.tpl:7
+#: plugins/admin/systems/goShareServer.tpl:21
+#: plugins/admin/systems/goMailServer.tpl:167
+#: plugins/admin/systems/goImapServer.tpl:94
+#: plugins/admin/systems/goSyslogServer.tpl:6
+#: plugins/admin/systems/goGlpiServer.tpl:24
+#: plugins/admin/systems/goCupsServer.tpl:6
+#: plugins/admin/systems/goTerminalServer.tpl:17
+#: plugins/admin/systems/goFaxServer.tpl:16
+#: plugins/admin/systems/goLogDBServer.tpl:16
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: include/class_MultiSelectWindow.inc:78
+#: ihtml/themes/default/copyPasteDialog.tpl:14
 msgid "Save"
 msgstr "Guardar"
 
-#: plugins/personal/generic/main.inc:107
+#: plugins/personal/generic/main.inc:97
 msgid "You are not allowed to set your password!"
 msgstr "¡No tiene permisos para cambiar su contraseña!"
 
-#: plugins/personal/generic/main.inc:189
+#: plugins/personal/generic/main.inc:177
 msgid "Generic user information"
 msgstr "Información genérica del usuario"
 
@@ -2133,43 +2720,57 @@ msgstr "Información genérica del usuario"
 msgid "Standard certificate"
 msgstr "Certificado estandar"
 
-#: plugins/personal/generic/generic_certs.tpl:17
-#: plugins/personal/generic/generic_certs.tpl:37
-#: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:206
-#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/generic/generic_certs.tpl:21
+#: plugins/personal/generic/generic_certs.tpl:45
+#: plugins/personal/generic/generic_certs.tpl:69
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#: plugins/personal/environment/environment.tpl:152
 #: plugins/personal/environment/kioskManagement.tpl:15
-#: plugins/admin/groups/class_groupMail.inc:487
-#: plugins/admin/applications/class_applicationParameters.inc:98
-#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:9
+#: 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/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/workstationStartup.tpl:90
+#: plugins/admin/systems/workstationStartup.tpl:144
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/fai/faiPackage.tpl:62
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:248
-#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/goMailServer.tpl:57
+#: plugins/admin/systems/goMailServer.tpl:80
+#: plugins/admin/fai/faiPackage.tpl:72
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
 msgid "Remove"
 msgstr "Eliminar"
 
-#: plugins/personal/generic/generic_certs.tpl:28
+#: plugins/personal/generic/generic_certs.tpl:33
 msgid "S/MIME certificate"
 msgstr "Certificado S/MIME"
 
-#: plugins/personal/generic/generic_certs.tpl:48
+#: plugins/personal/generic/generic_certs.tpl:57
 msgid "PKCS12 certificate"
 msgstr "Certificado PKCS12"
 
-#: plugins/personal/generic/generic_certs.tpl:65
+#: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
+#: plugins/personal/generic/paste_generic.tpl:4
+msgid "User settings"
+msgstr "Parámetros 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/pureftpd.tpl:4
 msgid "FTP account"
 msgstr "Cuenta FTP"
 
 #: plugins/personal/connectivity/pureftpd.tpl:15
-#: plugins/admin/systems/glpi_devices.tpl:575
+#: plugins/admin/systems/glpi_devices.tpl:596
 msgid "Bandwidth"
 msgstr "Ancho de banda"
 
@@ -2177,64 +2778,66 @@ msgstr "Ancho de banda"
 msgid "Upload bandwidth"
 msgstr "Ancho de banda ascendente"
 
-#: plugins/personal/connectivity/pureftpd.tpl:20
 #: plugins/personal/connectivity/pureftpd.tpl:24
+#: plugins/personal/connectivity/pureftpd.tpl:32
 msgid "kb/s"
 msgstr "Kb/s"
 
-#: plugins/personal/connectivity/pureftpd.tpl:23
+#: plugins/personal/connectivity/pureftpd.tpl:27
 msgid "Download bandwidth"
 msgstr "Ancho de banda descendente"
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
+#: plugins/personal/connectivity/pureftpd.tpl:43
 msgid "Quota"
 msgstr "Cuota"
 
-#: plugins/personal/connectivity/pureftpd.tpl:39
+#: plugins/personal/connectivity/pureftpd.tpl:47
 msgid "Files"
 msgstr "Archivos"
 
-#: plugins/personal/connectivity/pureftpd.tpl:43
+#: plugins/personal/connectivity/pureftpd.tpl:55
 #: plugins/addons/mailqueue/contents.tpl:54
-#: plugins/admin/systems/glpi_devices.tpl:283
-#: plugins/admin/systems/glpi_devices.tpl:406
-#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:293
+#: plugins/admin/systems/glpi_devices.tpl:420
+#: plugins/admin/systems/glpi_devices.tpl:485
 msgid "Size"
 msgstr "Tamaño"
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
+#: plugins/personal/connectivity/pureftpd.tpl:71
 msgid "Ratio"
 msgstr "Relación"
 
-#: plugins/personal/connectivity/pureftpd.tpl:58
+#: plugins/personal/connectivity/pureftpd.tpl:75
 msgid "Uploaded / downloaded files"
 msgstr "Archivos Subidos / Descargados"
 
-#: plugins/personal/connectivity/pureftpd.tpl:71
+#: plugins/personal/connectivity/pureftpd.tpl:98
 msgid "Check to disable FTP Access"
 msgstr "Active para desactivar acceso FTP"
 
-#: plugins/personal/connectivity/pureftpd.tpl:71
+#: plugins/personal/connectivity/pureftpd.tpl:100
 msgid "Temporary disable FTP access"
 msgstr "Acceso FTP desactivado temporalmente"
 
-#: plugins/personal/connectivity/proxy.tpl:10
+#: plugins/personal/connectivity/proxy.tpl:17
+#: plugins/personal/connectivity/class_proxyAccount.inc:287
 msgid "Proxy account"
 msgstr "Cuenta proxy"
 
-#: plugins/personal/connectivity/proxy.tpl:18
+#: plugins/personal/connectivity/proxy.tpl:28
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr "Filtrar contenido indeseable (p.e. pornografía o contenido violento)"
 
-#: plugins/personal/connectivity/proxy.tpl:24
+#: plugins/personal/connectivity/proxy.tpl:38
 msgid "Limit proxy access to working time"
 msgstr "Limitar acceso al proxy al horario laboral"
 
-#: plugins/personal/connectivity/proxy.tpl:69
+#: plugins/personal/connectivity/proxy.tpl:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:300
 msgid "Restrict proxy usage by quota"
 msgstr "Restringir el uso del proxy con cuota"
 
-#: plugins/personal/connectivity/proxy.tpl:86
+#: plugins/personal/connectivity/proxy.tpl:93
 msgid "per"
 msgstr "por"
 
@@ -2242,11 +2845,31 @@ msgstr "por"
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#, fuzzy, php-format
+msgid "Removing of user/PHPgw account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de PHPgw"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:118
+#, fuzzy, php-format
+msgid "Saving of user/PHPgw account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de PHPgw"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:135
+msgid "PHP GW"
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:136
+#, fuzzy
+msgid "PHP GW account settings"
+msgstr "Parámetros de grupo"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Cuenta PHPGroupware"
 
-#: plugins/personal/connectivity/kolab.tpl:1
+#: plugins/personal/connectivity/kolab.tpl:3
+#: plugins/personal/connectivity/kolab.tpl:35
 msgid "Kolab account"
 msgstr "Cuenta Kolab"
 
@@ -2258,53 +2881,57 @@ msgstr ""
 "La cuenta kolab está actualmente desactivada. Sus características serán "
 "modificadas si añade una cuenta de correo."
 
-#: plugins/personal/connectivity/kolab.tpl:10
+#: plugins/personal/connectivity/kolab.tpl:41
+#: plugins/personal/connectivity/class_kolabAccount.inc:449
 msgid "Delegations"
 msgstr "Delegaciones"
 
-#: plugins/personal/connectivity/kolab.tpl:23
+#: plugins/personal/connectivity/kolab.tpl:59
 msgid "Mail size"
 msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/connectivity/kolab.tpl:24
+#: plugins/personal/connectivity/kolab.tpl:62
 msgid "No mail size restriction for this account"
 msgstr "No hay restricción de correo para esta cuenta."
 
-#: plugins/personal/connectivity/kolab.tpl:32
+#: plugins/personal/connectivity/kolab.tpl:71
 msgid "Free Busy information"
 msgstr "Información de estado de presencia"
 
-#: plugins/personal/connectivity/kolab.tpl:35
+#: plugins/personal/connectivity/kolab.tpl:74
 #: plugins/admin/systems/servRepositorySetup.tpl:24
 msgid "URL"
 msgstr "URL"
 
-#: plugins/personal/connectivity/kolab.tpl:39
+#: plugins/personal/connectivity/kolab.tpl:82
 msgid "Future"
 msgstr "Futuro"
 
-#: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
+#: plugins/personal/connectivity/kolab.tpl:86
+#: plugins/personal/connectivity/oxchange.tpl:39
+#: plugins/personal/connectivity/oxchange.tpl:49
 msgid "days"
 msgstr "días"
 
-#: plugins/personal/connectivity/kolab.tpl:45
+#: plugins/personal/connectivity/kolab.tpl:93
+#: plugins/personal/connectivity/class_kolabAccount.inc:450
 msgid "Invitation policy"
 msgstr "Política de invitación"
 
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
+#: plugins/personal/connectivity/class_kolabAccount.inc:436
+#: plugins/admin/systems/class_servKolab.inc:413
 msgid "Kolab"
 msgstr "Kolab"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:105
+#: plugins/personal/connectivity/class_kolabAccount.inc:133
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "reenvíos."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:113
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
@@ -2312,113 +2939,216 @@ 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:166
 msgid "Always accept"
 msgstr "Aceptar siempre"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
+#: plugins/personal/connectivity/class_kolabAccount.inc:167
 msgid "Always reject"
 msgstr "Denegar siempre"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:142
+#: plugins/personal/connectivity/class_kolabAccount.inc:168
 msgid "Reject if conflicts"
 msgstr "Denegar si hay conflictos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:143
+#: plugins/personal/connectivity/class_kolabAccount.inc:169
 msgid "Manual if conflicts"
 msgstr "Preguntar si hay conflictos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:144
+#: plugins/personal/connectivity/class_kolabAccount.inc:170
 msgid "Manual"
 msgstr "Manual"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:180
+#: plugins/personal/connectivity/class_kolabAccount.inc:218
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:232
+#: plugins/personal/connectivity/class_kolabAccount.inc:279
+#, fuzzy, php-format
+msgid "Removing of user/kolab account with dn '%s' failed."
+msgstr "Ha fallado al eliminar la cuenta samba"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:290
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr "El valor especificado como presencia futura necesita ser un entero."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:237
+#: plugins/personal/connectivity/class_kolabAccount.inc:295
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "El valor especificado como Dirección URL de  no es válido"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:251
+#: plugins/personal/connectivity/class_kolabAccount.inc:309
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 "La entrada de la política de invitación para la dirección '%s' no es valida."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:259
+#: plugins/personal/connectivity/class_kolabAccount.inc:317
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 "¡No hay ningún usuario con cuenta de correo '%s' para su política de "
 "invitación!"
 
-#: plugins/personal/connectivity/class_webdavAccount.inc:6
-msgid "WebDAV"
-msgstr "WebDAV"
+#: plugins/personal/connectivity/class_kolabAccount.inc:401
+#, fuzzy, php-format
+msgid "Saving of user/kolab account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de Kolab"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:437
+#, fuzzy
+msgid "Kolab account settings"
+msgstr "Cuenta Kolab"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:446
+msgid "Free busy future"
+msgstr ""
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:447
+#, fuzzy
+msgid "Mail size restriction"
+msgstr "Parámetros de correo"
+
+#: plugins/personal/connectivity/class_kolabAccount.inc:448
+#, fuzzy
+msgid "Free busy information"
+msgstr "Información de estado de presencia"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:133
+msgid "WebDAV"
+msgstr "WebDAV"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#, fuzzy, php-format
+msgid "Removing of user/webDAV account with dn '%s' failed."
+msgstr "Ha fallado al eliminar la cuenta WebDAV"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:115
+#, fuzzy, php-format
+msgid "Saving of user/webDAV account with dn '%s' failed."
+msgstr "Ha fallado al guardar la cuenta WebDAV"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:134
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
 
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:6
 #: plugins/generic/references/class_reference.inc:34
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:135
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:99
+#, fuzzy, php-format
+msgid "Removing of user/pureftpd account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de pureftpd"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:142
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:145
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
-msgid "Value specified as 'Files' is not valid."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
+#, fuzzy
+msgid "Value specified as 'Quota files' is not valid."
 msgstr "El valor especificado como 'Archivos' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
-msgid "Value specified as 'Size' is not valid."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:152
+#, fuzzy
+msgid "Value specified as 'Quota size' is not valid."
 msgstr "El valor especificado como 'Tamaño' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "El valor especificado como 'relación' no es válido"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:155
+#, fuzzy
+msgid "Value specified as 'Upload ratio' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Cuenta WebDAV"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:158
+#, fuzzy
+msgid "Value specified as 'Download ratio' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:184
+#, fuzzy, php-format
+msgid "Saving of user/pureftpd account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de pureftpd"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:203
+#, fuzzy
+msgid "Ftp"
+msgstr "Tipo de FS"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:204
+#, fuzzy
+msgid "Pure ftp account"
+msgstr "Crear cuenta de fax"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:213
+#, fuzzy
+msgid "Quota files"
+msgstr "Tamaño de la Cola de correo"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:214
+#, fuzzy
+msgid "Upload ratio"
+msgstr "Enviar"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:215
+#, fuzzy
+msgid "Quota MBytes"
+msgstr "Tamaño de la Cola de correo"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:216
+#, fuzzy
+msgid "Download ratio"
+msgstr "Descargar configuración"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:217
+#, fuzzy
+msgid "Upload bandwith"
+msgstr "Ancho de banda ascendente"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:218
+#, fuzzy
+msgid "Download bandwith"
+msgstr "Ancho de banda descendente"
 
 #: plugins/personal/connectivity/oxchange.tpl:2
 msgid "Open-Xchange Account"
 msgstr "Cuenta Open-Xchange"
 
 #: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
-msgstr "desactivado, No se ha detectado soporte Postgresql"
+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"
 
-#: plugins/personal/connectivity/oxchange.tpl:4
+#: plugins/personal/connectivity/oxchange.tpl:18
 msgid "Open-Xchange account"
 msgstr "Cuenta de Open-Xchange"
 
-#: plugins/personal/connectivity/oxchange.tpl:13
+#: plugins/personal/connectivity/oxchange.tpl:29
 msgid "Remember"
 msgstr "Recordar"
 
-#: plugins/personal/connectivity/oxchange.tpl:17
+#: plugins/personal/connectivity/oxchange.tpl:33
 msgid "Appointment Days"
 msgstr "Días de recordatorio"
 
-#: plugins/personal/connectivity/oxchange.tpl:21
+#: plugins/personal/connectivity/oxchange.tpl:42
 msgid "Task Days"
 msgstr "Días para tareas"
 
-#: plugins/personal/connectivity/oxchange.tpl:33
+#: plugins/personal/connectivity/oxchange.tpl:61
 msgid "User Information"
 msgstr "Información de Usuario"
 
-#: plugins/personal/connectivity/oxchange.tpl:37
+#: plugins/personal/connectivity/oxchange.tpl:65
 msgid "User Timezone"
 msgstr "Zona de uso horario del usuario"
 
@@ -2426,509 +3156,709 @@ msgstr "Zona de uso horario del usuario"
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:709
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:817
+msgid "Couldn't connect to postgresql database!"
+msgstr "No puedo conectar al servidor de base de datos postgresql."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:713
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:821
+msgid "Needed parameters for openexchange connectivity plugin are missing!"
+msgstr ""
+"¡Los parámetros necesarios para extensión de conectividad open-xchange no se "
+"encuentran!"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:717
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:825
+msgid "PHP4 module for postgresql database is missing!"
+msgstr "¡El módulo de PHP4 para la base de datos Postgresql no está instalado!"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
 #, fuzzy, php-format
+msgid "Removing of user/oxchange addressbook account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de open-xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
 msgid ""
-"This account has %s features disabled. Posix features are needed for "
-"openXchange accounts, enable them first."
+"The Open-Xchange accountname is empty and thus invalid! Check to make sure "
+"that "
 msgstr ""
-"Esta cuenta tiene sus características samba desactivadas, las "
-"características Posix son necesarias para las cuentas samba, activelas "
-"primero."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:805
+msgid "you are not using any strange characters in the loginname."
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:838
+#, fuzzy, php-format
+msgid "Saving of user/oxchange account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de open-xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:845
+#, fuzzy, php-format
+msgid "Creating of user/oxchange account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de open-xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:885
 #, fuzzy
-msgid "OpenXchange"
+msgid "Open xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
-#, fuzzy, php-format
-msgid ""
-"This account has %s features disabled. Mail features are needed for "
-"openXchange accounts, enable them first."
-msgstr ""
-"Esta cuenta tiene sus características samba desactivadas, las "
-"características Posix son necesarias para las cuentas samba, activelas "
-"primero."
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:886
+#, fuzzy
+msgid "Open xchange account settings"
+msgstr "Cuenta de Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:699
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:789
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:895
 #, fuzzy
-msgid "Couldn't connect to postgresql database!"
-msgstr "No puedo conectar al servidor de base de datos postgresql."
+msgid "OXAppointmentDays"
+msgstr "Días de recordatorio"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:703
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:793
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:896
 #, fuzzy
-msgid "Needed parameters for openexchange connectivity plugin are missing!"
-msgstr ""
-"¡Los parámetros necesarios para extensión de conectividad open-xchange no "
-"son validos!"
+msgid "OXTaskDays"
+msgstr "Días para tareas"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:707
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:797
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:897
 #, fuzzy
-msgid "PHP4 module for postgresql database is missing!"
-msgstr "¡El módulo de PHP4 para la base de datos Postgresql falla!"
+msgid "OXTimeZone"
+msgstr "Zona de uso horario del usuario"
 
 #: plugins/personal/connectivity/intranet.tpl:3
-#, fuzzy
 msgid "Intranet account"
-msgstr "Crear cuenta telefónica"
+msgstr "Crear cuenta de intranet"
 
-#: plugins/personal/connectivity/class_connectivity.inc:63
+#: 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/class_connectivity.inc:177
+#, fuzzy
+msgid "Connectivity settings"
+msgstr "Conectividad"
+
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
+#: plugins/personal/connectivity/class_proxyAccount.inc:286
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
+#: plugins/admin/systems/goMailServer.tpl:18
+#: plugins/admin/systems/goMailServer.tpl:26
+#: plugins/admin/systems/goMailServer.tpl:34
 msgid "KB"
 msgstr "Kb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:84
 msgid "GB"
 msgstr "Gb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:299
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
+#: plugins/addons/mailqueue/class_mailqueue.inc:323
 msgid "hour"
 msgstr "hora"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "day"
 msgstr "día"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "week"
 msgstr "semana"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:80
+#: plugins/personal/connectivity/class_proxyAccount.inc:85
 msgid "month"
 msgstr "mes"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:169
+#: plugins/personal/connectivity/class_proxyAccount.inc:150
+#, fuzzy, php-format
+msgid "Removing of user/proxy account with dn '%s' failed."
+msgstr "Se ha fallado al eliminar la cuenta del proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:168
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:172
-#, fuzzy
+#: plugins/personal/connectivity/class_proxyAccount.inc:170
 msgid "Numerical value for Quota Setting is not valid."
-msgstr "El valor de 'Tamaño de Cola' no es valido."
+msgstr "El valor numérico para cuota no es valido."
 
-#: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_proxyAccount.inc:268
+#, fuzzy, php-format
+msgid "Saving of user/proxy account with dn '%s' failed."
+msgstr "Ha fallado la grabación de la cuenta proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:296
+#, fuzzy
+msgid "gosaProxyID"
+msgstr "Proxy"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:298
+msgid "Filter unwanted content"
+msgstr ""
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:299
+#: plugins/personal/connectivity/class_proxyAccount.inc:302
+#, fuzzy
+msgid "Limit proxy access"
+msgstr "Limitar acceso al proxy al horario laboral"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:303
 #, fuzzy
+msgid "Limit quota"
+msgstr "Cuota del Perfil"
+
+#: plugins/personal/connectivity/class_proxyAccount.inc:304
+#, fuzzy
+msgid "Quota limit period"
+msgstr "Periodo de Notificación de Host"
+
+#: plugins/personal/connectivity/pptp.tpl:3
+#: plugins/personal/connectivity/class_pptpAccount.inc:151
 msgid "PPTP account"
-msgstr "Cuenta FTP"
+msgstr "Cuenta PPTP"
 
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
+#: plugins/personal/connectivity/class_intranetAccount.inc:169
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/glpi.tpl:1
+#: plugins/personal/connectivity/class_intranetAccount.inc:100
+#, fuzzy, php-format
+msgid "Removing of user/intranet account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de intranet"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:158
+#, fuzzy, php-format
+msgid "Saving of user/intranet account with dn '%s' failed."
+msgstr "Ha fallado la grabación de la cuenta de intranet"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:176
 #, fuzzy
+msgid "Intranet account settings"
+msgstr "Crear cuenta de intranet"
+
+#: plugins/personal/connectivity/glpi.tpl:1
 msgid "GLPI account"
-msgstr "Cuenta FTP"
+msgstr "Cuenta GLPI"
 
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
+#: plugins/personal/connectivity/class_pptpAccount.inc:150
 msgid "PPTP"
-msgstr ""
+msgstr "PPTP"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:85
+#, fuzzy, php-format
+msgid "Removing of user/PPTP account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta PPTP"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:132
+#, fuzzy, php-format
+msgid "Saving of user/PPTP account with dn '%s' failed."
+msgstr "Ha fallado la grabación de la cuenta PPTP"
 
 #: plugins/personal/connectivity/opengw.tpl:1
-#, fuzzy
+#: plugins/personal/connectivity/class_opengwAccount.inc:302
 msgid "Opengroupware"
-msgstr "Cuenta PHPGroupware"
+msgstr "Cuenta OpenGroupware"
 
 #: plugins/personal/connectivity/opengw.tpl:8
-#, fuzzy
+#: plugins/personal/connectivity/class_opengwAccount.inc:312
 msgid "Location team"
-msgstr "Nombre de la localización"
+msgstr "Equipo de localización"
 
 #: plugins/personal/connectivity/opengw.tpl:21
-#, fuzzy
+#: plugins/personal/connectivity/class_opengwAccount.inc:313
 msgid "Template user"
-msgstr "Plantilla"
+msgstr "Plantilla de usuario"
 
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
+#: plugins/personal/connectivity/opengw.tpl:33
+#: plugins/personal/connectivity/class_opengwAccount.inc:314
+#: plugins/admin/systems/class_servGeneric.inc:44
+#: plugins/admin/systems/class_workstationGeneric.inc:103
+#: plugins/admin/ogroups/class_termgroup.inc:46
 msgid "Locked"
-msgstr ""
+msgstr "Bloqueado"
 
-#: plugins/personal/connectivity/opengw.tpl:64
-#, fuzzy
+#: plugins/personal/connectivity/opengw.tpl:48
+#: plugins/personal/connectivity/class_opengwAccount.inc:315
 msgid "Teams"
-msgstr "Días para tareas"
+msgstr "Equipos"
 
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
-#, fuzzy
 msgid "PHPscheduleit account"
-msgstr "Cuenta PHPGroupware"
+msgstr "Cuenta PHPschedulñeit"
 
 #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
-#, fuzzy
 msgid "PHPscheduleit"
-msgstr "Cuenta PHPGroupware"
+msgstr "PHPscheduleit"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:6
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:78
+#, fuzzy, php-format
+msgid "Removing of user/PHPscheduleit account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta PHPscheduleit"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#, fuzzy, php-format
+msgid "Saving of user/PHPscheduleit account with dn '%s' failed."
+msgstr "Ha fallado la grabación de la cuenta PHPscheduleit"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:143
 #, fuzzy
+msgid "PHP Schedule it"
+msgstr "PHPscheduleit"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:144
+#, fuzzy
+msgid "PHP Schedule it settings"
+msgstr "PHPscheduleit"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:6
 msgid "Opengroupware account"
-msgstr "Cuenta PHPGroupware"
+msgstr "Cuenta OpenGroupware"
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
+#: plugins/personal/connectivity/class_opengwAccount.inc:136
 msgid ""
 "OpenGroupware: Your configuration is missing a postgresql extension. Can't "
 "perform any database queries."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
+#: plugins/personal/connectivity/class_opengwAccount.inc:141
 msgid ""
 "OpenGroupware: Missing database configuration for opengroupware. Can't get "
 "or set any informations."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
+#: plugins/personal/connectivity/class_opengwAccount.inc:149
 msgid ""
 "OpenGroupware: Can't connect to specified database. Please check given "
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_opengwAccount.inc:303
+#, fuzzy
+msgid "Open groupware account settings"
+msgstr "Cuenta OpenGroupware"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:102
-#: plugins/personal/environment/environment.tpl:149
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:14
+#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/environment/environment.tpl:191
 msgid "Environment managment settings"
-msgstr "Parametros del correo de usuarios"
+msgstr "Parámetros de gestión de estado"
 
-#: plugins/personal/environment/environment.tpl:11
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:17
 msgid "Profile managment"
-msgstr "Mantenimiento de Departamentos"
+msgstr "Gestión de perfiles"
 
-#: plugins/personal/environment/environment.tpl:18
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:26
 msgid "Use profile managment"
-msgstr "Gestión de Asterisk PBX"
+msgstr "Gestión de perfiles de usuario"
 
-#: plugins/personal/environment/environment.tpl:25
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:33
 msgid "Profile server managment"
-msgstr "Mantenimiento de Departamentos"
+msgstr "Gestión de perfiles de servidor"
 
-#: plugins/personal/environment/environment.tpl:28
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:36
 msgid "Profil path"
 msgstr "Ruta del Perfil"
 
-#: plugins/personal/environment/environment.tpl:40
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:49
 msgid "Profil quota"
-msgstr "Ruta del Perfil"
+msgstr "Cuota del Perfil"
 
-#: plugins/personal/environment/environment.tpl:54
+#: plugins/personal/environment/environment.tpl:66
+#: plugins/personal/environment/class_environment.inc:1162
 msgid "Cache profile localy"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:63
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:75
 msgid "Kiosk profile settings"
-msgstr "Parametros del correo de usuarios"
+msgstr "Parámetros del perfil de Kiosk"
 
-#: plugins/personal/environment/environment.tpl:66
+#: plugins/personal/environment/environment.tpl:78
+#: plugins/personal/environment/class_environment.inc:1168
 msgid "Kiosk profile"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:72
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:88
 msgid "Manage"
-msgstr "Nombre de la maquina"
+msgstr "Gestionar"
 
-#: plugins/personal/environment/environment.tpl:81
-msgid "Resolution changeable on runtime"
+#: plugins/personal/environment/environment.tpl:98
+#: plugins/personal/environment/class_environment.inc:1161
+msgid "Resolution changeable during session"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:86
+#: plugins/personal/environment/environment.tpl:103
+#: plugins/personal/environment/class_environment.inc:1167
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Resolución"
 
-#: plugins/personal/environment/environment.tpl:105
-#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/personal/environment/environment.tpl:126
+#: plugins/personal/environment/class_environment.inc:1173
+#: plugins/admin/systems/servservice.tpl:11
+#: plugins/admin/systems/class_workstationStartup.inc:1096
+#: plugins/admin/systems/workstationStartup.tpl:129
 #: plugins/admin/systems/terminalStartup.tpl:66
-#, fuzzy
+#: plugins/admin/systems/goShareServer.tpl:1
+#: plugins/admin/systems/class_goShareServer.inc:148
+#: plugins/admin/systems/class_goShareServer.inc:448
 msgid "Shares"
-msgstr "Borrar"
+msgstr "Recursos compartidos"
 
-#: plugins/personal/environment/environment.tpl:118
-#: plugins/admin/systems/workstationStartup.tpl:88
-#: plugins/admin/systems/terminalStartup.tpl:79
-#, fuzzy
-msgid "Mountpoint"
-msgstr "Monitor"
+#: plugins/personal/environment/environment.tpl:136
+msgid "User used to connect to the share"
+msgstr "Usuario utilizado para conectarse con el recurso compartido"
 
-#: plugins/personal/environment/environment.tpl:127
+#: plugins/personal/environment/environment.tpl:139
+msgid "Select a share"
+msgstr "Seleccione un recurso compartido"
+
+#: plugins/personal/environment/environment.tpl:147
+msgid "Mount path"
+msgstr "Punto de montaje"
+
+#: plugins/personal/environment/environment.tpl:160
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:162
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
-#, fuzzy
 msgid "Logon script management"
-msgstr "Gestión del sistema"
+msgstr "Gestión del script de gestión"
 
-#: plugins/personal/environment/environment.tpl:152
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:196
+#: plugins/personal/environment/class_environment.inc:1172
 msgid "Hotplug devices"
-msgstr "Disquetera"
+msgstr "Dispositivos de conexión en caliente (HotPlug)"
 
-#: plugins/personal/environment/environment.tpl:153
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:198
 msgid "Hotplug device settings"
-msgstr "Disquetera"
+msgstr "Parámetros dispositivos de conexión en caliente (HotPlug)"
 
-#: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:360
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/personal/environment/environment.tpl:212
+#: plugins/admin/groups/class_divListGroup.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:90
 msgid "New"
 msgstr "Nuevo"
 
-#: plugins/personal/environment/environment.tpl:165
+#: plugins/personal/environment/environment.tpl:215
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:173
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:230
 msgid "Printer settings"
-msgstr "Configuración telefónica"
+msgstr "Parámetros de impresora"
 
-#: plugins/personal/environment/environment.tpl:183
-#, fuzzy
-msgid "Admin Toggle"
-msgstr "Usuario administrador"
+#: plugins/personal/environment/environment.tpl:247
+msgid "Toggle admin"
+msgstr "Cambio de administrador"
 
-#: plugins/personal/environment/main.inc:124
-#, fuzzy
+#: plugins/personal/environment/environment.tpl:250
+msgid "Toggle default"
+msgstr "Cambio por defecto"
+
+#: plugins/personal/environment/main.inc:116
 msgid "User environment settings"
-msgstr "Parametros del correo de usuarios"
+msgstr "Parámetros de estado de usuarios"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:111
-#, fuzzy
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgstr "Por favor especifique un nombre  valido: Solo se permiten 0-9 a-Z."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:114
-#, fuzzy
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 msgid "Invalid character in description. Please specify a valid description."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgstr ""
+"Caracteres no validos en la descripción, por favor especifique una "
+"descripción valida."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:117
-#, fuzzy
+#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:127
 msgid "Please specify a valid id."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgstr "Por favor especifique un id valido."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:123
-#, fuzzy
+#: plugins/personal/environment/class_hotplugDialog.inc:133
 msgid "An Entry with this name already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
+msgstr "Ya existe una entrada con este 'Nombre'."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:128
-#, fuzzy
+#: plugins/personal/environment/class_hotplugDialog.inc:138
 msgid "Please select an entry or press cancel."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+msgstr "¡Por favor seleccione una entrada o presione cancelar."
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
-#, fuzzy
+#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:102
 msgid "Please select a printer or press cancel."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+msgstr "¡Por favor seleccione una impresora o presione cancelar."
 
 #: plugins/personal/environment/hotplugDialog.tpl:1
-#, fuzzy
 msgid "Add hotplug devices"
-msgstr "Disquetera"
+msgstr "Añadir dispositivos de conexión en caliente (HotPlug)"
 
 #: plugins/personal/environment/hotplugDialog.tpl:5
-#, fuzzy
 msgid "Hotplug management"
-msgstr "Mantenimiento de Departamentos"
+msgstr "Gestión de dispositivos de conexión en caliente (HotPlug)"
 
 #: plugins/personal/environment/hotplugDialog.tpl:10
-#, fuzzy
 msgid "Select hotplug device to add"
-msgstr "Borrar"
+msgstr "Seleccione dispositivos de conexión en caliente (HotPlug) para añadir"
 
 #: plugins/personal/environment/hotplugDialog.tpl:34
-#, fuzzy
 msgid "Choose the department the search will be based    on"
-msgstr "Escoja el departamento base de la busqueda"
+msgstr "Escoja el departamento base de la búsqueda"
 
 #: plugins/personal/environment/hotplugDialog.tpl:43
-#: plugins/admin/groups/group_objects.tpl:38
-#: plugins/admin/users/headpage.tpl:48
-#: plugins/admin/systems/glpiSelectUser.tpl:37
+#: plugins/admin/groups/group_objects.tpl:46
+#: plugins/admin/users/class_divListUsers.inc:72
+#: plugins/admin/applications/class_divListApplication.inc:58
+#: plugins/admin/systems/glpiSelectUser.tpl:35
+#: plugins/admin/fai/class_divListFai.inc:81
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr "Mostrar usuarios que concuerden con"
 
 #: plugins/personal/environment/hotplugDialog.tpl:48
-#, fuzzy
 msgid "Regular expression for        matching hotplugs"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+msgstr ""
+"Expresiones regulares que concuerden con dispositivos de conexión en "
+"caliente (HotPlug)"
 
-#: plugins/personal/environment/class_environment.inc:251
-#: plugins/personal/environment/class_environment.inc:288
-#, fuzzy
+#: plugins/personal/environment/class_environment.inc:205
+msgid "auto"
+msgstr "automático"
+
+#: plugins/personal/environment/class_environment.inc:227
+#: plugins/admin/systems/class_terminalService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:88
+#, 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:305
+#: plugins/personal/environment/class_environment.inc:345
 msgid "Remove environment extension"
-msgstr "Eliminar extensión Kolab"
+msgstr "Eliminar extensión de estado"
 
-#: plugins/personal/environment/class_environment.inc:252
-#: plugins/personal/environment/class_environment.inc:289
-#, fuzzy
+#: plugins/personal/environment/class_environment.inc:306
+#: plugins/personal/environment/class_environment.inc:346
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
+"La extensión de estado está activada. Puede desactivarla pulsando aquí."
 
-#: plugins/personal/environment/class_environment.inc:261
-#: plugins/personal/environment/class_environment.inc:266
-#: plugins/personal/environment/class_environment.inc:294
-#: plugins/personal/environment/class_environment.inc:299
+#: plugins/personal/environment/class_environment.inc:315
+#: plugins/personal/environment/class_environment.inc:320
+#: plugins/personal/environment/class_environment.inc:351
+#: plugins/personal/environment/class_environment.inc:356
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:262
-#: plugins/personal/environment/class_environment.inc:295
-#, fuzzy
+#: plugins/personal/environment/class_environment.inc:316
+#: plugins/personal/environment/class_environment.inc:352
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+"La extensión de estado está desactivada. Puede activarla pulsando aquí."
 
-#: plugins/personal/environment/class_environment.inc:267
-#: plugins/personal/environment/class_environment.inc:300
-#, fuzzy
+#: plugins/personal/environment/class_environment.inc:321
+#: plugins/personal/environment/class_environment.inc:357
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
 "can enable this feature."
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+"La extensión de estado está desactivada. Debe crear una cuenta Posix antes "
+"de poder activarla."
 
-#: plugins/personal/environment/class_environment.inc:404
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
-#, fuzzy
+#: plugins/personal/environment/class_environment.inc:460
+#: plugins/personal/environment/class_environment.inc:805
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "None"
-msgstr "ninguno"
+msgstr "Ninguno"
 
-#: plugins/personal/environment/class_environment.inc:500
-#: plugins/personal/environment/class_environment.inc:510
-#: plugins/admin/systems/class_terminalStartup.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:364
+#: plugins/personal/environment/class_environment.inc:474
 #, fuzzy
+msgid "You are not allowed to write Logon scripts."
+msgstr "No le es permitido borrar este usuario"
+
+#: plugins/personal/environment/class_environment.inc:553
+#: plugins/personal/environment/class_environment.inc:564
+#: plugins/admin/systems/class_terminalStartup.inc:187
+#: plugins/admin/systems/class_workstationStartup.inc:588
 msgid "You must specify a valid mount point."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgstr "Por favor especifique un punto de montaje válido."
 
-#: plugins/personal/environment/class_environment.inc:743
-#, fuzzy
+#: plugins/personal/environment/class_environment.inc:626
+#: plugins/personal/environment/class_environment.inc:627
+#: plugins/personal/environment/class_environment.inc:635
+#: plugins/personal/environment/class_environment.inc:636
+msgid "Reset password hash"
+msgstr "Reiniciar hash de la contraseña"
+
+#: plugins/personal/environment/class_environment.inc:640
+msgid "Delete share entry"
+msgstr "Eliminar entrada compartida"
+
+#: plugins/personal/environment/class_environment.inc:808
+#, php-format
+msgid ""
+"The selected kiosk profile '%s' is no longer available, setting current "
+"profile to 'none'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:846
+#, fuzzy, php-format
+msgid "Removing of user/environment account with dn '%s' failed."
+msgstr "Ha fallado al eliminar la extensión de estado"
+
+#: plugins/personal/environment/class_environment.inc:899
 msgid "Please set a valid profile quota size."
-msgstr "Por favor especifique un rango VSync valido"
+msgstr "Por favor especifique un tamaño de cuota del perfil valido"
 
-#: plugins/personal/environment/class_environment.inc:750
+#: plugins/personal/environment/class_environment.inc:906
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:772
+#: plugins/personal/environment/class_environment.inc:944
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:865
-#, fuzzy
-msgid "Error while writing printer"
-msgstr "¡Error mientras se exportaban las entradas indicadas!"
+#: plugins/personal/environment/class_environment.inc:1073
+#, fuzzy, php-format
+msgid "Saving of user/environment account with dn '%s' failed."
+msgstr "Ha fallado la grabación de la cuenta de intranet"
 
-#: plugins/personal/environment/class_environment.inc:935
+#: plugins/personal/environment/class_environment.inc:1086
+msgid "group share"
+msgstr "grupos compartidos"
+
+#: plugins/personal/environment/class_environment.inc:1119
+msgid "Administrator"
+msgstr "Administrador"
+
+#: plugins/personal/environment/class_environment.inc:1124
+#: plugins/personal/environment/class_environment.inc:1170
+msgid "Default printer"
+msgstr "Impresora por defecto"
+
+#: plugins/personal/environment/class_environment.inc:1150
 #, fuzzy
-msgid "Error while writing printer settings"
-msgstr "¡Error mientras se exportaban las entradas indicadas!"
+msgid "Environment settings"
+msgstr "Parámetros de estado de usuarios"
 
-#: plugins/personal/environment/class_environment.inc:1059
+#: plugins/personal/environment/class_environment.inc:1157
+msgid "Command to extend the list of possible screen resolutions"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:1164
 #, fuzzy
-msgid "Admin"
-msgstr "DN del administrador"
+msgid "Profile quota"
+msgstr "Cuota del Perfil"
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:1
+#: plugins/personal/environment/class_environment.inc:1165
 #, fuzzy
+msgid "Profile server"
+msgstr "Servidor de Archivos"
+
+#: plugins/personal/environment/class_environment.inc:1171
+#: plugins/personal/environment/logonManagement.tpl:56
+msgid "Logon script"
+msgstr ""
+
+#: plugins/personal/environment/selectPrinterDialog.tpl:1
 msgid "Add printer devcies"
-msgstr "Dispositivo de Impresión"
+msgstr "Añadir dispositivos de Impresión"
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:5
 #: plugins/personal/environment/selectPrinterDialog.tpl:10
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:3
-#, fuzzy
 msgid "Select printer to add"
-msgstr "Seleccione números para añadir"
+msgstr "Seleccione impresora para añadir"
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:43
-#, fuzzy
 msgid "Display printers matching"
-msgstr "Mostrar números que concuerdan con"
+msgstr "Mostrar impresoras que concuerden con"
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:48
-#, fuzzy
 msgid "Regular expression for matching printer names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+msgstr "Expresiones regulares que concuerden con nombres de impresoras"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
-#, fuzzy
+#: plugins/personal/environment/class_logonManagementDialog.inc:97
 msgid "Specified name is invalid."
-msgstr "El nombre especificado ya esta siendo usado"
+msgstr "El nombre especificado no es válido"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-#, fuzzy
+#: plugins/personal/environment/class_logonManagementDialog.inc:101
+msgid "Please specify a valid script name."
+msgstr "Por favor especifique un nombre de script valido."
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:105
 msgid "Specified description contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+msgstr "La descripción especificada contiene caracteres no validos!"
 
 #: plugins/personal/environment/logonManagement.tpl:8
-#, fuzzy
 msgid "Logon script settings"
-msgstr "Parametros Unix"
+msgstr "Parámetros del script de inicio de sesión"
 
 #: plugins/personal/environment/logonManagement.tpl:10
-#, fuzzy
 msgid "Skript name"
-msgstr "Nombre de la lista"
+msgstr "Nombre del Script"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:46
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:577
+#: plugins/addons/godfs/generic.tpl:12 plugins/addons/godfs/generic.tpl:38
+#: plugins/admin/groups/class_groupGeneric.inc:871
+#: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
+#: plugins/admin/applications/class_applicationGeneric.inc:488
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
+#: plugins/admin/departments/class_departmentGeneric.inc:537
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
 #: plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/wingeneric.tpl:24
-#: plugins/admin/systems/component.tpl:24 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/ogroups/generic.tpl:13 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/systems/class_servGeneric.inc:325
+#: plugins/admin/systems/wingeneric.tpl:25
+#: plugins/admin/systems/component.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:800
+#: plugins/admin/systems/class_componentGeneric.inc:243
+#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/class_phoneGeneric.inc:419
+#: plugins/admin/systems/class_servNfs.inc:272
+#: plugins/admin/systems/class_goMailServer.inc:782
+#: plugins/admin/ogroups/generic.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:763
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/class_faiScript.inc:459
+#: plugins/admin/fai/class_faiTemplate.inc:423
+#: plugins/admin/fai/faiPackage.tpl:19
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17
+#: plugins/admin/fai/class_faiPackage.inc:549
+#: plugins/admin/fai/class_faiProfile.inc:441
+#: plugins/admin/fai/class_faiHook.inc:483 plugins/admin/fai/faiProfile.tpl:19
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:11
 #: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/class_faiVariable.inc:391
 #: plugins/admin/fai/faiTemplateEntry.tpl:11
-#: plugins/gofon/macro/generic.tpl:36 plugins/gofon/conference/generic.tpl:51
+#: plugins/admin/mimetypes/generic.tpl:31
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:663
+#: plugins/admin/mimetypes/paste_generic.tpl:21
+#: plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/macro/class_gofonMacro.inc:475
+#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:532
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -2936,9 +3866,8 @@ msgstr "Descripción"
 
 #: plugins/personal/environment/logonManagement.tpl:24
 #: plugins/admin/fai/faiScriptEntry.tpl:34
-#, fuzzy
 msgid "Priority"
-msgstr "Puerto"
+msgstr "Prioridad"
 
 #: plugins/personal/environment/logonManagement.tpl:34
 msgid "Logon script flags"
@@ -2952,24 +3881,33 @@ msgstr ""
 msgid "Script can be replaced by user"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:56
-msgid "Logon script"
-msgstr ""
-
 #: plugins/personal/environment/logonManagement.tpl:75
+#: plugins/gofax/blocklists/generic.tpl:88
 #: plugins/gofax/faxaccount/lists.tpl:31
+#: plugins/addons/notifications/contents.tpl:12
+#: plugins/admin/groups/class_groupManagement.inc:333
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/groups/application_options.tpl:11
+#: plugins/admin/users/class_userManagement.inc:630
+#: plugins/admin/applications/class_applicationManagement.inc:353
+#: plugins/admin/systems/class_systemManagement.inc:491
 #: plugins/admin/systems/printerPPDDialog.tpl:22
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/ogroups/class_ogroupManagement.inc:335
+#: plugins/admin/fai/class_faiManagement.inc:588
 #: plugins/admin/fai/faiProfileEntry.tpl:70
-#: plugins/admin/fai/faiScriptEntry.tpl:67
+#: plugins/admin/fai/faiScriptEntry.tpl:68
 #: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiHookEntry.tpl:69
+#: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/fai/faiPackageEntry.tpl:61
+#: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
-#: plugins/admin/fai/faiNewBranch.tpl:17
+#: plugins/admin/fai/faiNewBranch.tpl:19
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:348
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:266
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:244
+#: ihtml/themes/default/acl.tpl:8 ihtml/themes/default/acl.tpl:20
+#: ihtml/themes/default/acl.tpl:69 ihtml/themes/default/acl.tpl:83
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -2996,14 +3934,13 @@ msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
-#, fuzzy
 msgid "Create new hotplug entry"
-msgstr "Crear una nueva entrada en"
+msgstr ""
+"Crear una nueva entrada en dispositivos de conexión en caliente (HotPlug)"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:8
-#, fuzzy
 msgid "Create new hotplug device"
-msgstr "Crear una nueva entrada en"
+msgstr "Crear un nuevo dispositivo de conexión en caliente (HotPlug)"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:10
 #: plugins/admin/systems/component.tpl:6
@@ -3012,19 +3949,21 @@ msgstr "Nombre del dispositivo"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:28
 #, fuzzy
+msgid "Vendor ID"
+msgstr "ID del Remitente"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:35
 msgid "Device ID"
-msgstr "Servicios"
+msgstr "Identificador de dispositivo"
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
-#, fuzzy
-msgid "save"
-msgstr "Guardar"
+#: plugins/personal/environment/hotplugDialogNew.tpl:43
+msgid "Product ID"
+msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
-#, fuzzy
 msgid "Kiosk profile management"
-msgstr "Gestión de Asterisk PBX"
+msgstr "Gestión de perfil de Kiosk"
 
 #: plugins/personal/environment/kioskManagement.tpl:13
 #: plugins/addons/ldapmanager/contentcsv.tpl:14
@@ -3033,90 +3972,80 @@ msgid "Browse"
 msgstr "Visualizar"
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
-#: plugins/admin/systems/glpi_edit_type.tpl:13
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:13
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/glpi_edit_type.tpl:15
 #: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_os.tpl:13
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/glpi_edit_os.tpl:15
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#, fuzzy
+#: plugins/admin/fai/class_faiSummaryTab.inc:202
+#: include/class_MultiSelectWindow.inc:79
 msgid "Close"
-msgstr "Elige"
+msgstr "Cerrar"
 
 #: plugins/personal/nagios/nagios.tpl:4
-#, fuzzy
 msgid "Nagios Account"
-msgstr "Contacto"
+msgstr "Cuenta Nagios"
 
 #: plugins/personal/nagios/nagios.tpl:7
-#, fuzzy
+#: plugins/personal/nagios/class_nagiosAccount.inc:251
 msgid "Alias"
-msgstr "Italiano"
-
-#: plugins/personal/nagios/nagios.tpl:12 plugins/admin/systems/servdns.tpl:52
-#: html/getxls.php:174
-#, fuzzy
-msgid "Mail address"
-msgstr "Dirección MAC"
+msgstr "Alias"
 
 #: plugins/personal/nagios/nagios.tpl:17
-#, fuzzy
+#: plugins/personal/nagios/class_nagiosAccount.inc:257
 msgid "Host notification period"
-msgstr "Opciones de aplicaciones"
+msgstr "Periodo de Notificación de Host"
 
 #: plugins/personal/nagios/nagios.tpl:25
-#, fuzzy
+#: plugins/personal/nagios/class_nagiosAccount.inc:261
 msgid "Service notification period"
-msgstr "Opciones de aplicaciones"
+msgstr "Periodo de Notificación de Servicio"
 
 #: plugins/personal/nagios/nagios.tpl:32
-#, fuzzy
+#: plugins/personal/nagios/class_nagiosAccount.inc:260
 msgid "Service notification options"
-msgstr "Opciones de aplicaciones"
+msgstr "Opciones de Notificación de Servicio"
 
 #: plugins/personal/nagios/nagios.tpl:41
-#, fuzzy
+#: plugins/personal/nagios/class_nagiosAccount.inc:256
 msgid "Host notification options"
-msgstr "Opciones de aplicaciones"
+msgstr "Opciones de Notificación de Host"
 
 #: plugins/personal/nagios/nagios.tpl:53
-#, fuzzy
+#: plugins/personal/nagios/class_nagiosAccount.inc:259
 msgid "Service notification commands"
-msgstr "Opciones de aplicaciones"
+msgstr "Comandos de Notificación de Servicio"
 
 #: plugins/personal/nagios/nagios.tpl:57
-#, fuzzy
+#: plugins/personal/nagios/class_nagiosAccount.inc:255
 msgid "Host notification commands"
-msgstr "Opciones de aplicaciones"
+msgstr "Comandos de Notificación de Host"
 
 #: plugins/personal/nagios/nagios.tpl:66
-#, fuzzy
 msgid "Nagios authentification"
-msgstr "Estación de trabajo Windows"
+msgstr "Autenticación de Nagios"
 
 #: plugins/personal/nagios/nagios.tpl:69
-#, fuzzy
 msgid "view system informations"
-msgstr "Información de sistema"
+msgstr "Ver la información de sistema"
 
 #: plugins/personal/nagios/nagios.tpl:72
-#, fuzzy
 msgid "view configuration information"
-msgstr "Información organizativa"
+msgstr "Ver la información de configuración"
 
 #: plugins/personal/nagios/nagios.tpl:75
 msgid "trigger system commands"
 msgstr ""
 
 #: plugins/personal/nagios/nagios.tpl:78
-#, fuzzy
 msgid "view all services"
-msgstr "Provee servicios de exploración"
+msgstr "Ver todos los servicios"
 
 #: plugins/personal/nagios/nagios.tpl:81
 msgid "view all hosts"
-msgstr ""
+msgstr "Ver todos los hosts"
 
 #: plugins/personal/nagios/nagios.tpl:83
 msgid "trigger all service commands"
@@ -3127,98 +4056,175 @@ msgid "trigger all host commands"
 msgstr ""
 
 #: plugins/personal/nagios/class_nagiosAccount.inc:92
-#, fuzzy
 msgid "This account has no nagios extensions."
-msgstr "Esta cuenta no tiene extensiones validas de correo."
+msgstr "Esta cuenta no tiene extensiones validas de nagios."
 
 #: plugins/personal/nagios/class_nagiosAccount.inc:101
-#, fuzzy
 msgid "Remove nagios account"
-msgstr "Borrar cuenta de correo"
+msgstr "Borrar cuenta de nagios"
 
 #: plugins/personal/nagios/class_nagiosAccount.inc:102
-#, fuzzy
 msgid ""
 "This account has nagios features enabled. You can disable them by clicking "
 "below."
 msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"Esta cuenta tiene las características de nagios activas. Puede desactivarlas "
 "apretando a continuación."
 
 #: plugins/personal/nagios/class_nagiosAccount.inc:104
-#, fuzzy
 msgid "Create nagios account"
-msgstr "Crear cuenta de correo"
+msgstr "Crear cuenta de nagios"
 
 #: plugins/personal/nagios/class_nagiosAccount.inc:104
-#, fuzzy
 msgid ""
 "This account has nagios features disabled. You can enable them by clicking "
 "below."
 msgstr ""
-"Esta cuenta tiene las características de correo desactivadas.Puede "
+"Esta cuenta tiene las características de nagios desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:163
-#, fuzzy
+#: plugins/personal/nagios/class_nagiosAccount.inc:147
+#, fuzzy, php-format
+msgid "Saving of user/nagios account with dn '%s' 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 'Nombre' no ha sido rellenado."
+msgstr "El campo requerido 'Alias de Nagios' no ha sido rellenado."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:166
-#, fuzzy
+#: plugins/personal/nagios/class_nagiosAccount.inc:170
 msgid "The required field 'NagiosMail' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+msgstr "El campo requerido 'Correo de Nagios' no ha sido rellenado."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:170
 #: plugins/personal/nagios/class_nagiosAccount.inc:174
-#, fuzzy
+#: 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 Principal'."
+"'Cuenta Nagios'."
 
-#: plugins/personal/nagios/main.inc:124
+#: plugins/personal/nagios/class_nagiosAccount.inc:226
+#, fuzzy, php-format
+msgid "Removing of user/nagios account with dn '%s' failed."
+msgstr "Ha fallado borrar cuenta de nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:241
+#, fuzzy
+msgid "Nagios account settings"
+msgstr "Parámetros de Nagios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:263
 #, fuzzy
+msgid "View all hosts"
+msgstr "Ver todos los hosts"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:264
+#, fuzzy
+msgid "View all services"
+msgstr "Ver todos los servicios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:266
+#, fuzzy
+msgid "Trigger system commands"
+msgstr "Ver la información de sistema"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:267
+#, fuzzy
+msgid "Trigger all host commands"
+msgstr "Ver todos los hosts"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:268
+#, fuzzy
+msgid "Trigger all service commands"
+msgstr "Ver todos los servicios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:270
+#, fuzzy
+msgid "View configuration information"
+msgstr "Ver la información de configuración"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:271
+#, fuzzy
+msgid "View system informations"
+msgstr "Ver la información de sistema"
+
+#: plugins/personal/nagios/main.inc:124
 msgid "Nagios settings"
-msgstr "Parametros del correo de usuarios"
+msgstr "Parámetros de Nagios"
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Lista de listas de bloqueos"
+#: 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: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/gofax/blocklists/headpage.tpl:24
+#: plugins/personal/netatalk/class_netatalk.inc:133
 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."
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"Este menú le permite crear, editar o eliminar listas de bloqueo. Puede usar "
-"el selector de rango en la parte superior de la lista, cuando trabaja con un "
-"gran número de listas de bloqueo."
+"Esta cuenta tiene las características Netatalk activas. Puede desactivarlas "
+"pulsando a continuación."
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr "Seleccione para mostrar listas de bloqueo salientes"
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+msgid "Create netatalk account"
+msgstr "Crear cuenta Netatalk"
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr "Mostrar listas de bloqueos salientes"
+#: 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/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr "Seleccione para mostrar listas de bloqueo entrantes"
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr ""
 
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr "Mostrar listas de bloqueos entrantes"
+#: plugins/personal/netatalk/class_netatalk.inc:256
+#, fuzzy, php-format
+msgid "Saving of user/netatalk account with dn '%s' failed."
+msgstr "Ha fallado la grabación de la cuenta Netatalk"
 
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr "Mostrar listas que contengan"
+#: plugins/personal/netatalk/class_netatalk.inc:316
+#, fuzzy, php-format
+msgid "Removing of user/netatalk account with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta Netatalk"
 
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr "Expresiones regulares para encontrar nombres de listas"
+#: plugins/personal/netatalk/class_netatalk.inc:331
+msgid "Apple talk"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:334
+msgid "apple-user-homeurl"
+msgstr ""
+
+#: plugins/personal/netatalk/class_netatalk.inc:335
+#, fuzzy
+msgid "apple-user-homeDirectory"
+msgstr "Directorio Principal"
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+msgid "Share"
+msgstr "Compartido"
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+#: plugins/admin/systems/class_servNfs.inc:275
+msgid "Path"
+msgstr ""
 
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
@@ -3232,338 +4238,522 @@ msgstr "Nombre de la lista de bloqueos"
 msgid "Select subtree to place blocklist in"
 msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/admin/systems/servnfs.tpl:47
+#: plugins/admin/systems/class_servNfs.inc:273
 #: plugins/admin/systems/workstationService.tpl:42
 #: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/terminalService.tpl:42
 #: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpi_devices.tpl:413
-#: plugins/admin/systems/glpi_devices.tpl:476
-#: plugins/admin/systems/glpi_devices.tpl:524
+#: plugins/admin/systems/class_glpiAccount.inc:783
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:780
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/fai/class_faiSummaryTab.inc:309
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
 msgid "Type"
 msgstr "Tipo"
 
-#: plugins/gofax/blocklists/generic.tpl:34
+#: 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/generic.tpl:43
+#: plugins/gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr "Descripción de esta lista de bloqueos"
 
-#: plugins/gofax/blocklists/generic.tpl:56
+#: plugins/gofax/blocklists/generic.tpl:61
 msgid "Blocked numbers"
 msgstr "Números bloqueados"
 
-#: plugins/gofax/blocklists/generic.tpl:72
+#: 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/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/admin/acl/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/mimetypes/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:49 html/index.php:339 html/index.php:345
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: ihtml/themes/default/remove.tpl:2
+msgid "Warning"
+msgstr "Aviso"
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Por favor pulse dos veces si realmente quiere hacer esto, ya que no hay "
+"manera de que GOsa recupere posteriormente la información."
+
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
+#: plugins/admin/mimetypes/remove.tpl:9 plugins/gofon/macro/remove.tpl:9
+#: ihtml/themes/default/remove.tpl:9
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
+msgstr ""
+"Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
+"<i>Cancelar</i> para Abortar."
+
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
+msgid "Blocklist management"
+msgstr "Gestión de listas de bloqueo"
+
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "FAX Blocklists"
 msgstr "Lista de bloqueos de FAX"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:206
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:172
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr "Has decidido eliminar la lista de bloqueo '%s'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:218
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:189
 msgid "You have no permission to remove this blocklist."
 msgstr "No tiene permisos para eliminar esta lista de bloqueo."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:236
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:204
 msgid "Please specify a valid phone number."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:670
-#: plugins/admin/applications/class_applicationManagement.inc:326
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/systems/class_glpiSelectUser.inc:144
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
-#: plugins/admin/fai/class_faiManagement.inc:629
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-#, fuzzy
-msgid "Go up one department"
-msgstr "Nombre del departamento"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:670
-#: plugins/admin/applications/class_applicationManagement.inc:326
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:566
-#: plugins/admin/systems/class_glpiSelectUser.inc:144
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
-#: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/admin/fai/class_faiManagement.inc:629
-#: plugins/admin/fai/class_faiProfile.inc:286
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
-msgid "Up"
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
-#: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:671
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/systems/class_glpiSelectUser.inc:146
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
-#: plugins/admin/fai/class_faiManagement.inc:632
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-#, fuzzy
-msgid "Go to root department"
-msgstr "Lista de Departamentos"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
-#: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:671
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:567
-#: plugins/admin/systems/class_glpiSelectUser.inc:146
-#: plugins/admin/ogroups/class_ogroupManagement.inc:360
-#: plugins/admin/fai/class_faiManagement.inc:632
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
-#, fuzzy
-msgid "Root"
-msgstr "Reiniciar"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+msgid "send"
+msgstr "enviar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
-#: plugins/admin/groups/class_groupManagement.inc:358
-#: plugins/admin/users/class_userManagement.inc:672
-#: plugins/admin/applications/class_applicationManagement.inc:328
-#: plugins/admin/systems/class_systemManagement.inc:568
-#: plugins/admin/systems/class_glpiSelectUser.inc:148
-#: plugins/admin/ogroups/class_ogroupManagement.inc:361
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
-#, fuzzy
-msgid "Go to users department"
-msgstr "Seleccione para ver los departamentos"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+msgid "receive"
+msgstr "recibir"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:293
-#: plugins/admin/groups/class_groupManagement.inc:358
-#: plugins/admin/users/class_userManagement.inc:672
-#: plugins/admin/applications/class_applicationManagement.inc:328
-#: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:568
-#: plugins/admin/systems/class_glpiSelectUser.inc:148
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
-#: plugins/admin/fai/class_faiManagement.inc:635
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
-#, fuzzy
-msgid "Home"
-msgstr "Nombre de Maquina"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:413
+#, fuzzy, php-format
+msgid "Removing of blocklist with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la estación de trabajo"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
-#, fuzzy
-msgid "Create new blocklist"
-msgstr "Nombre de la lista de bloqueos"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:453
+msgid "You have no permissions to create a blocklist on this 'Base'."
+msgstr "No tiene permisos para crear una lista de bloqueo en esta 'Base'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
-#, fuzzy
-msgid "New Blocklist"
-msgstr "Listas de bloqueo"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:459
+#: plugins/admin/departments/class_departmentGeneric.inc:235
+msgid "Required field 'Name' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/users/class_userManagement.inc:678
-#: plugins/admin/applications/class_applicationManagement.inc:333
-#: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:578
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/admin/fai/class_faiManagement.inc:665
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-#, fuzzy
-msgid "Submit department"
-msgstr "Mostrar departamentos"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:462
+msgid "Required field 'Name' contains invalid characters"
+msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:297
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/users/class_userManagement.inc:678
-#: plugins/admin/applications/class_applicationManagement.inc:333
-#: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:578
-#: plugins/admin/ogroups/class_ogroupManagement.inc:367
-#: plugins/admin/fai/class_faiManagement.inc:665
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-msgid "Submit"
-msgstr ""
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:469
+msgid "Specified name is already used."
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/groups/class_groupManagement.inc:367
-#: plugins/admin/users/class_userManagement.inc:681
-#: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:581
-#: 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/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/ogroups/class_ogroupManagement.inc:371
-#: plugins/admin/fai/class_faiManagement.inc:683
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
-#, fuzzy
-msgid "edit"
-msgstr "Editar"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:476
+msgid "No permission to create a blocklist on this base."
+msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:681
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#, fuzzy
-msgid "Edit user"
-msgstr "Usuario administrador"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:524
+#, fuzzy, php-format
+msgid "Saving of blocklist with dn '%s' failed."
+msgstr "Ha fallado la grabación de la estación de trabajo"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/groups/class_groupManagement.inc:368
-#: plugins/admin/users/class_userManagement.inc:683
-#: plugins/admin/applications/class_applicationManagement.inc:338
-#: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:582
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-#: plugins/admin/fai/class_faiManagement.inc:684
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:564
 #, fuzzy
-msgid "delete"
-msgstr "Borrar"
+msgid "Fax Blocklists"
+msgstr "Lista de bloqueos de FAX"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:683
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#, fuzzy
-msgid "Delete user"
-msgstr "Borrar"
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
+#: plugins/addons/addressbook/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/groups/class_groupGeneric.inc:870
+#: plugins/admin/applications/class_applicationGeneric.inc:487
+#: plugins/admin/applications/class_applicationGeneric.inc:490
+#: plugins/admin/systems/class_terminalGeneric.inc:502
+#: plugins/admin/systems/class_servGeneric.inc:324
+#: plugins/admin/systems/class_printGeneric.inc:799
+#: plugins/admin/systems/class_componentGeneric.inc:242
+#: plugins/admin/systems/servnfs.tpl:9
+#: plugins/admin/systems/class_phoneGeneric.inc:418
+#: plugins/admin/systems/class_servRepository.inc:440
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:762
+#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/admin/fai/class_faiScript.inc:458
+#: plugins/admin/fai/class_faiTemplate.inc:422
+#: plugins/admin/fai/faiPackage.tpl:9
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/class_faiPackage.inc:548
+#: plugins/admin/fai/class_faiProfile.inc:440
+#: plugins/admin/fai/class_faiHook.inc:482 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/fai/class_faiPartitionTable.inc:495
+#: plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/class_faiVariable.inc:390
+#: plugins/admin/fai/faiTemplateEntry.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:304
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:661
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Nombre"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:579
 #, fuzzy
+msgid "Blocklist type"
+msgstr "N0mbre de listas de bloqueo"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:31
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:32
+msgid "List of blocklists"
+msgstr "Lista de listas de bloqueos"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:36
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+msgstr ""
+"Este menú permite añadir, editar o eliminar las listas de bloqueo "
+"seleccionadas. Puede usar el selector de rango en la parte superior de la "
+"lista de bloqueos, cuando trabaja con un gran número de bloqueos."
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:52
 msgid "Blocklist name"
-msgstr "Gestión de listas de bloqueo"
+msgstr "N0mbre de listas de bloqueo"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:53
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:393
-#: plugins/admin/users/class_userManagement.inc:692
-#: plugins/admin/applications/class_applicationManagement.inc:358
-#: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_systemManagement.inc:588
+#: plugins/admin/groups/class_divListGroup.inc:57
+#: plugins/admin/users/class_divListUsers.inc:58
+#: plugins/admin/applications/class_divListApplication.inc:52
+#: plugins/admin/departments/class_divListDepartment.inc:42
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/ogroups/class_ogroupManagement.inc:393
-#: plugins/admin/fai/class_faiManagement.inc:680
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
+#: plugins/admin/systems/class_divListSystem.inc:59
+#: plugins/admin/systems/class_divListSystemService.inc:31
+#: plugins/admin/ogroups/class_divListOGroup.inc:60
+#: plugins/admin/acl/class_divListACL.inc:50
+#: plugins/admin/fai/class_divListFai.inc:66
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:56
+#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/conference/class_divListConferences.inc:55
 msgid "Actions"
 msgstr "Acciones"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
-msgid "This table displays faxblocklists for the selected tree."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
-msgid "send"
-msgstr "enviar"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
-msgid "receive"
-msgstr "recibir"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:56
+msgid "Select to see send blocklists"
+msgstr "Seleccione para mostrar listas de bloqueo salientes"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:522
-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_divListBlocklists.inc:56
+msgid "Show send blocklists"
+msgstr "Mostrar listas de bloqueos salientes"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:528
-#: plugins/admin/departments/class_departmentGeneric.inc:164
-msgid "Required field 'Name' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
+msgid "Select to see receive blocklists"
+msgstr "Seleccione para mostrar listas de bloqueo entrantes"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:531
-msgid "Required field 'Name' contains invalid characters"
-msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
+msgid "Show receive blocklists"
+msgstr "Mostrar listas de bloqueos entrantes"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:538
-msgid "Specified name is already used."
-msgstr "El nombre especificado ya esta siendo usado"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:60
+#: plugins/admin/groups/class_divListGroup.inc:68
+#: plugins/admin/users/class_divListUsers.inc:69
+#: plugins/admin/applications/class_divListApplication.inc:55
+#: plugins/admin/departments/class_divListDepartment.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:72
+#: plugins/admin/ogroups/class_divListOGroup.inc:75
+#: plugins/admin/acl/class_divListACL.inc:57
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:59
+#: plugins/gofon/macro/class_divListMacros.inc:57
+#: plugins/gofon/conference/class_divListConferences.inc:58
+msgid "Select to search within subtrees"
+msgstr "Seleccione para buscar dentro del subárbol"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:63
+msgid "Regular expression for matching list names"
+msgstr "Expresiones regulares para encontrar nombres de listas"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:545
-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_divListBlocklists.inc:83
+#: plugins/admin/groups/class_divListGroup.inc:99
+#: plugins/admin/users/class_divListUsers.inc:100
+#: plugins/admin/applications/class_divListApplication.inc:99
+#: plugins/admin/departments/class_divListDepartment.inc:69
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/admin/acl/class_divListACL.inc:82
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:108
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
+msgid "Go to root department"
+msgstr "Ir al departamento raíz"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/groups/class_divListGroup.inc:99
+#: plugins/admin/users/class_divListUsers.inc:100
+#: plugins/admin/applications/class_divListApplication.inc:99
+#: plugins/admin/departments/class_divListDepartment.inc:69
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_baseSelectDialog.inc:26
+#: plugins/admin/systems/class_divListSystem.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/admin/acl/class_divListACL.inc:82
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:108
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
+msgid "Root"
+msgstr "Raíz"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/departments/class_divListDepartment.inc:70
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:96
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/admin/acl/class_divListACL.inc:84
+#: plugins/admin/fai/class_divListFai.inc:120
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
+msgid "Go up one department"
+msgstr "Subir un departamento"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:85
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/admin/users/class_divListUsers.inc:102
+#: plugins/admin/applications/class_divListApplication.inc:101
+#: plugins/admin/departments/class_divListDepartment.inc:70
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_baseSelectDialog.inc:28
+#: plugins/admin/systems/class_divListSystem.inc:96
+#: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/admin/acl/class_divListACL.inc:84
+#: plugins/admin/fai/class_faiProfile.inc:299
+#: plugins/admin/fai/class_divListFai.inc:120
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:82
+#: plugins/gofon/conference/class_divListConferences.inc:83
+#: include/class_acl.inc:362
+msgid "Up"
+msgstr ""
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
-#: plugins/admin/fai/remove.tpl:2 plugins/admin/fai/remove_branch.tpl:2
-#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:233 html/index.php:293 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/class_divListBlocklists.inc:87
+#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/applications/class_divListApplication.inc:103
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/admin/acl/class_divListACL.inc:86
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
+msgid "Go to users department"
+msgstr "Ir al departamento de los usuarios"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:87
+#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/admin/users/class_divListUsers.inc:104
+#: plugins/admin/applications/class_divListApplication.inc:103
+#: plugins/admin/departments/class_divListDepartment.inc:71
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_baseSelectDialog.inc:30
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/ogroups/class_divListOGroup.inc:109
+#: plugins/admin/acl/class_divListACL.inc:86
+#: plugins/admin/fai/class_divListFai.inc:123
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:84
+#: plugins/gofon/conference/class_divListConferences.inc:85
+msgid "Home"
+msgstr "Inicio"
 
-#: 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."
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/users/class_divListUsers.inc:106
+#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/departments/class_divListDepartment.inc:72
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/acl/class_divListACL.inc:88
+#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:114
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/conference/class_divListConferences.inc:87
+msgid "Reload list"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:89
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/groups/class_divListGroup.inc:109
+#: plugins/admin/users/class_divListUsers.inc:106
+#: plugins/admin/users/class_divListUsers.inc:117
+#: plugins/admin/applications/class_divListApplication.inc:105
+#: plugins/admin/applications/class_divListApplication.inc:114
+#: plugins/admin/departments/class_divListDepartment.inc:72
+#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
+#: plugins/admin/ogroups/class_divListOGroup.inc:120
+#: plugins/admin/acl/class_divListACL.inc:88
+#: plugins/admin/acl/class_divListACL.inc:94
+#: plugins/admin/fai/class_divListFai.inc:126
+#: plugins/admin/fai/class_divListFai.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:114
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:123
+#: plugins/gofon/macro/class_divListMacros.inc:86
+#: plugins/gofon/macro/class_divListMacros.inc:94
+#: plugins/gofon/conference/class_divListConferences.inc:87
+#: plugins/gofon/conference/class_divListConferences.inc:95
+msgid "Submit"
 msgstr ""
-"Por favor pulse dos veces si realmente quiere hacer esto, ya que no hay "
-"manera de que GOsa recupere posteriormente la información."
 
-#: plugins/gofax/blocklists/remove.tpl:10
-#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
-#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
-#: plugins/admin/ogroups/remove.tpl:10 plugins/admin/fai/remove_branch.tpl:10
-#: plugins/gofon/macro/remove.tpl:9
-#, fuzzy
-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/class_divListBlocklists.inc:93
+msgid "Create new blocklist"
+msgstr "Crear nueva lista de bloqueos"
 
-#: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
-msgid "Blocklist management"
-msgstr "Gestión de listas de bloqueo"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:93
+msgid "New Blocklist"
+msgstr "Nueva lista de bloqueo"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:97
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/groups/class_divListGroup.inc:109
+#: plugins/admin/users/class_divListUsers.inc:117
+#: plugins/admin/applications/class_divListApplication.inc:114
+#: plugins/admin/departments/class_divListDepartment.inc:77
+#: plugins/admin/systems/class_glpiSelectUser.inc:169
+#: plugins/admin/systems/class_divListSystem.inc:117
+#: plugins/admin/ogroups/class_divListOGroup.inc:120
+#: plugins/admin/acl/class_divListACL.inc:94
+#: plugins/admin/fai/class_divListFai.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:123
+#: plugins/gofon/macro/class_divListMacros.inc:94
+#: plugins/gofon/conference/class_divListConferences.inc:95
+msgid "Submit department"
+msgstr "Enviar departamentos"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
+#: plugins/admin/groups/class_divListGroup.inc:169
+#: plugins/admin/users/class_divListUsers.inc:221
+#: plugins/admin/applications/class_divListApplication.inc:162
+#: 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/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
+#: plugins/admin/systems/class_divListSystem.inc:156
+#: plugins/admin/ogroups/class_divListOGroup.inc:161
+#: plugins/admin/acl/class_divListACL.inc:122
+#: plugins/admin/fai/class_faiScript.inc:238
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:208
+#: plugins/admin/fai/class_faiTemplate.inc:211
+#: plugins/admin/fai/class_faiHook.inc:261
+#: plugins/admin/fai/class_faiHook.inc:264
+#: plugins/admin/fai/class_divListFai.inc:221
+#: plugins/admin/fai/class_divListFai.inc:226
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/gofon/macro/class_divListMacros.inc:109
+#: plugins/gofon/macro/class_divListMacros.inc:128
+#: plugins/gofon/conference/class_divListConferences.inc:124
+#: include/class_acl.inc:364 include/class_acl.inc:409
+msgid "edit"
+msgstr "Editar"
 
-#: plugins/gofax/faxaccount/lists.tpl:5
-msgid "Blocked numbers/lists"
-msgstr "Listas/Numeros bloqueados"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:124
+#: plugins/admin/users/class_divListUsers.inc:222
+msgid "Edit user"
+msgstr "Editar usuario"
 
-#: plugins/gofax/faxaccount/lists.tpl:17
-msgid "List of predefined blocklists"
-msgstr "Listas de listas de bloqueos predefinidas"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
+#: plugins/addons/mailqueue/contents.tpl:93
+#: plugins/admin/groups/class_divListGroup.inc:172
+#: plugins/admin/users/class_divListUsers.inc:226
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/systems/class_divListSystem.inc:158
+#: plugins/admin/ogroups/class_divListOGroup.inc:164
+#: plugins/admin/acl/class_divListACL.inc:125
+#: plugins/admin/fai/class_faiScript.inc:242
+#: plugins/admin/fai/class_faiTemplate.inc:212
+#: plugins/admin/fai/class_faiHook.inc:265
+#: plugins/admin/fai/class_divListFai.inc:229
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:174
+#: plugins/gofon/macro/class_divListMacros.inc:111
+#: plugins/gofon/macro/class_divListMacros.inc:131
+#: plugins/gofon/conference/class_divListConferences.inc:127
+#: plugins/gofon/conference/class_divListConferences.inc:129
+#: include/class_acl.inc:365 include/class_acl.inc:410
+msgid "delete"
+msgstr "borrar"
 
-#: plugins/gofax/faxaccount/lists.tpl:25
-#, fuzzy
-msgid "Add the list to the blocklists"
-msgstr "Lista de listas de bloqueos"
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:126
+#: plugins/admin/users/class_divListUsers.inc:227
+msgid "Delete user"
+msgstr "Borrar usuario"
 
 #: plugins/gofax/faxaccount/generic.tpl:12
+#: plugins/gofax/faxaccount/paste_generic.tpl:13
 msgid "Fax number for GOfax to trigger on"
 msgstr "Numero de fax que activa GOfax"
 
 #: plugins/gofax/faxaccount/generic.tpl:16
-#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:65
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:829
+#: plugins/admin/ogroups/phonequeue.tpl:35
+#: plugins/admin/ogroups/class_phonequeue.inc:737 html/getxls.php:65
 #: html/getxls.php:224
 msgid "Language"
 msgstr "Lenguaje"
@@ -3575,6 +4765,7 @@ msgstr ""
 "correo"
 
 #: plugins/gofax/faxaccount/generic.tpl:24
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:828
 msgid "Delivery format"
 msgstr "Formato de envío"
 
@@ -3599,6 +4790,7 @@ msgid "Deliver fax as mail"
 msgstr "Enviar fax como correo electrónico"
 
 #: plugins/gofax/faxaccount/generic.tpl:54
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:827
 msgid "Deliver fax to printer"
 msgstr "Enviar fax a la impresora"
 
@@ -3642,6 +4834,18 @@ msgstr "Mostrar números de usuarios"
 msgid "User name of which numbers are shown"
 msgstr "Nombre de usuario cuyos números están siendo mostrados"
 
+#: plugins/gofax/faxaccount/lists.tpl:5
+msgid "Blocked numbers/lists"
+msgstr "Listas/Numeros bloqueados"
+
+#: plugins/gofax/faxaccount/lists.tpl:17
+msgid "List of predefined blocklists"
+msgstr "Listas de listas de bloqueos predefinidas"
+
+#: plugins/gofax/faxaccount/lists.tpl:25
+msgid "Add the list to the blocklists"
+msgstr "Añadir a la lista de bloqueos"
+
 #: plugins/gofax/faxaccount/main.inc:105
 msgid "FAX settings"
 msgstr "Parametros del Fax"
@@ -3687,37 +4891,64 @@ 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/admin/groups/class_groupApplication.inc:514
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:88
-#, fuzzy
+#: plugins/admin/groups/class_groupApplication.inc:632
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 msgid "back"
-msgstr "Atras"
+msgstr "Atrás"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
+#, fuzzy, php-format
+msgid "Removing of user/fax account with dn '%s' failed."
+msgstr "Eliminar cuenta Posix"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:637
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
 msgid "The required field 'Fax' is not set."
 msgstr "No ha rellenado el campo requerido 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:641
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr "Por favor introduzca un numero de teléfono valido en el campo 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:649
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 "Envío de correo ha sido seleccionado, pero no se ha especificado ninguna "
 "dirección de correo."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
 msgid "The mail address you've entered is invalid."
 msgstr "La cuenta de correo electrónico que ha introducido no es válida."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:657
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
 msgstr ""
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:743
+#, fuzzy, php-format
+msgid "Saving of user/fax account with dn '%s' failed."
+msgstr "Ha fallado la grabación de la cuenta proxy"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:814
+#, fuzzy
+msgid "Fax account settings"
+msgstr "Parametros de samba"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:823
+msgid "Enable/Disable fax"
+msgstr ""
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:824
+#, fuzzy
+msgid "Receive blocklist"
+msgstr "Mostrar listas de bloqueos entrantes"
+
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:825
+#, fuzzy
+msgid "Send blocklist"
+msgstr "Mostrar listas de bloqueos salientes"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3735,7 +4966,7 @@ msgstr "Buscar por"
 #: plugins/gofax/faxreports/contents.tpl:7
 #: plugins/gofon/fonreports/contents.tpl:7
 msgid "Enter user name to search for"
-msgstr "Entre el nombre de usuario para la busqueda"
+msgstr "Entre el nombre de usuario para la búsqueda"
 
 #: plugins/gofax/faxreports/contents.tpl:8
 #: plugins/gofax/faxreports/contents.tpl:16
@@ -3747,7 +4978,7 @@ msgstr "en"
 #: plugins/gofax/faxreports/contents.tpl:9
 #: plugins/gofon/fonreports/contents.tpl:9
 msgid "Select subtree to base search on"
-msgstr "Seleccione el subárbol como base de la busqueda"
+msgstr "Seleccione el subárbol como base de la búsqueda"
 
 #: plugins/gofax/faxreports/contents.tpl:12
 #: plugins/gofon/fonreports/contents.tpl:12
@@ -3764,8 +4995,8 @@ msgstr "Buscar"
 
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/gofax/faxreports/detail.tpl:21
-#: plugins/admin/systems/class_printGeneric.inc:642
-#: plugins/admin/ogroups/class_ogroupManagement.inc:481
+#: plugins/admin/systems/class_printGeneric.inc:778
+#: plugins/admin/ogroups/class_ogroupManagement.inc:382
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
 msgstr "Usuario"
@@ -3794,7 +5025,7 @@ msgstr "# páginas"
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/fonreports/contents.tpl:51
 msgid "Search returned no results..."
-msgstr "La busqueda no ha encontrado resultados"
+msgstr "La búsqueda no ha encontrado resultados"
 
 #: plugins/gofax/faxreports/detail.tpl:5
 msgid "FAX preview - please wait"
@@ -3836,7 +5067,7 @@ msgstr "Estado del mensaje"
 msgid "Transfer time"
 msgstr "Tiempo de envio"
 
-#: plugins/gofax/faxreports/main.inc:5
+#: plugins/gofax/faxreports/main.inc:18
 msgid "FAX reports"
 msgstr "Reportes de FAX"
 
@@ -3844,79 +5075,52 @@ msgstr "Reportes de FAX"
 msgid "FAX Reports"
 msgstr "Informes de FAX"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
+#: 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:112
+#: plugins/gofax/faxreports/class_faxreport.inc:109
 #: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
+#: 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:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
+#: 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:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
+#: 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:185
+#: 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:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
+#: 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/address_info.tpl:16
-#: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:8
-#: plugins/admin/systems/glpi_devices.tpl:101
-#: plugins/admin/systems/glpi_devices.tpl:140
-#: plugins/admin/systems/glpi_devices.tpl:193
-#: plugins/admin/systems/glpi_devices.tpl:247
-#: plugins/admin/systems/glpi_devices.tpl:303
-#: plugins/admin/systems/glpi_devices.tpl:365
-#: plugins/admin/systems/glpi_devices.tpl:435
-#: plugins/admin/systems/glpi_devices.tpl:497
-#: plugins/admin/systems/glpi_devices.tpl:541
-#: plugins/admin/systems/glpi_devices.tpl:592
-#: plugins/admin/systems/glpi_devices.tpl:644
-#: plugins/admin/systems/glpi_devices.tpl:688
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:6
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/fai/faiVariable.tpl:9
-#: plugins/admin/fai/faiPartitionTable.tpl:9
-#: 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/faiHook.tpl:9
-#: plugins/admin/fai/faiHookEntry.tpl:9
-#: plugins/admin/fai/faiTemplateEntry.tpl:7
-#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
-msgid "Name"
-msgstr "Nombre"
+#: plugins/gofax/faxreports/class_faxreport.inc:389
+#: plugins/gofax/faxreports/class_faxreport.inc:390
+#, fuzzy
+msgid "Fax report"
+msgstr "Reportes de FAX"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:399
+#, fuzzy
+msgid "Detailed view"
+msgstr "Dispositivos instalados"
 
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:66
@@ -3935,15 +5139,15 @@ msgid ""
 "find 'Gonicus'. Use the filters below to narrow down your search."
 msgstr ""
 "La extensión de lista telefónica provee las facilidades de listado y "
-"busqueda de usuarios en su sitio. Se puede especificar asterisco (*) como en "
-"'Go*us' para encontrar 'Gonicus'. Use estos filtros para reducir su busqueda."
+"búsqueda de usuarios en su sitio. Se puede especificar asterisco (*) como en "
+"'Go*us' para encontrar 'Gonicus'. Use estos filtros para reducir su búsqueda."
 
 #: plugins/addons/addressbook/contents.tpl:47
 msgid "Add entry"
 msgstr "Añadir entrada"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:596
+#: plugins/admin/groups/class_groupApplication.inc:714
 msgid "Edit entry"
 msgstr "Editar entrada"
 
@@ -3981,7 +5185,7 @@ msgstr "Elegir el objeto que sera buscado"
 
 #: plugins/addons/addressbook/contents.tpl:105
 msgid "Search string"
-msgstr "Cadena de busqueda"
+msgstr "Cadena de búsqueda"
 
 #: plugins/addons/addressbook/dial.tpl:3
 msgid "Dial connection..."
@@ -4022,7 +5226,7 @@ msgstr "Iniciales"
 
 #: plugins/addons/addressbook/address_edit.tpl:105
 #: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:45
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
 msgid "Email"
 msgstr "Correo Electrónico"
 
@@ -4044,10 +5248,11 @@ msgstr "Ciudad"
 
 #: plugins/addons/addressbook/address_edit.tpl:168
 #: plugins/addons/addressbook/address_info.tpl:73
+#: plugins/admin/departments/class_departmentGeneric.inc:538
 msgid "Country"
 msgstr "Pais"
 
-#: plugins/addons/addressbook/main.inc:23
+#: plugins/addons/addressbook/main.inc:37
 msgid "Address book"
 msgstr "Libreta de direcciones"
 
@@ -4068,12 +5273,18 @@ msgstr ""
 "No tiene configurado un numero de teléfono personal. Por favor cambie esto "
 "para permitir llamadas directas."
 
-#: plugins/addons/addressbook/class_addressbook.inc:186
-#: plugins/addons/addressbook/class_addressbook.inc:287
+#: plugins/addons/addressbook/class_addressbook.inc:180
+#: plugins/addons/addressbook/class_addressbook.inc:650
+#, fuzzy, php-format
+msgid "Removing of addressbook entry '%s' failed."
+msgstr "Ha fallado la eliminación de la cuenta de la libreta de direcciones"
+
+#: plugins/addons/addressbook/class_addressbook.inc:187
+#: plugins/addons/addressbook/class_addressbook.inc:288
 msgid "You are not allowed to delete this entry!"
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:281
+#: plugins/addons/addressbook/class_addressbook.inc:282
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Has decidido eliminar la entrada %s"
@@ -4093,14 +5304,13 @@ msgid "global addressbook"
 msgstr "Directorio de contactos global"
 
 #: plugins/addons/addressbook/class_addressbook.inc:468
-#, fuzzy
 msgid "user database"
-msgstr "Base de datos de FAX"
+msgstr "Usuario de Base de datos"
 
 #: plugins/addons/addressbook/class_addressbook.inc:472
-#, fuzzy, php-format
+#, php-format
 msgid "Contact stored in '%s'"
-msgstr "Contacto guardado en %s"
+msgstr "Contacto guardado en '%s'"
 
 #: plugins/addons/addressbook/class_addressbook.inc:474
 msgid "Creating new entry in"
@@ -4109,16 +5319,11 @@ 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:281
-#: plugins/addons/mailqueue/class_mailqueue.inc:346
+#: plugins/addons/mailqueue/class_mailqueue.inc:305
+#: plugins/addons/mailqueue/class_mailqueue.inc:370
 msgid "All"
 msgstr "Todo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:513 html/getxls.php:65
-#: html/getxls.php:174 html/getxls.php:224 html/getxls.php:236
-msgid "Given name"
-msgstr "Nombre"
-
 #: plugins/addons/addressbook/class_addressbook.inc:514
 msgid "Work phone"
 msgstr "Teléfono del trabajo"
@@ -4131,20 +5336,14 @@ msgstr "Móvil"
 msgid "Home phone"
 msgstr "Teléfono particular"
 
-#: plugins/addons/addressbook/class_addressbook.inc:515 html/getxls.php:80
-#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
-#: html/getxls.php:299
-msgid "User ID"
-msgstr "Identificador (ID) de usuario"
-
-#: plugins/addons/addressbook/class_addressbook.inc:596
+#: plugins/addons/addressbook/class_addressbook.inc:597
 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:604
+#: plugins/addons/addressbook/class_addressbook.inc:605
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -4181,7 +5380,6 @@ 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
-#, fuzzy
 msgid "Here is the status report for the import:"
 msgstr "Este es el informe de estado de la importación:"
 
@@ -4189,7 +5387,7 @@ msgstr "Este es el informe de estado de la importación:"
 msgid "Selected Template"
 msgstr "Plantilla seleccionada"
 
-#: plugins/addons/ldapmanager/main.inc:23
+#: plugins/addons/ldapmanager/main.inc:40
 #: plugins/addons/ldapmanager/class_ldif.inc:7
 msgid "LDAP manager"
 msgstr "Gestor LDAP"
@@ -4264,14 +5462,20 @@ msgid "Import LDIF File"
 msgstr "Importar archivo LDIF"
 
 #: plugins/addons/ldapmanager/contentimport.tpl:24
-msgid "Modify existing attributes"
+#, fuzzy
+msgid "Modify existing objects, keep untouched 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:25
+msgid "Overwrite existing objects, all not listed attributes will be removed"
+msgstr ""
+
+#: plugins/addons/ldapmanager/contentimport.tpl:34
+#, fuzzy
+msgid "Remove existing entries first"
+msgstr "Ha fallado la eliminación de las entradas DNS"
 
-#: plugins/addons/ldapmanager/contentimport.tpl:40
+#: plugins/addons/ldapmanager/contentimport.tpl:41
 msgid "Import successful"
 msgstr "Importación correcta"
 
@@ -4342,40 +5546,34 @@ msgid "Error while exporting the requested entries!"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:3
-#, fuzzy
 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 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."
+"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
-#, fuzzy
 msgid "Choose the data you want to Export"
-msgstr "Elija el departamento que quiera exportar"
+msgstr "Elija la información que quiera exportar"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:24
-#, fuzzy
 msgid "Export complete XLS for"
-msgstr "Exportación del LDIF completada para"
+msgstr "Exportación del XLS completada para"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:62
-#, fuzzy
 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"
+msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo XLS"
 
 #: plugins/addons/ldapmanager/contentexportxls.tpl:62
-#, fuzzy
 msgid "Click here to save the LDAP Export to a xls file"
-msgstr "Pulse aquí para exportar la base de datos LDAP"
+msgstr "Pulse aquí para exportar la base de datos LDAP a un fichero XLS"
 
 #: plugins/addons/ldapmanager/class_exportxls.inc:7
-#, fuzzy
 msgid "XLS import"
-msgstr "Importar desde CSV"
+msgstr "Importar desde XLS"
 
 #: plugins/addons/logview/contents.tpl:11
 msgid "Show hosts"
@@ -4391,7 +5589,7 @@ msgstr "Intervalo de tiempo"
 
 #: plugins/addons/logview/contents.tpl:48
 msgid "Enter string to search for"
-msgstr "Introducir la cadena de busqueda"
+msgstr "Introducir la cadena de búsqueda"
 
 #: plugins/addons/logview/contents.tpl:60
 msgid "Ruleset"
@@ -4406,10 +5604,11 @@ msgid "Hostname"
 msgstr "Nombre de Maquina"
 
 #: plugins/addons/logview/contents.tpl:85
+#: plugins/addons/notifications/contents.tpl:44
 msgid "Message"
 msgstr "Mensaje"
 
-#: plugins/addons/logview/main.inc:23
+#: plugins/addons/logview/main.inc:33
 msgid "System log view"
 msgstr "Ver registro del sistema"
 
@@ -4473,19 +5672,16 @@ msgid "one month"
 msgstr "un mes"
 
 #: plugins/addons/mailqueue/contents.tpl:12
-#, fuzzy
 msgid "Please enter a search string here."
-msgstr "Por favor introduzca un número de serie válido"
+msgstr "Por favor introduzca una cadena de búsqueda aqui."
 
 #: plugins/addons/mailqueue/contents.tpl:14
-#, fuzzy
 msgid "Select a server"
-msgstr "Seleccione para ver los servidores"
+msgstr "Seleccione un servidor"
 
 #: plugins/addons/mailqueue/contents.tpl:17
-#, fuzzy
 msgid "with status"
-msgstr "Estado"
+msgstr "Con estado"
 
 #: plugins/addons/mailqueue/contents.tpl:21
 msgid "within the last"
@@ -4500,9 +5696,8 @@ msgid "Remove all messages from selected servers queue"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:31
-#, fuzzy
 msgid "Hold all messages"
-msgstr "reenviar mensajes a"
+msgstr "Guardar todos los mensajes"
 
 #: plugins/addons/mailqueue/contents.tpl:32
 msgid "Hold all messages in selected servers queue"
@@ -4525,186 +5720,346 @@ msgid "Requeue all messages in selected servers queue"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:46
-#, fuzzy
 msgid "Search returned no results"
-msgstr "La busqueda no ha encontrado resultados"
+msgstr "La búsqueda no ha devuelto resultados"
 
 #: plugins/addons/mailqueue/contents.tpl:52
-#, fuzzy
 msgid "ID"
-msgstr "UID"
+msgstr "ID"
 
 #: plugins/addons/mailqueue/contents.tpl:55
-#, fuzzy
 msgid "Arrival"
-msgstr "Abril"
+msgstr "Llegada"
 
 #: plugins/addons/mailqueue/contents.tpl:57
-#, fuzzy
 msgid "Recipient"
-msgstr "Descripción"
+msgstr "Recipiente"
 
 #: plugins/addons/mailqueue/contents.tpl:58
 msgid "Error"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:76
-#: plugins/addons/mailqueue/class_mailqueue.inc:349
-#, fuzzy
+#: plugins/addons/mailqueue/class_mailqueue.inc:373
 msgid "Active"
-msgstr "Privado"
+msgstr "Activo"
 
 #: plugins/addons/mailqueue/contents.tpl:93
-#, fuzzy
 msgid "Delete this message"
-msgstr "Borrar"
+msgstr "Eliminar este mensaje"
 
 #: plugins/addons/mailqueue/contents.tpl:97
 msgid "unhold"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:97
-#, fuzzy
 msgid "Release message"
-msgstr "Estado del mensaje"
+msgstr "Desbloquear el mensaje"
 
 #: plugins/addons/mailqueue/contents.tpl:101
-#, fuzzy
 msgid "hold"
-msgstr "método"
+msgstr "Poner en espera"
 
 #: plugins/addons/mailqueue/contents.tpl:101
-#, fuzzy
 msgid "Hold message"
-msgstr "Página Web Principal"
+msgstr "Poner el mensaje en espera"
 
 #: plugins/addons/mailqueue/contents.tpl:105
-#, fuzzy
 msgid "requeue"
-msgstr "Número de teléfono"
+msgstr "reencolar"
 
 #: plugins/addons/mailqueue/contents.tpl:105
 msgid "Requeue this message"
 msgstr ""
 
 #: plugins/addons/mailqueue/contents.tpl:108
-#, fuzzy
 msgid "header"
-msgstr "Remitente"
+msgstr "cabecera"
 
 #: plugins/addons/mailqueue/contents.tpl:108
-#, fuzzy
 msgid "Display header from this message"
-msgstr "Mostrar números que concuerdan con"
+msgstr "Mostrar cabeceras para este mensaje"
 
-#: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/main.inc:38
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
-#, fuzzy
 msgid "Mail queue"
-msgstr "Servidor"
+msgstr "Cola de correo"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:53
+#: plugins/addons/mailqueue/class_mailqueue.inc:58
 msgid ""
-"Please check your 'gosa.conf', there is no 'MAILQUEUE_QUERY_COMMAND' "
-"specified."
+"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:88
-#: plugins/addons/mailqueue/class_mailqueue.inc:107
-#: plugins/addons/mailqueue/class_mailqueue.inc:116
+#: 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/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/mailqueue/class_mailqueue.inc:251
-msgid "up"
+#: plugins/addons/mailqueue/class_mailqueue.inc:225
+msgid "There are no mail server specified."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:253
-#, fuzzy
+#: plugins/addons/mailqueue/class_mailqueue.inc:275
+msgid "up"
+msgstr "Arriba"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:277
 msgid "down"
-msgstr "Dominio"
+msgstr "Abajo"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:296
+#: plugins/addons/mailqueue/class_mailqueue.inc:320
 msgid "no limit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:301
-#, fuzzy
+#: plugins/addons/mailqueue/class_mailqueue.inc:325
 msgid "hours"
-msgstr "hora"
+msgstr "horas"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:347
+#: plugins/addons/mailqueue/class_mailqueue.inc:371
 msgid "Hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:348
+#: plugins/addons/mailqueue/class_mailqueue.inc:372
 msgid "Un hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:350
+#: plugins/addons/mailqueue/class_mailqueue.inc:374
 msgid "Not active"
 msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Lista de grupos"
+#: plugins/addons/godfs/contents.tpl:8
+msgid "DFS Shares"
+msgstr "Compartidos DFS"
 
-#: plugins/admin/groups/headpage.tpl:25
+#: plugins/addons/godfs/contents.tpl:26
 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."
+"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 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."
+"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/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
-msgstr "Seleccione para ver que grupos son grupos primarios de usuarios"
+#: plugins/addons/godfs/contents.tpl:40
+msgid "Display dfs shares matching"
+msgstr "Mostrar compartidos DFS que concuerden con"
 
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
-msgstr "Mostrar grupos primarios"
+#: 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/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Seleccione para ver que grupos tienen asignado un grupo samba"
+#: plugins/addons/godfs/generic.tpl:4
+msgid "DFS Properties"
+msgstr "Propiedades DFS"
 
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
-msgstr "Mostrar los grupos samba"
+#: plugins/addons/godfs/generic.tpl:8
+msgid "Name of dfs Share"
+msgstr "Nombre del compartido DFS"
 
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
-msgstr "Seleccione para ver que grupos tienen aplicaciones configuradas"
+#: plugins/addons/godfs/generic.tpl:16
+msgid "Fileserver"
+msgstr "Servidor de Archivos"
 
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
-msgstr "Mostrar los grupos de aplicaciones"
+#: plugins/addons/godfs/generic.tpl:20
+msgid "Share on Fileserver"
+msgstr "Compartido en el Servicio de Archivos"
 
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
+#: plugins/addons/godfs/generic.tpl:30
+msgid "DFS Location"
+msgstr "Localización del DFS"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:10
+msgid "DFS Managment"
+msgstr "Gestión de DFS"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:151
+#, fuzzy, php-format
+msgid "Removing of DFS share with dn '%s' failed."
+msgstr "Ha fallado la eliminación del compartido DFS"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:170
+msgid "No DFS entries found"
 msgstr ""
-"Seleccione para ver que grupos tienen configuración de correo electrónico"
 
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
-msgstr "Mostrar grupos de correo"
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+msgid "Go up one dfsshare"
+msgstr "Subir un nivel en el compartido DFS"
 
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+msgid "Go to dfs root"
+msgstr ""
 
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
-msgstr "Mostrar grupos funcionales"
+#: plugins/addons/godfs/class_dfsManagment.inc:215
+msgid "Create new dfsshare"
+msgstr "Crear un nuevo compartido DFS"
+
+#: plugins/addons/godfs/class_dfsManagment.inc:247
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr "Terminar"
+
+#: 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/class_dfsgeneric.inc:186
+#, fuzzy, php-format
+msgid "Saving dfs/generic with dn '%s' failed."
+msgstr "Ha fallado la grabación de componente genérico"
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:219
+#, fuzzy, php-format
+msgid "Removing dfs/generic with dn '%s' failed."
+msgstr "Ha fallado la eliminación de componente genérico"
+
+#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
+msgid "Distributed File System Administration"
+msgstr ""
+
+#: plugins/addons/notifications/main.inc:42
+#: plugins/addons/notifications/class_msgplug.inc:6
+#, fuzzy
+msgid "Notifications"
+msgstr "Intereses"
+
+#: plugins/addons/notifications/class_msgplug.inc:35
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/groups/class_groupGeneric.inc:867 include/class_acl.inc:164
+#: html/getxls.php:97 html/getxls.php:99 html/getxls.php:244
+msgid "Groups"
+msgstr "Grupos"
+
+#: plugins/addons/notifications/class_msgplug.inc:104
+#, fuzzy
+msgid "You have no permissions to send a message!"
+msgstr "No tiene permisos para crear un usuario en esta 'Base'."
+
+#: plugins/addons/notifications/class_msgplug.inc:108
+#, fuzzy
+msgid "No NOTIFY_COMMAND definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'ACTIONCMD' en 'gosa.conf'"
 
-#: plugins/admin/groups/mail.tpl:11
+#: plugins/addons/notifications/class_msgplug.inc:116
+#: 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/systems/class_workstationGeneric.inc:144
+#: plugins/admin/ogroups/class_termgroup.inc:166
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr "¡La ejecución de '%s' ha fallado!"
+
+#: plugins/addons/notifications/class_msgplug.inc:122
+#, fuzzy
+msgid "Please specify at least one recipient to send a message!"
+msgstr "Por favor especifique un nombre de script valido."
+
+#: plugins/addons/notifications/class_msgplug.inc:214
+#, fuzzy
+msgid "No DESC tag in message file:"
+msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
+
+#: plugins/addons/notifications/contents.tpl:2
+#, fuzzy
+msgid "Notification target"
+msgstr "No hay certificados instalados"
+
+#: plugins/addons/notifications/contents.tpl:7
+msgid "Use target from"
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:21
+#, fuzzy
+msgid "Available recipients"
+msgstr "Aplicaciones disponibles"
+
+#: plugins/addons/notifications/contents.tpl:22
+#: ihtml/themes/default/acl.tpl:30
+msgid "List message possible targets"
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:33
+#, fuzzy
+msgid "Recipients"
+msgstr "Recipiente"
+
+#: plugins/addons/notifications/contents.tpl:34
+#: ihtml/themes/default/acl.tpl:42
+msgid "List message recipients"
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:57
+#, fuzzy
+msgid "Send message"
+msgstr "Poner el mensaje en espera"
+
+#: plugins/addons/notifications/contents.tpl:68
+#, fuzzy
+msgid "Notification send!"
+msgstr "No hay certificados instalados"
+
+#: plugins/addons/notifications/contents.tpl:71
+msgid ""
+"Your message has been sent successfully. Press the continue button to get "
+"back to the notification plugin."
+msgstr ""
+
+#: plugins/addons/notifications/contents.tpl:74
+#: plugins/admin/users/template.tpl:48
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: plugins/admin/departments/class_departmentGeneric.inc:515
+#: plugins/admin/systems/SelectDeviceType.tpl:44
+#: plugins/admin/systems/ServiceAddDialog.tpl:29
+#: plugins/admin/fai/class_faiManagement.inc:430
+#: plugins/admin/fai/class_faiManagement.inc:595
+#: plugins/admin/fai/faiPackageNew.tpl:50
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+#: ihtml/themes/default/snapshotdialog.tpl:80
+msgid "Continue"
+msgstr "Continuar"
+
+#: 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"
 
@@ -4724,7 +6079,7 @@ msgstr "Permisos por defecto"
 msgid "Member permission"
 msgstr "Miembro con Permisos"
 
-#: plugins/admin/groups/mail.tpl:88
+#: 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"
 
@@ -4736,123 +6091,83 @@ 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/main.inc:39 plugins/admin/groups/main.inc:43
+#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
 msgid "Group administration"
 msgstr "Administración de grupos"
 
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42 html/getxls.php:97
-#: html/getxls.php:99 html/getxls.php:244
-msgid "Groups"
-msgstr "Grupos"
-
-#: plugins/admin/groups/class_groupManagement.inc:281
+#: plugins/admin/groups/class_groupManagement.inc:245
 #, 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:287
-#: plugins/admin/groups/class_groupManagement.inc:313
+#: plugins/admin/groups/class_groupManagement.inc:251
+#: plugins/admin/groups/class_groupManagement.inc:282
 msgid "You are not allowed to delete this group!"
 msgstr "¡No le está permitido eliminar este grupo!"
 
-#: plugins/admin/groups/class_groupManagement.inc:360
-#, fuzzy
-msgid "Create new group"
-msgstr "Crear cuenta telefónica"
-
-#: plugins/admin/groups/class_groupManagement.inc:367
-#: plugins/admin/applications/class_applicationManagement.inc:337
-#: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/ogroups/class_ogroupManagement.inc:371
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
-#, fuzzy
-msgid "Edit this entry"
-msgstr "Editar entrada"
-
-#: plugins/admin/groups/class_groupManagement.inc:368
-#: plugins/admin/applications/class_applicationManagement.inc:338
-#: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/ogroups/class_ogroupManagement.inc:372
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
-#, fuzzy
-msgid "Delete this entry"
-msgstr "Borrar"
-
-#: plugins/admin/groups/class_groupManagement.inc:378
-#: plugins/admin/users/class_userManagement.inc:728
-#, fuzzy
-msgid "Posix"
-msgstr "Proxy"
-
-#: plugins/admin/groups/class_groupManagement.inc:381
-#: plugins/admin/applications/class_applicationManagement.inc:348
-#: plugins/admin/ogroups/class_ogroupManagement.inc:483
-#: plugins/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Aplicación"
-
-#: plugins/admin/groups/class_groupManagement.inc:391
-#, fuzzy
-msgid "Groupname"
-msgstr "Nombre del grupo"
-
-#: plugins/admin/groups/class_groupManagement.inc:392
-#: plugins/admin/users/class_userManagement.inc:691
-#: plugins/admin/departments/generic.tpl:4
-#: plugins/admin/systems/terminal.tpl:1
-#: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:392
-#: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/gofon/conference/generic.tpl:4
-msgid "Properties"
-msgstr "Propiedades"
-
-#: plugins/admin/groups/class_groupManagement.inc:396
-#: plugins/admin/applications/class_applicationManagement.inc:362
-#: plugins/admin/ogroups/class_ogroupManagement.inc:397
-msgid "This table displays all groups, in the selected tree."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:115
+#: 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:167
+#: 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:284
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Samba group"
 msgstr "Grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:284
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain admins"
 msgstr "Administradores del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:284
+#: plugins/admin/groups/class_groupGeneric.inc:317
 msgid "Domain users"
 msgstr "Usuarios del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:285
+#: plugins/admin/groups/class_groupGeneric.inc:318
 msgid "Domain guests"
 msgstr "Invitados del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:290
+#: plugins/admin/groups/class_groupGeneric.inc:323
 #, php-format
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:622
-#: plugins/admin/ogroups/class_ogroup.inc:541
+#: 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
+#: plugins/admin/groups/class_groupGeneric.inc:693
+#, fuzzy, php-format
+msgid "Removing of groups/generic with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
+
+#: plugins/admin/groups/class_groupGeneric.inc: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: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/class_groupGeneric.inc:632
+#: plugins/admin/groups/class_groupGeneric.inc:732
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -4860,84 +6175,141 @@ msgstr ""
 "El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
 "numeros y guiones."
 
-#: plugins/admin/groups/class_groupGeneric.inc:643
-#: plugins/admin/groups/class_groupGeneric.inc:650
+#: 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/application.tpl:4
+#: plugins/admin/groups/class_groupGeneric.inc:862
+#, fuzzy
+msgid "Generic group settings"
+msgstr "Parámetros genéricos de la cola"
+
+#: plugins/admin/groups/class_groupGeneric.inc:874
+#, fuzzy
+msgid "Phone pickup group"
+msgstr "Miembros están en un grupo de salto telefónico"
+
+#: plugins/admin/groups/class_groupGeneric.inc:875
+#, fuzzy
+msgid "Nagios group"
+msgstr "Cuenta Nagios"
+
+#: plugins/admin/groups/class_groupGeneric.inc:878
+#, fuzzy
+msgid "Group member"
+msgstr "Miembros del grupo"
+
+#: plugins/admin/groups/class_groupGeneric.inc:879
+#, fuzzy
+msgid "Samba group type"
+msgstr "Grupo de samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:880
+#, fuzzy
+msgid "Samba SID"
+msgstr "Samba"
+
+#: plugins/admin/groups/application.tpl:3
+msgid "Release focus"
+msgstr "Enfocado a la versión"
+
+#: 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:7
-#, fuzzy
+#: plugins/admin/groups/application.tpl:19
 msgid "Add category"
-msgstr "Categoría"
+msgstr "Añadir categoría"
 
-#: plugins/admin/groups/application.tpl:12
+#: plugins/admin/groups/application.tpl:24
 msgid "Available applications"
 msgstr "Aplicaciones disponibles"
 
-#: plugins/admin/groups/acl.tpl:4
-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/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/class_groupMail.inc:227
+#: plugins/admin/groups/class_groupMail.inc:284 include/class_acl.inc:520
+#: include/class_acl.inc:596
 msgid "read"
 msgstr "leer"
 
-#: plugins/admin/groups/class_groupMail.inc:228
+#: plugins/admin/groups/class_groupMail.inc:285
 msgid "post"
 msgstr "post"
 
-#: plugins/admin/groups/class_groupMail.inc:229
+#: plugins/admin/groups/class_groupMail.inc:286
 msgid "external post"
 msgstr "post externo"
 
-#: plugins/admin/groups/class_groupMail.inc:230
+#: plugins/admin/groups/class_groupMail.inc:287
 msgid "append"
 msgstr "añadir"
 
-#: plugins/admin/groups/class_groupMail.inc:231
+#: plugins/admin/groups/class_groupMail.inc:288 include/class_acl.inc:521
+#: include/class_acl.inc:597
 msgid "write"
 msgstr "escribir"
 
-#: plugins/admin/groups/class_groupMail.inc:256
+#: plugins/admin/groups/class_groupMail.inc:312
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Esta 'dn' no tiene extensiones validas de correo."
 
-#: plugins/admin/groups/class_groupMail.inc:321
+#: plugins/admin/groups/class_groupMail.inc:377
 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:322
+#: plugins/admin/groups/class_groupMail.inc:378
 msgid "to the list of forwarders."
 msgstr "a la lista de remitentes."
 
-#: plugins/admin/groups/class_groupMail.inc:811
+#: plugins/admin/groups/class_groupMail.inc:613
+#, fuzzy, php-format
+msgid "Removing of groups/mail with dn '%s' failed."
+msgstr "Ha fallado la eliminación de parámetros de correo de grupo"
+
+#: plugins/admin/groups/class_groupMail.inc:777
+#, fuzzy, php-format
+msgid "Saving of groups/mail with dn '%s' failed."
+msgstr "Ha fallado la grabación de los parámetros de correo de grupos"
+
+#: plugins/admin/groups/class_groupMail.inc:806
 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:844
+#: plugins/admin/groups/class_groupMail.inc:839
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:848
-#, fuzzy
+#: plugins/admin/groups/class_groupMail.inc:843
 msgid "Please select a valid mail server."
-msgstr "Por favor introduzca un número de serie válido"
+msgstr "Por favor seleccione un servidor de correo valido."
+
+#: plugins/admin/groups/class_groupMail.inc:981
+#, fuzzy
+msgid "Group mail"
+msgstr "Nombre del grupo"
+
+#: plugins/admin/groups/class_groupMail.inc:989
+#, fuzzy
+msgid "Alternate addresses"
+msgstr "Direcciones alternativas"
+
+#: plugins/admin/groups/class_groupMail.inc:990
+#, fuzzy
+msgid "Forwarding addresses"
+msgstr "Cuenta Principal"
+
+#: plugins/admin/groups/class_groupMail.inc:993
+#: plugins/admin/systems/printer.tpl:63
+#: plugins/admin/systems/class_printGeneric.inc:804
+msgid "Permissions"
+msgstr "Permisos"
 
 #: plugins/admin/groups/mail_admins.tpl:4
 msgid "Folder administrators"
@@ -4947,11 +6319,18 @@ msgstr "Administradores de Carpetas"
 msgid "Select a specific department"
 msgstr "Seleccionar un departamento especifico"
 
-#: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
+#: 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:737
 msgid "Group name"
 msgstr "Nombre del grupo"
 
-#: plugins/admin/groups/generic.tpl:9
+#: plugins/admin/groups/generic.tpl:9 plugins/admin/groups/paste_generic.tpl:8
 msgid "Posix name of the group"
 msgstr "Nombre 'Posix' del grupo"
 
@@ -4963,38 +6342,40 @@ msgstr "Descripción del grupo"
 msgid "Choose subtree to place group in"
 msgstr "Elija lugar del árbol para colocar la aplicación"
 
-#: plugins/admin/groups/generic.tpl:36
+#: plugins/admin/groups/generic.tpl:41
+#: plugins/admin/groups/paste_generic.tpl:13
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Normalmente los identificadores (IDs) de grupos son autogenerados, "
 "seleccione aquí para ponerlo manualmente"
 
-#: plugins/admin/groups/generic.tpl:36
+#: plugins/admin/groups/generic.tpl:41
+#: plugins/admin/groups/paste_generic.tpl:15
 msgid "Force GID"
 msgstr "Forzar GID"
 
-#: plugins/admin/groups/generic.tpl:38
+#: plugins/admin/groups/generic.tpl:43
+#: plugins/admin/groups/paste_generic.tpl:18
 msgid "Forced ID number"
 msgstr "Número de ID forzado"
 
-#: plugins/admin/groups/generic.tpl:45
+#: plugins/admin/groups/generic.tpl:50
 msgid "Select to create a samba conform group"
 msgstr "Seleccione para crear un grupo samba"
 
-#: plugins/admin/groups/generic.tpl:50
+#: plugins/admin/groups/generic.tpl:55
 msgid "in domain"
 msgstr "en dominio"
 
-#: plugins/admin/groups/generic.tpl:67
+#: plugins/admin/groups/generic.tpl:72
 msgid "Members are in a phone pickup group"
 msgstr "Miembros están en un grupo de salto telefónico"
 
-#: plugins/admin/groups/generic.tpl:80
-#, fuzzy
+#: plugins/admin/groups/generic.tpl:85
 msgid "Members are in a nagios group"
-msgstr "Miembros están en un grupo de salto telefónico"
+msgstr "Miembros están en un grupo de Nagios"
 
-#: plugins/admin/groups/generic.tpl:96
+#: plugins/admin/groups/generic.tpl:101
 msgid "Group members"
 msgstr "Miembros del grupo"
 
@@ -5002,45 +6383,34 @@ msgstr "Miembros del grupo"
 msgid "Select users to add"
 msgstr "Seleccione usuarios que serán añadidos"
 
-#: plugins/admin/groups/group_objects.tpl:29
+#: plugins/admin/groups/group_objects.tpl:30
+#: plugins/admin/systems/class_divListSystem.inc:62
+#: 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:39
-#: plugins/admin/users/headpage.tpl:49
-#: plugins/admin/systems/glpiSelectUser.tpl:39
+#: 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:58
-msgid "This 'dn' is no acl container."
-msgstr "Este 'dn' no es un contenedor de listas de acceso."
-
-#: plugins/admin/groups/class_groupAcl.inc:203
-msgid "All fields are writeable"
-msgstr "Todos los campos son rellenarles."
-
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Opciones de aplicaciones"
-
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Mostrar las direcciones de los departamentos"
-
-#: plugins/admin/groups/mail_locals.tpl:42
-msgid "Display addresses matching"
-msgstr "Mostrar direcciones que concuerden con"
-
-#: plugins/admin/groups/class_groupApplication.inc:294
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Esta'dn' no es un grupo de aplicaciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:302
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr "Borrar aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:303
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -5048,11 +6418,11 @@ msgstr ""
 "Este grupo tiene la características de aplicación activa. Puede "
 "desactivarlas apretando a continuación."
 
-#: plugins/admin/groups/class_groupApplication.inc:305
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr "Crear aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:306
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -5060,121 +6430,254 @@ msgstr ""
 "Este grupo tiene la característica de aplicacióon desactivada. Puede "
 "activarlas apretando a continuación."
 
-#: plugins/admin/groups/class_groupApplication.inc:318
-#, fuzzy
+#: plugins/admin/groups/class_groupApplication.inc:417
 msgid "Invalid character in category name."
-msgstr "El campo 'Nombre' contiene caracteres no validos."
+msgstr "El campo 'Nombre de categoría' contiene caracteres no validos."
 
-#: plugins/admin/groups/class_groupApplication.inc:326
-#, fuzzy
+#: plugins/admin/groups/class_groupApplication.inc:425
 msgid "The specified category already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
+msgstr "La categoría especificada ya existe."
 
-#: plugins/admin/groups/class_groupApplication.inc:392
+#: plugins/admin/groups/class_groupApplication.inc:520
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "El nombre seleccionado de aplicación no es único. Por favor compruebe su "
 "base de datos LDAP."
 
-#: plugins/admin/groups/class_groupApplication.inc:428
+#: plugins/admin/groups/class_groupApplication.inc:556
 msgid "The selected application has no options."
 msgstr "La aplicación seleccionada no tiene opciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:520
-#: plugins/admin/departments/class_departmentManagement.inc:315
-#: plugins/admin/fai/class_faiManagement.inc:704
-#, fuzzy
+#: plugins/admin/groups/class_groupApplication.inc:638
+#: plugins/admin/departments/class_divListDepartment.inc:112
 msgid "department"
-msgstr "departamentos"
+msgstr "departamento"
 
-#: plugins/admin/groups/class_groupApplication.inc:528
-#, fuzzy
+#: plugins/admin/groups/class_groupApplication.inc:646
 msgid "application"
-msgstr "Aplicaciones"
+msgstr "aplicación"
 
-#: plugins/admin/groups/class_groupApplication.inc:559
-#: plugins/admin/groups/class_groupApplication.inc:595
-#, fuzzy
+#: plugins/admin/groups/class_groupApplication.inc:677
+#: plugins/admin/groups/class_groupApplication.inc:713
 msgid "Delete entry"
-msgstr "Borrar"
+msgstr "Borrar entrada"
 
-#: plugins/admin/groups/class_groupApplication.inc:563
-#: plugins/admin/groups/class_groupApplication.inc:593
+#: plugins/admin/groups/class_groupApplication.inc:681
+#: plugins/admin/groups/class_groupApplication.inc:711
 msgid "Move up"
-msgstr ""
+msgstr "Arriba"
 
-#: plugins/admin/groups/class_groupApplication.inc:564
-#: plugins/admin/groups/class_groupApplication.inc:594
-#, fuzzy
+#: plugins/admin/groups/class_groupApplication.inc:682
+#: plugins/admin/groups/class_groupApplication.inc:712
 msgid "Move down"
-msgstr "Dominio"
+msgstr "Abajo"
 
-#: plugins/admin/groups/class_groupApplication.inc:591
+#: plugins/admin/groups/class_groupApplication.inc:709
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-#: plugins/admin/systems/glpiSelectUser.tpl:6
-msgid "List of users"
-msgstr "Lista de usuarios"
+#: plugins/admin/groups/class_groupApplication.inc:737
+msgid "This application is no longer available."
+msgstr "La aplicación ya no está disponible."
 
-#: plugins/admin/users/headpage.tpl:24
-msgid ""
-"This menu allows you to create, edit and delete selected users. Having a "
-"great number of users, you may want to use the range selectors on top of the "
-"user list."
+#: plugins/admin/groups/class_groupApplication.inc:740
+#, php-format
+msgid "This application is not available in any release named %s."
 msgstr ""
-"Este menú provee la funcionalidad de crear, editar o borrar los usuarios "
-"seleccionados. Si tiene un gran numero de usuarios usted preferirá usar los "
-"selectores de rangos en la parte superior del listado."
 
-#: plugins/admin/users/headpage.tpl:38
-msgid "Select to see template pseudo users"
-msgstr "Seleccione para mostrar los usuarios pseudo plantillas"
+#: plugins/admin/groups/class_groupApplication.inc:744
+msgid "Check parameter"
+msgstr "Comprobar parámetros"
 
-#: plugins/admin/users/headpage.tpl:38 plugins/admin/fai/headpage.tpl:72
-msgid "Show templates"
-msgstr "Mostrar plantillas"
+#: plugins/admin/groups/class_groupApplication.inc:746
+msgid "This application has changed parameters."
+msgstr "Los parámetros de la aplicación han cambiado."
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Select to see users that have only a GOsa object"
-msgstr "Seleccione para ver los usuarios que solo tienen un objeto GOsa"
+#: plugins/admin/groups/class_groupApplication.inc:832
+#, fuzzy, php-format
+msgid "Removing of groups/applications with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
 
-#: plugins/admin/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr "Mostrar usuarios funcionales"
+#: plugins/admin/groups/class_groupApplication.inc:877
+#, fuzzy, php-format
+msgid "Saving of groups/applications with dn '%s' failed."
+msgstr "Ha fallado la grabación de la aplicación"
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Select to see users that have posix settings"
-msgstr "Seleccione para ver usuario que tienen configuraciones posix"
+#: plugins/admin/groups/class_groupApplication.inc:919
+#, php-format
+msgid ""
+"Can't resolve the release name '%s', setting release name to '%s'. Possibly "
+"the objects base has changed."
+msgstr ""
 
-#: plugins/admin/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr "Mostrar los usuarios unix"
+#: plugins/admin/groups/class_groupApplication.inc:1063
+#, fuzzy
+msgid "Group applications"
+msgstr "Mostrar aplicaciones"
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Select to see users that have mail settings"
-msgstr "Seleccione para ver los usuarios que tiene confiraciones de correo"
+#: plugins/admin/groups/class_groupApplication.inc:1070
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/applications/class_applicationGeneric.inc:484
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_ogroupManagement.inc:384
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:665
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Aplicación"
 
-#: plugins/admin/users/headpage.tpl:41
-msgid "Show mail users"
-msgstr "Mostrar los usuarios de correo"
+#: plugins/admin/groups/class_groupApplication.inc:1071
+#: plugins/admin/applications/class_applicationGeneric.inc:494
+#, fuzzy
+msgid "Application parameter"
+msgstr "Nombre de la aplicación"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Select to see users that have samba settings"
-msgstr "Seleccione para ver los usuarios que tiene configuraciones samba"
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/admin/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr "Mostrar usuarios samba"
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Mostrar las direcciones de los departamentos"
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Select to see users that have proxy settings"
-msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
+#: plugins/admin/groups/mail_locals.tpl:42
+msgid "Display addresses matching"
+msgstr "Mostrar direcciones que concuerden con"
 
-#: plugins/admin/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr "Mostrar los usuarios de proxy"
+#: 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
+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:55
+msgid "Groupname / Department"
+msgstr "Nombre de grupo / Departamento"
+
+#: plugins/admin/groups/class_divListGroup.inc:56
+#: plugins/admin/users/class_divListUsers.inc:57
+#: plugins/admin/departments/generic.tpl:4
+#: plugins/admin/systems/terminal.tpl:1
+#: plugins/admin/systems/workstation.tpl:1
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
+#: plugins/admin/fai/faiScriptEntry.tpl:29
+#: plugins/gofon/conference/generic.tpl:4
+msgid "Properties"
+msgstr "Propiedades"
+
+#: plugins/admin/groups/class_divListGroup.inc:60
+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:60
+msgid "Show primary groups"
+msgstr "Mostrar grupos primarios"
+
+#: plugins/admin/groups/class_divListGroup.inc:61
+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:61
+msgid "Show samba groups"
+msgstr "Mostrar los grupos samba"
+
+#: plugins/admin/groups/class_divListGroup.inc:62
+msgid "Select to see groups that have applications configured"
+msgstr "Seleccione para ver que grupos tienen aplicaciones configuradas"
+
+#: plugins/admin/groups/class_divListGroup.inc:62
+msgid "Show application groups"
+msgstr "Mostrar los grupos de aplicaciones"
+
+#: plugins/admin/groups/class_divListGroup.inc:63
+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:63
+msgid "Show mail groups"
+msgstr "Mostrar grupos de correo"
+
+#: plugins/admin/groups/class_divListGroup.inc:64
+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:64
+msgid "Show functional groups"
+msgstr "Mostrar grupos funcionales"
+
+#: plugins/admin/groups/class_divListGroup.inc:105
+msgid "Create new group"
+msgstr "Crear nuevo grupo"
+
+#: plugins/admin/groups/class_divListGroup.inc:139
+#: plugins/admin/users/class_divListUsers.inc:161
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_divListGroup.inc:164
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/applications/class_divListApplication.inc:157
+#: plugins/admin/ogroups/class_divListOGroup.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
+msgid "cut"
+msgstr "Cortar"
+
+#: plugins/admin/groups/class_divListGroup.inc:164
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/applications/class_divListApplication.inc:157
+#: plugins/admin/ogroups/class_divListOGroup.inc:156
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:167
+msgid "Cut this entry"
+msgstr "Cortar por esta entrada"
+
+#: plugins/admin/groups/class_divListGroup.inc:166
+#: plugins/admin/users/class_divListUsers.inc:219
+#: plugins/admin/applications/class_divListApplication.inc:159
+#: plugins/admin/ogroups/class_divListOGroup.inc:158
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:169
+msgid "copy"
+msgstr ""
+
+#: plugins/admin/groups/class_divListGroup.inc:166
+#: plugins/admin/users/class_divListUsers.inc:219
+#: plugins/admin/applications/class_divListApplication.inc:159
+#: plugins/admin/ogroups/class_divListOGroup.inc:158
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:169
+msgid "Copy this entry"
+msgstr "Copiar esta entrada"
+
+#: plugins/admin/groups/class_divListGroup.inc:169
+#: plugins/admin/applications/class_divListApplication.inc:162
+#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/ogroups/class_divListOGroup.inc:161
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:172
+#: plugins/gofon/conference/class_divListConferences.inc:124
+msgid "Edit this entry"
+msgstr "Editar esta entrada"
+
+#: plugins/admin/groups/class_divListGroup.inc:172
+#: plugins/admin/applications/class_divListApplication.inc:165
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:164
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:174
+#: plugins/gofon/conference/class_divListConferences.inc:127
+#: plugins/gofon/conference/class_divListConferences.inc:129
+msgid "Delete this entry"
+msgstr "Borrar esta entrada"
 
 #: plugins/admin/users/remove.tpl:6
 msgid ""
@@ -5197,216 +6700,226 @@ msgstr ""
 "cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
 "contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:65
-#: plugins/admin/systems/class_glpiSelectUser.inc:108 html/getxls.php:68
-#: html/getxls.php:70 html/getxls.php:243
-msgid "Users"
-msgstr "Usuarios"
-
-#: plugins/admin/users/class_userManagement.inc:247
-#: plugins/admin/users/class_userManagement.inc:317
+#: plugins/admin/users/class_userManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:273
 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:353
+#: plugins/admin/users/class_userManagement.inc:312
 #, 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:359
-#: plugins/admin/users/class_userManagement.inc:387
-#: plugins/admin/fai/class_faiManagement.inc:378
+#: plugins/admin/users/class_userManagement.inc:318
+#: plugins/admin/users/class_userManagement.inc:345
 msgid "You are not allowed to delete this user!"
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/users/class_userManagement.inc:488
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:392
-#: plugins/admin/ogroups/class_ogroup.inc:240
+#: plugins/admin/users/class_userManagement.inc:453
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
+#: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:559
+#: plugins/admin/users/class_userManagement.inc:532
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Una persona con el nombre elegido ya existe en el árbol"
 
-#: plugins/admin/users/class_userManagement.inc:674
-#, fuzzy
-msgid "Create new user"
-msgstr "Crear una nueva entrada en"
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Crear un nuevo usuario usando plantillas"
 
-#: plugins/admin/users/class_userManagement.inc:674
-#, fuzzy
-msgid "New user"
-msgstr "usuarios"
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"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."
 
-#: plugins/admin/users/class_userManagement.inc:675
-#, fuzzy
-msgid "Create new template"
-msgstr "Nueva plantilla"
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:768
+#: plugins/admin/fai/class_faiTemplate.inc:414
+msgid "Template"
+msgstr "Plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:675
-msgid "New template"
-msgstr "Nueva 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_userManagement.inc:682
-#, fuzzy
-msgid "password"
-msgstr "Contraseña"
+#: plugins/admin/users/class_divListUsers.inc:35
+#: plugins/admin/users/class_divListUsers.inc:36
+#: plugins/admin/systems/glpiSelectUser.tpl:6
+msgid "List of users"
+msgstr "Lista de usuarios"
+
+#: plugins/admin/users/class_divListUsers.inc:40
+msgid ""
+"This menu allows you to create, edit and delete selected users. Having a "
+"great number of users, you may want to use the range selectors on top of the "
+"user list."
+msgstr ""
+"Este menú provee la funcionalidad de crear, editar o borrar los usuarios "
+"seleccionados. Si tiene un gran numero de usuarios usted preferirá usar los "
+"selectores de rangos en la parte superior del listado."
 
-#: plugins/admin/users/class_userManagement.inc:690
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
-#: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
+#: plugins/admin/users/class_divListUsers.inc:56
+#: 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"
 
-#: plugins/admin/users/class_userManagement.inc:695
-msgid "This table displays all users, in the selected tree."
-msgstr ""
+#: plugins/admin/users/class_divListUsers.inc:60
+msgid "Select to see template pseudo users"
+msgstr "Seleccione para mostrar los usuarios pseudo plantillas"
+
+#: plugins/admin/users/class_divListUsers.inc:60
+#: plugins/admin/fai/class_divListFai.inc:69
+msgid "Show templates"
+msgstr "Mostrar plantillas"
+
+#: plugins/admin/users/class_divListUsers.inc:61
+msgid "Select to see users that have only a GOsa object"
+msgstr "Seleccione para ver los usuarios que solo tienen objeto GOsa"
+
+#: plugins/admin/users/class_divListUsers.inc:61
+msgid "Show functional users"
+msgstr "Mostrar usuarios funcionales"
+
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Select to see users that have posix settings"
+msgstr "Seleccione para ver usuario que tienen configuraciones posix"
+
+#: plugins/admin/users/class_divListUsers.inc:62
+msgid "Show unix users"
+msgstr "Mostrar los usuarios unix"
+
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Select to see users that have mail settings"
+msgstr "Seleccione para ver los usuarios que tiene confiraciones de correo"
 
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_divListUsers.inc:63
+msgid "Show mail users"
+msgstr "Mostrar los usuarios de correo"
+
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Select to see users that have samba settings"
+msgstr "Seleccione para ver los usuarios que tiene configuraciones samba"
+
+#: plugins/admin/users/class_divListUsers.inc:64
+msgid "Show samba users"
+msgstr "Mostrar usuarios samba"
+
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Select to see users that have proxy settings"
+msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
+
+#: plugins/admin/users/class_divListUsers.inc:65
+msgid "Show proxy users"
+msgstr "Mostrar los usuarios de proxy"
+
+#: plugins/admin/users/class_divListUsers.inc:110
+msgid "Create new user"
+msgstr "Crear nuevo usuario"
+
+#: plugins/admin/users/class_divListUsers.inc:110
+msgid "New user"
+msgstr "Nuevo usuario"
+
+#: plugins/admin/users/class_divListUsers.inc:112
+msgid "Create new template"
+msgstr "Crear nueva plantilla"
+
+#: plugins/admin/users/class_divListUsers.inc:112
+msgid "New template"
+msgstr "Nueva plantilla"
+
+#: plugins/admin/users/class_divListUsers.inc:159
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:727
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:160
 msgid "Edit generic properties"
-msgstr "Editar propiedades"
+msgstr "Editar propiedades genéricas"
 
-#: plugins/admin/users/class_userManagement.inc:729
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:162
 msgid "Edit UNIX properties"
-msgstr "Editar propiedades"
+msgstr "Editar propiedades UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:731
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:164
 msgid "Edit environment properties"
-msgstr "Editar propiedades"
+msgstr "Editar propiedades de estado"
 
-#: plugins/admin/users/class_userManagement.inc:733
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:166
 msgid "Edit mail properties"
-msgstr "Editar propiedades"
+msgstr "Editar propiedades de correo"
 
-#: plugins/admin/users/class_userManagement.inc:735
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:168
 msgid "Edit phone properties"
-msgstr "Editar propiedades"
+msgstr "Editar propiedades telefónicas"
 
-#: plugins/admin/users/class_userManagement.inc:737
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:170
 msgid "Edit fax properies"
-msgstr "Editar propiedades"
+msgstr "Editar propiedades de fax"
 
-#: plugins/admin/users/class_userManagement.inc:739
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:172
 msgid "Edit samba properties"
-msgstr "Editar propiedades"
+msgstr "Editar propiedades samba"
 
-#: plugins/admin/users/class_userManagement.inc:740
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:174
+msgid "Edit netatalk properties"
+msgstr "Editar propiedades Netatalk"
+
+#: plugins/admin/users/class_divListUsers.inc:175
 msgid "Create user from template"
-msgstr "Nueva plantilla"
+msgstr "Crear usuario desde plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:741
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:176
 msgid "Create user with this template"
-msgstr "Nueva plantilla"
+msgstr "Crear usuario con esta plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:800
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:223
+msgid "password"
+msgstr "contraseña"
+
+#: plugins/admin/users/class_divListUsers.inc:246
 msgid "Online"
-msgstr "en linea"
+msgstr "En linea"
 
-#: plugins/admin/users/class_userManagement.inc:807
-#, fuzzy
+#: plugins/admin/users/class_divListUsers.inc:253
 msgid "Offline"
-msgstr "fuera de linea"
-
-#: plugins/admin/users/class_userManagement.inc:1034
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:706
-msgid "Template"
-msgstr "Plantilla"
-
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Crear un nuevo usuario usando plantillas"
-
-#: plugins/admin/users/template.tpl:6
-#, fuzzy
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
-msgstr ""
-"Crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
-"valores en la base de datos serán rellenado automáticamente. Elegir "
-"<b>ninguno</b> para saltarse el uso de plantillas."
-
-#: plugins/admin/users/template.tpl:44
-#: plugins/admin/fai/class_faiManagement.inc:599
-#: plugins/admin/fai/faiPackageNew.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
-msgstr "Continuar"
-
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Administración de Usuarios"
-
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Lista de aplicaciones"
-
-#: plugins/admin/applications/headpage.tpl:24
-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/headpage.tpl:38
-msgid "Display applications matching"
-msgstr "Mostrar aplicaciones que concuerden con"
-
-#: plugins/admin/applications/headpage.tpl:41
-msgid "Regular expression for matching application names"
-msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
+msgstr "Fuera de linea"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationManagement.inc:357
+#: plugins/admin/applications/class_applicationGeneric.inc:450
+#: plugins/admin/applications/class_divListApplication.inc:51
 msgid "Application name"
 msgstr "Nombre de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:11
-#: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
+#: plugins/gofon/macro/generic.tpl:10
+#: plugins/gofon/macro/class_gofonMacro.inc:476 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Display name"
 msgstr "Nombre mostrado"
 
 #: plugins/admin/applications/generic.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:455
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 "Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
 
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
-#: plugins/admin/systems/workstation.tpl:88
-#: plugins/admin/ogroups/termgroup.tpl:13
+#: plugins/admin/applications/class_applicationGeneric.inc:489
+#: plugins/admin/systems/terminal.tpl:125 plugins/admin/systems/server.tpl:60
+#: plugins/admin/systems/workstation.tpl:103
+#: plugins/admin/systems/goMailServer.tpl:160
+#: plugins/admin/systems/goImapServer.tpl:87
+#: plugins/admin/ogroups/termgroup.tpl:85
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
 msgstr "Ejecute"
@@ -5416,87 +6929,117 @@ msgid "Path and/or binary name of application"
 msgstr "Ruta y nombre del binario de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:34
+#: plugins/admin/mimetypes/generic.tpl:40
 msgid "Choose subtree to place application in"
 msgstr "Elija lugar del árbol para colocar la aplicación"
 
-#: plugins/admin/applications/generic.tpl:48
+#: plugins/admin/applications/generic.tpl:55
+#: plugins/admin/applications/class_applicationGeneric.inc:491
+#: plugins/admin/mimetypes/generic.tpl:59
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:667
 msgid "Icon"
 msgstr "Icono"
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:63
+#: plugins/admin/mimetypes/generic.tpl:66
 msgid "Update"
 msgstr "Actualizar"
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:63
 msgid "Reload picture from LDAP"
 msgstr "Recargar imagen desde LDAP"
 
-#: plugins/admin/applications/generic.tpl:70
+#: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/class_applicationGeneric.inc:496
 msgid "Only executable for members"
 msgstr "Solo ejecutables para los miembros"
 
-#: plugins/admin/applications/generic.tpl:72
+#: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/class_applicationGeneric.inc:500
 msgid "Replace user configuration on startup"
 msgstr "Reemplazar la configuración del usuario en el inicio"
 
-#: plugins/admin/applications/generic.tpl:76
+#: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/class_applicationGeneric.inc:497
 msgid "Place icon on members desktop"
 msgstr "Colocar icono en los escritorios de los miembros "
 
-#: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/generic.tpl:86
+#: plugins/admin/applications/class_applicationGeneric.inc:499
 msgid "Place entry in members startmenu"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
-#: plugins/admin/applications/generic.tpl:82
-#, fuzzy
+#: plugins/admin/applications/generic.tpl:89
+#: plugins/admin/applications/class_applicationGeneric.inc:498
 msgid "Place entry in members launch bar"
-msgstr "Colocar entrado en los menús de inicio de los miembros"
+msgstr "Colocar entrada en los barra de inicio de los miembros"
 
-#: plugins/admin/applications/generic.tpl:95
+#: plugins/admin/applications/generic.tpl:102
 #: plugins/admin/systems/printerPPDDialog.tpl:11
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
-#, fuzzy
 msgid "Upload"
-msgstr "Carga de CPU"
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
+msgstr "Enviar"
+
+#: plugins/admin/applications/generic.tpl:103
+#: plugins/admin/fai/class_faiScript.inc:251
+#: plugins/admin/fai/class_faiTemplate.inc:224
+#: plugins/admin/fai/class_faiScriptEntry.inc:89
+#: plugins/admin/fai/class_faiHook.inc:274
+#: plugins/admin/fai/class_faiHookEntry.inc:84
+msgid "Download"
+msgstr "Descargar"
+
+#: plugins/admin/applications/class_applicationParameters.inc:52
 msgid "Remove options"
 msgstr "Eliminar opciones"
 
-#: plugins/admin/applications/class_applicationParameters.inc:51
+#: 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:53
+#: plugins/admin/applications/class_applicationParameters.inc:55
 msgid "Create options"
 msgstr "Crear opciones"
 
-#: plugins/admin/applications/class_applicationParameters.inc:54
+#: 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:91
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/admin/fai/class_faiVariable.inc:382
 msgid "Variable"
 msgstr "Variable"
 
-#: plugins/admin/applications/class_applicationParameters.inc:91
+#: 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:102
+#: plugins/admin/applications/class_applicationParameters.inc:104
 msgid "Add option"
 msgstr "Añadir opción"
 
-#: plugins/admin/applications/class_applicationParameters.inc:154
+#: plugins/admin/applications/class_applicationParameters.inc:128
+#, fuzzy, php-format
+msgid "Removing of application parameters with dn '%s' 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/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
+#: plugins/admin/applications/class_applicationParameters.inc:190
+#, fuzzy, php-format
+msgid "Saving of application parameters with dn '%s' failed."
+msgstr "Ha fallado la grabación de parámetros de aplicaciones"
+
+#: plugins/admin/applications/remove.tpl:6
+#: plugins/admin/mimetypes/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
+#: ihtml/themes/default/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for GOsa to get your data back."
@@ -5505,86 +7048,135 @@ msgstr ""
 "realmente hacer esto, ya que no hay manera de que GOsa recupere "
 "posteriormente la información."
 
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
+#: plugins/admin/applications/main.inc:39
+#: plugins/admin/applications/main.inc:41
 msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:86
-#, fuzzy
+#: plugins/admin/applications/class_applicationGeneric.inc:96
 msgid "no example"
-msgstr "incompleto"
+msgstr "sin ejemplo"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:106
+#: plugins/admin/applications/class_applicationGeneric.inc:116
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
 
+#: plugins/admin/applications/class_applicationGeneric.inc:203
+#, fuzzy, php-format
+msgid "Removing of application with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
+
 #: plugins/admin/applications/class_applicationGeneric.inc:215
+#, php-format
+msgid "Removing application from objectgroup '%s' failed"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:222
+#, 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:264
 msgid "The specified picture has not been uploaded correctly."
 msgstr "La foto indicada no ha sido subida correctamente."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:296
+#: plugins/admin/applications/class_applicationGeneric.inc:340
+msgid "Specified execute path must start with '/'."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:354
 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:301
+#: plugins/admin/applications/class_applicationGeneric.inc:359
 msgid "Required field 'Name' is not filled."
 msgstr "El campo requerido 'Nombre' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:305
+#: plugins/admin/applications/class_applicationGeneric.inc:363
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:309
+#: plugins/admin/applications/class_applicationGeneric.inc:367
 msgid "Required field 'Execute' is not filled."
 msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:318
+#: plugins/admin/applications/class_applicationGeneric.inc:382
+#: plugins/admin/applications/class_applicationGeneric.inc:390
 msgid "There's already an application with this 'Name'."
 msgstr "Ya existe una aplicación con este 'Nombre'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:250
+#: plugins/admin/applications/class_applicationGeneric.inc:421
+#, fuzzy, php-format
+msgid "Saving of application with dn '%s' failed."
+msgstr "Ha fallado la grabación de la aplicación"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:446
+msgid "Application settings"
+msgstr "Parámetros de aplicaciones"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:479
+#, fuzzy
+msgid "Application generic"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:492
+msgid "Flag"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:493
+#, fuzzy
+msgid "Script content"
+msgstr "Contenido de la Variable"
+
+#: plugins/admin/applications/class_applicationManagement.inc:289
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Va ha eliminar la aplicación '%s'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:256
-#: plugins/admin/applications/class_applicationManagement.inc:282
+#: plugins/admin/applications/class_applicationManagement.inc:295
+#: plugins/admin/applications/class_applicationManagement.inc:324
 msgid "You are not allowed to delete this application!"
 msgstr "¡No tiene permisos para eliminar esta aplicación!"
 
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#: plugins/admin/ogroups/class_ogroupManagement.inc:364
-#, fuzzy
-msgid "new"
-msgstr "Nuevo"
-
-#: plugins/admin/applications/class_applicationManagement.inc:330
-#, fuzzy
-msgid "Create new application"
-msgstr "Crear aplicaciones"
+#: plugins/admin/applications/class_divListApplication.inc:31
+msgid "List of Applications"
+msgstr "Lista de aplicaciones"
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr "Lista de Departamentos"
+#: plugins/admin/applications/class_divListApplication.inc:32
+msgid "This table displays all applications in the selected tree."
+msgstr "Esta tabla muestra todas las aplicaciones en el árbol seleccionado."
 
-#: plugins/admin/departments/headpage.tpl:24
+#: plugins/admin/applications/class_divListApplication.inc:36
 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."
+"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 los departamentos seleccionados. "
+"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 "
-"departamentos, cuando trabaja con un gran número de departamentos."
+"aplicaciones, cuando trabaja con un gran número de aplicaciones."
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
-msgstr "Mostrar Departamentos que concuerden con"
+#: plugins/admin/applications/class_divListApplication.inc:108
+#: plugins/admin/ogroups/class_divListOGroup.inc:115
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:117
+msgid "new"
+msgstr "nuevo"
 
-#: plugins/admin/departments/headpage.tpl:42
-msgid "Regular expression for matching department names"
-msgstr "Expresiones regulares para encontrar nombres de departamentos"
+#: plugins/admin/applications/class_divListApplication.inc:109
+msgid "Create new application"
+msgstr "Crear nueva aplicación"
+
+#: plugins/admin/applications/release_select.tpl:3
+#: plugins/admin/fai/branch_selector.tpl:3
+#: plugins/admin/mimetypes/release_select.tpl:3
+msgid "Branches"
+msgstr "Ramas"
+
+#: plugins/admin/applications/release_select.tpl:9
+#: plugins/admin/fai/branch_selector.tpl:9
+#: plugins/admin/mimetypes/release_select.tpl:9
+msgid "Current release"
+msgstr "Versión actual"
 
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
@@ -5595,11 +7187,12 @@ msgid "Name of subtree to create"
 msgstr "Nombre del subárbol para crear"
 
 #: plugins/admin/departments/generic.tpl:14
-#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/generic.tpl:61
 msgid "Descriptive text for department"
 msgstr "Descripción del departamento"
 
 #: plugins/admin/departments/generic.tpl:18
+#: plugins/admin/departments/class_departmentGeneric.inc:542
 msgid "Category"
 msgstr "Categoría"
 
@@ -5608,53 +7201,61 @@ msgid "Category for this subtree"
 msgstr "Categoría de este subarbol"
 
 #: plugins/admin/departments/generic.tpl:30
-#: plugins/gofon/conference/generic.tpl:122
+#: plugins/gofon/conference/generic.tpl:127
 msgid "Choose subtree to place department in"
 msgstr "Elija subárbol para colocar el departamento"
 
-#: plugins/admin/departments/generic.tpl:47
+#: plugins/admin/departments/generic.tpl:52
 msgid "State where this subtree is located"
 msgstr "País donde esta localizado el subarbol"
 
-#: plugins/admin/departments/generic.tpl:51
+#: plugins/admin/departments/generic.tpl:56
 msgid "Location of this subtree"
 msgstr "Localización de este subarbol"
 
-#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/departments/generic.tpl:60
 msgid "Postal address of this subtree"
 msgstr "Dirección postal de este subarbol"
 
-#: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/departments/generic.tpl:64
 msgid "Base telephone number of this subtree"
 msgstr "Número base de teléfono de este subarbol"
 
-#: plugins/admin/departments/generic.tpl:63
+#: plugins/admin/departments/generic.tpl:68
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Número base de fax de este subarbol"
 
-#: plugins/admin/departments/tabs_department.inc:29
-#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
-#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
-#: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
-#: plugins/admin/fai/tabsTemplate.inc:34
+#: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/class_departmentGeneric.inc:545
+msgid "Administrative settings"
+msgstr "Parámetros administrativos"
+
+#: plugins/admin/departments/generic.tpl:83
+msgid "Tag department as an independent administrative unit"
+msgstr ""
+
+#: plugins/admin/departments/tabs_department.inc:34
+#: plugins/admin/fai/tabsHook.inc:36 plugins/admin/fai/tabsPartition.inc:37
+#: plugins/admin/fai/tabsVariable.inc:37 plugins/admin/fai/tabsPackage.inc:36
+#: plugins/admin/fai/tabsProfile.inc:37 plugins/admin/fai/tabsScript.inc:37
+#: plugins/admin/fai/tabsTemplate.inc:37
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
 #: plugins/admin/departments/remove.tpl:6
 #: plugins/gofon/conference/remove.tpl:6
-#, fuzzy
 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 <b>todas</b> 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."
+"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/remove.tpl:10 plugins/admin/systems/remove.tpl:10
-#: plugins/admin/fai/remove.tpl:11 plugins/gofon/conference/remove.tpl:10
-#, fuzzy
+#: plugins/admin/acl/remove.tpl:10 plugins/admin/fai/remove.tpl:11
+#: 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 "
@@ -5662,108 +7263,218 @@ msgid ""
 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 <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
+"presione 'Eliminar' para continuar o 'Cancelar' para abortar."
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+#: plugins/admin/departments/dep_iframe.tpl:1
+#: plugins/admin/fai/faiNewBranch.tpl:33
+msgid "Processing the requested operation"
+msgstr "Procesando la operación pedida"
+
+#: plugins/admin/departments/dep_iframe.tpl:3
+msgid ""
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
+msgstr ""
+
+#: plugins/admin/departments/dep_iframe.tpl:8
+#: plugins/admin/fai/faiNewBranch.tpl:40
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
 msgid "Department management"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:150
+#: plugins/admin/departments/class_departmentGeneric.inc:172
+#, fuzzy, php-format
+msgid "Removing of department with dn '%s' failed."
+msgstr "Ha fallado la eliminación del departamento"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:221
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr "No tiene permisos para crear un departamento en esta 'Base'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:157
-#: plugins/admin/departments/class_departmentGeneric.inc:159
+#: plugins/admin/departments/class_departmentGeneric.inc:228
+#: plugins/admin/departments/class_departmentGeneric.inc:230
 msgid "Department with that 'Name' already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:167
+#: plugins/admin/departments/class_departmentGeneric.inc:238
 msgid "Required field 'Description' is not set."
 msgstr "El campo requerido 'Descripción' no ha sido rellenado."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:172
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
+#: plugins/admin/departments/class_departmentGeneric.inc:242
+#, 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."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:294
+msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
+msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:173
-msgid " Please choose another name."
-msgstr "Por favor elija otro nombre."
+#: plugins/admin/departments/class_departmentGeneric.inc:340
+#, fuzzy, php-format
+msgid "Saving of department with dn '%s' failed."
+msgstr "Ha fallado la grabación del departamento"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:382
+#, php-format
+msgid "Tagging '%s'."
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:460
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:496
+#: include/class_ldap.inc:455 include/class_acl.inc:492
+#: include/class_acl.inc:494 include/class_acl.inc:496
+#: include/class_acl.inc:499 ihtml/themes/default/snapshotdialog.tpl:14
+#: ihtml/themes/default/snapshotdialog.tpl:54
+msgid "Object"
+msgstr "Objeto"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:499
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
 
+#: plugins/admin/departments/class_departmentGeneric.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:534
 #: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/systems/class_glpiSelectUser.inc:108
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-#: plugins/admin/ogroups/class_ogroupManagement.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:391
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
 msgid "Departments"
 msgstr "Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:185
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
+#: plugins/admin/departments/class_departmentGeneric.inc:540
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Teléfono"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:541
+#: plugins/admin/departments/class_divListDepartment.inc:41
+msgid "Department name"
+msgstr "Nombre del departamento"
+
+#: plugins/admin/departments/class_departmentManagement.inc:158
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr "Esta a punto de borrar todo el subárbol LDAP colocado bajo '%s'."
 
-#: plugins/admin/departments/class_departmentManagement.inc:202
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
+#: plugins/admin/departments/class_departmentManagement.inc:179
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
 msgid "You have no permission to remove this department."
 msgstr "No tiene permisos para eliminar este departamento."
 
-#: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/fai/class_faiManagement.inc:635
-#, fuzzy
-msgid "Go to users home department"
-msgstr "Mostrar usuarios del departamento"
+#: plugins/admin/departments/class_departmentManagement.inc:339
+msgid ".."
+msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:281
-#, fuzzy
-msgid "Create new department"
-msgstr "Nombre del departamento"
+#: 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/class_departmentManagement.inc:289
-msgid "This table displays all departments, in the selected tree."
+#: plugins/admin/departments/class_divListDepartment.inc:33
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large number 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_departmentManagement.inc:298
-#, fuzzy
-msgid "Department name"
-msgstr "Mantenimiento de Departamentos"
+#: plugins/admin/departments/class_divListDepartment.inc:49
+msgid "Regular expression for matching department names"
+msgstr "Expresiones regulares para encontrar nombres de departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:392
-msgid ".."
-msgstr ""
+#: plugins/admin/departments/class_divListDepartment.inc:71
+#: plugins/admin/fai/class_divListFai.inc:123
+msgid "Go to users home department"
+msgstr "Ir al departamento base de los usuarios"
+
+#: plugins/admin/departments/class_divListDepartment.inc:74
+msgid "Create new department"
+msgstr "Crear nuevo departamento"
 
 #: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
-msgstr "Configuración de red"
+msgid "Network\tsettings"
+msgstr "Red\tparámetros"
 
-#: plugins/admin/systems/network.tpl:8
+#: plugins/admin/systems/network.tpl:9
 msgid "IP-address"
 msgstr "Dirección IP"
 
-#: plugins/admin/systems/network.tpl:16
+#: plugins/admin/systems/network.tpl:13
 msgid "MAC-address"
 msgstr "Dirección MAC"
 
+#: plugins/admin/systems/network.tpl:19
+msgid "Autodetect"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:41
+msgid "Enable DNS for this device"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/class_servDNS.inc:404
+#: plugins/admin/systems/servdnseditzone.tpl:67
+#: plugins/admin/fai/faiPackageNew.tpl:31
+#: plugins/gofon/phoneaccount/generic.tpl:68
+msgid "Refresh"
+msgstr "Refrescar"
+
+#: plugins/admin/systems/network.tpl:50
+msgid "Zone"
+msgstr "Zona"
+
+#: plugins/admin/systems/network.tpl:58
+#: plugins/admin/systems/class_servDNS.inc:166
+#: plugins/admin/systems/class_servDNS.inc:407
+#: plugins/admin/systems/class_termDNS.inc:521
+#: plugins/admin/systems/servdnseditzone.tpl:85
+msgid "TTL"
+msgstr ""
+
+#: plugins/admin/systems/network.tpl:63
+msgid "Dns records"
+msgstr "Registros DNS"
+
 #: plugins/admin/systems/class_terminalInfo.inc:54
 #: plugins/admin/systems/class_terminalInfo.inc:199
 msgid "present"
 msgstr "presente"
 
 #: plugins/admin/systems/class_terminalInfo.inc:67
-#: plugins/admin/systems/class_terminalService.inc:139
-#: plugins/admin/systems/class_terminalStartup.inc:99
-#: plugins/admin/systems/class_terminalGeneric.inc:128
-#: plugins/admin/systems/class_workstationStartup.inc:234
-#: plugins/admin/systems/class_workstationService.inc:131
+#: plugins/admin/systems/class_terminalService.inc:252
+#: plugins/admin/systems/class_terminalStartup.inc:151
+#: plugins/admin/systems/class_terminalGeneric.inc:230
+#: plugins/admin/systems/class_workstationStartup.inc:456
+#: plugins/admin/systems/class_workstationService.inc:252
 msgid "This 'dn' has no terminal features."
 msgstr "Esta 'dn' no tiene características de terminal."
 
 #: plugins/admin/systems/class_terminalInfo.inc:74
-#, fuzzy
 msgid "There is no php snmp module installed, can't gather any informations."
 msgstr ""
-"Aviso: imap_getacl no ha sido implementado, no se modificara información "
-"sobre las listas de acceso."
+"Aviso: no está instalado el módulo php_snmp, no se puede acceder a ninguna "
+"información."
 
 #: plugins/admin/systems/class_terminalInfo.inc:80
 #: plugins/admin/systems/class_terminalInfo.inc:174
@@ -5791,43 +7502,42 @@ msgstr "no esta activo"
 msgid "offline"
 msgstr "fuera de linea"
 
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "Exportación NFS"
-
 #: plugins/admin/systems/servservice.tpl:37
 msgid "Time Service"
 msgstr "Servicio de Hora"
 
 #: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/class_goLdapServer.inc:47
 msgid "LDAP Service"
 msgstr "Servicio LDAP"
 
-#: plugins/admin/systems/servservice.tpl:72
+#: plugins/admin/systems/servservice.tpl:70
 msgid "Terminal Service"
 msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/servservice.tpl:77
+#: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/class_goTerminalServer.inc:231
+#: plugins/admin/systems/goTerminalServer.tpl:6
 msgid "Temporary disable login"
 msgstr "Desactivación temporal del acceso"
 
-#: plugins/admin/systems/servservice.tpl:80
+#: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/class_terminalService.inc:437
+#: plugins/admin/systems/class_goTerminalServer.inc:232
+#: plugins/admin/systems/goTerminalServer.tpl:9
 msgid "Font path"
 msgstr "Ruta a las fuentes tipográficas"
 
-#: plugins/admin/systems/servservice.tpl:93
+#: plugins/admin/systems/servservice.tpl:91
+#: plugins/admin/systems/goSyslogServer.tpl:1
 msgid "Syslog Service"
 msgstr "Servicio de Logs"
 
-#: plugins/admin/systems/servservice.tpl:101
+#: plugins/admin/systems/servservice.tpl:99
+#: plugins/admin/systems/goCupsServer.tpl:1
 msgid "Print Service"
 msgstr "Servicio de impresión"
 
-#: plugins/admin/systems/servservice.tpl:109
-#, fuzzy
-msgid "Mail server"
-msgstr "Servidor"
-
 #: plugins/admin/systems/info.tpl:1
 msgid "System information"
 msgstr "Información de sistema"
@@ -5911,6 +7621,8 @@ msgid "SSH service"
 msgstr "Servicio SSH"
 
 #: plugins/admin/systems/info.tpl:119
+#: plugins/admin/systems/class_goCupsServer.inc:26
+#: plugins/admin/systems/class_goCupsServer.inc:46
 msgid "Print service"
 msgstr "Servicio de impresión"
 
@@ -5931,316 +7643,677 @@ msgstr "GUI"
 msgid "This 'dn' has no network features."
 msgstr "Esta 'dn' no tiene características de red."
 
-#: plugins/admin/systems/class_winGeneric.inc:137
-#: plugins/admin/systems/class_componentGeneric.inc:120
+#: plugins/admin/systems/class_winGeneric.inc:126
+#, php-format
+msgid "Removing of system wingeneric/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc:164
+#: plugins/admin/systems/class_componentGeneric.inc:155
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr "No tiene permisos para crear un componente en esta 'Base'."
 
-#: plugins/admin/systems/class_winGeneric.inc:147
-#: plugins/admin/systems/class_terminalGeneric.inc:262
-#: plugins/admin/systems/class_servGeneric.inc:183
-#: plugins/admin/systems/class_workstationGeneric.inc:220
-#: plugins/admin/systems/class_printGeneric.inc:500
-#: plugins/admin/systems/class_componentGeneric.inc:130
-#: plugins/admin/systems/class_phoneGeneric.inc:289
+#: plugins/admin/systems/class_winGeneric.inc:174
+#: plugins/admin/systems/class_terminalGeneric.inc:391
+#: plugins/admin/systems/class_servGeneric.inc:242
+#: plugins/admin/systems/class_workstationGeneric.inc:361
+#: plugins/admin/systems/class_printGeneric.inc:619
+#: plugins/admin/systems/class_componentGeneric.inc:165
+#: 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_winGeneric.inc:224
+#, php-format
+msgid "Saving of system wingeneric/generic with dn '%s' failed."
+msgstr ""
+
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr "Gestión del sistema"
 
-#: plugins/admin/systems/terminal.tpl:9
+#: plugins/admin/systems/terminal.tpl:8
 msgid "Terminal template"
 msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/terminal.tpl:11
+#: plugins/admin/systems/terminal.tpl:10
 msgid "Terminal name"
 msgstr "Nombre de terminal"
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/terminal.tpl:19 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:15
 #: plugins/admin/systems/component.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Elija un subárbol donde colocar el terminal"
 
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:45
-#: plugins/admin/systems/phonesettings.tpl:21
+#: plugins/admin/systems/terminal.tpl:34 plugins/admin/systems/server.tpl:32
+#: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/class_terminalGeneric.inc:496
+#: plugins/admin/systems/class_phoneGeneric.inc:420
+#: plugins/admin/systems/phonesettings.tpl:23
+#: plugins/admin/ogroups/termgroup.tpl:38
+#: plugins/admin/ogroups/class_termgroup.inc:357
 msgid "Mode"
 msgstr "Modo"
 
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:47
+#: 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/terminal.tpl:52
+#: plugins/admin/systems/terminal.tpl:42
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/systems/class_workstationGeneric.inc:476
+#: plugins/admin/ogroups/termgroup.tpl:47
+#: plugins/admin/ogroups/class_termgroup.inc:358
+msgid "Syslog server"
+msgstr "Servidor de Logs"
+
+#: 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/terminal.tpl:59
+#: plugins/admin/systems/class_terminalGeneric.inc:497
 msgid "Root server"
 msgstr "Servidor Raíz"
 
-#: plugins/admin/systems/terminal.tpl:54
+#: 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/terminal.tpl:60
+#: plugins/admin/systems/terminal.tpl:67
+#: plugins/admin/systems/class_terminalGeneric.inc:498
 msgid "Swap server"
 msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/terminal.tpl:62
+#: 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/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Syslog server"
-msgstr "Servidor de Logs"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:56
-msgid "Choose server to use for logging"
-msgstr "Elija un servidor que será usado para registro"
+#: plugins/admin/systems/terminal.tpl:86
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Inherit time server attributes"
+msgstr ""
 
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:62
+#: 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/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:64
+#: 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/terminal.tpl:99 plugins/admin/systems/server.tpl:38
-#: plugins/admin/systems/workstation.tpl:78
+#: 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/ogroups/termgroup.tpl:3
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/ogroups/termgroup.tpl:75
 msgid "Action"
 msgstr "Acción"
 
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:82
+#: 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/class_terminalService.inc:83
-#: plugins/admin/systems/class_workstationService.inc:69
+#: plugins/admin/systems/class_terminalService.inc:69
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:121
+msgid "unknown"
+msgstr "desconocido"
+
+#: plugins/admin/systems/class_terminalService.inc:72
+#: plugins/admin/systems/class_terminalService.inc:100
+#: plugins/admin/systems/class_terminalService.inc:106
+#: plugins/admin/systems/class_terminalService.inc:116
+#: plugins/admin/systems/class_terminalService.inc:117
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:123
+#: plugins/admin/systems/class_terminalService.inc:214
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_terminalService.inc:220
+#: plugins/admin/systems/class_terminalService.inc:223
+#: plugins/admin/systems/class_terminalService.inc:226
+#: plugins/admin/systems/class_terminalService.inc:229
+#: plugins/admin/systems/class_terminalService.inc:232
+#: plugins/admin/systems/class_terminalStartup.inc:39
+#: plugins/admin/systems/class_terminalStartup.inc:111
+#: plugins/admin/systems/class_terminalStartup.inc:131
+#: plugins/admin/systems/class_terminalGeneric.inc:114
+#: plugins/admin/systems/class_terminalGeneric.inc:280
+#: plugins/admin/systems/class_workstationGeneric.inc:118
+#: plugins/admin/systems/class_workstationStartup.inc:266
+#: plugins/admin/systems/class_workstationStartup.inc:284
+#: plugins/admin/systems/class_workstationStartup.inc:288
+#: plugins/admin/systems/class_workstationStartup.inc:758
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_workstationService.inc:207
+#: plugins/admin/systems/class_workstationService.inc:210
+#: plugins/admin/systems/class_workstationService.inc:213
+#: plugins/admin/systems/class_workstationService.inc:216
+#: plugins/admin/systems/class_workstationService.inc:219
+#: plugins/admin/systems/class_workstationService.inc:229
+#: plugins/admin/systems/class_workstationService.inc:230
+#: plugins/admin/systems/class_workstationService.inc:231
+#: plugins/admin/systems/class_workstationService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:233
+#: plugins/admin/systems/class_workstationService.inc:234
+#: plugins/admin/systems/class_workstationService.inc:235
+msgid "inherited"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:101
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+msgid "bit"
+msgstr "bit"
+
+#: plugins/admin/systems/class_terminalService.inc:155
 msgid "default"
 msgstr "por defecto"
 
-#: plugins/admin/systems/class_terminalService.inc:84
-#: plugins/admin/systems/class_workstationService.inc:70
+#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_workstationService.inc:138
 msgid "show chooser"
 msgstr "mostrar elegidos"
 
-#: plugins/admin/systems/class_terminalService.inc:85
-#: plugins/admin/systems/class_workstationService.inc:71
+#: plugins/admin/systems/class_terminalService.inc:157
+#: plugins/admin/systems/class_workstationService.inc:139
 msgid "direct"
 msgstr "Directo"
 
-#: plugins/admin/systems/class_terminalService.inc:88
-#: plugins/admin/systems/class_workstationService.inc:74
+#: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_workstationService.inc:142
 msgid "load balanced"
 msgstr "balanceo de carga"
 
-#: plugins/admin/systems/class_terminalService.inc:91
-#: plugins/admin/systems/class_workstationService.inc:77
+#: plugins/admin/systems/class_terminalService.inc:163
+#: plugins/admin/systems/class_workstationService.inc:145
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
-#: plugins/admin/systems/class_terminalService.inc:92
-#: plugins/admin/systems/class_workstationService.inc:78
+#: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_workstationService.inc:146
 msgid "ICA client"
 msgstr "Cliente ICA"
 
-#: plugins/admin/systems/class_terminalService.inc:187
-#: plugins/admin/systems/class_workstationService.inc:178
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_workstationService.inc:204
+msgid "Bit"
+msgstr "Bit"
+
+#: plugins/admin/systems/class_terminalService.inc:303
+#: plugins/admin/systems/class_workstationService.inc:302
 msgid "Choose the phone located at the current terminal"
 msgstr "Elija el teléfono localizado en el terminal actual"
 
-#: plugins/admin/systems/class_terminalService.inc:248
-#: plugins/admin/systems/class_terminalService.inc:253
-#: plugins/admin/systems/class_workstationService.inc:240
-#: plugins/admin/systems/class_workstationService.inc:245
+#: plugins/admin/systems/class_terminalService.inc:365
+#: plugins/admin/systems/class_terminalService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:375
 msgid "Please specify a valid VSync range."
 msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/admin/systems/class_terminalService.inc:263
-#: plugins/admin/systems/class_terminalService.inc:268
-#: plugins/admin/systems/class_workstationService.inc:255
-#: plugins/admin/systems/class_workstationService.inc:260
+#: plugins/admin/systems/class_terminalService.inc:380
+#: plugins/admin/systems/class_terminalService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:390
 msgid "Please specify a valid HSync range."
 msgstr "Por favor especifique un rango HSync valido"
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr "Nombre del servidor"
+#: plugins/admin/systems/class_terminalService.inc:416
+#, fuzzy, php-format
+msgid "Saving of object system terminal/service with dn '%s' failed."
+msgstr "Ha fallado la grabación de la información del servicio de terminal"
 
-#: plugins/admin/systems/server.tpl:42
-msgid "Select action to execute for this server"
-msgstr "Seleccione una acción que se ejecutara en este servidor"
+#: plugins/admin/systems/class_terminalService.inc:425
+#: plugins/admin/systems/class_workstationService.inc:440
+#, fuzzy
+msgid "Service"
+msgstr "Servicios"
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/class_terminalService.inc:426
+#: plugins/admin/systems/class_goTerminalServer.inc:29
+#: plugins/admin/systems/class_goTerminalServer.inc:49
+#: plugins/admin/systems/class_goTerminalServer.inc:223
+#: plugins/admin/systems/goTerminalServer.tpl:1
+#, fuzzy
+msgid "Terminal service"
+msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/class_servService.inc:264
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
+#: plugins/admin/systems/class_terminalService.inc:434
+#: plugins/admin/systems/class_workstationService.inc:449
+#, fuzzy
+msgid "Monitor"
+msgstr "Tamaño del monitor"
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Plantilla de estación de trabajo"
+#: plugins/admin/systems/class_terminalService.inc:435
+#: plugins/admin/ogroups/class_phonequeue.inc:738
+#, fuzzy
+msgid "Method"
+msgstr "método"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Nombre de la estación de trabajo"
+#: plugins/admin/systems/class_terminalService.inc:436
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: plugins/admin/systems/printer.tpl:6
+#: plugins/admin/systems/class_terminalService.inc:438
+#: plugins/admin/systems/class_workstationService.inc:450
 #, fuzzy
-msgid "General"
-msgstr "Genérico"
-
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Nombre de la impresora"
+msgid "Gfx driver"
+msgstr "Nuevo controlador de dispositivo"
 
-#: plugins/admin/systems/printer.tpl:30
-msgid "Details"
-msgstr ""
+#: plugins/admin/systems/class_terminalService.inc:439
+#: plugins/admin/systems/class_workstationService.inc:451
+#, fuzzy
+msgid "Gfx resolution"
+msgstr "Resolución"
 
-#: plugins/admin/systems/printer.tpl:33
+#: plugins/admin/systems/class_terminalService.inc:440
+#: plugins/admin/systems/class_workstationService.inc:452
 #, fuzzy
-msgid "Printer location"
-msgstr "Configuración telefónica"
+msgid "Gfx color depth"
+msgstr "Profundidad del Color"
 
-#: plugins/admin/systems/printer.tpl:37
-msgid "Printer URL"
-msgstr "URL de la impresora"
+#: plugins/admin/systems/class_terminalService.inc:441
+#: plugins/admin/systems/class_workstationService.inc:453
+#, fuzzy
+msgid "Hsync"
+msgstr "HSync"
 
-#: plugins/admin/systems/printer.tpl:45
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:86
-msgid "Driver"
-msgstr "Controlador"
+#: plugins/admin/systems/class_terminalService.inc:442
+#: plugins/admin/systems/class_workstationService.inc:454
+#, fuzzy
+msgid "Vsync"
+msgstr "VSync"
 
-#: plugins/admin/systems/printer.tpl:57
+#: plugins/admin/systems/class_terminalService.inc:443
 #, fuzzy
-msgid "Permissions"
-msgstr "Miembro con Permisos"
+msgid "Printer service enabled"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/class_terminalService.inc:444
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Servidor de Cola"
 
-#: plugins/admin/systems/printer.tpl:64
+#: plugins/admin/systems/class_terminalService.inc:445
+#: plugins/admin/systems/class_workstationService.inc:455
 #, fuzzy
-msgid "Users which are allowed to use this printer"
-msgstr "¡No tiene permisos para eliminar esta entrada!"
+msgid "Scanner enabled"
+msgstr "desactivado"
 
-#: plugins/admin/systems/printer.tpl:68 plugins/admin/systems/printer.tpl:84
+#: plugins/admin/systems/class_terminalService.inc:446
 #, fuzzy
-msgid "Add user"
-msgstr "Usuario administrador"
+msgid "Scanner model"
+msgstr "desactivado"
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+#: plugins/admin/systems/class_terminalService.inc:449
+#: plugins/admin/systems/class_workstationService.inc:456
 #, fuzzy
-msgid "Add group"
-msgstr "grupos"
+msgid "Keyboard model"
+msgstr "Elija modelo de teclado"
 
-#: plugins/admin/systems/printer.tpl:80
+#: plugins/admin/systems/class_terminalService.inc:450
+#: plugins/admin/systems/class_workstationService.inc:457
 #, fuzzy
-msgid "Users which are allowed to administrate this printer"
-msgstr "¡No tiene permisos para eliminar esta entrada!"
+msgid "Keyboard layout"
+msgstr "Elija localización del teclado"
 
-#: plugins/admin/systems/printer.tpl:81
+#: plugins/admin/systems/class_terminalService.inc:451
+#: plugins/admin/systems/class_workstationService.inc:458
 #, fuzzy
-msgid "Admins"
-msgstr "DN del administrador"
+msgid "Keyboard variant"
+msgstr "Elija variante de teclado"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
-msgstr "texto"
+#: plugins/admin/systems/class_terminalService.inc:452
+#: plugins/admin/systems/class_workstationService.inc:459
+#, fuzzy
+msgid "Mouse type"
+msgstr "Tipo MIME"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
-msgstr "Gráfico"
+#: plugins/admin/systems/class_terminalService.inc:453
+#: plugins/admin/systems/class_workstationService.inc:460
+#, fuzzy
+msgid "Mouse port"
+msgstr "Punto de montaje"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:62
-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_terminalService.inc:454
+#: plugins/admin/systems/class_workstationService.inc:461
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Componente telefónico"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/systems/class_workstationGeneric.inc:104
-#: plugins/admin/ogroups/class_termgroup.inc:66
-#: plugins/admin/ogroups/class_termgroup.inc:78
-#: plugins/admin/ogroups/class_termgroup.inc:90
+#: plugins/admin/systems/class_terminalStartup.inc:93
+#: plugins/admin/systems/class_workstationStartup.inc:309
 #, php-format
-msgid "Execution of '%s' failed!"
-msgstr "¡La ejecución de '%s' ha fallado!"
+msgid ""
+"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
+"exist."
+msgstr ""
+"El comando '%s', especificado como acción 'KERNELS' para la extensión '%s' "
+"no parece existir."
+
+#: plugins/admin/systems/class_terminalStartup.inc:386
+#, fuzzy, php-format
+msgid "Saving of system terminal/startup with dn '%s' failed."
+msgstr "Ha fallado la grabación de los parámetros de inicio de terminal"
+
+#: plugins/admin/systems/class_terminalStartup.inc:432
+#, fuzzy
+msgid "Terminal startup"
+msgstr "Plantilla de terminal"
+
+#: plugins/admin/systems/class_terminalStartup.inc:440
+#: plugins/admin/systems/class_workstationStartup.inc:1091
+#, fuzzy
+msgid "Ldap server"
+msgstr "Servidor LDAP"
+
+#: plugins/admin/systems/class_terminalStartup.inc:441
+#: plugins/admin/systems/class_workstationStartup.inc:1092
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "Boot kernel"
+msgstr "Kernel de inicio"
+
+#: plugins/admin/systems/class_terminalStartup.inc:442
+#: plugins/admin/systems/class_workstationStartup.inc:1093
+#, fuzzy
+msgid "Kernel parameter"
+msgstr "Comprobar parámetros"
+
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr "Nombre del servidor"
+
+#: plugins/admin/systems/server.tpl:54
+msgid "Select action to execute for this server"
+msgstr "Seleccione una acción que se ejecutara en este servidor"
+
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/printer.tpl:6
+msgid "General"
+msgstr "General"
+
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Nombre de la impresora"
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Details"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:39
+msgid "Printer location"
+msgstr "Localización de la impresora"
+
+#: plugins/admin/systems/printer.tpl:43
+msgid "Printer URL"
+msgstr "URL de la impresora"
+
+#: 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/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/printer.tpl:74 plugins/admin/systems/printer.tpl:90
+msgid "Add user"
+msgstr "Añadir usuario"
+
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
+msgid "Add group"
+msgstr "Añadir grupo"
+
+#: 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/printer.tpl:87
+msgid "Admins"
+msgstr "Administradores"
+
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
+msgstr "Plantilla de estación de trabajo"
+
+#: plugins/admin/systems/workstation.tpl:10
+#: plugins/admin/systems/class_workstationGeneric.inc:474
+msgid "Workstation name"
+msgstr "Nombre de la estación de trabajo"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:98
+msgid "text"
+msgstr "texto"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:99
+msgid "graphic"
+msgstr "Gráfico"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:74
+#: plugins/admin/systems/class_terminalGeneric.inc:161
+#, php-format
+msgid "Saving of system terminal/generic (FAIstate) with dn '%s' failed."
+msgstr ""
+
+#: 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/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:86
+#: 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_terminalGeneric.inc:145
-#: plugins/admin/systems/class_servGeneric.inc:115
-#: plugins/admin/systems/class_workstationGeneric.inc:131
-#: plugins/admin/ogroups/class_termgroup.inc:102
+#: plugins/admin/systems/class_terminalGeneric.inc:262
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:246
+#: plugins/admin/ogroups/class_termgroup.inc:249
 msgid "Switch off"
 msgstr "Apagar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:145
-#: plugins/admin/systems/class_servGeneric.inc:115
-#: plugins/admin/systems/class_workstationGeneric.inc:131
-#: plugins/admin/ogroups/class_termgroup.inc:102
+#: plugins/admin/systems/class_terminalGeneric.inc:263
+#: plugins/admin/systems/class_servGeneric.inc:161
+#: plugins/admin/systems/class_workstationGeneric.inc:246
+#: plugins/admin/ogroups/class_termgroup.inc:249
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:147
-#: plugins/admin/systems/class_servGeneric.inc:117
-#: plugins/admin/systems/class_workstationGeneric.inc:137
-#: plugins/admin/ogroups/class_termgroup.inc:102
+#: 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/systems/class_workstationGeneric.inc:251
+#: plugins/admin/systems/class_workstationGeneric.inc:257
+#: plugins/admin/ogroups/class_termgroup.inc:254
+msgid "Memory test"
+msgstr "Testeo de memoria"
+
+#: 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/systems/class_workstationGeneric.inc:252
+#: plugins/admin/systems/class_workstationGeneric.inc:258
+#: plugins/admin/ogroups/class_termgroup.inc:255
+msgid "System analysis"
+msgstr "Análisis del sistema"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:267
+#: plugins/admin/systems/class_servGeneric.inc:169
+#: plugins/admin/systems/class_workstationGeneric.inc:254
 msgid "Wake up"
 msgstr "Despertar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:245
+#: plugins/admin/systems/class_terminalGeneric.inc:319
+#, php-format
+msgid "Removing of object system terminal/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:374
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr "No tiene permisos para crear un terminal en esta 'Base'."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:249
+#: plugins/admin/systems/class_terminalGeneric.inc:378
 msgid "The required field 'Terminal name' is not set."
 msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
+#: plugins/admin/systems/class_terminalGeneric.inc:401
+#: plugins/admin/systems/class_workstationGeneric.inc:371
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:476
+#, php-format
+msgid "Saving of object system terminal/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_terminalGeneric.inc:487
+#: plugins/admin/systems/class_terminalGeneric.inc:493
+#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_goTerminalServer.inc:222
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:488
+#, fuzzy
+msgid "Terminal generic"
+msgstr "Servidor de terminal"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:499
+#, fuzzy
+msgid "Syslog server enabled"
+msgstr "Servidor de Logs"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:500
+#, fuzzy
+msgid "Ntp server settings"
+msgstr "Parámetros del usuario"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:503
+#: plugins/admin/systems/class_servGeneric.inc:328
+#: plugins/admin/systems/class_workstationGeneric.inc:478
+#: plugins/admin/ogroups/class_termgroup.inc:359
+#, fuzzy
+msgid "Action flag"
+msgstr "Acción"
+
+#: plugins/admin/systems/class_servGeneric.inc:43
+#: plugins/admin/systems/class_workstationGeneric.inc:102
+#: plugins/admin/ogroups/class_termgroup.inc:45
+msgid "Activated"
+msgstr "Activado"
+
+#: 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/class_servGeneric.inc:166
-#, fuzzy
+#: plugins/admin/systems/class_servGeneric.inc:75
+#: plugins/admin/systems/class_workstationGeneric.inc:140
+#: plugins/admin/ogroups/class_termgroup.inc:162
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'ACTIONCMD' en 'gosa.conf'"
+
+#: plugins/admin/systems/class_servGeneric.inc:111
+#, php-format
+msgid "Saving of system server/generic (FAIstate) with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:162
+#: plugins/admin/systems/class_workstationGeneric.inc:247
+#: plugins/admin/ogroups/class_termgroup.inc:250
+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:248
+#: plugins/admin/systems/class_workstationGeneric.inc:256
+#: plugins/admin/ogroups/class_termgroup.inc:251
+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:249
+#: plugins/admin/systems/class_workstationGeneric.inc:255
+#: plugins/admin/ogroups/class_termgroup.inc:252
+msgid "Reinstall"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:165
+#: plugins/admin/systems/class_workstationGeneric.inc:250
+#: plugins/admin/ogroups/class_termgroup.inc:253
+msgid "Rescan hardware"
+msgstr "Buscar hardware"
+
+#: plugins/admin/systems/class_servGeneric.inc:188
+#, fuzzy, php-format
+msgid "Removing of system server/generic with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la macro telefónica de presentación"
+
+#: plugins/admin/systems/class_servGeneric.inc:224
 msgid "The required field 'Server name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+msgstr "El campo requerido 'Nombre del servidor' no ha sido rellenado."
 
-#: plugins/admin/systems/class_servGeneric.inc:173
+#: 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:300
+#, php-format
+msgid "Saving of system server/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:316
+#, fuzzy
+msgid "Server generic"
+msgstr "Nombre del servidor"
+
+#: plugins/admin/systems/class_servGeneric.inc:326
+#: plugins/admin/systems/class_workstationGeneric.inc:475
+#, fuzzy
+msgid "Goto mode"
+msgstr "a la carpeta"
+
 #: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr "Eliminar servicio DHCP"
@@ -6265,398 +8338,262 @@ msgstr ""
 "Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
-#, fuzzy
-msgid "Activated"
-msgstr "Privado"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-#, fuzzy
-msgid "Memory test"
-msgstr "Memoria"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:73
-#, fuzzy
-msgid "System analysis"
-msgstr "Registro del sistema"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:100
-#, fuzzy
-msgid "No ACTIONCMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
+#: plugins/admin/systems/class_workstationGeneric.inc:174
+#: plugins/admin/ogroups/class_termgroup.inc:205
+#, fuzzy, php-format
+msgid "Saving of system workstation/generic (FAIstate) with dn '%s' failed."
+msgstr ""
+"Ha fallado la grabación de los parámetros de inicio de la estación de trabajo"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
+#: 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:132
-#, fuzzy
-msgid "Instant update"
-msgstr "Crear cuenta telefónica"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:133
-#: plugins/admin/systems/class_workstationGeneric.inc:139
-#, fuzzy
-msgid "Scheduled update"
-msgstr "Plantilla seleccionada"
-
-#: plugins/admin/systems/class_workstationGeneric.inc:134
-#: plugins/admin/systems/class_workstationGeneric.inc:138
-msgid "Reinstall"
-msgstr ""
-
-#: plugins/admin/systems/class_workstationGeneric.inc:135
-#, fuzzy
-msgid "Rescan hardware"
-msgstr "Componente telefónico"
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#, fuzzy, php-format
+msgid "Removing of system workstation/generic with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la estación de trabajo Samba"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:203
+#: plugins/admin/systems/class_workstationGeneric.inc:344
+#: plugins/admin/ogroups/class_termgroup.inc:113
 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:207
+#: plugins/admin/systems/class_workstationGeneric.inc:348
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 " El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
 
+#: plugins/admin/systems/class_workstationGeneric.inc:438
+#: plugins/admin/systems/class_workstationGeneric.inc:456
+#, fuzzy, php-format
+msgid "Saving of system workstation/generic with dn '%s' failed."
+msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:466
+#, fuzzy
+msgid "Workstation generic"
+msgstr "Nombre de la estación de trabajo"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:471
+#: plugins/admin/systems/class_systemManagement.inc:770
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/ogroups/class_ogroupManagement.inc:388
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Estación de trabajo"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:477
+#: plugins/admin/ogroups/class_termgroup.inc:360
+#, fuzzy
+msgid "Ntp server"
+msgstr "Servidor NTP"
+
 #: plugins/admin/systems/class_systemManagement.inc:32
 msgid "Systems"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:334
+#: 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/class_systemManagement.inc:350
+#: 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/class_systemManagement.inc:363
+#: 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/class_systemManagement.inc:407
+#: 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/class_systemManagement.inc:413
-#: plugins/admin/systems/class_systemManagement.inc:478
-#: plugins/admin/fai/class_faiManagement.inc:232
-#: plugins/admin/fai/class_faiManagement.inc:270
+#: plugins/admin/systems/class_systemManagement.inc:313
+#: plugins/admin/systems/class_systemManagement.inc:373
+#: plugins/admin/fai/class_faiManagement.inc:160
+#: plugins/admin/fai/class_faiManagement.inc:211
 msgid "You are not allowed to delete this component!"
 msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/systems/class_systemManagement.inc:570
-#, fuzzy
-msgid "New Terminal template"
-msgstr "Plantilla de terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:570
-#: plugins/admin/systems/class_systemManagement.inc:711
-#, fuzzy
-msgid "New Terminal"
+#: plugins/admin/systems/class_systemManagement.inc:648
+msgid "New terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:571
-#, fuzzy
-msgid "New Workstation template"
-msgstr "Plantilla de estación de trabajo"
-
-#: plugins/admin/systems/class_systemManagement.inc:571
-#: plugins/admin/systems/class_systemManagement.inc:712
-#, fuzzy
-msgid "New Workstation"
+#: plugins/admin/systems/class_systemManagement.inc:650
+msgid "New workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:572
-#, fuzzy
-msgid "New Server"
-msgstr "Servidor"
+#: plugins/admin/systems/class_systemManagement.inc:652
+msgid "New Device"
+msgstr "Nuevo dispositivo"
 
-#: plugins/admin/systems/class_systemManagement.inc:573
-#, fuzzy
-msgid "New Printer"
-msgstr "Impresora"
+#: plugins/admin/systems/class_systemManagement.inc:667
+msgid "Terminal template for"
+msgstr "Plantilla de terminal para"
 
-#: plugins/admin/systems/class_systemManagement.inc:574
-#, fuzzy
-msgid "New Phone"
-msgstr "Teléfono"
+#: plugins/admin/systems/class_systemManagement.inc:679
+msgid "Workstation template for"
+msgstr "Plantilla de estación de trabajo para"
 
-#: plugins/admin/systems/class_systemManagement.inc:575
-#, fuzzy
-msgid "New Component"
-msgstr "Otros componentes de red"
+#: plugins/admin/systems/class_systemManagement.inc:767
+msgid "New System from incoming"
+msgstr "Nuevo sistema desde la entrada"
 
-#: plugins/admin/systems/class_systemManagement.inc:581
-#, fuzzy
-msgid "Edit system"
-msgstr "Lista de sistemas"
+#: plugins/admin/systems/class_systemManagement.inc:771
+msgid "Workstation is installing"
+msgstr "La estación de trabajo se está instalando"
 
-#: plugins/admin/systems/class_systemManagement.inc:582
-#, fuzzy
-msgid "Delete system"
-msgstr "Borrar"
+#: plugins/admin/systems/class_systemManagement.inc:772
+msgid "Workstation is waiting for action"
+msgstr "la estación de trabajo esta esperando por una acción"
 
-#: plugins/admin/systems/class_systemManagement.inc:587
-#, fuzzy
-msgid "System"
-msgstr "Sistemas"
+#: plugins/admin/systems/class_systemManagement.inc:773
+msgid "Workstation installation failed"
+msgstr "Ha fallado la instalación de la estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:590
-#: plugins/admin/fai/class_faiManagement.inc:674
-msgid "This table displays all systems, in the selected tree."
+#: plugins/admin/systems/class_systemManagement.inc:776
+msgid "Server is installing"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:623
-#, fuzzy
-msgid "Cups Server"
-msgstr "Servidor"
+#: plugins/admin/systems/class_systemManagement.inc:777
+msgid "Server is waiting for action"
+msgstr "El servidor está esperando por una acción"
 
-#: plugins/admin/systems/class_systemManagement.inc:624
-msgid "Log Db"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:778
+msgid "Server installation failed"
+msgstr "Ha fallado la instalación del servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:625
-#, fuzzy
-msgid "Syslog Server"
-msgstr "Servidor de Logs"
+#: plugins/admin/systems/class_systemManagement.inc:779
+msgid "Winstation"
+msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/systems/class_systemManagement.inc:626
-#, fuzzy
-msgid "Mail Server"
-msgstr "Servidor"
+#: plugins/admin/systems/class_systemManagement.inc:780
+msgid "Network Device"
+msgstr "Dispositivo de Red"
 
-#: plugins/admin/systems/class_systemManagement.inc:627
-#, fuzzy
-msgid "Imap Server"
-msgstr "Servidor de Intercambio"
+#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_divListSystem.inc:103
+msgid "New Terminal"
+msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:628
-#, fuzzy
-msgid "Nfs Server"
-msgstr "Servidor"
+#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/systems/class_divListSystem.inc:105
+msgid "New Workstation"
+msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:629
-#, fuzzy
-msgid "Kerberos Server"
-msgstr "Kerberos"
-
-#: plugins/admin/systems/class_systemManagement.inc:630
-#, fuzzy
-msgid "Asterisk Server"
-msgstr "Base de datos de usuarios Asterisk"
-
-#: plugins/admin/systems/class_systemManagement.inc:631
-#, fuzzy
-msgid "Fax Server"
-msgstr "Servidor"
-
-#: plugins/admin/systems/class_systemManagement.inc:632
-#, fuzzy
-msgid "Ldap Server"
-msgstr "Servidor de Intercambio"
-
-#: plugins/admin/systems/class_systemManagement.inc:661
-#, fuzzy
-msgid "Set root password"
-msgstr "Poner Contraseña"
-
-#: plugins/admin/systems/class_systemManagement.inc:707
-#: plugins/admin/ogroups/class_ogroupManagement.inc:488
-#, fuzzy
-msgid "Terminal"
-msgstr "Terminales"
-
-#: plugins/admin/systems/class_systemManagement.inc:708
-#: plugins/admin/ogroups/class_ogroupManagement.inc:487
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Estación de trabajo"
-
-#: plugins/admin/systems/class_systemManagement.inc:713
-#, fuzzy
-msgid "Winstation"
-msgstr "Estación de trabajo"
-
-#: plugins/admin/systems/class_systemManagement.inc:714
-#, fuzzy
-msgid "Network Device"
-msgstr "Dispositivos de Red"
-
-#: plugins/admin/systems/class_systemManagement.inc:939
-msgid "New terminal"
-msgstr "Nuevo terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:942
-msgid "New workstation"
-msgstr "Nueva estación de trabajo"
-
-#: plugins/admin/systems/class_systemManagement.inc:959
-#, fuzzy
-msgid "Terminal template for"
-msgstr "Plantilla de terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:971
-msgid "Workstation template for"
-msgstr "Plantilla de estación de trabajo para"
-
-#: plugins/admin/systems/servdns.tpl:2
-#, fuzzy
+#: plugins/admin/systems/servdns.tpl:1
 msgid "Zones"
-msgstr "teléfonos"
-
-#: plugins/admin/systems/servdns.tpl:14
-#, fuzzy
-msgid "Zone settings"
-msgstr "Configuración telefónica"
-
-#: plugins/admin/systems/servdns.tpl:20
-#, fuzzy
-msgid "Zone name"
-msgstr "Número de teléfono"
-
-#: plugins/admin/systems/servdns.tpl:30
-#, fuzzy
-msgid "Subnet"
-msgstr "por debajo"
-
-#: plugins/admin/systems/servdns.tpl:40
-#, fuzzy
-msgid "SOA record for this zone"
-msgstr "Localización de este subarbol"
-
-#: plugins/admin/systems/servdns.tpl:46
-#, fuzzy
-msgid "Primary dns server for this zone"
-msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
+msgstr "Zonas"
 
-#: plugins/admin/systems/servdns.tpl:58
-msgid "Serialnumber (automatically generated)"
-msgstr ""
-
-#: plugins/admin/systems/servdns.tpl:68
-#: plugins/gofon/phoneaccount/generic.tpl:67
-#, fuzzy
-msgid "Refresh"
-msgstr "Referencias"
-
-#: plugins/admin/systems/servdns.tpl:74
-#: 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/servdns.tpl:80
-#, fuzzy
-msgid "Expire"
-msgstr "Exportar"
-
-#: plugins/admin/systems/servdns.tpl:86
-msgid "TTL"
-msgstr ""
-
-#: plugins/admin/systems/servdns.tpl:103
-msgid "DNS TTL"
-msgstr ""
-
-#: plugins/admin/systems/servdns.tpl:110
-#, fuzzy
-msgid "DNS Class"
-msgstr "clase"
+#: plugins/admin/systems/servkolab.tpl:9
+#: plugins/admin/systems/class_servKolab.inc:422
+msgid "Postfix mydomain"
+msgstr "Postfix mydomain"
 
-#: plugins/admin/systems/servdns.tpl:119
-msgid "Records"
-msgstr ""
+#: plugins/admin/systems/servkolab.tpl:16
+msgid "Postfix mydestination"
+msgstr "Postfix mydestination"
 
-#: plugins/admin/systems/servkolab.tpl:14
+#: plugins/admin/systems/servkolab.tpl:33
+#: plugins/admin/systems/class_servKolab.inc:432
 msgid "POP3 service"
 msgstr "Servicio POP3"
 
-#: plugins/admin/systems/servkolab.tpl:22
+#: plugins/admin/systems/servkolab.tpl:41
+#: plugins/admin/systems/class_servKolab.inc:434
 msgid "POP3/SSL service"
 msgstr "Servicio POP3/SSL"
 
-#: plugins/admin/systems/servkolab.tpl:30
+#: plugins/admin/systems/servkolab.tpl:49
+#: plugins/admin/systems/class_servKolab.inc:430
 msgid "IMAP service"
 msgstr "Servicio IMAP"
 
-#: plugins/admin/systems/servkolab.tpl:38
+#: plugins/admin/systems/servkolab.tpl:57
+#: plugins/admin/systems/class_servKolab.inc:433
 msgid "IMAP/SSL service"
 msgstr "Servicio IMAP/SSL"
 
-#: plugins/admin/systems/servkolab.tpl:46
+#: plugins/admin/systems/servkolab.tpl:65
+#: plugins/admin/systems/class_servKolab.inc:435
 msgid "Sieve service"
 msgstr "Servicio Sieve"
 
-#: plugins/admin/systems/servkolab.tpl:54
+#: plugins/admin/systems/servkolab.tpl:73
 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:62
+#: plugins/admin/systems/servkolab.tpl:81
 msgid "HTTP FreeBusy service (legacy)"
 msgstr "Servicio de presencia HTTP (propio)"
 
-#: plugins/admin/systems/servkolab.tpl:70
+#: plugins/admin/systems/servkolab.tpl:89
 msgid "Amavis email scanning (virus/spam)"
 msgstr "Desinfectado de correo Amavis (virus/spam)"
 
-#: plugins/admin/systems/servkolab.tpl:81
+#: plugins/admin/systems/servkolab.tpl:100
+#: plugins/admin/systems/class_servKolab.inc:436
 msgid "Quota settings"
 msgstr "Parámetros de quotas"
 
-#: plugins/admin/systems/servkolab.tpl:97
+#: plugins/admin/systems/servkolab.tpl:116
 msgid "Free/Busy settings"
 msgstr "Parámetros de Presencia"
 
-#: plugins/admin/systems/servkolab.tpl:102
+#: plugins/admin/systems/servkolab.tpl:121
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Permite descarga no autentificada de información de presencia."
 
-#: plugins/admin/systems/servkolab.tpl:117
+#: plugins/admin/systems/servkolab.tpl:136
+#: plugins/admin/systems/class_servKolab.inc:425
 msgid "SMTP privileged networks"
 msgstr "Redes privilegiadas SMTP"
 
-#: plugins/admin/systems/servkolab.tpl:122
+#: plugins/admin/systems/servkolab.tpl:141
 msgid "Hosts/networks allowed to relay"
 msgstr "Equipos/Redes que son permitidos para hacer relay"
 
-#: plugins/admin/systems/servkolab.tpl:125
+#: plugins/admin/systems/servkolab.tpl:144
 msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
+#: plugins/admin/systems/servkolab.tpl:157
 msgid "SMTP smarthost/relayhost"
 msgstr "SMTP smarthost/relayhos"
 
-#: plugins/admin/systems/servkolab.tpl:144
+#: plugins/admin/systems/servkolab.tpl:163
 msgid "Enable MX lookup for relayhost"
 msgstr "Permitir búsquedas MX para los relayhost"
 
-#: plugins/admin/systems/servkolab.tpl:149
+#: plugins/admin/systems/servkolab.tpl:168
 msgid "Host used to relay mails"
 msgstr "Equipo usado para reenviar correos"
 
-#: plugins/admin/systems/servkolab.tpl:163
+#: plugins/admin/systems/servkolab.tpl:182
+#: plugins/admin/systems/class_servKolab.inc:429
 msgid "Accept Internet Mail"
 msgstr "Aceptar correo desde internet"
 
-#: plugins/admin/systems/servkolab.tpl:169
+#: plugins/admin/systems/servkolab.tpl:188
 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/class_servDNS.inc:148
+#: plugins/admin/systems/class_servDNS.inc:32
+msgid "Domain name system service"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:73
 #: plugins/admin/systems/class_inventory.inc:36
 msgid "Remove DNS service"
 msgstr "Eliminar servicio DNS"
 
-#: plugins/admin/systems/class_servDNS.inc:149
+#: plugins/admin/systems/class_servDNS.inc:74
 #: plugins/admin/systems/class_inventory.inc:37
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
@@ -6664,12 +8601,12 @@ msgstr ""
 "Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servDNS.inc:151
+#: plugins/admin/systems/class_servDNS.inc:76
 #: plugins/admin/systems/class_inventory.inc:39
 msgid "Add DNS service"
 msgstr "Añadir servicio DNS"
 
-#: plugins/admin/systems/class_servDNS.inc:152
+#: plugins/admin/systems/class_servDNS.inc:77
 #: plugins/admin/systems/class_inventory.inc:40
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
@@ -6677,15 +8614,101 @@ msgstr ""
 "Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/servdb.tpl:6
+#: plugins/admin/systems/class_servDNS.inc:165
+#: plugins/admin/systems/class_servDNS.inc:400
+msgid "Reverse zone"
+msgstr "Zona Inversa"
+
+#: plugins/admin/systems/class_servDNS.inc:167
+#: plugins/admin/fai/faiTemplateEntry.tpl:86
+msgid "Class"
+msgstr "Clase"
+
+#: plugins/admin/systems/class_servDNS.inc:229
+#, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:288
+#, php-format
+msgid "Updating of system server/dns with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:297
+#, fuzzy, php-format
+msgid "Removing of system server/dns with dn '%s' failed."
+msgstr "Ha fallado la eliminación del servidor"
+
+#: plugins/admin/systems/class_servDNS.inc:318
+#, fuzzy, php-format
+msgid "Saving of system server/dns with dn '%s' failed."
+msgstr ""
+"Ha fallado la grabación de los parámetros del servidor de base de datos"
+
+#: plugins/admin/systems/class_servDNS.inc:342
+#, php-format
+msgid "Set status flag for system server/dns with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:357
+#: plugins/admin/systems/class_servDNS.inc:391
+#, fuzzy
+msgid "DNS service"
+msgstr "Añadir servicio DNS"
+
+#: plugins/admin/systems/class_servDNS.inc:390
+#: plugins/admin/systems/class_termDNS.inc:510
+msgid "DNS"
+msgstr ""
+
+#: plugins/admin/systems/class_servDNS.inc:399
+#: plugins/admin/systems/class_termDNS.inc:520
+#: plugins/admin/systems/servdnseditzone.tpl:7
+msgid "Zone name"
+msgstr "Nombre de la zona"
+
+#: plugins/admin/systems/class_servDNS.inc:401
+#, fuzzy
+msgid "Primary dns server"
+msgstr "Servidor DNS primario para esta zona"
+
+#: plugins/admin/systems/class_servDNS.inc:403
+#: plugins/admin/systems/glpiPrinter.tpl:38
+msgid "Serial"
+msgstr "Serie"
+
+#: plugins/admin/systems/class_servDNS.inc:405
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: plugins/admin/ogroups/class_phonequeue.inc:741
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Reintentar"
+
+#: plugins/admin/systems/class_servDNS.inc:406
+#: plugins/admin/systems/servdnseditzone.tpl:79
+msgid "Expire"
+msgstr "Expira"
+
+#: plugins/admin/systems/class_servDNS.inc:408
+#: plugins/admin/systems/servdnseditzone.tpl:24
+msgid "Zone records"
+msgstr "Registros de zona"
+
+#: plugins/admin/systems/servdb.tpl:6 plugins/admin/systems/goKrbServer.tpl:1
 msgid "Kerberos kadmin access"
 msgstr "Acceso a Kerberos kadmin"
 
-#: plugins/admin/systems/servdb.tpl:10
+#: plugins/admin/systems/servdb.tpl:10 plugins/admin/systems/goKrbServer.tpl:4
 msgid "Kerberos Realm"
 msgstr "Dominio Kerberos"
 
 #: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+#: plugins/admin/systems/goKrbServer.tpl:8
+#: plugins/admin/systems/goImapServer.tpl:19
+#: plugins/admin/systems/class_goImapServer.inc:284
 msgid "Admin user"
 msgstr "Usuario administrador"
 
@@ -6693,23 +8716,26 @@ msgstr "Usuario administrador"
 msgid "FAX database"
 msgstr "Base de datos de FAX"
 
-#: plugins/admin/systems/servdb.tpl:30
+#: plugins/admin/systems/servdb.tpl:30 plugins/admin/systems/goFaxServer.tpl:4
 msgid "FAX DB user"
 msgstr "Base de datos de usuarios de FAX"
 
 #: plugins/admin/systems/servdb.tpl:42
+#: plugins/admin/systems/class_goFonServer.inc:52
 msgid "Asterisk management"
 msgstr "Gestión de Asterisk PBX"
 
-#: plugins/admin/systems/servdb.tpl:46
+#: plugins/admin/systems/servdb.tpl:46 plugins/admin/systems/goFonServer.tpl:4
 msgid "Asterisk DB user"
 msgstr "Base de datos de usuarios Asterisk"
 
 #: plugins/admin/systems/servdb.tpl:54
+#: plugins/admin/systems/goFonServer.tpl:12
 msgid "Country dial prefix"
 msgstr "Prefijo de marcado nacional"
 
 #: plugins/admin/systems/servdb.tpl:58
+#: plugins/admin/systems/goFonServer.tpl:16
 msgid "Local dial prefix"
 msgstr "Prefijo de marcado local"
 
@@ -6718,32 +8744,42 @@ msgid "IMAP admin access"
 msgstr "Acceso administrador imap"
 
 #: plugins/admin/systems/servdb.tpl:74
+#: plugins/admin/systems/goImapServer.tpl:7
+#: plugins/admin/systems/class_goImapServer.inc:282
 msgid "Server identifier"
 msgstr "Identificador de servidor"
 
 #: plugins/admin/systems/servdb.tpl:78
+#: plugins/admin/systems/goImapServer.tpl:13
+#: plugins/admin/systems/class_goImapServer.inc:283
 msgid "Connect URL"
 msgstr "Conectar a la URL"
 
 #: plugins/admin/systems/servdb.tpl:91
+#: plugins/admin/systems/goImapServer.tpl:31
+#: plugins/admin/systems/class_goImapServer.inc:286
 msgid "Sieve port"
 msgstr "Puerto de Sieve"
 
 #: plugins/admin/systems/servdb.tpl:100
+#: plugins/admin/systems/class_goLogDBServer.inc:29
+#: plugins/admin/systems/class_goLogDBServer.inc:49
 msgid "Logging database"
 msgstr "Base de datos de Logs"
 
 #: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+#: plugins/admin/systems/goGlpiServer.tpl:4
+#: plugins/admin/systems/goLogDBServer.tpl:4
 msgid "Logging DB user"
 msgstr "Base de datos de acceso de usuarios"
 
 #: plugins/admin/systems/servdb.tpl:119
-#, fuzzy
 msgid "Glpi database"
-msgstr "Base de datos de FAX"
+msgstr "Base de datos Glpi"
 
 #: plugins/admin/systems/servdb.tpl:133
-#, fuzzy
+#: plugins/admin/systems/class_goGlpiServer.inc:227
+#: plugins/admin/systems/goGlpiServer.tpl:14
 msgid "Database"
 msgstr "Bases de datos"
 
@@ -6751,312 +8787,349 @@ msgstr "Bases de datos"
 msgid "Machine name"
 msgstr "Nombre de la maquina"
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, 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/class_servDB.inc:151
-#, 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/class_goFaxServer.inc:29
+#, fuzzy
+msgid "FAX service"
+msgstr "Servicio IMAP"
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
-msgstr "El puerto sieve necesita ser un numero."
+#: plugins/admin/systems/class_goFaxServer.inc:49
+#, fuzzy
+msgid "FAX database configuration"
+msgstr "Base de datos de FAX"
 
-#: plugins/admin/systems/class_servDB.inc:166
+#: plugins/admin/systems/class_goFaxServer.inc:79
 #, fuzzy, php-format
-msgid "The specified kerberos password is empty."
-msgstr "El archivo especificado está vacío."
+msgid "Removing server services/gofax with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/class_servDB.inc:190
+#: plugins/admin/systems/class_goFaxServer.inc:102
 #, fuzzy, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
+msgid "Saving server services/gofax with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Lista de sistemas"
-
-#: plugins/admin/systems/headpage.tpl:24
-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/systems/class_goFaxServer.inc:125
+#, php-format
+msgid "Set status flag for server services/gofax with dn '%s' failed."
 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/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see servers"
-msgstr "Seleccione para ver los servidores"
-
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Mostrar servidores"
-
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Seleccione para ver los terminales Linux"
-
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Mostrar terminales"
-
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Seleccione para ver las estaciones de trabajo Linux"
-
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
-
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
-
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Mostrara estaciones de trabajo basadas en windows"
-
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Seleccione para ver impresoras de red"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Mostrar impresoras de red"
-
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Seleccione para ver teléfonos VOIP"
-
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Mostrar teléfonos"
+#: plugins/admin/systems/class_goFaxServer.inc:135
+#: plugins/admin/systems/class_goGlpiServer.inc:136
+#, fuzzy
+msgid "The attribute user is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Seleccione para ver los dispositivos de red"
+#: plugins/admin/systems/class_goFaxServer.inc:138
+#: plugins/admin/systems/class_goFonServer.inc:140
+#, fuzzy, php-format
+msgid "The attribute password is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Mostrar dispositivos de Red"
+#: plugins/admin/systems/class_goFaxServer.inc:186
+#: plugins/admin/systems/class_goGlpiServer.inc:187
+#: plugins/admin/systems/class_goCupsServer.inc:176
+#: plugins/admin/systems/class_goTerminalServer.inc:193
+#: plugins/admin/systems/class_goNtpServer.inc:189
+#: plugins/admin/systems/class_goLdapServer.inc:181
+#: plugins/admin/systems/class_goSyslogServer.inc:175
+#: plugins/admin/systems/class_goFonServer.inc:195
+#: plugins/admin/systems/class_goLogDBServer.inc:185
+#: plugins/admin/systems/class_goKrbServer.inc:190
+#: plugins/admin/systems/class_goMailServer.inc:737
+#: plugins/admin/systems/class_goImapServer.inc:243
+#: plugins/admin/systems/class_goShareServer.inc:352
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as ACTION_HOOK for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Expresiones regulares para encontrar nombres de sistemas"
+#: plugins/admin/systems/class_goFaxServer.inc:215
+#, fuzzy
+msgid "Fax server"
+msgstr "Servidor FAX"
 
-#: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_goFaxServer.inc:216
 #, fuzzy
-msgid "Display systems of user"
-msgstr "Mostrar direcciones del usuario"
+msgid "Fax server service"
+msgstr "Servicio Sieve"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
+#: plugins/admin/systems/class_goFaxServer.inc:224
+#, fuzzy
+msgid "Login name"
+msgstr "Nombre de la localización"
 
-#: plugins/admin/systems/remove.tpl:6
+#: plugins/admin/systems/remove.tpl:6 plugins/admin/acl/remove.tpl:6
+#, fuzzy
 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."
+"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_servKolab.inc:115
-msgid "Remove Kolab extension"
-msgstr "Eliminar extensión Kolab"
-
-#: 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/class_servKolab.inc:118
-msgid "Add Kolab service"
-msgstr "Añadir el servicio Kolab"
-
-#: 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/class_servKolab.inc:146
+#: plugins/admin/systems/class_servKolab.inc:99
 #, 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/class_servKolab.inc:152
+#: plugins/admin/systems/class_servKolab.inc:105
 #, 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/class_servKolab.inc:224
+#: plugins/admin/systems/class_servKolab.inc:191
+#: plugins/admin/systems/class_servKolab.inc:207
+#, fuzzy, php-format
+msgid "Removing host entry from system server/kolab with dn '%s' failed."
+msgstr "Ha fallado la eliminación del servidor del objeto Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:246
 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:226
+#: plugins/admin/systems/class_servKolab.inc:248
 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/class_servKolab.inc:230
+#: plugins/admin/systems/class_servKolab.inc:252
 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:232
+#: plugins/admin/systems/class_servKolab.inc:254
 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/class_servKolab.inc:234
+#: plugins/admin/systems/class_servKolab.inc:256
 msgid "Future days must be a value."
 msgstr "Días futuros debe ser un valor"
 
-#: plugins/admin/systems/class_servKolab.inc:238
+#: plugins/admin/systems/class_servKolab.inc:260
 msgid "No SMTP privileged networks set."
 msgstr "No se han indicado redes privilegiadas SMTP."
 
-#: plugins/admin/systems/class_servKolab.inc:242
-msgid "No SMTP smarthost/relayhost set."
-msgstr "No se ha indicado SMTP smarthost/relayhost"
+#: plugins/admin/systems/class_servKolab.inc:332
+#, fuzzy, php-format
+msgid "Saving system server/kolab with dn '%s' failed."
+msgstr "Ha fallado la grabación del servidor del objeto Kolab"
 
-#: plugins/admin/systems/class_printGeneric.inc:175
-#: plugins/admin/systems/class_printGeneric.inc:182
-#: plugins/admin/systems/class_printGeneric.inc:217
-#: plugins/admin/systems/class_printGeneric.inc:238
-#: plugins/admin/systems/class_printGeneric.inc:241
-msgid "Add printer extension"
-msgstr ""
+#: plugins/admin/systems/class_servKolab.inc:354
+#, fuzzy
+msgid "Kolab mail service"
+msgstr "Añadir el servicio Kolab"
 
-#: plugins/admin/systems/class_printGeneric.inc:176
-msgid "This is a workstation template, printer tab is disabled."
+#: plugins/admin/systems/class_servKolab.inc:383
+#, php-format
+msgid "Set status flag for system server/kolab with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:183
-msgid "This is a terminal template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/class_servKolab.inc:414
+#, fuzzy
+msgid "Kolab service"
+msgstr "Añadir el servicio Kolab"
 
-#: plugins/admin/systems/class_printGeneric.inc:218
+#: plugins/admin/systems/class_servKolab.inc:423
 #, fuzzy
-msgid ""
-"This workstation 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"
+msgid "My destination"
+msgstr "Destino"
+
+#: plugins/admin/systems/class_servKolab.inc:424
+#, fuzzy
+msgid "FTP FreeBusy service"
+msgstr "Servicio de presencia HTTP (propio)"
+
+#: plugins/admin/systems/class_servKolab.inc:426
+msgid "Enable virus scan"
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:230
-#: plugins/admin/systems/class_printGeneric.inc:233
+#: plugins/admin/systems/class_servKolab.inc:427
 #, fuzzy
-msgid "Remove printer extension"
-msgstr "Eliminar extensión Kolab"
+msgid "Relayhost"
+msgstr "Enfocado a la versión"
 
-#: plugins/admin/systems/class_printGeneric.inc:231
+#: plugins/admin/systems/class_servKolab.inc:428
 #, fuzzy
+msgid "HTTP FreeBusy service"
+msgstr "Servicio de presencia HTTP (propio)"
+
+#: plugins/admin/systems/class_servKolab.inc:431
+msgid "kolabFreeBusyFuture"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:108
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:245
+#: plugins/admin/systems/class_printGeneric.inc:250
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:305
+#: plugins/admin/systems/class_printGeneric.inc:308
+msgid "Add printer extension"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:238
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construction."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:246
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:251
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:282
+msgid "This 'dn' has no printer features."
+msgstr "Esta 'dn' no tiene características de impresora."
+
+#: plugins/admin/systems/class_printGeneric.inc:290
+msgid ""
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"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_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
+msgid "Remove printer extension"
+msgstr "Eliminar extensión de impresión"
+
+#: plugins/admin/systems/class_printGeneric.inc:298
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
 "clicking below."
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
+"Esta estación de trabajo tiene la extensión impresora activada. Puede "
+"desactivarla pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:234
-#, fuzzy
+#: plugins/admin/systems/class_printGeneric.inc:301
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
 "below."
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
+"Este terminal tiene la extensión impresora activada. Puede desactivarla "
+"pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:239
-#, fuzzy
+#: plugins/admin/systems/class_printGeneric.inc:306
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
 "clicking below."
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+"Esta estación de trabajo tiene la extensión impresora desactivada. Puede "
+"activarla pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:242
-#, fuzzy
+#: plugins/admin/systems/class_printGeneric.inc:309
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
 "below."
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_printGeneric.inc:253
-msgid "This 'dn' has no printer features."
-msgstr "Esta 'dn' no tiene características de impresora."
+"Este terminal tiene la extensión impresora desactivada. Puede activarla "
+"pulsando aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:389
+#: plugins/admin/systems/class_printGeneric.inc:475
 #, php-format
 msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:397
-#, fuzzy
+#: plugins/admin/systems/class_printGeneric.inc:483
 msgid "can't get ppd informations."
-msgstr "Información de sistema"
+msgstr "no puedo acceder a la información PPD"
 
-#: plugins/admin/systems/class_printGeneric.inc:409
+#: plugins/admin/systems/class_printGeneric.inc:496
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:411
+#: plugins/admin/systems/class_printGeneric.inc:498
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:490
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr "No tiene permisos para crear una impresora en esta 'Base'."
+#: plugins/admin/systems/class_printGeneric.inc:553
+#, fuzzy, php-format
+msgid "Removing of system print/generic with dn '%s' failed."
+msgstr "Ha fallado la eliminación de la impresora"
+
+#: plugins/admin/systems/class_printGeneric.inc:751
+#, php-format
+msgid "Saving of system print/generic with dn '%s' failed."
+msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:637
-#: plugins/admin/systems/class_printGeneric.inc:639
-#: plugins/admin/ogroups/class_ogroupManagement.inc:482
+#: plugins/admin/systems/class_printGeneric.inc:773
+#: plugins/admin/systems/class_printGeneric.inc:775
+#: plugins/admin/ogroups/class_ogroupManagement.inc:383
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Grupo"
 
-#: plugins/admin/systems/password.tpl:2
+#: plugins/admin/systems/class_printGeneric.inc:791
+#, fuzzy
+msgid "Print generic"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/class_printGeneric.inc:802
+msgid "LabeledURL"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:803
 #, fuzzy
+msgid "Printer PPD"
+msgstr "Impresora"
+
+#: plugins/admin/systems/class_printGeneric.inc:820
+#, php-format
+msgid ""
+"You are not allowed to remove the given object '%s' from the list of members "
+"of printer '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:837
+#, php-format
+msgid "Illegal printer type while adding '%s' to the list of '%s' printers,"
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:842
+#, php-format
+msgid ""
+"You are not allowed to add the given object '%s' to the list of members of '%"
+"s'."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:864
+#, php-format
+msgid "Can't add '%s' to the list of members, it is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:872
+#, php-format
+msgid "Can't add '%s' to list of members, it is not reachable."
+msgstr ""
+
+#: plugins/admin/systems/password.tpl:2
 msgid ""
 "To change the terminal root password use the fields below. The changes take "
 "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 usuario use los campos a continuación. Los "
-"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
-"contraseña, el usuario no podrá autenticarse sin ella."
+"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."
@@ -7066,85 +9139,39 @@ msgstr ""
 msgid "Changing the password impinges on authentification only."
 msgstr "Cambiar la contraseña afecta solamente a la autenticación."
 
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
-
-#: plugins/admin/systems/glpi.tpl:9
-#, fuzzy
-msgid "System type"
-msgstr "Sistemas"
-
-#: plugins/admin/systems/glpi.tpl:19
-#, fuzzy
-msgid "Operating system"
-msgstr "Borrar"
+#: plugins/admin/systems/class_componentGeneric.inc:101
+#, fuzzy, php-format
+msgid "Removing of system component/generic with dn '%s' failed."
+msgstr "Ha fallado la eliminación de componente genérico"
 
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:22
-#: plugins/admin/systems/glpi_devices.tpl:119
-#: plugins/admin/systems/glpi_devices.tpl:158
-#: plugins/admin/systems/glpi_devices.tpl:211
-#: plugins/admin/systems/glpi_devices.tpl:265
-#: plugins/admin/systems/glpi_devices.tpl:321
-#: plugins/admin/systems/glpi_devices.tpl:383
-#: plugins/admin/systems/glpi_devices.tpl:453
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:559
-#: plugins/admin/systems/glpi_devices.tpl:610
-#: plugins/admin/systems/glpi_devices.tpl:662
-#: plugins/admin/systems/glpi_devices.tpl:706
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-msgid "Manufacturer"
-msgstr ""
+#: 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/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-#, fuzzy
-msgid "Contacts"
-msgstr "Contacto"
+#: 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/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-#, fuzzy
-msgid "Contact person"
-msgstr "Contacto"
+#: 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/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-msgid "Technical responsible"
+#: plugins/admin/systems/class_componentGeneric.inc:223
+#, php-format
+msgid "Saving of system component/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/admin/systems/glpi.tpl:63 plugins/admin/systems/glpi_devices.tpl:15
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:52
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#, fuzzy
-msgid "Comments"
-msgstr "Contacto"
-
-#: plugins/admin/systems/glpi.tpl:78
-#, fuzzy
-msgid "Installed devices"
-msgstr "Dispositivos clientes"
-
-#: plugins/admin/systems/glpi.tpl:90
-#, fuzzy
-msgid "Trading"
-msgstr "Ocultamiento"
-
-#: plugins/admin/systems/glpi.tpl:91
-#, fuzzy
-msgid "Software"
-msgstr "Estado"
-
-#: plugins/admin/systems/glpi.tpl:92
+#: plugins/admin/systems/class_componentGeneric.inc:234
 #, fuzzy
-msgid "Contracts"
-msgstr "Contacto"
+msgid "Component generic"
+msgstr "Nuevo componente"
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+#: plugins/admin/systems/class_componentGeneric.inc:239
 #, fuzzy
-msgid "Attachments"
-msgstr "Argumentos"
+msgid "Network device"
+msgstr "Dispositivos de Red"
 
 #: plugins/admin/systems/chooser.tpl:1
 msgid "Choose the kind of system component you want to create"
@@ -7195,361 +9222,554 @@ msgstr "Otros componentes de red"
 msgid "Create"
 msgstr "Crear"
 
-#: plugins/admin/systems/servnfs.tpl:1
+#: plugins/admin/systems/goNtpServer.tpl:2
 #, fuzzy
+msgid "Time server"
+msgstr "Servicio de Hora"
+
+#: 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/class_glpiAccount.inc:784
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: 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/class_glpiPrinterAccount.inc:781
+#: 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: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/class_glpiAccount.inc:777
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:776
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+msgid "Technical responsible"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:78 plugins/admin/systems/glpi.tpl:44
+#: plugins/admin/systems/class_glpiAccount.inc:781
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:779
+msgid "Contact person"
+msgstr "Persona de contacto"
+
+#: 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/servnfs.tpl:1
 msgid "Edit share"
-msgstr "Usuario administrador"
+msgstr "Editar recurso compartido"
 
 #: plugins/admin/systems/servnfs.tpl:2
 msgid "NFS setup"
 msgstr ""
 
 #: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: plugins/admin/systems/class_servNfs.inc:277
+msgid "Volume"
+msgstr "Volumen"
+
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
-#, fuzzy
+#: plugins/admin/systems/servnfs.tpl:94
 msgid "Codepage"
-msgstr "Página Web Principal"
+msgstr "Pagina de códigos"
 
-#: plugins/admin/systems/servnfs.tpl:59
-#, fuzzy
+#: plugins/admin/systems/servnfs.tpl:104
+#: plugins/admin/systems/class_servNfs.inc:276
 msgid "Option"
-msgstr "Opciones"
+msgstr "Opción"
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
-#, fuzzy
-msgid "Printer type"
-msgstr "Nombre de la impresora"
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
+msgid "System type"
+msgstr "Tipo de sistema"
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
-#, fuzzy
-msgid "Supported interfaces"
-msgstr "Impresora de Red"
+#: plugins/admin/systems/glpi.tpl:19
+#: plugins/admin/systems/class_glpiAccount.inc:779
+msgid "Operating system"
+msgstr "Sistema operativo"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-#, fuzzy
-msgid "Serial"
-msgstr "terminales"
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/class_glpiAccount.inc:778
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: 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/glpiPrinter.tpl:46
-#, fuzzy
-msgid "Parallel"
-msgstr "Variable"
+#: plugins/admin/systems/glpi.tpl:78
+msgid "Installed devices"
+msgstr "Dispositivos instalados"
 
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
-msgstr ""
+#: plugins/admin/systems/glpi.tpl:90
+msgid "Trading"
+msgstr "Comercial"
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
-#, fuzzy
-msgid "Installed cartridges"
-msgstr "Dispositivos clientes"
+#: plugins/admin/systems/glpi.tpl:91
+msgid "Software"
+msgstr "Software"
+
+#: plugins/admin/systems/glpi.tpl:92
+msgid "Contracts"
+msgstr "Contratos"
 
 #: plugins/admin/systems/remove_glpi.tpl:10
-#, fuzzy
 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 árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
-"presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
+"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_phoneGeneric.inc:105
 msgid "This 'dn' has no phone features."
 msgstr "Esta 'dn' no tiene características de teléfono."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:177
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:116
 msgid "yes"
-msgstr "Sistemas"
+msgstr "si"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:177
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:117
 msgid "no"
-msgstr "ninguno"
+msgstr "no"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:198
+#: plugins/admin/systems/class_phoneGeneric.inc:225
 msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:198
-#, fuzzy
+#: plugins/admin/systems/class_phoneGeneric.inc:225
 msgid "Networksettings"
 msgstr "Configuración de red"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:213
+#: 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'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:269
-#, fuzzy
+#: plugins/admin/systems/class_phoneGeneric.inc:247
+#, php-format
+msgid "Removing of system phone/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "The required field 'Phone name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+msgstr "El campo requerido 'Nombre del teléfono' no ha sido rellenado."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:272
+#: plugins/admin/systems/class_phoneGeneric.inc:295
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:279
+#: 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_servNfs.inc:35
+#: plugins/admin/systems/class_phoneGeneric.inc:397
+#, php-format
+msgid "Saving of system phone/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:410
+#, fuzzy
+msgid "Phone generic"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:415
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1213
+#, fuzzy
+msgid "Phone hardware"
+msgstr "Componente telefónico"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:421
+#: plugins/admin/systems/phonesettings.tpl:34
+msgid "DTMF mode"
+msgstr "Modo DTMF"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:422
+#, fuzzy
+msgid "Default ip"
+msgstr "Dirección IP por defecto"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:423
+msgid "Qualify"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:424
+msgid "Hardware type"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:46
 msgid ""
 "The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
-#, fuzzy
+#: plugins/admin/systems/class_servNfs.inc:49
 msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr "Borrar"
+msgstr ""
+"No se puede leer '/etc/gosa/encodings', por favor compruebe los permisos."
 
-#: plugins/admin/systems/class_servNfs.inc:125
-#, fuzzy
+#: plugins/admin/systems/class_servNfs.inc:180
 msgid "Please specify a valid path for your setup."
-msgstr "Por favor especifique un usuario valido."
+msgstr "Por favor especifique una ruta valida para su configuración."
 
-#: plugins/admin/systems/class_servNfs.inc:131
-#, fuzzy
-msgid "Please specify a valid name for your setup."
-msgstr "Por favor especifique un usuario 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:134
-#, fuzzy
-msgid "Please specify a name for your setup."
-msgstr "Por favor especifique un usuario valido."
+#: 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:139
-#, fuzzy
+#: plugins/admin/systems/class_servNfs.inc:194
 msgid "Description contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+msgstr "¡La descripción contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servNfs.inc:143
-#, fuzzy
+#: plugins/admin/systems/class_servNfs.inc:198
+msgid "Volume contains invalid characters."
+msgstr "El volumen contiene caracteres no validos."
+
+#: plugins/admin/systems/class_servNfs.inc:202
 msgid "Path contains invalid characters."
-msgstr "El campo 'Nombre' contiene caracteres no validos."
+msgstr "La ruta contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servNfs.inc:147
-#, fuzzy
+#: plugins/admin/systems/class_servNfs.inc:206
 msgid "Option contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+msgstr "La opción contiene caracteres no validos."
 
-#: plugins/admin/systems/class_workstationStartup.inc:216
-#, fuzzy
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+#: plugins/admin/systems/class_servNfs.inc:263
+msgid "NFS"
+msgstr ""
+
+#: plugins/admin/systems/class_servNfs.inc:264
+#, fuzzy
+msgid "NFS service"
+msgstr "Añadir servicio DNS"
 
-#: plugins/admin/systems/class_workstationStartup.inc:270
+#: plugins/admin/systems/class_servNfs.inc:274
 #, fuzzy
+msgid "Charset"
+msgstr "Chipset"
+
+#: plugins/admin/systems/class_workstationStartup.inc:391
+msgid ""
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:436
+msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:494
 msgid ""
 "There is already a profile in your selection that contain partition table "
 "configurations."
-msgstr "Ya existe un usuario con este 'Login' en la base de datos."
+msgstr ""
+"Ya existe un usuario con este perfil en su selección que tiene "
+"configuraciones de tabla de particiones."
 
-#: plugins/admin/systems/phonesettings.tpl:1
+#: plugins/admin/systems/class_workstationStartup.inc:831
+#, php-format
+msgid ""
+"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
+"Server was reset to 'auto'."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:845
+#, 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."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1013
+#, fuzzy, php-format
+msgid "Saving of system workstation/startup with dn '%s' failed."
+msgstr ""
+"Ha fallado la grabación de los parámetros de inicio de la estación de trabajo"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1063
+#, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1065
+#: plugins/admin/systems/class_servRepositorySetup.inc:172
+#, php-format
+msgid ""
+"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
+"empty string."
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1083
+#, fuzzy
+msgid "System startup"
+msgstr "Estado del Sistema"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1094
+#: plugins/admin/fai/class_faiProfile.inc:442
+#: plugins/admin/fai/faiProfile.tpl:32
+msgid "FAI classes"
+msgstr "Clases FAI"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1095
+msgid "FAI status flag"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1097
+msgid "Debian mirror"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:1098
 #, fuzzy
+msgid "Debian release"
+msgstr "Versión actual"
+
+#: plugins/admin/systems/phonesettings.tpl:1
 msgid "Advanced phone settings"
-msgstr "Configuración telefónica"
+msgstr "Configuración telefónica avanzada"
 
 #: plugins/admin/systems/phonesettings.tpl:6
-#, fuzzy
 msgid "Phone type"
-msgstr "Número de teléfono"
+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
-#, fuzzy
+#: plugins/admin/systems/phonesettings.tpl:27
+#: plugins/admin/systems/phonesettings.tpl:37
+#: plugins/admin/systems/phonesettings.tpl:51
+#: plugins/admin/systems/phonesettings.tpl:80
+#: plugins/admin/systems/phonesettings.tpl:111
+#: plugins/admin/systems/phonesettings.tpl:158
 msgid "Choose a phone type"
-msgstr "Elija tipo de ratón"
+msgstr "Elija tipo de teléfono"
 
-#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:11
 msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:32
-#, fuzzy
-msgid "DTMF mode"
-msgstr "Modo"
-
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
-#, fuzzy
+#: plugins/admin/systems/phonesettings.tpl:48
+#: plugins/admin/systems/phonesettings.tpl:87
 msgid "Default IP"
-msgstr "por defecto"
+msgstr "Dirección IP por defecto"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
+#: plugins/admin/systems/phonesettings.tpl:58
+#: plugins/admin/systems/phonesettings.tpl:95
 msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:75
-#, fuzzy
+#: plugins/admin/systems/phonesettings.tpl:77
 msgid "Modus"
-msgstr "Ratón"
+msgstr "Modo"
 
-#: plugins/admin/systems/phonesettings.tpl:106
+#: plugins/admin/systems/phonesettings.tpl:108
 msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:116
-#, fuzzy
+#: plugins/admin/systems/phonesettings.tpl:118
 msgid "Secret"
-msgstr "Calle"
+msgstr "Secreto"
 
-#: plugins/admin/systems/phonesettings.tpl:124
+#: plugins/admin/systems/phonesettings.tpl:126
 msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:132
+#: plugins/admin/systems/phonesettings.tpl:134
 msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
-#, fuzzy
+#: plugins/admin/systems/phonesettings.tpl:147
 msgid "Account code"
-msgstr "Cuenta"
+msgstr "Código de cuenta"
 
-#: plugins/admin/systems/phonesettings.tpl:153
-#, fuzzy
+#: plugins/admin/systems/phonesettings.tpl:155
 msgid "Trunk lines"
-msgstr "Clientes Ligeros"
+msgstr "Lineas troncales"
 
-#: plugins/admin/systems/phonesettings.tpl:168
-#, fuzzy
+#: plugins/admin/systems/phonesettings.tpl:170
 msgid "Hosts that are allowed to connect"
-msgstr "Equipos/Redes que son permitidos para hacer relay"
+msgstr "Equipos/Redes que tienen permiso para conectar"
 
-#: plugins/admin/systems/phonesettings.tpl:183
-#, fuzzy
+#: plugins/admin/systems/phonesettings.tpl:185
 msgid "Hosts that are not allowed to connect"
-msgstr "¡No tiene permisos para eliminar este componente!"
+msgstr "Equipos/Redes que no tienen permisos para conectar"
 
-#: plugins/admin/systems/phonesettings.tpl:205
+#: plugins/admin/systems/phonesettings.tpl:207
 msgid "MSN"
 msgstr ""
 
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-#, fuzzy
 msgid "Select entries to add"
-msgstr "Seleccione usuarios que serán añadidos"
+msgstr "Seleccione entradas para añadir"
 
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-#, fuzzy
 msgid "Display members of department"
-msgstr "Mostrar número de Departamentos"
+msgstr "Mostrar miembros del departamento"
 
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-#, fuzzy
 msgid "Display members matching"
-msgstr "Mostrar números que concuerdan con"
+msgstr "Mostrar miembros que concuerden con"
 
 #: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
-#, fuzzy
 msgid "Regular expression for matching member names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+msgstr "Expresiones regulares que concuerden con nombres de miembros"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#: plugins/admin/systems/class_printerPPDDialog.inc:62
 #, php-format
 msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
+#: 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_printerPPDDialog.inc:99
 #, php-format
 msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
+"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_printerPPDDialog.inc:109
-#, fuzzy
-msgid "Can't get ppd informations."
-msgstr "Información genérica del usuario"
+#: 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_printerPPDDialog.inc:125
+#: 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_printerPPDDialog.inc:138
-#, fuzzy, php-format
+#: plugins/admin/systems/class_printerPPDDialog.inc:211
+#, 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."
+
+#: 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_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_printerPPDDialog.inc:267
+#, php-format
 msgid "There is already a ppd file for this kind of printer."
-msgstr "Ya existe un usuario con este 'Login' en la base de datos."
+msgstr "Ya existe un archivo PPD para ese tipo de impresora."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
-#, fuzzy, php-format
+#: plugins/admin/systems/class_printerPPDDialog.inc:288
+#, php-format
 msgid "Can't save file '%s'."
-msgstr "Borrar"
-
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-#, fuzzy
-msgid "Please specify a valid ppd file."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgstr "No se puede grabar el archivo '%s'."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
-#, fuzzy
-msgid "Please select a valid ppd."
-msgstr "Por favor introduzca un número de serie válido"
+#: plugins/admin/systems/class_printerPPDDialog.inc:292
+msgid "Uploaded ppd file is empty, can't create new ppd file."
+msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:319
+#: plugins/admin/systems/class_printerPPDDialog.inc:413
 #: plugins/admin/fai/faiPackage.tpl:41
-#, fuzzy
+#: plugins/admin/fai/class_faiPackage.inc:551
 msgid "Section"
-msgstr "Acción"
+msgstr "Sección"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
-#, fuzzy
+#: plugins/admin/systems/class_printerPPDDialog.inc:462
+#: plugins/admin/systems/class_printerPPDDialog.inc:465
 msgid "True"
-msgstr "Futuro"
+msgstr "Verdadero"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
-#, fuzzy
+#: plugins/admin/systems/class_printerPPDDialog.inc:463
+#: plugins/admin/systems/class_printerPPDDialog.inc:466
 msgid "False"
-msgstr "mujer"
+msgstr "Falso"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#: plugins/admin/systems/class_printerPPDDialog.inc:471
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
 
 #: plugins/admin/systems/printerPPDDialog.tpl:1
-#, fuzzy
 msgid "Printer driver"
-msgstr "Dispositivo de Impresión"
+msgstr "Controlador de dispositivo de Impresión"
 
 #: plugins/admin/systems/printerPPDDialog.tpl:5
 #: plugins/admin/systems/workstationService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/class_glpiAccount.inc:782
 msgid "Model"
 msgstr "Modelo"
 
 #: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-#, fuzzy
 msgid "Select"
-msgstr "Borrar"
+msgstr "Seleccionar"
 
 #: plugins/admin/systems/printerPPDDialog.tpl:9
-#, fuzzy
 msgid "New driver"
-msgstr "Servidor"
+msgstr "Nuevo controlador de dispositivo"
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
@@ -7559,24 +9779,38 @@ msgstr "Seleccione objetos a añadir"
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/systems/servRepository.tpl:46
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
-#: plugins/admin/fai/headpage.tpl:82 plugins/admin/fai/faiProfileEntry.tpl:54
+#: plugins/admin/fai/faiProfileEntry.tpl:54
 #: plugins/admin/fai/faiProfileEntry.tpl:55
-#: plugins/admin/fai/faiPackageEntry.tpl:47
+#: plugins/admin/fai/faiPackageEntry.tpl:42
 msgid "Display objects matching"
 msgstr "Mostrar objetos que concuerden con"
 
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/systems/servRepository.tpl:50
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
-#: plugins/admin/fai/headpage.tpl:86 plugins/admin/fai/faiProfileEntry.tpl:59
-#: plugins/admin/fai/faiPackageEntry.tpl:51
+#: plugins/admin/fai/faiProfileEntry.tpl:59
+#: plugins/admin/fai/faiPackageEntry.tpl:46
 msgid "Regular expression for matching object names"
 msgstr "Expresiones regulares que concuerden con nombres de objetos"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
-#, fuzzy
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#, php-format
+msgid "Selected vendor '%s' does not exists in our list of ppds."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
 msgid "Printer ppd selection."
-msgstr "Configuración telefónica"
+msgstr "Seleccionar impresora ppd"
+
+#: plugins/admin/systems/class_workstationService.inc:432
+#, fuzzy, php-format
+msgid "Saving of system workstation/service with dn '%s' failed."
+msgstr "Ha fallado la grabación de los servicios de la estación de trabajo"
+
+#: plugins/admin/systems/class_workstationService.inc:441
+#, fuzzy
+msgid "Workstation service"
+msgstr "Nombre de la estación de trabajo"
 
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
@@ -7628,19 +9862,6 @@ msgstr "Puerto"
 msgid "Choose mouse port"
 msgstr "Elija el puerto del ratón"
 
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-msgid "Telephone hardware"
-msgstr "Componente telefónico"
-
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-msgid "Telephone"
-msgstr "Teléfono"
-
 #: plugins/admin/systems/workstationService.tpl:88
 #: plugins/admin/systems/terminalService.tpl:88
 msgid "Choose graphic driver that is needed by the installed graphic board"
@@ -7667,46 +9888,41 @@ msgstr "Elija la profundidad de color usada en modo gráfico"
 msgid "Display device"
 msgstr "Mostrar dispositivo"
 
-#: plugins/admin/systems/workstationService.tpl:121
-#, fuzzy
-msgid "unknown"
-msgstr "estado desconocido"
-
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
+#: plugins/admin/systems/workstationService.tpl:125
+msgid "Use DDC for automatic detection"
 msgstr ""
 
-#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/workstationService.tpl:128
 #: plugins/admin/systems/terminalService.tpl:124
 msgid "HSync"
 msgstr "HSync"
 
-#: plugins/admin/systems/workstationService.tpl:132
+#: 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:135
+#: plugins/admin/systems/workstationService.tpl:133
 #: plugins/admin/systems/terminalService.tpl:129
 msgid "VSync"
 msgstr "VSync"
 
-#: plugins/admin/systems/workstationService.tpl:137
+#: 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:149
+#: plugins/admin/systems/workstationService.tpl:147
 #: plugins/admin/systems/terminalService.tpl:203
 msgid "Scan device"
 msgstr "Dispositivo de escaneo"
 
-#: plugins/admin/systems/workstationService.tpl:150
+#: 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:151
+#: plugins/admin/systems/workstationService.tpl:149
 #: plugins/admin/systems/terminalService.tpl:205
 msgid "Provide scan services"
 msgstr "Provee servicios de exploración"
@@ -7716,68 +9932,65 @@ msgstr "Provee servicios de exploración"
 msgid "Boot parameters"
 msgstr "Parametros de inicio"
 
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "Servidor LDAP"
-
-#: plugins/admin/systems/workstationStartup.tpl:10
-#: plugins/admin/systems/terminalStartup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
-msgstr ""
-"Elija que servidor LDAP se usara para gestión de cuentas de usuario y "
-"terminales"
-
 #: plugins/admin/systems/workstationStartup.tpl:17
 #: plugins/admin/systems/terminalStartup.tpl:17
-msgid "Boot kernel"
-msgstr "Kernel de inicio"
-
-#: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:19
-msgid "Enter the filename of the kernel to use"
-msgstr "Introduzca el nombre del fichero del núcleo que se usara"
-
-#: plugins/admin/systems/workstationStartup.tpl:22
-#: plugins/admin/systems/terminalStartup.tpl:22
 msgid "Custom options"
 msgstr "Otras opciones"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
-#: plugins/admin/systems/terminalStartup.tpl:24
+#: 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 parametros serán pasados a la configuración de arranque del "
+"Introducir que parámetros serán pasados a la configuración de arranque del "
 "nucleo"
 
-#: plugins/admin/systems/workstationStartup.tpl:35
-#, fuzzy
-msgid "FAI server"
+#: 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/fai/faiPackageNew.tpl:35
-#, fuzzy
-msgid "set"
-msgstr "Borrar"
+#: plugins/admin/systems/workstationStartup.tpl:71
+msgid "FAI server"
+msgstr "Servidor FAI"
 
-#: plugins/admin/systems/workstationStartup.tpl:42
-#, fuzzy
+#: plugins/admin/systems/workstationStartup.tpl:45
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/servRepositorySetup.tpl:17
+#: plugins/admin/systems/class_servRepository.inc:244
+#: plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/fai/class_faiPackage.inc:553
+#: plugins/admin/fai/faiPackageNew.tpl:21
+#: plugins/admin/fai/faiPackageNew.tpl:24
+msgid "Release"
+msgstr "Versión"
+
+#: plugins/admin/systems/workstationStartup.tpl:63
+#: plugins/admin/systems/workstationStartup.tpl:95
 msgid "Assigned FAI classes"
-msgstr "Elija tipo de ratón"
+msgstr "Asignar clases FAI"
+
+#: plugins/admin/systems/workstationStartup.tpl:85
+msgid "set"
+msgstr "poner"
 
-#: plugins/admin/systems/workstationStartup.tpl:62
+#: 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 parametros)"
+msgstr "Módulos del núcleo (formato: nombre parámetros)"
 
-#: plugins/admin/systems/workstationStartup.tpl:64
+#: 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/workstationStartup.tpl:142
+#: plugins/admin/systems/terminalStartup.tpl:79
+msgid "Mountpoint"
+msgstr "Punto de montaje"
+
 #: 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"
@@ -7803,10 +10016,6 @@ msgstr ""
 msgid "use debug mode for startup"
 msgstr "Usar el modo de depuración durante el arranque"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
 #: plugins/admin/systems/terminalService.tpl:145
 msgid "Connect method"
 msgstr "Método de conexión"
@@ -7845,10 +10054,6 @@ msgstr ""
 msgid "Provide print services"
 msgstr "Proveer servicios de impresión"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Servidor de Cola"
-
 #: plugins/admin/systems/terminalService.tpl:191
 msgid "Select NFS filesystem to place spool files on"
 msgstr ""
@@ -7858,454 +10063,532 @@ msgstr ""
 msgid "Select scanner driver to use"
 msgstr "Seleccione que controladores de escáner se usaran"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:196
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
-#, fuzzy
-msgid "Release"
-msgstr "Paquete de reglas"
+#: plugins/admin/systems/servRepositorySetup.tpl:1
+#: plugins/admin/systems/class_servRepository.inc:431
+#: plugins/admin/fai/faiPackage.tpl:29
+msgid "Repository"
+msgstr "Repositorio"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
-#, fuzzy
+#: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/class_servRepository.inc:442
 msgid "Parent server"
-msgstr "Servicio de impresión"
+msgstr "Servidor Origen"
 
 #: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:197
-#: plugins/admin/systems/class_servRepository.inc:218
-#, fuzzy
+#: plugins/admin/systems/class_servRepository.inc:245
+#: plugins/admin/systems/class_servRepository.inc:266
 msgid "Sections"
-msgstr "Acción"
+msgstr "Secciones"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:116
-#, fuzzy
+#: plugins/admin/systems/class_servRepositorySetup.inc:119
 msgid "Please enter a value for 'release'."
-msgstr "Por favor especifique un usuario valido."
+msgstr "Por favor introduzca un valor para esta 'versión'."
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:120
-#, fuzzy
+#: plugins/admin/systems/class_servRepositorySetup.inc:123
 msgid "Please specify a valid value for 'url'."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/systems/class_servRepository.inc:97
-#, fuzzy
-msgid "Remove FAI repository extension."
-msgstr "Eliminar extensión Kolab"
+msgstr "Por favor especifique un valor para la 'url' valido."
 
-#: plugins/admin/systems/class_servRepository.inc:98
-#, fuzzy
+#: plugins/admin/systems/class_servRepositorySetup.inc:170
+#, php-format
 msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
+"No puedo ejecutar el REPOSITORY_HOOK '%s' indicado. Por favor compruebe el "
+"archivo gosa.conf."
 
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
+#: plugins/admin/systems/class_servRepository.inc:35
+#: plugins/admin/systems/class_servRepository.inc:392
+#: plugins/admin/systems/class_servRepository.inc:432
+#, fuzzy
+msgid "Repository service"
+msgstr "Parámetros del repositorio"
+
+#: plugins/admin/systems/class_servRepository.inc:137
+#, php-format
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:101
-#, fuzzy
+#: plugins/admin/systems/class_servRepository.inc:171
+#, php-format
 msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
+"Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_servRepository.inc:162
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
-#: plugins/admin/fai/class_faiManagement.inc:321
-#: plugins/admin/fai/class_faiManagement.inc:427
-#, fuzzy
+#: plugins/admin/systems/class_servRepository.inc:204
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:351
+#: plugins/admin/fai/class_faiManagement.inc:331
 msgid "This name is already in use."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/servRepository.tpl:6
+#: plugins/admin/systems/class_servRepository.inc:421
+#, php-format
+msgid "Set status flag for server services/repository with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_servRepository.inc:441
 #, fuzzy
+msgid "Releases"
+msgstr "Versión"
+
+#: plugins/admin/systems/class_servRepository.inc:443
+msgid "Url"
+msgstr ""
+
+#: plugins/admin/systems/servRepository.tpl:6
 msgid "List of configured repositories."
-msgstr "Lista de grupos"
+msgstr "Lista de repositorios configurados."
 
 #: plugins/admin/systems/servRepository.tpl:11
-#, fuzzy
 msgid "Add repository"
-msgstr "Reintentar"
+msgstr "Añadir repositorio"
 
 #: plugins/admin/systems/servRepository.tpl:29
 msgid "This menu allows you to create, delete and edit repository settings."
 msgstr ""
 
-#: plugins/admin/systems/glpi_edit_type.tpl:7
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/glpi_edit_os.tpl:7
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+#: plugins/admin/systems/class_goGlpiServer.inc:31
 #, fuzzy
-msgid "Rename"
-msgstr "Nombre del servidor"
+msgid "Inventory database"
+msgstr "Usuario de Base de datos"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#: plugins/admin/systems/class_goGlpiServer.inc:51
 #, fuzzy
-msgid "List of devices"
-msgstr "Lista de usuarios"
+msgid "Glpi management"
+msgstr "Gestión de listas de bloqueo"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:24
+#: plugins/admin/systems/class_goGlpiServer.inc:81
+#, fuzzy, php-format
+msgid "Removing server services/glpi with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:99
+#, fuzzy, php-format
+msgid "Saving server services/glpi with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:126
+#, php-format
+msgid "Set status flag for server services/glpi with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goGlpiServer.inc:139
+#, fuzzy
+msgid "The attribute database is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:217
+#, fuzzy
+msgid "Glpi server"
+msgstr "Servidor de correo"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:218
+#, fuzzy
+msgid "Glpi server service"
+msgstr "Servicio Sieve"
+
+#: plugins/admin/systems/class_goGlpiServer.inc:226
+#: plugins/admin/systems/class_goFonServer.inc:233
+#: plugins/admin/systems/class_goLogDBServer.inc:224
+#: plugins/admin/systems/class_goKrbServer.inc:229
+#, fuzzy
+msgid "Admin"
+msgstr "Administradores"
+
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+msgid "Manage System-types"
+msgstr "Gestionar tipos de sistemas"
+
+#: 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
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+msgid "Rename"
+msgstr "Renombrar"
+
+#: 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/glpiDeviceManagement.tpl:6
+msgid "List of devices"
+msgstr "Lista de dispositivos"
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
 msgid ""
 "This dialog allows you to attach a device to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-#, fuzzy
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
 msgid "Display devices matching"
-msgstr "Mostrar direcciones que concuerden con"
+msgstr "Mostrar dispositivos que concuerden con"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:39
-#, fuzzy
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
 msgid "Regular expression for matching device names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
-
-#: plugins/admin/systems/glpiDeviceManagement.tpl:53
-#: plugins/admin/systems/class_glpiSelectUser.inc:109
-#: plugins/admin/systems/class_glpiSelectUser.inc:136
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/systems/glpiAttachmentPool.tpl:53
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:53
+msgstr "Expresiones regulares que concuerden con nombres de dispositivos"
+
+#: 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/glpiPrinterCartridges.tpl:51
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
-#, fuzzy
 msgid "Use"
-msgstr "Usuario"
+msgstr "Usa"
+
+#: plugins/admin/systems/goFonServer.tpl:1
+#, fuzzy
+msgid "VoIP database information"
+msgstr "Información de sistema"
 
-#: plugins/admin/systems/class_glpiAccount.inc:140
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:153
+#: plugins/admin/systems/class_glpiAccount.inc:144
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
 msgid "There is no server with valid glpi database service."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:150
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:163
-#, fuzzy
+#: plugins/admin/systems/class_glpiAccount.inc:154
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
 msgid "Can't connect to glpi database, the php-mysql extension is missing."
 msgstr ""
-"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
-"registros!"
+"No puedo conectar a la base de datos glpi, la extensión php-mysql no se "
+"encuentra."
 
-#: plugins/admin/systems/class_glpiAccount.inc:160
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:173
-#, fuzzy
+#: plugins/admin/systems/class_glpiAccount.inc:164
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
 msgid "Can't connect to glpi database, check configuration twice."
 msgstr ""
-"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
-"registros!"
+"No puedo conectar a la base de datos glpi, compruebe la configuración de "
+"nuevo."
 
-#: plugins/admin/systems/class_glpiAccount.inc:174
-#: plugins/admin/systems/class_glpiAccount.inc:180
-#: plugins/admin/systems/class_glpiAccount.inc:186
+#: 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/class_glpiAccount.inc:283
+#: plugins/admin/systems/class_glpiAccount.inc:292
 msgid "Adding new sytem type failed, this system type name is already used."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:303
+#: 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/class_glpiAccount.inc:314
-#, fuzzy
+#: plugins/admin/systems/class_glpiAccount.inc:323
 msgid "Rename failed, this system type name is already used."
-msgstr "El nombre especificado ya esta siendo usado"
+msgstr ""
+"El cambio de nombre ha fallado, ha especificado uno que está siendo usado."
 
-#: plugins/admin/systems/class_glpiAccount.inc:349
-#, fuzzy
+#: plugins/admin/systems/class_glpiAccount.inc:379
 msgid "Adding new operating system failed, specifed name is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+msgstr ""
+"Añadir nuevo sistema operativo ha fallado, el valor especificado esta siendo "
+"utilizado."
 
-#: plugins/admin/systems/class_glpiAccount.inc:371
+#: 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/class_glpiAccount.inc:383
-#, fuzzy
+#: plugins/admin/systems/class_glpiAccount.inc:413
 msgid "Updating operating system failed, specifed name is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+msgstr ""
+"Actualizar sistema operativo ha fallado, el valor especificado esta siendo "
+"utilizado."
 
-#: plugins/admin/systems/class_glpiAccount.inc:515
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:196
-#, fuzzy
-msgid "Remove inventory service"
-msgstr "Eliminar servicio DNS"
+#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+msgid "Remove inventory"
+msgstr "Eliminar inventario"
 
-#: plugins/admin/systems/class_glpiAccount.inc:516
-#, fuzzy
+#: plugins/admin/systems/class_glpiAccount.inc:566
 msgid ""
 "This device has inventory informations enabled. You can disable them by "
 "clicking below."
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
+"Este dispositivo tiene información de inventario activada. Puede "
+"desactivarla pulsando aquí."
 
-#: plugins/admin/systems/class_glpiAccount.inc:518
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#, fuzzy
-msgid "Add inventory service"
-msgstr "Añadir el servicio Kolab"
+#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+msgid "Add inventory"
+msgstr "Añadir inventario"
 
-#: plugins/admin/systems/class_glpiAccount.inc:519
-#, fuzzy
+#: plugins/admin/systems/class_glpiAccount.inc:569
 msgid ""
 "This device has inventory informations disabled. You can enable them by "
 "clicking below."
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+"Este dispositivo tiene información de inventario desactivada. Puede "
+"activarla pulsando aquí."
 
-#: plugins/admin/systems/class_glpiAccount.inc:582
-#: plugins/admin/systems/class_glpiAccount.inc:596
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:578
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:592
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+#: plugins/admin/systems/class_glpiAccount.inc:633
+#: plugins/admin/systems/class_glpiAccount.inc:648
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
 msgid "N/A"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+#: 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/class_glpiAccount.inc:768
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:764
+msgid "Glpi"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:769
 #, fuzzy
-msgid "Attachment"
-msgstr "Argumentos"
+msgid "Inventory extension"
+msgstr "Eliminar extensión de impresión"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-#: plugins/admin/systems/glpi_devices.tpl:108
-#: plugins/admin/systems/glpi_devices.tpl:147
-#: plugins/admin/systems/glpi_devices.tpl:200
-#: plugins/admin/systems/glpi_devices.tpl:254
-#: plugins/admin/systems/glpi_devices.tpl:310
-#: plugins/admin/systems/glpi_devices.tpl:372
-#: plugins/admin/systems/glpi_devices.tpl:442
-#: plugins/admin/systems/glpi_devices.tpl:504
-#: plugins/admin/systems/glpi_devices.tpl:548
-#: plugins/admin/systems/glpi_devices.tpl:599
-#: plugins/admin/systems/glpi_devices.tpl:651
-#: plugins/admin/systems/glpi_devices.tpl:695
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+#: plugins/admin/systems/class_glpiAccount.inc:786
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:783
 #, fuzzy
-msgid "Comment"
-msgstr "Contacto"
+msgid "Attachment name"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:787
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:784
+#, fuzzy
+msgid "Attachment comment"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:788
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:785
+#, fuzzy
+msgid "Attachment mime type"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:789
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:786
+#, fuzzy
+msgid "Attachment filename"
+msgstr "Adjuntos"
+
+#: plugins/admin/systems/class_glpiAccount.inc:791
+#, fuzzy
+msgid "Peripheral devices"
+msgstr "Dispositivo de Impresión"
+
+#: plugins/admin/systems/glpiManufacturer.tpl:1
+msgid "Manage manufacturers"
+msgstr "Gestione fabricantes"
+
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+msgid "Attachment"
+msgstr "Adjuntos"
 
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:30
-#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:122
+#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:130
 msgid "File"
 msgstr "Archivo"
 
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-#, fuzzy
 msgid "Filename"
-msgstr "Nombre del servidor"
+msgstr "Nombre del archivo"
 
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-#, fuzzy
 msgid "Mime-type"
-msgstr "Tipo"
+msgstr "Tipo MIME"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:136
-#, fuzzy
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
 msgid "use"
-msgstr "Ratón"
+msgstr "uso"
 
-#: plugins/admin/systems/glpiSelectUser.tpl:24
+#: 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:2
-#, fuzzy
-msgid "Monitor"
-msgstr "Monitor"
+msgid "Add/Edit monitor"
+msgstr "Añadir/Editar monitor"
 
-#: plugins/admin/systems/glpi_devices.tpl:31
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:777
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+msgid "Comments"
+msgstr "Comentarios"
+
+#: plugins/admin/systems/glpi_devices.tpl:33
 msgid "Monitor size"
-msgstr "Monitor"
+msgstr "Tamaño del monitor"
 
-#: plugins/admin/systems/glpi_devices.tpl:34
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:36
 msgid "Inch"
-msgstr "Francés"
+msgstr "Pulgada"
 
-#: plugins/admin/systems/glpi_devices.tpl:42
+#: plugins/admin/systems/glpi_devices.tpl:44
 msgid "Integrated microphone"
-msgstr ""
-
-#: plugins/admin/systems/glpi_devices.tpl:45
-#: plugins/admin/systems/glpi_devices.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:61
-#: plugins/admin/systems/glpi_devices.tpl:69
-#: plugins/admin/systems/glpi_devices.tpl:170
-#: plugins/admin/systems/glpi_devices.tpl:286
-#: plugins/admin/systems/glpi_devices.tpl:349
-#, fuzzy
+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 "Sistemas"
+msgstr "Si"
 
-#: plugins/admin/systems/glpi_devices.tpl:46
-#: plugins/admin/systems/glpi_devices.tpl:54
-#: plugins/admin/systems/glpi_devices.tpl:62
-#: plugins/admin/systems/glpi_devices.tpl:70
-#: plugins/admin/systems/glpi_devices.tpl:171
-#: plugins/admin/systems/glpi_devices.tpl:287
-#: plugins/admin/systems/glpi_devices.tpl:350
-#, fuzzy
+#: 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 "ninguno"
+msgstr "No"
 
-#: plugins/admin/systems/glpi_devices.tpl:50
+#: plugins/admin/systems/glpi_devices.tpl:52
 msgid "Integrated speakers"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:58
+#: plugins/admin/systems/glpi_devices.tpl:60
 msgid "Sub-D"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:66
+#: plugins/admin/systems/glpi_devices.tpl:68
 msgid "BNC"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:74
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:76
 msgid "Serial number"
-msgstr "Nombre de terminal"
+msgstr "Número de serie"
 
-#: plugins/admin/systems/glpi_devices.tpl:81
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:83
 msgid "Additional serial number"
-msgstr "Numero de serie del certificado"
+msgstr "Número de serie adicional"
 
-#: plugins/admin/systems/glpi_devices.tpl:95
-#, fuzzy
-msgid "Other devices"
-msgstr "Dispositivos de Red"
+#: plugins/admin/systems/glpi_devices.tpl:97
+msgid "Add/Edit other device"
+msgstr "Añadir/Editar otro dispositivo"
 
-#: plugins/admin/systems/glpi_devices.tpl:134
-msgid "Power supply"
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:167
+#: plugins/admin/systems/glpi_devices.tpl:173
 msgid "Atx"
-msgstr ""
+msgstr "ATX"
 
-#: plugins/admin/systems/glpi_devices.tpl:175
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:181
 msgid "Power"
-msgstr "Puerto"
+msgstr "Potencia"
 
-#: plugins/admin/systems/glpi_devices.tpl:187
-msgid "Gfxcard"
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:220
-#: plugins/admin/systems/glpi_devices.tpl:274
-#: plugins/admin/systems/glpi_devices.tpl:337
+#: 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/glpi_devices.tpl:229
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:237
 msgid "Ram"
-msgstr "Nombre del servidor"
+msgstr "RAM"
 
-#: plugins/admin/systems/glpi_devices.tpl:241
-#, fuzzy
-msgid "Controllers"
-msgstr "Pais"
+#: plugins/admin/systems/glpi_devices.tpl:249
+msgid "Add/Edit controller"
+msgstr "Añadir/Editar controlador"
 
-#: plugins/admin/systems/glpi_devices.tpl:297
-#, fuzzy
-msgid "Drive"
-msgstr "Controlador"
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:330
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:342
 msgid "Speed"
-msgstr "Sexo"
+msgstr "Velocidad"
 
-#: plugins/admin/systems/glpi_devices.tpl:346
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:358
 msgid "Writeable"
-msgstr "escribir"
+msgstr "Grabable"
 
-#: plugins/admin/systems/glpi_devices.tpl:359
-#, fuzzy
-msgid "Hdd"
-msgstr "Añadir"
+#: plugins/admin/systems/glpi_devices.tpl:371
+msgid "Add/Edit harddisk"
+msgstr "Añadir/Editar Disco Duro"
 
-#: plugins/admin/systems/glpi_devices.tpl:392
+#: plugins/admin/systems/glpi_devices.tpl:406
 msgid "Rpm"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:399
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:413
 msgid "Cache"
-msgstr "Cancelar"
+msgstr "Cache"
 
-#: plugins/admin/systems/glpi_devices.tpl:429
-msgid "RAM"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:443
+msgid "Add/Edit memory"
+msgstr "Añadir/Editar memoria"
 
-#: plugins/admin/systems/glpi_devices.tpl:462
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:478
 msgid "Frequenz"
-msgstr "Número de teléfono"
+msgstr "Frecuencia"
 
-#: plugins/admin/systems/glpi_devices.tpl:491
-msgid "Soundcard"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:507
+msgid "Add/Edit sound card"
+msgstr "Añadir/Editar tarjeta de sonido"
 
-#: plugins/admin/systems/glpi_devices.tpl:535
-#, fuzzy
-msgid "Network interface"
-msgstr "Impresora de Red"
+#: plugins/admin/systems/glpi_devices.tpl:553
+msgid "Add/Edit network interface"
+msgstr "Añadir/Editar dispositivo de red"
 
-#: plugins/admin/systems/glpi_devices.tpl:568
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_termDNS.inc:523
 msgid "MAC address"
 msgstr "Dirección MAC"
 
-#: plugins/admin/systems/glpi_devices.tpl:586
-msgid "Processor"
-msgstr ""
+#: plugins/admin/systems/glpi_devices.tpl:607
+msgid "Add/Edit processor"
+msgstr "Añadir/Editar procesador"
 
-#: plugins/admin/systems/glpi_devices.tpl:619
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:642
 msgid "Frequence"
-msgstr "Número de teléfono"
+msgstr "Frecuencia"
 
-#: plugins/admin/systems/glpi_devices.tpl:626
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:649
 msgid "Default frequence"
-msgstr "Valor por defecto"
+msgstr "Frecuencia por defecto"
 
-#: plugins/admin/systems/glpi_devices.tpl:638
-#, fuzzy
-msgid "Motherboard"
-msgstr "Teclado"
+#: plugins/admin/systems/glpi_devices.tpl:661
+msgid "Add/Edit motherboard"
+msgstr "Añadir/Editar placa base"
 
-#: plugins/admin/systems/glpi_devices.tpl:671
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:696
 msgid "Chipset"
-msgstr "Borrar"
+msgstr "Chipset"
 
-#: plugins/admin/systems/glpi_devices.tpl:682
-#, fuzzy
-msgid "Computer case"
-msgstr "incompleto"
+#: plugins/admin/systems/glpi_devices.tpl:707
+msgid "Add/Edit computer case"
+msgstr "Añadir/Editar Caja de ordenador"
 
-#: plugins/admin/systems/glpi_devices.tpl:715
-#, fuzzy
+#: plugins/admin/systems/glpi_devices.tpl:742
 msgid "format"
-msgstr "Puerto"
+msgstr "formateo"
+
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
+msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:93
 #, php-format
@@ -8314,9 +10597,9 @@ msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:113
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, fuzzy, php-format
+#, php-format
 msgid "You're about to delete the glpi device '%s'."
-msgstr "Está a punto de borrar el grupo '%s'."
+msgstr "Está a punto de borrar el dispositivo glpi '%s'."
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:117
 msgid "Can't detect object name."
@@ -8329,88 +10612,75 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:187
-#, fuzzy
 msgid "devices"
-msgstr "Servicios"
+msgstr "dispositivos"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#, fuzzy
 msgid "New monitor"
-msgstr "Nueva contraseña"
+msgstr "Nuevo monitor"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#, fuzzy
 msgid "M"
-msgstr "Mb"
+msgstr "M"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
-#, fuzzy
 msgid "New mainbord"
-msgstr "Nueva contraseña"
+msgstr "Nueva placa base"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#, fuzzy
 msgid "New processor"
-msgstr "Nueva contraseña"
+msgstr "Nuevo procesador"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-#: plugins/admin/fai/class_faiManagement.inc:640
+#: plugins/admin/fai/class_divListFai.inc:131
 msgid "P"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-#, fuzzy
 msgid "New case"
-msgstr "usuarios"
+msgstr "Nueva caja"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:231
 msgid "C"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-#, fuzzy
 msgid "New network interface"
-msgstr "Impresora de Red"
+msgstr "Nuevo dispositivo de red"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:233
-#, fuzzy
 msgid "NI"
-msgstr "UNIX"
+msgstr "NI"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-#, fuzzy
 msgid "New ram"
-msgstr "usuarios"
+msgstr "Nueva memoria"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:235
 msgid "R"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-#, fuzzy
 msgid "New hard disk"
-msgstr "Servidor"
+msgstr "Nuevo disco duro"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:237
 msgid "HDD"
-msgstr ""
+msgstr "HDD"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-#, fuzzy
 msgid "New drive"
-msgstr "Servidor"
+msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:239
-#, fuzzy
 msgid "D"
-msgstr "UID"
+msgstr "D"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-#, fuzzy
 msgid "New controller"
-msgstr "Número de teléfono"
+msgstr "Nueva controladora"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:241
 msgid "CS"
@@ -8425,9 +10695,8 @@ msgid "GC"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-#, fuzzy
 msgid "New sound card"
-msgstr "Nueva contraseña"
+msgstr "Nueva tarjeta de sonido"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:245
 msgid "SC"
@@ -8442,46 +10711,46 @@ msgid "PS"
 msgstr ""
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-#, fuzzy
 msgid "New misc device"
-msgstr "Dispositivos de Red"
+msgstr "Nuevo dispositivo (otros)"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:249
 msgid "OC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
-#, fuzzy
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
 msgid "You have to specify a valid name for this device."
-msgstr "Por favor especifique un usuario valido."
+msgstr "Por favor especifique un nombre valido para este dispositivo."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
-#, fuzzy
+#: 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 especificado ya esta siendo usado"
+msgstr "El nombre de dispositivo especificado ya esta siendo usado"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
-#, fuzzy
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 msgid "Other"
-msgstr "Filtros"
+msgstr "Otro"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:13
-#, fuzzy
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+msgid "Add/Edit manufacturer"
+msgstr "Añadir/Editar Fabricante"
+
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
 msgid "Website"
-msgstr "escribir"
+msgstr "Sitio web"
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:31
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: 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
-#, fuzzy
 msgid "Phone number"
-msgstr "Números de teléfonos"
+msgstr "Número de teléfono"
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:73
-#, fuzzy, php-format
+#, php-format
 msgid "You're about to delete the glpi attachment component '%s'."
-msgstr "Va ha eliminar la aplicación '%s'."
+msgstr "Va ha eliminar el componente adjunto glpi '%s'."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:112
 #, php-format
@@ -8491,28 +10760,25 @@ msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:124
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:128
-#, fuzzy
 msgid "There is no valid file uploaded."
-msgstr "No se ha subido ningún archivo."
+msgstr "No se ha subido ningún archivo valido."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:131
-#, fuzzy
 msgid "Upload wasn't successfull."
-msgstr "Exportación completada"
+msgstr "El envío no fue correcto."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:134
 msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:138
-#, fuzzy
 msgid "There is already a file with the same name uploaded."
-msgstr "Ya existe un usuario con este 'Login' en la base de datos."
+msgstr "Ya existe un fichero con este nombre."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:142
-#, fuzzy, php-format
+#, php-format
 msgid "Can't create file '%s'."
-msgstr "Borrar"
+msgstr "No puedo crear el fichero '%s'."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:186
 msgid "File is available."
@@ -8523,59 +10789,50 @@ msgid "File is not readable, possibly the file is missing."
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:191
-#, fuzzy
 msgid "Currently no file uploaded."
-msgstr "No se ha subido ningún archivo."
+msgstr "No se ha subido ningún archivo actualmente."
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:202
-#, fuzzy
 msgid "Mime"
-msgstr "Teléfono Móvil"
+msgstr "Mime"
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:205
 msgid "This table displays all available attachments."
 msgstr ""
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:222
-#, fuzzy
 msgid "empty"
-msgstr "Plantilla"
+msgstr "vacío"
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:259
-#, fuzzy
 msgid "Create new attachment"
-msgstr "Nombre del departamento"
+msgstr "Crear nuevo adjunto"
 
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:260
-#, fuzzy
 msgid "New Attachment"
-msgstr "Argumentos"
+msgstr "Nuevo adjunto"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
-#, fuzzy
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
 msgid "Please specify a valid name for this attachment."
-msgstr "Por favor especifique un usuario valido."
+msgstr "Por favor especifique un nombre de adjunto valido."
 
 #: plugins/admin/systems/glpiAttachmentPool.tpl:6
-#, fuzzy
 msgid "List of attachments"
-msgstr "Lista de Departamentos"
+msgstr "Lista de Adjuntos"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:24
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
 msgid ""
 "This dialog allow you to attach additional objects (like manuals, guides, "
 "etc.)  to your currently edited computer."
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
-#, fuzzy
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
 msgid "Display attachments matching"
-msgstr "Mostrar Departamentos que concuerden con"
+msgstr "Mostrar adjuntos que concuerden con"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:39
-#, fuzzy
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
 msgid "Regular expression for matching attachment names"
-msgstr "Expresiones regulares para encontrar nombres de departamentos"
+msgstr "Expresiones regulares para encontrar nombres de adjuntos"
 
 #: plugins/admin/systems/class_glpiManufacturer.inc:58
 #, php-format
@@ -8585,56 +10842,78 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/systems/class_glpiManufacturer.inc:104
-#, fuzzy
 msgid "Please specify a name."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgstr "Por favor especifique un nombre"
 
 #: plugins/admin/systems/class_glpiManufacturer.inc:113
 #: plugins/admin/systems/class_glpiManufacturer.inc:119
-#, fuzzy
 msgid "Specified name is already in use, please choose another one."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+msgstr ""
+"El valor especificado como 'Nombre' esta siendo utilizado. Por favor elija "
+"otro."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:197
-#, fuzzy
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
 msgid ""
 "This server has inventory features enabled. You can disable them by clicking "
 "below."
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
+"Este servidor tiene la extensión inventario activada. Puede desactivarla "
+"pulsando aquí."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
-#, fuzzy
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
 msgid ""
 "This server has inventory features disabled. You can enable them by clicking "
 "below."
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+"Este servidor tiene la extensión inventario desactivada. Puede activarla "
+"pulsando aquí."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:238
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:271
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
 #, php-format
 msgid ""
 "Can't rename given printer type to '%s', because this type name already "
 "exists."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:252
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
 #, php-format
 msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:719
-#, fuzzy
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
 msgid "since"
-msgstr "Arriba desde"
+msgstr "desde"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:765
+#, fuzzy
+msgid "Printer inventory extension"
+msgstr "Eliminar extensión de impresión"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:773
+#, fuzzy
+msgid "Supports serial interface"
+msgstr "Interfaces soportados"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:774
+#, fuzzy
+msgid "Supports parallel interface"
+msgstr "Interfaces soportados"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:775
+#, fuzzy
+msgid "Supports usb interface"
+msgstr "Interfaces soportados"
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:788
+#, fuzzy
+msgid "Cartridge settings"
+msgstr "Parámetros de correo"
 
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, fuzzy, php-format
+#, php-format
 msgid "You're about to delete the glpi cartridge type '%s'."
-msgstr "Va ha eliminar la aplicación '%s'."
+msgstr "Va ha eliminar el paquete glpi tipo '%s'."
 
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
 #, php-format
@@ -8647,12 +10926,78 @@ msgstr ""
 msgid "Cartridges"
 msgstr ""
 
+#: plugins/admin/systems/class_termDNS.inc:132
+#, php-format
+msgid ""
+"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
+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_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_termDNS.inc:319
+msgid ""
+"The given macaddress is invalid. There must be 6 2byte segments seperated by "
+"':'."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:339
+#, php-format
+msgid "Found duplicate value for record type '%s'."
+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_termDNS.inc:358
+#, php-format
+msgid ""
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:365
+#: plugins/admin/systems/class_servDNSeditZone.inc:409
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:448
+#, fuzzy, php-format
+msgid "Saving of terminal/dns account with dn '%s' failed."
+msgstr "No se ha podido guardar la cuenta de correo"
+
+#: plugins/admin/systems/class_termDNS.inc:511
+#, fuzzy
+msgid "DNS settings"
+msgstr "Parametros de samba"
+
+#: plugins/admin/systems/class_termDNS.inc:519
+#, fuzzy
+msgid "DNS records"
+msgstr "Registros DNS"
+
+#: plugins/admin/systems/class_termDNS.inc:522
+#, fuzzy
+msgid "IP address"
+msgstr "Dirección IP"
+
 #: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
 msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
-#, fuzzy
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
 msgid "The selected name is already in use."
 msgstr "El nombre especificado ya esta siendo usado"
 
@@ -8660,7 +11005,7 @@ msgstr "El nombre especificado ya esta siendo usado"
 msgid "List of available cartridge type for this type of printer"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:24
+#: 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 "
@@ -8669,87 +11014,1194 @@ msgid ""
 "more then one printer."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-#, fuzzy
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
 msgid "Display cartridge types matching"
-msgstr "Mostrar números que concuerdan con"
+msgstr "Mostrar tipos de cartuchos que concuerdan con"
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:39
-#, fuzzy
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
 msgid "Regular expression for matching cartridge types"
-msgstr "Expresiones regulares que concuerden con direcciones"
+msgstr "Expresiones regulares que concuerden con tipos de cartuchos"
 
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-#, fuzzy
 msgid "Reference"
-msgstr "Referencias"
+msgstr "Referencia"
+
+#: plugins/admin/systems/servdnseditzone.tpl:13
+msgid "Network address"
+msgstr "Dirección de red"
+
+#: plugins/admin/systems/servdnseditzone.tpl:27
+msgid "Can't be edited because the zone wasn't saved right now."
+msgstr ""
+
+#: plugins/admin/systems/servdnseditzone.tpl:39
+msgid "SOA record"
+msgstr "Registros SOA"
+
+#: plugins/admin/systems/servdnseditzone.tpl:45
+msgid "Primary dns server for this zone"
+msgstr "Servidor DNS primario para esta zona"
 
-#: plugins/admin/ogroups/headpage.tpl:24
+#: plugins/admin/systems/servdnseditzone.tpl:57
+msgid "Serial number (automatically incremented)"
+msgstr ""
+
+#: 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/SelectDeviceType.tpl:3
 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."
+"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 ""
-"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/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr "Mostrar grupos que tienen usuarios"
+#: 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/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr "Mostrar grupos que contienen grupos"
+#: plugins/admin/systems/SelectDeviceType.tpl:21
+msgid "Choose a system type"
+msgstr "Elija tipo de sistema"
 
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr "Mostrar grupos que contienen aplicaciones"
+#: plugins/admin/systems/SelectDeviceType.tpl:32
+msgid "Choose an object group as template"
+msgstr "Elija un grupo de objetos como plantilla"
 
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr "Mostrar grupos que contienen departamentos"
+#: plugins/admin/systems/SelectDeviceType.tpl:33
+msgid "Choose an object group"
+msgstr "Elija un grupo de objetos"
 
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr "Mostrar grupos que contienen servidores"
+#: plugins/admin/systems/class_servDNSeditZone.inc:290
+#: plugins/admin/ogroups/phonequeue.tpl:18
+#: plugins/admin/fai/class_faiProfile.inc:300 include/class_acl.inc:363
+msgid "Down"
+msgstr "Abajo"
 
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr "Mostrar grupos que contienen estaciones de trabajo"
+#: 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/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr "Mostrar grupos que contienen terminales"
+#: 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/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr "Mostrar grupos que contienen impresoras"
+#: plugins/admin/systems/class_servDNSeditZone.inc:359
+#, php-format
+msgid "Please choose a valid zone name."
+msgstr "Por favor seleccione un nombre de zona válido."
 
-#: plugins/admin/ogroups/headpage.tpl:51
-#, fuzzy
-msgid "Display object groups matching"
-msgstr "Mostrar objetos que concuerden con"
+#: plugins/admin/systems/class_servDNSeditZone.inc:363
+#, php-format
+msgid "Please choose a valid reverse zone name."
+msgstr "Por favor seleccione un nombre de zona inversa válido."
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "Nombre del grupo"
+#: plugins/admin/systems/class_servDNSeditZone.inc:367
+msgid "Primary dns server must end with '.' to be a valid entry."
+msgstr ""
 
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
-msgstr "Objetos miembro"
+#: plugins/admin/systems/class_servDNSeditZone.inc:371
+msgid "Your specified mail address must end with '.' to be a valid record."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:375
+#: plugins/admin/systems/class_servDNSeditZone.inc:379
+msgid ""
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:383
+msgid "Only lowercase strings are allowed as zone name."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
+msgid "Please specify a numeric value for serial number."
+msgstr "Por favor especifique un valor numérico para el número de serie."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
+msgid "Please specify a numeric value for refresh."
+msgstr "Por favor especifique un valor numérico para el refresco."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
+msgid "Please specify a numeric value for ttl."
+msgstr "Por favor especifique un valor numérico para TTL."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:399
+msgid "Please specify a numeric value for expire."
+msgstr "Por favor especifique un valor numérico para expiración."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:403
+msgid "Please specify a numeric value for retry."
+msgstr "Por favor especifique un valor numérico para reintento."
+
+#: 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:115
+#, php-format
+msgid "Select this base"
+msgstr "Seleccionar esta base"
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+msgid "New entry"
+msgstr "Nueva entrada"
+
+#: 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/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/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/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_servDNSeditZoneEntries.inc:227
+#, php-format
+msgid "The name '%s' is used more than once."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
+#, php-format
+msgid "The host name '%s' should be written in lowercase."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#, php-format
+msgid "The record type '%s' is a unique type and can't be defined twice."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#, 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/servDNSeditZoneEntries.tpl:1
+msgid ""
+"This dialog allows you to configure all components of this DNS zone on a "
+"single list."
+msgstr ""
+
+#: 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/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/servDNSeditZoneEntries.tpl:14
+msgid "Create a new DNS zone entry"
+msgstr "Crear una nueva entrada de zona DNS"
+
+#: plugins/admin/systems/class_divListSystem.inc:37
+#: plugins/admin/systems/class_divListSystem.inc:38
+msgid "List of systems"
+msgstr "Lista de sistemas"
+
+#: 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."
+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:58
+msgid "System / Department"
+msgstr "Sistema / Departamento"
+
+#: plugins/admin/systems/class_divListSystem.inc:62
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Mostrar servidores"
+
+#: plugins/admin/systems/class_divListSystem.inc:63
+msgid "Select to see Linux terminals"
+msgstr "Seleccione para ver los terminales Linux"
+
+#: plugins/admin/systems/class_divListSystem.inc:63
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Mostrar terminales"
+
+#: plugins/admin/systems/class_divListSystem.inc:64
+msgid "Select to see Linux workstations"
+msgstr "Seleccione para ver las estaciones de trabajo Linux"
+
+#: plugins/admin/systems/class_divListSystem.inc:64
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Mostrar estaciones de trabajo"
+
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
+
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Show windows based workstations"
+msgstr "Mostrara estaciones de trabajo basadas en windows"
+
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Select to see network printers"
+msgstr "Seleccione para ver impresoras de red"
+
+#: plugins/admin/systems/class_divListSystem.inc:66
+msgid "Show network printers"
+msgstr "Mostrar impresoras de red"
+
+#: plugins/admin/systems/class_divListSystem.inc:67
+msgid "Select to see VOIP phones"
+msgstr "Seleccione para ver teléfonos VOIP"
+
+#: plugins/admin/systems/class_divListSystem.inc:67
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Mostrar teléfonos"
+
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Select to see network devices"
+msgstr "Seleccione para ver los dispositivos de red"
+
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Show network devices"
+msgstr "Mostrar dispositivos de Red"
+
+#: plugins/admin/systems/class_divListSystem.inc:76
+msgid "Display systems of user"
+msgstr "Mostrar sistemas del usuario"
+
+#: plugins/admin/systems/class_divListSystem.inc:103
+msgid "New Terminal template"
+msgstr "Nueva plantilla de terminal"
+
+#: plugins/admin/systems/class_divListSystem.inc:105
+msgid "New Workstation template"
+msgstr "Nueva plantilla de estación de trabajo"
+
+#: plugins/admin/systems/class_divListSystem.inc:106
+#: plugins/admin/systems/class_divListSystem.inc:107
+msgid "New Server"
+msgstr "Nuevo servidor"
+
+#: plugins/admin/systems/class_divListSystem.inc:108
+#: plugins/admin/systems/class_divListSystem.inc:109
+msgid "New Printer"
+msgstr "Nueva impresora"
+
+#: plugins/admin/systems/class_divListSystem.inc:110
+#: plugins/admin/systems/class_divListSystem.inc:111
+msgid "New Phone"
+msgstr "Nuevo teléfono"
+
+#: plugins/admin/systems/class_divListSystem.inc:112
+#: plugins/admin/systems/class_divListSystem.inc:113
+msgid "New Component"
+msgstr "Nuevo componente"
+
+#: plugins/admin/systems/class_divListSystem.inc:131
+msgid "Cups Server"
+msgstr "Servidor CUPS"
+
+#: plugins/admin/systems/class_divListSystem.inc:132
+msgid "Log Db"
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystem.inc:133
+msgid "Syslog Server"
+msgstr "Servidor SYSLOG"
+
+#: plugins/admin/systems/class_divListSystem.inc:134
+msgid "Mail Server"
+msgstr "Servidor de correo"
+
+#: plugins/admin/systems/class_divListSystem.inc:135
+msgid "Imap Server"
+msgstr "Servidor IMAP"
+
+#: plugins/admin/systems/class_divListSystem.inc:136
+msgid "Nfs Server"
+msgstr "Servidor NFS"
+
+#: plugins/admin/systems/class_divListSystem.inc:137
+msgid "Kerberos Server"
+msgstr "Servidor Kerberos"
+
+#: plugins/admin/systems/class_divListSystem.inc:138
+msgid "Asterisk Server"
+msgstr "Servidor Asterisk"
+
+#: plugins/admin/systems/class_divListSystem.inc:139
+msgid "Fax Server"
+msgstr "Servidor FAX"
+
+#: plugins/admin/systems/class_divListSystem.inc:140
+msgid "Ldap Server"
+msgstr "Servidor LDAP"
+
+#: plugins/admin/systems/class_divListSystem.inc:156
+#: plugins/admin/acl/class_divListACL.inc:123
+msgid "Edit system"
+msgstr "Editar sistema"
+
+#: plugins/admin/systems/class_divListSystem.inc:158
+#: plugins/admin/acl/class_divListACL.inc:126
+msgid "Delete system"
+msgstr "Eliminar sistema"
+
+#: plugins/admin/systems/class_divListSystem.inc:189
+msgid "Set root       password"
+msgstr "Poner Contraseña de root"
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:3
+msgid "Adding a new service to the current server"
+msgstr ""
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:7
+msgid ""
+"This dialog allows you to add new services to the currenty edited server "
+"object. The box below shows all available but not already used services."
+msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:59
-#: plugins/admin/ogroups/tabs_ogroups.inc:151
+#: plugins/admin/systems/ServiceAddDialog.tpl:13
 #, fuzzy
+msgid "Service to add"
+msgstr "Seleccione impresora para añadir"
+
+#: plugins/admin/systems/ServiceAddDialog.tpl:20
+#, fuzzy
+msgid "All available services are already in use."
+msgstr "El nombre de dispositivo especificado ya esta siendo usado"
+
+#: plugins/admin/systems/class_goCupsServer.inc:76
+#, fuzzy, php-format
+msgid "Removing of server services/cups with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goCupsServer.inc:100
+#, fuzzy, php-format
+msgid "Saving of server services/cups with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goCupsServer.inc:122
+#, php-format
+msgid "Set status flag for server services/cups with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goCupsServer.inc:206
+#, fuzzy
+msgid "Cups"
+msgstr "Arriba"
+
+#: plugins/admin/systems/class_goCupsServer.inc:207
+#, fuzzy
+msgid "Cups service"
+msgstr "Servicio de sonido"
+
+#: plugins/admin/systems/goLdapServer.tpl:1
+#: plugins/admin/systems/class_goLdapServer.inc:27
+#, fuzzy
+msgid "LDAP service"
+msgstr "Servicio LDAP"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:79
+#, php-format
+msgid "Removing server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:102
+#, fuzzy, php-format
+msgid "Saving server services/terminalServer with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goTerminalServer.inc:129
+#, php-format
+msgid "Set status flag for server services/terminalServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goTerminalServer.inc:139
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
+#: plugins/admin/systems/class_divListSystemService.inc:17
+#: plugins/admin/systems/class_divListSystemService.inc:18
+#, fuzzy
+msgid "Installed services"
+msgstr "Dispositivos instalados"
+
+#: plugins/admin/systems/class_divListSystemService.inc:22
+#, fuzzy
+msgid ""
+"This menu allows you to add, remove and configure the properties of a "
+"specific service."
+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_divListSystemService.inc:30
+#, fuzzy
+msgid "Service name"
+msgstr "Nombre del servidor"
+
+#: plugins/admin/systems/class_divListSystemService.inc:51
+#, fuzzy
+msgid "Add service"
+msgstr "Añadir servicio DNS"
+
+#: plugins/admin/systems/class_divListSystemService.inc:51
+#, fuzzy
+msgid "Add new service"
+msgstr "Añadir servicio DNS"
+
+#: plugins/admin/systems/class_divListSystemService.inc:54
+#, fuzzy
+msgid "Start all"
+msgstr "Inicio"
+
+#: plugins/admin/systems/class_divListSystemService.inc:54
+#, fuzzy
+msgid "Start all services"
+msgstr "Ver todos los servicios"
+
+#: plugins/admin/systems/class_divListSystemService.inc:56
+#: plugins/admin/systems/class_divListSystemService.inc:106
+#, fuzzy
+msgid "Stop service"
+msgstr "Servicio de sonido"
+
+#: plugins/admin/systems/class_divListSystemService.inc:56
+#, fuzzy
+msgid "Stop all services"
+msgstr "Ver todos los servicios"
+
+#: plugins/admin/systems/class_divListSystemService.inc:58
+#: plugins/admin/systems/class_divListSystemService.inc:112
+#, fuzzy
+msgid "Restart service"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/class_divListSystemService.inc:58
+#, fuzzy
+msgid "Restart all services"
+msgstr "Ver todos los servicios"
+
+#: plugins/admin/systems/class_divListSystemService.inc:86
+#, fuzzy
+msgid "Stopped"
+msgstr "Velocidad"
+
+#: plugins/admin/systems/class_divListSystemService.inc:87
+#, fuzzy
+msgid "Started"
+msgstr "Estado"
+
+#: plugins/admin/systems/class_divListSystemService.inc:88
+#, fuzzy
+msgid "Restarting"
+msgstr "Destino"
+
+#: plugins/admin/systems/class_divListSystemService.inc:89
+#, fuzzy
+msgid "User status"
+msgstr "Parámetros del usuario"
+
+#: plugins/admin/systems/class_divListSystemService.inc:100
+#, fuzzy
+msgid "Start service"
+msgstr "Servicio de exploración"
+
+#: plugins/admin/systems/class_divListSystemService.inc:118
+#, fuzzy
+msgid "Edit service"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/class_divListSystemService.inc:124
+#, fuzzy
+msgid "Remove service"
+msgstr "Eliminar servicio DNS"
+
+#: plugins/admin/systems/class_serverService.inc:7
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
+msgid "Stop"
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:8
+#, fuzzy
+msgid "Start"
+msgstr "Inicio"
+
+#: plugins/admin/systems/class_serverService.inc:9
+#, fuzzy
+msgid "Restart"
+msgstr "Reintentar"
+
+#: plugins/admin/systems/class_serverService.inc:262
+msgid "Can't set status while this server is not saved."
+msgstr ""
+
+#: plugins/admin/systems/class_serverService.inc:274
+#, php-format
+msgid "The specified method '%s' can't executed for services."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:27
+#, fuzzy
+msgid "Time service"
+msgstr "Servicio de Hora"
+
+#: plugins/admin/systems/class_goNtpServer.inc:70
+#: plugins/admin/systems/class_goNtpServer.inc:220
+#, fuzzy
+msgid "NTP service"
+msgstr "Servidor NTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:100
+#, fuzzy, php-format
+msgid "Removing server services/goNtpServer with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goNtpServer.inc:122
+#, fuzzy, php-format
+msgid "Saving server services/goNtpServer with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goNtpServer.inc:149
+#, php-format
+msgid "Set status flag for server services/goNtpServer with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goNtpServer.inc:219
+#, fuzzy
+msgid "NTP"
+msgstr "FTP"
+
+#: plugins/admin/systems/class_goNtpServer.inc:228
+#, fuzzy
+msgid "Ntp source"
+msgstr "Servicio de sonido"
+
+#: plugins/admin/systems/class_goLdapServer.inc:77
+#, fuzzy, php-format
+msgid "Removing server services/ldap with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goLdapServer.inc:95
+#, fuzzy, php-format
+msgid "Saving server services/ldap with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goLdapServer.inc:123
+#, php-format
+msgid "Set status flag for server services/ldap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:133
+#, fuzzy
+msgid "The given base is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goLdapServer.inc:210
+msgid "Ldap"
+msgstr ""
+
+#: plugins/admin/systems/class_goLdapServer.inc:211
+#, fuzzy
+msgid "Ldap service"
+msgstr "Servidor LDAP"
+
+#: plugins/admin/systems/class_goLdapServer.inc:219
+#, fuzzy
+msgid "Ldap base"
+msgstr "Servidor LDAP"
+
+#: plugins/admin/systems/goMailServer.tpl:7
+msgid "Visible full qualified hostname"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:10
+msgid "The full qualified host name."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:14
+#, fuzzy
+msgid "Max mail header size"
+msgstr "Tamaño del correo electrónico"
+
+#: plugins/admin/systems/goMailServer.tpl:18
+#, fuzzy
+msgid "This value specifies the maximal header size."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+
+#: plugins/admin/systems/goMailServer.tpl:22
+#: plugins/admin/systems/class_goMailServer.inc:784
+#, fuzzy
+msgid "Max mailbox size"
+msgstr "Tamaño del correo electrónico"
+
+#: plugins/admin/systems/goMailServer.tpl:26
+msgid "Defines the maximal size of mail box."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:30
+#: plugins/admin/systems/class_goMailServer.inc:785
+#, fuzzy
+msgid "Max message size"
+msgstr "Mensaje"
+
+#: plugins/admin/systems/goMailServer.tpl:34
+msgid "Specify the maximal size of a message."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:38
+#: plugins/admin/systems/class_goMailServer.inc:788
+#, fuzzy
+msgid "Relay host"
+msgstr "Enfocado a la versión"
+
+#: plugins/admin/systems/goMailServer.tpl:42
+msgid "Relay messages to following host:"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:51
+#: plugins/admin/systems/class_goMailServer.inc:787
+msgid "Local networks"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:52
+#, fuzzy
+msgid "Postfix networks"
+msgstr "Parámetros Posix"
+
+#: plugins/admin/systems/goMailServer.tpl:66
+#, fuzzy
+msgid "Domains and routing"
+msgstr "Administradores del dominio"
+
+#: plugins/admin/systems/goMailServer.tpl:74
+#: plugins/admin/systems/class_goMailServer.inc:786
+msgid "Domains to accept mail for"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:75
+msgid "Postfix is responsible for the following domains:"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:89
+#, fuzzy
+msgid "Transports"
+msgstr "Tiempo de envio"
+
+#: plugins/admin/systems/goMailServer.tpl:92
+msgid "Select a transport protocol."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:105
+#, fuzzy
+msgid "Restrictions"
+msgstr "Secciones"
+
+#: plugins/admin/systems/goMailServer.tpl:113
+#: plugins/admin/systems/class_goMailServer.inc:790
+#, fuzzy
+msgid "Restrictions for sender"
+msgstr "Secciones para esta versión"
+
+#: plugins/admin/systems/goMailServer.tpl:116
+#: plugins/admin/systems/goMailServer.tpl:132
+msgid "Restriction filter"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:129
+#: plugins/admin/systems/class_goMailServer.inc:791
+msgid "Restrictions for recipient"
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:149
+#: plugins/admin/systems/goImapServer.tpl:76
+msgid "The server must be saved before you can use the status flag."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:151
+#: plugins/admin/systems/goImapServer.tpl:78
+msgid "The service must be saved before you can use the status flag."
+msgstr ""
+
+#: plugins/admin/systems/goMailServer.tpl:154
+#: plugins/admin/systems/goImapServer.tpl:81
+#, fuzzy
+msgid "Set new status"
+msgstr "Estado del Sistema"
+
+#: plugins/admin/systems/goMailServer.tpl:160
+#: plugins/admin/systems/goImapServer.tpl:87
+#, fuzzy
+msgid "Set status"
+msgstr "Estado del Sistema"
+
+#: plugins/admin/systems/goImapServer.tpl:44
+#: plugins/admin/systems/class_goImapServer.inc:287
+#, fuzzy
+msgid "Start IMAP service"
+msgstr "Servicio IMAP"
+
+#: plugins/admin/systems/goImapServer.tpl:51
+#: plugins/admin/systems/class_goImapServer.inc:288
+#, fuzzy
+msgid "Start IMAP SSL service"
+msgstr "Servicio IMAP/SSL"
+
+#: plugins/admin/systems/goImapServer.tpl:58
+#: plugins/admin/systems/class_goImapServer.inc:289
+#, fuzzy
+msgid "Start POP3 service"
+msgstr "Servicio POP3"
+
+#: plugins/admin/systems/goImapServer.tpl:65
+#: plugins/admin/systems/class_goImapServer.inc:290
+#, fuzzy
+msgid "Start POP3 SSL service"
+msgstr "Servicio POP3/SSL"
+
+#: plugins/admin/systems/class_goSyslogServer.inc:26
+#, fuzzy
+msgid "Logging service"
+msgstr "Base de datos de acceso de usuarios"
+
+#: plugins/admin/systems/class_goSyslogServer.inc:46
+#: plugins/admin/systems/class_goSyslogServer.inc:205
+#, fuzzy
+msgid "Syslog service"
+msgstr "Servicio de Logs"
+
+#: plugins/admin/systems/class_goSyslogServer.inc:76
+#, fuzzy, php-format
+msgid "Removing server services/goSysLog with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goSyslogServer.inc:94
+#, fuzzy, php-format
+msgid "Saving server services/goSysLog with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goSyslogServer.inc:121
+#, php-format
+msgid "Set status flag for server services/goSysLog with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goSyslogServer.inc:204
+#, fuzzy
+msgid "Syslog"
+msgstr "Registro del sistema"
+
+#: plugins/admin/systems/class_goFonServer.inc:32
+#, fuzzy
+msgid "VoIP service"
+msgstr "Servicio IMAP"
+
+#: plugins/admin/systems/class_goFonServer.inc:82
+#, fuzzy, php-format
+msgid "Removing server services/gofon with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goFonServer.inc:100
+#, fuzzy, php-format
+msgid "Saving server services/gofon with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goFonServer.inc:127
+#, php-format
+msgid "Set status flag for server services/gofon with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goFonServer.inc:137
+#, fuzzy, php-format
+msgid "The attribute DB user is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goFonServer.inc:143
+#, fuzzy, php-format
+msgid ""
+"The attribute local dial prefix is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goFonServer.inc:146
+#, fuzzy, php-format
+msgid ""
+"The attribute country dial prefix is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_goFonServer.inc:224
+#, fuzzy
+msgid "GoFon server"
+msgstr "Servidor de fuentes"
+
+#: plugins/admin/systems/class_goFonServer.inc:225
+#, fuzzy
+msgid "GoFon server service"
+msgstr "Servidor Kerberos"
+
+#: plugins/admin/systems/class_goFonServer.inc:235
+#, fuzzy
+msgid "Area code"
+msgstr "Registros SOA"
+
+#: plugins/admin/systems/class_goFonServer.inc:236
+#, fuzzy
+msgid "Country code"
+msgstr "Código de cuenta"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/goLogDB with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:97
+#, fuzzy, php-format
+msgid "Saving server services/goLogDB with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:124
+#, php-format
+msgid "Set status flag for server services/goLogDB with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goLogDBServer.inc:215
+#, fuzzy
+msgid "Log"
+msgstr "Inicio de sesión"
+
+#: plugins/admin/systems/class_goLogDBServer.inc:216
+#, fuzzy
+msgid "Log service"
+msgstr "Base de datos de acceso de usuarios"
+
+#: plugins/admin/systems/goSyslogServer.tpl:1
+#: plugins/admin/systems/goCupsServer.tpl:1
+#, fuzzy
+msgid "enabled"
+msgstr "desactivado"
+
+#: plugins/admin/systems/class_goKrbServer.inc:29
+#: plugins/admin/systems/class_goKrbServer.inc:220
+#, fuzzy
+msgid "Kerberos service"
+msgstr "Servidor Kerberos"
+
+#: plugins/admin/systems/class_goKrbServer.inc:49
+#, fuzzy
+msgid "Kerberos kadmin access informations"
+msgstr "Acceso a Kerberos kadmin"
+
+#: plugins/admin/systems/class_goKrbServer.inc:79
+#, fuzzy, php-format
+msgid "Removing server services/gokrb with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goKrbServer.inc:97
+#, fuzzy, php-format
+msgid "Saving server services/gokrb with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goKrbServer.inc:124
+#, php-format
+msgid "Set status flag for server services/gokrb with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goKrbServer.inc:135
+#, php-format
+msgid "The specified kerberos password is empty."
+msgstr "la clave kerberos especificada está vacía."
+
+#: plugins/admin/systems/class_goKrbServer.inc:138
+#, fuzzy, php-format
+msgid "The specified kerberos admin is empty."
+msgstr "la clave kerberos especificada está vacía."
+
+#: plugins/admin/systems/class_goKrbServer.inc:141
+#, fuzzy, php-format
+msgid "The specified kerberos realm is empty."
+msgstr "la clave kerberos especificada está vacía."
+
+#: plugins/admin/systems/class_goKrbServer.inc:228
+#, fuzzy
+msgid "Realm"
+msgstr "RAM"
+
+#: plugins/admin/systems/class_goMailServer.inc:44
+#, fuzzy
+msgid "Mail service (SMTP)"
+msgstr "Servidor de correo"
+
+#: plugins/admin/systems/class_goMailServer.inc:482
+#, fuzzy
+msgid "Postfix"
+msgstr "Posix"
+
+#: plugins/admin/systems/class_goMailServer.inc:512
+#, fuzzy, php-format
+msgid "Removing server services/mail with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goMailServer.inc:580
+#, fuzzy, php-format
+msgid "Saving server services/mail with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goMailServer.inc:608
+#, php-format
+msgid "Set status flag for server services/mail with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:619
+#, fuzzy
+msgid "Please specify a numeric value for header size limit."
+msgstr "Por favor especifique un valor numérico para reintento."
+
+#: plugins/admin/systems/class_goMailServer.inc:623
+#, fuzzy
+msgid "Please specify a numeric value for mailbox size limit."
+msgstr "Por favor especifique un valor numérico para expiración."
+
+#: plugins/admin/systems/class_goMailServer.inc:627
+#, fuzzy
+msgid "Please specify a numeric value for message size limit."
+msgstr "Por favor especifique un valor numérico para expiración."
+
+#: plugins/admin/systems/class_goMailServer.inc:774
+#, fuzzy
+msgid "Mail service"
+msgstr "Servidor de correo"
+
+#: plugins/admin/systems/class_goMailServer.inc:783
+msgid "Header size limit"
+msgstr ""
+
+#: plugins/admin/systems/class_goMailServer.inc:789
+#, fuzzy
+msgid "Transport table"
+msgstr "Tiempo de envio"
+
+#: plugins/admin/systems/goGlpiServer.tpl:1
+#, fuzzy
+msgid "GLPI database information"
+msgstr "Información genérica del usuario"
+
+#: plugins/admin/systems/class_goImapServer.inc:48
+#, fuzzy
+msgid "IMAP/POP3 service"
+msgstr "Servicio IMAP"
+
+#: plugins/admin/systems/class_goImapServer.inc:53
+#, fuzzy
+msgid "Repair database"
+msgstr "Base de datos Glpi"
+
+#: plugins/admin/systems/class_goImapServer.inc:83
+#, fuzzy
+msgid "Cyrus service"
+msgstr "Servicio de sonido"
+
+#: plugins/admin/systems/class_goImapServer.inc:112
+#, fuzzy, php-format
+msgid "Removing server services/imap with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goImapServer.inc:130
+#, fuzzy, php-format
+msgid "Saving server services/imap with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto de servicio de servidor"
+
+#: plugins/admin/systems/class_goImapServer.inc:158
+#, php-format
+msgid "Set status flag for server services/imap with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goImapServer.inc:168
+#, fuzzy
+msgid "Please specify a server identifier."
+msgstr "Por favor especifique un id valido."
+
+#: plugins/admin/systems/class_goImapServer.inc:171
+#, fuzzy
+msgid "Please specify a connect url."
+msgstr "Por favor especifique un nombre"
+
+#: plugins/admin/systems/class_goImapServer.inc:174
+#, fuzzy
+msgid "Please specify an admin user."
+msgstr "Por favor especifique un nombre"
+
+#: plugins/admin/systems/class_goImapServer.inc:177
+#, fuzzy
+msgid "Please specify a password for the admin user."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/admin/systems/class_goImapServer.inc:182
+#, 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/class_goImapServer.inc:186
+msgid "The sieve port needs to be numeric."
+msgstr "El puerto sieve necesita ser un numero."
+
+#: plugins/admin/systems/class_goImapServer.inc:273
+#, fuzzy
+msgid "Imap"
+msgstr "Importar"
+
+#: plugins/admin/systems/class_goImapServer.inc:274
+#, fuzzy
+msgid "Imap service"
+msgstr "Servidor IMAP"
+
+#: plugins/admin/systems/class_goImapServer.inc:285
+#: ihtml/themes/default/setup_step4.tpl:27
+msgid "Admin password"
+msgstr "Nueva contraseña"
+
+#: plugins/admin/systems/goFaxServer.tpl:1
+#, fuzzy
+msgid "FAX database information"
+msgstr "Base de datos de FAX"
+
+#: plugins/admin/systems/class_goShareServer.inc:31
+#, fuzzy
+msgid "File service"
+msgstr "Servidor de Archivos"
+
+#: plugins/admin/systems/class_goShareServer.inc:178
+#, php-format
+msgid "Removing of system server/shares with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:212
+#, fuzzy, php-format
+msgid "Saving of system server/shares with dn '%s' failed."
+msgstr ""
+"Ha fallado la grabación de los parámetros del servidor de base de datos"
+
+#: plugins/admin/systems/class_goShareServer.inc:239
+#, php-format
+msgid "Set status flag for system server/shares with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/systems/class_goShareServer.inc:287
+#, fuzzy, php-format
+msgid "Creating system server/shares (mount container) with dn '%s' failed."
+msgstr "Ha fallado la creación del contenedor de montaje"
+
+#: plugins/admin/systems/class_goShareServer.inc:301
+#, fuzzy, php-format
+msgid "Removing system server/shares (mount container) with dn '%s' failed."
+msgstr "Ha fallado la eliminación del contenedor de montaje"
+
+#: plugins/admin/systems/class_goShareServer.inc:312
+#, fuzzy, php-format
+msgid "Saving system server/shares (mount container) with dn '%s' failed."
+msgstr "Ha fallado la grabación del contenedor de montaje"
+
+#: plugins/admin/systems/class_goShareServer.inc:449
+#, fuzzy
+msgid "Share service"
+msgstr "Servicio de exploración"
+
+#: plugins/admin/systems/class_goShareServer.inc:457
+#, fuzzy
+msgid "Share entry"
+msgstr "Nueva entrada"
+
+#: plugins/admin/systems/goLogDBServer.tpl:1
+#, fuzzy
+msgid "Logging database information"
+msgstr "Base de datos de Logs"
+
+#: plugins/admin/ogroups/termgroup.tpl:2
+msgid ""
+"Actions you choose here influence all systems in this object group. "
+"Additionally, all values editable here can be inherited by the clients "
+"assigned to this object group."
+msgstr ""
+
+#: 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/tabs_ogroups.inc:61
+#: plugins/admin/ogroups/tabs_ogroups.inc:166
 msgid "Phone queue"
-msgstr "Número de teléfono"
+msgstr "Cola de teléfono"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:87
+#: plugins/admin/ogroups/class_termgroup.inc:349
+msgid "System"
+msgstr "Sistema"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:84
-#: plugins/admin/ogroups/tabs_ogroups.inc:131
+#: plugins/admin/ogroups/tabs_ogroups.inc:146
 msgid "Terminals"
 msgstr "Terminales"
 
+#: plugins/admin/ogroups/class_termgroup.inc:118
+msgid "There must be at least one NTP server selected."
+msgstr ""
+
+#: plugins/admin/ogroups/class_termgroup.inc:343
+#, fuzzy, php-format
+msgid "Removing of object group/workstation with dn '%s' failed."
+msgstr ""
+"Ha fallado la eliminación de los parámetros del correo del objeto grupo"
+
+#: plugins/admin/ogroups/class_termgroup.inc:350
+#, fuzzy
+msgid "System group"
+msgstr "Estado del Sistema"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Seleccione para ver los departamentos"
@@ -8806,129 +12258,102 @@ msgstr "Seleccione para ver teléfonos"
 msgid "Display objects of department"
 msgstr "Mostrar objetos de departamentos"
 
-#: plugins/admin/ogroups/termgroup.tpl:1
-msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
-msgstr ""
-"Todas las acciones que elija aquí influirán en <b>todas</b> la máquinas en "
-"este objeto grupo. Tenga presente que reiniciar las máquinas pueden no hacer "
-"felices a las personas que actualmente están trabajando en ellas."
-
-#: plugins/admin/ogroups/termgroup.tpl:7
-msgid "Select action to execute for this   group of terminals"
-msgstr "Seleccione una acción que se ejecutara en este grupo de terminales"
-
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroup.inc:759
+#: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 msgid "Object groups"
 msgstr "Grupos de objetos"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
-msgstr "Cuentas UNIX"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr "Servidores"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
-msgstr "Clientes Ligeros"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
-msgstr "Estaciones de trabajo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:217
+#: 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_ogroupManagement.inc:223
-#: plugins/admin/ogroups/class_ogroupManagement.inc:249
+#: 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_ogroupManagement.inc:364
-#, fuzzy
-msgid "Create new object group"
-msgstr "Grupo de objetos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:391
-#, fuzzy
-msgid "Name of object groups"
-msgstr "Nombre del grupo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:440
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Grupo de objetos"
-
-#: plugins/admin/ogroups/class_ogroup.inc:132
+#: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr "Este 'dn' no es un objeto tipo grupo."
 
-#: plugins/admin/ogroups/class_ogroup.inc:242
+#: plugins/admin/ogroups/class_ogroup.inc:279
 msgid "too many different objects!"
 msgstr "¡Demasiados objetos diferentes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:244
+#: plugins/admin/ogroups/class_ogroup.inc:281
 msgid "users"
 msgstr "usuarios"
 
-#: plugins/admin/ogroups/class_ogroup.inc:245
+#: plugins/admin/ogroups/class_ogroup.inc:282
 msgid "groups"
 msgstr "grupos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:246
+#: plugins/admin/ogroups/class_ogroup.inc:283
 msgid "applications"
 msgstr "Aplicaciones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:247
+#: plugins/admin/ogroups/class_ogroup.inc:284
 msgid "departments"
 msgstr "departamentos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:248
+#: plugins/admin/ogroups/class_ogroup.inc:285
 msgid "servers"
 msgstr "servidores"
 
-#: plugins/admin/ogroups/class_ogroup.inc:249
+#: plugins/admin/ogroups/class_ogroup.inc:286
 msgid "workstations"
 msgstr "estaciones de trabajo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:250
+#: plugins/admin/ogroups/class_ogroup.inc:287
 msgid "terminals"
 msgstr "terminales"
 
-#: plugins/admin/ogroups/class_ogroup.inc:251
+#: plugins/admin/ogroups/class_ogroup.inc:288
 msgid "phones"
 msgstr "teléfonos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:252
+#: plugins/admin/ogroups/class_ogroup.inc:289
 msgid "printers"
 msgstr "servidores de Impresión"
 
-#: plugins/admin/ogroups/class_ogroup.inc:259
+#: plugins/admin/ogroups/class_ogroup.inc:296
 msgid "and"
 msgstr "y"
 
-#: plugins/admin/ogroups/class_ogroup.inc:410
-msgid "Non existing dn: "
+#: plugins/admin/ogroups/class_ogroup.inc:508
+msgid "Non existing dn:"
 msgstr "No existe 'dn':"
 
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#, fuzzy
+#: plugins/admin/ogroups/class_ogroup.inc:649
 msgid "There is already an object with this cn."
-msgstr "Ya existe un usuario con este 'Login' en la base de datos."
+msgstr "Ya existe un objeto con este 'cn'."
 
-#: plugins/admin/ogroups/class_ogroup.inc:551
+#: plugins/admin/ogroups/class_ogroup.inc:666
 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
+#, fuzzy, php-format
+msgid "Saving of object group/generic with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto grupo"
+
+#: plugins/admin/ogroups/class_ogroup.inc:728
+#, fuzzy, php-format
+msgid "Removing of object group/generic with dn '%s' failed."
+msgstr "Ha fallado la eliminación del objeto grupo"
+
+#: plugins/admin/ogroups/class_ogroup.inc:754
+#, fuzzy
+msgid "Object group generic"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/ogroups/class_ogroup.inc:764
+#, fuzzy
+msgid "Member"
+msgstr "Objetos miembro"
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -8938,43 +12363,38 @@ msgstr ""
 "GOsa pueda recuperar posteriormente esa información"
 
 #: plugins/admin/ogroups/phonequeue.tpl:1
-#, fuzzy
 msgid "Queue Settings"
-msgstr "Parámetros de quotas"
+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
-#, fuzzy
 msgid "Generic queue Settings"
-msgstr "Información genérica del usuario"
-
-#: plugins/admin/ogroups/phonequeue.tpl:18
-#: plugins/admin/fai/class_faiProfile.inc:287
-#, fuzzy
-msgid "Down"
-msgstr "Dominio"
+msgstr "Parámetros genéricos de la cola"
 
 #: plugins/admin/ogroups/phonequeue.tpl:46
-#, fuzzy
+#: plugins/admin/ogroups/class_phonequeue.inc:717
 msgid "Timeout"
-msgstr "Tiempo(s) excedido(s)"
+msgstr "Tiempo de espera"
 
 #: plugins/admin/ogroups/phonequeue.tpl:62
-#, fuzzy
 msgid "Strategy"
-msgstr "Estado"
+msgstr "Estrategia"
 
 #: plugins/admin/ogroups/phonequeue.tpl:74
+#: plugins/admin/ogroups/class_phonequeue.inc:718
 msgid "Max queue length"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:82
+#: plugins/admin/ogroups/class_phonequeue.inc:719
 msgid "Announce frequency"
 msgstr ""
 
@@ -8991,18 +12411,17 @@ msgid "Use music on hold instead of ringing"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:108
+#: plugins/admin/ogroups/class_phonequeue.inc:726
 msgid "Music on hold"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:116
-#, fuzzy
 msgid "Welcome sound file"
-msgstr "¡Bienvenido %s!"
+msgstr "Archivo de sonido de Bienvenida"
 
 #: plugins/admin/ogroups/phonequeue.tpl:124
-#, fuzzy
 msgid "Announce message"
-msgstr "Mensaje de ausencia"
+msgstr "Mensaje de presentación"
 
 #: plugins/admin/ogroups/phonequeue.tpl:132
 msgid "Sound file for 'You are next ...'"
@@ -9017,53 +12436,56 @@ msgid "'... calls waiting'"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:156
-#, fuzzy
 msgid "'Thank you' message"
-msgstr "Estado del mensaje"
+msgstr "Mensaje de Despedida"
 
 #: plugins/admin/ogroups/phonequeue.tpl:164
 msgid "'minutes' sound file"
-msgstr ""
+msgstr "Archivo de sonido 'minutos'"
 
 #: plugins/admin/ogroups/phonequeue.tpl:172
 msgid "'seconds' sound file"
-msgstr ""
+msgstr "Archivo de sonido 'segundos'"
 
 #: plugins/admin/ogroups/phonequeue.tpl:180
 msgid "Hold sound file"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:188
-#, fuzzy
 msgid "Less Than sound file"
-msgstr "¡Bienvenido %s!"
+msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:204
-#, fuzzy
 msgid "Phone attributes "
-msgstr "Atributo 'dn' de los usuarios"
+msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:212
+#: plugins/admin/ogroups/class_phonequeue.inc:739
 msgid "Announce holdtime"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:218
+#: plugins/admin/ogroups/class_phonequeue.inc:720
 msgid "Allow the called user to transfer his call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:224
+#: plugins/admin/ogroups/class_phonequeue.inc:721
 msgid "Allows calling user to transfer call"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:234
+#: plugins/admin/ogroups/class_phonequeue.inc:722
 msgid "Allow the called to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:240
+#: plugins/admin/ogroups/class_phonequeue.inc:724
 msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
 #: plugins/admin/ogroups/phonequeue.tpl:246
+#: plugins/admin/ogroups/class_phonequeue.inc:723
 msgid "Ring instead of playing background music"
 msgstr ""
 
@@ -9072,30 +12494,42 @@ msgid "Mail distribution list"
 msgstr ""
 
 #: plugins/admin/ogroups/mail.tpl:11
-#, fuzzy
 msgid "Primary mail address for this distribution list"
-msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
+msgstr ""
+"Dirección de correo electrónica primaria para esta lista de distribución"
 
 #: plugins/admin/ogroups/class_mailogroup.inc:41
-#, fuzzy
 msgid ""
 "This group has mail features enabled. You can disable them by clicking below."
 msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"Este grupo tiene las características de correo activas. Puede desactivarlas "
 "apretando a continuación."
 
 #: plugins/admin/ogroups/class_mailogroup.inc:43
-#, fuzzy
 msgid ""
 "This group has mail features disabled. You can enable them by clicking below."
 msgstr ""
-"Esta cuenta 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_phonequeue.inc:79
+#: plugins/admin/ogroups/class_mailogroup.inc:98
+#, fuzzy, php-format
+msgid "Saving of object group/mail with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto grupo"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:131
+#, fuzzy, php-format
+msgid "Removing of object group/mail with dn '%s' failed."
+msgstr "Ha fallado la eliminación del objeto grupo"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:156
 #, fuzzy
+msgid "Mail group"
+msgstr "Grupo primario"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:79
 msgid "ring all"
-msgstr "Terminales"
+msgstr "llamar a todos"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:80
 msgid "round robin"
@@ -9110,345 +12544,489 @@ msgid "fewest completed calls"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:83
-#, fuzzy
 msgid "random"
-msgstr "y"
+msgstr "al azar"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:84
 msgid "round robin with memory"
 msgstr ""
 
 #: plugins/admin/ogroups/class_phonequeue.inc:113
-#, fuzzy
 msgid "Remove the phone queue from this Account"
-msgstr "Eliminar cuenta telefónica"
+msgstr "Eliminar la cola telefónica de esta cuenta"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:114
-#, fuzzy
 msgid ""
 "Phone queue is enabled for this group. You can disable it by clicking below."
 msgstr ""
-"Esta cuenta tiene la extensión 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
-#, fuzzy
 msgid "Create phone queue"
-msgstr "Crear cuenta telefónica"
+msgstr "Crear cola telefónica"
 
 #: plugins/admin/ogroups/class_phonequeue.inc:117
-#, fuzzy
 msgid ""
 "For this group the phone queues are disabled. You can enable them by "
 "clicking below."
 msgstr ""
-"Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
+"Esta grupo tiene las colas telefónicas desactivadas. Puede activarlas "
 "pulsando aquí."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:199
-#, fuzzy
+#: plugins/admin/ogroups/class_phonequeue.inc:201
 msgid "Timeout must be numeric"
-msgstr "El puerto sieve necesita ser un numero."
+msgstr "Tiempo de espera debe ser un valor numérico"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:202
+#: plugins/admin/ogroups/class_phonequeue.inc:204
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:205
+#: plugins/admin/ogroups/class_phonequeue.inc:207
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:208
+#: plugins/admin/ogroups/class_phonequeue.inc:210
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
+#: plugins/admin/ogroups/class_phonequeue.inc:213
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:227
 msgid ""
 "There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:238
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
+#: plugins/admin/ogroups/class_phonequeue.inc:240
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:271
 #, 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:248
-#: plugins/admin/ogroups/class_phonequeue.inc:622
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:86
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1044
-#: plugins/gofon/macro/class_gofonMacro.inc:216
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
-#, fuzzy, php-format
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:625
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:87
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1049
+#: plugins/gofon/macro/class_gofonMacro.inc:247
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:282
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:398
+#, php-format
 msgid "Can't select database %s on %s."
-msgstr "No puedo seleccionar la base de datos."
+msgstr "No puedo seleccionar la base de datos '%s' en '%s'."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:279
-#: plugins/admin/ogroups/class_phonequeue.inc:493
-#: plugins/admin/ogroups/class_phonequeue.inc:658
-#, fuzzy, php-format
+#: plugins/admin/ogroups/class_phonequeue.inc:281
+#: plugins/admin/ogroups/class_phonequeue.inc:495
+#: plugins/admin/ogroups/class_phonequeue.inc:661
+#, php-format
 msgid "Can't delete in Database %s, on Server %s."
-msgstr "No puedo seleccionar la base de datos."
+msgstr "No puedo eliminar de la base de datos '%s' en servidor '%s'."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:523
 #: plugins/admin/ogroups/class_phonequeue.inc:525
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1145
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1147
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:412
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:414
+#: plugins/admin/ogroups/class_phonequeue.inc:527
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1156
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:438
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:440
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:612
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:79
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:295
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
-#: plugins/gofon/macro/class_gofonMacro.inc:205
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:361
+#: plugins/admin/ogroups/class_phonequeue.inc:587
+#, fuzzy, php-format
+msgid "Saving of object group/phone queue with dn '%s' failed."
+msgstr "Ha fallado la grabación de los parámetros de correo del objeto grupo"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:615
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:80
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:296
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/macro/class_gofonMacro.inc:236
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
 "error."
 msgstr ""
 
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/faiHook.tpl:32
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/ogroups/class_phonequeue.inc:684
+#, fuzzy, php-format
+msgid "Removing of object group/phone queue with dn '%s' failed."
+msgstr ""
+"Ha fallado la eliminación de los parámetros del correo del objeto grupo"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:709
 #, fuzzy
-msgid "Objects"
-msgstr "Objeto"
+msgid "Phone group"
+msgstr "Miembros están en un grupo de salto telefónico"
 
-#: plugins/admin/fai/faiVariable.tpl:34
+#: plugins/admin/ogroups/class_phonequeue.inc:727
 #, fuzzy
-msgid "List of assigned variables"
-msgstr "Elija tipo de ratón"
+msgid "Welcome music"
+msgstr "¡Bienvenido %s!"
 
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
+#: plugins/admin/ogroups/class_phonequeue.inc:728
+msgid "Report hold time"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:729
+msgid "'You are next' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:730
+msgid "'There are' sound"
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:731
+msgid "'Call waiting' sound"
 msgstr ""
 
-#: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
+#: plugins/admin/ogroups/class_phonequeue.inc:732
 #, fuzzy
-msgid "Fully Automatic Installation"
-msgstr "Mantenimiento de aplicaciones"
+msgid "'Thank you' sound"
+msgstr "Mensaje de Despedida"
 
-#: plugins/admin/fai/class_faiManagement.inc:32
+#: plugins/admin/ogroups/class_phonequeue.inc:733
 #, fuzzy
-msgid "FAI"
-msgstr "FAX ID"
+msgid "'Minutes' sound"
+msgstr "Archivo de sonido 'minutos'"
 
-#: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/ogroups/class_phonequeue.inc:734
 #, fuzzy
-msgid "Fully Automatic Installation - management"
-msgstr "Mantenimiento de aplicaciones"
+msgid "'Seconds' sound"
+msgstr "Archivo de sonido 'segundos'"
 
-#: plugins/admin/fai/class_faiManagement.inc:226
-#, fuzzy, php-format
-msgid "You're about to delete all information about the FAI class at '%s'."
+#: plugins/admin/ogroups/class_phonequeue.inc:735
+msgid "'Less than' sound"
 msgstr ""
-"Esta a punto de borrar toda la información sobre el componente en '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:315
-#: plugins/admin/fai/class_faiManagement.inc:421
+#: plugins/admin/ogroups/class_phonequeue.inc:736
 #, fuzzy
-msgid "Specified branch name is invalid."
-msgstr "El nombre especificado ya esta siendo usado"
-
-#: plugins/admin/fai/class_faiManagement.inc:375
-#, fuzzy, php-format
-msgid "You're about to delete a fai branch / freeze  '%s'."
-msgstr "Está a punto de borrar el grupo '%s'."
+msgid "Queue phone number"
+msgstr "Número de teléfono"
 
-#: plugins/admin/fai/class_faiManagement.inc:640
+#: plugins/admin/ogroups/class_phonequeue.inc:740
 #, fuzzy
-msgid "New profile"
-msgstr "Gestión de Asterisk PBX"
+msgid "Announce"
+msgstr "Mensaje de presentación"
 
-#: plugins/admin/fai/class_faiManagement.inc:645
-#, fuzzy
-msgid "New partition table"
-msgstr "Impresora"
+#: 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/fai/class_faiManagement.inc:645
-msgid "PT"
+#: 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/class_divListOGroup.inc:58
+msgid "Name of object groups"
+msgstr "Nombre del objeto grupo"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Select to see groups containing users"
+msgstr "Seleccione para mostrar grupos que tienen usuarios"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Show groups containing users"
+msgstr "Mostrar grupos que tienen usuarios"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+msgid "Select to see groups containing groups"
+msgstr "Seleccione para mostrar grupos que contienen grupos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+msgid "Show groups containing groups"
+msgstr "Mostrar grupos que contienen grupos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+msgid "Select to see groups containing applications"
+msgstr "seleccione para mostrar grupos que contienen aplicaciones"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+msgid "Show groups containing applications"
+msgstr "Mostrar grupos que contienen aplicaciones"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
+msgid "Select to see groups containing departments"
+msgstr "Seleccione para mostrar grupos que contienen departamentos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:66
+msgid "Show groups containing departments"
+msgstr "Mostrar grupos que contienen departamentos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
+msgid "Select to see groups containing servers"
+msgstr "Seleccione para mostrar grupos que contienen servidores"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:67
+msgid "Show groups containing servers"
+msgstr "Mostrar grupos que contienen servidores"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
+msgid "Select to see groups containing workstations"
+msgstr "Seleccione para mostrar grupos que contienen estaciones de trabajo"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:68
+msgid "Show groups containing workstations"
+msgstr "Mostrar grupos que contienen estaciones de trabajo"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+msgid "Select to see groups containing terminals"
+msgstr "Seleccione para mostrar grupos que contienen terminales"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+msgid "Show groups containing terminals"
+msgstr "Mostrar grupos que contienen terminales"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
+msgid "Select to see groups containing printer"
+msgstr "Seleccione para mostrar grupos que contienen impresoras"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:70
+msgid "Show groups containing printer"
+msgstr "Mostrar grupos que contienen impresoras"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
+msgid "Select to see groups containing phones"
+msgstr "Seleccione para mostrar grupos que contienen teléfonos"
 
-#: plugins/admin/fai/class_faiManagement.inc:648
+#: plugins/admin/ogroups/class_divListOGroup.inc:71
+msgid "Show groups containing phones"
+msgstr "Mostrar grupos que contienen teléfonos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:115
+msgid "Create new object group"
+msgstr "Crear nuevo objeto grupo"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:178
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/acl/class_aclManagement.inc:25
 #, fuzzy
-msgid "New scripts"
-msgstr "Mostrar equipos"
+msgid "ACLs"
+msgstr "ACL"
 
-#: plugins/admin/fai/class_faiManagement.inc:648
-msgid "S"
-msgstr ""
+#: plugins/admin/acl/class_aclManagement.inc:159
+#, fuzzy, php-format
+msgid "You're about to delete the acl %s."
+msgstr "Está a punto de borrar la macro '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:651
+#: plugins/admin/acl/class_aclManagement.inc:165
+#: plugins/admin/acl/class_aclManagement.inc:191
 #, fuzzy
-msgid "New hooks"
-msgstr "Mostrar equipos"
+msgid "You are not allowed to delete this acl!"
+msgstr "¡No le está permitido eliminar esta macro!"
 
-#: plugins/admin/fai/class_faiManagement.inc:651
-msgid "H"
-msgstr ""
+#: plugins/admin/acl/class_divListACL.inc:31
+#, fuzzy
+msgid "List of acl"
+msgstr "Lista de grupos"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/acl/class_divListACL.inc:32
 #, fuzzy
-msgid "New variables"
-msgstr "Mostrar terminales"
+msgid "List of acls"
+msgstr "Lista de grupos"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
-msgid "V"
+#: plugins/admin/acl/class_divListACL.inc:36
+msgid "This menu allows you to edit and delete selected acls."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:657
+#: plugins/admin/acl/class_divListACL.inc:61
 #, fuzzy
-msgid "New templates"
-msgstr "Nueva plantilla"
+msgid "Display acls matching"
+msgstr "Mostrar grupos que concuerden con"
 
-#: plugins/admin/fai/class_faiManagement.inc:657
-msgid "T"
-msgstr ""
+#: plugins/admin/acl/class_divListACL.inc:109
+#, fuzzy
+msgid "Acl"
+msgstr "Todo"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
+#: plugins/admin/acl/class_divListACL.inc:153
 #, fuzzy
-msgid "New package list"
-msgstr "# páginas"
+msgid "Select to display users"
+msgstr "Seleccione para ver usuarios estandar"
 
-#: plugins/admin/fai/class_faiManagement.inc:660
-msgid "PK"
-msgstr ""
+#: plugins/admin/acl/class_divListACL.inc:153
+#, fuzzy
+msgid "Display user"
+msgstr "Nombre mostrado"
 
-#: plugins/admin/fai/class_faiManagement.inc:678
+#: plugins/admin/acl/class_divListACL.inc:155
 #, fuzzy
-msgid "Name of FAI class"
-msgstr "Nombre de la lista de bloqueos"
+msgid "Select to display departments"
+msgstr "Seleccione para ver los departamentos"
 
-#: plugins/admin/fai/class_faiManagement.inc:679
-msgid "Class type"
-msgstr ""
+#: plugins/admin/acl/class_divListACL.inc:155
+#, fuzzy
+msgid "Display departments"
+msgstr "Mostrar Departamentos que concuerden con"
 
-#: plugins/admin/fai/class_faiManagement.inc:683
+#: plugins/admin/acl/main.inc:43 plugins/admin/acl/main.inc:45
 #, fuzzy
-msgid "Edit class"
-msgstr "clase"
+msgid "ACL management"
+msgstr "Gestión de listas de bloqueo"
+
+#: plugins/admin/fai/faiVariable.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiScript.tpl:34 plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/faiHook.tpl:34
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+msgid "Objects"
+msgstr "Objetos"
+
+#: 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/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:364
+#, fuzzy, php-format
+msgid "Creating of FAI/script with dn '%s' failed."
+msgstr "Ha fallado la Creación de la base del script FAI"
 
-#: plugins/admin/fai/class_faiManagement.inc:684
+#: plugins/admin/fai/class_faiScript.inc:451
+#: plugins/admin/fai/class_faiScript.inc:461
+#: plugins/admin/fai/class_faiHook.inc:485
 #, fuzzy
-msgid "Delete class"
-msgstr "Borrar"
+msgid "FAI script"
+msgstr "Script de importación"
 
-#: plugins/admin/fai/class_faiManagement.inc:725
-#: plugins/admin/fai/class_faiManagement.inc:726
-#: plugins/admin/fai/class_faiProfile.inc:280
-#: plugins/admin/fai/class_faiProfileEntry.inc:124
+#: plugins/admin/fai/class_faiScript.inc:460
 #, fuzzy
-msgid "Partition table"
-msgstr "Variable"
+msgid "Script priority"
+msgstr "Ruta del Script"
 
-#: plugins/admin/fai/class_faiManagement.inc:732
-#: plugins/admin/fai/class_faiManagement.inc:733
-msgid "Package list"
-msgstr ""
+#: plugins/admin/fai/class_faiTemplate.inc:336
+#, fuzzy, php-format
+msgid "Saving of FAI/template with dn '%s' failed."
+msgstr "Ha fallado la grabación de la base de la plantilla FAI"
 
-#: plugins/admin/fai/class_faiManagement.inc:739
-#: plugins/admin/fai/class_faiManagement.inc:740
+#: plugins/admin/fai/class_faiTemplate.inc:415
 #, fuzzy
-msgid "Scripts"
-msgstr "Ruta del Script"
+msgid "FAI template"
+msgstr "Nueva plantilla"
 
-#: plugins/admin/fai/class_faiManagement.inc:760
-#: plugins/admin/fai/class_faiManagement.inc:761
+#: plugins/admin/fai/class_faiTemplate.inc:424
 #, fuzzy
-msgid "Profile"
-msgstr "Ruta del Perfil"
+msgid "Template file"
+msgstr "Plantilla de paquete"
 
-#: plugins/admin/fai/headpage.tpl:6
+#: plugins/admin/fai/class_faiTemplate.inc:425
 #, fuzzy
-msgid "List of FAI classes"
-msgstr "Elija tipo de ratón"
+msgid "Template path"
+msgstr "Nombre de la plantilla"
 
-#: plugins/admin/fai/headpage.tpl:24
-msgid "This menu allows you to create, delete and edit FAI classes."
-msgstr ""
-
-#: plugins/admin/fai/headpage.tpl:29
+#: plugins/admin/fai/class_faiTemplate.inc:426
 #, fuzzy
-msgid "Branches"
-msgstr "Cancelar"
+msgid "File owner"
+msgstr "Nombre del archivo"
 
-#: plugins/admin/fai/headpage.tpl:35
+#: plugins/admin/fai/class_faiTemplate.inc:427
 #, fuzzy
-msgid "Current release"
-msgstr "Contraseña actual"
+msgid "File permissions"
+msgstr "Permisos"
 
-#: plugins/admin/fai/headpage.tpl:47
-msgid "Create new branch using the current release"
-msgstr ""
+#: plugins/admin/fai/class_faiManagement.inc:33
+#: plugins/admin/fai/class_faiManagement.inc:814
+msgid "FAI"
+msgstr "FAI"
+
+#: plugins/admin/fai/class_faiManagement.inc:34
+msgid "Fully Automatic Installation - management"
+msgstr "Gestión - Instalación totalmente automática"
 
-#: plugins/admin/fai/headpage.tpl:51
-msgid "Create a locked version of the current release"
+#: plugins/admin/fai/class_faiManagement.inc:154
+#, 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:204
+#, php-format
+msgid ""
+"Release cleanup : Removing object (tagged as remvoed) that is no longer in "
+"use '%s'."
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:56
-#, fuzzy
-msgid "Delete current release"
-msgstr "Borrar"
+#: plugins/admin/fai/class_faiManagement.inc:264
+#, 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/headpage.tpl:71
-#, fuzzy
-msgid "Show profiles"
-msgstr "Mostrar impresoras"
+#: plugins/admin/fai/class_faiManagement.inc:267
+msgid "You are not allowed to delete this release!"
+msgstr "¡No le es permitido borrar esta versión!"
 
-#: plugins/admin/fai/headpage.tpl:73
-#, fuzzy
-msgid "Show scripts"
-msgstr "Mostrar equipos"
+#: plugins/admin/fai/class_faiManagement.inc:322
+msgid "Specified branch name is invalid."
+msgstr "El nombre de la rama especificado no es válido."
 
-#: plugins/admin/fai/headpage.tpl:74
-#, fuzzy
-msgid "Show hooks"
-msgstr "Mostrar equipos"
+#: plugins/admin/fai/class_faiManagement.inc:324
+msgid "Specified freeze name is invalid."
+msgstr "El nombre de la rama suspendida especificada no es valido."
 
-#: plugins/admin/fai/headpage.tpl:75
+#: plugins/admin/fai/class_faiManagement.inc:808
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
 #, fuzzy
-msgid "Show variables"
-msgstr "Mostrar terminales"
+msgid "Management"
+msgstr "Nombre de la maquina"
 
-#: plugins/admin/fai/headpage.tpl:76
+#: plugins/admin/fai/class_faiManagement.inc:809
 #, fuzzy
-msgid "Show packages"
-msgstr "Mostrar teléfonos"
+msgid "FAI management"
+msgstr "Gestión de listas de bloqueo"
 
-#: plugins/admin/fai/headpage.tpl:77
-#, fuzzy
-msgid "Show partitions"
-msgstr "Mostrar estaciones de trabajo"
+#: plugins/admin/fai/faiPackage.tpl:49
+msgid "Install method"
+msgstr "Método de instalación"
+
+#: plugins/admin/fai/faiPackage.tpl:65
+msgid "Used packages"
+msgstr "Paquetes usados"
+
+#: plugins/admin/fai/faiPackage.tpl:67
+msgid "Choosen packages"
+msgstr "Paquetes elegidos"
+
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:669
+msgid "Configure"
+msgstr "Configurar"
+
+#: plugins/admin/fai/faiPackage.tpl:74
+msgid "Toggle remove flag"
+msgstr "Cambiar la marca de eliminación"
 
 #: plugins/admin/fai/remove.tpl:7
-#, fuzzy
 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>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."
+"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/faiPartitionTable.tpl:34
-#, fuzzy
 msgid "Discs"
-msgstr "Servicios"
+msgstr "Discos"
 
 #: plugins/admin/fai/faiPartitionTable.tpl:40
 msgid "Choose a disk to delete or edit"
@@ -9465,9 +13043,8 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:39
-#, fuzzy
 msgid "Show only classes with templates"
-msgstr "Mostrar plantillas"
+msgstr "Mostrar solo clases con plantillas"
 
 #: plugins/admin/fai/faiProfileEntry.tpl:41
 msgid "Show only classes with scripts"
@@ -9478,294 +13055,369 @@ msgid "Show only classes with hooks"
 msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:45
-#, fuzzy
 msgid "Show only classes with variables"
-msgstr "Mostrar terminales"
+msgstr "Mostrar solo clases con variables"
 
 #: plugins/admin/fai/faiProfileEntry.tpl:47
 msgid "Show only classes with packages"
 msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:49
-#, fuzzy
 msgid "Show only classes with partitions"
-msgstr "Mostrar estaciones de trabajo"
+msgstr "Mostrar solo clases con particiones"
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:51
-#: plugins/admin/fai/class_faiHookEntry.inc:54
-#, fuzzy
+#: plugins/admin/fai/class_faiScriptEntry.inc:68
+#: plugins/admin/fai/class_faiHookEntry.inc:71
 msgid "Please select a valid file."
-msgstr "Por favor introduzca un número de serie válido"
+msgstr "Por favor seleccione un fichero válido."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:54
-#: plugins/admin/fai/class_faiHookEntry.inc:57
-#, fuzzy
+#: plugins/admin/fai/class_faiScriptEntry.inc:71
+#: plugins/admin/fai/class_faiHookEntry.inc:74
 msgid "Selected file is empty."
 msgstr "El archivo especificado está vacío."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:98
-#: plugins/admin/fai/class_faiVariableEntry.inc:86
-#: plugins/admin/fai/class_faiHookEntry.inc:112
-#: plugins/admin/fai/class_faiTemplateEntry.inc:164
-#, fuzzy
+#: plugins/admin/fai/class_faiScriptEntry.inc:133
+#: plugins/admin/fai/class_faiVariableEntry.inc:102
+#: plugins/admin/fai/class_faiHookEntry.inc:147
+#: plugins/admin/fai/class_faiTemplateEntry.inc:192
 msgid "Please enter a name."
-msgstr "Por favor especifique una dirección de servidor - URI - válida."
+msgstr "Por favor introduzca un nombre."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:102
-#, fuzzy
+#: plugins/admin/fai/class_faiScriptEntry.inc:137
 msgid "Please enter a script."
-msgstr "Por favor introduzca un número de serie válido"
+msgstr "Por favor introduzca un script."
 
 #: plugins/admin/fai/faiScriptEntry.tpl:29
 #: plugins/admin/fai/faiScriptEntry.tpl:48
-#, fuzzy
 msgid "Script attributes"
-msgstr "Atributo 'dn' de los usuarios"
+msgstr "Parámetros del script"
 
 #: plugins/admin/fai/faiScriptEntry.tpl:38 plugins/admin/fai/faiProfile.tpl:33
-#, fuzzy
 msgid "Choose a priority"
-msgstr "Elija tipo de ratón"
+msgstr "Elija una prioridad"
 
 #: plugins/admin/fai/faiScriptEntry.tpl:63
 #: plugins/admin/fai/faiHookEntry.tpl:63
-#, fuzzy
 msgid "Import script"
-msgstr "Mostrar equipos"
+msgstr "Script de importación"
 
-#: plugins/admin/fai/class_faiPackage.inc:291
-#, fuzzy
+#: plugins/admin/fai/class_faiPackage.inc:392
 msgid "Please select a least one Package."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+msgstr "Por favor seleccione al menos un Paquete."
 
-#: plugins/admin/fai/class_faiPackage.inc:295
-#, fuzzy
+#: plugins/admin/fai/class_faiPackage.inc:396
 msgid "Please choose a valid combination for your repository setup."
-msgstr "Por favor especifique un usuario valido."
+msgstr ""
+"Por favor especifique una combinación valida para la configuración de su "
+"repositorio."
 
-#: plugins/admin/fai/class_faiPackage.inc:316
-#, fuzzy
+#: plugins/admin/fai/class_faiPackage.inc:417
 msgid "package is configured"
-msgstr "Desconfigurado"
+msgstr "El paquete está configurado"
+
+#: plugins/admin/fai/class_faiPackage.inc:423
+msgid "Package marked for removal"
+msgstr ""
 
-#: plugins/admin/fai/class_faiPackage.inc:340
+#: plugins/admin/fai/class_faiPackage.inc:450
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:55
-#, fuzzy
-msgid "Used packages"
-msgstr "Mostrar teléfonos"
+#: plugins/admin/fai/class_faiPackage.inc:494
+#, fuzzy, php-format
+msgid "Saving of FAI/package list with dn '%s' failed."
+msgstr "Ha fallado la grabación de la tabla de particiones FAI"
+
+#: plugins/admin/fai/class_faiPackage.inc:540
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+msgid "Package"
+msgstr "Paquete"
 
-#: plugins/admin/fai/faiPackage.tpl:57
+#: plugins/admin/fai/class_faiPackage.inc:541
 #, fuzzy
-msgid "Choosen packages"
-msgstr "Mostrar teléfonos"
+msgid "FAI Package list"
+msgstr "Nueva lista de paquetes"
 
-#: plugins/admin/fai/faiPackage.tpl:63 include/functions.inc:595
-msgid "Configure"
-msgstr "Configurar"
+#: plugins/admin/fai/class_faiPackage.inc:552
+#, fuzzy
+msgid "Install Method"
+msgstr "Método de instalación"
 
-#: plugins/admin/fai/class_faiProfile.inc:272
+#: plugins/admin/fai/class_faiProfile.inc:285
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:275
+#: plugins/admin/fai/class_faiProfile.inc:288
 #: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:276
+#: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:120
-#, fuzzy
 msgid "Template bundle"
-msgstr "Plantilla"
+msgstr "Plantilla de paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:277
+#: plugins/admin/fai/class_faiProfile.inc:290
 #: plugins/admin/fai/class_faiProfileEntry.inc:121
-#, fuzzy
 msgid "Script bundle"
-msgstr "Ruta del Script"
+msgstr "Script del paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:278
+#: plugins/admin/fai/class_faiProfile.inc:291
 #: plugins/admin/fai/class_faiProfileEntry.inc:122
-#, fuzzy
 msgid "Variable bundle"
-msgstr "Variable"
+msgstr "Variables del paquete"
 
-#: plugins/admin/fai/class_faiProfile.inc:279
+#: plugins/admin/fai/class_faiProfile.inc:292
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:283
+#: plugins/admin/fai/class_faiProfile.inc:293
+#: plugins/admin/fai/class_faiPartitionTable.inc:487
+#: plugins/admin/fai/class_faiProfileEntry.inc:124
+#: plugins/admin/fai/class_faiSummaryTab.inc:43
+msgid "Partition table"
+msgstr "Tabla de particiones"
+
+#: plugins/admin/fai/class_faiProfile.inc:296
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:351
+#: plugins/admin/fai/class_faiProfile.inc:385
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:355
-#, fuzzy
+#: plugins/admin/fai/class_faiProfile.inc:389
 msgid "Please enter a valid name."
-msgstr "Por favor introduzca un número de serie válido"
+msgstr "Por favor introduzca un nombre válido"
 
-#: plugins/admin/fai/class_faiProfile.inc:363
-#, fuzzy
+#: plugins/admin/fai/class_faiProfile.inc:397
 msgid "There is already a profile with this class name defined."
-msgstr "Ya existe un usuario con este 'Login' en la base de datos."
+msgstr "Ya existe un perfil con este nombre de clase definido."
 
-#: plugins/admin/fai/faiProfile.tpl:32
-#, fuzzy
-msgid "FAI classes"
-msgstr "Elija tipo de ratón"
+#: plugins/admin/fai/class_faiProfile.inc:420
+#: plugins/admin/fai/class_faiProfile.inc:424
+#, fuzzy, php-format
+msgid "Saving of FAI/profile with dn '%s' failed."
+msgstr "Ha fallado la grabación de la tabla de particiones FAI"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
+#: plugins/admin/fai/class_faiProfile.inc:432
 #, fuzzy
-msgid "FS type"
-msgstr "Tipo"
+msgid "Profile"
+msgstr "Perfiles"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
+#: plugins/admin/fai/class_faiProfile.inc:433
 #, fuzzy
-msgid "Mount point"
-msgstr "Monitor"
+msgid "FAI profile"
+msgstr "Nuevo perfil"
+
+#: plugins/admin/fai/class_faiHook.inc:392
+#, fuzzy, php-format
+msgid "Saving of FAI/hook with dn '%s' failed."
+msgstr "Ha fallado la grabación del script FAI"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
+#: plugins/admin/fai/class_faiHook.inc:474
 #, fuzzy
-msgid "Size in MB"
-msgstr "Entrando"
+msgid "Hook"
+msgstr "ok"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:183
+#: plugins/admin/fai/class_faiHook.inc:475
 #, fuzzy
-msgid "Mount options"
-msgstr "Otras opciones"
+msgid "FAI hook"
+msgstr "Mostrar acciones FAI"
+
+#: plugins/admin/fai/class_faiHook.inc:484
+#: plugins/admin/fai/faiHookEntry.tpl:34
+msgid "Task"
+msgstr "Tareas"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:184
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
-msgid "FS option"
-msgstr "Añadir opción"
+msgid "primary"
+msgstr "Grupo primario"
 
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, fuzzy
+msgid "logical"
+msgstr "Añadir Cuenta Local"
+
+#: 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_faiPartitionTable.inc:499
+#: plugins/admin/fai/class_faiSummaryTab.inc:308
+msgid "Mount point"
+msgstr "Punto de montaje"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
+#: plugins/admin/fai/class_faiSummaryTab.inc:307
+msgid "Size in MB"
+msgstr "Tamaño en Mb"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTable.inc:501
+#: plugins/admin/fai/class_faiSummaryTab.inc:306
+msgid "Mount options"
+msgstr "Opciones de Montaje"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
+msgid "FS option"
+msgstr "Opciones de FS"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:198
 msgid "Preserve"
-msgstr "servidores"
+msgstr "Preservar"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:337
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:342
-#, fuzzy, php-format
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
+#, php-format
 msgid "Please enter a valid mount point for partition %s."
-msgstr ""
-"Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
+msgstr "Por favor introduzca un punto de montaje valido para la partición %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:347
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:351
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:357
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
-#, fuzzy, php-format
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
+#, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr ""
-"Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
+"Por favor introduzca un tamaño de partición valido para la partición %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:367
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:369
-#, fuzzy, php-format
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
+#, php-format
 msgid "Please enter a valid range for partition %s."
-msgstr "Por favor introduzca un número de serie válido"
+msgstr "Por favor introduzca un rango valido para la partición %s."
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:374
-#, fuzzy, php-format
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:393
+#, php-format
 msgid "Please enter a range for partition size for partition %s."
-msgstr "Por favor introduzca un número de serie válido"
+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
+msgid ""
+"You have more than 3 primary partition table entries in your configuration, "
+"please check your configuration twice."
+msgstr ""
 
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-#, fuzzy
 msgid "Device"
-msgstr "Servicios"
+msgstr "Dispositivo"
 
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-#, fuzzy
 msgid "Partition entries"
-msgstr "Variable"
+msgstr "Entradas en la partición"
 
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-#, fuzzy
 msgid "Add partition"
-msgstr "Añadir opción"
+msgstr "Añadir partición"
 
-#: plugins/admin/fai/faiScript.tpl:34
-#, fuzzy
+#: plugins/admin/fai/faiScript.tpl:36
 msgid "List of scripts"
-msgstr "Lista de usuarios"
-
-#: plugins/admin/fai/faiScript.tpl:40
-msgid "Choose a script to delete or edit"
-msgstr ""
+msgstr "Lista de scripts"
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:82
-#, fuzzy
+#: plugins/admin/fai/class_faiVariableEntry.inc:98
 msgid "Please specify a value for the attribute 'content'."
-msgstr "Por favor especifique un usuario valido."
+msgstr "Por favor especifique un valor para el atributo 'contenido'."
 
 #: plugins/admin/fai/faiVariableEntry.tpl:29
-#, fuzzy
 msgid "Variable attributes"
-msgstr "Atributo 'dn' de los usuarios"
+msgstr "Atributos de las variables"
 
 #: plugins/admin/fai/faiVariableEntry.tpl:34
-#, fuzzy
+#: plugins/admin/fai/class_faiVariable.inc:392
 msgid "Variable content"
-msgstr "Variable"
+msgstr "Contenido de la Variable"
 
 #: plugins/admin/fai/faiTemplate.tpl:31
-#, fuzzy
 msgid "List of template files"
-msgstr "Lista de Departamentos"
-
-#: plugins/admin/fai/faiTemplate.tpl:37
-#, fuzzy
-msgid "Choose a template to delete or edit"
-msgstr "Elija un departamento para guardar la entrada"
+msgstr "Lista de ficheros plantillas"
 
-#: plugins/admin/fai/faiHook.tpl:34
-#, fuzzy
-msgid "List of hook scripts"
-msgstr "Lista de listas de bloqueos"
+#: plugins/admin/fai/faiSummary.tpl:4
+msgid "FAI object tree"
+msgstr "Árbol de objetos FAI"
 
-#: plugins/admin/fai/faiHook.tpl:40
-msgid "Choose a hook to delete or edit"
+#: plugins/admin/fai/faiSummary.tpl:9
+msgid "Reload class and release configuration from parent object."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:231
-#: plugins/admin/fai/class_faiPartitionTable.inc:237
-#, fuzzy, php-format
+#: plugins/admin/fai/faiHook.tpl:36
+msgid "List of hook scripts"
+msgstr "Lista de scripts de acciones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:284
+#: plugins/admin/fai/class_faiPartitionTable.inc:290
+#, php-format
 msgid "%s partition"
-msgstr "Mostrar estaciones de trabajo"
+msgstr "partición %s"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:233
-#: plugins/admin/fai/class_faiPartitionTable.inc:239
-#, fuzzy, php-format
+#: plugins/admin/fai/class_faiPartitionTable.inc:286
+#: plugins/admin/fai/class_faiPartitionTable.inc:292
+#, php-format
 msgid "%s partition(s)"
-msgstr "Mostrar estaciones de trabajo"
+msgstr "partición(es) %s"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:375
+#, fuzzy, php-format
+msgid "Saving of FAI/partition table with dn '%s' failed."
+msgstr "Ha fallado la grabación de la base de la tabla de particiones FAI"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:488
+#, fuzzy
+msgid "FAI partition table"
+msgstr "Nueva tabla de particiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:496
+#, fuzzy
+msgid "Partition type"
+msgstr "Tabla de particiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:497
+#, fuzzy
+msgid "Partition no."
+msgstr "Paticiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:498
+#, fuzzy
+msgid "File system type"
+msgstr "Tipo de sistema"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:108
+#: plugins/admin/fai/class_faiPartitionTable.inc:500
 #, fuzzy
+msgid "Partition size"
+msgstr "Paticiones"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:502
+#, fuzzy
+msgid "File system options"
+msgstr "Ver la información de sistema"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:503
+#, fuzzy
+msgid "Partition flags"
+msgstr "Paticiones"
+
+#: plugins/admin/fai/class_faiHookEntry.inc:143
 msgid "Please enter a value for script."
-msgstr "Por favor introduzca un número de serie válido"
+msgstr "Por favor introduzca un valor para el script"
 
 #: plugins/admin/fai/class_faiProfileEntry.inc:123
 msgid "Package bundle"
@@ -9773,73 +13425,56 @@ msgstr ""
 
 #: plugins/admin/fai/class_faiProfileEntry.inc:154
 #: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
-#, fuzzy
 msgid "Class name"
-msgstr "Elija tipo de ratón"
+msgstr "Nombre de la clase"
 
 #: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
-#, fuzzy
 msgid "Hook attributes"
-msgstr "Atributo 'dn' de los usuarios"
-
-#: plugins/admin/fai/faiHookEntry.tpl:34
-#, fuzzy
-msgid "Task"
-msgstr "Días para tareas"
+msgstr "Atributos de acción"
 
 #: plugins/admin/fai/faiHookEntry.tpl:36
 msgid "Choose an existing FAI task"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:77
-#, fuzzy
+#: plugins/admin/fai/class_askClassName.inc:85
 msgid "Create new FAI object - partition table."
-msgstr "Grupo de objetos"
+msgstr "Crear nuevo objeto FAI: tabla de particiones."
 
-#: plugins/admin/fai/class_askClassName.inc:78
-#, fuzzy
+#: plugins/admin/fai/class_askClassName.inc:86
 msgid "Create new FAI object - package bundle."
-msgstr "Grupo de objetos"
+msgstr "Crear nuevo objeto FAI: Colección de paquetes"
 
-#: plugins/admin/fai/class_askClassName.inc:79
-#, fuzzy
+#: plugins/admin/fai/class_askClassName.inc:87
 msgid "Create new FAI object - script bundle."
-msgstr "Grupo de objetos"
+msgstr "Crear nuevo objeto FAI: Colección de scripts."
 
-#: plugins/admin/fai/class_askClassName.inc:80
-#, fuzzy
+#: plugins/admin/fai/class_askClassName.inc:88
 msgid "Create new FAI object - variable bundle."
-msgstr "Grupo de objetos"
+msgstr "Crear nuevo objeto FAI: Colección de variables."
 
-#: plugins/admin/fai/class_askClassName.inc:81
-#, fuzzy
+#: plugins/admin/fai/class_askClassName.inc:89
 msgid "Create new FAI object - hook bundle."
-msgstr "Grupo de objetos"
+msgstr "Crear nuevo objeto FAI: Colección de acciones."
 
-#: plugins/admin/fai/class_askClassName.inc:82
-#, fuzzy
+#: plugins/admin/fai/class_askClassName.inc:90
 msgid "Create new FAI object - profile."
-msgstr "Grupo de objetos"
+msgstr "Crear nuevo objeto FAI:: Perfil."
 
-#: plugins/admin/fai/class_askClassName.inc:83
-#, fuzzy
+#: plugins/admin/fai/class_askClassName.inc:91
 msgid "Create new FAI object - template."
-msgstr "Nueva plantilla"
+msgstr "Crear nuevo objeto FAI: Plantilla."
 
-#: plugins/admin/fai/class_askClassName.inc:84
-#, fuzzy
+#: plugins/admin/fai/class_askClassName.inc:92
 msgid "Create new FAI object"
-msgstr "Grupo de objetos"
+msgstr "Crear nuevo objeto FAI."
 
-#: plugins/admin/fai/class_askClassName.inc:137
-#, fuzzy
+#: plugins/admin/fai/class_askClassName.inc:146
 msgid "The given class name is empty."
-msgstr "El archivo especificado está vacío."
+msgstr "El nombre de la clase especificado está vacío."
 
-#: plugins/admin/fai/class_askClassName.inc:141
-#, fuzzy
+#: plugins/admin/fai/class_askClassName.inc:150
 msgid "The specified class name is already in use for this object type."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+msgstr "El nombre de la clase especificado esta siendo utilizado."
 
 #: plugins/admin/fai/askClassName.tpl:6
 msgid ""
@@ -9865,134 +13500,126 @@ msgid "Choose FAI class name from a list of existing classes"
 msgstr ""
 
 #: plugins/admin/fai/askClassName.tpl:54
-#, fuzzy
 msgid "Choose class name"
-msgstr "Elija tipo de ratón"
+msgstr "Elija nombre de clase"
 
 #: plugins/admin/fai/askClassName.tpl:74
-#, fuzzy
 msgid "A new class name."
-msgstr "Aplicaciones disponibles"
+msgstr "Un nuevo nombre de clase."
+
+#: plugins/admin/fai/class_faiVariable.inc:304
+#, fuzzy, php-format
+msgid "Saving of FAI/variable with dn '%s' failed."
+msgstr "Ha fallado la grabación de la base de la tabla de particiones FAI"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:74
+#: plugins/admin/fai/class_faiVariable.inc:383
 #, fuzzy
+msgid "FAI variable"
+msgstr "Mostrar variables FAI"
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:88
 msgid "no file uploaded yet"
-msgstr "No se ha subido ningún archivo."
+msgstr "no se ha subido ningún archivo todavía"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:76
+#: plugins/admin/fai/class_faiTemplateEntry.inc:93
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:156
-#, fuzzy
+#: plugins/admin/fai/class_faiTemplateEntry.inc:184
 msgid "Please specify a value for attribute 'file'."
-msgstr "Por favor especifique un usuario valido."
+msgstr "Por favor especifique un valor para el atributo 'fichero'."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:160
-#, fuzzy
+#: plugins/admin/fai/class_faiTemplateEntry.inc:188
 msgid "Please specify a value for attribute 'path'."
-msgstr "Por favor especifique un usuario valido."
+msgstr "Por favor especifique un valor para el atributo 'ruta'."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:168
-#, fuzzy
+#: plugins/admin/fai/class_faiTemplateEntry.inc:196
 msgid "Please enter a user."
-msgstr "Por favor especifique una dirección de servidor - URI - válida."
+msgstr "Por favor introduzca un usuario."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:171
-#, fuzzy
+#: 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 nombre de usuario valido."
+msgstr ""
+"Por favor especifique un usuario valido. Solo están permitidos a-Z/0-9."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:175
-#, fuzzy
+#: plugins/admin/fai/class_faiTemplateEntry.inc:203
 msgid "Please enter a group."
-msgstr "Por favor especifique una dirección de servidor - URI - válida."
+msgstr "Por favor introduzca un grupo."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:178
-#, fuzzy
+#: plugins/admin/fai/class_faiTemplateEntry.inc:206
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgstr "Por favor especifique un grupo valido. Solo están permitidos a-Z/0-9."
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:21
-#, fuzzy
 msgid "Template attributes"
-msgstr "Atributo 'dn' de los usuarios"
+msgstr "Atributos de la plantilla"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:35
-#, fuzzy
 msgid "Save template"
-msgstr "Nueva plantilla"
+msgstr "Guardar plantilla"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:47
-#, fuzzy
 msgid "Destination path"
-msgstr "Destino"
+msgstr "Ruta de destino"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:546
+#: plugins/gofon/conference/class_divListConferences.inc:53
 msgid "Owner"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:80
-#, fuzzy
 msgid "Access"
-msgstr "Dirección"
-
-#: plugins/admin/fai/faiTemplateEntry.tpl:86
-#, fuzzy
-msgid "Class"
-msgstr "clase"
+msgstr "Acceso"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:87
-#, fuzzy
 msgid "Read"
-msgstr "leer"
+msgstr "Lectura"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:88
-#, fuzzy
 msgid "Write"
-msgstr "escribir"
+msgstr "Escritura"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:91
-#, fuzzy
 msgid "Special"
-msgstr "terminales"
+msgstr "Especial"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:100
-#, fuzzy
 msgid "SUID"
-msgstr "UID"
+msgstr "SUID"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:109
-#, fuzzy
 msgid "SGID"
-msgstr "GID"
+msgstr "SGID"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:112
-#, fuzzy
 msgid "Others"
-msgstr "Filtros"
+msgstr "Otros"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:118
-#, fuzzy
 msgid "sticky"
 msgstr "estatico"
 
 #: plugins/admin/fai/class_faiPackageEntry.inc:35
-#, fuzzy
 msgid "Please enter your search string here"
-msgstr "Por favor introduzca un número de serie válido"
+msgstr "Por favor introduzca una cadena de búsqueda"
 
 #: plugins/admin/fai/class_faiPackageEntry.inc:48
 msgid ""
 "This list displays all assigned package names for this repository settings."
 msgstr ""
 
+#: 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/faiPackageEntry.tpl:6
-#, fuzzy
 msgid "List of available packages"
-msgstr "Elija tipo de ratón"
+msgstr "Lista de paquetes disponibles"
 
 #: plugins/admin/fai/faiPackageEntry.tpl:26
 msgid ""
@@ -10000,20 +13627,14 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
-#, fuzzy
-msgid "Package"
-msgstr "Mostrar teléfonos"
-
-#: plugins/admin/fai/class_faiPackageConfiguration.inc:42
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
 #, php-format
 msgid "Debconf information for package '%s'"
 msgstr ""
 
 #: plugins/admin/fai/faiPackageNew.tpl:1
-#, fuzzy
 msgid "Repository settings"
-msgstr "Configuración de red"
+msgstr "Parámetros del repositorio"
 
 #: plugins/admin/fai/faiPackageNew.tpl:3
 msgid ""
@@ -10039,16 +13660,15 @@ msgid ""
 "First select the preferred release, then the section and finally the mirror."
 msgstr ""
 
-#: plugins/admin/fai/faiPackageNew.tpl:21
-msgid "Following releases are available"
-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
-#, fuzzy
+#: plugins/admin/fai/faiPackageNew.tpl:37
 msgid "Sections for this release"
-msgstr "Localización de este subarbol"
+msgstr "Secciones para esta versión"
 
-#: plugins/admin/fai/faiNewBranch.tpl:3
+#: 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 "
@@ -10058,28 +13678,411 @@ msgid ""
 "and 'fai'."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:9
+#: 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/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/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Initiate operation"
+msgstr "Iniciando operación"
+
+#: 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_faiSummaryTab.inc:39
+msgid "Scripts"
+msgstr "Scripts"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
+msgid "Package list"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:184
+msgid "This object has no FAI classes assigned."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:196
+msgid "Open"
+msgstr "Abierto"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:303
+msgid "No."
+msgstr "No."
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:305
+msgid "FS options"
+msgstr "Opciones FS"
+
+#: 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/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:64
+msgid "Name of FAI class"
+msgstr "Nombre de las clases FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:65
+msgid "Class type"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Display FAI profile objects"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:68
+msgid "Show profiles"
+msgstr "Mostrar perfiles"
+
+#: plugins/admin/fai/class_divListFai.inc:69
+msgid "Display FAI template objects"
+msgstr "Mostrar objetos de plantilla FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:70
+msgid "Display FAI scripts"
+msgstr "Mostrar scrips FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:70
+msgid "Show scripts"
+msgstr "Mostrar scrips"
+
+#: plugins/admin/fai/class_divListFai.inc:71
+msgid "Display FAI hooks"
+msgstr "Mostrar acciones FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:71
+msgid "Show hooks"
+msgstr "Mostrar acciones"
+
+#: plugins/admin/fai/class_divListFai.inc:72
+msgid "Display FAI variables"
+msgstr "Mostrar variables FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:72
+msgid "Show variables"
+msgstr "Mostrar variables"
+
+#: plugins/admin/fai/class_divListFai.inc:73
+msgid "Display FAI packages"
+msgstr "Mostrar paquetes FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:73
+msgid "Show packages"
+msgstr "Mostrar paquetes"
+
+#: plugins/admin/fai/class_divListFai.inc:74
+msgid "Display FAI partitions"
+msgstr "Mostrar particiones FAI"
+
+#: plugins/admin/fai/class_divListFai.inc:74
+msgid "Show partitions"
+msgstr "Mostrar particiones"
+
+#: plugins/admin/fai/class_divListFai.inc:131
+msgid "New profile"
+msgstr "Nuevo perfil"
+
+#: plugins/admin/fai/class_divListFai.inc:136
+msgid "New partition table"
+msgstr "Nueva tabla de particiones"
+
+#: plugins/admin/fai/class_divListFai.inc:136
+msgid "PT"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:139
+msgid "New scripts"
+msgstr "Nuevos scripts"
+
+#: plugins/admin/fai/class_divListFai.inc:139
+msgid "S"
+msgstr "S"
+
+#: plugins/admin/fai/class_divListFai.inc:142
+msgid "New hooks"
+msgstr "Nuevas acciones"
+
+#: plugins/admin/fai/class_divListFai.inc:142
+msgid "H"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:145
+msgid "New variables"
+msgstr "Nuevas variables"
+
+#: plugins/admin/fai/class_divListFai.inc:145
+msgid "V"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:148
+msgid "New templates"
+msgstr "Nuevas plantillas"
+
+#: plugins/admin/fai/class_divListFai.inc:148
+msgid "T"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:151
+msgid "New package list"
+msgstr "Nueva lista de paquetes"
+
+#: plugins/admin/fai/class_divListFai.inc:151
+msgid "PK"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:222
+#: plugins/admin/fai/class_divListFai.inc:227
+msgid "Edit class"
+msgstr "Editar clase"
+
+#: plugins/admin/fai/class_divListFai.inc:230
+msgid "Delete class"
+msgstr "Eliminar clase"
+
+#: plugins/admin/mimetypes/generic.tpl:13
+#: plugins/admin/mimetypes/paste_generic.tpl:13
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:148
+#, fuzzy
+msgid "Mime type"
+msgstr "Tipo MIME"
+
+#: plugins/admin/mimetypes/generic.tpl:16
+#: plugins/admin/mimetypes/paste_generic.tpl:16
+#, fuzzy
+msgid "Please enter a name for the mime type here"
+msgstr "¡Por favor introduzca un número de teléfono valido!"
+
+#: plugins/admin/mimetypes/generic.tpl:21
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:662
+#, fuzzy
+msgid "Mime group"
+msgstr "Grupo primario"
+
+#: plugins/admin/mimetypes/generic.tpl:24
+#, fuzzy
+msgid "Categorize this mime type"
+msgstr "Categoría de este subarbol"
+
+#: plugins/admin/mimetypes/generic.tpl:34
+#, fuzzy
+msgid "Please specify a description"
+msgstr "Por favor especifique un nombre de script valido."
+
+#: plugins/admin/mimetypes/generic.tpl:66
+msgid "Update mime type icon"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:79
+msgid "Left click"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:84
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:668
+#, fuzzy
+msgid "File patterns"
+msgstr "Filtros"
+
+#: plugins/admin/mimetypes/generic.tpl:86
+#, fuzzy
+msgid "Please specify a new file pattern"
+msgstr "Por favor especifique un nombre"
+
+#: plugins/admin/mimetypes/generic.tpl:87
+msgid "Add a new file pattern"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:92
+#: plugins/admin/mimetypes/generic.tpl:133
+#, fuzzy
+msgid "Enter an application name here"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/mimetypes/generic.tpl:93
+#: plugins/admin/mimetypes/generic.tpl:134
+#, fuzzy
+msgid "Add application"
+msgstr "aplicación"
+
+#: plugins/admin/mimetypes/generic.tpl:103
+msgid "Embedding"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:114
+msgid "Show file in embedded viewer"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:119
+msgid "Show file in external viewer"
+msgstr ""
+
+#: plugins/admin/mimetypes/generic.tpl:124
+msgid "Ask whether to save to local disk"
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:434
+#, php-format
+msgid "Saving of mime type/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:443
+#, fuzzy, php-format
+msgid "Removing of mime type/generic with dn '%s' failed."
+msgstr "Ha fallado la eliminación de componente genérico"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:455
+#, fuzzy, php-format
+msgid "Removing mime type from objectgroup '%s' failed"
+msgstr "Ha fallado la eliminación de la aplicación del grupo '%s'"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:465
+#, fuzzy
+msgid "Please specify a valid name for this mime type."
+msgstr "Por favor especifique un nombre de adjunto valido."
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:468
+#, fuzzy
+msgid "Please specify at least one file pattern."
+msgstr "Por favor especifique un nombre de adjunto valido."
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:481
+#, fuzzy
+msgid "There's already a mime type with this 'Name'."
+msgstr "Ya existe una aplicación con este 'Nombre'."
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:489
+#, fuzzy
+msgid "There's already an mime with this 'Name'."
+msgstr "Ya existe una aplicación con este 'Nombre'."
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:501
+#, fuzzy
+msgid "You have no permissions to create a mime type on this 'Base'."
+msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:653
+#, fuzzy
+msgid "Mime type generic"
+msgstr "Tipo MIME"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:658
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:26
+#, fuzzy
+msgid "Mime types"
+msgstr "Tipo MIME"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:666
+#, fuzzy
+msgid "Left click action"
+msgstr "Crear aplicaciones"
+
+#: plugins/admin/mimetypes/class_mimetypeGeneric.inc:669
+#, fuzzy
+msgid "Embedded applications"
+msgstr "Aplicaciones Usadas"
+
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:27
+#, fuzzy
+msgid "Manage mime types"
+msgstr "Gestionar tipos de sistemas"
+
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:284
+#, fuzzy, php-format
+msgid "You're about to delete the mime type '%s'."
+msgstr "Has decidido eliminar la entrada %s"
+
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:290
+#: plugins/admin/mimetypes/class_mimetypeManagement.inc:319
+#, fuzzy
+msgid "You are not allowed to delete this mime type!"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
+
+#: plugins/admin/mimetypes/paste_generic.tpl:24
+#, fuzzy
+msgid "Please specify a description for this mime type here"
+msgstr "Por favor especifique un nombre de adjunto valido."
+
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:35
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:36
+#, fuzzy
+msgid "List of defined mime types"
+msgstr "Listas de listas de bloqueos predefinidas"
+
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:37
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected mime types. You may "
+"want to use the range selector on top of the mime type listbox, when working "
+"with a large number of mime types."
+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/mimetypes/class_divListMimeTypes.inc:55
+#, fuzzy
+msgid "Mime type name"
+msgstr "Tipo MIME"
+
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:62
 #, fuzzy
-msgid "Please enter a name for the branch"
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+msgid "Display mime types matching"
+msgstr "Mostrar tipos de cartuchos que concuerdan con"
 
-#: plugins/admin/fai/remove_branch.tpl:6
+#: plugins/admin/mimetypes/class_divListMimeTypes.inc:118
 #, fuzzy
-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, "
-"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."
+msgid "Create new mime type"
+msgstr "Crear nueva plantilla"
+
+#: plugins/admin/mimetypes/main.inc:42 plugins/admin/mimetypes/main.inc:44
+#, fuzzy
+msgid "Mimetype management"
+msgstr "Gestión del sistema"
 
 #: 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
 #, fuzzy
 msgid "Phone PIN"
 msgstr "Teléfono"
@@ -10090,53 +14093,53 @@ msgstr "Teléfono"
 msgid "Phone macro"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
 #, fuzzy
 msgid "no macro"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:135
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:136
 #, fuzzy
 msgid "undefined"
 msgstr "sin definirse"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:644
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:646
 #: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:250
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
 "can't be saved to asterisk database."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:256
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:257
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:559
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:561
 #, fuzzy
 msgid "Error while performing query:"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:615
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:739
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:617
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
 msgid "This account has no phone extensions."
 msgstr "Esta cuenta no tiene extensiones telefónicas"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:635
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:637
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:749
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
 msgid "Remove phone account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:750
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:752
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -10144,12 +14147,12 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:753
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
 msgid "Create phone account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:754
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
 #, fuzzy
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
@@ -10158,7 +14161,7 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:757
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -10166,19 +14169,19 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:770
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
 msgid "Please enter a valid phone number!"
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:800
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:802
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:888
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:889
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:891
 #, fuzzy
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
@@ -10187,11 +14190,11 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:894
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:896
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:897
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:899
 #, fuzzy
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
@@ -10200,36 +14203,82 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:907
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:909
 #, 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:914
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:335
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:916
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:336
 #, fuzzy, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1076
-msgid "Stop"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:964
+#, fuzzy, php-format
+msgid "Saving of user/phone account with dn '%s' failed."
+msgstr "Cuenta proxy"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1085
+msgid ""
+"Can't remove phone account, the mysql extension is not present in php "
+"configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1111
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1118
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1125
+#, fuzzy, php-format
+msgid "Removing of user/phone account with dn '%s' failed."
+msgstr "Eliminar cuenta Posix"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1203
+#, fuzzy
+msgid "Phone account settings"
+msgstr "Configuración telefónica"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1212
+#, fuzzy
+msgid "Delivery mode"
+msgstr "Metodos de envío"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1214
+#, fuzzy
+msgid "Telephone pin"
+msgstr "Teléfono"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1215
+msgid "Voicemail pin"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1216
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:545
+#, fuzzy
+msgid "Telephone number"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1217
+#, fuzzy
+msgid "Macro settings"
+msgstr "Parámetros de correo"
+
 #: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
 msgid "Phone settings"
 msgstr "Configuración telefónica"
 
 #: plugins/gofon/macro/headpage.tpl:6
+#: plugins/gofon/macro/class_divListMacros.inc:31
+#: plugins/gofon/macro/class_divListMacros.inc:32
 #, fuzzy
 msgid "List of macros"
 msgstr "Lista de grupos"
 
 #: plugins/gofon/macro/headpage.tpl:24
+#: plugins/gofon/macro/class_divListMacros.inc:36
 #, fuzzy
 msgid ""
 "This menu allows you to add, edit and remove selected macros. You may want "
@@ -10251,144 +14300,134 @@ msgid "Display macros  matching"
 msgstr "Mostrar grupos que concuerden con"
 
 #: plugins/gofon/macro/headpage.tpl:41
+#: plugins/gofon/macro/class_divListMacros.inc:60
 #, fuzzy
 msgid "Regular expression for matching macro names"
 msgstr "Expresión regular que concuerde con nombres de grupos"
 
 #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-#, fuzzy
 msgid "Macro name"
-msgstr "Nombre de la maquina"
+msgstr "Nombre de la macro"
 
 #: plugins/gofon/macro/generic.tpl:12
 msgid "Macro name to be displayed"
 msgstr ""
 
 #: plugins/gofon/macro/generic.tpl:22
-#, fuzzy
 msgid "Choose subtree to place macro in"
-msgstr "Elija lugar del árbol para colocar la aplicación"
+msgstr "Elija lugar del árbol para colocar la macro"
 
-#: plugins/gofon/macro/generic.tpl:43
-#, fuzzy
+#: plugins/gofon/macro/generic.tpl:48
 msgid "Visible for user"
-msgstr "Lista de usuarios"
+msgstr "Visible para el usuario"
 
-#: plugins/gofon/macro/generic.tpl:52
-#, fuzzy
+#: plugins/gofon/macro/generic.tpl:57
 msgid "Macro text"
-msgstr "Nombre de la maquina"
+msgstr "macro de texto"
 
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-#, fuzzy
 msgid "Phone macros"
-msgstr "Informes telefónicos"
+msgstr "Macros telefónicas"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, fuzzy, php-format
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:211
+#, php-format
 msgid "You're about to delete the macro '%s'."
-msgstr "Está a punto de borrar el grupo '%s'."
+msgstr "Está a punto de borrar la macro '%s'."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
-#, fuzzy
+#: 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 este grupo!"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
-#, fuzzy
-msgid "Create new phone macro"
-msgstr "Crear cuenta telefónica"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#, fuzzy
-msgid "Visible"
-msgstr "Variable"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-#, fuzzy
-msgid "Macro"
-msgstr "Nombre de la maquina"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "visible"
-msgstr "Visible Publicamente"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "invisible"
-msgstr "Visible Publicamente"
+msgstr "¡No le está permitido eliminar esta macro!"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:103
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:197
-#, fuzzy
 msgid "This 'dn' is no phone macro."
-msgstr "Esta 'dn' no tiene características de teléfono."
+msgstr "Esta 'dn' no es una macro de teléfono."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:159
+#: plugins/gofon/macro/class_gofonMacro.inc:187
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:191
+#: plugins/gofon/macro/class_gofonMacro.inc:194
+#: plugins/gofon/macro/class_gofonMacro.inc:209
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
+#, fuzzy, php-format
+msgid "Removing of goFonMacro/generic account with dn '%s' failed."
+msgstr "Ha fallado borrar cuenta de nagios"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:222
 msgid ""
 "There is no mysql extension available in your php setup, can't save any "
 "changes to asterisk db."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:261
+#: plugins/gofon/macro/class_gofonMacro.inc:292
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:279
+#: plugins/gofon/macro/class_gofonMacro.inc:310
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:288
-#: plugins/gofon/macro/class_gofonMacro.inc:296
+#: plugins/gofon/macro/class_gofonMacro.inc:319
+#: plugins/gofon/macro/class_gofonMacro.inc:327
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:310
+#: plugins/gofon/macro/class_gofonMacro.inc:341
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:357
-#, fuzzy, php-format
+#: plugins/gofon/macro/class_gofonMacro.inc:389
+#, php-format
 msgid "The given cn '%s' already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
+msgstr "Ya existe un cn '%s'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:362
+#: plugins/gofon/macro/class_gofonMacro.inc:394
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:366
+#: plugins/gofon/macro/class_gofonMacro.inc:398
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:371
+#: plugins/gofon/macro/class_gofonMacro.inc:403
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:377
+#: plugins/gofon/macro/class_gofonMacro.inc:409
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:382
-#, fuzzy
+#: plugins/gofon/macro/class_gofonMacro.inc:414
 msgid "Please choose a valid  base."
-msgstr "Por favor especifique un rango VSync valido"
+msgstr "Por favor elija una base válida."
+
+#: plugins/gofon/macro/class_gofonMacro.inc:457
+#, fuzzy, php-format
+msgid "Saving of goFonMacro/generic account with dn '%s' failed."
+msgstr "Ha fallado al grabar la cuenta de nagios"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:466
+#, fuzzy
+msgid "Asterisk macro management"
+msgstr "Gestión de Asterisk PBX"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:477
+#, fuzzy
+msgid "Macro content"
+msgstr "macro de texto"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:478
+msgid "Visibility flag"
+msgstr ""
 
 #: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
@@ -10401,9 +14440,8 @@ msgid "type"
 msgstr "Tipo"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
-#, fuzzy
 msgid "String"
-msgstr "durante"
+msgstr "Cadena de texto"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:246
 msgid "Combobox"
@@ -10414,38 +14452,82 @@ msgid "Bool"
 msgstr ""
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:253
-#, fuzzy
 msgid "Delete unused"
-msgstr "Borrar"
+msgstr "Eliminar sin usar"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:327
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:340
+#: 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:369
+#: 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/main.inc:38 plugins/gofon/macro/main.inc:40
+#: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
 #, fuzzy
 msgid "Phone macro management"
 msgstr "Gestión del sistema"
 
+#: plugins/gofon/macro/class_divListMacros.inc:52
+#, fuzzy
+msgid "macro name"
+msgstr "Nombre de la macro"
+
+#: plugins/gofon/macro/class_divListMacros.inc:53
+#, fuzzy
+msgid "Visible"
+msgstr "Variable"
+
+#: plugins/gofon/macro/class_divListMacros.inc:90
+#, fuzzy
+msgid "Create new phone macro"
+msgstr "Crear cuenta telefónica"
+
+#: plugins/gofon/macro/class_divListMacros.inc:110
+#: plugins/gofon/macro/class_divListMacros.inc:129
+#, fuzzy
+msgid "Edit macro"
+msgstr "Editar recurso compartido"
+
+#: plugins/gofon/macro/class_divListMacros.inc:112
+#: plugins/gofon/macro/class_divListMacros.inc:132
+#, fuzzy
+msgid "Delete macro"
+msgstr "Borrar usuario"
+
+#: plugins/gofon/macro/class_divListMacros.inc:115
+#, fuzzy
+msgid "Macro"
+msgstr "Nombre de la maquina"
+
+#: plugins/gofon/macro/class_divListMacros.inc:116
+#, fuzzy
+msgid "visible"
+msgstr "Visible Publicamente"
+
+#: plugins/gofon/macro/class_divListMacros.inc:117
+#, fuzzy
+msgid "invisible"
+msgstr "Visible Publicamente"
+
 #: plugins/gofon/conference/headpage.tpl:6
+#: plugins/gofon/conference/class_divListConferences.inc:31
+#: plugins/gofon/conference/class_divListConferences.inc:32
 #, fuzzy
 msgid "List of conference rooms"
 msgstr "Lista de grupos"
 
 #: plugins/gofon/conference/headpage.tpl:24
+#: plugins/gofon/conference/class_divListConferences.inc:36
 #, fuzzy
 msgid ""
 "This menu allows you to create, delete and edit selected phone conferences. "
@@ -10477,117 +14559,169 @@ msgstr "Nombre del subárbol para crear"
 msgid "Choose subtree to place conference in"
 msgstr "Elija el subárbol donde colocar el usuario"
 
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:66
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:99
+#: plugins/gofon/conference/generic.tpl:104
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:535
 #, fuzzy
 msgid "Preset PIN"
 msgstr "presente"
 
-#: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
+#: plugins/gofon/conference/generic.tpl:112
+#: plugins/gofon/conference/class_divListConferences.inc:54
 msgid "PIN"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:113
+#: plugins/gofon/conference/generic.tpl:118
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:536
 #, fuzzy
 msgid "Record conference"
 msgstr "Referencias"
 
-#: plugins/gofon/conference/generic.tpl:121
+#: plugins/gofon/conference/generic.tpl:126
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:138
+#: plugins/gofon/conference/generic.tpl:143
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:537
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:144
+#: plugins/gofon/conference/generic.tpl:149
 #, fuzzy
 msgid "Activate session menu"
 msgstr "Activar mensaje de ausencia"
 
-#: plugins/gofon/conference/generic.tpl:150
+#: plugins/gofon/conference/generic.tpl:155
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:156
+#: plugins/gofon/conference/generic.tpl:161
 #, fuzzy
 msgid "Count users"
 msgstr "Pais"
 
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:521
 #, fuzzy
 msgid "Phone conferences"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-#, fuzzy
-msgid "Management"
-msgstr "Nombre de la maquina"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-#, fuzzy
-msgid "Create new conference"
-msgstr "Crear una nueva entrada en"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
-#, fuzzy
-msgid "New conference"
-msgstr "Número de teléfono"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "This table displays all available conference rooms."
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:182
+#, php-format
+msgid "Removing of goFonConference/generic with dn '%s' failed."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
-#, fuzzy
-msgid "Name - Number"
-msgstr "Número de teléfono"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:365
-#, fuzzy
-msgid "Conference"
-msgstr "Referencias"
-
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:216
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:220
 #, fuzzy
 msgid "Please enter a PIN."
 msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
 #, fuzzy
 msgid "Please enter a name for the conference."
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:228
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:232
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:262
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
 msgid ""
 "Can't save any changes to asterisk database, there is currently no mysql "
 "extension available in your php setup."
 msgstr ""
 
-#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:510
+#, php-format
+msgid "Saving of goFonConference/generic with dn '%s' failed."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:522
+#, fuzzy
+msgid "Phone conference management"
+msgstr "Mantenimiento de Departamentos"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:527
+msgid "GOfon"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:533
+#, fuzzy
+msgid "Conference PIN"
+msgstr "Referencias"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:538
+#, fuzzy
+msgid "Activate menu"
+msgstr "Activar mensaje de ausencia"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:539
+msgid "Announce user activity"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:540
+#, fuzzy
+msgid "Count user"
+msgstr "Pais"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:541
+#, fuzzy
+msgid "Conference type"
+msgstr "Referencias"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:543
+#, fuzzy
+msgid "Format"
+msgstr "formateo"
+
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:544
+msgid "Lifetime"
+msgstr ""
+
+#: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 #, fuzzy
 msgid "Conference management"
 msgstr "Mantenimiento de Departamentos"
 
+#: plugins/gofon/conference/class_divListConferences.inc:52
+#, fuzzy
+msgid "Name - Number"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/conference/class_divListConferences.inc:61
+#, fuzzy
+msgid "Regular expression for matching conference names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+
+#: plugins/gofon/conference/class_divListConferences.inc:90
+#, fuzzy
+msgid "Create new conference"
+msgstr "Crear una nueva entrada en"
+
+#: plugins/gofon/conference/class_divListConferences.inc:90
+#, fuzzy
+msgid "New conference"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/conference/class_divListConferences.inc:154
+#, fuzzy
+msgid "Conference"
+msgstr "Referencias"
+
 #: plugins/gofon/fonreports/contents.tpl:31
 msgid "Source"
 msgstr "Fuente"
@@ -10604,7 +14738,10 @@ msgstr "Canal"
 msgid "Duration"
 msgstr "Duración"
 
-#: plugins/gofon/fonreports/main.inc:5
+#: plugins/gofon/fonreports/main.inc:21
+#: plugins/gofon/fonreports/class_fonreport.inc:356
+#: plugins/gofon/fonreports/class_fonreport.inc:357
+#: plugins/gofon/fonreports/class_fonreport.inc:365
 msgid "Phone reports"
 msgstr "Informes telefónicos"
 
@@ -10612,21 +14749,21 @@ msgstr "Informes telefónicos"
 msgid "Phone Reports"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
+#: plugins/gofon/fonreports/class_fonreport.inc:157
+#: plugins/gofon/fonreports/class_fonreport.inc:167
 #, fuzzy
 msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
 "No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
 "informes!"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:110
+#: plugins/gofon/fonreports/class_fonreport.inc:171
 #, fuzzy
 msgid "Can't select phone database for report generation!"
 msgstr ""
 "¡No puedo seleccionar la base de datos de fax para la generación de informes!"
 
-#: plugins/gofon/fonreports/class_fonreport.inc:212
+#: 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!"
 
@@ -10648,8 +14785,9 @@ msgid "This object has no relationship to other objects."
 msgstr "Este objeto no tiene ninguna relación con otros objetos."
 
 #: plugins/generic/welcome/welcome.tpl:4
+#, fuzzy
 msgid ""
-"This is the GOsa main screen. You can select your tasks from the menu on the "
+"This is the GOsa main menu. You can select your tasks from the menu on the "
 "left, or by choosing one of the pictograms below. All changes apply directly "
 "to your companies LDAP server."
 msgstr ""
@@ -10681,7 +14819,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:347
+#: include/php_setup.inc:71 html/main.php:381
 msgid "Toggle information"
 msgstr "Información de intercambio"
 
@@ -10705,37 +14843,37 @@ msgstr "estatico"
 msgid "method"
 msgstr "método"
 
-#: include/php_setup.inc:121
+#: include/php_setup.inc:129
 msgid "Trace"
 msgstr "Traza"
 
-#: include/php_setup.inc:122
+#: include/php_setup.inc:130
 msgid "Line"
 msgstr "Linea"
 
-#: include/php_setup.inc:123
+#: include/php_setup.inc:131
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: include/functions.inc:290
-#, php-format
-msgid "Error when connecting the LDAP. Server said '%s'."
+#: include/functions.inc:299
+#, fuzzy, php-format
+msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "Hay un error trantando de conectarse al servidor LDAP. El error del servidor "
 "es: '%s'"
 
-#: include/functions.inc:311
+#: include/functions.inc:316
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr "Autenticación del usuario fallida. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:330
+#: include/functions.inc:337
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 "Nombre de usuario o UID no son únicos. Por favor, compruebe su base de datos "
 "LDAP."
 
-#: include/functions.inc:368
+#: include/functions.inc:468
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
@@ -10743,7 +14881,7 @@ msgstr ""
 "Error al tratar de agregar un bloqueo. Los parámetros no son correctos, por "
 "favor, compruebe el código fuente."
 
-#: include/functions.inc:378
+#: include/functions.inc:478
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -10752,17 +14890,17 @@ msgstr ""
 "No se pudo generar el bloqueo a la base de datos LDAP. Por favor, compruebe "
 "la entrada 'config' en gosa.conf. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:393
+#: include/functions.inc:493
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr "Fallo al tratar de agregar un bloqueo. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:419
+#: include/functions.inc:519
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr "Fallo al tratar de agregar un bloqueo. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:449
+#: include/functions.inc:549
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
@@ -10770,7 +14908,7 @@ msgstr ""
 "Fallo al tratar de obtener un bloqueo de LDAP. Los parámetros no fueron "
 "correctamente configurados, por favor, compruebe el código fuente."
 
-#: include/functions.inc:459
+#: include/functions.inc:559
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -10778,7 +14916,7 @@ msgstr ""
 "No puedo bloquear la información en la base de datos LDAP. Por favor, "
 "compruebe la entrada 'config' en el archivos gosa.conf."
 
-#: include/functions.inc:467
+#: include/functions.inc:567
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -10786,12 +14924,12 @@ msgstr ""
 "Se encontraron varios bloqueos para el objeto a bloquear. Esto no debería "
 "ser posible, eliminando referencias múltiples."
 
-#: include/functions.inc:581
+#: include/functions.inc:655
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡Ha excedido el tamaño máximo de %d entradas!"
 
-#: include/functions.inc:583
+#: include/functions.inc:657
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -10800,11 +14938,48 @@ msgstr ""
 "Indique el nuevo tamaño limite a %s y enséñame este mensaje si el tamaño "
 "limite es todavía superado"
 
-#: include/functions.inc:600
+#: include/functions.inc:674
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1008
+#: include/functions.inc:1068 include/functions.inc:1258
+msgid "LDAP error:"
+msgstr "Error LDAP:"
+
+#: include/functions.inc:1069
+msgid ""
+"Problems with the LDAP server mean that you probably lost the last changes. "
+"Please check your LDAP setup for possible errors and try again."
+msgstr ""
+
+#: include/functions.inc:1077
+msgid ""
+"Please check your input and fix the error. Press 'OK' to close this message "
+"box."
+msgstr ""
+
+#: include/functions.inc:1086
+#, fuzzy
+msgid "An error occured while processing your request"
+msgstr ""
+"Un error ha ocurrido cuando se insertaba la entrada '%s' - El proceso ha "
+"sido abortado."
+
+#: include/functions.inc:1090 include/functions_setup.inc:254
+msgid "OK"
+msgstr "Perfecto"
+
+#: include/functions.inc:1152
+#, fuzzy
+msgid "Continue anyway"
+msgstr "Continuar"
+
+#: include/functions.inc:1154
+#, fuzzy
+msgid "Edit anyway"
+msgstr "Editar entrada"
+
+#: include/functions.inc:1156
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -10813,31 +14988,25 @@ 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:1107
-msgid "LDAP error:"
-msgstr "Error LDAP:"
-
-#: include/functions.inc:1285
+#: include/functions.inc:1440
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1313
+#: include/functions.inc:1468
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1587
+#: include/functions.inc:1742
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1630
+#: include/functions.inc:1785
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Versión de desarrollo de GOsa (Rev %s)"
 
 #: include/class_mail-methods-cyrus.inc:39
-msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
+msgid "Warning: Account has an invalid mailserver string!"
 msgstr ""
 
 #: include/class_mail-methods-cyrus.inc:52
@@ -10849,65 +15018,93 @@ msgstr ""
 "de los valores de la configuración del correo no serán guardados en el "
 "servidor"
 
-#: include/class_mail-methods-cyrus.inc:115
+#: include/class_mail-methods-cyrus.inc:129
 #, 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:131
+#: include/class_mail-methods-cyrus.inc:148
 #, 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:155
+#: include/class_mail-methods-cyrus.inc:174
 #, fuzzy
 msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 "Aviso: imap_getacl no ha sido implementado, no se modificara información "
 "sobre las listas de acceso."
 
-#: include/class_mail-methods-cyrus.inc:173
+#: include/class_mail-methods-cyrus.inc:192
 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:195
+#: include/class_mail-methods-cyrus.inc:214
 #, 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:223
+#: include/class_mail-methods-cyrus.inc:242
 #, 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:236
+#: include/class_mail-methods-cyrus.inc:255
 #, 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:307
+#: include/class_mail-methods-cyrus.inc:326
 #, 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:311
+#: include/class_mail-methods-cyrus.inc:330
 #, 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_ldap.inc:479
+#: 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:228
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:448
+#, fuzzy, php-format
+msgid "Creating copy of %s"
+msgstr "Lista de usuarios"
+
+#: include/class_ldap.inc:451
+msgid "Processing"
+msgstr ""
+
+#: include/class_ldap.inc:491
+#, fuzzy
+msgid "Error while fetching source dn - aborted!"
+msgstr "¡Error mientras se exportaban las entradas indicadas!"
+
+#: include/class_ldap.inc:554
 #, fuzzy, php-format
 msgid "Unknown FAIstate %s"
 msgstr "estado desconocido"
 
-#: include/class_ldap.inc:590
+#: include/class_ldap.inc:702
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -10916,28 +15113,57 @@ 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:852
+#: include/class_ldap.inc:771
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
+msgstr ""
+
+#: include/class_ldap.inc:773
+#, fuzzy, php-format
+msgid "while operating on LDAP server %s"
+msgstr ""
+"Hay un error trantando de conectarse al servidor LDAP. El error del servidor "
+"es: '%s'"
+
+#: include/class_ldap.inc:995
 #, 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:865
-#, 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."
+"en la linea %s"
 
-#: include/class_ldap.inc:881
+#: include/class_ldap.inc:1024
 #, 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_plugin.inc:391
+#: include/class_ldap.inc:1152
+#, fuzzy, php-format
+msgid "Ldap import with dn '%s' failed."
+msgstr "Ha fallado la grabación de la impresora"
+
+#: include/class_tabs.inc:183
+#, php-format
+msgid "Delete process has been canceled by plugin '%s': %s"
+msgstr ""
+
+#: include/class_tabs.inc:298
+msgid "References"
+msgstr "Referencias"
+
+#: include/class_plugin.inc:414
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as CHECK hook 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:597
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -10945,7 +15171,7 @@ msgstr ""
 "El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:419 include/class_password-methods.inc:181
+#: include/class_plugin.inc:631 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -10953,7 +15179,7 @@ msgstr ""
 "El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:447
+#: include/class_plugin.inc:665
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -10961,12 +15187,76 @@ msgstr ""
 "El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
 "parece existir."
 
+#: include/class_plugin.inc:971
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr ""
+
+#: include/class_plugin.inc:978
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr ""
+
+#: include/class_plugin.inc:992 include/class_plugin.inc:1021
+#, php-format
+msgid "Handle object tagging with dn '%s' failed."
+msgstr ""
+
+#: include/class_plugin.inc:1008
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr ""
+
+#: include/class_plugin.inc:1069 include/class_plugin.inc:1115
+#: include/class_plugin.inc:1116
+#, fuzzy, php-format
+msgid "Saving object snapshot with dn '%s' failed."
+msgstr "Ha fallado la grabación del objeto grupo"
+
+#: include/class_plugin.inc:1132 include/class_SnapShotDialog.inc:53
+#, fuzzy
+msgid "You are not allowed to delete this snapshot!"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
+
+#: include/class_plugin.inc:1147
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable '%s' is not "
+"configured in your gosa.conf."
+msgstr ""
+
+#: include/class_plugin.inc:1159
+#, php-format
+msgid ""
+"The snapshot functionality is enabled, but the required variable(s) '%s' is "
+"not configured in your gosa.conf."
+msgstr ""
+
+#: include/class_plugin.inc:1191
+#, php-format
+msgid "Method get available snapshots with dn '%s' failed."
+msgstr ""
+
+#: include/class_plugin.inc:1247
+#, php-format
+msgid "Method get deleted snapshots with dn '%s' failed."
+msgstr ""
+
+#: include/class_plugin.inc:1311 include/class_plugin.inc:1325
+#, fuzzy, php-format
+msgid "Restore snapshot with dn '%s' failed."
+msgstr "Ha fallado la eliminación del teléfono"
+
 #: 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)"
 
-#: include/class_pluglist.inc:115
+#: include/class_pluglist.inc:53
+msgid "All objects in this category"
+msgstr ""
+
+#: include/class_pluglist.inc:131
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
@@ -10974,9 +15264,14 @@ msgstr ""
 "El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
 "favor actualízela usando el script 'fix_config.sh'!"
 
-#: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+#: include/class_pluglist.inc:145 include/class_pluglist.inc:146
+#: include/class_pluglist.inc:245
+#, fuzzy
+msgid "Unknown"
+msgstr "estado desconocido"
+
+#: include/class_pluglist.inc:153 ihtml/themes/default/framework.tpl:14
+#: ihtml/themes/default/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -11002,52 +15297,62 @@ msgstr ""
 msgid "PPD manager : The specified path '%s' doesn't exists."
 msgstr ""
 
-#: include/class_ppdManager.inc:129 include/class_ppdManager.inc:247
+#: include/class_ppdManager.inc:144
+#, php-format
+msgid "Specified ppd file '%s' can't be opened for reading."
+msgstr ""
+
+#: include/class_ppdManager.inc:146
+#, php-format
+msgid "The required tmp file file '%s' can't be opened for writing."
+msgstr ""
+
+#: include/class_ppdManager.inc:170 include/class_ppdManager.inc:297
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: include/class_ppdManager.inc:137
+#: include/class_ppdManager.inc:178
 #, fuzzy
 msgid "Nested groups are not supported!"
 msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
 
-#: include/class_ppdManager.inc:141
+#: include/class_ppdManager.inc:182
 #, fuzzy
 msgid "Group name not unique!"
 msgstr "Nombre del grupo"
 
-#: include/class_ppdManager.inc:147 include/class_ppdManager.inc:177
+#: include/class_ppdManager.inc:188 include/class_ppdManager.inc:218
 msgid "Symbol values are not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:171
+#: include/class_ppdManager.inc:212
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:196
+#: include/class_ppdManager.inc:237
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:268
+#: include/class_ppdManager.inc:318
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_config.inc:69
+#: 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:195 html/index.php:141
+#: include/class_config.inc:208 html/index.php:211
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
 "sistemas."
 
-#: include/class_config.inc:448
+#: include/class_config.inc:472
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID y/o RIDBASE no se encuentran en su configuración."
 
@@ -11098,19 +15403,13 @@ msgstr "Fichero de configuración"
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/functions_setup.inc:98
-msgid "Can't bind to LDAP. No schema check possible!"
-msgstr ""
-"No se pudo establecer la conexión al servidor LDAP. ¡No se pudo comprobar el "
-"esquema.!"
-
-#: include/functions_setup.inc:107 include/functions_setup.inc:116
+#: include/functions_setup.inc:84
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 "No se pudo obtener la información del esquema del servidor. No se pudo "
 "comprobar el esquema."
 
-#: include/functions_setup.inc:136
+#: include/functions_setup.inc:99
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
@@ -11119,7 +15418,7 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no esta disponible en configuración de LDAP."
 
-#: include/functions_setup.inc:140
+#: include/functions_setup.inc:103
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
@@ -11127,96 +15426,120 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no tiene la versión %s"
 
-#: include/functions_setup.inc:145
+#: include/functions_setup.inc:108
 #, php-format
 msgid "Support for '%s' enabled"
 msgstr "Es soporte para '%s' esta activado"
 
-#: include/functions_setup.inc:155
+#: include/functions_setup.inc:118
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr ""
 "No se encuentra el objeto de clase (object class) requerido '%s' en la "
 "configuración del servidor LDAP."
 
-#: include/functions_setup.inc:159
+#: include/functions_setup.inc:122
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr "El objeto de clase (objectclass) requerido '%s' no tiene la versión %s"
 
-#: include/functions_setup.inc:170
+#: include/functions_setup.inc:133
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr ""
 "El soporte de SAMBA 3 se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:175
+#: include/functions_setup.inc:138
 msgid "SAMBA 3 support enabled"
 msgstr "Soporte de SAMBA 3 activado"
 
-#: include/functions_setup.inc:180
+#: include/functions_setup.inc:143
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr ""
 "El soporte de SAMBA 2 se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:185
+#: include/functions_setup.inc:148
 msgid "SAMBA 2 support enabled"
 msgstr "Soporte de SAMBA 2 activado"
 
-#: include/functions_setup.inc:191
+#: include/functions_setup.inc:154
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para pureftp se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:196
+#: include/functions_setup.inc:159
 msgid "Support for pureftp enabled"
 msgstr "Soporte de PUREFTP activado"
 
-#: include/functions_setup.inc:201
+#: include/functions_setup.inc:164
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para WebDAV se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:206
+#: include/functions_setup.inc:169
 msgid "Support for WebDAV enabled"
 msgstr "Soporte de WebDAV activado"
 
-#: include/functions_setup.inc:211
+#: include/functions_setup.inc:174
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para phpgroupware se encuentra desactivado, no parece haber "
 "esquemas instalados"
 
-#: include/functions_setup.inc:216
+#: include/functions_setup.inc:179
 msgid "Support for phpgroupware enabled"
 msgstr "El soporte para phpgroupware está activado"
 
-#: include/functions_setup.inc:221
+#: include/functions_setup.inc:184
+#, fuzzy
+msgid "Support for trustAccount disabled, no schema seems to be installed"
+msgstr ""
+"El soporte para gofon se encuentra desactivado, no parece haber esquemas "
+"instalados"
+
+#: include/functions_setup.inc:189
+#, fuzzy
+msgid "Support for trustAccount enabled"
+msgstr "Soporte de GOFON activado"
+
+#: include/functions_setup.inc:194
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para gofon se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:226
+#: include/functions_setup.inc:199
 msgid "Support for gofon enabled"
 msgstr "Soporte de GOFON activado"
 
-#: include/functions_setup.inc:231
+#: include/functions_setup.inc:204
 #, fuzzy
 msgid "Support for nagios disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para gofon se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:236
+#: include/functions_setup.inc:209
 #, fuzzy
 msgid "Support for nagios enabled"
 msgstr "Soporte de GOFON activado"
 
-#: include/functions_setup.inc:246
+#: include/functions_setup.inc:214
+#, fuzzy
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr ""
+"El soporte para gofon se encuentra desactivado, no parece haber esquemas "
+"instalados"
+
+#: include/functions_setup.inc:219
+#, fuzzy
+msgid "Support for netatalk enabled"
+msgstr "Soporte de GOFON activado"
+
+#: include/functions_setup.inc:229
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -11224,31 +15547,27 @@ msgstr ""
 "El soporte para Kolab se encuentra desactivado, no parece haber esquemas "
 "instalados, cambiando el método de correo a cyrus"
 
-#: include/functions_setup.inc:253
+#: include/functions_setup.inc:236
 msgid "Support for Kolab enabled"
 msgstr "Soporte de KOLAB activado"
 
-#: include/functions_setup.inc:271
-msgid "OK"
-msgstr "Perfecto"
-
-#: include/functions_setup.inc:274
+#: include/functions_setup.inc:257
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: include/functions_setup.inc:276
+#: include/functions_setup.inc:259
 msgid "Failed"
 msgstr "Fallado"
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:276
 msgid "PHP setup inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.inc:294
+#: include/functions_setup.inc:278
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Comprobando la versión de PHP (>=4.1.0)"
 
-#: include/functions_setup.inc:295
+#: include/functions_setup.inc:279
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -11256,13 +15575,13 @@ msgstr ""
 "Debe tener una versión de PHP 4.1.0 o superior para el correcto "
 "funcionamiento de GOsa."
 
-#: include/functions_setup.inc:298
+#: include/functions_setup.inc:282
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 "Comprobando si el registro de variables globales (register_globals) esta "
 "desactivado."
 
-#: include/functions_setup.inc:299
+#: include/functions_setup.inc:283
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -11272,37 +15591,48 @@ msgstr ""
 "que permite acceder a variables globales sin cambiar el ambito. Esto puede "
 "ser un problema de seguridad. GOsa funcionará en los dos modos."
 
-#: include/functions_setup.inc:302
+#: include/functions_setup.inc:286
+msgid "PHP session.gc_maxlifetime (>= 86400 seconds)."
+msgstr ""
+
+#: include/functions_setup.inc:287
+msgid ""
+"PHP uses this value for the garbage collector to delete old sessions, "
+"setting this value to one day will prevent loosing session and cookie  "
+"before they really timeout."
+msgstr ""
+
+#: include/functions_setup.inc:290
 msgid "Checking for ldap module"
 msgstr "Comprobando los módulos de ldap"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:291
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr "Este es el módulo más usado por GOsa, es realmente requerido."
 
-#: include/functions_setup.inc:306
+#: include/functions_setup.inc:294
 #, fuzzy
 msgid "Checking for XML functions"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:307
+#: include/functions_setup.inc:295
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:310
+#: include/functions_setup.inc:298
 msgid "Checking for gettext support"
 msgstr "Comprobando el soporte de gettext"
 
-#: include/functions_setup.inc:311
+#: 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."
 
-#: include/functions_setup.inc:314
+#: include/functions_setup.inc:302
 msgid "Checking for iconv support"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:315
+#: include/functions_setup.inc:303
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -11311,11 +15641,11 @@ msgstr ""
 "Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
 "tanto requerido."
 
-#: include/functions_setup.inc:318
+#: include/functions_setup.inc:306
 msgid "Checking for mhash module"
 msgstr "Comprobando por el módulo de mhash"
 
-#: include/functions_setup.inc:319
+#: include/functions_setup.inc:307
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
@@ -11323,11 +15653,11 @@ msgstr ""
 "Necesitará este módulo para usar crifrado SSHA. Si usted solo usa crypt o "
 "md5, ignore este mensaje. GOsa correra si él."
 
-#: include/functions_setup.inc:322
+#: include/functions_setup.inc:310
 msgid "Checking for imap module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:323
+#: include/functions_setup.inc:311
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -11335,11 +15665,11 @@ msgstr ""
 "El módulo de IMAP es necesario para comunicarse con el servidor IMAP. "
 "Obtiene el estado, crea y borra usuarios del correo."
 
-#: include/functions_setup.inc:326
+#: include/functions_setup.inc:314
 msgid "Checking for getacl in imap"
 msgstr "Comprobando por getacl en imap"
 
-#: include/functions_setup.inc:327
+#: include/functions_setup.inc:315
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
@@ -11349,21 +15679,21 @@ msgstr ""
 "módulo IAMP estandar no es capaz de leer acls. Necesitará una versión "
 "reciente de PHP para obtener está caracteristica. "
 
-#: include/functions_setup.inc:330
+#: include/functions_setup.inc:318
 msgid "Checking for mysql module"
 msgstr "Comprobando el módulo de mysql"
 
-#: include/functions_setup.inc:331
+#: include/functions_setup.inc:319
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "El soporte de MySQL es necesario para leer los repotes de GOfax de la base "
 "de datos."
 
-#: include/functions_setup.inc:334
+#: include/functions_setup.inc:322
 msgid "Checking for cups module"
 msgstr "Comprobando el módulo de cups"
 
-#: include/functions_setup.inc:335
+#: include/functions_setup.inc:323
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -11371,11 +15701,11 @@ msgstr ""
 "Para poder leer las impresoras disponibles a través del protocolo IPP, en "
 "vez de los archivos printcap, tiene que tener instalado el módulo de CUPS."
 
-#: include/functions_setup.inc:338
+#: include/functions_setup.inc:326
 msgid "Checking for kadm5 module"
 msgstr "Comprobando el módulo kadm5"
 
-#: include/functions_setup.inc:339
+#: include/functions_setup.inc:327
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -11383,27 +15713,27 @@ msgstr ""
 "Manejando usuarios en kerberos requiere el módulo kadm5 que esta disponible "
 "en la red PEAR."
 
-#: include/functions_setup.inc:342
+#: include/functions_setup.inc:330
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:343
+#: include/functions_setup.inc:331
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:379
+#: include/functions_setup.inc:367
 #, fuzzy
 msgid "PHP detailed function inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.inc:383
+#: include/functions_setup.inc:371
 #, fuzzy, php-format
 msgid "Checking for function %s"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:384
+#: include/functions_setup.inc:372
 #, fuzzy, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
@@ -11413,15 +15743,15 @@ msgstr ""
 "Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
 "tanto requerido."
 
-#: include/functions_setup.inc:395
+#: include/functions_setup.inc:383
 msgid "Checking for some additional programms"
 msgstr "Comprobando programas adicionales"
 
-#: include/functions_setup.inc:404
+#: include/functions_setup.inc:392
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Comprobando por ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:393
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -11429,11 +15759,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:408
+#: include/functions_setup.inc:396
 msgid "Checking imagick module for PHP"
 msgstr "Comprobando el módulo PHP de imagick"
 
-#: include/functions_setup.inc:409
+#: include/functions_setup.inc:397
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
@@ -11441,11 +15771,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:416
+#: include/functions_setup.inc:404
 msgid "Checking for fping utility"
 msgstr "Comprobando la herramienta fping"
 
-#: include/functions_setup.inc:417
+#: include/functions_setup.inc:405
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -11453,11 +15783,11 @@ msgstr ""
 "La herramienta fping solo se usa si tiene un entorno de terminales clientes "
 "delgados (thinclient)."
 
-#: include/functions_setup.inc:432
+#: include/functions_setup.inc:420
 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:433
+#: include/functions_setup.inc:421
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -11465,11 +15795,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:446
+#: include/functions_setup.inc:434
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini comprobación -> session.auto_register"
 
-#: include/functions_setup.inc:447
+#: include/functions_setup.inc:435
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -11477,11 +15807,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:450
+#: include/functions_setup.inc:438
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini comprobación -> implicit_flush"
 
-#: include/functions_setup.inc:451
+#: include/functions_setup.inc:439
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -11489,11 +15819,11 @@ msgstr ""
 "Esta opción controla el manejador de salida. Desactive esta opción para "
 "mejorar el rendimiento."
 
-#: include/functions_setup.inc:458
+#: include/functions_setup.inc:446
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini comprobación -> max_execution_time"
 
-#: include/functions_setup.inc:459
+#: include/functions_setup.inc:447
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -11501,11 +15831,11 @@ msgstr ""
 "El tiempo máximo de ejecución debe ser de al menos 30 segundos, algunas "
 "acciones pueden consumir mucho tiempo."
 
-#: include/functions_setup.inc:466
+#: include/functions_setup.inc:454
 msgid "php.ini check -> memory_limit"
 msgstr "pnp.ini comprobación -> memory_limit"
 
-#: include/functions_setup.inc:467
+#: include/functions_setup.inc:455
 #, fuzzy
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
@@ -11515,11 +15845,11 @@ msgstr ""
 "impredecibles! Una cantidad recomendada es 16Mb, para sitios con grandes "
 "cargas seria aún mayor."
 
-#: include/functions_setup.inc:471
+#: include/functions_setup.inc:459
 msgid "php.ini check -> expose_php"
 msgstr "php.ini comprobación -> expose_php"
 
-#: include/functions_setup.inc:472
+#: include/functions_setup.inc:460
 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."
@@ -11528,11 +15858,11 @@ msgstr ""
 "debería enviar ninguna información sobre el servidor sobre el que está "
 "funcionando en ningún caso."
 
-#: include/functions_setup.inc:476
+#: include/functions_setup.inc:464
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini comprobación -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:465
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -11540,11 +15870,11 @@ msgstr ""
 "Aumenta la seguridad de su servidor poniendo 'magic_quotes_gpc' en 'on'. PHP "
 "escapara en este caso todas las comillas que encuentre en las cadenas."
 
-#: include/functions_setup.inc:722
+#: 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:731 include/functions_setup.inc:814
+#: include/functions_setup.inc:720 include/functions_setup.inc:803
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -11552,8 +15882,8 @@ msgstr ""
 "No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
 "este accesible para GOsa."
 
-#: include/functions_setup.inc:745 include/functions_setup.inc:819
-#: include/functions_setup.inc:824
+#: include/functions_setup.inc:734 include/functions_setup.inc:808
+#: include/functions_setup.inc:813
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -11561,7 +15891,7 @@ msgstr ""
 "¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
 "asegure que este accesible para GOsa."
 
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:823
 #, fuzzy
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
@@ -11570,7 +15900,7 @@ msgstr ""
 "Conexión al servidor correcta, pero el servidor aparenta estar completamente "
 "vacíos, por favor compruebe la información de nuevo."
 
-#: include/functions_setup.inc:890
+#: include/functions_setup.inc:879
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -11578,70 +15908,302 @@ msgid ""
 msgstr ""
 "Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
 
-#: include/functions_setup.inc:921
-msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Please "
-"verify that it is readable for GOsa"
+#: include/functions_setup.inc:910
+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
+#, 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:252
+#: 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/functions_helpviewer.inc:43
+#, fuzzy, php-format
+msgid "XML error in guide.xml: %s at line %d"
+msgstr "Error XML en 'gosa.conf': %s en la linea %d"
+
+#: include/functions_helpviewer.inc:84
+msgid "No help available for this plugin."
+msgstr ""
+
+#: include/functions_helpviewer.inc:93 html/helpviewer.php:192
+msgid "previous"
+msgstr ""
+
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
+#, fuzzy
+msgid "next"
+msgstr "texto"
+
+#: include/functions_helpviewer.inc:385
+#, php-format
+msgid "%s results for your search with the keyword %s"
+msgstr ""
+
+#: include/functions_helpviewer.inc:459
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr ""
+
+#: include/class_debconfTemplate.inc:260
+#, fuzzy
+msgid "This package has no debconf options."
+msgstr "Esta cuenta no tiene extensiones telefónicas"
+
+#: include/class_MultiSelectWindow.inc:398
+msgid ""
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:502
+msgid "Restore snapshopts of already deleted objects"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:503
+#, fuzzy
+msgid "Restore"
+msgstr "Reintentar"
+
+#: include/class_MultiSelectWindow.inc:521
+#: include/class_SnapShotDialog.inc:105
+msgid "Restore snapshot"
+msgstr ""
+
+#: include/class_MultiSelectWindow.inc:527
+#, fuzzy
+msgid "Create snapshot"
+msgstr "Crear cuenta de nagios"
+
+#: include/class_MultiSelectWindow.inc:527
+#, fuzzy
+msgid "Create a new snapshot from this object"
+msgstr "Crear nuevo objeto FAI."
+
+#: 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/functions_dns.inc:363
+#, php-format
+msgid ""
+"Found more than one dns zone which contains an entry named '%s'. Aborting "
+"getting dns informations for this device."
+msgstr ""
+
+#: include/class_CopyPasteHandler.inc:152
+#, fuzzy, php-format
+msgid "You are going to copy the entry '%s'."
+msgstr "Has decidido eliminar la entrada %s"
+
+#: include/class_CopyPasteHandler.inc:216
+#, fuzzy
+msgid "Paste"
+msgstr "Fecha"
+
+#: include/class_CopyPasteHandler.inc:218
+#, fuzzy
+msgid "Can't paste"
+msgstr "Crear cuenta telefónica"
+
+#: include/functions_FAI.inc:362
+#, php-format
+msgid "Error, following objects should be equal '%s' and '%s'"
+msgstr ""
+
+#: include/functions_FAI.inc:468
+#, php-format
+msgid "Release management failed, can't save '%s'"
+msgstr ""
+
+#: include/class_acl.inc:6
+#, fuzzy
+msgid "Access control"
+msgstr "Opciones de acceso"
+
+#: include/class_acl.inc:145
+#, fuzzy
+msgid "All categories"
+msgstr "Añadir categoría"
+
+#: include/class_acl.inc:153
+msgid "Reset ACLs"
+msgstr ""
+
+#: include/class_acl.inc:154
+#, fuzzy
+msgid "One level"
+msgstr "Nivel de log"
+
+#: include/class_acl.inc:155 include/class_acl.inc:160
+#, fuzzy
+msgid "Current object"
+msgstr "Crear nuevo objeto FAI."
+
+#: include/class_acl.inc:156
+msgid "Complete subtree"
+msgstr ""
+
+#: include/class_acl.inc:157
+msgid "Complete subtree (permanent)"
+msgstr ""
+
+#: include/class_acl.inc:161
+msgid "Use ACL defined in role"
+msgstr ""
+
+#: include/class_acl.inc:364
+#, fuzzy
+msgid "Edit ACL"
+msgstr "Editar"
+
+#: include/class_acl.inc:365
+#, fuzzy
+msgid "Delete ACL"
+msgstr "Borrar"
+
+#: include/class_acl.inc:402
+msgid "No ACL settings for this category"
+msgstr ""
+
+#: include/class_acl.inc:404
+#, php-format
+msgid "Contains ACLs for these objects: %s"
+msgstr ""
+
+#: include/class_acl.inc:409
+#, fuzzy
+msgid "Edit categories ACLs"
+msgstr "Editar clase"
+
+#: include/class_acl.inc:410
+msgid "Clear categories ACLs"
 msgstr ""
 
-#: include/functions_setup.inc:930
+#: include/class_acl.inc:449
 #, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
-msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
+msgid "Edit ACL for '%s', scope is '%s'"
+msgstr ""
 
-#: include/functions_setup.inc:1040 include/functions_setup.inc:1063
-#: include/functions_setup.inc:1072 html/index.php:178
-#: 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!"
+#: include/class_acl.inc:459
+msgid "All objects in current subtree"
 msgstr ""
-"No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
 
-#: include/functions_helpviewer.inc:43
-#, fuzzy, php-format
-msgid "XML error in guide.xml: %s at line %d"
-msgstr "Error XML en 'gosa.conf': %s en la linea %d"
+#: include/class_acl.inc:492 include/class_acl.inc:494
+#, fuzzy
+msgid "Show/Hide Advanced Settings"
+msgstr "Configuración telefónica avanzada"
 
-#: include/functions_helpviewer.inc:86
-msgid "No help available for this plugin."
-msgstr ""
+#: include/class_acl.inc:505
+#, fuzzy
+msgid "Create objects"
+msgstr "Crear nuevo objeto FAI."
 
-#: include/functions_helpviewer.inc:95
-msgid "previous"
+#: include/class_acl.inc:506
+#, fuzzy
+msgid "Move objects"
+msgstr "Objetos miembro"
+
+#: include/class_acl.inc:507
+#, fuzzy
+msgid "Remove objects"
+msgstr "Objetos miembro"
+
+#: include/class_acl.inc:509 include/class_acl.inc:515
+msgid "Modifyable by owner"
 msgstr ""
 
-#: include/functions_helpviewer.inc:99
+#: include/class_acl.inc:512
 #, fuzzy
-msgid "next"
-msgstr "texto"
+msgid "Move object"
+msgstr "Objetos miembro"
+
+#: include/class_acl.inc:513
+#, fuzzy
+msgid "Remove object"
+msgstr "Objetos miembro"
 
-#: include/functions_helpviewer.inc:387
+#: include/class_acl.inc:625
 #, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+msgid "Unkown ACL type '%s'. Don't know how to handle it."
 msgstr ""
 
-#: include/functions_helpviewer.inc:462
+#: include/class_acl.inc:665
+#, fuzzy, php-format
+msgid "Unknown entry '%s'!"
+msgstr "estado desconocido"
+
+#: include/class_acl.inc:726
 #, php-format
-msgid "%s%% hit rate in file %s"
+msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_debconfTemplate.inc:251
+#: include/class_acl.inc:734
 #, fuzzy
-msgid "This package has no debconf options."
-msgstr "Esta cuenta no tiene extensiones telefónicas"
+msgid "Members:"
+msgstr "Objetos miembro"
+
+#: include/class_acl.inc:740
+msgid "ACL is valid for all users"
+msgstr ""
+
+#: include/class_acl.inc:848
+#, fuzzy, php-format
+msgid "Saving ACLs with dn '%s' failed."
+msgstr "Ha fallado la grabación del script FAI"
+
+#: include/class_SnapShotDialog.inc:47
+#, fuzzy, php-format
+msgid "You're about to delete the snapshot '%s'."
+msgstr "Está a punto de borrar la macro '%s'."
+
+#: include/class_SnapShotDialog.inc:107
+#, fuzzy
+msgid "Remove snapshot"
+msgstr "Crear cuenta de nagios"
+
+#: include/class_SnapShotDialog.inc:109 include/class_SnapShotDialog.inc:129
+msgid "Y-m-d, H:i:s"
+msgstr ""
+
+#: include/class_SnapShotDialog.inc:141
+#, fuzzy
+msgid "Please specify a valid description for this snapshot."
+msgstr "Por favor especifique un nombre de adjunto valido."
 
 #: 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/helpviewer.php:116
+#: html/helpviewer.php:67
+msgid "Help browser"
+msgstr ""
+
+#: html/helpviewer.php:118
 #, fuzzy
-msgid "There is no helpfile specified for this class."
+msgid "There is no helpfile specified for this class"
 msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
 
-#: html/helpviewer.php:226
+#: html/helpviewer.php:265
 #, php-format
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
@@ -11667,25 +16229,31 @@ msgstr ""
 "El directorio '%s' especificado como directorio de compilación para smarty  "
 "no es accesible, ¡compruebe la existencia y los permisos de este directorio!"
 
-#: html/main.php:149
+#: html/main.php:165
+#, fuzzy
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"FATAL: Register globals is on. GOsa will refuse to login unless this is "
+"fixed by an administrator."
 msgstr ""
 "'Register globals' está activado. No se permitirá ninguna entrada hasta que "
 "esto sea solucionado por un administrador."
 
-#: html/main.php:192
+#: html/main.php:207
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 "Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
 
-#: html/main.php:325
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
+#: html/main.php:342
+#, fuzzy, php-format
+msgid "FATAL: Can't find any plugin definitions for plugin '%s'!"
 msgstr "No se pudo encontrar ninguna definición de extensión para '%s'"
 
-#: html/main.php:347
+#: html/main.php:357
+#, fuzzy
+msgid "Your password is about to expire, please change your password"
+msgstr "No tiene permisos para cambiar su contraseña."
+
+#: html/main.php:381
 #, fuzzy
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
@@ -11704,50 +16272,63 @@ msgstr ""
 msgid "Can't read file '%s', check permissions."
 msgstr "Borrar"
 
-#: html/index.php:49
+#: html/index.php:49 html/index.php:339
+msgid "Session will not be encrypted."
+msgstr "La sesion no sera encriptada."
+
+#: html/index.php:49 html/index.php:339
+msgid "Enter SSL session"
+msgstr "Entrar en sesión SSL"
+
+#: html/index.php:121
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 "No se puede leer la configuración de GOsa (%s/gosa.conf). Se ha abortado la "
 "operación."
 
-#: html/index.php:71
-#, php-format
-msgid "Directory '%s' specified as compile directory is not accessable!"
+#: html/index.php:142
+#, fuzzy, php-format
+msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "El directorio '%s' especificado como directorio de compilación no es "
 "accesible."
 
-#: html/index.php:151
+#: html/index.php:223
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:159
+#: html/index.php:232
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:186
+#: html/index.php:260
 msgid "Please specify a valid username!"
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: html/index.php:188
+#: html/index.php:262
 msgid "Please specify your password!"
 msgstr "Por favor especifique su contraseña."
 
-#: html/index.php:195
+#: html/index.php:269
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/index.php:233 html/index.php:293
-msgid "Session will not be encrypted."
-msgstr "La sesion no sera encriptada."
+#: html/index.php:293
+#, fuzzy
+msgid "Account locked. Please contact your system administrator."
+msgstr ""
+"NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
+"sistemas."
 
-#: html/index.php:233 html/index.php:293
-msgid "Enter SSL session"
-msgstr "Entrar en sesión SSL"
+#: html/index.php:345
+msgid ""
+"Your browser has cookies disabled. Please enable cookies and reload this "
+"page before logging in!"
+msgstr ""
 
 #: html/getxls.php:65
 msgid "Birthday"
@@ -11764,7 +16345,7 @@ msgstr "Nombre del servidor"
 msgid "User list of %s on %s"
 msgstr "Lista de usuarios"
 
-#: html/getxls.php:94 html/getxls.php:227
+#: html/getxls.php:94 html/getxls.php:227 ihtml/themes/default/acl.tpl:41
 #, fuzzy
 msgid "Members"
 msgstr "Objetos miembro"
@@ -11785,25 +16366,21 @@ msgstr "incompleto"
 msgid "Common name"
 msgstr "Nombre de la localización"
 
+#: html/getxls.php:149 html/getxls.php:151 html/getxls.php:158
+#: html/getxls.php:179 html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr "Servidores"
+
 #: html/getxls.php:156 html/getxls.php:314
 #, fuzzy, php-format
 msgid "Servers of %s on %s"
 msgstr "Servidores"
 
-#: html/getxls.php:174
-msgid "Home postal address"
-msgstr ""
-
 #: html/getxls.php:174
 #, fuzzy
 msgid "Mobile phone"
 msgstr "Teléfono particular"
 
-#: html/getxls.php:174 html/getxls.php:236
-#, fuzzy
-msgid "Postal address"
-msgstr "Código Postal"
-
 #: html/getxls.php:174
 #, fuzzy
 msgid "Function"
@@ -11844,11 +16421,6 @@ msgstr "De organización"
 msgid "Postal Code"
 msgstr "Código Postal"
 
-#: html/getxls.php:236
-#, fuzzy
-msgid "Surename"
-msgstr "Nombre del servidor"
-
 #: html/getxls.php:236
 #, fuzzy
 msgid "Title"
@@ -11894,7 +16466,7 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "Borrar"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/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 "
@@ -11904,19 +16476,18 @@ 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 busqueda a valores pequeños y usar filtros para encontrar las entradas "
+"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
+#: 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
+#: 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 "
@@ -11925,41 +16496,42 @@ 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:15
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
+#: 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:44 ihtml/themes/default/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:55
+#: ihtml/themes/default/login.tpl:57
 msgid "Sign in"
 msgstr "Entrando"
 
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/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
+#: 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/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 <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 "
 "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/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
+#: ihtml/themes/default/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
@@ -11967,22 +16539,22 @@ msgstr ""
 "Ignorando este mensaje cambiara/borrara los datos que esta actualmente "
 "editando. Por favor, cierre las ventanas múltiples y vuelva a entrar."
 
-#: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
+#: ihtml/themes/default/conflict.tpl:14
 msgid "Logout"
 msgstr "Salir"
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr "Bienvenido a la configuración de GOsa"
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: ihtml/themes/default/setup_introduction.tpl:4
+#, fuzzy
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
 "found. This setup like script will try to aid you in creating a working "
 "configuration by performing three major steps: first we'll check the PHP "
 "installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
+"needed programms and after you've provided basic information for your LDAP "
 "connectivity, we're going to check your LDAP setup."
 msgstr ""
 "Parece que esta ejecutando GOsa por primera vez - no se encontró la "
@@ -11992,85 +16564,71 @@ msgstr ""
 "programas opcionales y, luego de ingresar la información necesaria para "
 "conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
 
-#: ihtml/themes/altlinux/framework.tpl:15
+#: ihtml/themes/default/setup_introduction.tpl:17
+msgid ""
+"You can also use the new and more-advanced way of inspecting your PHP-"
+"installation. It will give you information about the exact function that "
+"could not be found (functions that could be found are not mentioned). This "
+"is useful if you know what you're doing."
+msgstr ""
+
+#: ihtml/themes/default/setup_introduction.tpl:19
+msgid "Toggle Show/Hide"
+msgstr ""
+
+#: ihtml/themes/default/setup_useradmin.tpl:3
+msgid "You already have an Administrative Account and a Group."
+msgstr "Ya tiene una cuenta y un grupo administrativo."
+
+#: ihtml/themes/default/setup_useradmin.tpl:10
+msgid ""
+"To provide full administrative access to GOsa, you need to create a special "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+"Para proveer de acceso administrativo total a GOsa, se necesita crear un "
+"grupo especial que contendrá los usuarios administrativos. Este programa de "
+"configuración puede ayudarle en esta tarea. Introduzca el nombre y "
+"contraseñas deseadas para crear las entradas necesarias."
+
 #: ihtml/themes/default/framework.tpl:15
 msgid "Main"
 msgstr "Inicio"
 
-#: ihtml/themes/altlinux/framework.tpl:20
 #: ihtml/themes/default/framework.tpl:20
 msgid "Help"
 msgstr "Ayuda"
 
-#: ihtml/themes/altlinux/framework.tpl:25
 #: ihtml/themes/default/framework.tpl:25
 msgid "Sign out"
 msgstr "Salir"
 
-#: ihtml/themes/altlinux/framework.tpl:33
 #: ihtml/themes/default/framework.tpl:33
 msgid "Signed in:"
 msgstr "Entrando"
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+#: ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr "Detectado conflicto de Bloqueos"
 
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
+#: 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 delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
+"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, la otra persona cerro su navegador "
 "mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
 "pulsando en el botón <i>Eliminar</i>."
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
 msgid "Setup continued..."
 msgstr "La instalación continua"
 
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
-msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
-msgstr ""
-"El paso dos busca por una colección de programas/herramientas de soporte y "
-"comprueba si tienen al menos la mínima versión necesaria."
-
-#: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4
-msgid ""
-"Now we're going include your LDAP server and create an initial "
-"configuration. After you've entered the server URI below, a quick check is "
-"performed if required LDAP schemas are in place. Samba versions are "
-"autodetected by the installed objectclasses. Details on how your LDAP tree "
-"is organized will be asked later on."
-msgstr ""
-"Vamos a incluir el servidor LDAP y crear una configuración inicial. Una vez "
-"que usted ingrese el URI del servidor, se realizara una pequeña comprobación "
-"para comprobar que los esquemas de LDAP requeridos están correctamente "
-"instalados. La versión de samba es detectada a través de los \"objectclass\" "
-"instalados. Los detalles sobre como el árbol LDAP está organizado serán "
-"preguntados más adelante."
-
-#: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10
-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>"
-
-#: ihtml/themes/altlinux/setup_step4.tpl:2
 #: ihtml/themes/default/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
@@ -12079,17 +16637,14 @@ msgstr ""
 "Los campos siguientes permiten la configuración básica del control de GOsa y "
 "afectara a varios parámetros de su configuración principal."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:7
 #: ihtml/themes/default/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr "Ingrese una descripción para la ubicación que está configurando"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:11
 #: ihtml/themes/default/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Nombre de la localización"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:18
 #: ihtml/themes/default/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
@@ -12102,17 +16657,10 @@ msgstr ""
 "que esto funcione, necesitamos el DN del administrador y la contraseña "
 "correspondiente."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:23
 #: ihtml/themes/default/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "DN del administrador"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27
-msgid "Admin password"
-msgstr "Nueva contraseña"
-
-#: ihtml/themes/altlinux/setup_step4.tpl:34
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -12124,33 +16672,27 @@ msgstr ""
 "incluyendo la manera en que las cuentas son creadas. Compruebe los valores a "
 "continuación si se ajustan a sus necesidades."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:39
 #: ihtml/themes/default/setup_step4.tpl:39
 #, fuzzy
 msgid "Base "
 msgstr "Base"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:43
 #: ihtml/themes/default/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "Carpeta de almacenamiento - ou - para los usuarios"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:47
 #: ihtml/themes/default/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:55
 #: ihtml/themes/default/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "Carpeta de almacenamiento - ou - para los grupos"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:59
 #: ihtml/themes/default/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "Identificador base - ID -, para usuarios y grupos"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:67
 #: ihtml/themes/default/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
@@ -12161,12 +16703,10 @@ msgstr ""
 "Normalmente esto es ajustable a través de las plantillas de usuario, pero "
 "usted puede especificar un método para ser usado por defecto."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:72
 #: ihtml/themes/default/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr "Algoritmo de encriptación"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:83
 #: ihtml/themes/default/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
@@ -12178,144 +16718,67 @@ msgstr ""
 "general de cuotas. Puede elegir el método 'dummy' para dejar su "
 "configuración de correo limpia."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:88
 #: ihtml/themes/default/setup_step4.tpl:88
 msgid "Mail method"
 msgstr "Método de correo"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:99
+#: 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. "
-"(But it  could be a security risk)  "
+"versions. In some cases it would be helpful to enable the error reporting."
 msgstr ""
 
-#: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
 #, fuzzy
 msgid "Display PHP errors"
 msgstr "Error PHP:"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
 #, fuzzy
 msgid "true"
 msgstr "Futuro"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
 #, fuzzy
 msgid "false"
 msgstr "mujer"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
 msgid "Check"
 msgstr "Comprobación"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1
-msgid "Setup finished"
-msgstr "Configuración finalizada"
-
-#: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3
-msgid ""
-"Basically the setup is finished. You can check the result of the schema "
-"check here and download the autogenerated gosa.conf below."
-msgstr ""
-"Básicamente la configuración ha terminado. Puede comprobar los resultados de "
-"este esquema aquí y descargar el gosa.conf generado automáticamente."
-
-#: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7
-msgid "Schema Configuration"
-msgstr "Configuración de esquemas"
-
-#: ihtml/themes/altlinux/setup_finish.tpl:12
-#: ihtml/themes/default/setup_finish.tpl:12
-msgid "Configuration File"
-msgstr "Fichero de configuración"
-
-#: ihtml/themes/altlinux/setup_finish.tpl:14
-#: ihtml/themes/default/setup_finish.tpl:14
-msgid ""
-"GOsa setup has collected all data needed to create an initial configuration "
-"file. Save the the link below as your gosa.conf and place that file in /etc/"
-"gosa. Change it as needed."
-msgstr ""
-"La configuración de GOsa ha recogido toda la información necesaria para "
-"crear una configuración inicial. Guarde esta configuración como gosa.conf en "
-"'/etc/gosa/'. Modifíquela tanto como sea necesario"
-
-#: ihtml/themes/altlinux/setup_finish.tpl:17
-#: ihtml/themes/default/setup_finish.tpl:17
-msgid "Download configuration"
-msgstr "Descargar configuración"
-
-#: ihtml/themes/altlinux/setup_finish.tpl:20
-#: ihtml/themes/default/setup_finish.tpl:20
-msgid ""
-"After placing the file under /etc/gosa, place make sure that the webserver "
-"user is able to read gosa.conf, while other users shouldn't. You may want to "
-"execute these commands to achieve this requirement:"
-msgstr ""
-"Después de colocar el archivo en /etc/gosa, asegúrese que el usuario del "
-"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/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr "Ya tiene una cuenta y un grupo administrativo."
-
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
-msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
-msgstr ""
-"Para proveer de acceso administrativo total a GOsa, se necesita crear un "
-"grupo especial que contendrá los usuarios administrativos. Este programa de "
-"configuración puede ayudarle en esta tarea. Introduzca el nombre y "
-"contraseñas deseadas para crear las entradas necesarias."
-
-#: ihtml/themes/default/setup_introduction.tpl:4
-#, fuzzy
+#: ihtml/themes/default/setup_step2.tpl:4
 msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic information for your LDAP "
-"connectivity, we're going to check your LDAP setup."
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
 msgstr ""
-"Parece que esta ejecutando GOsa por primera vez - no se encontró la "
-"configuración. Los siguientes pasos tratarán de asistirlo en crear una "
-"configuración funcional, efectuando las siguientes tareas: comprobar la "
-"instalación de PHP y de los módulos necesarios, luego comprobar los "
-"programas opcionales y, luego de ingresar la información necesaria para "
-"conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
+"El paso dos busca por una colección de programas/herramientas de soporte y "
+"comprueba si tienen al menos la mínima versión necesaria."
 
-#: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
-"You can also use the new and more-advanced way of inspecting your PHP-"
-"installation. It will give you information about the exact function that "
-"could not be found (functions that could be found are not mentioned). This "
-"is useful if you know what you're doing."
-msgstr ""
-
-#: ihtml/themes/default/setup_introduction.tpl:19
-msgid "Toggle Show/Hide"
+"Now we're going include your LDAP server and create an initial "
+"configuration. After you've entered the server URI below, a quick check is "
+"performed if required LDAP schemas are in place. Samba versions are "
+"autodetected by the installed objectclasses. Details on how your LDAP tree "
+"is organized will be asked later on."
 msgstr ""
+"Vamos a incluir el servidor LDAP y crear una configuración inicial. Una vez "
+"que usted ingrese el URI del servidor, se realizara una pequeña comprobación "
+"para comprobar que los esquemas de LDAP requeridos están correctamente "
+"instalados. La versión de samba es detectada a través de los \"objectclass\" "
+"instalados. Los detalles sobre como el árbol LDAP está organizado serán "
+"preguntados más adelante."
 
-#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/default/setup_step3.tpl:10
+#, fuzzy
 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."
+"Please enter the server URI to allow the setup to connect your LDAP server "
+"(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."
+"servidor:389).</i>"
 
 #: ihtml/themes/default/help.tpl:9
 msgid "GOsa help viewer"
@@ -12341,744 +16804,490 @@ msgstr ""
 msgid "Sign in again"
 msgstr "Entrando"
 
-#, fuzzy
-#~ msgid "The required field 'MAC-address' is not set."
-#~ msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
-
-#, fuzzy
-#~ msgid "The required field 'IP-address' is not set."
-#~ msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
-
-#, fuzzy
-#~ msgid "close"
-#~ msgstr "Elige"
-
-#, fuzzy
-#~ msgid "Current base"
-#~ msgstr "Contraseña actual"
-
-#, fuzzy
-#~ msgid "mailto"
-#~ msgstr "Correo Electrónico"
-
-#, fuzzy
-#~ msgid "New other peripherals"
-#~ msgstr "Impresora de Red"
-
-#, fuzzy
-#~ msgid "Can't connect to specified database."
-#~ msgstr "No puedo conectar al servidor de base de datos postgresql."
-
-#, fuzzy
-#~ msgid "Coments"
-#~ msgstr "Contacto"
-
-#, fuzzy
-#~ msgid "Invalid characters in uid."
-#~ msgstr "El campo 'Nombre' contiene caracteres no validos."
-
-#, fuzzy
-#~ msgid "Append new class names"
-#~ msgstr "Aplicaciones disponibles"
-
-#, fuzzy
-#~ msgid "Master"
-#~ msgstr "Fecha"
-
-#, fuzzy
-#~ msgid "Repositories"
-#~ msgstr "Reintentar"
-
-#, fuzzy
-#~ msgid "Search filter"
-#~ msgstr "Buscar por"
-
-#, fuzzy
-#~ msgid "There is no useable package list defined."
-#~ msgstr "No se ha subido ningún archivo."
-
-#, fuzzy
-#~ msgid ""
-#~ "There is no value for 'KDE_APPLICATIONS_MENU' specified in your gosa.conf."
-#~ msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
-
-#, fuzzy
-#~ msgid "XML error in %s : %s at line %d"
-#~ msgstr "Error XML en 'gosa.conf': %s en la linea %d"
-
-#, fuzzy
-#~ msgid ""
-#~ "Can't connect to fax database, no reports can be shown!. Check username, "
-#~ "password and server settings."
-#~ msgstr ""
-#~ "No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
-#~ "informes!"
-
-#, fuzzy
-#~ msgid "No mysql extension loaded, can't connect to mysql server."
-#~ msgstr "Elija el método de conexión con el servidor de terminal"
+#: ihtml/themes/default/setup_finish.tpl:1
+msgid "Setup finished"
+msgstr "Configuración finalizada"
 
-#, fuzzy
-#~ msgid "Account expiry"
-#~ msgstr "La cuenta expirará después de"
+#: ihtml/themes/default/setup_finish.tpl:3
+msgid ""
+"Basically the setup is finished. You can check the result of the schema "
+"check here and download the autogenerated gosa.conf below."
+msgstr ""
+"Básicamente la configuración ha terminado. Puede comprobar los resultados de "
+"este esquema aquí y descargar el gosa.conf generado automáticamente."
 
-#, fuzzy
-#~ msgid "Can change password"
-#~ msgstr "Cambiar contraseña"
+#: ihtml/themes/default/setup_finish.tpl:7
+msgid "Schema Configuration"
+msgstr "Configuración de esquemas"
 
-#, fuzzy
-#~ msgid "Password expiry"
-#~ msgstr "La contraseña expira en"
+#: ihtml/themes/default/setup_finish.tpl:12
+msgid "Configuration File"
+msgstr "Fichero de configuración"
 
-#, fuzzy
-#~ msgid "Home path"
-#~ msgstr "Teléfono particular"
+#: ihtml/themes/default/setup_finish.tpl:14
+msgid ""
+"GOsa setup has collected all data needed to create an initial configuration "
+"file. Save the the link below as your gosa.conf and place that file in /etc/"
+"gosa. Change it as needed."
+msgstr ""
+"La configuración de GOsa ha recogido toda la información necesaria para "
+"crear una configuración inicial. Guarde esta configuración como gosa.conf en "
+"'/etc/gosa/'. Modifíquela tanto como sea necesario"
 
-#, fuzzy
-#~ msgid "Home drive"
-#~ msgstr "Servidor"
+#: ihtml/themes/default/setup_finish.tpl:17
+msgid "Download configuration"
+msgstr "Descargar configuración"
 
-#, fuzzy
-#~ msgid "Samba domain name"
-#~ msgstr "Directorio Samba"
+#: ihtml/themes/default/setup_finish.tpl:20
+msgid ""
+"After placing the file under /etc/gosa, place make sure that the webserver "
+"user is able to read gosa.conf, while other users shouldn't. You may want to "
+"execute these commands to achieve this requirement:"
+msgstr ""
+"Después de colocar el archivo en /etc/gosa, asegúrese que el usuario del "
+"servidor web pueda leer gosa.conf y que los otros no deberían poder leerlo. "
+"Para cumplir con este requerimiento puede ejecutar estos comandos:"
 
-#, fuzzy
-#~ msgid "Allow password change"
-#~ msgstr "Nueva contraseña"
+#: ihtml/themes/default/acl.tpl:2
+msgid "Assigned ACLs for current entry"
+msgstr ""
 
+#: ihtml/themes/default/acl.tpl:4
 #, fuzzy
-#~ msgid "Lock account"
-#~ msgstr "Bloquear cuenta samba"
+msgid "New ACL"
+msgstr "Nuevo"
 
+#: ihtml/themes/default/acl.tpl:8
 #, fuzzy
-#~ msgid ""
-#~ "Can't connect to phone database, no reports can be shown!. Check server,"
-#~ "username and password combination."
-#~ msgstr ""
-#~ "No puedo conectar a la base de datos telefónica, ¡No se pueden mostrar "
-#~ "informes!"
+msgid "ACL type"
+msgstr "Tipo"
 
+#: ihtml/themes/default/acl.tpl:8
 #, fuzzy
-#~ msgid "Can't select phone (gophone) database for report generation!"
-#~ msgstr ""
-#~ "¡No puedo seleccionar la base de datos telefónica para la generación de "
-#~ "informes!"
+msgid "Select an acl type"
+msgstr "Seleccione una base"
 
-#, fuzzy
-#~ msgid "Enter         SSL         session"
-#~ msgstr "Entrar en sesión SSL"
+#: ihtml/themes/default/acl.tpl:15
+msgid "Use members from"
+msgstr ""
 
-#, fuzzy
-#~ msgid "First Name"
-#~ msgstr "Nombre de la lista"
+#: ihtml/themes/default/acl.tpl:29
+msgid "Available members"
+msgstr ""
 
+#: ihtml/themes/default/acl.tpl:55
 #, fuzzy
-#~ msgid "Given Name"
-#~ msgstr "Nombre"
+msgid "List of available ACL categories"
+msgstr "Lista de paquetes disponibles"
 
-#, fuzzy
-#~ msgid "Server Name"
-#~ msgstr "Nombre del servidor"
+#: ihtml/themes/default/acl.tpl:63
+msgid "ACLs for this object"
+msgstr ""
 
-#, fuzzy
-#~ msgid "Display Name"
-#~ msgstr "Nombre mostrado"
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
+msgstr ""
 
-#, fuzzy
-#~ msgid "BirthDate"
-#~ msgstr "Fecha"
+#: 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
 #, fuzzy
-#~ msgid "DisplayName"
-#~ msgstr "Nombre mostrado"
+msgid "Operation complete"
+msgstr "incompleto"
 
-#, fuzzy
-#~ msgid "Phone Number"
-#~ msgstr "Números de teléfonos"
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
+msgstr ""
 
+#: ihtml/themes/default/accountexpired.tpl:23
+#: ihtml/themes/default/accountexpired.tpl:27
 #, fuzzy
-#~ msgid "Postal Adress"
-#~ msgstr "Código Postal"
+msgid "Old Password"
+msgstr "Contraseña"
 
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
 #, fuzzy
-#~ msgid "mobile"
-#~ msgstr "Teléfono Móvil"
+msgid "New Password"
+msgstr "Nueva contraseña"
 
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
 #, fuzzy
-#~ msgid "Postal Address"
-#~ msgstr "Código Postal"
+msgid "Verify Password"
+msgstr "Contraseña"
 
+#: ihtml/themes/default/accountexpired.tpl:51
 #, fuzzy
-#~ msgid "st"
-#~ msgstr "Borrar"
-
-#~ msgid "Edit parameters"
-#~ msgstr "Editar parametros"
-
-#~ msgid "Edit optional application parameters"
-#~ msgstr "Editar parámetros de aplicaciones opcionales"
+msgid "Change Password"
+msgstr "Cambiar contraseña"
 
+#: ihtml/themes/default/accountexpired.tpl:52
 #, fuzzy
-#~ msgid "Adress"
-#~ msgstr "Dirección"
-
-#~ msgid "Display workstations matching"
-#~ msgstr "Mostrar estaciones de trabajo que concuerden con"
+msgid "Click here to Change your password"
+msgstr "No tiene permisos para cambiar su contraseña."
 
+#: ihtml/themes/default/snapshotdialog.tpl:3
 #, fuzzy
-#~ msgid ""
-#~ "This menu allows you to create, edit and delete selected printers. Having "
-#~ "a great number of printers, you may want to use the range selectors on "
-#~ "top of the printers list."
-#~ msgstr ""
-#~ "Este menú provee la funcionalidad de crear, editar o borrar los usuarios "
-#~ "seleccionados. Si tiene un gran numero de usuarios usted preferirá usar "
-#~ "los selectores de rangos en la parte superior del listado."
+msgid "Restoring object snapshots"
+msgstr "Crear nuevo objeto grupo"
 
-#, fuzzy
-#~ msgid "Specific Phone settings"
-#~ msgstr "Configuración telefónica"
+#: ihtml/themes/default/snapshotdialog.tpl:6
+msgid ""
+"This procedure will restore a snapshot of the selected object. It will "
+"replace the existing object after pressing the restore button."
+msgstr ""
 
-#, fuzzy
-#~ msgid ""
-#~ "This menu allows you to select one or multiple entries to be added to the "
-#~ "printer object for specific tasks. Having a great number of entries, you "
-#~ "may want to use the range selectors below."
-#~ msgstr ""
-#~ "Este menú provee la funcionalidad de crear, editar o borrar los usuarios "
-#~ "seleccionados. Si tiene un gran numero de usuarios usted preferirá usar "
-#~ "los selectores de rangos en la parte superior del listado."
+#: ihtml/themes/default/snapshotdialog.tpl:23
+msgid "There is no snapshot available that could be restored"
+msgstr ""
 
-#, fuzzy
-#~ msgid "all"
-#~ msgstr "Todo"
+#: ihtml/themes/default/snapshotdialog.tpl:25
+msgid "Choose a snapshot and click the folder image, to restore the snapshot"
+msgstr ""
 
+#: ihtml/themes/default/snapshotdialog.tpl:44
 #, fuzzy
-#~ msgid "day ago"
-#~ msgstr "día"
+msgid "Creating object snapshots"
+msgstr "Crear nuevo objeto grupo"
 
-#, fuzzy
-#~ msgid "days ago"
-#~ msgstr "días"
+#: ihtml/themes/default/snapshotdialog.tpl:47
+msgid ""
+"This procedure will create a snapshot of the selected object. It will be "
+"stored inside a special branch of your directory system and can be restored "
+"later on."
+msgstr ""
 
+#: ihtml/themes/default/snapshotdialog.tpl:62
 #, fuzzy
-#~ msgid "Select time periode"
-#~ msgstr "Seleccionar modo de terminal"
+msgid "Timestamp"
+msgstr "Tiempo de espera"
 
-#, fuzzy
-#~ msgid "PPTP Server account"
-#~ msgstr "Cuenta FTP"
+#: ihtml/themes/default/snapshotdialog.tpl:71
+msgid "Reason for generating this snapshot"
+msgstr ""
 
 #, fuzzy
-#~ msgid "PPTP Server"
-#~ msgstr "Servidor NTP"
+#~ msgid "phpgwAccountExpires"
+#~ msgstr "La cuenta expirará después de"
 
 #, fuzzy
-#~ msgid "GLPI Account"
+#~ msgid "phpgwAccountType"
 #~ msgstr "Cuenta"
 
-#, fuzzy
-#~ msgid "Needed parameters to openexchange connectivity plugin are missing!"
-#~ msgstr ""
-#~ "¡Los parámetros necesarios para extensión de conectividad open-xchange no "
-#~ "son validos!"
-
-#, fuzzy
-#~ msgid "XLS export"
-#~ msgstr "Importar desde CSV"
-
-#, fuzzy
-#~ msgid "You've no permission to do XLS exports."
-#~ msgstr "No tiene permisos para hacer exportaciones LDAP."
-
-#~ msgid "This 'dn' has no account extensions."
-#~ msgstr "Este 'dn' no tiene extensiones de cuenta."
-
-#~ msgid "This is an empty plugin."
-#~ msgstr "Esta es un extensión vacía."
-
-#, fuzzy
-#~ msgid "email"
-#~ msgstr "Correo Electrónico"
-
-#, fuzzy
-#~ msgid "pager"
-#~ msgstr "Dispositivo de aviso"
-
-#, fuzzy
-#~ msgid "Nagios Auth"
-#~ msgstr "Contacto"
-
-#, fuzzy
-#~ msgid "authorized_for_system_information"
-#~ msgstr "Información de sistema"
-
-#~ msgid "organizations user database"
-#~ msgstr "bases de datos de organizaciones de usuarios"
-
-#~ msgid ""
-#~ "To change the terminal root password use the fields below. The changes "
-#~ "take effect during next reboot. Please memorize the new password, because "
-#~ "the you would't be able to log in. <b>Leave fields blank for password "
-#~ "inheritance from default entries.</b>"
-#~ msgstr ""
-#~ "Para cambiarla clave de administrador ('root') del terminal use los "
-#~ "campos mas abajo. Los cambios tendrán efecto durante el próximo inicio. "
-#~ "Por favor memorice la nueva clave, ya que deberá iniciar sesion. <b> "
-#~ "Dejando los campos en blanco se pondrán los valores por defecto.</b>"
+#~ msgid "Value specified as 'Ratio' is not valid."
+#~ msgstr "El valor especificado como 'relación' no es válido"
 
 #, fuzzy
-#~ msgid "Checking for function <b>%s</b>"
-#~ msgstr "Comprobando el soporte de iconv"
+#~ msgid "mailEnabled"
+#~ msgstr "desactivado"
 
 #, fuzzy
-#~ msgid "Members:"
-#~ msgstr "Objetos miembro"
+#~ msgid "Connectivity  account"
+#~ msgstr "Conectividad"
 
 #, fuzzy
-#~ msgid "Initiales"
-#~ msgstr "Iniciales"
+#~ msgid "GOsa intranet account"
+#~ msgstr "Crear cuenta de intranet"
 
 #, fuzzy
-#~ msgid "Upload new PPD file"
-#~ msgstr "Archivos Subidos / Descargados"
+#~ msgid "Open groupware account"
+#~ msgstr "Cuenta OpenGroupware"
 
-#, fuzzy
-#~ msgid "Initiales)."
-#~ msgstr "Iniciales"
+#~ msgid "Can't get quota information for '%s'."
+#~ msgstr "No se pueden conseguir los datos de la cuota de '%s'."
 
 #, fuzzy
-#~ msgid "Create template"
-#~ msgstr "Nueva plantilla"
+#~ msgid "Shadow last change"
+#~ msgstr "Mostrar paquetes"
 
 #, fuzzy
-#~ msgid "Add admin user"
-#~ msgstr "Usuario administrador"
+#~ msgid "Device monitor"
+#~ msgstr "Nuevo monitor"
 
 #, fuzzy
-#~ msgid "Add admin group"
-#~ msgstr "Grupo de samba"
+#~ msgid "Device case"
+#~ msgstr "Nombre del dispositivo"
 
 #, fuzzy
-#~ msgid "Undefined"
-#~ msgstr "sin definirse"
+#~ msgid "Device motherboard"
+#~ msgstr "Añadir/Editar placa base"
 
 #, fuzzy
-#~ msgid "Select user/group to add"
-#~ msgstr "Seleccione grupo a añadir"
-
-#~ msgid "Object groups need at least one member!"
-#~ msgstr "'Grupos de objetos que necesitan al menos un miembro!"
+#~ msgid "Device soundcard"
+#~ msgstr "Nueva tarjeta de sonido"
 
 #, fuzzy
-#~ msgid "selected"
-#~ msgstr "Borrar"
+#~ msgid "Device processor"
+#~ msgstr "Nuevo procesador"
 
 #, fuzzy
-#~ msgid "Please select a PPD or press cancel"
-#~ msgstr "¡Por favor introduzca un número de teléfono valido!"
-
-#~ msgid "Automount devices (format: complete autofs entry)"
-#~ msgstr "Dispositivos de automontaje (formato: entrada autofs completa)"
-
-#~ msgid "Add additional automount entries"
-#~ msgstr "Añadir entradas adicionales de automontaje"
-
-#~ msgid "Additional fstab entries"
-#~ msgstr "Entradas de fstab adicionales"
-
-#~ msgid "Add additional filesystems to be mounted during startup"
-#~ msgstr ""
-#~ "Añadir sistemas de archivos adicionales que serán montados al arrancar"
+#~ msgid "Device misc device"
+#~ msgstr "Nuevo dispositivo (otros)"
 
 #, fuzzy
-#~ msgid "Service"
-#~ msgstr "Servicios"
+#~ msgid "Device ram"
+#~ msgstr "Nombre del dispositivo"
 
 #, fuzzy
-#~ msgid "List of used class names"
-#~ msgstr "Elija tipo de ratón"
+#~ msgid "Device hard disk drive"
+#~ msgstr "Nuevo disco duro"
 
 #, fuzzy
-#~ msgid "Profile management"
-#~ msgstr "Mantenimiento de Departamentos"
+#~ msgid "Device drive"
+#~ msgstr "Nombre del dispositivo"
 
 #, fuzzy
-#~ msgid "Display hotplugs of department"
-#~ msgstr "Mostrar los grupos de departamentos"
+#~ msgid "Device controler"
+#~ msgstr "Nueva controladora"
 
 #, fuzzy
-#~ msgid "Select printer entry"
-#~ msgstr "Seleccione para ver impresoras"
+#~ msgid "Device pci device"
+#~ msgstr "Mostrar dispositivo"
 
 #, fuzzy
-#~ msgid "Display printers of department"
-#~ msgstr "Mostrar número de Departamentos"
+#~ msgid "Saving printer membership with dn %s failed "
+#~ msgstr "Ha fallado la grabación de la impresora"
 
-#, fuzzy
-#~ msgid "Logon management"
-#~ msgstr "Mantenimiento de Departamentos"
+#~ msgid "Error while writing printer settings"
+#~ msgstr "¡Error mientras se guardaban los parámetros de la impresora"
 
 #, fuzzy
-#~ msgid "Please enter a valid name. Only 0-9 a-Z are allowed here."
-#~ msgstr "Por favor especifique un nombre de usuario valido."
+#~ msgid "Kernel paramenter"
+#~ msgstr "Comprobar parámetros"
 
 #, fuzzy
-#~ msgid "Please enter a valid class name. Only 0-9 a-z is allowed here."
-#~ msgstr "Por favor especifique un nombre de usuario valido."
+#~ msgid "Max queue lenght"
+#~ msgstr "Cola de correo"
 
 #, fuzzy
-#~ msgid "release"
-#~ msgstr "Borrar"
+#~ msgid " Announce frequency"
+#~ msgstr "Mensaje de presentación"
 
 #, fuzzy
-#~ msgid "section"
-#~ msgstr "Acción"
+#~ msgid "Day"
+#~ msgstr "día"
 
 #, fuzzy
-#~ msgid "Profil server"
-#~ msgstr "Servidor de Cola"
+#~ msgid "Keyboard modell"
+#~ msgstr "Elija modelo de teclado"
 
 #, fuzzy
-#~ msgid "Please enter a valid description."
-#~ msgstr "Por favor introduzca un número de serie válido"
+#~ msgid "Keyborad variant"
+#~ msgstr "Elija variante de teclado"
 
 #, fuzzy
-#~ msgid "Please specify a script."
-#~ msgstr "Por favor especifique un nombre de usuario valido."
+#~ msgid "Valume"
+#~ msgstr "Volumen"
 
 #, fuzzy
-#~ msgid "Invalid character in description. Please enter a valid description."
-#~ msgstr "Por favor especifique un nombre de usuario valido."
+#~ msgid "Server indentifier"
+#~ msgstr "Identificador de servidor"
 
 #, fuzzy
-#~ msgid "Please specify a description for this profile."
-#~ msgstr "Por favor especifique un usuario valido."
+#~ msgid "User certificate PKCS12"
+#~ msgstr "Certificado estandar"
 
 #, fuzzy
-#~ msgid "Please enter a description for your disk."
-#~ msgstr "Por favor especifique un usuario valido."
+#~ msgid "Vocation message"
+#~ msgstr "Mensaje de ausencia"
 
-#, fuzzy
-#~ msgid " name="
-#~ msgstr "Nombre de la lista"
+#~ msgid "Removing UNIX account failed"
+#~ msgstr "Ha fallado  al borrar la cuenta unix"
 
-#, fuzzy
-#~ msgid " value="
-#~ msgstr "Valor por defecto"
+#~ msgid "Saving UNIX account failed"
+#~ msgstr "Ha fallado  al grabar la cuenta unix"
 
-#, fuzzy
-#~ msgid " type="
-#~ msgstr "Tipo"
+#~ msgid "Error while writing printer"
+#~ msgstr "¡Error mientras se guardaba la impresora"
 
-#, fuzzy
-#~ msgid "FAI management"
-#~ msgstr "Nombre de la maquina"
+#~ msgid "Adding environment information failed"
+#~ msgstr "Ha fallado al añadir la información de estado"
 
-#, fuzzy
-#~ msgid "New script bundle"
-#~ msgstr "Impresora"
+#~ msgid "Removing FAX account failed"
+#~ msgstr "Ha fallado la eliminación de la cuenta de Fax"
 
-#, fuzzy
-#~ msgid "New hook bundle"
-#~ msgstr "Teléfono"
+#~ msgid "Saving addressbook entry failed"
+#~ msgstr "Ha fallado la grabación de la cuenta de la libreta de direcciones"
 
-#, fuzzy
-#~ msgid "New variable bundle"
-#~ msgstr "Mostrar terminales"
+#~ msgid "Removing FAI script failed"
+#~ msgstr "Ha fallado la eliminación del script FAI"
 
-#, fuzzy
-#~ msgid "New template bundle"
-#~ msgstr "Nueva plantilla"
+#~ msgid "Saving FAI template failed"
+#~ msgstr "Ha fallado la grabación de la la plantilla FAI"
 
-#, fuzzy
-#~ msgid "Edit object"
-#~ msgstr "Encontrar objeto"
+#~ msgid "Removing FAI partition table failed"
+#~ msgstr "Ha fallado la eliminación de la tabla de particiones FAI"
 
-#, fuzzy
-#~ msgid "Delete object"
-#~ msgstr "Objetos miembro"
+#~ msgid "Removing FAI partition table entry failed"
+#~ msgstr ""
+#~ "Ha fallado la eliminación de la entrada en la tabla de particiones FAI"
 
-#, fuzzy
-#~ msgid "Script set"
-#~ msgstr "Ruta del Script"
+#~ msgid "Saving FAI partition table entry failed"
+#~ msgstr ""
+#~ "Ha fallado la grabación de la entrada en la tabla de particiones FAI"
 
-#, fuzzy
-#~ msgid "Variable set"
-#~ msgstr "Variable"
+#~ msgid "Apply this acl only for users own entries"
+#~ msgstr "Aplicar esta lista de acceso a las entradas de los usuarios"
 
-#, fuzzy
-#~ msgid "Abort"
-#~ msgstr "Puerto"
+#~ msgid "This 'dn' is no acl container."
+#~ msgstr "Este 'dn' no es un contenedor de listas de acceso."
 
-#, fuzzy
-#~ msgid "Please enter a valid name for partition %s."
-#~ msgstr "Por favor especifique un usuario valido."
+#~ msgid "All fields are writeable"
+#~ msgstr "Todos los campos son rellenarles."
 
-#, fuzzy
-#~ msgid "please enter a unique name for partition %s"
-#~ msgstr "¡Por favor introduzca un número de teléfono valido!"
+#~ msgid "Removing application information failed"
+#~ msgstr "Ha fallado la eliminación de información de la aplicación"
 
-#, fuzzy
-#~ msgid "Choose a disc name"
-#~ msgstr "Elija modelo de teclado"
+#~ msgid "Saving application information failed"
+#~ msgstr "Ha fallado la grabación de información de la aplicación"
 
-#, fuzzy
-#~ msgid "cancel"
-#~ msgstr "Cancelar"
+#~ msgid "Removing application failed"
+#~ msgstr "Ha fallado la eliminación de la aplicación"
 
-#, fuzzy
-#~ msgid "Available class names."
-#~ msgstr "Aplicaciones disponibles"
+#~ 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."
 
-#, fuzzy
-#~ msgid "Create new FAI object - set of scripts."
-#~ msgstr "Grupo de objetos"
+#~ msgid "Saving server failed"
+#~ msgstr "Ha fallado la grabación del servidor"
 
-#, fuzzy
-#~ msgid "Create new FAI object - set of hooks."
-#~ msgstr "Grupo de objetos"
+#~ msgid "Updating DNS service failed"
+#~ msgstr "Ha fallado la actualización del servicio DNS"
 
-#, fuzzy
-#~ msgid "Obtions"
-#~ msgstr "Opciones"
+#~ msgid "Removing DNS entries failed"
+#~ msgstr "Ha fallado la eliminación de las entradas DNS"
 
-#, fuzzy
-#~ msgid "FAI partition table entry"
-#~ msgstr "Entradas de fstab adicionales"
+#~ msgid "Saving DNS entries failed"
+#~ msgstr "Ha fallado la grabación de las entradas DNS"
 
-#, fuzzy
-#~ msgid "FAI script set"
-#~ msgstr "Parametros Unix"
+#~ msgid "The attribute '%s' is empty or contains invalid characters."
+#~ msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
-#, fuzzy
-#~ msgid ""
-#~ "This menu allows you to create, delete and edit selected FAI obejcts. "
-#~ "Having a large size of objects, you might prefer the range selectors on "
-#~ "top of this list."
+#~ msgid "The imap name string needs to be a hostname or an IP-address."
 #~ msgstr ""
-#~ "Este menú le permite crear, editar o eliminar listas de bloqueo. Puede "
-#~ "usar el selector de rango en la parte superior de la lista, cuando "
-#~ "trabaja con un gran número de listas de bloqueo."
+#~ "La cadena del nombre IMAP necesita ser un nombre de host o una dirección "
+#~ "IP."
 
-#, fuzzy
-#~ msgid ""
-#~ "Please enter a valid description for your disk. Only a-Z 0-9 are allowed."
-#~ msgstr "Por favor especifique un nombre de usuario valido."
-
-#, fuzzy
-#~ msgid "Object type"
-#~ msgstr "Nombre de objeto"
+#~ msgid "Removing kolab host entry failed"
+#~ msgstr "Ha fallado la eliminación de la entrada de host Kolab"
 
-#, fuzzy
-#~ msgid "Set phone password"
-#~ msgstr "Poner Contraseña"
-
-#, fuzzy
-#~ msgid "Set voicemail password"
-#~ msgstr "Poner Contraseña"
+#~ msgid "Removing terminal failed"
+#~ msgstr "Ha fallado la eliminación del terminal"
 
-#~ msgid "Path to PPD"
-#~ msgstr "Ruta al 'PPD'"
+#~ msgid "Saving terminal failed"
+#~ msgstr "Ha fallado la grabación del terminal"
 
-#, fuzzy
-#~ msgid "You need to specify a Phone PIN."
-#~ msgstr "¡Necesita introducir al menos un número de teléfono!"
+#~ msgid "Saving Samba workstation failed"
+#~ msgstr "Ha fallado la grabación de la estación de trabajo Samba"
 
-#~ msgid "Default printer"
-#~ msgstr "Impresora por defecto"
+#~ msgid "Saving terminal to DNS object failed"
+#~ msgstr "Ha fallado la grabación del terminal en el objeto DNS."
 
-#, fuzzy
-#~ msgid "Name of Conference"
-#~ msgstr "Nombre del departamento"
+#~ msgid "Removing phone failed"
+#~ msgstr "Ha fallado la eliminación del teléfono"
 
-#, fuzzy
-#~ msgid "Number"
-#~ msgstr "Noviembre"
+#~ msgid "Saving phone failed"
+#~ msgstr "Ha fallado la grabación del nombre de teléfono"
 
-#, fuzzy
-#~ msgid "Additional phone attributes "
-#~ msgstr "Entradas de fstab adicionales"
+#~ msgid "Saving phone queue failed"
+#~ msgstr "Ha fallado la grabación de la cola telefónica"
 
-#~ msgid "Forward calls to"
-#~ msgstr "Reenviar llamadas a"
+#~ msgid "Removing phone queue failed"
+#~ msgstr "Ha fallado la eliminación de la cola telefónica"
 
-#~ msgid "Timeout (s)"
-#~ msgstr "Tiempo(s) excedido(s)"
+#~ msgid "Removing phone macro failed"
+#~ msgstr "Ha fallado la eliminación de la macro telefónica"
 
-#~ msgid "The number '%s' is no valid phone number!"
-#~ msgstr "¡El número '%s' no es un número de teléfono valido!"
+#~ msgid "Saving phone macro failed"
+#~ msgstr "Ha fallado la grabación de la macro telefónica"
 
 #, fuzzy
-#~ msgid "fill out"
-#~ msgstr "Salir"
-
-#~ msgid "Display lists containing"
-#~ msgstr "Mostrar listas que contengan"
-
-#~ msgid "Show lists containing entered numbers"
-#~ msgstr "Mostrar listas que contengan los números ya introducidos"
+#~ msgid "Saving phone macro parameters failed"
+#~ msgstr "Editar parámetros de aplicaciones opcionales"
 
 #, fuzzy
-#~ msgid "New system"
-#~ msgstr "Borrar"
-
-#~ msgid "Display terminal(s) of user"
-#~ msgstr "Mostrar terminal(es) del usuario"
+#~ msgid "Saving phone conference failed"
+#~ msgstr "Cuenta proxy"
 
 #, fuzzy
-#~ msgid "Germany"
-#~ msgstr "Alemán"
-
-#~ msgid ""
-#~ "-Edit- and -New...- will execute an assistant to aid you when performing "
-#~ "changes on your blocklist. -Delete- will ask you for confirmation before "
-#~ "really deleting anything."
-#~ msgstr ""
-#~ "- Editar - y - Nueva... - le proveerán de un asistente para ayudarle "
-#~ "cuando cree cambios en sus listas de bloqueos. - Eliminar - le pedirá "
-#~ "confirmación antes de eliminar realmente nada."
+#~ msgid "Snapshot failed."
+#~ msgstr "Ha fallado la grabación del nombre de teléfono"
 
-#~ msgid "Display lists of department"
-#~ msgstr "Mostrar listas de Departamentos"
+#~ msgid "Overwrite existing entry"
+#~ msgstr "Sobreescribir la entrada actual"
 
-#~ msgid ""
-#~ "-Edit- and -New...- will execute an assistant to aid you in editing group "
-#~ "properties. -Delete- will ask for confirmation before removing groups."
-#~ msgstr ""
-#~ "- Editar - y - Nuevo... - ejecutaran un asistente que le ayudara en la "
-#~ "edición de las propiedades del grupo. - Eliminar - le pedirá confirmación "
-#~ "antes de eliminar los grupos."
+#~ msgid "Removing DNS service failed"
+#~ msgstr "Ha fallado la eliminación del servicio DNS"
 
-#~ msgid "Dive into LDAP subtrees when searching"
-#~ msgstr "Desciende a todo el árbol LDAP cuando se busca"
+#~ 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."
 
-#~ msgid "Search in subtrees"
-#~ msgstr "Buscar en el subárbol"
+#~ msgid "Databases"
+#~ msgstr "Bases de datos"
 
-#~ msgid ""
-#~ "-Edit- and -New...- execute an assistant to aid you in managing your "
-#~ "account informations. -Delete- will ask for confirmation before deleting "
-#~ "users."
-#~ msgstr ""
-#~ "-Editar- y -Nuevo...- ejecutan un asistente para ayudarle en el manejo de "
-#~ "información de cuentas. -Borrar- le pedirá confirmación antes de borrar "
-#~ "los usuarios del servidor LDAP."
+#~ msgid "Remove Kolab extension"
+#~ msgstr "Eliminar extensión Kolab"
 
 #~ msgid ""
-#~ "-Edit- and -New...- will execute an assistant to aid you in editing "
-#~ "properties. -Delete- will ask for confirmation before removing "
-#~ "applications."
+#~ "This server has kolab features enabled. You can disable them by clicking "
+#~ "below."
 #~ msgstr ""
-#~ "-Editar y - Nueva... - ejecutaran un asistente para ayudarle a editar las "
-#~ "propiedades de la aplicación. - Eliminar - le pedirá comprobación antes "
-#~ "de eliminar la aplicación."
-
-#~ msgid "Display applications of department"
-#~ msgstr "Mostrar aplicaciones de departamentos"
+#~ "Este servidor tiene la extensión Kolab activada. Puede desactivarla "
+#~ "pulsando aquí."
 
 #~ msgid ""
-#~ "-Edit- and -New...- will provide an assistant to aid you when performing "
-#~ "changes on your departments. -Delete- will ask for confirmation before "
-#~ "deleting departments."
+#~ "This server has kolab features disabled. You can enable them by clicking "
+#~ "below."
 #~ msgstr ""
-#~ "- Editar - y - Nuevo ... - proveen un asistente que le ayudara cuando "
-#~ "quiera crear cambios en los departamentos. - Eliminar - le pedirá "
-#~ "confirmación antes de realmente eliminar el departamento."
-
-#~ msgid "Display subdepartments of"
-#~ msgstr "Mostrar subdepartamentos de "
+#~ "Este servidor tiene la extensión Kolab desactivada. Puede activarla "
+#~ "pulsando aquí."
 
-#~ msgid "Thin client template for"
-#~ msgstr "Plantilla de cliente ligero para"
+#~ msgid "Remove FAI repository extension."
+#~ msgstr "Eliminar extensión de repositorio FAI."
 
 #~ msgid ""
-#~ "-Edit- will execute an assistant to aid you in changing the system "
-#~ "properties. -Delete- will ask for confirmation before deleting systems."
+#~ "This server has FAI repository features enabled. You can disable them by "
+#~ "clicking below."
 #~ msgstr ""
-#~ "- Editar - ejecutara un asistente que le ayudara a cambiar las "
-#~ "propiedades del sistema. -Borrar- le pedirá confirmación antes de "
-#~ "eliminar los sistemas."
-
-#, fuzzy
-#~ msgid ""
-#~ "-Edit- and -New...- will execute an assistant to aid you in editing "
-#~ "properties. -Delete- will ask for confirmation before removing macros."
-#~ msgstr ""
-#~ "-Editar y - Nueva... - ejecutaran un asistente para ayudarle a editar las "
-#~ "propiedades de la aplicación. - Eliminar - le pedirá comprobación antes "
-#~ "de eliminar la aplicación."
-
-#, fuzzy
-#~ msgid "Display macros of department"
-#~ msgstr "Mostrar los grupos de departamentos"
-
-#, fuzzy
-#~ msgid "Telefon PIN"
-#~ msgstr "Teléfono"
-
-#~ msgid "Show empty groups"
-#~ msgstr "Mostrar grupos vacios"
-
-#, fuzzy
-#~ msgid "The given value for goFonQualify is not a valid number."
-#~ msgstr "El valor de 'Tamaño de Cola' no es valido."
-
-#~ msgid "Answering machine"
-#~ msgstr "Contestador automático"
-
-#~ msgid "Deliver missed calls as mail"
-#~ msgstr "Enviar llamadas perdidas como correo electrónico"
-
-#~ msgid "Select to see users that have ftp settings"
-#~ msgstr "Selecctione para ver los usuarios que tienen configuraciones de ftp"
-
-#~ msgid "Show FTP users"
-#~ msgstr "Mostrar los usuarios de FTP"
-
-#~ msgid "Select to see users that have FAX settings"
-#~ msgstr "Seleccione para ver los usuarios que tienen configuraciones de FAX"
-
-#~ msgid "Show FAX users"
-#~ msgstr "Mostrar los usuarios de FAX"
-
-#, fuzzy
-#~ msgid "Phone category"
-#~ msgstr "Informes telefónicos"
+#~ "Este servidor tiene la extensión repositorio FAI activada. Puede "
+#~ "desactivarla pulsando aquí."
 
 #~ msgid ""
-#~ "We've inspected the webserver side now. Your setup seems to fit GOsa's "
-#~ "needs. Lets go for the GOsa configuration part now..."
+#~ "This server has FAI repository features disabled. You can enable them by "
+#~ "clicking below."
 #~ msgstr ""
-#~ "Hemos inspeccionado el servidor web. Su configuración parece cumplir con "
-#~ "los requerimientos de GOsa. Continuamos la configuración de GOsa..."
+#~ "Este servidor tiene la extensión repositorio FAI desactivada. Puede "
+#~ "activarla pulsando aquí."
 
 #~ msgid ""
-#~ "Finally, you need to specify parameters to access the LDAP server. GOsa "
-#~ "always acts as admin and manages access rights internally. This is a "
-#~ "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
-#~ "this to work, we need the admin DN and the corresponding password."
+#~ "It looks like you're calling GOsa for the first time - no configuration "
+#~ "was found. This setup like script will try to aid you in creating a "
+#~ "working configuration by performing three major steps: first we'll check "
+#~ "the PHP installation for required modules, than we're going to check for "
+#~ "optional/needed programms and after you've provided basic informations "
+#~ "for your LDAP connectivity, we're going to check your LDAP setup."
 #~ msgstr ""
-#~ "Finalmente, necesita especificar parámetros para acceder al servidor "
-#~ "LDAP. GOsa siempre actúa como administrador y maneja los derechos de "
-#~ "acceso internamente. Este comportamiento cambiará cuando el manejo de "
-#~ "derechos de acceso de OpenLDAP este completamente implementado. Para que "
-#~ "esto funcione, necesitamos el DN del administrador y la contraseña "
-#~ "correspondiente."
-
-#~ msgid "absent"
-#~ msgstr "ausente"
-
-#, fuzzy
-#~ msgid "Value specified as 'Quota Size' is empty."
-#~ msgstr "El valor especificado como 'Tamaño' no es válido"
-
-#, fuzzy
-#~ msgid "Value specified as 'Quota Size' is not valid."
-#~ msgstr "El valor especificado como 'Tamaño' no es válido"
+#~ "Parece que esta ejecutando GOsa por primera vez - no se encontró la "
+#~ "configuración. Los siguientes pasos tratarán de asistirlo en crear una "
+#~ "configuración funcional, efectuando las siguientes tareas: comprobar la "
+#~ "instalación de PHP y de los módulos necesarios, luego comprobar los "
+#~ "programas opcionales y, luego de ingresar la información necesaria para "
+#~ "conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
 
 #~ msgid ""
-#~ "If this is lock detection is false, the other person has obviously closed "
+#~ "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."
 #~ msgstr ""