more localization fixes for getxls.php

[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 bfb9e4a6b17c3567a3d1ee5edc9ceebafd5c100b..d1527b016c081dba57b7ad6d55e6c0d8da050e41 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1,90 +1,111 @@
+# 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
+# Alejandro Escanero Blanco <alex@ofmin.com>, 2003, 2005.
+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"
+"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"
+
 #: contrib/gosa.conf:4
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: contrib/gosa.conf:23
+#: contrib/gosa.conf:28
 msgid "Administration"
 msgstr "Administradores"
 
-#: contrib/gosa.conf:44
+#: contrib/gosa.conf:51
 msgid "Addons"
 msgstr "Agregados"
 
-#: contrib/gosa.conf:59 contrib/gosa.conf:71 contrib/gosa.conf:80
-#: contrib/gosa.conf:86 contrib/gosa.conf:91 contrib/gosa.conf:97
-#: contrib/gosa.conf:105 contrib/gosa.conf:114 contrib/gosa.conf:122
-#: contrib/gosa.conf:127 contrib/gosa.conf:132 contrib/gosa.conf:137
-#: contrib/gosa.conf:142 contrib/gosa.conf:147
+#: contrib/gosa.conf:66 contrib/gosa.conf:79 contrib/gosa.conf:88
+#: contrib/gosa.conf:94 contrib/gosa.conf:99 contrib/gosa.conf:105
+#: contrib/gosa.conf:114 contrib/gosa.conf:123 contrib/gosa.conf:132
+#: contrib/gosa.conf:137 contrib/gosa.conf:142 contrib/gosa.conf:147
+#: contrib/gosa.conf:152 contrib/gosa.conf:157
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba3.tpl:6 plugins/personal/samba/samba2.tpl:6
+#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
-#: plugins/admin/FAI/faiPartitionTable.tpl:4
-#: plugins/admin/FAI/faiVariable.tpl:4 plugins/admin/FAI/faiScriptEntry.tpl:5
-#: plugins/admin/FAI/faiPackage.tpl:4 plugins/admin/FAI/faiProfile.tpl:1
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:3
-#: plugins/admin/FAI/faiScript.tpl:4 plugins/admin/FAI/faiVariableEntry.tpl:5
-#: plugins/admin/FAI/faiTemplate.tpl:4 plugins/admin/FAI/faiHookEntry.tpl:5
-#: plugins/admin/FAI/faiTemplateEntry.tpl:5 plugins/admin/FAI/faiHook.tpl:4
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#: plugins/admin/fai/faiPartitionTable.tpl:4
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
+#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:32 plugins/admin/fai/faiScript.tpl:4
+#: plugins/admin/fai/faiVariableEntry.tpl:5
+#: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
+#: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Genérico"
 
-#: contrib/gosa.conf:60
+#: contrib/gosa.conf:67
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:61 contrib/gosa.conf:72
+#: contrib/gosa.conf:68 contrib/gosa.conf:80
 #: plugins/personal/environment/class_environment.inc:12
 #: plugins/admin/groups/class_groupManagement.inc:377
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "Environment"
 msgstr "Entorno"
 
-#: contrib/gosa.conf:62 contrib/gosa.conf:74
+#: contrib/gosa.conf:69 contrib/gosa.conf:82
 #: plugins/personal/mail/class_mailAccount.inc:22
 #: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/users/class_userManagement.inc:714
-#: plugins/admin/ogroups/tabs_ogroups.inc:49
+#: plugins/admin/users/class_userManagement.inc:728
+#: plugins/admin/ogroups/tabs_ogroups.inc:73
+#: plugins/admin/ogroups/tabs_ogroups.inc:158
 #: plugins/admin/ogroups/class_ogroupManagement.inc:380
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Correo Electrónico"
 
-#: contrib/gosa.conf:63 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:70 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:720
+#: plugins/admin/users/class_userManagement.inc:734
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:64 plugins/personal/connectivity/main.inc:136
+#: contrib/gosa.conf:71 plugins/personal/connectivity/main.inc:135
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Conectividad"
 
-#: contrib/gosa.conf:65 plugins/personal/generic/generic.tpl:231
-#: plugins/personal/generic/generic.tpl:362
+#: contrib/gosa.conf:72 plugins/personal/generic/generic.tpl:241
+#: plugins/personal/generic/generic.tpl:372
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:718
-#: plugins/admin/departments/generic.tpl:62
+#: plugins/admin/users/class_userManagement.inc:732
+#: plugins/admin/departments/generic.tpl:62 html/getxls.php:149
+#: html/getxls.php:206
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:66 plugins/personal/generic/generic.tpl:214
-#: plugins/personal/generic/generic.tpl:352
+#: contrib/gosa.conf:73 plugins/personal/generic/generic.tpl:224
+#: plugins/personal/generic/generic.tpl:362
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:96
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/groups/class_groupManagement.inc:376
-#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:730
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:702
+#: plugins/admin/systems/class_systemManagement.inc:706
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
 #: plugins/admin/ogroups/class_ogroupManagement.inc:484
@@ -93,267 +114,342 @@ msgstr "Fax"
 msgid "Phone"
 msgstr "Teléfono"
 
-#: contrib/gosa.conf:67 contrib/gosa.conf:76 contrib/gosa.conf:82
-#: contrib/gosa.conf:87 contrib/gosa.conf:93 contrib/gosa.conf:101
-#: contrib/gosa.conf:110 contrib/gosa.conf:118 contrib/gosa.conf:123
-#: contrib/gosa.conf:128 contrib/gosa.conf:133 contrib/gosa.conf:138
-#: contrib/gosa.conf:143 contrib/gosa.conf:148
+#: contrib/gosa.conf:74 contrib/gosa.conf:84 contrib/gosa.conf:90
+#: contrib/gosa.conf:95 contrib/gosa.conf:101 contrib/gosa.conf:110
+#: contrib/gosa.conf:119 contrib/gosa.conf:128 contrib/gosa.conf:133
+#: contrib/gosa.conf:138 contrib/gosa.conf:143 contrib/gosa.conf:148
+#: contrib/gosa.conf:153 contrib/gosa.conf:158
 msgid "References"
 msgstr "Referencias"
 
-#: contrib/gosa.conf:73
+#: contrib/gosa.conf:75 plugins/personal/nagios/class_nagiosAccount.inc:18
+msgid "Nagios"
+msgstr ""
+
+#: contrib/gosa.conf:81
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:83
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:81 plugins/admin/ogroups/phonequeue.tpl:31
+#: contrib/gosa.conf:89 plugins/admin/applications/generic.tpl:58
+#: plugins/admin/systems/printerPPDDialog.tpl:17
+#: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:92 plugins/gofon/phoneaccount/class_phoneAccount.inc:638
+#: contrib/gosa.conf:100 plugins/gofon/phoneaccount/class_phoneAccount.inc:637
 #, fuzzy
 msgid "Parameter"
 msgstr "Parametros de inicio"
 
-#: contrib/gosa.conf:98 contrib/gosa.conf:115
+#: contrib/gosa.conf:106 contrib/gosa.conf:124
+#: plugins/admin/ogroups/tabs_ogroups.inc:93
+msgid "Startup"
+msgstr "Inicio"
+
+#: contrib/gosa.conf:107 contrib/gosa.conf:125
+#: plugins/admin/ogroups/tabs_ogroups.inc:97
 msgid "Devices"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:99 contrib/gosa.conf:116
-msgid "Startup"
-msgstr "Inicio"
+#: contrib/gosa.conf:108 contrib/gosa.conf:126
+#: plugins/personal/environment/environment.tpl:168
+#: plugins/admin/systems/class_systemManagement.inc:712
+#: plugins/admin/ogroups/class_ogroupManagement.inc:49
+#: plugins/admin/ogroups/class_ogroupManagement.inc:487
+#: plugins/generic/references/class_reference.inc:52
+msgid "Printer"
+msgstr "Impresora"
 
-#: contrib/gosa.conf:100 contrib/gosa.conf:109 contrib/gosa.conf:117
-msgid "Monitoring"
-msgstr "Monitor"
+#: contrib/gosa.conf:109 contrib/gosa.conf:118 contrib/gosa.conf:127
+#: plugins/personal/environment/hotplugDialog.tpl:24
+#: plugins/personal/environment/selectPrinterDialog.tpl:24
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:20
+#: 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/admin/systems/selectUserToPrinterDialog.tpl:22
+#: plugins/admin/ogroups/headpage.tpl:20
+#: plugins/admin/fai/faiProfileEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
+#: plugins/admin/fai/faiPackageEntry.tpl:22
+#: plugins/gofon/macro/headpage.tpl:20
+#: plugins/gofon/conference/headpage.tpl:20
+msgid "Information"
+msgstr "Información"
 
-#: contrib/gosa.conf:106
+#: contrib/gosa.conf:115
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: contrib/gosa.conf:107 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:116 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:160 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:170 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
+#: plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: plugins/addons/ldapmanager/contentexportxls.tpl:32
+#: plugins/addons/ldapmanager/contentexportxls.tpl:47
 msgid "Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:161 plugins/personal/mail/generic.tpl:112
-#: plugins/personal/environment/logonManagement.tpl:53
-#: plugins/personal/environment/logonManagement.tpl:57
+#: contrib/gosa.conf:171
+#, fuzzy
+msgid "Excel Export"
+msgstr "Exportar"
+
+#: contrib/gosa.conf:172 plugins/personal/mail/generic.tpl:112
+#: plugins/personal/environment/logonManagement.tpl:65
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
-#: plugins/addons/ldapmanager/contentimport.tpl:49
-#: plugins/admin/FAI/faiScriptEntry.tpl:56
+#: plugins/admin/applications/generic.tpl:83
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:162
+#: contrib/gosa.conf:173
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:178
+#: contrib/gosa.conf:177
+#, fuzzy
+msgid "Partitions"
+msgstr "Destino"
+
+#: contrib/gosa.conf:181 plugins/personal/environment/logonManagement.tpl:55
+#: plugins/admin/applications/generic.tpl:81
+#: plugins/admin/fai/faiScriptEntry.tpl:50
+#: plugins/admin/fai/faiHookEntry.tpl:50
+#, fuzzy
+msgid "Script"
+msgstr "Ruta del Script"
+
+#: contrib/gosa.conf:185 plugins/admin/fai/class_faiManagement.inc:542
+#: plugins/admin/fai/class_faiManagement.inc:543
+msgid "Hooks"
+msgstr ""
+
+#: contrib/gosa.conf:189 plugins/admin/fai/class_faiManagement.inc:535
+#: plugins/admin/fai/class_faiManagement.inc:536
+#, fuzzy
+msgid "Variables"
+msgstr "Variable"
+
+#: contrib/gosa.conf:193 plugins/admin/fai/class_faiManagement.inc:556
+#: plugins/admin/fai/class_faiManagement.inc:557
+#, fuzzy
+msgid "Templates"
+msgstr "Plantilla"
+
+#: contrib/gosa.conf:197 plugins/personal/environment/environment.tpl:7
+#, fuzzy
+msgid "Profiles"
+msgstr "Ruta del Perfil"
+
+#: contrib/gosa.conf:201
+#, fuzzy
+msgid "Packages"
+msgstr "Mostrar teléfonos"
+
+#: contrib/gosa.conf:217
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:195 plugins/admin/ogroups/class_phonequeue.inc:160
+#: contrib/gosa.conf:234 plugins/admin/ogroups/class_phonequeue.inc:161
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:235
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:197
+#: contrib/gosa.conf:236
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:237
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:199
+#: contrib/gosa.conf:238
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:200
+#: contrib/gosa.conf:239
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:201
+#: contrib/gosa.conf:240
 msgid "Italian"
 msgstr "Italiano"
 
-#: 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/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
+msgstr "Esto hace algo"
 
-#: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/personal/samba/samba3_workstations.tpl:20
-#: plugins/personal/environment/hotplugDialog.tpl:34
-#: plugins/personal/environment/selectPrinterDialog.tpl:35
-#: 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/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/systems/selectUserToPrinterDialog.tpl:35
-#: plugins/admin/ogroups/headpage.tpl:29
-#: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/FAI/faiProfileEntry.tpl:29 plugins/admin/FAI/headpage.tpl:29
-#: plugins/gofon/macro/headpage.tpl:29
-#: plugins/gofon/conference/headpage.tpl:28
-msgid "Filters"
-msgstr "Filtros"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, 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/mail_locals.tpl:26
-#: plugins/admin/groups/mail_locals.tpl:32
-msgid "Display addresses of department"
-msgstr "Mostrar las direcciones de los departamentos"
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
+msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
 
-#: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:39
-#: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/samba/samba3_workstations.tpl:27
-#: plugins/personal/environment/selectPrinterDialog.tpl:44
-#: plugins/gofax/faxaccount/locals.tpl:31
-#: plugins/addons/addressbook/contents.tpl:80
-#: plugins/admin/groups/group_objects.tpl:34
-#: plugins/admin/groups/mail_locals.tpl:35
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:44
-#: 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"
+#: plugins/personal/mail/class_mailAccount.inc:200
+msgid "This account has no mail extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:44
-msgid "Display addresses matching"
-msgstr "Mostrar direcciones que concuerden con"
+#: plugins/personal/mail/class_mailAccount.inc:209
+#: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
+msgid "Remove mail account"
+msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/mail/mail_locals.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
-#: plugins/personal/samba/samba3_workstations.tpl:31
-#: plugins/admin/groups/mail_locals.tpl:47
-msgid "Regular expression for matching addresses"
-msgstr "Expresiones regulares que concuerden con direcciones"
+#: plugins/personal/mail/class_mailAccount.inc:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
 
-#: plugins/personal/mail/mail_locals.tpl:32
-#: plugins/admin/groups/mail_locals.tpl:54
-msgid "Display addresses of user"
-msgstr "Mostrar direcciones del usuario"
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
+msgstr "Crear cuenta de correo"
 
-#: plugins/personal/mail/mail_locals.tpl:33
-#: plugins/admin/groups/mail_locals.tpl:57
-msgid "User name of which addresses are shown"
-msgstr "Nombre de usuario de las direcciones mostradas"
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account 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."
 
-#: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
-#: plugins/personal/posix/generic.tpl:73
-#: plugins/personal/posix/generic.tpl:102
-#: plugins/personal/posix/posix_groups.tpl:72
-#: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/samba/samba3.tpl:307
-#: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/personal/connectivity/class_kolabAccount.inc:200
-#: plugins/personal/environment/environment.tpl:114
-#: plugins/personal/environment/environment.tpl:169
-#: plugins/personal/environment/kioskManagement.tpl:13
-#: plugins/gofax/blocklists/generic.tpl:63
-#: plugins/gofax/faxaccount/generic.tpl:75
-#: plugins/gofax/faxaccount/locals.tpl:62
-#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
-#: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/generic.tpl:88
-#: plugins/admin/groups/group_objects.tpl:49
-#: plugins/admin/groups/mail_locals.tpl:68
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
-#: plugins/admin/systems/startup.tpl:95
-#: plugins/admin/systems/phonesettings.tpl:181
-#: plugins/admin/systems/phonesettings.tpl:196
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:74
-#: plugins/admin/ogroups/generic.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:50
-#: plugins/admin/ogroups/phonequeue.tpl:24
-#: plugins/admin/FAI/faiPartitionTable.tpl:43
-#: plugins/admin/FAI/faiVariable.tpl:43
-#: plugins/admin/FAI/class_faiProfile.inc:144
-#: plugins/admin/FAI/faiScript.tpl:43 plugins/admin/FAI/faiTemplate.tpl:43
-#: plugins/admin/FAI/faiHook.tpl:43 plugins/gofon/phoneaccount/generic.tpl:13
-msgid "Add"
-msgstr "Añadir"
+#: plugins/personal/mail/class_mailAccount.inc:260
+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/mail_locals.tpl:43 plugins/personal/mail/main.inc:106
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112 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/connectivity/main.inc:118
-#: plugins/personal/environment/main.inc:106
-#: plugins/personal/environment/hotplugDialog.tpl:76
-#: plugins/personal/environment/selectPrinterDialog.tpl:75
-#: plugins/personal/environment/logonManagement.tpl:78
-#: plugins/personal/environment/hotplugDialogNew.tpl:30
-#: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/addons/addressbook/address_edit.tpl:115
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:330
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/group_objects.tpl:51
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/remove.tpl:17
-#: plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:617
-#: plugins/admin/users/template.tpl:46
-#: plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:303
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:350
-#: plugins/admin/systems/class_systemManagement.inc:529
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:86
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:75
-#: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:338
-#: plugins/admin/ogroups/remove.tpl:17
-#: plugins/admin/FAI/class_faiManagement.inc:340
-#: plugins/admin/FAI/class_faiManagement.inc:344
-#: plugins/admin/FAI/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
-#: plugins/gofon/macro/remove.tpl:16
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:271
-#: plugins/gofon/conference/remove.tpl:17
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-msgid "Cancel"
-msgstr "Cancelar"
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+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:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"Esta intentando añadir una dirección de correo no valida a la lista de "
+"direcciones alternativas"
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+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:689
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:694
+#: plugins/admin/groups/class_groupMail.inc:610
+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:698
+#: plugins/personal/mail/class_mailAccount.inc:702
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/ogroups/class_mailogroup.inc:67
+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:709
+#: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
+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:715
+#: plugins/admin/groups/class_groupMail.inc:625
+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:724
+#: plugins/admin/groups/class_groupMail.inc:634
+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:734
+#: plugins/admin/groups/class_groupMail.inc:642
+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:738
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
 
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
@@ -361,7 +457,7 @@ msgid "Primary address"
 msgstr "Cuenta Principal"
 
 #: plugins/personal/mail/generic.tpl:11 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:703
+#: plugins/admin/systems/class_systemManagement.inc:707
 #: plugins/admin/ogroups/class_ogroupManagement.inc:483
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
@@ -377,6 +473,7 @@ msgstr "Uso de la Cola de Correo"
 
 #: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:147
+#: plugins/admin/systems/class_printGeneric.inc:353
 msgid "not defined"
 msgstr "sin definirse"
 
@@ -394,35 +491,84 @@ msgstr "Direcciones alternativas"
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
 
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:127
+#: plugins/personal/mail/mail_locals.tpl:41
+#: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:102
+#: plugins/personal/samba/samba3.tpl:307
+#: plugins/personal/samba/samba3_workstations.tpl:39
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
+#: plugins/personal/environment/environment.tpl:117
+#: plugins/personal/environment/environment.tpl:134
+#: plugins/personal/environment/environment.tpl:177
+#: plugins/personal/environment/hotplugDialog.tpl:73
+#: plugins/personal/environment/selectPrinterDialog.tpl:71
+#: plugins/personal/environment/kioskManagement.tpl:13
+#: plugins/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
+#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
+#: plugins/admin/groups/class_groupMail.inc:404
+#: plugins/admin/groups/group_objects.tpl:49
+#: plugins/admin/groups/generic.tpl:99 plugins/admin/groups/mail_locals.tpl:68
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:70
+#: plugins/admin/systems/workstationStartup.tpl:53
+#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/workstationStartup.tpl:92
+#: plugins/admin/systems/terminalStartup.tpl:61
+#: plugins/admin/systems/terminalStartup.tpl:80
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
+#: plugins/admin/ogroups/generic.tpl:38
+#: plugins/admin/ogroups/phonequeue.tpl:24
+#: plugins/admin/fai/faiPartitionTable.tpl:43
+#: plugins/admin/fai/faiVariable.tpl:43 plugins/admin/fai/faiPackage.tpl:73
+#: plugins/admin/fai/class_faiProfile.inc:150
+#: plugins/admin/fai/faiProfile.tpl:37 plugins/admin/fai/faiScript.tpl:43
+#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/faiHook.tpl:43
+#: plugins/gofon/phoneaccount/generic.tpl:13
+msgid "Add"
+msgstr "Añadir"
+
 #: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:131
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: plugins/personal/samba/samba3.tpl:309
 #: plugins/personal/connectivity/kolab.tpl:20
-#: plugins/personal/environment/environment.tpl:115
-#: plugins/personal/environment/environment.tpl:155
-#: plugins/personal/environment/environment.tpl:170
+#: plugins/personal/environment/environment.tpl:135
+#: plugins/personal/environment/environment.tpl:162
+#: plugins/personal/environment/environment.tpl:178
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
 #: plugins/gofax/faxaccount/generic.tpl:77
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:55
 #: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/remove.tpl:15
-#: plugins/admin/groups/generic.tpl:90 plugins/admin/users/remove.tpl:15
+#: plugins/admin/groups/generic.tpl:101 plugins/admin/users/remove.tpl:15
 #: plugins/admin/applications/remove.tpl:14
 #: plugins/admin/departments/remove.tpl:15
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/startup.tpl:62
-#: plugins/admin/systems/startup.tpl:76 plugins/admin/systems/startup.tpl:96
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+#: plugins/admin/systems/remove.tpl:15
 #: plugins/admin/systems/phonesettings.tpl:182
 #: plugins/admin/systems/phonesettings.tpl:197
+#: plugins/admin/systems/workstationStartup.tpl:54
+#: plugins/admin/systems/workstationStartup.tpl:74
+#: plugins/admin/systems/terminalStartup.tpl:62
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/admin/FAI/faiPartitionTable.tpl:45
-#: plugins/admin/FAI/faiVariable.tpl:45 plugins/admin/FAI/faiScript.tpl:45
-#: plugins/admin/FAI/faiTemplate.tpl:45 plugins/admin/FAI/remove.tpl:15
-#: plugins/admin/FAI/faiHook.tpl:45 plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/faiPartitionTable.tpl:45
+#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiProfile.tpl:38
+#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:45
+#: plugins/admin/fai/faiHook.tpl:45 plugins/gofon/phoneaccount/generic.tpl:15
 #: plugins/gofon/macro/remove.tpl:14 plugins/gofon/conference/remove.tpl:15
 msgid "Delete"
 msgstr "Borrar"
@@ -474,7 +620,7 @@ msgstr "rechazar correos mayores que"
 #: plugins/personal/mail/generic.tpl:95
 #: plugins/personal/connectivity/pureftpd.tpl:40
 #: plugins/personal/connectivity/class_proxyAccount.inc:78
-#: plugins/personal/environment/environment.tpl:57
+#: plugins/personal/environment/environment.tpl:71
 msgid "MB"
 msgstr "Mb"
 
@@ -515,48 +661,112 @@ 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/samba/main.inc:104
 #: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/connectivity/main.inc:116
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:115
 #: plugins/personal/environment/main.inc:104
+#: plugins/personal/nagios/main.inc:104
 #: plugins/gofax/blocklists/generic.tpl:77
 #: plugins/gofax/faxaccount/main.inc:89
 #: plugins/admin/groups/class_groupManagement.inc:328
-#: plugins/admin/users/class_userManagement.inc:615
+#: plugins/admin/users/class_userManagement.inc:629
 #: plugins/admin/applications/class_applicationManagement.inc:301
 #: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:527
+#: plugins/admin/systems/class_systemManagement.inc:536
 #: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/admin/FAI/class_faiManagement.inc:338
+#: plugins/admin/fai/class_faiManagement.inc:381
 #: plugins/gofon/phoneaccount/main.inc:104
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:300
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:269
 msgid "Finish"
 msgstr "Terminar"
 
+#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/posix/trust_machines.tpl:41
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/main.inc:112 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/generic_certs.tpl:78
+#: plugins/personal/generic/main.inc:160
+#: plugins/personal/connectivity/main.inc:117
+#: plugins/personal/environment/main.inc:106
+#: plugins/personal/environment/hotplugDialog.tpl:74
+#: plugins/personal/environment/selectPrinterDialog.tpl:72
+#: plugins/personal/environment/logonManagement.tpl:76
+#: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/nagios/main.inc:106
+#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:64
+#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/address_edit.tpl:115
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:330
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/group_objects.tpl:51
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/mail_locals.tpl:70 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:631
+#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
+#: plugins/admin/applications/class_applicationManagement.inc:303
+#: plugins/admin/departments/remove.tpl:17
+#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:538
+#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/systems/chooser.tpl:18 plugins/admin/systems/servnfs.tpl:92
+#: plugins/admin/systems/printerPPDDialog.tpl:23
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:71
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/remove.tpl:17 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/class_faiManagement.inc:383
+#: plugins/admin/fai/class_faiManagement.inc:388
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:30
+#: plugins/admin/fai/faiProfileEntry.tpl:72
+#: plugins/admin/fai/faiScriptEntry.tpl:68
+#: plugins/admin/fai/faiVariableEntry.tpl:49
+#: plugins/admin/fai/faiHookEntry.tpl:70
+#: plugins/admin/fai/faiTemplateEntry.tpl:133
+#: plugins/admin/fai/faiPackageEntry.tpl:66
+#: plugins/admin/fai/faiPackageNew.tpl:66
+#: plugins/gofon/phoneaccount/main.inc:106 plugins/gofon/macro/remove.tpl:16
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:271
+#: plugins/gofon/conference/remove.tpl:17
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
+msgid "Cancel"
+msgstr "Cancelar"
+
 #: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:184
-#: plugins/personal/connectivity/main.inc:126
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:179
+#: plugins/personal/connectivity/main.inc:125
 #: plugins/personal/environment/main.inc:114
-#: plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/nagios/main.inc:114 plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:111
 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:177
-#: plugins/personal/connectivity/main.inc:127
-#: plugins/personal/environment/environment.tpl:116
+#: plugins/personal/samba/main.inc:115 plugins/personal/generic/main.inc:172
+#: plugins/personal/connectivity/main.inc:126
 #: plugins/personal/environment/main.inc:115
+#: plugins/personal/environment/environment.tpl:136
+#: plugins/personal/nagios/main.inc:115
 #: plugins/gofax/faxaccount/generic.tpl:90
 #: plugins/gofax/faxaccount/generic.tpl:96
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/printer.tpl:61
-#: plugins/admin/FAI/faiPartitionTable.tpl:44
-#: plugins/admin/FAI/faiVariable.tpl:44 plugins/admin/FAI/faiScript.tpl:44
-#: plugins/admin/FAI/faiTemplate.tpl:44 plugins/admin/FAI/faiHook.tpl:44
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/printer.tpl:46
+#: plugins/admin/fai/faiPartitionTable.tpl:44
+#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiScript.tpl:44
+#: plugins/admin/fai/faiTemplate.tpl:44 plugins/admin/fai/faiHook.tpl:44
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Edit"
 msgstr "Editar"
@@ -565,165 +775,92 @@ msgstr "Editar"
 msgid "User mail settings"
 msgstr "Parametros del correo de usuarios"
 
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-msgid "This does something"
-msgstr "Esto hace algo"
+#: 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/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, 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/mail_locals.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/samba/samba3_workstations.tpl:20
+#: plugins/personal/environment/hotplugDialog.tpl:34
+#: plugins/personal/environment/selectPrinterDialog.tpl:35
+#: 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/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/systems/selectUserToPrinterDialog.tpl:32
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:22
+#: plugins/admin/ogroups/ogroup_objects.tpl:20
+#: plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/fai/faiProfileEntry.tpl:32 plugins/admin/fai/headpage.tpl:29
+#: plugins/admin/fai/faiPackageEntry.tpl:34
+#: plugins/gofon/macro/headpage.tpl:29
+#: plugins/gofon/conference/headpage.tpl:29
+msgid "Filters"
+msgstr "Filtros"
 
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
-msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:32
+msgid "Display addresses of department"
+msgstr "Mostrar las direcciones de los departamentos"
 
-#: plugins/personal/mail/class_mailAccount.inc:200
-msgid "This account has no mail extensions."
-msgstr "Esta cuenta no tiene extensiones validas de correo."
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/personal/environment/selectPrinterDialog.tpl:45
+#: plugins/gofax/faxaccount/locals.tpl:31
+#: plugins/addons/addressbook/contents.tpl:80
+#: plugins/admin/groups/group_objects.tpl:34
+#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:44
+#: 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"
 
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
-msgid "Remove mail account"
-msgstr "Borrar cuenta de correo"
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:44
+msgid "Display addresses matching"
+msgstr "Mostrar direcciones que concuerden con"
 
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
-"apretando a continuación."
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Create mail account"
-msgstr "Crear cuenta de correo"
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account 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."
-
-#: plugins/personal/mail/class_mailAccount.inc:260
-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:266
-#: plugins/admin/groups/class_groupMail.inc:250
-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:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Esta intentando añadir una dirección de correo no valida a la lista de "
-"direcciones alternativas"
-
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-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:689
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
-msgstr ""
-
-#: plugins/personal/mail/class_mailAccount.inc:694
-#: plugins/admin/groups/class_groupMail.inc:610
-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:698
-#: plugins/personal/mail/class_mailAccount.inc:702
-#: plugins/addons/addressbook/class_addressbook.inc:570
-#: plugins/admin/ogroups/class_mailogroup.inc:67
-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:709
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:74
-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:715
-#: plugins/admin/groups/class_groupMail.inc:625
-msgid "Value in 'Quota size' is not valid."
-msgstr "El valor de 'Tamaño de Cola' no es valido."
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:47
+msgid "Regular expression for matching addresses"
+msgstr "Expresiones regulares que concuerden con direcciones"
 
-#: plugins/personal/mail/class_mailAccount.inc:724
-#: plugins/admin/groups/class_groupMail.inc:634
-msgid "Please specify a vaild mail size for mails to be rejected."
-msgstr "Por favor especifique un usuario valido."
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:54
+msgid "Display addresses of user"
+msgstr "Mostrar direcciones del usuario"
 
-#: plugins/personal/mail/class_mailAccount.inc:734
-#: plugins/admin/groups/class_groupMail.inc:642
-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/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:57
+msgid "User name of which addresses are shown"
+msgstr "Nombre de usuario de las direcciones mostradas"
 
-#: plugins/personal/mail/class_mailAccount.inc:738
-msgid "You specified Spam settings, but there is no Folder specified."
-msgstr ""
+#: plugins/personal/password/class_password.inc:5
+#: plugins/admin/systems/class_systemManagement.inc:658
+#: 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 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
+#: ihtml/themes/default/setup_useradmin.tpl:30
+msgid "Password"
+msgstr "Contraseña"
 
 #: plugins/personal/password/password.tpl:2
 #: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:664
+#: plugins/admin/users/class_userManagement.inc:678
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
@@ -781,35 +918,24 @@ msgstr ""
 "todos los programas configurados también."
 
 #: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:174 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/personal/generic/main.inc:169 plugins/gofax/reports/detail.tpl:68
 #: plugins/addons/ldapmanager/contentimport.tpl:44
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1285
-#: ihtml/themes/altlinux/setup_step2.tpl:12
+#: plugins/addons/ldapmanager/contentcsv.tpl:122
+#: plugins/addons/ldapmanager/contentexport.tpl:66
+#: plugins/addons/ldapmanager/contentexportxls.tpl:69
+#: include/functions.inc:1285 ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: 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
 #: ihtml/themes/default/setup_useradmin.tpl:40
-#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
+#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr "Atras"
 
-#: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:649
-#: 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 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
-#: ihtml/themes/default/setup_useradmin.tpl:30
-msgid "Password"
-msgstr "Contraseña"
-
 #: plugins/personal/password/main.inc:40
 msgid ""
 "The password you've entered as your current password doesn't match the real "
@@ -850,57 +976,18 @@ 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:85
-#: plugins/personal/samba/class_sambaAccount.inc:630
-msgid "Home directory"
-msgstr "Directorio Principal"
-
-#: plugins/personal/posix/generic.tpl:13
-msgid "Shell"
-msgstr "Shell"
-
-#: plugins/personal/posix/generic.tpl:21
-msgid "Primary group"
-msgstr "Grupo primario"
-
-#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/contents.tpl:32
-#: plugins/gofax/reports/detail.tpl:46 plugins/gofon/reports/contents.tpl:35
-msgid "Status"
-msgstr "Estado"
-
-#: plugins/personal/posix/generic.tpl:39
-msgid "Force UID/GID"
-msgstr "Forzar UID/GID"
-
-#: plugins/personal/posix/generic.tpl:43
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/generic.tpl:52
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr "Miembros del grupo"
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
-
-#: plugins/personal/posix/generic.tpl:84
-msgid "Account"
-msgstr "Cuenta"
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Seleccione sistema a añadir"
 
-#: plugins/personal/posix/generic.tpl:91
-msgid "System trust"
-msgstr "Autentificación del sistema"
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Mostrar sistemas de departamentos"
 
-#: plugins/personal/posix/generic.tpl:92
-#, fuzzy
-msgid "Trust mode"
-msgstr "Modo"
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+msgid "Display systems matching"
+msgstr "Mostrar sistemas que concuerden con"
 
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
@@ -967,17 +1054,17 @@ msgid "Display groups matching"
 msgstr "Mostrar grupos que concuerden con"
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:68 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr "Expresión regular que concuerde con nombres de grupos"
 
 #: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/admin/groups/headpage.tpl:74
+#: plugins/admin/groups/headpage.tpl:73
 msgid "Display groups of user"
 msgstr "Mostrar grupos de usuarios"
 
 #: plugins/personal/posix/posix_groups.tpl:61
-#: plugins/admin/groups/headpage.tpl:78
+#: plugins/admin/groups/headpage.tpl:76
 msgid "User name of which groups are shown"
 msgstr "Nombres de usuarios de los grupos que se muestran"
 
@@ -987,22 +1074,61 @@ 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/samba3.tpl:245 plugins/personal/samba/samba2.tpl:68
+#: plugins/personal/samba/samba2.tpl:68 plugins/personal/samba/samba3.tpl:245
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Seleccione sistema a añadir"
+#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:85
+#: plugins/personal/samba/class_sambaAccount.inc:630
+msgid "Home directory"
+msgstr "Directorio Principal"
 
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Mostrar sistemas de departamentos"
+#: plugins/personal/posix/generic.tpl:13
+msgid "Shell"
+msgstr "Shell"
 
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr "Mostrar sistemas que concuerden con"
+#: plugins/personal/posix/generic.tpl:21
+msgid "Primary group"
+msgstr "Grupo primario"
+
+#: plugins/personal/posix/generic.tpl:29 plugins/gofax/reports/detail.tpl:46
+#: plugins/gofax/reports/contents.tpl:32 plugins/gofon/reports/contents.tpl:35
+msgid "Status"
+msgstr "Estado"
+
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "Forzar UID/GID"
+
+#: plugins/personal/posix/generic.tpl:43
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "Miembros del grupo"
+
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
+
+#: plugins/personal/posix/generic.tpl:84
+msgid "Account"
+msgstr "Cuenta"
+
+#: plugins/personal/posix/generic.tpl:91
+msgid "System trust"
+msgstr "Autentificación del sistema"
+
+#: plugins/personal/posix/generic.tpl:92
+#, fuzzy
+msgid "Trust mode"
+msgstr "Modo"
 
 #: plugins/personal/posix/main.inc:131
 msgid "Unix settings"
@@ -1014,7 +1140,7 @@ msgid "UNIX"
 msgstr "UNIX"
 
 #: plugins/personal/posix/class_posixAccount.inc:133
-#: plugins/personal/posix/class_posixAccount.inc:957
+#: plugins/personal/posix/class_posixAccount.inc:960
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
@@ -1024,7 +1150,8 @@ msgstr "Desconfigurado"
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:217
+#: plugins/admin/systems/class_workstationService.inc:107
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
 msgid "automatic"
 msgstr "automático"
 
@@ -1094,7 +1221,7 @@ msgstr "Avisar al usuario %s días antes de expirar la contraseña"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:236
+#: plugins/personal/generic/class_user.inc:237
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
@@ -1105,7 +1232,7 @@ msgstr "Enero"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:236
+#: plugins/personal/generic/class_user.inc:237
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
@@ -1116,7 +1243,7 @@ msgstr "Febrero"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:236
+#: plugins/personal/generic/class_user.inc:237
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
@@ -1127,7 +1254,7 @@ msgstr "Marzo"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:236
+#: plugins/personal/generic/class_user.inc:237
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
@@ -1138,7 +1265,7 @@ msgstr "Abril"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:237
+#: plugins/personal/generic/class_user.inc:238
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
@@ -1149,7 +1276,7 @@ msgstr "Mayo"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:237
+#: plugins/personal/generic/class_user.inc:238
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
@@ -1160,7 +1287,7 @@ msgstr "Junio"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:237
+#: plugins/personal/generic/class_user.inc:238
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
@@ -1171,7 +1298,7 @@ msgstr "Julio"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:237
+#: plugins/personal/generic/class_user.inc:238
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
@@ -1182,7 +1309,7 @@ msgstr "Agosto"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:237
+#: plugins/personal/generic/class_user.inc:238
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
@@ -1193,7 +1320,7 @@ msgstr "Septiembre"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:238
+#: plugins/personal/generic/class_user.inc:239
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
@@ -1204,7 +1331,7 @@ msgstr "Octubre"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:238
+#: plugins/personal/generic/class_user.inc:239
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
@@ -1215,118 +1342,137 @@ msgstr "Noviembre"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:238
+#: plugins/personal/generic/class_user.inc:239
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
 msgstr "Diciembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:542
+#: plugins/personal/posix/class_posixAccount.inc:545
 #: plugins/personal/samba/class_sambaAccount.inc:450
 #: plugins/admin/systems/class_terminalGeneric.inc:62
-#: plugins/admin/systems/class_workstationGeneric.inc:70
 #: ihtml/themes/altlinux/setup_step4.tpl:91
 #: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/personal/posix/class_posixAccount.inc:542
+#: plugins/personal/posix/class_posixAccount.inc:545
 msgid "full access"
 msgstr "Acceso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:543
+#: plugins/personal/posix/class_posixAccount.inc:546
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/personal/posix/class_posixAccount.inc:712
+#: plugins/personal/posix/class_posixAccount.inc:715
 msgid "Failed: overriding lock"
 msgstr "Fallo: Sobrepasado bloqueo"
 
-#: plugins/personal/posix/class_posixAccount.inc:871
+#: plugins/personal/posix/class_posixAccount.inc:874
 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:874
+#: plugins/personal/posix/class_posixAccount.inc:877
 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:882
+#: plugins/personal/posix/class_posixAccount.inc:885
 msgid "Value specified as 'UID' is not valid."
 msgstr "El valor especificado en 'UID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:885
+#: plugins/personal/posix/class_posixAccount.inc:888
 msgid "Value specified as 'UID' is too small."
 msgstr "El valor especificado como 'UID' es demasiado pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:889
-#: plugins/admin/groups/class_groupGeneric.inc:617
+#: plugins/personal/posix/class_posixAccount.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:642
 msgid "Value specified as 'GID' is not valid."
 msgstr "El valor especificado como 'GID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:892
-#: plugins/admin/groups/class_groupGeneric.inc:620
+#: plugins/personal/posix/class_posixAccount.inc:895
+#: plugins/admin/groups/class_groupGeneric.inc:645
 msgid "Value specified as 'GID' is too small."
 msgstr "El valor especificado como 'GID' es muy pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:900
+#: plugins/personal/posix/class_posixAccount.inc:903
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "El valor especificado en 'shadowMin' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:905
+#: plugins/personal/posix/class_posixAccount.inc:908
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "El valor especificado en 'shadowMax' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:910
+#: plugins/personal/posix/class_posixAccount.inc:913
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "El valor especificado en 'shadowWarning' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:913
+#: plugins/personal/posix/class_posixAccount.inc:916
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:916
+#: plugins/personal/posix/class_posixAccount.inc:919
 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:919
+#: plugins/personal/posix/class_posixAccount.inc:922
 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:924
+#: plugins/personal/posix/class_posixAccount.inc:927
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "El valor especificado en 'shadowInactive' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:927
+#: plugins/personal/posix/class_posixAccount.inc:930
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "'shadowInactive' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:932
+#: plugins/personal/posix/class_posixAccount.inc:935
 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:1036
-#: plugins/admin/groups/class_groupGeneric.inc:651
+#: plugins/personal/posix/class_posixAccount.inc:1039
+#: plugins/admin/groups/class_groupGeneric.inc:676
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
-#: plugins/personal/samba/samba3.tpl:23
-msgid "Domain"
-msgstr "Dominio"
+#: plugins/personal/samba/samba2.tpl:13
+msgid "Samba home"
+msgstr "Directorio Samba"
 
-#: plugins/personal/samba/samba3.tpl:38 plugins/personal/samba/samba2.tpl:30
+#: plugins/personal/samba/samba2.tpl:30 plugins/personal/samba/samba3.tpl:38
 msgid "Script path"
 msgstr "Ruta del Script"
 
-#: plugins/personal/samba/samba3.tpl:44 plugins/personal/samba/samba3.tpl:95
-#: plugins/personal/samba/samba2.tpl:36
+#: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
+#: plugins/personal/samba/samba3.tpl:95
 #: plugins/personal/samba/class_sambaAccount.inc:631
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
+#: plugins/personal/samba/samba2.tpl:48 plugins/personal/samba/samba3.tpl:230
+msgid "Access options"
+msgstr "Opciones de acceso"
+
+#: plugins/personal/samba/samba2.tpl:54 plugins/personal/samba/samba3.tpl:236
+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:239
+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
+msgid "Temporary disable samba account"
+msgstr "Desactivar temporalmente la cuenta samba"
+
+#: plugins/personal/samba/samba3.tpl:23
+msgid "Domain"
+msgstr "Dominio"
+
 #: plugins/personal/samba/samba3.tpl:56
 msgid "Terminal Server"
 msgstr "Servidor de terminal"
@@ -1399,18 +1545,6 @@ msgstr "Desconexion"
 msgid "Reconnect if disconnected"
 msgstr "Reconexión si se ha desconectado"
 
-#: plugins/personal/samba/samba3.tpl:230 plugins/personal/samba/samba2.tpl:48
-msgid "Access options"
-msgstr "Opciones de acceso"
-
-#: plugins/personal/samba/samba3.tpl:236 plugins/personal/samba/samba2.tpl:54
-msgid "Allow user to change password from client"
-msgstr "Permitir al usuario cambiar las opciones desde el cliente"
-
-#: plugins/personal/samba/samba3.tpl:239 plugins/personal/samba/samba2.tpl:57
-msgid "Login from windows client requires no password"
-msgstr "El inicio de sesión en window no requiere contraseña"
-
 #: plugins/personal/samba/samba3.tpl:242
 msgid "Lock samba account"
 msgstr "Bloquear cuenta samba"
@@ -1431,14 +1565,6 @@ msgstr "La cuenta expirará después de"
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
-#: plugins/personal/samba/samba2.tpl:13
-msgid "Samba home"
-msgstr "Directorio Samba"
-
-#: plugins/personal/samba/samba2.tpl:60
-msgid "Temporary disable samba account"
-msgstr "Desactivar temporalmente la cuenta samba"
-
 #: plugins/personal/samba/main.inc:123
 msgid "Samba settings"
 msgstr "Parametros de samba"
@@ -1562,92 +1688,92 @@ 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:247
+#: plugins/personal/generic/class_user.inc:248
 msgid "female"
 msgstr "mujer"
 
-#: plugins/personal/generic/class_user.inc:247
+#: plugins/personal/generic/class_user.inc:248
 msgid "male"
 msgstr "hombre"
 
-#: plugins/personal/generic/class_user.inc:257
+#: plugins/personal/generic/class_user.inc:262
 msgid "This account has no valid GOsa extensions."
 msgstr "Esta cuenta no tiene extensiones GOsa validas"
 
-#: plugins/personal/generic/class_user.inc:286
+#: plugins/personal/generic/class_user.inc:291
 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:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Please enter a valid serial number"
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:424
 #, php-format
 msgid ""
 "Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:424
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:418
+#: plugins/personal/generic/class_user.inc:424
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:422
+#: plugins/personal/generic/class_user.inc:428
 #, fuzzy
 msgid "No certificate installed"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/class_user.inc:822
+#: plugins/personal/generic/class_user.inc:835
 msgid "Kerberos database communication failed"
 msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/class_user.inc:839
+#: plugins/personal/generic/class_user.inc:852
 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:850
+#: plugins/personal/generic/class_user.inc:863
 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:880
+#: plugins/personal/generic/class_user.inc:893
 #, fuzzy
 msgid "Invalid characters in uid."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/personal/generic/class_user.inc:894
+#: plugins/personal/generic/class_user.inc:907
 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:899
+#: plugins/personal/generic/class_user.inc:912
 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:905
+#: plugins/personal/generic/class_user.inc:918
 #: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:529
+#: plugins/admin/users/class_userManagement.inc:543
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:914
+#: plugins/personal/generic/class_user.inc:927
 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:920
+#: plugins/personal/generic/class_user.inc:933
 #: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/admin/users/class_userManagement.inc:546
 msgid "The required field 'Given name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:923
+#: plugins/personal/generic/class_user.inc:936
 msgid "The required field 'Login' is not set."
 msgstr " El campo requerido 'Login' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:930
+#: plugins/personal/generic/class_user.inc:943
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -1655,7 +1781,7 @@ msgstr ""
 "Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
 "base de datos."
 
-#: plugins/personal/generic/class_user.inc:937
+#: plugins/personal/generic/class_user.inc:950
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -1663,55 +1789,65 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/personal/generic/class_user.inc:940
+#: plugins/personal/generic/class_user.inc:953
 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:943
-#: plugins/personal/generic/class_user.inc:971
+#: plugins/personal/generic/class_user.inc:956
+#: plugins/personal/generic/class_user.inc:984
 #: plugins/addons/addressbook/class_addressbook.inc:537
 #: plugins/addons/addressbook/class_addressbook.inc:565
 #: plugins/admin/departments/class_departmentGeneric.inc:166
 msgid "The field 'Name' contains invalid characters."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/personal/generic/class_user.inc:946
-#: plugins/personal/generic/class_user.inc:968
+#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:981
 #: plugins/addons/addressbook/class_addressbook.inc:540
 #: plugins/addons/addressbook/class_addressbook.inc:562
 msgid "The field 'Given name' contains invalid characters."
 msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
 
-#: plugins/personal/generic/class_user.inc:951
-#: plugins/personal/generic/class_user.inc:954
+#: plugins/personal/generic/class_user.inc:964
+#: plugins/personal/generic/class_user.inc:967
 #: plugins/addons/addressbook/class_addressbook.inc:545
 #: plugins/addons/addressbook/class_addressbook.inc:548
 #: plugins/admin/departments/class_departmentGeneric.inc:169
 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:957
+#: plugins/personal/generic/class_user.inc:970
 #: plugins/addons/addressbook/class_addressbook.inc:551
 #: plugins/admin/departments/class_departmentGeneric.inc:172
 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:960
+#: plugins/personal/generic/class_user.inc:973
 #: plugins/addons/addressbook/class_addressbook.inc:554
 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:963
+#: plugins/personal/generic/class_user.inc:976
 #: plugins/addons/addressbook/class_addressbook.inc:557
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 "El campo 'Dispositivo de Busqueda' contiene un número de teléfono invalido."
 
-#: plugins/personal/generic/class_user.inc:1088
+#: plugins/personal/generic/class_user.inc:1103
 #, fuzzy
 msgid "Could not open specified certificate!"
 msgstr "No puedo seleccionar la base de datos."
 
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+"Ha cambiado el método en que su clave es guardada en la base de datos LDAP. "
+"Por esa razón tiene que volver a reintroducir su contraseña de nuevo. Gosa "
+"codificara esta con el nuevo método seleccionado."
+
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Información personal"
@@ -1726,24 +1862,20 @@ msgid "Change picture"
 msgstr "Cambiar foto"
 
 #: plugins/personal/generic/generic.tpl:24
-#: plugins/personal/environment/logonManagement.tpl:10
-#: plugins/personal/environment/hotplugDialogNew.tpl:7
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/class_addressbook.inc:504
 #: plugins/admin/users/template.tpl:19 plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:98
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:112
-#: plugins/admin/FAI/faiPartitionTable.tpl:9
-#: plugins/admin/FAI/faiVariable.tpl:9 plugins/admin/FAI/faiScriptEntry.tpl:9
-#: plugins/admin/FAI/faiPackage.tpl:9 plugins/admin/FAI/faiProfile.tpl:6
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:7
-#: plugins/admin/FAI/faiScript.tpl:9 plugins/admin/FAI/faiVariableEntry.tpl:9
-#: plugins/admin/FAI/faiTemplate.tpl:9 plugins/admin/FAI/faiHookEntry.tpl:9
-#: plugins/admin/FAI/faiTemplateEntry.tpl:9 plugins/admin/FAI/faiHook.tpl:9
-#: plugins/gofon/macro/parameter.tpl:5
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
+#: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
+#: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:54 html/getxls.php:149
+#: html/getxls.php:194 html/getxls.php:203 html/getxls.php:206
 msgid "Name"
 msgstr "Nombre"
 
@@ -1778,29 +1910,34 @@ msgstr "Fecha de nacimiento"
 msgid "Set"
 msgstr "por debajo"
 
-#: plugins/personal/generic/generic.tpl:81
+#: plugins/personal/generic/generic.tpl:81 html/getxls.php:194
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/generic.tpl:92
+#: plugins/personal/generic/generic.tpl:91
+#, fuzzy
+msgid "Preferred langage"
+msgstr "Lenguaje por defecto"
+
+#: plugins/personal/generic/generic.tpl:102
 #: plugins/gofax/blocklists/generic.tpl:14 plugins/admin/groups/generic.tpl:21
 #: plugins/admin/applications/generic.tpl:33
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:18
-#: plugins/admin/systems/printer.tpl:29
+#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/phone.tpl:13
+#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/workstation.tpl:27
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
 #: plugins/gofon/macro/generic.tpl:20 plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr "Base"
 
-#: plugins/personal/generic/generic.tpl:96
+#: plugins/personal/generic/generic.tpl:106
 msgid "Choose subtree to place user in"
 msgstr "Elija el subárbol donde colocar el usuario"
 
-#: plugins/personal/generic/generic.tpl:111
-#: plugins/personal/generic/generic.tpl:255
+#: plugins/personal/generic/generic.tpl:121
+#: plugins/personal/generic/generic.tpl:265
 #: plugins/addons/addressbook/address_edit.tpl:44
 #: plugins/addons/addressbook/address_edit.tpl:93
 #: plugins/addons/addressbook/address_info.tpl:33
@@ -1809,51 +1946,51 @@ msgstr "Elija el subárbol donde colocar el usuario"
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/generic.tpl:115
+#: plugins/personal/generic/generic.tpl:125
 msgid "Private phone"
 msgstr "Numero privado"
 
-#: plugins/personal/generic/generic.tpl:119
+#: plugins/personal/generic/generic.tpl:129
 msgid "Homepage"
 msgstr "Página Web Principal"
 
-#: plugins/personal/generic/generic.tpl:128
+#: plugins/personal/generic/generic.tpl:138
 msgid "Password storage"
 msgstr "Carpeta de almacenamiento de Contraseñas"
 
-#: plugins/personal/generic/generic.tpl:138
+#: plugins/personal/generic/generic.tpl:148
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificados"
 
-#: plugins/personal/generic/generic.tpl:140
+#: plugins/personal/generic/generic.tpl:150
 msgid "Edit certificates"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/generic.tpl:144
+#: plugins/personal/generic/generic.tpl:154
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:145
+#: plugins/personal/generic/generic.tpl:155
 msgid "Edit properties"
 msgstr "Editar propiedades"
 
-#: plugins/personal/generic/generic.tpl:161
+#: plugins/personal/generic/generic.tpl:171
 msgid "Organizational information"
 msgstr "Información organizativa"
 
-#: plugins/personal/generic/generic.tpl:173
+#: plugins/personal/generic/generic.tpl:183 html/getxls.php:206
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/generic.tpl:177
+#: plugins/personal/generic/generic.tpl:187
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:307
 #: plugins/addons/addressbook/address_edit.tpl:75
 #: plugins/addons/addressbook/address_info.tpl:64
 #: plugins/admin/groups/class_groupManagement.inc:385
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:686
 #: plugins/admin/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/systems/class_systemManagement.inc:586
 #: plugins/admin/ogroups/class_ogroupManagement.inc:414
 #: plugins/admin/ogroups/class_ogroupManagement.inc:482
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:342
@@ -1861,137 +1998,115 @@ msgstr "Organización"
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/generic.tpl:181
+#: plugins/personal/generic/generic.tpl:191
 msgid "Department No."
 msgstr "Departamento No."
 
-#: plugins/personal/generic/generic.tpl:187
+#: plugins/personal/generic/generic.tpl:197
 msgid "Employee No."
 msgstr "Empleado No."
 
-#: plugins/personal/generic/generic.tpl:193
+#: plugins/personal/generic/generic.tpl:203
 msgid "Employee type"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/generic.tpl:209
-#: plugins/personal/generic/generic.tpl:348
+#: plugins/personal/generic/generic.tpl:219
+#: plugins/personal/generic/generic.tpl:358
 msgid "Room No."
 msgstr "Habitación No."
 
-#: plugins/personal/generic/generic.tpl:221
+#: plugins/personal/generic/generic.tpl:231
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:51
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr "Teléfono Móvil"
 
-#: plugins/personal/generic/generic.tpl:225
+#: plugins/personal/generic/generic.tpl:235
 #: plugins/addons/addressbook/address_edit.tpl:102
-#: plugins/addons/addressbook/address_info.tpl:91
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:149
+#: html/getxls.php:206
 msgid "Pager"
 msgstr "Dispositivo de aviso"
 
-#: plugins/personal/generic/generic.tpl:247
+#: plugins/personal/generic/generic.tpl:257
 #: plugins/admin/departments/generic.tpl:42
 #: plugins/admin/departments/generic.tpl:50
-#: plugins/admin/systems/printer.tpl:49
+#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:149
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/generic.tpl:251
-#: plugins/admin/departments/generic.tpl:46
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/admin/departments/generic.tpl:46 html/getxls.php:149
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/generic.tpl:269
+#: plugins/personal/generic/generic.tpl:279
 msgid "Vocation"
 msgstr "Intereses"
 
-#: plugins/personal/generic/generic.tpl:273
+#: plugins/personal/generic/generic.tpl:283
 msgid "Unit description"
 msgstr "Descripción de la unidad"
 
-#: plugins/personal/generic/generic.tpl:281
+#: plugins/personal/generic/generic.tpl:291
 msgid "Subject area"
 msgstr "Adjunto al area"
 
-#: plugins/personal/generic/generic.tpl:289
+#: plugins/personal/generic/generic.tpl:299
 msgid "Functional title"
 msgstr "Título Funcional"
 
-#: plugins/personal/generic/generic.tpl:296
+#: plugins/personal/generic/generic.tpl:306
 msgid "Role"
 msgstr "Papel desempeñado"
 
-#: plugins/personal/generic/generic.tpl:308
+#: plugins/personal/generic/generic.tpl:318
 msgid "Person locality"
 msgstr "Población de la Persona"
 
-#: plugins/personal/generic/generic.tpl:316
+#: plugins/personal/generic/generic.tpl:326
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/generic.tpl:323
+#: plugins/personal/generic/generic.tpl:333
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/generic.tpl:329
+#: plugins/personal/generic/generic.tpl:339
 #: plugins/addons/addressbook/address_edit.tpl:81
-#: plugins/addons/addressbook/address_info.tpl:70
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:149
 msgid "Postal code"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:345
 msgid "House identifier"
 msgstr "Tipo de Vía"
 
-#: plugins/personal/generic/generic.tpl:357
+#: plugins/personal/generic/generic.tpl:367
 msgid "Please use the phone tab"
 msgstr "Por favor use la casilla teléfono"
 
-#: plugins/personal/generic/generic.tpl:370
+#: plugins/personal/generic/generic.tpl:380
 msgid "Last delivery"
 msgstr "Último envío"
 
-#: plugins/personal/generic/generic.tpl:377
+#: plugins/personal/generic/generic.tpl:387
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
-#: plugins/personal/generic/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
-msgstr ""
-"Ha cambiado el método en que su clave es guardada en la base de datos LDAP. "
-"Por esa razón tiene que volver a reintroducir su contraseña de nuevo. Gosa "
-"codificara esta con el nuevo método seleccionado."
-
 #: plugins/personal/generic/generic_picture.tpl:23
 msgid "Remove picture"
 msgstr "Eliminar foto"
 
 #: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/addons/addressbook/address_edit.tpl:114
-#: plugins/admin/systems/servnfs.tpl:85
-#: plugins/admin/systems/printerPPDDialog.tpl:22
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/FAI/faiScriptEntry.tpl:69
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:38
-#: plugins/admin/FAI/faiVariableEntry.tpl:48
-#: plugins/admin/FAI/faiHookEntry.tpl:58
-#: plugins/admin/FAI/faiTemplateEntry.tpl:58
+#: plugins/admin/systems/servnfs.tpl:91
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 msgid "Save"
 msgstr "Guardar"
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "¡No tiene permisos para cambiar su contraseña!"
-
-#: plugins/personal/generic/main.inc:194
-msgid "Generic user information"
-msgstr "Información genérica del usuario"
-
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificado estandar"
@@ -2000,10 +2115,15 @@ msgstr "Certificado estandar"
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
+#: plugins/personal/environment/environment.tpl:118
 #: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:251
+#: plugins/admin/systems/printer.tpl:47
+#: plugins/admin/systems/workstationStartup.tpl:93
+#: plugins/admin/systems/terminalStartup.tpl:81
+#: plugins/admin/fai/faiPackage.tpl:74
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:245
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Eliminar"
@@ -2020,55 +2140,42 @@ msgstr "Certificado PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
-#: plugins/personal/connectivity/pureftpd.tpl:1
-msgid "FTP account"
-msgstr "Cuenta FTP"
-
-#: plugins/personal/connectivity/pureftpd.tpl:11
-msgid "Bandwidth"
-msgstr "Ancho de banda"
-
-#: plugins/personal/connectivity/pureftpd.tpl:15
-msgid "Upload bandwidth"
-msgstr "Ancho de banda ascendente"
-
-#: plugins/personal/connectivity/pureftpd.tpl:16
-#: plugins/personal/connectivity/pureftpd.tpl:20
-msgid "kb/s"
-msgstr "Kb/s"
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "¡No tiene permisos para cambiar su contraseña!"
 
-#: plugins/personal/connectivity/pureftpd.tpl:19
-msgid "Download bandwidth"
-msgstr "Ancho de banda descendente"
+#: plugins/personal/generic/main.inc:189
+msgid "Generic user information"
+msgstr "Información genérica del usuario"
 
-#: plugins/personal/connectivity/pureftpd.tpl:31
-#: plugins/personal/environment/environment.tpl:53
-msgid "Quota"
-msgstr "Cuota"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
 
-#: plugins/personal/connectivity/pureftpd.tpl:35
-msgid "Files"
-msgstr "Archivos"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+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/pureftpd.tpl:39
-msgid "Size"
-msgstr "Tamaño"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+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/pureftpd.tpl:50
-msgid "Ratio"
-msgstr "Relación"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
+msgstr "El valor especificado como 'Archivos' no es válido"
 
-#: plugins/personal/connectivity/pureftpd.tpl:54
-msgid "Uploaded / downloaded files"
-msgstr "Archivos Subidos / Descargados"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
+msgstr "El valor especificado como 'Tamaño' no es válido"
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Check to disable FTP Access"
-msgstr "Active para desactivar acceso FTP"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "El valor especificado como 'relación' no es válido"
 
-#: plugins/personal/connectivity/pureftpd.tpl:67
-msgid "Temporary disable FTP access"
-msgstr "Acceso FTP desactivado temporalmente"
+#: plugins/personal/connectivity/class_phpgwAccount.inc:5
+msgid "PHPGroupware"
+msgstr "PHPGroupware"
 
 #: plugins/personal/connectivity/proxy.tpl:16
 msgid "Proxy account"
@@ -2090,60 +2197,6 @@ msgstr "Restringir el uso del proxy con cuota"
 msgid "per"
 msgstr "por"
 
-#: plugins/personal/connectivity/class_phpgwAccount.inc:5
-msgid "PHPGroupware"
-msgstr "PHPGroupware"
-
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr "Cuenta PHPGroupware"
-
-#: plugins/personal/connectivity/kolab.tpl:1
-msgid "Kolab account"
-msgstr "Cuenta Kolab"
-
-#: plugins/personal/connectivity/kolab.tpl:4
-msgid ""
-"The kolab account is currently disabled. It's features can be adjusted if "
-"you add a mail account."
-msgstr ""
-"La cuenta kolab está actualmente desactivada. Sus características serán "
-"modificadas si añade una cuenta de correo."
-
-#: plugins/personal/connectivity/kolab.tpl:10
-msgid "Delegations"
-msgstr "Delegaciones"
-
-#: plugins/personal/connectivity/kolab.tpl:23
-msgid "Mail size"
-msgstr "Tamaño del correo electrónico"
-
-#: plugins/personal/connectivity/kolab.tpl:24
-msgid "No mail size restriction for this account"
-msgstr "No hay restricción de correo para esta cuenta."
-
-#: plugins/personal/connectivity/kolab.tpl:32
-msgid "Free Busy information"
-msgstr "Información de estado de presencia"
-
-#: plugins/personal/connectivity/kolab.tpl:35
-msgid "URL"
-msgstr "URL"
-
-#: plugins/personal/connectivity/kolab.tpl:39
-msgid "Future"
-msgstr "Futuro"
-
-#: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
-msgid "days"
-msgstr "días"
-
-#: plugins/personal/connectivity/kolab.tpl:45
-msgid "Invitation policy"
-msgstr "Política de invitación"
-
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
 msgid "Kolab"
 msgstr "Kolab"
@@ -2212,66 +2265,59 @@ msgstr ""
 msgid "WebDAV"
 msgstr "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:125
-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/phpgw.tpl:1
+msgid "PHPGroupware account"
+msgstr "Cuenta PHPGroupware"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
-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/kolab.tpl:1
+msgid "Kolab account"
+msgstr "Cuenta Kolab"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
-msgid "Value specified as 'Files' is not valid."
-msgstr "El valor especificado como 'Archivos' no es válido"
+#: plugins/personal/connectivity/kolab.tpl:4
+msgid ""
+"The kolab account is currently disabled. It's features can be adjusted if "
+"you add a mail account."
+msgstr ""
+"La cuenta kolab está actualmente desactivada. Sus características serán "
+"modificadas si añade una cuenta de correo."
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
-msgid "Value specified as 'Size' is not valid."
-msgstr "El valor especificado como 'Tamaño' no es válido"
+#: plugins/personal/connectivity/kolab.tpl:10
+msgid "Delegations"
+msgstr "Delegaciones"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "El valor especificado como 'relación' no es válido"
-
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "Cuenta WebDAV"
-
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "Open-Xchange Account"
-msgstr "Cuenta Open-Xchange"
+#: plugins/personal/connectivity/kolab.tpl:23
+msgid "Mail size"
+msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
-msgstr "desactivado, No se ha detectado soporte Postgresql"
+#: plugins/personal/connectivity/kolab.tpl:24
+msgid "No mail size restriction for this account"
+msgstr "No hay restricción de correo para esta cuenta."
 
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Open-Xchange account"
-msgstr "Cuenta de Open-Xchange"
+#: plugins/personal/connectivity/kolab.tpl:32
+msgid "Free Busy information"
+msgstr "Información de estado de presencia"
 
-#: plugins/personal/connectivity/oxchange.tpl:13
-msgid "Remember"
-msgstr "Recordar"
+#: plugins/personal/connectivity/kolab.tpl:35
+msgid "URL"
+msgstr "URL"
 
-#: plugins/personal/connectivity/oxchange.tpl:17
-msgid "Appointment Days"
-msgstr "Días de recordatorio"
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "Future"
+msgstr "Futuro"
 
-#: plugins/personal/connectivity/oxchange.tpl:21
-msgid "Task Days"
-msgstr "Días para tareas"
+#: plugins/personal/connectivity/kolab.tpl:40
+#: plugins/personal/connectivity/oxchange.tpl:18
+#: plugins/personal/connectivity/oxchange.tpl:22
+msgid "days"
+msgstr "días"
 
-#: plugins/personal/connectivity/oxchange.tpl:33
-msgid "User Information"
-msgstr "Información de Usuario"
+#: plugins/personal/connectivity/kolab.tpl:45
+msgid "Invitation policy"
+msgstr "Política de invitación"
 
-#: plugins/personal/connectivity/oxchange.tpl:37
-msgid "User Timezone"
-msgstr "Zona de uso horario del usuario"
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
@@ -2314,6 +2360,88 @@ msgstr ""
 msgid "PHP4 module for Postgresql Database Failed!"
 msgstr "¡El módulo de PHP4 para la base de datos Postgresql falla!"
 
+#: plugins/personal/connectivity/pureftpd.tpl:1
+msgid "FTP account"
+msgstr "Cuenta FTP"
+
+#: plugins/personal/connectivity/pureftpd.tpl:11
+msgid "Bandwidth"
+msgstr "Ancho de banda"
+
+#: plugins/personal/connectivity/pureftpd.tpl:15
+msgid "Upload bandwidth"
+msgstr "Ancho de banda ascendente"
+
+#: plugins/personal/connectivity/pureftpd.tpl:16
+#: plugins/personal/connectivity/pureftpd.tpl:20
+msgid "kb/s"
+msgstr "Kb/s"
+
+#: plugins/personal/connectivity/pureftpd.tpl:19
+msgid "Download bandwidth"
+msgstr "Ancho de banda descendente"
+
+#: plugins/personal/connectivity/pureftpd.tpl:31
+#: plugins/personal/environment/environment.tpl:65
+msgid "Quota"
+msgstr "Cuota"
+
+#: plugins/personal/connectivity/pureftpd.tpl:35
+msgid "Files"
+msgstr "Archivos"
+
+#: plugins/personal/connectivity/pureftpd.tpl:39
+msgid "Size"
+msgstr "Tamaño"
+
+#: plugins/personal/connectivity/pureftpd.tpl:50
+msgid "Ratio"
+msgstr "Relación"
+
+#: plugins/personal/connectivity/pureftpd.tpl:54
+msgid "Uploaded / downloaded files"
+msgstr "Archivos Subidos / Descargados"
+
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Check to disable FTP Access"
+msgstr "Active para desactivar acceso FTP"
+
+#: plugins/personal/connectivity/pureftpd.tpl:67
+msgid "Temporary disable FTP access"
+msgstr "Acceso FTP desactivado temporalmente"
+
+#: 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"
+
+#: plugins/personal/connectivity/oxchange.tpl:4
+msgid "Open-Xchange account"
+msgstr "Cuenta de Open-Xchange"
+
+#: plugins/personal/connectivity/oxchange.tpl:13
+msgid "Remember"
+msgstr "Recordar"
+
+#: plugins/personal/connectivity/oxchange.tpl:17
+msgid "Appointment Days"
+msgstr "Días de recordatorio"
+
+#: plugins/personal/connectivity/oxchange.tpl:21
+msgid "Task Days"
+msgstr "Días para tareas"
+
+#: plugins/personal/connectivity/oxchange.tpl:33
+msgid "User Information"
+msgstr "Información de Usuario"
+
+#: plugins/personal/connectivity/oxchange.tpl:37
+msgid "User Timezone"
+msgstr "Zona de uso horario del usuario"
+
 #: plugins/personal/connectivity/intranet.tpl:1
 #, fuzzy
 msgid "Intranet account"
@@ -2365,125 +2493,202 @@ msgstr "El valor de 'Tamaño de Cola' no es valido."
 msgid "Intranet"
 msgstr ""
 
+#: plugins/personal/environment/main.inc:124
+#, fuzzy
+msgid "User environment settings"
+msgstr "Parametros del correo de usuarios"
+
+#: plugins/personal/environment/class_environment.inc:214
+#: plugins/personal/environment/class_environment.inc:250
+#, fuzzy
+msgid "Remove environment extension"
+msgstr "Eliminar extensión Kolab"
+
+#: plugins/personal/environment/class_environment.inc:215
+#: plugins/personal/environment/class_environment.inc:251
+#, fuzzy
+msgid "Environment extension enabled. You can disable it by clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
+
+#: plugins/personal/environment/class_environment.inc:224
+#: plugins/personal/environment/class_environment.inc:229
+#: plugins/personal/environment/class_environment.inc:257
+#: plugins/personal/environment/class_environment.inc:262
+msgid "Add environment extension"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:225
+#: plugins/personal/environment/class_environment.inc:258
+#, fuzzy
+msgid "Environment extension disabled. You can enable it by clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
+
+#: plugins/personal/environment/class_environment.inc:230
+#: plugins/personal/environment/class_environment.inc:263
+#, fuzzy
+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í."
+
+#: plugins/personal/environment/class_environment.inc:449
+#: plugins/personal/environment/class_environment.inc:451
+#: plugins/admin/systems/class_terminalStartup.inc:131
+#: plugins/admin/systems/class_workstationStartup.inc:277
+#, fuzzy
+msgid "You must specify a valid mount point."
+msgstr "Por favor especifique un nombre de usuario valido."
+
+#: plugins/personal/environment/class_environment.inc:679
+#, fuzzy
+msgid "Please set a valid profile quota size."
+msgstr "Por favor especifique un rango VSync valido"
+
+#: plugins/personal/environment/class_environment.inc:686
+msgid ""
+"You need to setup a valid posix extension in order to enable evironment "
+"features."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:708
+msgid "Can't save new kiosk profiles, possibly permission denied for folder"
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:801
+#, fuzzy
+msgid "Error while writing printer"
+msgstr "¡Error mientras se exportaban las entradas indicadas!"
+
+#: plugins/personal/environment/class_environment.inc:871
+#, fuzzy
+msgid "Error while writing printer settings"
+msgstr "¡Error mientras se exportaban las entradas indicadas!"
+
+#: plugins/personal/environment/class_environment.inc:986
+#, fuzzy
+msgid "Admin"
+msgstr "DN del administrador"
+
 #: plugins/personal/environment/environment.tpl:3
 msgid "The environment extension is currently disabled."
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:6
+#: plugins/personal/environment/environment.tpl:8
+#: plugins/personal/environment/environment.tpl:100
+#: plugins/personal/environment/environment.tpl:146
 #, fuzzy
 msgid "Environment managment settings"
 msgstr "Parametros del correo de usuarios"
 
-#: plugins/personal/environment/environment.tpl:9
-#, fuzzy
-msgid "Profiles"
-msgstr "Ruta del Perfil"
-
-#: plugins/personal/environment/environment.tpl:10
+#: plugins/personal/environment/environment.tpl:11
 #, fuzzy
 msgid "Profile managment"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/personal/environment/environment.tpl:17
+#: plugins/personal/environment/environment.tpl:18
 #, fuzzy
 msgid "Use profile managment"
 msgstr "Gestión de Asterisk PBX"
 
-#: plugins/personal/environment/environment.tpl:24
+#: plugins/personal/environment/environment.tpl:25
 #, fuzzy
 msgid "Profile server managment"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/personal/environment/environment.tpl:27
+#: plugins/personal/environment/environment.tpl:28
 #, fuzzy
-msgid "Profil server"
-msgstr "Servidor de Cola"
+msgid "Profil path"
+msgstr "Ruta del Perfil"
 
-#: plugins/personal/environment/environment.tpl:39
-msgid "Use local caching"
+#: plugins/personal/environment/environment.tpl:42
+msgid "Cache profile localy"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:62
-#: plugins/admin/systems/service.tpl:94
-msgid "Resolution"
-msgstr "Resolución"
+#: plugins/personal/environment/environment.tpl:51
+#, fuzzy
+msgid "Kiosk profile settings"
+msgstr "Parametros del correo de usuarios"
 
-#: plugins/personal/environment/environment.tpl:76
-msgid "Resolution changeable on runtime"
+#: plugins/personal/environment/environment.tpl:54
+msgid "Kiosk profile"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:82
-#: plugins/personal/environment/environment.tpl:86
-msgid "Kiosk profile"
+#: plugins/personal/environment/environment.tpl:60
+#, fuzzy
+msgid "Manage"
+msgstr "Nombre de la maquina"
+
+#: plugins/personal/environment/environment.tpl:79
+msgid "Resolution changeable on runtime"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:83
+#: plugins/personal/environment/environment.tpl:84
+#: plugins/admin/systems/workstationService.tpl:94
+#: plugins/admin/systems/terminalService.tpl:94
+msgid "Resolution"
+msgstr "Resolución"
+
+#: plugins/personal/environment/environment.tpl:103
+#: plugins/admin/systems/workstationStartup.tpl:78
+#: plugins/admin/systems/terminalStartup.tpl:66
 #, fuzzy
-msgid "Kiosk profile settings"
-msgstr "Parametros del correo de usuarios"
+msgid "Shares"
+msgstr "Borrar"
 
-#: plugins/personal/environment/environment.tpl:99
+#: plugins/personal/environment/environment.tpl:116
+#: plugins/admin/systems/workstationStartup.tpl:91
+#: plugins/admin/systems/terminalStartup.tpl:79
 #, fuzzy
-msgid "Profile management"
-msgstr "Mantenimiento de Departamentos"
+msgid "Mountpoint"
+msgstr "Monitor"
 
-#: plugins/personal/environment/environment.tpl:104
+#: plugins/personal/environment/environment.tpl:124
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:105
+#: plugins/personal/environment/environment.tpl:125
+#: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 #, fuzzy
 msgid "Logon script management"
 msgstr "Gestión del sistema"
 
-#: plugins/personal/environment/environment.tpl:122
-msgid "Attach share"
-msgstr ""
-
-#: plugins/personal/environment/environment.tpl:142
+#: plugins/personal/environment/environment.tpl:149
 #, fuzzy
 msgid "Hotplug devices"
 msgstr "Disquetera"
 
-#: plugins/personal/environment/environment.tpl:143
+#: plugins/personal/environment/environment.tpl:150
 #, fuzzy
 msgid "Hotplug device settings"
 msgstr "Disquetera"
 
-#: plugins/personal/environment/environment.tpl:153
+#: plugins/personal/environment/environment.tpl:160
 #: plugins/admin/groups/class_groupManagement.inc:354
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:328
 msgid "New"
 msgstr "Nuevo"
 
-#: plugins/personal/environment/environment.tpl:154
+#: plugins/personal/environment/environment.tpl:161
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:160
-#: plugins/admin/systems/class_systemManagement.inc:708
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/admin/ogroups/class_ogroupManagement.inc:487
-#: plugins/generic/references/class_reference.inc:52
-msgid "Printer"
-msgstr "Impresora"
-
-#: plugins/personal/environment/environment.tpl:161
+#: plugins/personal/environment/environment.tpl:169
 #, fuzzy
 msgid "Printer settings"
 msgstr "Configuración telefónica"
 
-#: plugins/personal/environment/environment.tpl:171
+#: plugins/personal/environment/environment.tpl:179
 #, fuzzy
 msgid "Admin Toggle"
 msgstr "Usuario administrador"
 
-#: plugins/personal/environment/main.inc:124
-#, fuzzy
-msgid "User environment settings"
-msgstr "Parametros del correo de usuarios"
-
 #: plugins/personal/environment/class_hotplugDialog.inc:109
 #, fuzzy
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
@@ -2509,159 +2714,58 @@ msgstr "Ya existe un Departamento con este 'Nombre'."
 msgid "Please select an entry or press cancel."
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:64
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:92
-#, fuzzy
-msgid "Please select a printer or press cancel."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
-
 #: plugins/personal/environment/hotplugDialog.tpl:1
 #, fuzzy
-msgid "Select hotplug entry"
-msgstr "Borrar"
+msgid "Add hotplug devices"
+msgstr "Disquetera"
 
 #: plugins/personal/environment/hotplugDialog.tpl:5
 #, fuzzy
 msgid "Hotplug management"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/personal/environment/hotplugDialog.tpl:24
-#: plugins/personal/environment/selectPrinterDialog.tpl:24
-#: plugins/gofax/blocklists/headpage.tpl:20
-#: plugins/gofax/blocklists/generic.tpl:67
-#: 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/admin/systems/selectUserToPrinterDialog.tpl:24
-#: plugins/admin/ogroups/headpage.tpl:20
-#: plugins/admin/FAI/faiProfileEntry.tpl:20 plugins/admin/FAI/headpage.tpl:20
-#: plugins/gofon/macro/headpage.tpl:20
-#: plugins/gofon/conference/headpage.tpl:20
-msgid "Information"
-msgstr "Información"
+#: plugins/personal/environment/hotplugDialog.tpl:10
+#, fuzzy
+msgid "Select hotplug device to add"
+msgstr "Borrar"
 
 #: plugins/personal/environment/hotplugDialog.tpl:28
-msgid "This menu allows you to select an existing hotplug configuration."
+msgid ""
+"This menu allows you to select existing hotplug devices. All devices of all "
+"users are choosable here."
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialog.tpl:40
-#, fuzzy
-msgid "Display hotplugs of department"
-msgstr "Mostrar los grupos de departamentos"
-
-#: plugins/personal/environment/hotplugDialog.tpl:43
+#: plugins/personal/environment/hotplugDialog.tpl:44
 #, fuzzy
 msgid "Choose the department the search will be based    on"
 msgstr "Escoja el departamento base de la busqueda"
 
-#: plugins/personal/environment/hotplugDialog.tpl:57
+#: plugins/personal/environment/hotplugDialog.tpl:53
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/users/headpage.tpl:48
-#: plugins/gofon/conference/headpage.tpl:34
+#: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
 msgstr "Mostrar usuarios que concuerden con"
 
-#: plugins/personal/environment/hotplugDialog.tpl:62
+#: plugins/personal/environment/hotplugDialog.tpl:58
 #, fuzzy
 msgid "Regular expression for        matching hotplugs"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/personal/environment/hotplugDialog.tpl:75
-#: plugins/personal/environment/selectPrinterDialog.tpl:74
-#: plugins/personal/environment/logonManagement.tpl:77
-#: plugins/admin/FAI/askClassName.tpl:27 plugins/admin/FAI/askClassName.tpl:44
-#, fuzzy
-msgid "Use"
-msgstr "Usuario"
-
-#: plugins/personal/environment/class_environment.inc:203
-#: plugins/personal/environment/class_environment.inc:235
-#, fuzzy
-msgid "Remove environment extension"
-msgstr "Eliminar extensión Kolab"
-
-#: plugins/personal/environment/class_environment.inc:204
-#: plugins/personal/environment/class_environment.inc:236
-#, fuzzy
-msgid ""
-"This server has environment extension enabled. You can disable it by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
-
-#: plugins/personal/environment/class_environment.inc:208
-#: plugins/personal/environment/class_environment.inc:213
-#: plugins/personal/environment/class_environment.inc:240
-#: plugins/personal/environment/class_environment.inc:245
-msgid "Add environment extension"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:209
-#: plugins/personal/environment/class_environment.inc:241
-#, fuzzy
-msgid ""
-"This server has environment extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
-
-#: plugins/personal/environment/class_environment.inc:214
-#: plugins/personal/environment/class_environment.inc:246
-#, fuzzy
-msgid ""
-"This server has 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í."
-
-#: plugins/personal/environment/class_environment.inc:409
-#, fuzzy
-msgid "You must specify a valid mount point."
-msgstr "Por favor especifique un nombre de usuario valido."
-
-#: plugins/personal/environment/class_environment.inc:621
-#, fuzzy
-msgid "Please set a valid profile quota size."
-msgstr "Por favor especifique un rango VSync valido"
-
-#: plugins/personal/environment/class_environment.inc:628
-msgid ""
-"You need to setup a valid posix extension in order to enable evironment "
-"features."
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:650
-msgid "Can't save new kiosk profiles, possibly permission denied for folder"
-msgstr ""
-
-#: plugins/personal/environment/class_environment.inc:724
-#, fuzzy
-msgid "Error while writing printer"
-msgstr "¡Error mientras se exportaban las entradas indicadas!"
-
-#: plugins/personal/environment/class_environment.inc:803
-#, fuzzy
-msgid "Error while writing printer settings"
-msgstr "¡Error mientras se exportaban las entradas indicadas!"
-
-#: plugins/personal/environment/class_environment.inc:965
+#: plugins/personal/environment/class_selectPrinterDialog.inc:64
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:92
 #, fuzzy
-msgid "Admin"
-msgstr "DN del administrador"
+msgid "Please select a printer or press cancel."
+msgstr "¡Por favor introduzca un número de teléfono valido!"
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:1
 #, fuzzy
-msgid "Select printer entry"
-msgstr "Seleccione para ver impresoras"
+msgid "Add printer devcies"
+msgstr "Dispositivo de Impresión"
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:5
 #: plugins/personal/environment/selectPrinterDialog.tpl:10
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:5
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:3
 #, fuzzy
 msgid "Select printer to add"
 msgstr "Seleccione números para añadir"
@@ -2677,119 +2781,127 @@ msgstr ""
 "seleccionados. Si tiene un gran numero de usuarios usted preferirá usar los "
 "selectores de rangos en la parte superior del listado."
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:41
-#, fuzzy
-msgid "Display printers of department"
-msgstr "Mostrar número de Departamentos"
-
-#: plugins/personal/environment/selectPrinterDialog.tpl:58
+#: plugins/personal/environment/selectPrinterDialog.tpl:54
 #, fuzzy
 msgid "Display printers matching"
 msgstr "Mostrar números que concuerdan con"
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:63
+#: plugins/personal/environment/selectPrinterDialog.tpl:59
 #, fuzzy
 msgid "Regular expression for matching printer names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:93
-#, fuzzy
-msgid "Specified name is invalid."
-msgstr "El nombre especificado ya esta siendo usado"
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:97
-#, fuzzy
-msgid "Specified description contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
-
-#: plugins/personal/environment/logonManagement.tpl:1
-#, fuzzy
-msgid "Logon management"
-msgstr "Mantenimiento de Departamentos"
-
 #: plugins/personal/environment/logonManagement.tpl:8
 #, fuzzy
 msgid "Logon script settings"
 msgstr "Parametros Unix"
 
+#: plugins/personal/environment/logonManagement.tpl:10
+#, fuzzy
+msgid "Skript name"
+msgstr "Nombre de la lista"
+
 #: plugins/personal/environment/logonManagement.tpl:17
-#: plugins/personal/environment/hotplugDialogNew.tpl:14
+#: plugins/personal/environment/hotplugDialogNew.tpl:17
 #: plugins/gofax/blocklists/generic.tpl:41 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:24
 #: plugins/admin/departments/generic.tpl:12
 #: plugins/admin/systems/server.tpl:24 plugins/admin/systems/phone.tpl:24
-#: plugins/admin/systems/printer.tpl:18
+#: 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/faiPartitionTable.tpl:19
-#: plugins/admin/FAI/faiVariable.tpl:19
-#: plugins/admin/FAI/faiScriptEntry.tpl:17 plugins/admin/FAI/faiPackage.tpl:19
-#: plugins/admin/FAI/faiProfile.tpl:16
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:193
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:18
-#: plugins/admin/FAI/faiScript.tpl:19
-#: plugins/admin/FAI/faiVariableEntry.tpl:17
-#: plugins/admin/FAI/faiTemplate.tpl:19 plugins/admin/FAI/faiHookEntry.tpl:17
-#: plugins/admin/FAI/faiTemplateEntry.tpl:17 plugins/admin/FAI/faiHook.tpl:19
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/faiPartitionTable.tpl:19
+#: plugins/admin/fai/faiVariable.tpl:19
+#: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiVariableEntry.tpl:17
+#: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
+#: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/gofon/macro/generic.tpl:36 plugins/gofon/conference/generic.tpl:51
-#: plugins/generic/references/contents.tpl:11
+#: plugins/generic/references/contents.tpl:11 html/getxls.php:103
+#: html/getxls.php:200
 msgid "Description"
 msgstr "Descripción"
 
 #: plugins/personal/environment/logonManagement.tpl:24
-#: plugins/admin/FAI/faiScriptEntry.tpl:34
+#: plugins/admin/fai/faiScriptEntry.tpl:34
 #, fuzzy
 msgid "Priority"
 msgstr "Puerto"
 
-#: plugins/personal/environment/logonManagement.tpl:35
+#: plugins/personal/environment/logonManagement.tpl:34
 msgid "Logon script flags"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:40
+#: plugins/personal/environment/logonManagement.tpl:38
 msgid "Last script"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:48
-msgid "Overloadable"
+#: plugins/personal/environment/logonManagement.tpl:44
+msgid "Script can be replaced by user"
 msgstr ""
 
-#: plugins/personal/environment/logonManagement.tpl:65
+#: plugins/personal/environment/logonManagement.tpl:56
 msgid "Logon script"
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:54
-#, php-format
-msgid "Can't delete '%s'. Error was: permission denied."
-msgstr ""
-
-#: plugins/personal/environment/class_kioskManagementDialog.inc:57
-#, php-format
-msgid "Can't delete '%s'. Errow was: file doesn't exist."
-msgstr ""
+#: plugins/personal/environment/class_logonManagementDialog.inc:93
+#, fuzzy
+msgid "Specified name is invalid."
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:80
-#, php-format
-msgid "Can't open '%s'. Error was: permission denied."
-msgstr ""
+#: plugins/personal/environment/class_logonManagementDialog.inc:97
+#, fuzzy
+msgid "Specified description contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
 #: plugins/personal/environment/hotplugDialogNew.tpl:1
-#: plugins/personal/environment/hotplugDialogNew.tpl:5
 #, fuzzy
 msgid "Create new hotplug entry"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:21
+#: plugins/personal/environment/hotplugDialogNew.tpl:8
 #, fuzzy
-msgid "ID"
-msgstr "UID"
+msgid "Create new hotplug device"
+msgstr "Crear una nueva entrada en"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:10
+#: plugins/admin/systems/component.tpl:6
+msgid "Device name"
+msgstr "Nombre del dispositivo"
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:29
+#: plugins/personal/environment/hotplugDialogNew.tpl:28
+#, fuzzy
+msgid "Device ID"
+msgstr "Servicios"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:38
 #, fuzzy
 msgid "save"
 msgstr "Guardar"
 
+#: plugins/personal/environment/class_kioskManagementDialog.inc:54
+#, php-format
+msgid "Can't delete '%s'. Error was: permission denied."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:57
+#, php-format
+msgid "Can't delete '%s'. Errow was: file doesn't exist."
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:81
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:87
+#, php-format
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
+msgstr ""
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 #, fuzzy
@@ -2797,55 +2909,128 @@ msgid "Kiosk profile management"
 msgstr "Gestión de Asterisk PBX"
 
 #: plugins/personal/environment/kioskManagement.tpl:12
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
 #: plugins/addons/ldapmanager/contentimport.tpl:15
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
 msgid "Browse"
 msgstr "Visualizar"
 
 #: plugins/personal/environment/kioskManagement.tpl:22
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:19
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:59
 #, fuzzy
 msgid "Close"
 msgstr "Elige"
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Lista de listas de bloqueos"
+#: plugins/personal/nagios/main.inc:124
+#, fuzzy
+msgid "User nagios settings"
+msgstr "Parametros del correo de usuarios"
 
-#: plugins/gofax/blocklists/headpage.tpl:24
+#: plugins/personal/nagios/class_nagiosAccount.inc:82
+#, fuzzy
+msgid "This account has no nagios extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:91
+#, fuzzy
+msgid "Remove nagios account"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
+#, fuzzy
 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 nagios 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 de correo activas. Puede desactivarlas "
+"apretando 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/nagios/class_nagiosAccount.inc:94
+#, fuzzy
+msgid "Create nagios account"
+msgstr "Crear cuenta de correo"
 
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr "Mostrar listas de bloqueos salientes"
+#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#, 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 "
+"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/nagios/class_nagiosAccount.inc:169
+#, fuzzy
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr "Mostrar listas de bloqueos entrantes"
+#: plugins/personal/nagios/class_nagiosAccount.inc:172
+#, fuzzy
+msgid "The required field 'NagiosMail' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr "Mostrar listas que contengan"
+#: plugins/personal/nagios/class_nagiosAccount.inc:176
+#: plugins/personal/nagios/class_nagiosAccount.inc:180
+#, fuzzy
+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'."
 
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr "Expresiones regulares para encontrar nombres de listas"
+#: plugins/personal/nagios/nagios.tpl:4
+#, fuzzy
+msgid "Nagios Account"
+msgstr "Contacto"
+
+#: plugins/personal/nagios/nagios.tpl:7
+#, fuzzy
+msgid "alias"
+msgstr "Italiano"
+
+#: plugins/personal/nagios/nagios.tpl:12
+#, fuzzy
+msgid "email"
+msgstr "Correo Electrónico"
+
+#: plugins/personal/nagios/nagios.tpl:17
+msgid "Host Notification Period"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:25
+msgid "Service Notification Period"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:32
+msgid "Service Notification Options"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:41
+#, fuzzy
+msgid "Host Notification Options"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/personal/nagios/nagios.tpl:48
+#, fuzzy
+msgid "pager"
+msgstr "Dispositivo de aviso"
+
+#: plugins/personal/nagios/nagios.tpl:53
+msgid "Service Notification Commands"
+msgstr ""
+
+#: plugins/personal/nagios/nagios.tpl:57
+#, fuzzy
+msgid "Host Notification Commands"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/personal/nagios/nagios.tpl:66
+#, fuzzy
+msgid "Nagios Auth"
+msgstr "Contacto"
+
+#: plugins/personal/nagios/nagios.tpl:68
+#, fuzzy
+msgid "authorized_for_system_information"
+msgstr "Información de sistema"
 
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
@@ -2860,9 +3045,12 @@ 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/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
 #: plugins/admin/systems/servnfs.tpl:31
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:194
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:176
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
 msgid "Type"
 msgstr "Tipo"
@@ -2902,11 +3090,12 @@ msgstr "Por favor especifique un usuario valido."
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:666
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:553
+#: plugins/admin/systems/class_systemManagement.inc:562
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
+#: plugins/admin/fai/class_faiManagement.inc:417
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
 #, fuzzy
@@ -2915,13 +3104,13 @@ msgstr "Nombre del departamento"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:291
 #: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:652
+#: plugins/admin/users/class_userManagement.inc:666
 #: plugins/admin/applications/class_applicationManagement.inc:323
 #: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:553
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:85
+#: plugins/admin/systems/class_systemManagement.inc:562
 #: plugins/admin/ogroups/class_ogroupManagement.inc:356
 #: plugins/admin/ogroups/phonequeue.tpl:17
+#: plugins/admin/fai/class_faiManagement.inc:417
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:324
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
 msgid "Up"
@@ -2929,11 +3118,12 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:563
 #: plugins/admin/ogroups/class_ogroupManagement.inc:357
+#: plugins/admin/fai/class_faiManagement.inc:420
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
 #, fuzzy
@@ -2942,11 +3132,12 @@ msgstr "Lista de Departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:292
 #: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:653
+#: plugins/admin/users/class_userManagement.inc:667
 #: plugins/admin/applications/class_applicationManagement.inc:324
 #: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:554
+#: plugins/admin/systems/class_systemManagement.inc:563
 #: plugins/admin/ogroups/class_ogroupManagement.inc:358
+#: plugins/admin/fai/class_faiManagement.inc:420
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:325
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:289
 #, fuzzy
@@ -2955,9 +3146,9 @@ msgstr "Reiniciar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:350
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:564
 #: plugins/admin/ogroups/class_ogroupManagement.inc:359
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
@@ -2967,11 +3158,12 @@ msgstr "Seleccione para ver los departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:293
 #: plugins/admin/groups/class_groupManagement.inc:351
-#: plugins/admin/users/class_userManagement.inc:654
+#: plugins/admin/users/class_userManagement.inc:668
 #: plugins/admin/applications/class_applicationManagement.inc:325
 #: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:555
+#: plugins/admin/systems/class_systemManagement.inc:564
 #: plugins/admin/ogroups/class_ogroupManagement.inc:360
+#: plugins/admin/fai/class_faiManagement.inc:423
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:326
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
 #, fuzzy
@@ -2990,11 +3182,12 @@ msgstr "Listas de bloqueo"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:296
 #: plugins/admin/groups/class_groupManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:659
+#: plugins/admin/users/class_userManagement.inc:673
 #: plugins/admin/applications/class_applicationManagement.inc:329
 #: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:564
+#: plugins/admin/systems/class_systemManagement.inc:573
 #: plugins/admin/ogroups/class_ogroupManagement.inc:364
+#: plugins/admin/fai/class_faiManagement.inc:452
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:330
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:294
 #, fuzzy
@@ -3003,11 +3196,12 @@ msgstr "Contraseña actual"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:674
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:565
+#: plugins/admin/systems/class_systemManagement.inc:574
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/admin/fai/class_faiManagement.inc:453
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 #, fuzzy
@@ -3016,11 +3210,12 @@ msgstr "Mostrar departamentos"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:297
 #: plugins/admin/groups/class_groupManagement.inc:357
-#: plugins/admin/users/class_userManagement.inc:660
+#: plugins/admin/users/class_userManagement.inc:674
 #: plugins/admin/applications/class_applicationManagement.inc:330
 #: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:565
+#: plugins/admin/systems/class_systemManagement.inc:574
 #: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/admin/fai/class_faiManagement.inc:453
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 msgid "Submit"
@@ -3028,12 +3223,12 @@ msgstr ""
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
 #: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:663
+#: plugins/admin/users/class_userManagement.inc:677
 #: plugins/admin/applications/class_applicationManagement.inc:334
 #: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:579
 #: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/admin/FAI/class_faiManagement.inc:401
+#: plugins/admin/fai/class_faiManagement.inc:471
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:299
 #, fuzzy
@@ -3041,7 +3236,7 @@ msgid "edit"
 msgstr "Editar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:663
+#: plugins/admin/users/class_userManagement.inc:677
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:336
 #, fuzzy
 msgid "Edit user"
@@ -3049,12 +3244,12 @@ msgstr "Usuario administrador"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
 #: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/users/class_userManagement.inc:665
+#: plugins/admin/users/class_userManagement.inc:679
 #: plugins/admin/applications/class_applicationManagement.inc:335
 #: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:571
+#: plugins/admin/systems/class_systemManagement.inc:580
 #: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/admin/FAI/class_faiManagement.inc:402
+#: plugins/admin/fai/class_faiManagement.inc:472
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
@@ -3063,7 +3258,7 @@ msgid "delete"
 msgstr "Borrar"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:665
+#: plugins/admin/users/class_userManagement.inc:679
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:337
 #, fuzzy
 msgid "Delete user"
@@ -3077,11 +3272,12 @@ msgstr "Gestión de listas de bloqueo"
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:308
 #: plugins/addons/addressbook/contents.tpl:42
 #: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/users/class_userManagement.inc:674
+#: plugins/admin/users/class_userManagement.inc:688
 #: plugins/admin/applications/class_applicationManagement.inc:355
 #: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:578
+#: plugins/admin/systems/class_systemManagement.inc:587
 #: plugins/admin/ogroups/class_ogroupManagement.inc:391
+#: plugins/admin/fai/class_faiManagement.inc:468
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:344
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:315
 msgid "Actions"
@@ -3124,9 +3320,9 @@ msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
 #: 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/ogroups/remove.tpl:2 plugins/admin/FAI/remove.tpl:2
+#: plugins/admin/ogroups/remove.tpl:2 plugins/admin/fai/remove.tpl:2
 #: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
-#: html/index.php:231 ihtml/themes/altlinux/conflict.tpl:6
+#: html/index.php:227 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"
@@ -3151,16 +3347,55 @@ msgstr ""
 "Entonces si esta seguro - presione <i>Eliminar</i> para continuar o "
 "<i>Cancelar</i> para Abortar."
 
-#: 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/headpage.tpl:6
+msgid "List of blocklists"
+msgstr "Lista de listas de bloqueos"
+
+#: plugins/gofax/blocklists/headpage.tpl:24
+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ú 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."
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Select to see send blocklists"
+msgstr "Seleccione para mostrar listas de bloqueo salientes"
+
+#: plugins/gofax/blocklists/headpage.tpl:38
+msgid "Show send blocklists"
+msgstr "Mostrar listas de bloqueos salientes"
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Select to see receive blocklists"
+msgstr "Seleccione para mostrar listas de bloqueo entrantes"
+
+#: plugins/gofax/blocklists/headpage.tpl:39
+msgid "Show receive blocklists"
+msgstr "Mostrar listas de bloqueos entrantes"
+
+#: plugins/gofax/blocklists/headpage.tpl:45
+msgid "Display lists matching"
+msgstr "Mostrar listas que contengan"
+
+#: plugins/gofax/blocklists/headpage.tpl:48
+msgid "Regular expression for matching list names"
+msgstr "Expresiones regulares para encontrar nombres de listas"
+
+#: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
+msgid "Blocklist management"
+msgstr "Gestión de listas de bloqueo"
 
 #: plugins/gofax/faxaccount/generic.tpl:12
 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
+#: plugins/admin/ogroups/phonequeue.tpl:35 html/getxls.php:54
+#: html/getxls.php:194
 msgid "Language"
 msgstr "Lenguaje"
 
@@ -3257,8 +3492,15 @@ msgid "List of predefined blocklists"
 msgstr "Listas de listas de bloqueos predefinidas"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
+#: plugins/admin/groups/application_options.tpl:8
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1276
+#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/admin/fai/faiScriptEntry.tpl:67
+#: plugins/admin/fai/faiVariableEntry.tpl:48
+#: plugins/admin/fai/faiHookEntry.tpl:69
+#: plugins/admin/fai/faiTemplateEntry.tpl:132
+#: plugins/admin/fai/faiPackageEntry.tpl:65 include/functions.inc:1276
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -3329,6 +3571,57 @@ msgid ""
 "correct your choice."
 msgstr ""
 
+#: plugins/gofax/reports/detail.tpl:6
+msgid "FAX preview - please wait"
+msgstr "Previsualización del Fax - Por favor espere"
+
+#: plugins/gofax/reports/detail.tpl:9
+msgid "Click on fax to download"
+msgstr "Pulse en 'Fax' para descargar"
+
+#: plugins/gofax/reports/detail.tpl:18
+msgid "FAX ID"
+msgstr "FAX ID"
+
+#: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
+#: plugins/admin/systems/class_printGeneric.inc:560
+#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+#: plugins/admin/fai/faiTemplateEntry.tpl:94
+msgid "User"
+msgstr "Usuario"
+
+#: plugins/gofax/reports/detail.tpl:26
+msgid "Date / Time"
+msgstr "Fecha / Hora"
+
+#: plugins/gofax/reports/detail.tpl:30
+msgid "Sender MSN"
+msgstr "MSN del Remitente"
+
+#: plugins/gofax/reports/detail.tpl:34
+msgid "Sender ID"
+msgstr "ID del Remitente"
+
+#: plugins/gofax/reports/detail.tpl:38
+msgid "Receiver MSN"
+msgstr "MSN del Receptor"
+
+#: plugins/gofax/reports/detail.tpl:42
+msgid "Receiver ID"
+msgstr "ID del Receptor"
+
+#: plugins/gofax/reports/detail.tpl:50
+msgid "Status message"
+msgstr "Estado del mensaje"
+
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr "Tiempo de envio"
+
+#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
+msgid "# pages"
+msgstr "# páginas"
+
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
 msgid "Filter"
@@ -3363,12 +3656,6 @@ msgstr "durante"
 msgid "Search"
 msgstr "Buscar"
 
-#: plugins/gofax/reports/contents.tpl:30 plugins/gofax/reports/detail.tpl:22
-#: plugins/admin/systems/class_printGeneric.inc:520
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
-msgid "User"
-msgstr "Usuario"
-
 #: plugins/gofax/reports/contents.tpl:31
 #: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
@@ -3383,60 +3670,12 @@ msgstr "Remitente"
 msgid "Receiver"
 msgstr "Receptor"
 
-#: plugins/gofax/reports/contents.tpl:35 plugins/gofax/reports/detail.tpl:58
-msgid "# pages"
-msgstr "# páginas"
-
 #: plugins/gofax/reports/contents.tpl:47
 #: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr "La busqueda no ha encontrado resultados"
 
-#: plugins/gofax/reports/detail.tpl:6
-msgid "FAX preview - please wait"
-msgstr "Previsualización del Fax - Por favor espere"
-
-#: plugins/gofax/reports/detail.tpl:9
-msgid "Click on fax to download"
-msgstr "Pulse en 'Fax' para descargar"
-
-#: plugins/gofax/reports/detail.tpl:18
-msgid "FAX ID"
-msgstr "FAX ID"
-
-#: plugins/gofax/reports/detail.tpl:26
-msgid "Date / Time"
-msgstr "Fecha / Hora"
-
-#: plugins/gofax/reports/detail.tpl:30
-msgid "Sender MSN"
-msgstr "MSN del Remitente"
-
-#: plugins/gofax/reports/detail.tpl:34
-msgid "Sender ID"
-msgstr "ID del Remitente"
-
-#: plugins/gofax/reports/detail.tpl:38
-msgid "Receiver MSN"
-msgstr "MSN del Receptor"
-
-#: plugins/gofax/reports/detail.tpl:42
-msgid "Receiver ID"
-msgstr "ID del Receptor"
-
-#: plugins/gofax/reports/detail.tpl:50
-msgid "Status message"
-msgstr "Estado del mensaje"
-
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
-msgstr "Tiempo de envio"
-
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr "Reportes de FAX"
-
 #: plugins/gofax/reports/class_faxreport.inc:6
 msgid "FAX Reports"
 msgstr "Informes de FAX"
@@ -3471,6 +3710,10 @@ msgstr ""
 msgid "Y-M-D"
 msgstr "Y-M-D"
 
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Reportes de FAX"
+
 #: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:40
 #: plugins/addons/addressbook/address_info.tpl:29
@@ -3547,16 +3790,6 @@ msgstr "Marcando conexión"
 msgid "Dial"
 msgstr "Llamar"
 
-#: plugins/addons/addressbook/remove.tpl:7
-msgid ""
-"This includes all addressbook data in this entry. 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 la información de la libreta de direcciones en esta "
-"entrada. Por favor pulse dos veces si realmente quiere hacer esta, ya que no "
-"hay forma de que GOsa recupere la información."
-
 #: plugins/addons/addressbook/address_edit.tpl:7
 msgid "Choose the department to store entry in"
 msgstr "Elija un departamento para guardar la entrada"
@@ -3567,7 +3800,8 @@ msgid "Personal"
 msgstr "Personal"
 
 #: plugins/addons/addressbook/address_edit.tpl:29
-#: plugins/addons/addressbook/address_info.tpl:19
+#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:149
+#: html/getxls.php:206
 msgid "Initials"
 msgstr "Iniciales"
 
@@ -3587,7 +3821,8 @@ msgid "Company"
 msgstr "Compañia"
 
 #: plugins/addons/addressbook/address_edit.tpl:78
-#: plugins/addons/addressbook/address_info.tpl:67
+#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:149
+#: html/getxls.php:206
 msgid "City"
 msgstr "Ciudad"
 
@@ -3596,6 +3831,16 @@ msgstr "Ciudad"
 msgid "Country"
 msgstr "Pais"
 
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. 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 la información de la libreta de direcciones en esta "
+"entrada. Por favor pulse dos veces si realmente quiere hacer esta, ya que no "
+"hay forma de que GOsa recupere la información."
+
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
 msgstr "Libreta de direcciones"
@@ -3668,11 +3913,13 @@ msgstr "Teléfono del trabajo"
 msgid "Cell phone"
 msgstr "Móvil"
 
-#: plugins/addons/addressbook/class_addressbook.inc:506
+#: plugins/addons/addressbook/class_addressbook.inc:506 html/getxls.php:149
 msgid "Home phone"
 msgstr "Teléfono particular"
 
-#: plugins/addons/addressbook/class_addressbook.inc:506
+#: plugins/addons/addressbook/class_addressbook.inc:506 html/getxls.php:66
+#: html/getxls.php:88 html/getxls.php:103 html/getxls.php:238
+#: html/getxls.php:253
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
@@ -3690,48 +3937,6 @@ msgstr ""
 "No tiene permisos para crear o modificar una entrada de libreta de "
 "direcciones global."
 
-#: plugins/addons/ldapmanager/contentcsv.tpl:2
-msgid ""
-"The CSV import plugin provides methods to generate user accounts from a file "
-"containing Comma Seperated Values. The administrator can decide which "
-"columns should be transfered to which attribute. Note that you must have at "
-"least the UID, GIVENNAME and SURENAME set."
-msgstr ""
-"La extensión importar desde CSV provee de los metodos para generar cuentas "
-"desde un archivo que contiene valores separados por comas. El administrador "
-"puede decidir cuales columnas debería ser transferidas a que atributo. "
-"Fíjese que al menos debe tener 'UID', 'GIVENNAME' y 'SURENAME' configurados."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:10
-msgid "Select CSV file to import"
-msgstr "Seleccione el archivo CSV para importar"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:19
-msgid "Select template"
-msgstr "Selecciona plantilla"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:34
-msgid "All entries have been written to the LDAP database successfully."
-msgstr ""
-"Todas las entradas han sido escritas correctamente en la base de datos LDAP."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:36
-msgid "Oups. There was an error during the import of your data."
-msgstr "Error: Ha habido un error durante la importación de los datos."
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:39
-msgid "Here is the status report for the import:"
-msgstr "Este es el informe de estado de la importación:"
-
-#: plugins/addons/ldapmanager/contentcsv.tpl:87
-msgid "Selected Template"
-msgstr "Plantilla seleccionada"
-
-#: plugins/addons/ldapmanager/main.inc:23
-#: plugins/addons/ldapmanager/class_ldif.inc:7
-msgid "LDAP manager"
-msgstr "Gestor LDAP"
-
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
 msgid "LDIF export"
@@ -3813,6 +4018,43 @@ msgstr "Sobreescribir la entrada actual"
 msgid "Import successful"
 msgstr "Importación correcta"
 
+#: plugins/addons/ldapmanager/contentcsv.tpl:2
+msgid ""
+"The CSV import plugin provides methods to generate user accounts from a file "
+"containing Comma Seperated Values. The administrator can decide which "
+"columns should be transfered to which attribute. Note that you must have at "
+"least the UID, GIVENNAME and SURENAME set."
+msgstr ""
+"La extensión importar desde CSV provee de los metodos para generar cuentas "
+"desde un archivo que contiene valores separados por comas. El administrador "
+"puede decidir cuales columnas debería ser transferidas a que atributo. "
+"Fíjese que al menos debe tener 'UID', 'GIVENNAME' y 'SURENAME' configurados."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:10
+msgid "Select CSV file to import"
+msgstr "Seleccione el archivo CSV para importar"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:19
+msgid "Select template"
+msgstr "Selecciona plantilla"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:34
+msgid "All entries have been written to the LDAP database successfully."
+msgstr ""
+"Todas las entradas han sido escritas correctamente en la base de datos LDAP."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:36
+msgid "Oups. There was an error during the import of your data."
+msgstr "Error: Ha habido un error durante la importación de los datos."
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:39
+msgid "Here is the status report for the import:"
+msgstr "Este es el informe de estado de la importación:"
+
+#: plugins/addons/ldapmanager/contentcsv.tpl:87
+msgid "Selected Template"
+msgstr "Plantilla seleccionada"
+
 #: plugins/addons/ldapmanager/class_import.inc:38
 msgid "You've no permission to do LDAP imports."
 msgstr "No tiene permisos para hacer importaciones LDAP"
@@ -3832,6 +4074,7 @@ msgstr ""
 "ficheros como copias de seguridad o para iniciar un nuevo servidor."
 
 #: plugins/addons/ldapmanager/contentexport.tpl:10
+#: plugins/addons/ldapmanager/contentexportxls.tpl:10
 msgid "Export single entry"
 msgstr "Exportar solo esta entrada"
 
@@ -3841,18 +4084,23 @@ msgstr "Exportación del LDIF completada para"
 
 #: plugins/addons/ldapmanager/contentexport.tpl:24
 #: plugins/addons/ldapmanager/contentexport.tpl:39
+#: plugins/addons/ldapmanager/contentexportxls.tpl:27
+#: plugins/addons/ldapmanager/contentexportxls.tpl:42
 msgid "Choose the department you want to Export"
 msgstr "Elija el departamento que quiera exportar"
 
 #: plugins/addons/ldapmanager/contentexport.tpl:36
+#: plugins/addons/ldapmanager/contentexportxls.tpl:39
 msgid "Export IVBB LDIF for"
 msgstr "Exportación IVBB LDIF para"
 
 #: plugins/addons/ldapmanager/contentexport.tpl:55
+#: plugins/addons/ldapmanager/contentexportxls.tpl:58
 msgid "Export successful"
 msgstr "Exportación completada"
 
 #: plugins/addons/ldapmanager/contentexport.tpl:59
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
 msgid "Click here to save the complete LDAP database to a file"
 msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
 
@@ -3860,53 +4108,55 @@ msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
 msgid "Click here to save the LDAP Export "
 msgstr "Pulse aquí para exportar la base de datos LDAP"
 
+#: plugins/addons/ldapmanager/class_ldif.inc:7
+#: plugins/addons/ldapmanager/main.inc:23
+msgid "LDAP manager"
+msgstr "Gestor LDAP"
+
 #: plugins/addons/ldapmanager/class_export.inc:7
 msgid "CSV import"
 msgstr "Importar desde CSV"
 
 #: plugins/addons/ldapmanager/class_export.inc:35
+#: plugins/addons/ldapmanager/class_exportxls.inc:35
 msgid "You've no permission to do LDAP exports."
 msgstr "No tiene permisos para hacer exportaciones LDAP."
 
 #: plugins/addons/ldapmanager/class_export.inc:80
+#: plugins/addons/ldapmanager/class_exportxls.inc:85
 msgid "Error while exporting the requested entries!"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/addons/logview/contents.tpl:11
-msgid "Show hosts"
-msgstr "Mostrar equipos"
+#: 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."
 
-#: plugins/addons/logview/contents.tpl:20
-msgid "Log level"
-msgstr "Nivel de log"
-
-#: plugins/addons/logview/contents.tpl:38
-msgid "Time interval"
-msgstr "Intervalo de tiempo"
-
-#: plugins/addons/logview/contents.tpl:48
-msgid "Enter string to search for"
-msgstr "Introducir la cadena de busqueda"
-
-#: plugins/addons/logview/contents.tpl:60
-msgid "Ruleset"
-msgstr "Paquete de reglas"
-
-#: plugins/addons/logview/contents.tpl:82
-msgid "Level"
-msgstr "Nivel"
+#: plugins/addons/ldapmanager/contentexportxls.tpl:14
+#, fuzzy
+msgid "Choose the data you want to Export"
+msgstr "Elija el departamento que quiera exportar"
 
-#: plugins/addons/logview/contents.tpl:83
-msgid "Hostname"
-msgstr "Nombre de Maquina"
+#: plugins/addons/ldapmanager/contentexportxls.tpl:24
+#, fuzzy
+msgid "Export complete XLS for"
+msgstr "Exportación del LDIF completada para"
 
-#: plugins/addons/logview/contents.tpl:85
-msgid "Message"
-msgstr "Mensaje"
+#: 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"
 
-#: plugins/addons/logview/main.inc:23
-msgid "System log view"
-msgstr "Ver registro del sistema"
+#: plugins/addons/ldapmanager/class_exportxls.inc:7
+#, fuzzy
+msgid "XLS import"
+msgstr "Importar desde CSV"
 
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
@@ -3967,19 +4217,90 @@ msgstr ""
 "No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
 "registros!"
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Lista de grupos"
+#: plugins/addons/logview/contents.tpl:11
+msgid "Show hosts"
+msgstr "Mostrar equipos"
 
-#: plugins/admin/groups/headpage.tpl:25
+#: plugins/addons/logview/contents.tpl:20
+msgid "Log level"
+msgstr "Nivel de log"
+
+#: plugins/addons/logview/contents.tpl:38
+msgid "Time interval"
+msgstr "Intervalo de tiempo"
+
+#: plugins/addons/logview/contents.tpl:48
+msgid "Enter string to search for"
+msgstr "Introducir la cadena de busqueda"
+
+#: plugins/addons/logview/contents.tpl:60
+msgid "Ruleset"
+msgstr "Paquete de reglas"
+
+#: plugins/addons/logview/contents.tpl:82
+msgid "Level"
+msgstr "Nivel"
+
+#: plugins/addons/logview/contents.tpl:83
+msgid "Hostname"
+msgstr "Nombre de Maquina"
+
+#: plugins/addons/logview/contents.tpl:85
+msgid "Message"
+msgstr "Mensaje"
+
+#: plugins/addons/logview/main.inc:23
+msgid "System log view"
+msgstr "Ver registro del sistema"
+
+#: plugins/admin/groups/class_groupGeneric.inc:115
+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:161
+msgid "This 'dn' is no group."
+msgstr "Este 'dn' no es un grupo."
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+msgid "Samba group"
+msgstr "Grupo de samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+msgid "Domain admins"
+msgstr "Administradores del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:266
+msgid "Domain users"
+msgstr "Usuarios del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:267
+msgid "Domain guests"
+msgstr "Invitados del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:272
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:606
+#: plugins/admin/ogroups/class_ogroup.inc:523
+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:616
 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."
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
 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."
+"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
+"numeros y guiones."
+
+#: plugins/admin/groups/class_groupGeneric.inc:627
+#: plugins/admin/groups/class_groupGeneric.inc:634
+msgid "Value specified as 'Name' is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
 #: plugins/admin/groups/mail.tpl:11
 msgid "Primary mail address for this shared folder"
@@ -4005,20 +4326,27 @@ msgstr "Miembro con Permisos"
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
-#: plugins/admin/groups/remove.tpl:7
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Lista de grupos"
+
+#: plugins/admin/groups/headpage.tpl:25
 msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
+"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 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."
+"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/main.inc:39 plugins/admin/groups/main.inc:43
 msgid "Group administration"
 msgstr "Administración de grupos"
 
 #: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42
+#: plugins/admin/ogroups/class_ogroupManagement.inc:42 html/getxls.php:80
+#: html/getxls.php:212
 msgid "Groups"
 msgstr "Grupos"
 
@@ -4057,7 +4385,7 @@ msgid "Delete this entry"
 msgstr "Borrar"
 
 #: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/users/class_userManagement.inc:724
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
@@ -4076,11 +4404,12 @@ msgid "Groupname"
 msgstr "Nombre del grupo"
 
 #: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:673
+#: plugins/admin/users/class_userManagement.inc:687
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
 #: plugins/admin/ogroups/class_ogroupManagement.inc:390
+#: plugins/admin/fai/faiScriptEntry.tpl:29
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Propiedades"
@@ -4091,78 +4420,17 @@ msgstr "Propiedades"
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
-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:155
-msgid "This 'dn' is no group."
-msgstr "Este 'dn' no es un grupo."
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Samba group"
-msgstr "Grupo de samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain admins"
-msgstr "Administradores del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain users"
-msgstr "Usuarios del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:261
-msgid "Domain guests"
-msgstr "Invitados del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:266
-#, php-format
-msgid "Special group (%d)"
-msgstr "Grupo especial (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:581
-#: plugins/admin/ogroups/class_ogroup.inc:492
-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:591
+#: plugins/admin/groups/remove.tpl:7
 msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
 msgstr ""
-"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
-"numeros y guiones."
-
-#: plugins/admin/groups/class_groupGeneric.inc:602
-#: plugins/admin/groups/class_groupGeneric.inc:609
-msgid "Value specified as 'Name' is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
-
-#: plugins/admin/groups/application.tpl:4
-msgid "Used applications"
-msgstr "Aplicaciones Usadas"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit parameters"
-msgstr "Editar parametros"
-
-#: plugins/admin/groups/application.tpl:11
-msgid "Edit optional application parameters"
-msgstr "Editar parámetros de aplicaciones opcionales"
-
-#: plugins/admin/groups/application.tpl:21
-msgid "Available applications"
-msgstr "Aplicaciones disponibles"
-
-#: plugins/admin/groups/acl.tpl:4
-msgid "Object"
-msgstr "Objeto"
+"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/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/application_options.tpl:1
+msgid "Application options"
+msgstr "Opciones de aplicaciones"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -4212,9 +4480,50 @@ msgstr ""
 msgid "Please select a valid mail server."
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/groups/mail_admins.tpl:4
-msgid "Folder administrators"
-msgstr "Administradores de Carpetas"
+#: plugins/admin/groups/acl.tpl:4
+msgid "Object"
+msgstr "Objeto"
+
+#: 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/application.tpl:4
+msgid "Used applications"
+msgstr "Aplicaciones Usadas"
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit parameters"
+msgstr "Editar parametros"
+
+#: plugins/admin/groups/application.tpl:11
+msgid "Edit optional application parameters"
+msgstr "Editar parámetros de aplicaciones opcionales"
+
+#: plugins/admin/groups/application.tpl:21
+msgid "Available applications"
+msgstr "Aplicaciones disponibles"
+
+#: plugins/admin/groups/group_objects.tpl:6
+msgid "Select users to add"
+msgstr "Seleccione usuarios que serán añadidos"
+
+#: plugins/admin/groups/group_objects.tpl:30
+msgid "Display users of department"
+msgstr "Mostrar usuarios del departamento"
+
+#: plugins/admin/groups/group_objects.tpl:41
+#: plugins/admin/users/headpage.tpl:49
+msgid "Regular expression for matching user names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+
+#: plugins/admin/groups/class_groupAcl.inc:55
+msgid "This 'dn' is no acl container."
+msgstr "Este 'dn' no es un contenedor de listas de acceso."
+
+#: plugins/admin/groups/class_groupAcl.inc:200
+msgid "All fields are writeable"
+msgstr "Todos los campos son rellenarles."
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/ogroups/generic.tpl:7
 msgid "Group name"
@@ -4258,34 +4567,18 @@ msgstr "en dominio"
 msgid "Members are in a phone pickup group"
 msgstr "Miembros están en un grupo de salto telefónico"
 
-#: plugins/admin/groups/generic.tpl:81
+#: plugins/admin/groups/generic.tpl:77
+#, fuzzy
+msgid "Members are in a nagios group"
+msgstr "Miembros están en un grupo de salto telefónico"
+
+#: plugins/admin/groups/generic.tpl:92
 msgid "Group members"
 msgstr "Miembros del grupo"
 
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Seleccione usuarios que serán añadidos"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Display users of department"
-msgstr "Mostrar usuarios del departamento"
-
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/users/headpage.tpl:49
-msgid "Regular expression for matching user names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
-
-#: plugins/admin/groups/class_groupAcl.inc:54
-msgid "This 'dn' is no acl container."
-msgstr "Este 'dn' no es un contenedor de listas de acceso."
-
-#: plugins/admin/groups/class_groupAcl.inc:199
-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_admins.tpl:4
+msgid "Folder administrators"
+msgstr "Administradores de Carpetas"
 
 #: plugins/admin/groups/class_groupApplication.inc:61
 msgid "This 'dn' is no appgroup."
@@ -4330,79 +4623,6 @@ msgstr "La aplicación seleccionada no tiene opciones."
 msgid "The application named %s is no longer available and has been removed."
 msgstr ""
 
-#: plugins/admin/users/headpage.tpl:6
-msgid "List of users"
-msgstr "Lista de usuarios"
-
-#: 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."
-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/users/headpage.tpl:38 plugins/admin/FAI/headpage.tpl:37
-msgid "Show templates"
-msgstr "Mostrar plantillas"
-
-#: 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/users/headpage.tpl:39
-msgid "Show functional users"
-msgstr "Mostrar usuarios funcionales"
-
-#: 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/users/headpage.tpl:40
-msgid "Show unix users"
-msgstr "Mostrar los usuarios unix"
-
-#: 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/users/headpage.tpl:41
-msgid "Show mail users"
-msgstr "Mostrar los usuarios de correo"
-
-#: 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/users/headpage.tpl:42
-msgid "Show samba users"
-msgstr "Mostrar usuarios samba"
-
-#: 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/users/headpage.tpl:43
-msgid "Show proxy users"
-msgstr "Mostrar los usuarios de proxy"
-
-#: plugins/admin/users/remove.tpl:7
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. Please double check if your really want to do this since there is "
-"no way for GOsa to get your data back."
-msgstr ""
-"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
-"configuración IMAP, etc. de este usuario. Por favor pulse dos veces si "
-"quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
-"posteriormente la información."
-
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -4413,8 +4633,46 @@ msgstr ""
 "cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
 "contraseña, el usuario no podrá autenticarse sin ella."
 
+#: 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
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> 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:11
+#: plugins/admin/users/class_userManagement.inc:1010
+#: plugins/admin/systems/class_systemManagement.inc:703
+msgid "Template"
+msgstr "Plantilla"
+
+#: plugins/admin/users/template.tpl:44
+#: plugins/admin/fai/class_faiManagement.inc:387
+#: plugins/admin/fai/faiPackageNew.tpl:65
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: 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/users/class_userManagement.inc:25
-#: plugins/admin/systems/printer.tpl:80
+#: plugins/admin/systems/printer.tpl:65 html/getxls.php:56 html/getxls.php:211
 msgid "Users"
 msgstr "Usuarios"
 
@@ -4433,40 +4691,41 @@ msgstr "Esta a punto de borrar el usuario %s"
 msgid "You are not allowed to delete this user!"
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/users/class_userManagement.inc:474
-#: plugins/admin/ogroups/class_ogroup.inc:201
+#: plugins/admin/users/class_userManagement.inc:485
+#: plugins/admin/systems/class_workstationStartup.inc:49
+#: plugins/admin/ogroups/class_ogroup.inc:232
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:555
 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:656
+#: plugins/admin/users/class_userManagement.inc:670
 #, fuzzy
 msgid "Create new user"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:670
 #, fuzzy
 msgid "New user"
 msgstr "usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:657
+#: plugins/admin/users/class_userManagement.inc:671
 #, fuzzy
 msgid "Create new template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:657
+#: plugins/admin/users/class_userManagement.inc:671
 msgid "New template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:664
+#: plugins/admin/users/class_userManagement.inc:678
 #, fuzzy
 msgid "password"
 msgstr "Contraseña"
 
-#: plugins/admin/users/class_userManagement.inc:672
+#: plugins/admin/users/class_userManagement.inc:686
 #: 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
@@ -4475,127 +4734,141 @@ msgstr "Contraseña"
 msgid "Username"
 msgstr "Nombre de Usuario"
 
-#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/admin/users/class_userManagement.inc:691
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:722
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:709
+#: plugins/admin/users/class_userManagement.inc:723
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:725
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:727
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:729
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:717
+#: plugins/admin/users/class_userManagement.inc:731
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:719
+#: plugins/admin/users/class_userManagement.inc:733
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:721
+#: plugins/admin/users/class_userManagement.inc:735
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/users/class_userManagement.inc:736
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:737
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:792
 #, fuzzy
 msgid "Online"
 msgstr "en linea"
 
-#: plugins/admin/users/class_userManagement.inc:785
+#: plugins/admin/users/class_userManagement.inc:799
 #, fuzzy
 msgid "Offline"
 msgstr "fuera de linea"
 
-#: plugins/admin/users/class_userManagement.inc:996
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:699
-#: plugins/admin/FAI/class_faiManagement.inc:459
-msgid "Template"
-msgstr "Plantilla"
+#: plugins/admin/users/remove.tpl:7
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. Please double check if your really want to do this since there is "
+"no way for GOsa to get your data back."
+msgstr ""
+"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
+"configuración IMAP, etc. de este usuario. Por favor pulse dos veces si "
+"quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
+"posteriormente la información."
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Crear un nuevo usuario usando plantillas"
+#: plugins/admin/users/headpage.tpl:6
+msgid "List of users"
+msgstr "Lista de usuarios"
 
-#: plugins/admin/users/template.tpl:6
+#: plugins/admin/users/headpage.tpl:24
 msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
+"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 ""
-"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."
+"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/template.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/headpage.tpl:38
+msgid "Select to see template pseudo users"
+msgstr "Seleccione para mostrar los usuarios pseudo plantillas"
 
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Administración de Usuarios"
+#: plugins/admin/users/headpage.tpl:38 plugins/admin/fai/headpage.tpl:37
+msgid "Show templates"
+msgstr "Mostrar plantillas"
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Lista de aplicaciones"
+#: 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/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/users/headpage.tpl:39
+msgid "Show functional users"
+msgstr "Mostrar usuarios funcionales"
 
-#: plugins/admin/applications/headpage.tpl:38
-msgid "Display applications matching"
-msgstr "Mostrar aplicaciones que concuerden con"
+#: 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/applications/headpage.tpl:41
-msgid "Regular expression for matching application names"
-msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
+#: plugins/admin/users/headpage.tpl:40
+msgid "Show unix users"
+msgstr "Mostrar los usuarios unix"
+
+#: 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/users/headpage.tpl:41
+msgid "Show mail users"
+msgstr "Mostrar los usuarios de correo"
+
+#: 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/users/headpage.tpl:42
+msgid "Show samba users"
+msgstr "Mostrar usuarios samba"
+
+#: 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/users/headpage.tpl:43
+msgid "Show proxy users"
+msgstr "Mostrar los usuarios de proxy"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
@@ -4604,9 +4877,10 @@ msgid "Application name"
 msgstr "Nombre de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/terminal.tpl:109 plugins/admin/systems/server.tpl:48
-#: plugins/admin/systems/workstation.tpl:109
+#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: plugins/admin/systems/workstation.tpl:88
 #: plugins/admin/ogroups/termgroup.tpl:13
+#: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
 msgstr "Ejecute"
 
@@ -4640,22 +4914,29 @@ msgstr "Actualizar"
 msgid "Reload picture from LDAP"
 msgstr "Recargar imagen desde LDAP"
 
-#: plugins/admin/applications/generic.tpl:61
+#: plugins/admin/applications/generic.tpl:62
 msgid "Only executable for members"
 msgstr "Solo ejecutables para los miembros"
 
-#: plugins/admin/applications/generic.tpl:63
+#: plugins/admin/applications/generic.tpl:64
 msgid "Replace user configuration on startup"
 msgstr "Reemplazar la configuración del usuario en el inicio"
 
-#: plugins/admin/applications/generic.tpl:67
+#: plugins/admin/applications/generic.tpl:68
 msgid "Place icon on members desktop"
 msgstr "Colocar icono en los escritorios de los miembros "
 
-#: plugins/admin/applications/generic.tpl:70
+#: plugins/admin/applications/generic.tpl:71
 msgid "Place entry in members startmenu"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
+#: plugins/admin/applications/generic.tpl:84
+#: plugins/admin/systems/printerPPDDialog.tpl:11
+#: plugins/admin/fai/faiTemplateEntry.tpl:40
+#, fuzzy
+msgid "Upload"
+msgstr "Carga de CPU"
+
 #: plugins/admin/applications/class_applicationParameters.inc:47
 msgid "Remove options"
 msgstr "Eliminar opciones"
@@ -4701,38 +4982,32 @@ 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
-msgid "Application management"
-msgstr "Mantenimiento de aplicaciones"
+#: plugins/admin/applications/headpage.tpl:6
+msgid "List of applications"
+msgstr "Lista de aplicaciones"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:63
-msgid "This 'dn' is no application."
-msgstr "Este 'dn' no es una aplicación"
+#: 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/class_applicationGeneric.inc:160
-msgid "The specified picture has not been uploaded correctly."
-msgstr "La foto indicada no ha sido subida correctamente."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:241
-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:246
-msgid "Required field 'Name' is not filled."
-msgstr "El campo requerido 'Nombre' no ha sido llenado."
-
-#: plugins/admin/applications/class_applicationGeneric.inc:250
-msgid "Invalid character in application name. Only a-z 0-9 are allowed."
-msgstr ""
+#: plugins/admin/applications/headpage.tpl:38
+msgid "Display applications matching"
+msgstr "Mostrar aplicaciones que concuerden con"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:254
-msgid "Required field 'Execute' is not filled."
-msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
+#: plugins/admin/applications/headpage.tpl:41
+msgid "Regular expression for matching application names"
+msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:263
-msgid "There's already an application with this 'Name'."
-msgstr "Ya existe una aplicación con este 'Nombre'."
+#: plugins/admin/applications/main.inc:38
+#: plugins/admin/applications/main.inc:40
+msgid "Application management"
+msgstr "Mantenimiento de aplicaciones"
 
 #: plugins/admin/applications/class_applicationManagement.inc:247
 #, php-format
@@ -4755,27 +5030,46 @@ msgstr "Nuevo"
 msgid "Create new application"
 msgstr "Crear aplicaciones"
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr "Lista de Departamentos"
+#: plugins/admin/applications/class_applicationGeneric.inc:82
+#, fuzzy
+msgid "no example"
+msgstr "incompleto"
 
-#: plugins/admin/departments/headpage.tpl:24
-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."
+#: plugins/admin/applications/class_applicationGeneric.inc:97
+msgid "This 'dn' is no application."
+msgstr "Este 'dn' no es una aplicación"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:213
+msgid "The specified picture has not been uploaded correctly."
+msgstr "La foto indicada no ha sido subida correctamente."
+
+#: plugins/admin/applications/class_applicationGeneric.inc:294
+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:299
+msgid "Required field 'Name' is not filled."
+msgstr "El campo requerido 'Nombre' no ha sido llenado."
+
+#: plugins/admin/applications/class_applicationGeneric.inc:303
+msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
-"Este menú permite añadir, editar o eliminar los departamentos seleccionados. "
-"Puede usar el selector de rango en la parte superior de la lista de "
-"departamentos, cuando trabaja con un gran número de departamentos."
 
-#: plugins/admin/departments/headpage.tpl:38
-msgid "Display departments matching"
-msgstr "Mostrar Departamentos que concuerden con"
+#: plugins/admin/applications/class_applicationGeneric.inc:307
+msgid "Required field 'Execute' is not filled."
+msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 
-#: 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_applicationGeneric.inc:316
+msgid "There's already an application with this 'Name'."
+msgstr "Ya existe una aplicación con este 'Nombre'."
+
+#: plugins/admin/departments/tabs_department.inc:30
+#: plugins/admin/fai/tabsHook.inc:30 plugins/admin/fai/tabsPartition.inc:33
+#: plugins/admin/fai/tabsVariable.inc:30 plugins/admin/fai/tabsPackage.inc:30
+#: plugins/admin/fai/tabsTemplate.inc:30 plugins/admin/fai/tabsProfile.inc:30
+#: plugins/admin/fai/tabsScript.inc:30
+msgid "Try to move tree failed. Destination tree is subtree of source tree."
+msgstr ""
 
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
@@ -4786,7 +5080,7 @@ msgid "Name of subtree to create"
 msgstr "Nombre del subárbol para crear"
 
 #: plugins/admin/departments/generic.tpl:14
-#: plugins/gofon/conference/generic.tpl:57
+#: plugins/gofon/conference/generic.tpl:56
 msgid "Descriptive text for department"
 msgstr "Descripción del departamento"
 
@@ -4823,14 +5117,6 @@ msgstr "Número base de teléfono de este subarbol"
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Número base de fax de este subarbol"
 
-#: plugins/admin/departments/tabs_department.inc:30
-#: plugins/admin/FAI/tabsHook.inc:30 plugins/admin/FAI/tabsPartition.inc:33
-#: plugins/admin/FAI/tabsVariable.inc:30 plugins/admin/FAI/tabsPackage.inc:30
-#: plugins/admin/FAI/tabsProfile.inc:30 plugins/admin/FAI/tabsScript.inc:30
-#: plugins/admin/FAI/tabsTemplate.inc:30
-msgid "Try to move tree failed. Destination tree is subtree of source tree."
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:7
 #: plugins/gofon/conference/remove.tpl:7
 msgid ""
@@ -4843,7 +5129,7 @@ msgstr ""
 "que GOsa recupere la información posteriormente."
 
 #: plugins/admin/departments/remove.tpl:11 plugins/admin/systems/remove.tpl:11
-#: plugins/admin/FAI/remove.tpl:11 plugins/gofon/conference/remove.tpl:11
+#: plugins/admin/fai/remove.tpl:11 plugins/gofon/conference/remove.tpl:11
 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 "
@@ -4853,30 +5139,31 @@ msgstr ""
 "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."
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
-msgid "Department management"
-msgstr "Mantenimiento de Departamentos"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:140
-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/headpage.tpl:6
+msgid "List of departments"
+msgstr "Lista de Departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:147
-#: plugins/admin/departments/class_departmentGeneric.inc:149
-msgid "Department with that 'Name' already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
+#: plugins/admin/departments/headpage.tpl:24
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on top of "
+"the department list."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los departamentos seleccionados. "
+"Puede usar el selector de rango en la parte superior de la lista de "
+"departamentos, cuando trabaja con un gran número de departamentos."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:157
-msgid "Required field 'Description' is not set."
-msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+#: plugins/admin/departments/headpage.tpl:38
+msgid "Display departments matching"
+msgstr "Mostrar Departamentos que concuerden con"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:162
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
+#: plugins/admin/departments/headpage.tpl:42
+msgid "Regular expression for matching department names"
+msgstr "Expresiones regulares para encontrar nombres de departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:163
-msgid " Please choose another name."
-msgstr "Por favor elija otro nombre."
+#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+msgid "Department management"
+msgstr "Mantenimiento de Departamentos"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
@@ -4896,6 +5183,7 @@ 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:423
 #, fuzzy
 msgid "Go to users home department"
 msgstr "Mostrar usuarios del departamento"
@@ -4915,6 +5203,7 @@ msgid "Department name"
 msgstr "Mantenimiento de Departamentos"
 
 #: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/fai/class_faiManagement.inc:492
 #, fuzzy
 msgid "department"
 msgstr "departamentos"
@@ -4923,17 +5212,26 @@ msgstr "departamentos"
 msgid ".."
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:1
-msgid "Network settings"
-msgstr "Configuración de red"
+#: plugins/admin/departments/class_departmentGeneric.inc:140
+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/systems/network.tpl:8
-msgid "IP-address"
-msgstr "Dirección IP"
+#: plugins/admin/departments/class_departmentGeneric.inc:147
+#: plugins/admin/departments/class_departmentGeneric.inc:149
+msgid "Department with that 'Name' already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/systems/network.tpl:16
-msgid "MAC-address"
-msgstr "Dirección MAC"
+#: plugins/admin/departments/class_departmentGeneric.inc:157
+msgid "Required field 'Description' is not set."
+msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:162
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:163
+msgid " Please choose another name."
+msgstr "Por favor elija otro nombre."
 
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
@@ -4942,8 +5240,10 @@ msgstr "presente"
 
 #: plugins/admin/systems/class_terminalInfo.inc:62
 #: plugins/admin/systems/class_terminalService.inc:136
-#: plugins/admin/systems/class_terminalStartup.inc:75
+#: plugins/admin/systems/class_terminalStartup.inc:96
 #: plugins/admin/systems/class_terminalGeneric.inc:127
+#: plugins/admin/systems/class_workstationService.inc:121
+#: plugins/admin/systems/class_workstationStartup.inc:212
 msgid "This 'dn' has no terminal features."
 msgstr "Esta 'dn' no tiene características de terminal."
 
@@ -4972,37 +5272,48 @@ msgstr "estado desconocido"
 msgid "offline"
 msgstr "fuera de linea"
 
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "Exportación NFS"
+#: plugins/admin/systems/network.tpl:1
+msgid "Network settings"
+msgstr "Configuración de red"
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Servicio de Hora"
+#: plugins/admin/systems/network.tpl:8
+msgid "IP-address"
+msgstr "Dirección IP"
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Servicio LDAP"
+#: plugins/admin/systems/network.tpl:16
+msgid "MAC-address"
+msgstr "Dirección MAC"
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Servidor de terminal"
+#: plugins/admin/systems/class_servService.inc:259
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Desactivación temporal del acceso"
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
+msgid "This 'dn' has no network features."
+msgstr "Esta 'dn' no tiene características de red."
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Ruta a las fuentes tipográficas"
+#: plugins/admin/systems/class_winGeneric.inc:139
+#: plugins/admin/systems/class_componentGeneric.inc:110
+#, fuzzy
+msgid "The required field 'Component name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Servicio de Logs"
+#: plugins/admin/systems/class_winGeneric.inc:153
+#: plugins/admin/systems/class_componentGeneric.inc:123
+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/servservice.tpl:101
-msgid "Print Service"
-msgstr "Servicio de impresión"
+#: plugins/admin/systems/class_winGeneric.inc:163
+#: plugins/admin/systems/class_terminalGeneric.inc:257
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:211
+#: plugins/admin/systems/class_printGeneric.inc:438
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:299
+#, 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/info.tpl:1
 msgid "System information"
@@ -5056,7 +5367,9 @@ msgstr "Disquetera"
 msgid "CDROM device"
 msgstr "Unidad de CDROM"
 
-#: plugins/admin/systems/info.tpl:73 plugins/admin/systems/service.tpl:83
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/terminalService.tpl:83
 msgid "Graphic device"
 msgstr "Tarjeta Gráfica"
 
@@ -5100,159 +5413,137 @@ msgstr "Servicio de sonido"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
-msgid "This 'dn' has no network features."
-msgstr "Esta 'dn' no tiene características de red."
-
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:110
-#, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
-
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
-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:163
-#: plugins/admin/systems/class_terminalGeneric.inc:254
-#: plugins/admin/systems/class_servGeneric.inc:180
-#: plugins/admin/systems/class_workstationGeneric.inc:242
-#: plugins/admin/systems/class_printGeneric.inc:406
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
-#, 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/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr "Gestión del sistema"
 
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Plantilla de terminal"
+#: plugins/admin/systems/servservice.tpl:11
+msgid "Nfs Export"
+msgstr "Exportación NFS"
 
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Nombre de terminal"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Servicio de Hora"
 
-#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:20
-#: plugins/admin/systems/printer.tpl:31
-#: 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/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Servicio LDAP"
 
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-#: plugins/admin/systems/phonesettings.tpl:25
-msgid "Mode"
-msgstr "Modo"
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr "Seleccionar modo de terminal"
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Desactivación temporal del acceso"
 
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr "Servidor Raíz"
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Ruta a las fuentes tipográficas"
 
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-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/workstation.tpl:60
-msgid "Swap server"
-msgstr "Servidor de Intercambio"
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-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:74
-msgid "Syslog server"
-msgstr "Servidor de Logs"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr "Elija un servidor que será usado para registro"
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr "Servidor NTP"
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-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:99
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Acción"
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Servicio de Logs"
 
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr "Seleccione una acción que se ejecutara en este terminal"
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Servicio de impresión"
 
 #: plugins/admin/systems/class_terminalService.inc:83
+#: plugins/admin/systems/class_workstationService.inc:68
 msgid "default"
 msgstr "por defecto"
 
 #: plugins/admin/systems/class_terminalService.inc:84
+#: plugins/admin/systems/class_workstationService.inc:69
 msgid "show chooser"
 msgstr "mostrar elegidos"
 
 #: plugins/admin/systems/class_terminalService.inc:85
+#: plugins/admin/systems/class_workstationService.inc:70
 msgid "direct"
 msgstr "Directo"
 
 #: plugins/admin/systems/class_terminalService.inc:88
+#: plugins/admin/systems/class_workstationService.inc:73
 msgid "load balanced"
 msgstr "balanceo de carga"
 
 #: plugins/admin/systems/class_terminalService.inc:91
+#: plugins/admin/systems/class_workstationService.inc:76
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
 #: plugins/admin/systems/class_terminalService.inc:92
+#: plugins/admin/systems/class_workstationService.inc:77
 msgid "ICA client"
 msgstr "Cliente ICA"
 
 #: plugins/admin/systems/class_terminalService.inc:184
+#: plugins/admin/systems/class_workstationService.inc:168
 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:233
+#: plugins/admin/systems/class_workstationService.inc:238
 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:248
+#: plugins/admin/systems/class_workstationService.inc:253
 msgid "Please specify a valid HSync range."
 msgstr "Por favor especifique un rango HSync valido"
 
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:157
+#: plugins/admin/systems/class_servDB.inc:162
+#: plugins/admin/systems/class_servDB.inc:168
+#, 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:137
+#, 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_servDB.inc:141
+msgid "The sieve port needs to be numeric."
+msgstr "El puerto sieve necesita ser un numero."
+
+#: plugins/admin/systems/class_servDB.inc:152
+#, fuzzy, php-format
+msgid "The specified kerberos password is empty."
+msgstr "El archivo especificado está vacío."
+
+#: plugins/admin/systems/class_servDB.inc:176
+#, 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'."
+
 #: plugins/admin/systems/server.tpl:6
 msgid "Server name"
 msgstr "Nombre del servidor"
 
+#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/terminal.tpl:20 plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/workstation.tpl:29
+#: 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/server.tpl:38 plugins/admin/systems/terminal.tpl:99
+#: plugins/admin/systems/workstation.tpl:78
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Acción"
+
 #: 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"
@@ -5261,70 +5552,78 @@ msgstr "Seleccione una acción que se ejecutara en este servidor"
 msgid "Phone name"
 msgstr "Número de teléfono"
 
-#: plugins/admin/systems/class_servService.inc:258
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Plantilla de estación de trabajo"
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+msgstr "Nombre de terminal"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Nombre de la estación de trabajo"
+#: plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:45
+#: plugins/admin/systems/phonesettings.tpl:25
+msgid "Mode"
+msgstr "Modo"
 
-#: plugins/admin/systems/printer.tpl:6
-#, fuzzy
-msgid "General"
-msgstr "Genérico"
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:47
+msgid "Select terminal mode"
+msgstr "Seleccionar modo de terminal"
 
-#: plugins/admin/systems/printer.tpl:14
-msgid "Printer name"
-msgstr "Nombre de la impresora"
+#: plugins/admin/systems/terminal.tpl:52
+msgid "Root server"
+msgstr "Servidor Raíz"
 
-#: plugins/admin/systems/printer.tpl:46
-msgid "Details"
-msgstr ""
+#: plugins/admin/systems/terminal.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
 
-#: plugins/admin/systems/printer.tpl:53
-msgid "Printer URL"
-msgstr "URL de la impresora"
+#: plugins/admin/systems/terminal.tpl:60
+msgid "Swap server"
+msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/printer.tpl:61
-msgid "PPD"
+#: plugins/admin/systems/terminal.tpl:62
+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/printer.tpl:71
-#, fuzzy
-msgid "Permissions"
-msgstr "Miembro con Permisos"
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Syslog server"
+msgstr "Servidor de Logs"
 
-#: plugins/admin/systems/printer.tpl:79
-msgid "Following objects are assigned as user."
-msgstr ""
+#: 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/printer.tpl:96
-msgid "Following objects are assigned as admin."
-msgstr ""
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:62
+msgid "NTP server"
+msgstr "Servidor NTP"
 
-#: plugins/admin/systems/printer.tpl:97
-#, fuzzy
-msgid "Admins"
-msgstr "DN del administrador"
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:64
+msgid "Choose server to use for synchronizing time"
+msgstr "Elija un servidor que será usado para sincronización horaria"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:82
+msgid "Select action to execute for this terminal"
+msgstr "Seleccione una acción que se ejecutara en este terminal"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:63
-#: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
 msgstr "texto"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:64
-#: plugins/admin/systems/class_workstationGeneric.inc:72
 msgid "graphic"
 msgstr "Gráfico"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:89
 #: plugins/admin/systems/class_servGeneric.inc:59
-#: plugins/admin/systems/class_workstationGeneric.inc:98
 #: plugins/admin/ogroups/class_termgroup.inc:59
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
@@ -5335,9 +5634,7 @@ msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
 #: plugins/admin/systems/class_servGeneric.inc:63
 #: plugins/admin/systems/class_servGeneric.inc:75
 #: plugins/admin/systems/class_servGeneric.inc:87
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: plugins/admin/systems/class_workstationGeneric.inc:98
 #: plugins/admin/ogroups/class_termgroup.inc:63
 #: plugins/admin/ogroups/class_termgroup.inc:75
 #: plugins/admin/ogroups/class_termgroup.inc:87
@@ -5347,44 +5644,42 @@ msgstr "¡La ejecución de '%s' ha fallado!"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:101
 #: plugins/admin/systems/class_servGeneric.inc:71
-#: plugins/admin/systems/class_workstationGeneric.inc:110
 #: plugins/admin/ogroups/class_termgroup.inc:71
 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:113
 #: plugins/admin/systems/class_servGeneric.inc:83
-#: plugins/admin/systems/class_workstationGeneric.inc:122
 #: plugins/admin/ogroups/class_termgroup.inc:83
 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:144
 #: plugins/admin/systems/class_servGeneric.inc:112
-#: plugins/admin/systems/class_workstationGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:123
 #: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Switch off"
 msgstr "Apagar"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:144
 #: plugins/admin/systems/class_servGeneric.inc:112
-#: plugins/admin/systems/class_workstationGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:123
 #: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Reboot"
 msgstr "Reiniciar"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:146
 #: plugins/admin/systems/class_servGeneric.inc:114
-#: plugins/admin/systems/class_workstationGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:128
 #: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Wake up"
 msgstr "Despertar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:237
+#: plugins/admin/systems/class_terminalGeneric.inc:240
 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:241
+#: plugins/admin/systems/class_terminalGeneric.inc:244
 msgid "The required field 'Terminal name' is not set."
 msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
 
@@ -5425,15 +5720,108 @@ msgstr ""
 "Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:136
+#: plugins/admin/systems/printer.tpl:6
+#, fuzzy
+msgid "General"
+msgstr "Genérico"
+
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Nombre de la impresora"
+
+#: plugins/admin/systems/printer.tpl:30
+msgid "Details"
+msgstr ""
+
+#: plugins/admin/systems/printer.tpl:33
+#, fuzzy
+msgid "Printer location"
+msgstr "Configuración telefónica"
+
+#: plugins/admin/systems/printer.tpl:37
+msgid "Printer URL"
+msgstr "URL de la impresora"
+
+#: 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/printer.tpl:57
+#, fuzzy
+msgid "Permissions"
+msgstr "Miembro con Permisos"
+
+#: plugins/admin/systems/printer.tpl:64
+#, fuzzy
+msgid "Users which are allowed to use this printer"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
+
+#: plugins/admin/systems/printer.tpl:68 plugins/admin/systems/printer.tpl:84
+#, fuzzy
+msgid "Add user"
+msgstr "Usuario administrador"
+
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+#, fuzzy
+msgid "Add group"
+msgstr "grupos"
+
+#: plugins/admin/systems/printer.tpl:80
+#, fuzzy
+msgid "Users which are allowed to administrate this printer"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
+
+#: plugins/admin/systems/printer.tpl:81
+#, fuzzy
+msgid "Admins"
+msgstr "DN del administrador"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:68
+#, fuzzy
+msgid "Activated"
+msgstr "Privado"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:69
+msgid "Locked"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationGeneric.inc:70
+#, fuzzy
+msgid "Memory test"
+msgstr "Memoria"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:94
+#, 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:106
 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:225
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#, fuzzy
+msgid "Instant update"
+msgstr "Crear cuenta telefónica"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:125
+#: plugins/admin/systems/class_workstationGeneric.inc:129
+#, fuzzy
+msgid "Scheduled update"
+msgstr "Plantilla seleccionada"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:126
+#, fuzzy
+msgid "Rescan hardware"
+msgstr "Componente telefónico"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:194
 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:229
+#: plugins/admin/systems/class_workstationGeneric.inc:198
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 " El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
@@ -5442,255 +5830,270 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:322
+#: plugins/admin/systems/class_systemManagement.inc:331
 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:338
+#: plugins/admin/systems/class_systemManagement.inc:347
 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:351
+#: plugins/admin/systems/class_systemManagement.inc:360
 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:395
-#: plugins/admin/FAI/class_faiManagement.inc:165
+#: plugins/admin/systems/class_systemManagement.inc:404
 #, 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:401
-#: plugins/admin/systems/class_systemManagement.inc:465
-#: plugins/admin/FAI/class_faiManagement.inc:171
-#: plugins/admin/FAI/class_faiManagement.inc:204
+#: plugins/admin/systems/class_systemManagement.inc:410
+#: plugins/admin/systems/class_systemManagement.inc:474
+#: plugins/admin/fai/class_faiManagement.inc:207
+#: plugins/admin/fai/class_faiManagement.inc:246
 msgid "You are not allowed to delete this component!"
 msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/systems/class_systemManagement.inc:557
-#: plugins/admin/systems/class_systemManagement.inc:704
+#: plugins/admin/systems/class_systemManagement.inc:566
+#, fuzzy
+msgid "New Terminal template"
+msgstr "Plantilla de terminal"
+
+#: plugins/admin/systems/class_systemManagement.inc:566
+#: plugins/admin/systems/class_systemManagement.inc:708
 #, fuzzy
 msgid "New Terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:558
-#: plugins/admin/systems/class_systemManagement.inc:705
+#: plugins/admin/systems/class_systemManagement.inc:567
+#, fuzzy
+msgid "New Workstation template"
+msgstr "Plantilla de estación de trabajo"
+
+#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/systems/class_systemManagement.inc:709
 #, fuzzy
 msgid "New Workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:559
+#: plugins/admin/systems/class_systemManagement.inc:568
 #, fuzzy
 msgid "New Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:560
+#: plugins/admin/systems/class_systemManagement.inc:569
 #, fuzzy
 msgid "New Printer"
 msgstr "Impresora"
 
-#: plugins/admin/systems/class_systemManagement.inc:561
+#: plugins/admin/systems/class_systemManagement.inc:570
 #, fuzzy
 msgid "New Phone"
 msgstr "Teléfono"
 
-#: plugins/admin/systems/class_systemManagement.inc:562
+#: plugins/admin/systems/class_systemManagement.inc:571
 #, fuzzy
 msgid "New Component"
 msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:579
 #, fuzzy
 msgid "Edit system"
 msgstr "Lista de sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:571
+#: plugins/admin/systems/class_systemManagement.inc:580
 #, fuzzy
 msgid "Delete system"
 msgstr "Borrar"
 
-#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/systems/class_systemManagement.inc:586
 #, fuzzy
 msgid "System"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:581
-#: plugins/admin/FAI/class_faiManagement.inc:392
+#: plugins/admin/systems/class_systemManagement.inc:590
+#: plugins/admin/fai/class_faiManagement.inc:462
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:614
+#: plugins/admin/systems/class_systemManagement.inc:623
 #, fuzzy
 msgid "Cups Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:615
+#: plugins/admin/systems/class_systemManagement.inc:624
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:625
 #, fuzzy
 msgid "Syslog Server"
 msgstr "Servidor de Logs"
 
-#: plugins/admin/systems/class_systemManagement.inc:617
+#: plugins/admin/systems/class_systemManagement.inc:626
 #, fuzzy
 msgid "Mail Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:627
 #, fuzzy
 msgid "Imap Server"
 msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/class_systemManagement.inc:619
+#: plugins/admin/systems/class_systemManagement.inc:628
 #, fuzzy
 msgid "Nfs Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:629
 #, fuzzy
 msgid "Kerberos Server"
 msgstr "Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:621
+#: plugins/admin/systems/class_systemManagement.inc:630
 #, fuzzy
 msgid "Asterisk Server"
 msgstr "Base de datos de usuarios Asterisk"
 
-#: plugins/admin/systems/class_systemManagement.inc:622
+#: plugins/admin/systems/class_systemManagement.inc:631
 #, fuzzy
 msgid "Fax Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:632
 #, fuzzy
 msgid "Ldap Server"
 msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/class_systemManagement.inc:649
+#: plugins/admin/systems/class_systemManagement.inc:658
 #, fuzzy
 msgid "Set root password"
 msgstr "Poner Contraseña"
 
-#: plugins/admin/systems/class_systemManagement.inc:700
+#: plugins/admin/systems/class_systemManagement.inc:704
 #: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminales"
 
-#: plugins/admin/systems/class_systemManagement.inc:701
+#: plugins/admin/systems/class_systemManagement.inc:705
 #: plugins/admin/ogroups/class_ogroupManagement.inc:485
 #: plugins/generic/references/class_reference.inc:48
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:706
+#: plugins/admin/systems/class_systemManagement.inc:710
 #, fuzzy
 msgid "Winstation"
 msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/systems/class_systemManagement.inc:711
 #, fuzzy
 msgid "Network Device"
 msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/class_systemManagement.inc:917
+#: plugins/admin/systems/class_systemManagement.inc:928
 msgid "New terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_systemManagement.inc:931
 msgid "New workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:937
+#: plugins/admin/systems/class_systemManagement.inc:948
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:948
+#: plugins/admin/systems/class_systemManagement.inc:960
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr "Servicio POP3"
+#: plugins/admin/systems/class_printGeneric.inc:186
+#: plugins/admin/systems/class_printGeneric.inc:207
+#: plugins/admin/systems/class_printGeneric.inc:210
+msgid "Add printer extension"
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr "Servicio POP3/SSL"
+#: plugins/admin/systems/class_printGeneric.inc:187
+#, 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"
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr "Servicio IMAP"
+#: plugins/admin/systems/class_printGeneric.inc:199
+#: plugins/admin/systems/class_printGeneric.inc:202
+#, fuzzy
+msgid "Remove printer extension"
+msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr "Servicio IMAP/SSL"
-
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr "Servicio Sieve"
-
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/class_printGeneric.inc:200
+#, fuzzy
+msgid ""
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
 msgstr ""
-"Servicio de presencia de FTP (propio, no tiene interacción con el servicio "
-"de presencia de Kolab2)"
-
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "Servicio de presencia HTTP (propio)"
-
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Desinfectado de correo Amavis (virus/spam)"
-
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr "Parámetros de quotas"
-
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr "Parámetros de Presencia"
-
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr "Permite descarga no autentificada de información de presencia."
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr "Redes privilegiadas SMTP"
+#: plugins/admin/systems/class_printGeneric.inc:203
+#, fuzzy
+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í."
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr "Equipos/Redes que son permitidos para hacer relay"
+#: plugins/admin/systems/class_printGeneric.inc:208
+#, fuzzy
+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í."
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
+#: plugins/admin/systems/class_printGeneric.inc:211
+#, fuzzy
+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/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhos"
+#: plugins/admin/systems/class_printGeneric.inc:222
+msgid "This 'dn' has no printer features."
+msgstr "Esta 'dn' no tiene características de impresora."
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr "Permitir búsquedas MX para los relayhost"
+#: plugins/admin/systems/class_printGeneric.inc:364
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr "Equipo usado para reenviar correos"
+#: plugins/admin/systems/class_printGeneric.inc:366
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr "Aceptar correo desde internet"
+#: plugins/admin/systems/class_printGeneric.inc:428
+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/servkolab.tpl:169
-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_printGeneric.inc:555
+#: plugins/admin/systems/class_printGeneric.inc:557
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: 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/class_servDNS.inc:33
 msgid "Remove DNS service"
@@ -5714,6 +6117,14 @@ msgstr ""
 "Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
 "aquí."
 
+#: plugins/admin/systems/workstation.tpl:9
+msgid "Workstation template"
+msgstr "Plantilla de estación de trabajo"
+
+#: plugins/admin/systems/workstation.tpl:11
+msgid "Workstation name"
+msgstr "Nombre de la estación de trabajo"
+
 #: plugins/admin/systems/servdb.tpl:6
 msgid "Kerberos kadmin access"
 msgstr "Acceso a Kerberos kadmin"
@@ -5774,129 +6185,6 @@ msgstr "Base de datos de Logs"
 msgid "Logging DB user"
 msgstr "Base de datos de acceso de usuarios"
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Nombre de la maquina"
-
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, 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:137
-#, 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_servDB.inc:141
-msgid "The sieve port needs to be numeric."
-msgstr "El puerto sieve necesita ser un numero."
-
-#: plugins/admin/systems/class_servDB.inc:172
-#, 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'."
-
-#: 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."
-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/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Seleccione para ver los dispositivos de red"
-
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Mostrar dispositivos de Red"
-
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Expresiones regulares para encontrar nombres de sistemas"
-
-#: plugins/admin/systems/headpage.tpl:59
-#, fuzzy
-msgid "Display systems of user"
-msgstr "Mostrar direcciones del usuario"
-
-#: 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/remove.tpl:7
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
-msgstr ""
-"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
-"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
-"esto, no hay forma de que GOsa recupere la información."
-
 #: plugins/admin/systems/class_servKolab.inc:112
 msgid "Remove Kolab extension"
 msgstr "Eliminar extensión Kolab"
@@ -5963,290 +6251,200 @@ msgstr "No se han indicado redes privilegiadas SMTP."
 msgid "No SMTP smarthost/relayhost set."
 msgstr "No se ha indicado SMTP smarthost/relayhost"
 
-#: plugins/admin/systems/class_printGeneric.inc:168
-#: plugins/admin/systems/class_printGeneric.inc:189
-#: plugins/admin/systems/class_printGeneric.inc:192
-msgid "Add printer extension"
-msgstr ""
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
+msgstr "Servicio POP3"
 
-#: plugins/admin/systems/class_printGeneric.inc:169
-#, 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"
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr "Servicio POP3/SSL"
 
-#: plugins/admin/systems/class_printGeneric.inc:181
-#: plugins/admin/systems/class_printGeneric.inc:184
-#, fuzzy
-msgid "Remove printer extension"
-msgstr "Eliminar extensión Kolab"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr "Servicio IMAP"
 
-#: plugins/admin/systems/class_printGeneric.inc:182
-#, fuzzy
-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í."
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr "Servicio IMAP/SSL"
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-#, fuzzy
-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í."
-
-#: plugins/admin/systems/class_printGeneric.inc:190
-#, fuzzy
-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í."
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr "Servicio Sieve"
 
-#: plugins/admin/systems/class_printGeneric.inc:193
-#, fuzzy
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+"Servicio de presencia de FTP (propio, no tiene interacción con el servicio "
+"de presencia de Kolab2)"
 
-#: plugins/admin/systems/class_printGeneric.inc:204
-msgid "This 'dn' has no printer features."
-msgstr "Esta 'dn' no tiene características de impresora."
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "Servicio de presencia HTTP (propio)"
 
-#: plugins/admin/systems/class_printGeneric.inc:322
-#, fuzzy
-msgid "Undefined"
-msgstr "sin definirse"
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Desinfectado de correo Amavis (virus/spam)"
 
-#: plugins/admin/systems/class_printGeneric.inc:333
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr "Parámetros de quotas"
 
-#: plugins/admin/systems/class_printGeneric.inc:335
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr "Parámetros de Presencia"
 
-# 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
-# Alejandro Escanero Blanco <alex@ofmin.com>, 2003, 2005.
-#: plugins/admin/systems/class_printGeneric.inc:339
-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"
-"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"
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr "Permite descarga no autentificada de información de presencia."
 
-#: plugins/admin/systems/class_printGeneric.inc:396
-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/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr "Redes privilegiadas SMTP"
 
-#: plugins/admin/systems/class_printGeneric.inc:515
-#: plugins/admin/systems/class_printGeneric.inc:517
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
-#: plugins/generic/references/class_reference.inc:36
-msgid "Group"
-msgstr "Grupo"
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr "Equipos/Redes que son permitidos para hacer relay"
 
-#: plugins/admin/systems/password.tpl:2
-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>"
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
 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>"
 
-#: plugins/admin/systems/password.tpl:6
-msgid "Changing the password impinges on authentification only."
-msgstr "Cambiar la contraseña afecta solamente a la autenticación."
-
-#: plugins/admin/systems/service.tpl:4
-msgid "Keyboard"
-msgstr "Teclado"
-
-#: plugins/admin/systems/service.tpl:7 plugins/admin/systems/service.tpl:210
-msgid "Model"
-msgstr "Modelo"
-
-#: plugins/admin/systems/service.tpl:9
-msgid "Choose keyboard model"
-msgstr "Elija modelo de teclado"
-
-#: plugins/admin/systems/service.tpl:15
-msgid "Layout"
-msgstr "Disposición"
-
-#: plugins/admin/systems/service.tpl:17
-msgid "Choose keyboard layout"
-msgstr "Elija localización del teclado"
-
-#: plugins/admin/systems/service.tpl:23
-msgid "Variant"
-msgstr "Variante"
-
-#: plugins/admin/systems/service.tpl:25
-msgid "Choose keyboard variant"
-msgstr "Elija variante de teclado"
-
-#: plugins/admin/systems/service.tpl:39
-msgid "Mouse"
-msgstr "Ratón"
-
-#: plugins/admin/systems/service.tpl:44
-msgid "Choose mouse type"
-msgstr "Elija tipo de ratón"
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr "SMTP smarthost/relayhos"
 
-#: plugins/admin/systems/service.tpl:50
-msgid "Port"
-msgstr "Puerto"
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr "Permitir búsquedas MX para los relayhost"
 
-#: plugins/admin/systems/service.tpl:52
-msgid "Choose mouse port"
-msgstr "Elija el puerto del ratón"
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr "Equipo usado para reenviar correos"
 
-#: plugins/admin/systems/service.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-msgid "Telephone hardware"
-msgstr "Componente telefónico"
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr "Aceptar correo desde internet"
 
-#: plugins/admin/systems/service.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-msgid "Telephone"
-msgstr "Teléfono"
+#: plugins/admin/systems/servkolab.tpl:169
+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/service.tpl:86
-msgid "Driver"
-msgstr "Controlador"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Nombre de la maquina"
 
-#: plugins/admin/systems/service.tpl:88
-msgid "Choose graphic driver that is needed by the installed graphic board"
+#: plugins/admin/systems/remove.tpl:7
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
 msgstr ""
-"Elija controlador gráfico que se necesita para la tarjeta gráfica instalada"
+"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/service.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr "Elija la resolución gráfica usada en modo gráfico"
+#: plugins/admin/systems/headpage.tpl:6
+msgid "List of systems"
+msgstr "Lista de sistemas"
 
-#: plugins/admin/systems/service.tpl:102
-msgid "Color depth"
-msgstr "Profundidad del Color"
+#: 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."
+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/service.tpl:104
-msgid "Choose colordepth used in graphic mode"
-msgstr "Elija la profundidad de color usada en modo gráfico"
+#: 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/service.tpl:117
-msgid "Display device"
-msgstr "Mostrar dispositivo"
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Mostrar servidores"
 
-#: plugins/admin/systems/service.tpl:124
-msgid "HSync"
-msgstr "HSync"
+#: plugins/admin/systems/headpage.tpl:39
+msgid "Select to see Linux terminals"
+msgstr "Seleccione para ver los terminales Linux"
 
-#: plugins/admin/systems/service.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
-msgstr "Frecuencia de refresco horizontal para el monitor instalado"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Mostrar terminales"
 
-#: plugins/admin/systems/service.tpl:129
-msgid "VSync"
-msgstr "VSync"
+#: plugins/admin/systems/headpage.tpl:40
+msgid "Select to see Linux workstations"
+msgstr "Seleccione para ver las estaciones de trabajo Linux"
 
-#: plugins/admin/systems/service.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
-msgstr "Frecuencia de refresco vertical para el monitor instalado"
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/systems/service.tpl:141
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
+#: 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/service.tpl:145
-msgid "Connect method"
-msgstr "Método de conexión"
+#: plugins/admin/systems/headpage.tpl:41
+msgid "Show windows based workstations"
+msgstr "Mostrara estaciones de trabajo basadas en windows"
 
-#: plugins/admin/systems/service.tpl:147
-msgid "Choose method to connect to terminal server"
-msgstr "Elija el método de conexión con el servidor de terminal"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Select to see network printers"
+msgstr "Seleccione para ver impresoras de red"
 
-#: plugins/admin/systems/service.tpl:154
-msgid "Terminal server"
-msgstr "Servidor de terminal"
+#: plugins/admin/systems/headpage.tpl:42
+msgid "Show network printers"
+msgstr "Mostrar impresoras de red"
 
-#: plugins/admin/systems/service.tpl:156
-msgid "Select specific terminal server to use"
-msgstr "Seleccione específicamente que servidor de terminal usará"
+#: plugins/admin/systems/headpage.tpl:43
+msgid "Select to see VOIP phones"
+msgstr "Seleccione para ver teléfonos VOIP"
 
-#: plugins/admin/systems/service.tpl:163
-msgid "Font server"
-msgstr "Servidor de fuentes"
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Mostrar teléfonos"
 
-#: plugins/admin/systems/service.tpl:165
-msgid "Select specific font server to use"
-msgstr "Seleccione específicamente que servidor de fuentes usará"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Select to see network devices"
+msgstr "Seleccione para ver los dispositivos de red"
 
-#: plugins/admin/systems/service.tpl:181
-msgid "Print device"
-msgstr "Dispositivo de Impresión"
+#: plugins/admin/systems/headpage.tpl:44
+msgid "Show network devices"
+msgstr "Mostrar dispositivos de Red"
 
-#: plugins/admin/systems/service.tpl:182
-msgid "Select to start IPP based printing service on terminal"
-msgstr ""
-"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
-"terminal"
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
+msgstr "Expresiones regulares para encontrar nombres de sistemas"
 
-#: plugins/admin/systems/service.tpl:183
-msgid "Provide print services"
-msgstr "Proveer servicios de impresión"
+#: plugins/admin/systems/headpage.tpl:59
+#, fuzzy
+msgid "Display systems of user"
+msgstr "Mostrar direcciones del usuario"
 
-#: plugins/admin/systems/service.tpl:189
-msgid "Spool server"
-msgstr "Servidor de Cola"
+#: 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/service.tpl:191
-msgid "Select NFS filesystem to place spool files on"
+#: plugins/admin/systems/password.tpl:2
+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 ""
-"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
-
-#: plugins/admin/systems/service.tpl:203
-msgid "Scan device"
-msgstr "Dispositivo de escaneo"
-
-#: plugins/admin/systems/service.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/service.tpl:205
-msgid "Provide scan services"
-msgstr "Provee servicios de exploración"
+"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>"
 
-#: plugins/admin/systems/service.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Seleccione que controladores de escáner se usaran"
+#: plugins/admin/systems/password.tpl:6
+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
 #: plugins/admin/systems/class_phoneGeneric.inc:276
@@ -6260,10 +6458,6 @@ msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 msgid "The required field 'IP-address' is not set."
 msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/admin/systems/component.tpl:6
-msgid "Device name"
-msgstr "Nombre del dispositivo"
-
 #: plugins/admin/systems/chooser.tpl:1
 msgid "Choose the kind of system component you want to create"
 msgstr "Elija el tipo de componente del sistema que desea crear"
@@ -6309,111 +6503,9 @@ msgstr "Impresora de Red"
 msgid "Other network component"
 msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Crear"
-
-#: plugins/admin/systems/startup.tpl:1
-msgid "Boot parameters"
-msgstr "Parametros de inicio"
-
-#: plugins/admin/systems/startup.tpl:8
-msgid "LDAP server"
-msgstr "Servidor LDAP"
-
-#: plugins/admin/systems/startup.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/startup.tpl:17
-msgid "Boot kernel"
-msgstr "Kernel de inicio"
-
-#: plugins/admin/systems/startup.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/startup.tpl:22
-msgid "Custom options"
-msgstr "Otras opciones"
-
-#: plugins/admin/systems/startup.tpl:24
-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 "
-"nucleo"
-
-#: plugins/admin/systems/startup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
-msgstr "Seleccione si el terminal soporta inicio gráfico con barra de progreso"
-
-#: plugins/admin/systems/startup.tpl:36
-msgid "use graphical bootup"
-msgstr "Usar arranque gráfico"
-
-#: plugins/admin/systems/startup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr "Seleccione si el terminal debería arrancar en modo texto"
-
-#: plugins/admin/systems/startup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr "Usar arranque en modo texto"
-
-#: plugins/admin/systems/startup.tpl:41
-msgid "Select to get more verbose output during startup"
-msgstr ""
-"Seleccione para obtener una información mas prolija durante el arranque"
-
-#: plugins/admin/systems/startup.tpl:42
-msgid "use debug mode for startup"
-msgstr "Usar el modo de depuración durante el arranque"
-
-#: plugins/admin/systems/startup.tpl:53
-msgid "Kernel modules (format: name parameters)"
-msgstr "Módulos del núcleo (formato: nombre parametros)"
-
-#: plugins/admin/systems/startup.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/startup.tpl:67
-msgid "Automount devices (format: complete autofs entry)"
-msgstr "Dispositivos de automontaje (formato: entrada autofs completa)"
-
-#: plugins/admin/systems/startup.tpl:69
-msgid "Add additional automount entries"
-msgstr "Añadir entradas adicionales de automontaje"
-
-#: plugins/admin/systems/startup.tpl:87
-msgid "Additional fstab entries"
-msgstr "Entradas de fstab adicionales"
-
-#: plugins/admin/systems/startup.tpl:89
-msgid "Add additional filesystems to be mounted during startup"
-msgstr "Añadir sistemas de archivos adicionales que serán montados al arrancar"
-
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:41
-#, fuzzy
-msgid "Charset"
-msgstr "Borrar"
-
-#: plugins/admin/systems/servnfs.tpl:63
-#: plugins/admin/FAI/faiTemplateEntry.tpl:34
-msgid "Path"
-msgstr ""
-
-#: plugins/admin/systems/servnfs.tpl:75
-#, fuzzy
-msgid "Option"
-msgstr "Opciones"
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Crear"
 
 #: plugins/admin/systems/class_phoneGeneric.inc:102
 msgid "This 'dn' has no phone features."
@@ -6464,36 +6556,6 @@ msgstr ""
 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:101
-#, fuzzy
-msgid "Please specify a valid path for your setup."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/systems/class_servNfs.inc:107
-#, fuzzy
-msgid "Please specify a valid name for your setup."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/systems/class_servNfs.inc:110
-#, fuzzy
-msgid "Please specify a name for your setup."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/systems/class_servNfs.inc:115
-#, fuzzy
-msgid "Description contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
-
-#: plugins/admin/systems/class_servNfs.inc:119
-#, fuzzy
-msgid "Path contains invalid characters."
-msgstr "El campo 'Nombre' contiene caracteres no validos."
-
-#: plugins/admin/systems/class_servNfs.inc:123
-#, fuzzy
-msgid "Option contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
-
 #: plugins/admin/systems/phonesettings.tpl:1
 #, fuzzy
 msgid "Specific Phone settings"
@@ -6581,23 +6643,212 @@ msgstr "¡No tiene permisos para eliminar este componente!"
 msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:1
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
+msgstr "Teclado"
+
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+msgid "Model"
+msgstr "Modelo"
+
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
+msgstr "Elija modelo de teclado"
+
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
+msgstr "Disposición"
+
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
+msgstr "Elija localización del teclado"
+
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
+msgstr "Variante"
+
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
+msgstr "Elija variante de teclado"
+
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
+msgstr "Ratón"
+
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
+msgstr "Puerto"
+
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+msgid "Choose mouse port"
+msgstr "Elija el puerto del ratón"
+
+#: plugins/admin/systems/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"
+msgstr ""
+"Elija controlador gráfico que se necesita para la tarjeta gráfica instalada"
+
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
+msgstr "Elija la resolución gráfica usada en modo gráfico"
+
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
+msgstr "Profundidad del Color"
+
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
+msgstr "Elija la profundidad de color usada en modo gráfico"
+
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
+msgstr "Mostrar dispositivo"
+
+#: plugins/admin/systems/workstationService.tpl:124
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
+msgstr "HSync"
+
+#: plugins/admin/systems/workstationService.tpl:126
+#: 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:129
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
+msgstr "VSync"
+
+#: plugins/admin/systems/workstationService.tpl:131
+#: 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:143
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
+msgstr "Dispositivo de escaneo"
+
+#: plugins/admin/systems/workstationService.tpl:144
+#: 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:145
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
+msgstr "Provee servicios de exploración"
+
+#: plugins/admin/systems/class_servNfs.inc:101
+#, fuzzy
+msgid "Please specify a valid path for your setup."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/admin/systems/class_servNfs.inc:107
+#, fuzzy
+msgid "Please specify a valid name for your setup."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/admin/systems/class_servNfs.inc:110
+#, fuzzy
+msgid "Please specify a name for your setup."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/admin/systems/class_servNfs.inc:115
+#, fuzzy
+msgid "Description contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_servNfs.inc:119
+#, fuzzy
+msgid "Path contains invalid characters."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
+
+#: plugins/admin/systems/class_servNfs.inc:123
+#, fuzzy
+msgid "Option contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:41
 #, fuzzy
-msgid "Select entry"
+msgid "Charset"
 msgstr "Borrar"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:10
+#: plugins/admin/systems/servnfs.tpl:63
+msgid "Path"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:75
 #, fuzzy
-msgid "Select user/group to add"
-msgstr "Seleccione grupo a añadir"
+msgid "Option"
+msgstr "Opciones"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:28
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+#, fuzzy
+msgid "Printer driver"
+msgstr "Dispositivo de Impresión"
+
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:57
+#, fuzzy
+msgid "Select"
+msgstr "Borrar"
+
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+#, fuzzy
+msgid "New driver"
+msgstr "Servidor"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+#, fuzzy
+msgid "Select entries to add"
+msgstr "Seleccione usuarios que serán añadidos"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:26
 #, fuzzy
 msgid ""
-"This menu allows you to select one or multiple users or groups to add them "
-"to the printer. \n"
-"\t\t\t\t\t\t\tHaving a great number of users, you may want to use the range "
-"selectors on top of this list."
+"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 "
@@ -6608,128 +6859,264 @@ msgstr ""
 msgid "Display members of department"
 msgstr "Mostrar número de Departamentos"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:53
 #, fuzzy
 msgid "Display members matching"
 msgstr "Mostrar números que concuerdan con"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:63
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:58
 #, fuzzy
 msgid "Regular expression for matching member names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:2
-msgid "Printer driver information file setup"
+#: plugins/admin/systems/class_printerPPDDialog.inc:53
+#, php-format
+msgid "Can't open '%s', ppd settings reseted."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:100
+#, php-format
+msgid "Cab't create folder '%s' for the uploaded ppd file."
 msgstr ""
 
-#: plugins/admin/systems/printerPPDDialog.tpl:7
+#: plugins/admin/systems/class_printerPPDDialog.inc:113
+#, fuzzy, 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."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:120
+#, fuzzy, php-format
+msgid "Can't save file '%s'"
+msgstr "Borrar"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:136
+#: plugins/admin/systems/class_printerPPDDialog.inc:139
 #, fuzzy
-msgid "Current used information setup : "
-msgstr "Información genérica del usuario"
+msgid "Please specify a valid ppd file."
+msgstr "Por favor especifique un nombre de usuario valido."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:163
+#, fuzzy
+msgid "Please select a valid ppd."
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:270
+#: plugins/admin/fai/faiPackage.tpl:41
+#, fuzzy
+msgid "Section"
+msgstr "Acción"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:320
+#: plugins/admin/systems/class_printerPPDDialog.inc:323
+#, fuzzy
+msgid "True"
+msgstr "Futuro"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:321
+#: plugins/admin/systems/class_printerPPDDialog.inc:324
+#, fuzzy
+msgid "False"
+msgstr "mujer"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:329
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
+msgstr ""
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Seleccione objetos a añadir"
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:33
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+msgid "Display objects of department"
+msgstr "Mostrar objetos de departamentos"
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:41
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+#: plugins/admin/fai/faiProfileEntry.tpl:55
+#: plugins/admin/fai/faiProfileEntry.tpl:56 plugins/admin/fai/headpage.tpl:47
+#: plugins/admin/fai/faiPackageEntry.tpl:50
+msgid "Display objects matching"
+msgstr "Mostrar objetos que concuerden con"
+
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:45
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
+#: plugins/admin/fai/faiProfileEntry.tpl:60 plugins/admin/fai/headpage.tpl:51
+#: plugins/admin/fai/faiPackageEntry.tpl:55
+msgid "Regular expression for matching object names"
+msgstr "Expresiones regulares que concuerden con nombres de objetos"
+
+#: plugins/admin/systems/class_workstationStartup.inc:197
+#, 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_workstationStartup.inc:248
+#, fuzzy
+msgid ""
+"There is already a profile in your selection that contain partition table "
+"configuratons."
+msgstr "Ya existe un usuario con este 'Login' en la base de datos."
+
+#: plugins/admin/systems/workstationStartup.tpl:4
+#: plugins/admin/systems/terminalStartup.tpl:1
+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
+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 "
+"nucleo"
+
+#: plugins/admin/systems/workstationStartup.tpl:35
+#, fuzzy
+msgid "FAI server"
+msgstr "Servidor LDAP"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:13
+#: plugins/admin/systems/workstationStartup.tpl:41
+#: plugins/admin/fai/faiPackage.tpl:57 plugins/admin/fai/faiPackageNew.tpl:59
 #, fuzzy
-msgid "Select"
+msgid "set"
 msgstr "Borrar"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/systems/workstationStartup.tpl:42
 #, fuzzy
-msgid "List of PPDs"
-msgstr "Lista de usuarios"
+msgid "Assigned FAI classes"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:85
-msgid "Reset list"
-msgstr ""
+#: plugins/admin/systems/workstationStartup.tpl:65
+#: plugins/admin/systems/terminalStartup.tpl:53
+msgid "Kernel modules (format: name parameters)"
+msgstr "Módulos del núcleo (formato: nombre parametros)"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:87
-msgid "Upload PPD"
-msgstr ""
+#: plugins/admin/systems/workstationStartup.tpl:67
+#: 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/class_printerPPDSelectionDialog.inc:92
-msgid "List with all available ppd files."
-msgstr ""
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:99
-msgid "Entries"
-msgstr ""
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr "Método de conexión"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:117
-#, fuzzy
-msgid "selected"
-msgstr "Borrar"
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr "Elija el método de conexión con el servidor de terminal"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:135
-#, fuzzy
-msgid "Please select a PPD or press cancel"
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Servidor de terminal"
 
-#: plugins/admin/ogroups/headpage.tpl:24
-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/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr "Seleccione específicamente que servidor de terminal usará"
 
-#: plugins/admin/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr "Mostrar grupos que tienen usuarios"
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr "Servidor de fuentes"
 
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr "Mostrar grupos que contienen grupos"
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr "Seleccione específicamente que servidor de fuentes usará"
 
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr "Mostrar grupos que contienen aplicaciones"
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr "Dispositivo de Impresión"
 
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr "Mostrar grupos que contienen departamentos"
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
+msgstr ""
+"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
+"terminal"
 
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr "Mostrar grupos que contienen servidores"
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
+msgstr "Proveer servicios de impresión"
 
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr "Mostrar grupos que contienen estaciones de trabajo"
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Servidor de Cola"
 
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr "Mostrar grupos que contienen terminales"
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
+msgstr ""
+"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
 
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr "Mostrar grupos que contienen impresoras"
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Seleccione que controladores de escáner se usaran"
 
-#: plugins/admin/ogroups/headpage.tpl:51
-#, fuzzy
-msgid "Display object groups matching"
-msgstr "Mostrar objetos que concuerden con"
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr "Seleccione si el terminal soporta inicio gráfico con barra de progreso"
 
-#: plugins/admin/ogroups/generic.tpl:9
-msgid "Name of the group"
-msgstr "Nombre del grupo"
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "Usar arranque gráfico"
 
-#: plugins/admin/ogroups/generic.tpl:32
-msgid "Member objects"
-msgstr "Objetos miembro"
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Seleccione si el terminal debería arrancar en modo texto"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Terminales"
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "Usar arranque en modo texto"
+
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
+msgstr ""
+"Seleccione para obtener una información mas prolija durante el arranque"
+
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr "Usar el modo de depuración durante el arranque"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:39
+#: plugins/admin/ogroups/tabs_ogroups.inc:59
+#: plugins/admin/ogroups/tabs_ogroups.inc:148
 #, fuzzy
 msgid "Phone queue"
 msgstr "Número de teléfono"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Seleccione objetos a añadir"
+#: plugins/admin/ogroups/tabs_ogroups.inc:84
+#: plugins/admin/ogroups/tabs_ogroups.inc:128
+msgid "Terminals"
+msgstr "Terminales"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
@@ -6783,20 +7170,6 @@ msgstr "Mostrar impresoras"
 msgid "Select to see phones"
 msgstr "Seleccione para ver teléfonos"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-msgid "Display objects of department"
-msgstr "Mostrar objetos de departamentos"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-#: plugins/admin/FAI/faiProfileEntry.tpl:52 plugins/admin/FAI/headpage.tpl:47
-msgid "Display objects matching"
-msgstr "Mostrar objetos que concuerden con"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
-#: plugins/admin/FAI/faiProfileEntry.tpl:56 plugins/admin/FAI/headpage.tpl:51
-msgid "Regular expression for matching object names"
-msgstr "Expresiones regulares que concuerden con nombres de objetos"
-
 #: plugins/admin/ogroups/termgroup.tpl:1
 msgid ""
 "All actions you choose here influence <b>all</b> machines in this object "
@@ -6811,8 +7184,64 @@ msgstr ""
 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/class_ogroup.inc:124
+msgid "This 'dn' is no object group."
+msgstr "Este 'dn' no es un objeto tipo grupo."
+
+#: plugins/admin/ogroups/class_ogroup.inc:234
+msgid "too many different objects!"
+msgstr "¡Demasiados objetos diferentes!"
+
+#: plugins/admin/ogroups/class_ogroup.inc:236
+msgid "users"
+msgstr "usuarios"
+
+#: plugins/admin/ogroups/class_ogroup.inc:237
+msgid "groups"
+msgstr "grupos"
+
+#: plugins/admin/ogroups/class_ogroup.inc:238
+msgid "applications"
+msgstr "Aplicaciones"
+
+#: plugins/admin/ogroups/class_ogroup.inc:239
+msgid "departments"
+msgstr "departamentos"
+
+#: plugins/admin/ogroups/class_ogroup.inc:240
+msgid "servers"
+msgstr "servidores"
+
+#: plugins/admin/ogroups/class_ogroup.inc:241
+msgid "workstations"
+msgstr "estaciones de trabajo"
+
+#: plugins/admin/ogroups/class_ogroup.inc:242
+msgid "terminals"
+msgstr "terminales"
+
+#: plugins/admin/ogroups/class_ogroup.inc:243
+msgid "phones"
+msgstr "teléfonos"
+
+#: plugins/admin/ogroups/class_ogroup.inc:244
+msgid "printers"
+msgstr "servidores de Impresión"
+
+#: plugins/admin/ogroups/class_ogroup.inc:251
+msgid "and"
+msgstr "y"
+
+#: plugins/admin/ogroups/class_ogroup.inc:402
+msgid "Non existing dn: "
+msgstr "No existe 'dn':"
+
+#: plugins/admin/ogroups/class_ogroup.inc:533
+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/main.inc:34 plugins/admin/ogroups/main.inc:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 msgid "Object groups"
 msgstr "Grupos de objetos"
 
@@ -6820,7 +7249,9 @@ msgstr "Grupos de objetos"
 msgid "UNIX accounts"
 msgstr "Cuentas UNIX"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45 html/getxls.php:128
+#: html/getxls.php:134 html/getxls.php:151 html/getxls.php:213
+#: html/getxls.php:269
 msgid "Servers"
 msgstr "Servidores"
 
@@ -6842,89 +7273,240 @@ msgstr "Has decidido eliminar el objeto grupo '%s'."
 msgid "You are not allowed to delete this object group!"
 msgstr "¡No tiene permisos para eliminar este objeto grupo!"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#, fuzzy
+msgid "Create new object group"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#, fuzzy
+msgid "Name of object groups"
+msgstr "Nombre del grupo"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/ogroups/generic.tpl:9
+msgid "Name of the group"
+msgstr "Nombre del grupo"
+
+#: plugins/admin/ogroups/generic.tpl:32
+msgid "Member objects"
+msgstr "Objetos miembro"
+
+#: plugins/admin/ogroups/remove.tpl:7
+msgid ""
+"Please double check if you really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Por favor pulse dos veces si quiere hacer esto, ya que no hay forma de que "
+"GOsa pueda recuperar posteriormente esa información"
+
+#: plugins/admin/ogroups/headpage.tpl:24
+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/headpage.tpl:39
+msgid "Show groups containing users"
+msgstr "Mostrar grupos que tienen usuarios"
+
+#: plugins/admin/ogroups/headpage.tpl:40
+msgid "Show groups containing groups"
+msgstr "Mostrar grupos que contienen grupos"
+
+#: plugins/admin/ogroups/headpage.tpl:41
+msgid "Show groups containing applications"
+msgstr "Mostrar grupos que contienen aplicaciones"
+
+#: plugins/admin/ogroups/headpage.tpl:42
+msgid "Show groups containing departments"
+msgstr "Mostrar grupos que contienen departamentos"
+
+#: plugins/admin/ogroups/headpage.tpl:43
+msgid "Show groups containing servers"
+msgstr "Mostrar grupos que contienen servidores"
+
+#: plugins/admin/ogroups/headpage.tpl:44
+msgid "Show groups containing workstations"
+msgstr "Mostrar grupos que contienen estaciones de trabajo"
+
+#: plugins/admin/ogroups/headpage.tpl:45
+msgid "Show groups containing terminals"
+msgstr "Mostrar grupos que contienen terminales"
+
+#: plugins/admin/ogroups/headpage.tpl:46
+msgid "Show groups containing printers"
+msgstr "Mostrar grupos que contienen impresoras"
+
+#: plugins/admin/ogroups/headpage.tpl:51
+#, fuzzy
+msgid "Display object groups matching"
+msgstr "Mostrar objetos que concuerden con"
+
+#: plugins/admin/ogroups/mail.tpl:7
+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"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+#, 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 "
+"apretando a continuación."
+
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 #, fuzzy
-msgid "Create new object group"
-msgstr "Grupo de objetos"
+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."
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#: plugins/admin/ogroups/class_phonequeue.inc:79
 #, fuzzy
-msgid "Name of object groups"
-msgstr "Nombre del grupo"
+msgid "ring all"
+msgstr "Terminales"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
-#: plugins/admin/FAI/class_faiManagement.inc:397
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Grupo de objetos"
+#: plugins/admin/ogroups/class_phonequeue.inc:80
+msgid "round robin"
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:95
-msgid "This 'dn' is no object group."
-msgstr "Este 'dn' no es un objeto tipo grupo."
+#: plugins/admin/ogroups/class_phonequeue.inc:81
+msgid "least recently called"
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:203
-msgid "too many different objects!"
-msgstr "¡Demasiados objetos diferentes!"
+#: plugins/admin/ogroups/class_phonequeue.inc:82
+msgid "fewest completed calls"
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:205
-msgid "users"
-msgstr "usuarios"
+#: plugins/admin/ogroups/class_phonequeue.inc:83
+#, fuzzy
+msgid "random"
+msgstr "y"
 
-#: plugins/admin/ogroups/class_ogroup.inc:206
-msgid "groups"
-msgstr "grupos"
+#: plugins/admin/ogroups/class_phonequeue.inc:84
+msgid "round robin with memory"
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:207
-msgid "applications"
-msgstr "Aplicaciones"
+#: plugins/admin/ogroups/class_phonequeue.inc:110
+#, fuzzy
+msgid "Remove the phone queue from this Account"
+msgstr "Eliminar cuenta telefónica"
 
-#: plugins/admin/ogroups/class_ogroup.inc:208
-msgid "departments"
-msgstr "departamentos"
+#: plugins/admin/ogroups/class_phonequeue.inc:111
+#, 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í."
 
-#: plugins/admin/ogroups/class_ogroup.inc:209
-msgid "servers"
-msgstr "servidores"
+#: plugins/admin/ogroups/class_phonequeue.inc:113
+#, fuzzy
+msgid "Create phone queue"
+msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/ogroups/class_ogroup.inc:210
-msgid "workstations"
-msgstr "estaciones de trabajo"
+#: plugins/admin/ogroups/class_phonequeue.inc:114
+#, 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 "
+"pulsando aquí."
 
-#: plugins/admin/ogroups/class_ogroup.inc:211
-msgid "terminals"
-msgstr "terminales"
+#: plugins/admin/ogroups/class_phonequeue.inc:161
+msgid "Uruguai"
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:212
-msgid "phones"
-msgstr "teléfonos"
+#: plugins/admin/ogroups/class_phonequeue.inc:199
+#, fuzzy
+msgid "Timeout must be numeric"
+msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/ogroups/class_ogroup.inc:213
-msgid "printers"
-msgstr "servidores de Impresión"
+#: plugins/admin/ogroups/class_phonequeue.inc:202
+msgid "Retry must be numeric"
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:220
-msgid "and"
-msgstr "y"
+#: plugins/admin/ogroups/class_phonequeue.inc:205
+msgid "Max queue length must be numeric"
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:371
-msgid "Non existing dn: "
-msgstr "No existe 'dn':"
+#: plugins/admin/ogroups/class_phonequeue.inc:208
+msgid "Announce frequency must be numeric"
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:502
-msgid "Object groups need at least one member!"
-msgstr "'Grupos de objetos que necesitan al menos un miembro!"
+#: plugins/admin/ogroups/class_phonequeue.inc:211
+msgid "There must be least one queue number defined."
+msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:507
-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_phonequeue.inc:225
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:629
+#: plugins/gofon/macro/class_gofonMacro.inc:88
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:222
+msgid ""
+"There is currently no asterisk server defined. Possibly you are missing a "
+"server that handles the asterisk management (goFonServer).\n"
+"Your Settings can't be saved to asterisk Database."
+msgstr ""
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: plugins/admin/ogroups/class_phonequeue.inc:239
+#: plugins/admin/ogroups/class_phonequeue.inc:613
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:77
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:283
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1019
+#: plugins/gofon/macro/class_gofonMacro.inc:188
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:234
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:343
+#, php-format
 msgid ""
-"Please double check if you really want to do this since there is no way for "
-"GOsa to get your data back."
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:249
+#: plugins/admin/ogroups/class_phonequeue.inc:623
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:84
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1030
+#: plugins/gofon/macro/class_gofonMacro.inc:199
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:354
+#, fuzzy, php-format
+msgid "Can't select database %s on %s."
+msgstr "No puedo seleccionar la base de datos."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:280
+#: plugins/admin/ogroups/class_phonequeue.inc:494
+#: plugins/admin/ogroups/class_phonequeue.inc:659
+#, fuzzy, php-format
+msgid "Can't delete in Database %s, on Server %s."
+msgstr "No puedo seleccionar la base de datos."
+
+#: plugins/admin/ogroups/class_phonequeue.inc:524
+#: plugins/admin/ogroups/class_phonequeue.inc:526
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1131
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1133
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:394
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:396
+#, php-format
+msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
-"Por favor pulse dos veces si quiere hacer esto, ya que no hay forma de que "
-"GOsa pueda recuperar posteriormente esa información"
 
 #: plugins/admin/ogroups/phonequeue.tpl:1
 #, fuzzy
@@ -7040,905 +7622,872 @@ msgstr "Atributo 'dn' de los usuarios"
 #: plugins/admin/ogroups/phonequeue.tpl:212
 msgid "Announce holdtime"
 msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:218
-msgid "Allow the called user to transfer his call"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:224
-msgid "Allows calling user to transfer call"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:234
-msgid "Allow the called to hangup by pressing *"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:240
-msgid "Allows calling to hangup by pressing *"
-msgstr ""
-
-#: plugins/admin/ogroups/phonequeue.tpl:246
-msgid "Ring instead of playing background music"
-msgstr ""
-
-#: plugins/admin/ogroups/mail.tpl:7
-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"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:79
-#, fuzzy
-msgid "ring all"
-msgstr "Terminales"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:80
-msgid "round robin"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:81
-msgid "least recently called"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:82
-msgid "fewest completed calls"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:83
-#, fuzzy
-msgid "random"
-msgstr "y"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:84
-msgid "round robin with memory"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:110
-#, fuzzy
-msgid "Remove the phone queue from this Account"
-msgstr "Eliminar cuenta telefónica"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:111
-#, 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í."
-
-#: plugins/admin/ogroups/class_phonequeue.inc:113
-#, fuzzy
-msgid "Create phone queue"
-msgstr "Crear cuenta telefónica"
-
-#: plugins/admin/ogroups/class_phonequeue.inc:113
-#, 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 "
-"pulsando aquí."
-
-#: plugins/admin/ogroups/class_phonequeue.inc:160
-msgid "Uruguai"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:198
-#, fuzzy
-msgid "Timeout must be numeric"
-msgstr "El puerto sieve necesita ser un numero."
-
-#: plugins/admin/ogroups/class_phonequeue.inc:201
-msgid "Retry must be numeric"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:204
-msgid "Max queue length must be numeric"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:207
-msgid "Announce frequency must be numeric"
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:210
-msgid "There must be least one queue number defined."
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:224
-#: plugins/gofon/macro/class_gofonMacro.inc:88
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:222
-msgid ""
-"There is currently no asterisk server defined. Possibly you are missing a "
-"server that handles the asterisk management (goFonServer). \n"
-"  Your Settings can't be saved to asterisk Database. "
-msgstr ""
-
-#: plugins/admin/ogroups/class_phonequeue.inc:238
-#: plugins/admin/ogroups/class_phonequeue.inc:612
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:290
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1019
-#: plugins/gofon/macro/class_gofonMacro.inc:188
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:234
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:343
-#, php-format
-msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
-"error."
+
+#: plugins/admin/ogroups/phonequeue.tpl:218
+msgid "Allow the called user to transfer his call"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:248
-#: plugins/admin/ogroups/class_phonequeue.inc:622
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:301
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1030
-#: plugins/gofon/macro/class_gofonMacro.inc:199
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:354
-#, fuzzy, php-format
-msgid "Can't select database %s on %s."
-msgstr "No puedo seleccionar la base de datos."
+#: plugins/admin/ogroups/phonequeue.tpl:224
+msgid "Allows calling user to transfer call"
+msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:279
-#: plugins/admin/ogroups/class_phonequeue.inc:493
-#: plugins/admin/ogroups/class_phonequeue.inc:658
-#, fuzzy, php-format
-msgid "Can't delete in Database %s, on Server %s."
-msgstr "No puedo seleccionar la base de datos."
+#: plugins/admin/ogroups/phonequeue.tpl:234
+msgid "Allow the called to hangup by pressing *"
+msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:523
-#: plugins/admin/ogroups/class_phonequeue.inc:525
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1131
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1133
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:394
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:396
-#, php-format
-msgid "The specified telephonenumber '%s' is already assigned to '%s'."
+#: plugins/admin/ogroups/phonequeue.tpl:240
+msgid "Allows calling to hangup by pressing *"
 msgstr ""
 
-#: plugins/admin/ogroups/class_mailogroup.inc:38
-#, fuzzy
-msgid ""
-"This group has mail features enabled. You can disable them by clicking below."
+#: plugins/admin/ogroups/phonequeue.tpl:246
+msgid "Ring instead of playing background music"
 msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
-"apretando a continuación."
 
-#: plugins/admin/ogroups/class_mailogroup.inc:40
+#: plugins/admin/fai/remove.tpl:7
 #, fuzzy
 msgid ""
-"This group has mail features disabled. You can enable them by clicking below."
+"This includes <b>all</b> object informations. Please double check if your "
+"really want to do this since there is no way for GOsa to get your data back."
 msgstr ""
-"Esta cuenta tiene las características de correo desactivadas.Puede "
-"activarlas pulsando aqui."
+"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/FAI/class_faiScript.inc:198
-#: plugins/admin/FAI/class_faiTemplate.inc:198
-#: plugins/admin/FAI/class_faiPackage.inc:110
-#: plugins/admin/FAI/class_faiPackage.inc:113
-#: plugins/admin/FAI/class_faiProfile.inc:213
-#: plugins/admin/FAI/class_faiHook.inc:208
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:299
-#: plugins/admin/FAI/class_faiPartitionTable.inc:262
-#: plugins/admin/FAI/class_faiVariable.inc:198
-#, fuzzy
-msgid "Please enter a valid description."
-msgstr "Por favor introduzca un número de serie válido"
+#: plugins/admin/fai/main.inc:38 plugins/admin/fai/main.inc:40
+#, fuzzy
+msgid "Fully Automatic Installation"
+msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/FAI/class_faiManagement.inc:31 plugins/admin/FAI/main.inc:38
-#: plugins/admin/FAI/main.inc:40
+#: plugins/admin/fai/class_faiManagement.inc:32
 #, fuzzy
-msgid "FAI management"
-msgstr "Nombre de la maquina"
+msgid "FAI"
+msgstr "FAX ID"
 
-#: plugins/admin/FAI/class_faiManagement.inc:32
+#: plugins/admin/fai/class_faiManagement.inc:33
 #, fuzzy
 msgid "Fully Automatic Installation - management"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/FAI/class_faiManagement.inc:363
+#: plugins/admin/fai/class_faiManagement.inc:201
+#, fuzzy, 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 el componente en '%s'."
+
+#: plugins/admin/fai/class_faiManagement.inc:428
+#, fuzzy
+msgid "New profile"
+msgstr "Gestión de Asterisk PBX"
+
+#: plugins/admin/fai/class_faiManagement.inc:428
+msgid "P"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:433
 #, fuzzy
 msgid "New partition table"
 msgstr "Impresora"
 
-#: plugins/admin/FAI/class_faiManagement.inc:363
+#: plugins/admin/fai/class_faiManagement.inc:433
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:366
+#: plugins/admin/fai/class_faiManagement.inc:436
 #, fuzzy
-msgid "New script bundle"
-msgstr "Impresora"
+msgid "New scripts"
+msgstr "Mostrar equipos"
 
-#: plugins/admin/FAI/class_faiManagement.inc:366
+#: plugins/admin/fai/class_faiManagement.inc:436
 msgid "S"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:369
+#: plugins/admin/fai/class_faiManagement.inc:439
 #, fuzzy
-msgid "New hook bundle"
-msgstr "Teléfono"
+msgid "New hooks"
+msgstr "Mostrar equipos"
 
-#: plugins/admin/FAI/class_faiManagement.inc:369
+#: plugins/admin/fai/class_faiManagement.inc:439
 msgid "H"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:372
+#: plugins/admin/fai/class_faiManagement.inc:442
 #, fuzzy
-msgid "New variable bundle"
+msgid "New variables"
 msgstr "Mostrar terminales"
 
-#: plugins/admin/FAI/class_faiManagement.inc:372
+#: plugins/admin/fai/class_faiManagement.inc:442
 msgid "V"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:375
+#: plugins/admin/fai/class_faiManagement.inc:445
 #, fuzzy
-msgid "New template bundle"
+msgid "New templates"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/FAI/class_faiManagement.inc:375
+#: plugins/admin/fai/class_faiManagement.inc:445
 msgid "T"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:378
+#: plugins/admin/fai/class_faiManagement.inc:448
 #, fuzzy
-msgid "New package bundle"
+msgid "New package list"
 msgstr "# páginas"
 
-#: plugins/admin/FAI/class_faiManagement.inc:378
+#: plugins/admin/fai/class_faiManagement.inc:448
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:383
+#: plugins/admin/fai/class_faiManagement.inc:466
 #, fuzzy
-msgid "New profile bundle"
-msgstr "Gestión de Asterisk PBX"
-
-#: plugins/admin/FAI/class_faiManagement.inc:383
-msgid "P"
-msgstr ""
+msgid "Name of FAI class"
+msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/admin/FAI/class_faiManagement.inc:396
-msgid "FAI objects / ObjectClasses"
+#: plugins/admin/fai/class_faiManagement.inc:467
+msgid "Class type"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:398
+#: plugins/admin/fai/class_faiManagement.inc:471
 #, fuzzy
-msgid "Obtions"
-msgstr "Opciones"
-
-#: plugins/admin/FAI/class_faiManagement.inc:401
-#, fuzzy
-msgid "Edit object"
-msgstr "Encontrar objeto"
+msgid "Edit class"
+msgstr "clase"
 
-#: plugins/admin/FAI/class_faiManagement.inc:402
+#: plugins/admin/fai/class_faiManagement.inc:472
 #, fuzzy
-msgid "Delete object"
-msgstr "Objetos miembro"
+msgid "Delete class"
+msgstr "Borrar"
 
-#: plugins/admin/FAI/class_faiManagement.inc:417
-#: plugins/admin/FAI/class_faiProfile.inc:152
-#: plugins/admin/FAI/class_faiProfileEntry.inc:118
+#: plugins/admin/fai/class_faiManagement.inc:514
+#: plugins/admin/fai/class_faiManagement.inc:515
+#: plugins/admin/fai/class_faiProfile.inc:158
+#: plugins/admin/fai/class_faiProfileEntry.inc:120
 #, fuzzy
 msgid "Partition table"
 msgstr "Variable"
 
-#: plugins/admin/FAI/class_faiManagement.inc:424
+#: plugins/admin/fai/class_faiManagement.inc:521
+#: plugins/admin/fai/class_faiManagement.inc:522
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:431
+#: plugins/admin/fai/class_faiManagement.inc:528
+#: plugins/admin/fai/class_faiManagement.inc:529
 #, fuzzy
-msgid "Script set"
+msgid "Scripts"
 msgstr "Ruta del Script"
 
-#: plugins/admin/FAI/class_faiManagement.inc:438
+#: plugins/admin/fai/class_faiManagement.inc:549
+#: plugins/admin/fai/class_faiManagement.inc:550
 #, fuzzy
-msgid "Variable set"
-msgstr "Variable"
+msgid "Profile"
+msgstr "Ruta del Perfil"
 
-#: plugins/admin/FAI/class_faiManagement.inc:445
-msgid "Hook set"
-msgstr ""
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#, fuzzy
+msgid "Device"
+msgstr "Servicios"
 
-#: plugins/admin/FAI/class_faiManagement.inc:452
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
 #, fuzzy
-msgid "Profile"
-msgstr "Ruta del Perfil"
+msgid "Partition entries"
+msgstr "Variable"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
+#, fuzzy
+msgid "Add partition"
+msgstr "Añadir opción"
 
-#: plugins/admin/FAI/faiPartitionTable.tpl:32
-#: plugins/admin/FAI/faiVariable.tpl:32 plugins/admin/FAI/faiScript.tpl:32
-#: plugins/admin/FAI/faiTemplate.tpl:32 plugins/admin/FAI/faiHook.tpl:32
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
+#: plugins/admin/fai/faiTemplate.tpl:32 plugins/admin/fai/faiHook.tpl:32
 #, fuzzy
 msgid "Objects"
 msgstr "Objeto"
 
-#: plugins/admin/FAI/faiPartitionTable.tpl:34
-msgid "This partition table contains following disks"
-msgstr ""
+#: plugins/admin/fai/faiPartitionTable.tpl:34
+#, fuzzy
+msgid "Discs"
+msgstr "Servicios"
 
-#: plugins/admin/FAI/faiPartitionTable.tpl:40
+#: plugins/admin/fai/faiPartitionTable.tpl:40
 msgid "Choose a disk to delete or edit"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:6 plugins/admin/FAI/headpage.tpl:6
+#: plugins/admin/fai/faiProfileEntry.tpl:6
 msgid "List of FAI objects (Fully Automatic Installation)"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:24
+#: plugins/admin/fai/faiProfileEntry.tpl:27
 msgid ""
-"This menu allows you to select FAI class names, to add them to the currently "
-"editted profile."
+"This menu allows you to select FAI class names and to add them to the "
+"currently edited profile."
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:37
+#: plugins/admin/fai/faiProfileEntry.tpl:40
 #, fuzzy
 msgid "Show only classes with templates"
 msgstr "Mostrar plantillas"
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:39
+#: plugins/admin/fai/faiProfileEntry.tpl:42
 msgid "Show only classes with scripts"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:41
+#: plugins/admin/fai/faiProfileEntry.tpl:44
 msgid "Show only classes with hooks"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:43
+#: plugins/admin/fai/faiProfileEntry.tpl:46
 #, fuzzy
 msgid "Show only classes with variables"
 msgstr "Mostrar terminales"
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:45
+#: plugins/admin/fai/faiProfileEntry.tpl:48
 msgid "Show only classes with packages"
 msgstr ""
 
-#: plugins/admin/FAI/faiProfileEntry.tpl:47
+#: plugins/admin/fai/faiProfileEntry.tpl:50
 #, fuzzy
 msgid "Show only classes with partitions"
 msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/FAI/faiVariable.tpl:34 plugins/admin/FAI/faiScript.tpl:34
-#: plugins/admin/FAI/faiTemplate.tpl:34 plugins/admin/FAI/faiHook.tpl:34
-msgid "This bundle contains following objects"
-msgstr ""
+#: plugins/admin/fai/faiVariable.tpl:34
+#, fuzzy
+msgid "List of assigned variables"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/FAI/faiVariable.tpl:40
+#: plugins/admin/fai/faiVariable.tpl:40
 msgid "Choose a variable to delete or edit"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiScriptEntry.inc:48
+#: plugins/admin/fai/class_faiScriptEntry.inc:48
+#: plugins/admin/fai/class_faiHookEntry.inc:51
 #, fuzzy
 msgid "Please select a valid file."
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/FAI/class_faiScriptEntry.inc:51
+#: plugins/admin/fai/class_faiScriptEntry.inc:51
+#: plugins/admin/fai/class_faiHookEntry.inc:54
 #, fuzzy
 msgid "Selected file is empty."
 msgstr "El archivo especificado está vacío."
 
-#: plugins/admin/FAI/class_faiScriptEntry.inc:94
+#: plugins/admin/fai/class_faiScriptEntry.inc:96
+#: plugins/admin/fai/class_faiVariableEntry.inc:83
+#: plugins/admin/fai/class_faiHookEntry.inc:101
+#: plugins/admin/fai/class_faiTemplateEntry.inc:161
 #, fuzzy
-msgid "Please specify a script."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgid "Please enter a name."
+msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/admin/FAI/class_faiScriptEntry.inc:98
-#: plugins/admin/FAI/class_faiVariableEntry.inc:81
-#: plugins/admin/FAI/class_faiHookEntry.inc:86
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:87
+#: plugins/admin/fai/class_faiScriptEntry.inc:100
 #, fuzzy
-msgid "Please enter a description."
+msgid "Please enter a script."
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/FAI/class_faiScriptEntry.inc:102
-#: plugins/admin/FAI/class_faiVariableEntry.inc:85
-#: plugins/admin/FAI/class_faiHookEntry.inc:90
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:91
+#: plugins/admin/fai/faiScriptEntry.tpl:29
+#: plugins/admin/fai/faiScriptEntry.tpl:48
 #, fuzzy
-msgid "Invalid character in description. Please enter a valid description."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgid "Script attributes"
+msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/admin/FAI/class_faiScriptEntry.inc:106
-#: plugins/admin/FAI/class_faiVariableEntry.inc:89
-#: plugins/admin/FAI/class_faiHookEntry.inc:94
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:95
+#: plugins/admin/fai/faiScriptEntry.tpl:38 plugins/admin/fai/faiProfile.tpl:33
 #, fuzzy
-msgid "Please enter a name."
-msgstr "Por favor especifique una dirección de servidor - URI - válida."
+msgid "Choose a priority"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/FAI/class_faiScriptEntry.inc:110
-#: plugins/admin/FAI/class_faiVariableEntry.inc:93
-#: plugins/admin/FAI/class_faiHookEntry.inc:98
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:99
+#: plugins/admin/fai/faiScriptEntry.tpl:63
+#: plugins/admin/fai/faiHookEntry.tpl:63
 #, fuzzy
-msgid "Please enter a valid name. Only a-Z 0-9 are allowed."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgid "Import script"
+msgstr "Mostrar equipos"
 
-#: plugins/admin/FAI/faiScriptEntry.tpl:29
-#: plugins/admin/FAI/faiScriptEntry.tpl:48
+#: plugins/admin/fai/class_faiPackage.inc:118
 #, fuzzy
-msgid "Script attributes"
-msgstr "Atributo 'dn' de los usuarios"
+msgid "There is no useable package list defined."
+msgstr "No se ha subido ningún archivo."
+
+#: plugins/admin/fai/class_faiPackage.inc:256
+#, php-format
+msgid "Can't read configuration folder '%s'."
+msgstr ""
 
-#: plugins/admin/FAI/faiScriptEntry.tpl:38
+#: plugins/admin/fai/class_faiPackage.inc:338
 #, fuzzy
-msgid "Choose a priority"
-msgstr "Elija tipo de ratón"
+msgid "Please select a least one Package."
+msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/admin/FAI/faiScriptEntry.tpl:50
-#: plugins/admin/FAI/faiHookEntry.tpl:34
+#: plugins/admin/fai/class_faiPackage.inc:342
 #, fuzzy
-msgid "Script"
-msgstr "Ruta del Script"
+msgid "Please choose a valid combination for your repository setup."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/FAI/faiScriptEntry.tpl:54
+#: plugins/admin/fai/class_faiPackage.inc:373
+#, php-format
+msgid "Package file '%s' does not exist."
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:29
 #, fuzzy
-msgid "Import script"
-msgstr "Mostrar equipos"
+msgid "Repository"
+msgstr "Reintentar"
 
-#: plugins/admin/FAI/faiScriptEntry.tpl:70
-#: plugins/admin/FAI/faiVariableEntry.tpl:49
-#: plugins/admin/FAI/faiHookEntry.tpl:59
-#: plugins/admin/FAI/faiTemplateEntry.tpl:59
+#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:29
 #, fuzzy
-msgid "Abort"
-msgstr "Puerto"
+msgid "Release"
+msgstr "Paquete de reglas"
 
-#: plugins/admin/FAI/class_faiProfile.inc:136
-#: plugins/admin/FAI/class_faiProfileEntry.inc:140
+#: plugins/admin/fai/faiPackage.tpl:50
+msgid "Mirror"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:54 plugins/admin/fai/faiPackageNew.tpl:51
+msgid "mirror"
+msgstr ""
+
+#: plugins/admin/fai/faiPackage.tpl:67
+#, fuzzy
+msgid "Used packages"
+msgstr "Mostrar teléfonos"
+
+#: plugins/admin/fai/faiPackage.tpl:69
+#, fuzzy
+msgid "Choosen packages"
+msgstr "Mostrar teléfonos"
+
+#: plugins/admin/fai/faiPackage.tpl:75 include/functions.inc:587
+msgid "Configure"
+msgstr "Configurar"
+
+#: plugins/admin/fai/class_faiProfile.inc:142
+#: plugins/admin/fai/class_faiProfileEntry.inc:148
 msgid "This list displays all assigned class names for this profile."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:144
+#: plugins/admin/fai/class_faiProfile.inc:150
 #, fuzzy
 msgid "Append new class names"
 msgstr "Aplicaciones disponibles"
 
-#: plugins/admin/FAI/class_faiProfile.inc:147
-#: plugins/admin/FAI/class_faiProfileEntry.inc:113
+#: plugins/admin/fai/class_faiProfile.inc:153
+#: plugins/admin/fai/class_faiProfileEntry.inc:115
 msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:148
-#: plugins/admin/FAI/class_faiProfileEntry.inc:114
+#: plugins/admin/fai/class_faiProfile.inc:154
+#: plugins/admin/fai/class_faiProfileEntry.inc:116
 #, fuzzy
 msgid "Template bundle"
 msgstr "Plantilla"
 
-#: plugins/admin/FAI/class_faiProfile.inc:149
-#: plugins/admin/FAI/class_faiProfileEntry.inc:115
+#: plugins/admin/fai/class_faiProfile.inc:155
+#: plugins/admin/fai/class_faiProfileEntry.inc:117
 #, fuzzy
 msgid "Script bundle"
 msgstr "Ruta del Script"
 
-#: plugins/admin/FAI/class_faiProfile.inc:150
-#: plugins/admin/FAI/class_faiProfileEntry.inc:116
+#: plugins/admin/fai/class_faiProfile.inc:156
+#: plugins/admin/fai/class_faiProfileEntry.inc:118
 #, fuzzy
 msgid "Variable bundle"
 msgstr "Variable"
 
-#: plugins/admin/FAI/class_faiProfile.inc:151
+#: plugins/admin/fai/class_faiProfile.inc:157
 msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:154
+#: plugins/admin/fai/class_faiProfile.inc:160
 msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:209
-#, fuzzy
-msgid "Please specify a description for this profile."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/FAI/class_faiProfile.inc:217
-#, fuzzy
-msgid "Please enter a valid name. Only 0-9 a-Z are allowed here."
-msgstr "Por favor especifique un nombre de usuario valido."
-
-#: plugins/admin/FAI/class_faiProfile.inc:221
+#: plugins/admin/fai/class_faiProfile.inc:223
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiProfile.inc:229
+#: plugins/admin/fai/class_faiProfile.inc:227
+#, fuzzy
+msgid "Please enter a valid name."
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/admin/fai/class_faiProfile.inc:235
 #, fuzzy
 msgid "There is already a profile with this class name defined."
 msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
-#: plugins/admin/FAI/faiProfile.tpl:31
+#: plugins/admin/fai/faiProfile.tpl:32
+#, fuzzy
+msgid "FAI classes"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/fai/headpage.tpl:6
 #, fuzzy
-msgid "List of used class names"
+msgid "List of FAI classes"
 msgstr "Elija tipo de ratón"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:191
-msgid "Nr"
+#: plugins/admin/fai/headpage.tpl:24
+msgid "This menu allows you to create, delete and edit FAI classes."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:195
+#: plugins/admin/fai/headpage.tpl:36
+#, fuzzy
+msgid "Show profiles"
+msgstr "Mostrar impresoras"
+
+#: plugins/admin/fai/headpage.tpl:38
+#, fuzzy
+msgid "Show scripts"
+msgstr "Mostrar equipos"
+
+#: plugins/admin/fai/headpage.tpl:39
+#, fuzzy
+msgid "Show hooks"
+msgstr "Mostrar equipos"
+
+#: plugins/admin/fai/headpage.tpl:40
+#, fuzzy
+msgid "Show variables"
+msgstr "Mostrar terminales"
+
+#: plugins/admin/fai/headpage.tpl:41
+#, fuzzy
+msgid "Show packages"
+msgstr "Mostrar teléfonos"
+
+#: plugins/admin/fai/headpage.tpl:42
+#, fuzzy
+msgid "Show partitions"
+msgstr "Mostrar estaciones de trabajo"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:177
 #, fuzzy
 msgid "FS type"
 msgstr "Tipo"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:178
 #, fuzzy
 msgid "Mount point"
 msgstr "Monitor"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:197
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:179
 #, fuzzy
 msgid "Size in MB"
 msgstr "Entrando"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:198
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
 #, fuzzy
 msgid "Mount options"
 msgstr "Otras opciones"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:199
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
 #, fuzzy
 msgid "FS option"
 msgstr "Añadir opción"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:200
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
 #, fuzzy
 msgid "Preserve"
 msgstr "servidores"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:294
-#, fuzzy
-msgid "Please enter a description for your disk."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:315
-#, fuzzy, php-format
-msgid "Please enter a valid name for partition %s."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:319
-#, fuzzy, php-format
-msgid "please enter a unique name for partition %s"
-msgstr "¡Por favor introduzca un número de teléfono valido!"
-
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:323
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:334
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:327
-#, fuzzy, php-format
-msgid "Please enter a valid description for partition %s."
-msgstr ""
-"Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
-
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:331
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:339
 #, fuzzy, 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'"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:336
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:344
 #, php-format
 msgid ""
-"Fils system type 'swap' is already used, change file system type for "
+"File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:342
-#, php-format
-msgid "Please enter a range for partition size, 'from-to', for partition %s."
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:348
+msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:344
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:346
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:354
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:358
 #, fuzzy, php-format
-msgid "Please enter a valid range for partition %s."
-msgstr "Por favor introduzca un número de serie válido"
-
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:389
-#, php-format
-msgid ""
-"Size settings for partition %s, overlap with size settings for partition %s."
+msgid "Please enter a valid partition size for partition %s."
 msgstr ""
+"Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:11
-#, fuzzy
-msgid "Choose a disc name"
-msgstr "Elija modelo de teclado"
-
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:29
-#, fuzzy
-msgid "Partition entries"
-msgstr "Variable"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:364
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
+#, fuzzy, php-format
+msgid "Please enter a valid range for partition %s."
+msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:32
-#, fuzzy
-msgid "Add partition"
-msgstr "Añadir opción"
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:371
+#, fuzzy, php-format
+msgid "Please enter a range for partition size for partition %s."
+msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:39
+#: plugins/admin/fai/faiScript.tpl:34
 #, fuzzy
-msgid "cancel"
-msgstr "Cancelar"
+msgid "List of scripts"
+msgstr "Lista de usuarios"
 
-#: plugins/admin/FAI/faiScript.tpl:40
+#: plugins/admin/fai/faiScript.tpl:40
 msgid "Choose a script to delete or edit"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiVariableEntry.inc:77
+#: plugins/admin/fai/class_faiVariableEntry.inc:79
 #, fuzzy
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/FAI/faiVariableEntry.tpl:29
+#: plugins/admin/fai/faiVariableEntry.tpl:29
 #, fuzzy
 msgid "Variable attributes"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/admin/FAI/faiVariableEntry.tpl:34
-#, fuzzy
-msgid "Variable Content"
-msgstr "Variable"
-
-#: plugins/admin/FAI/faiTemplate.tpl:40
-#, fuzzy
-msgid "Choose a template to delete or edit"
-msgstr "Elija un departamento para guardar la entrada"
-
-#: plugins/admin/FAI/remove.tpl:7
-#, fuzzy
-msgid ""
-"This includes <b>all</b> object 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/FAI/headpage.tpl:24
-msgid "This menu allows you to create, delete and edit FAI objects."
-msgstr ""
-
-#: plugins/admin/FAI/headpage.tpl:36
-#, fuzzy
-msgid "Show profiles"
-msgstr "Mostrar impresoras"
-
-#: plugins/admin/FAI/headpage.tpl:38
-#, fuzzy
-msgid "Show scripts"
-msgstr "Mostrar equipos"
-
-#: plugins/admin/FAI/headpage.tpl:39
+#: plugins/admin/fai/faiVariableEntry.tpl:34
 #, fuzzy
-msgid "Show hooks"
-msgstr "Mostrar equipos"
-
-#: plugins/admin/FAI/headpage.tpl:40
-#, fuzzy
-msgid "Show variables"
-msgstr "Mostrar terminales"
-
-#: plugins/admin/FAI/headpage.tpl:41
-#, fuzzy
-msgid "Show packages"
-msgstr "Mostrar teléfonos"
-
-#: plugins/admin/FAI/headpage.tpl:42
-#, fuzzy
-msgid "Show partitions"
-msgstr "Mostrar estaciones de trabajo"
-
-#: plugins/admin/FAI/class_faiPartitionTable.inc:218
-#: plugins/admin/FAI/class_faiPartitionTable.inc:220
-msgid "Number of Partitions"
-msgstr ""
+msgid "Variable content"
+msgstr "Variable"
 
-#: plugins/admin/FAI/class_faiPartitionTable.inc:266
+#: plugins/admin/fai/faiTemplate.tpl:34
 #, fuzzy
-msgid "Please enter a valid name."
-msgstr "Por favor introduzca un número de serie válido"
+msgid "List of template files"
+msgstr "Lista de Departamentos"
 
-#: plugins/admin/FAI/class_faiHookEntry.inc:77
+#: plugins/admin/fai/faiTemplate.tpl:40
 #, fuzzy
-msgid "Please enter a value for task."
-msgstr "Por favor especifique un usuario valido."
+msgid "Choose a template to delete or edit"
+msgstr "Elija un departamento para guardar la entrada"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:219
+#: plugins/admin/fai/class_faiPartitionTable.inc:225
+#, fuzzy, php-format
+msgid "%s partition"
+msgstr "Mostrar estaciones de trabajo"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:221
+#: plugins/admin/fai/class_faiPartitionTable.inc:227
+#, fuzzy, php-format
+msgid "%s partition(s)"
+msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/FAI/class_faiHookEntry.inc:80
+#: plugins/admin/fai/class_faiHookEntry.inc:97
 #, fuzzy
 msgid "Please enter a value for script."
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/FAI/class_faiProfileEntry.inc:117
+#: plugins/admin/fai/class_faiProfileEntry.inc:119
 msgid "Package bundle"
 msgstr ""
 
-#: plugins/admin/FAI/faiHookEntry.tpl:29
+#: 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:44
+#: plugins/admin/fai/faiHookEntry.tpl:34
 #, fuzzy
 msgid "Task"
 msgstr "Días para tareas"
 
-#: plugins/admin/FAI/class_askClassName.inc:68
+#: plugins/admin/fai/faiHookEntry.tpl:36
+msgid "Choose a FAI task to hook"
+msgstr ""
+
+#: plugins/admin/fai/class_askClassName.inc:68
 #, fuzzy
 msgid "Create new FAI object - partition table."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:69
+#: plugins/admin/fai/class_askClassName.inc:69
 #, fuzzy
-msgid "Create new FAI object - package list."
+msgid "Create new FAI object - package bundle."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:70
+#: plugins/admin/fai/class_askClassName.inc:70
 #, fuzzy
-msgid "Create new FAI object - set of scripts."
+msgid "Create new FAI object - script bundle."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:71
-msgid "Create new FAI object - set of variables."
-msgstr ""
+#: plugins/admin/fai/class_askClassName.inc:71
+#, fuzzy
+msgid "Create new FAI object - variable bundle."
+msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:72
+#: plugins/admin/fai/class_askClassName.inc:72
 #, fuzzy
-msgid "Create new FAI object - set of hooks."
+msgid "Create new FAI object - hook bundle."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:73
+#: plugins/admin/fai/class_askClassName.inc:73
 #, fuzzy
 msgid "Create new FAI object - profile."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:74
+#: plugins/admin/fai/class_askClassName.inc:74
 #, fuzzy
 msgid "Create new FAI object - template."
 msgstr "Nueva plantilla"
 
-#: plugins/admin/FAI/class_askClassName.inc:75
+#: plugins/admin/fai/class_askClassName.inc:75
 #, fuzzy
 msgid "Create new FAI object"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:125
+#: plugins/admin/fai/class_askClassName.inc:126
 #, fuzzy
 msgid "The given class name is empty."
 msgstr "El archivo especificado está vacío."
 
-#: plugins/admin/FAI/class_askClassName.inc:129
+#: plugins/admin/fai/class_askClassName.inc:130
 #, fuzzy
 msgid "The specified class name is already in use for this object type."
 msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/FAI/class_askClassName.inc:133
-#, 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."
-
-#: plugins/admin/FAI/askClassName.tpl:5
-msgid ""
-"Please select a class name for this object. The class name specifies a set "
-"of configurations."
-msgstr ""
-
-#: plugins/admin/FAI/askClassName.tpl:7
+#: plugins/admin/fai/askClassName.tpl:6
 msgid ""
-"Every Class name must be unique. But it can be used for different objects at "
-"the same time.\n"
-"\n"
-"\t   If you use this class name in a profile, all object with this class "
-"name will be included to this profile."
+"Adding a new class to the FAI management, requires a class name. You have to "
+"specify a unique class name for unique types of FAI classes, while you can "
+"use the same class name for different types of FAI classes. In the laste "
+"case, FAI will automatically enclose all these different class types to one "
+"unique class name."
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:11
+#: plugins/admin/fai/askClassName.tpl:12
 msgid ""
-"The list box below shows all available class names you may use, for this "
-"object, to avoid duplicates."
+"Please use one of the following methods to choose the name for the new FAI "
+"class."
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:17
-msgid "You can select of one the following class names for this object."
+#: plugins/admin/fai/askClassName.tpl:26
+msgid "Enter FAI class name manually"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:21
+#: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
 #, fuzzy
-msgid "Available class names."
-msgstr "Aplicaciones disponibles"
+msgid "Class name"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/fai/askClassName.tpl:48
+msgid "Choose FAI class name from a list of existing classes"
+msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:24
+#: plugins/admin/fai/askClassName.tpl:54
 #, fuzzy
 msgid "Choose class name"
 msgstr "Elija tipo de ratón"
 
-#: plugins/admin/FAI/askClassName.tpl:36
-msgid "Please enter your class name here, if want to create a new class."
-msgstr ""
+#: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#, fuzzy
+msgid "Use"
+msgstr "Usuario"
 
-#: plugins/admin/FAI/askClassName.tpl:40
+#: plugins/admin/fai/askClassName.tpl:74
 msgid "A new class name.</b>"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:77
+#: plugins/admin/fai/class_faiTemplateEntry.inc:71
+#, fuzzy
+msgid "no file uploaded yet"
+msgstr "No se ha subido ningún archivo."
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:73
+#, php-format
+msgid "exists in database (size: %s bytes)"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:153
 #, fuzzy
 msgid "Please specify a value for attribute 'file'."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/FAI/class_faiTemplateEntry.inc:81
+#: plugins/admin/fai/class_faiTemplateEntry.inc:157
 #, fuzzy
 msgid "Please specify a value for attribute 'path'."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/FAI/faiTemplateEntry.tpl:29
+#: plugins/admin/fai/class_faiTemplateEntry.inc:165
+#, fuzzy
+msgid "Please enter a user."
+msgstr "Por favor especifique una dirección de servidor - URI - válida."
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:168
+#, fuzzy
+msgid "Please enter a valid user. Only a-Z 0-9 are allowed."
+msgstr "Por favor especifique un nombre de usuario valido."
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:172
+#, fuzzy
+msgid "Please enter a group."
+msgstr "Por favor especifique una dirección de servidor - URI - válida."
+
+#: plugins/admin/fai/class_faiTemplateEntry.inc:175
+#, fuzzy
+msgid "Please enter a valid group. Only a-Z 0-9 are allowed."
+msgstr "Por favor especifique un nombre de usuario valido."
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:21
 #, fuzzy
 msgid "Template attributes"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/admin/FAI/faiTemplateEntry.tpl:44 include/php_setup.inc:122
+#: plugins/admin/fai/faiTemplateEntry.tpl:29 include/php_setup.inc:122
 msgid "File"
 msgstr "Archivo"
 
-#: plugins/admin/FAI/faiHook.tpl:40
+#: plugins/admin/fai/faiTemplateEntry.tpl:35
+#, fuzzy
+msgid "Save template"
+msgstr "Nueva plantilla"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:47
+#, fuzzy
+msgid "Destination path"
+msgstr "Destino"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
+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"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:87
+#, fuzzy
+msgid "Read"
+msgstr "leer"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:88
+#, fuzzy
+msgid "Write"
+msgstr "escribir"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:91
+#, fuzzy
+msgid "Special"
+msgstr "terminales"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:100
+#, fuzzy
+msgid "SUID"
+msgstr "UID"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:109
+#, fuzzy
+msgid "SGID"
+msgstr "GID"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:112
+#, fuzzy
+msgid "Others"
+msgstr "Filtros"
+
+#: plugins/admin/fai/faiTemplateEntry.tpl:118
+#, fuzzy
+msgid "sticky"
+msgstr "estatico"
+
+#: plugins/admin/fai/faiHook.tpl:34
+#, fuzzy
+msgid "List of hook scripts"
+msgstr "Lista de listas de bloqueos"
+
+#: plugins/admin/fai/faiHook.tpl:40
 msgid "Choose a hook to delete or edit"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:33
-msgid "Voicemail PIN"
+#: plugins/admin/fai/class_faiPackageEntry.inc:43
+msgid ""
+"This list displays all assigned package names for this repository settings."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:41
+#: plugins/admin/fai/faiPackageEntry.tpl:6
 #, fuzzy
-msgid "Phone PIN"
-msgstr "Teléfono"
+msgid "List of available packages"
+msgstr "Elija tipo de ratón"
 
-#: plugins/gofon/phoneaccount/generic.tpl:59
-#: plugins/gofon/phoneaccount/generic.tpl:60
-#, fuzzy
-msgid "Phone macro"
-msgstr "Informes telefónicos"
+#: plugins/admin/fai/faiPackageEntry.tpl:27
+msgid ""
+"This menu allows you to select multiple packages to add them to the "
+"currently edited package list."
+msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:67
+#: plugins/admin/fai/faiPackageNew.tpl:2
 #, fuzzy
-msgid "Refresh"
-msgstr "Referencias"
+msgid "Repository settings"
+msgstr "Configuración de red"
+
+#: plugins/admin/fai/faiPackageNew.tpl:6
+msgid ""
+"To add packages to your package list you have to setup the repository "
+"settings first."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:8
+msgid ""
+"Packages are usually stored on different servers called mirrors. These "
+"mirrors have different types of releases (for example woody/sarge/etch), "
+"which finally contain packages sorted by section."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:11
+msgid ""
+"Section and release can't be changed in future dialogs, but the mirror can "
+"be changed by editing the entry."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:17
+msgid ""
+"First select the preferred release, then the section and finally the mirror."
+msgstr ""
 
-#: plugins/gofon/phoneaccount/generic.tpl:68
+#: plugins/admin/fai/faiPackageNew.tpl:25
+msgid "Following releases are available"
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:37
 #, fuzzy
-msgid "Complete"
-msgstr "incompleto"
+msgid "Sections for this release"
+msgstr "Localización de este subarbol"
+
+#: plugins/admin/fai/faiPackageNew.tpl:48
+msgid "Matching mirrors"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/main.inc:121
+msgid "Phone settings"
+msgstr "Configuración telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:126
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:116
 #, fuzzy
 msgid "no macro"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:143
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:133
 #, fuzzy
 msgid "undefined"
 msgstr "sin definirse"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:630
-msgid ""
-"There is currently no asterisk server defined. Possibly you are missing a "
-"server that handles the asterisk management (goFonServer). \n"
-" Your Settings can't be saved to asterisk Database. "
-msgstr ""
-
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:548
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:547
 #, fuzzy
-msgid "Error while performing query "
+msgid "Error while performing query:"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:601
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:600
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:724
 msgid "This account has no phone extensions."
 msgstr "Esta cuenta no tiene extensiones telefónicas"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:621
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:620
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
@@ -7993,7 +8542,7 @@ msgstr ""
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:874
 #, fuzzy
 msgid ""
-"The specified oicemail PIN contains invalid characters, only numeric values "
+"The specified Voicemail PIN contains invalid characters, only numeric values "
 "are allowed here."
 msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
@@ -8032,149 +8581,65 @@ msgstr ""
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/main.inc:121
-msgid "Phone settings"
-msgstr "Configuración telefónica"
-
-#: plugins/gofon/reports/contents.tpl:31
-msgid "Source"
-msgstr "Fuente"
-
-#: plugins/gofon/reports/contents.tpl:32
-msgid "Destination"
-msgstr "Destino"
-
-#: plugins/gofon/reports/contents.tpl:33
-msgid "Channel"
-msgstr "Canal"
-
-#: plugins/gofon/reports/contents.tpl:36
-msgid "Duration"
-msgstr "Duración"
-
-#: plugins/gofon/reports/main.inc:5
-msgid "Phone reports"
-msgstr "Informes telefónicos"
-
-#: plugins/gofon/reports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Informes telefónicos"
-
-#: plugins/gofon/reports/class_fonreport.inc:141
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"No puedo conectar a la base de datos telefónica, ¡No se pueden mostrar "
-"informes!"
-
-#: plugins/gofon/reports/class_fonreport.inc:145
-msgid "Can't select phone database for report generation!"
-msgstr ""
-"¡No puedo seleccionar la base de datos telefónica para la generación de "
-"informes!"
-
-#: plugins/gofon/reports/class_fonreport.inc:154
-msgid "Query for phone database failed!"
-msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
-
-#: plugins/gofon/macro/headpage.tpl:6
-#, fuzzy
-msgid "List of macros"
-msgstr "Lista de grupos"
-
-#: plugins/gofon/macro/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
-"usar el selector de rango en la parte superior de la lista de grupos, cuando "
-"trabaja con un gran número de grupos."
-
-#: plugins/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros matching"
-msgstr "Mostrar grupos que concuerden con"
-
-#: plugins/gofon/macro/headpage.tpl:38
-#, fuzzy
-msgid "Display macros  matching"
-msgstr "Mostrar grupos que concuerden con"
-
-#: plugins/gofon/macro/headpage.tpl:41
-#, 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"
-
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
+#: plugins/gofon/phoneaccount/generic.tpl:33
+msgid "Voicemail PIN"
 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"
-
-#: plugins/gofon/macro/generic.tpl:43
-#, fuzzy
-msgid "Visible for user"
-msgstr "Lista de usuarios"
-
-#: plugins/gofon/macro/generic.tpl:52
-#, fuzzy
-msgid "Macro text"
-msgstr "Nombre de la maquina"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
-#, fuzzy
-msgid "Phone macros"
-msgstr "Informes telefónicos"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, fuzzy, php-format
-msgid "You're about to delete the macro '%s'."
-msgstr "Está a punto de borrar el grupo '%s'."
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+#: plugins/gofon/phoneaccount/generic.tpl:41
 #, fuzzy
-msgid "You are not allowed to delete this macro!"
-msgstr "¡No le está permitido eliminar este grupo!"
+msgid "Phone PIN"
+msgstr "Teléfono"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#: plugins/gofon/phoneaccount/generic.tpl:60
 #, fuzzy
-msgid "Create new phone macro"
-msgstr "Crear cuenta telefónica"
+msgid "Phone macro"
+msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/phoneaccount/generic.tpl:67
 #, fuzzy
-msgid "Visible"
-msgstr "Variable"
+msgid "Refresh"
+msgstr "Referencias"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
-msgid "This table displays all phone macros, in the selected tree."
+#: plugins/gofon/reports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/reports/class_fonreport.inc:141
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
+"No puedo conectar a la base de datos telefónica, ¡No se pueden mostrar "
+"informes!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
-#, fuzzy
-msgid "Macro"
-msgstr "Nombre de la maquina"
+#: plugins/gofon/reports/class_fonreport.inc:145
+msgid "Can't select phone database for report generation!"
+msgstr ""
+"¡No puedo seleccionar la base de datos telefónica para la generación de "
+"informes!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
-#, fuzzy
-msgid "visible"
-msgstr "Visible Publicamente"
+#: plugins/gofon/reports/class_fonreport.inc:154
+msgid "Query for phone database failed!"
+msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "invisible"
-msgstr "Visible Publicamente"
+#: plugins/gofon/reports/contents.tpl:31
+msgid "Source"
+msgstr "Fuente"
+
+#: plugins/gofon/reports/contents.tpl:32
+msgid "Destination"
+msgstr "Destino"
+
+#: plugins/gofon/reports/contents.tpl:33
+msgid "Channel"
+msgstr "Canal"
+
+#: plugins/gofon/reports/contents.tpl:36
+msgid "Duration"
+msgstr "Duración"
+
+#: plugins/gofon/reports/main.inc:5
+msgid "Phone reports"
+msgstr "Informes telefónicos"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:94
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:191
@@ -8188,63 +8653,113 @@ msgid ""
 "selected this Macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:239
+#: plugins/gofon/macro/class_gofonMacro.inc:244
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:257
+#: plugins/gofon/macro/class_gofonMacro.inc:262
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:266
-#: plugins/gofon/macro/class_gofonMacro.inc:274
+#: plugins/gofon/macro/class_gofonMacro.inc:271
+#: plugins/gofon/macro/class_gofonMacro.inc:279
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:288
+#: plugins/gofon/macro/class_gofonMacro.inc:293
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:331
+#: plugins/gofon/macro/class_gofonMacro.inc:336
 #, fuzzy, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:336
+#: plugins/gofon/macro/class_gofonMacro.inc:341
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:340
+#: plugins/gofon/macro/class_gofonMacro.inc:345
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:345
+#: plugins/gofon/macro/class_gofonMacro.inc:350
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:351
+#: plugins/gofon/macro/class_gofonMacro.inc:356
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:356
+#: plugins/gofon/macro/class_gofonMacro.inc:361
 #, fuzzy
 msgid "Please choose a valid  base."
 msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/gofon/macro/parameter.tpl:3
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 #, fuzzy
-msgid "Argument"
-msgstr "Argumentos"
+msgid "Macro name"
+msgstr "Nombre de la maquina"
 
-#: plugins/gofon/macro/parameter.tpl:7
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:22
 #, fuzzy
-msgid "type"
-msgstr "Tipo"
+msgid "Choose subtree to place macro in"
+msgstr "Elija lugar del árbol para colocar la aplicación"
+
+#: plugins/gofon/macro/generic.tpl:43
+#, fuzzy
+msgid "Visible for user"
+msgstr "Lista de usuarios"
+
+#: plugins/gofon/macro/generic.tpl:52
+#, fuzzy
+msgid "Macro text"
+msgstr "Nombre de la maquina"
+
+#: plugins/gofon/macro/headpage.tpl:6
+#, fuzzy
+msgid "List of macros"
+msgstr "Lista de grupos"
+
+#: plugins/gofon/macro/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
+"usar el selector de rango en la parte superior de la lista de grupos, cuando "
+"trabaja con un gran número de grupos."
+
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros matching"
+msgstr "Mostrar grupos que concuerden con"
+
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros  matching"
+msgstr "Mostrar grupos que concuerden con"
+
+#: plugins/gofon/macro/headpage.tpl:41
+#, fuzzy
+msgid "Regular expression for matching macro names"
+msgstr "Expresión regular que concuerde con nombres de grupos"
+
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#, fuzzy
+msgid "Phone macro management"
+msgstr "Gestión del sistema"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:239
 #, fuzzy
@@ -8281,31 +8796,60 @@ msgid ""
 "using this macro '%s'."
 msgstr ""
 
-#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
-msgid "Phone macro management"
-msgstr "Gestión del sistema"
+msgid "Phone macros"
+msgstr "Informes telefónicos"
 
-#: plugins/gofon/conference/headpage.tpl:6
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#, fuzzy, php-format
+msgid "You're about to delete the macro '%s'."
+msgstr "Está a punto de borrar el grupo '%s'."
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
 #, fuzzy
-msgid "List of conference rooms"
-msgstr "Lista de grupos"
+msgid "You are not allowed to delete this macro!"
+msgstr "¡No le está permitido eliminar este grupo!"
 
-#: plugins/gofon/conference/headpage.tpl:24
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
 #, fuzzy
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences list."
+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 ""
-"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/gofon/conference/headpage.tpl:35
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
 #, fuzzy
-msgid "Regular expression for        matching user names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+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"
+
+#: plugins/gofon/macro/parameter.tpl:3
+#, fuzzy
+msgid "Argument"
+msgstr "Argumentos"
+
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Tipo"
 
 #: plugins/gofon/conference/generic.tpl:13
 #, fuzzy
@@ -8323,11 +8867,11 @@ 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:62
+#: plugins/gofon/conference/generic.tpl:61
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:70
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:149
 #, fuzzy
 msgid "Phone number"
 msgstr "Números de teléfonos"
@@ -8398,15 +8942,32 @@ msgstr ""
 msgid "Name - Number"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
-msgid "Owner"
-msgstr ""
-
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:368
 #, fuzzy
 msgid "Conference"
 msgstr "Referencias"
 
+#: plugins/gofon/conference/headpage.tpl:6
+#, fuzzy
+msgid "List of conference rooms"
+msgstr "Lista de grupos"
+
+#: plugins/gofon/conference/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences list."
+msgstr ""
+"Este menú permite añadir, editar o eliminar 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/gofon/conference/headpage.tpl:36
+#, fuzzy
+msgid "Regular expression for        matching user names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+
 #: plugins/gofon/conference/class_phoneConferenceGeneric.inc:188
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
@@ -8486,7 +9047,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:313
+#: include/php_setup.inc:71 html/main.php:315
 msgid "Toggle information"
 msgstr "Información de intercambio"
 
@@ -8605,10 +9166,6 @@ 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:587
-msgid "Configure"
-msgstr "Configurar"
-
 #: include/functions.inc:592
 msgid "incomplete"
 msgstr "incompleto"
@@ -8695,50 +9252,13 @@ msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
 #, 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
-#, 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_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr "Este 'dn' no tiene extensiones de cuenta."
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr "Esta es un extensión vacía."
-
-#: include/class_plugin.inc:398
-#, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
-"parece existir."
-
-#: include/class_plugin.inc:426 include/class_password-methods.inc:181
-#, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
-"parece existir."
-
-#: include/class_plugin.inc:454
-#, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
-"parece existir."
-
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+
+#: include/class_mail-methods-cyrus.inc:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
-"No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
+"No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
+"s'"
 
 #: include/class_pluglist.inc:98
 msgid ""
@@ -8758,37 +9278,44 @@ msgstr ""
 "Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
 "los cambios?"
 
-#: include/class_password-methods.inc:165
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
-msgstr ""
-"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr "Este 'dn' no tiene extensiones de cuenta."
 
-#: include/class_password-methods.inc:202
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr "Esta es un extensión vacía."
+
+#: include/class_plugin.inc:398
+#, php-format
 msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
 msgstr ""
-"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
-"pueden cambiar las contraseñas de SAMBA."
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
 
-#: include/class_ppdManager.inc:57
+#: include/class_plugin.inc:426 include/class_password-methods.inc:181
 #, php-format
 msgid ""
-"Parsing PPD file %s faild - line too long. Trailing characters have been "
-"ignored"
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
+"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
+"parece existir."
 
-#: include/class_ppdManager.inc:78
+#: include/class_plugin.inc:454
 #, php-format
-msgid "Parsing PPD file %s failed - no information found."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
+"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
+"parece existir."
 
 #: include/class_config.inc:69
 #, 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:140
+#: include/class_config.inc:195 html/index.php:136
 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 "
@@ -8798,10 +9325,23 @@ msgstr ""
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID y/o RIDBASE no se encuentran en su configuración."
 
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
-"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
+"No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
+
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
+
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgstr ""
+"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
+"pueden cambiar las contraseñas de SAMBA."
 
 #: include/class_password-methods-kerberos.inc:43
 msgid ""
@@ -8820,7 +9360,12 @@ msgid "Changing password in kerberos database failed!"
 msgstr ""
 "¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
 
-#: include/class_ldap.inc:438
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
+
+#: include/class_ldap.inc:437
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -8829,7 +9374,7 @@ 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:671
+#: include/class_ldap.inc:698
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -8838,12 +9383,12 @@ msgstr ""
 "El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
 "en la linea %s"
 
-#: include/class_ldap.inc:684
+#: include/class_ldap.inc:711
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
 
-#: include/class_ldap.inc:700
+#: include/class_ldap.inc:727
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -8875,6 +9420,16 @@ msgstr "Fichero de configuración"
 msgid "No valid certificate loaded"
 msgstr ""
 
+#: include/functions_helpviewer.inc:292
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
+msgstr ""
+
+#: include/functions_helpviewer.inc:367
+#, php-format
+msgid "%s%% hit rate in file %s"
+msgstr ""
+
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
@@ -8981,7 +9536,19 @@ msgstr ""
 msgid "Support for gofon enabled"
 msgstr "Soporte de GOFON activado"
 
+#: include/functions_setup.inc:231
+#, 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
+#, fuzzy
+msgid "Support for nagios enabled"
+msgstr "Soporte de GOFON activado"
+
+#: include/functions_setup.inc:246
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -8989,31 +9556,31 @@ 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:243
+#: include/functions_setup.inc:253
 msgid "Support for Kolab enabled"
 msgstr "Soporte de KOLAB activado"
 
-#: include/functions_setup.inc:261
+#: include/functions_setup.inc:271
 msgid "OK"
 msgstr "Perfecto"
 
-#: include/functions_setup.inc:264
+#: include/functions_setup.inc:274
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: include/functions_setup.inc:266
+#: include/functions_setup.inc:276
 msgid "Failed"
 msgstr "Fallado"
 
-#: include/functions_setup.inc:283
+#: include/functions_setup.inc:293
 msgid "PHP setup inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Comprobando la versión de PHP (>=4.1.0)"
 
-#: include/functions_setup.inc:285
+#: include/functions_setup.inc:295
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -9021,13 +9588,13 @@ msgstr ""
 "Debe tener una versión de PHP 4.1.0 o superior para el correcto "
 "funcionamiento de GOsa."
 
-#: include/functions_setup.inc:288
+#: include/functions_setup.inc:298
 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:289
+#: include/functions_setup.inc:299
 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 "
@@ -9037,37 +9604,37 @@ 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:292
+#: include/functions_setup.inc:302
 msgid "Checking for ldap module"
 msgstr "Comprobando los módulos de ldap"
 
-#: include/functions_setup.inc:293
+#: include/functions_setup.inc:303
 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:296
+#: include/functions_setup.inc:306
 #, fuzzy
 msgid "Checking for XML functions"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:297
+#: include/functions_setup.inc:307
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:300
+#: include/functions_setup.inc:310
 msgid "Checking for gettext support"
 msgstr "Comprobando el soporte de gettext"
 
-#: include/functions_setup.inc:301
+#: include/functions_setup.inc:311
 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:303
+#: include/functions_setup.inc:314
 msgid "Checking for iconv support"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:315
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -9076,11 +9643,11 @@ msgstr ""
 "Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
 "tanto requerido."
 
-#: include/functions_setup.inc:307
+#: include/functions_setup.inc:318
 msgid "Checking for mhash module"
 msgstr "Comprobando por el módulo de mhash"
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:319
 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."
@@ -9088,11 +9655,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:311
+#: include/functions_setup.inc:322
 msgid "Checking for imap module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:312
+#: include/functions_setup.inc:323
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -9100,11 +9667,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:315
+#: include/functions_setup.inc:326
 msgid "Checking for getacl in imap"
 msgstr "Comprobando por getacl en imap"
 
-#: include/functions_setup.inc:316
+#: include/functions_setup.inc:327
 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 "
@@ -9114,21 +9681,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:319
+#: include/functions_setup.inc:330
 msgid "Checking for mysql module"
 msgstr "Comprobando el módulo de mysql"
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:331
 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:323
+#: include/functions_setup.inc:334
 msgid "Checking for cups module"
 msgstr "Comprobando el módulo de cups"
 
-#: include/functions_setup.inc:324
+#: include/functions_setup.inc:335
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -9136,11 +9703,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:327
+#: include/functions_setup.inc:338
 msgid "Checking for kadm5 module"
 msgstr "Comprobando el módulo kadm5"
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:339
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -9148,25 +9715,42 @@ msgstr ""
 "Manejando usuarios en kerberos requiere el módulo kadm5 que esta disponible "
 "en la red PEAR."
 
-#: include/functions_setup.inc:331
+#: include/functions_setup.inc:342
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:332
+#: include/functions_setup.inc:343
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:342
+#: include/functions_setup.inc:379
+#, fuzzy
+msgid "PHP detailed function inspection"
+msgstr "Comprobación configuración PHP"
+
+#: include/functions_setup.inc:383
+#, fuzzy, php-format
+msgid "Checking for function <b>%s</b>"
+msgstr "Comprobando el soporte de iconv"
+
+#: include/functions_setup.inc:384
+#, php-format
+msgid ""
+"The function <b>%s</b> is used by GOsa. There is no information if it's "
+"optional or required yet."
+msgstr ""
+
+#: include/functions_setup.inc:395
 msgid "Checking for some additional programms"
 msgstr "Comprobando programas adicionales"
 
-#: include/functions_setup.inc:351
+#: include/functions_setup.inc:404
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Comprobando por ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:405
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -9174,11 +9758,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:355
+#: include/functions_setup.inc:408
 msgid "Checking imagick module for PHP"
 msgstr "Comprobando el módulo PHP de imagick"
 
-#: include/functions_setup.inc:356
+#: include/functions_setup.inc:409
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
@@ -9186,11 +9770,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:363
+#: include/functions_setup.inc:416
 msgid "Checking for fping utility"
 msgstr "Comprobando la herramienta fping"
 
-#: include/functions_setup.inc:364
+#: include/functions_setup.inc:417
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -9198,11 +9782,11 @@ msgstr ""
 "La herramienta fping solo se usa si tiene un entorno de terminales clientes "
 "delgados (thinclient)."
 
-#: include/functions_setup.inc:379
+#: include/functions_setup.inc:432
 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:380
+#: include/functions_setup.inc:433
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -9210,11 +9794,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:393
+#: include/functions_setup.inc:446
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini comprobación -> session.auto_register"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:447
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -9222,11 +9806,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:397
+#: include/functions_setup.inc:450
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini comprobación -> implicit_flush"
 
-#: include/functions_setup.inc:398
+#: include/functions_setup.inc:451
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -9234,11 +9818,11 @@ msgstr ""
 "Esta opción controla el manejador de salida. Desactive esta opción para "
 "mejorar el rendimiento."
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:458
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini comprobación -> max_execution_time"
 
-#: include/functions_setup.inc:406
+#: include/functions_setup.inc:459
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -9246,11 +9830,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:413
+#: include/functions_setup.inc:466
 msgid "php.ini check -> memory_limit"
 msgstr "pnp.ini comprobación -> memory_limit"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:467
 #, fuzzy
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
@@ -9260,11 +9844,11 @@ msgstr ""
 "impredecibles! Una cantidad recomendada es 16Mb, para sitios con grandes "
 "cargas seria aún mayor."
 
-#: include/functions_setup.inc:418
+#: include/functions_setup.inc:471
 msgid "php.ini check -> expose_php"
 msgstr "php.ini comprobación -> expose_php"
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:472
 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."
@@ -9273,11 +9857,11 @@ msgstr ""
 "debería enviar ninguna información sobre el servidor sobre el que está "
 "funcionando en ningún caso."
 
-#: include/functions_setup.inc:423
+#: include/functions_setup.inc:476
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini comprobación -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:424
+#: include/functions_setup.inc:477
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -9285,11 +9869,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:666
+#: include/functions_setup.inc:720
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Tiene que especificar un servidor ldap antes de continuar."
 
-#: include/functions_setup.inc:675 include/functions_setup.inc:758
+#: include/functions_setup.inc:729 include/functions_setup.inc:812
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -9297,8 +9881,8 @@ msgstr ""
 "No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
 "este accesible para GOsa."
 
-#: include/functions_setup.inc:689 include/functions_setup.inc:763
-#: include/functions_setup.inc:768
+#: include/functions_setup.inc:743 include/functions_setup.inc:817
+#: include/functions_setup.inc:822
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -9306,7 +9890,7 @@ msgstr ""
 "¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
 "asegure que este accesible para GOsa."
 
-#: include/functions_setup.inc:778
+#: include/functions_setup.inc:832
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
@@ -9314,7 +9898,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:834
+#: include/functions_setup.inc:888
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -9322,19 +9906,19 @@ msgid ""
 msgstr ""
 "Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
 
-#: include/functions_setup.inc:865
+#: include/functions_setup.inc:919
 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:874
+#: include/functions_setup.inc:928
 #, 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:984 include/functions_setup.inc:1007
-#: include/functions_setup.inc:1016 html/index.php:176
+#: include/functions_setup.inc:1038 include/functions_setup.inc:1061
+#: include/functions_setup.inc:1070 html/index.php:172
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -9343,19 +9927,209 @@ msgid ""
 msgstr ""
 "No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
 
-#: include/functions_helpviewer.inc:260
+#: include/class_ppdManager.inc:124 include/class_ppdManager.inc:242
 #, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+msgid ""
+"Parsing PPD file %s failed - line too long. Trailing characters have been "
+"ignored"
+msgstr ""
+
+#: include/class_ppdManager.inc:132
+#, fuzzy
+msgid "Nested groups are not supported!"
+msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
+
+#: include/class_ppdManager.inc:136
+#, fuzzy
+msgid "Group name not unique!"
+msgstr "Nombre del grupo"
+
+#: include/class_ppdManager.inc:142 include/class_ppdManager.inc:172
+msgid "Symbol values are not supported yet!"
+msgstr ""
+
+#: include/class_ppdManager.inc:166
+msgid "Nested options are not supported!"
+msgstr ""
+
+#: include/class_ppdManager.inc:191
+msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: include/functions_helpviewer.inc:335
+#: include/class_ppdManager.inc:263
 #, php-format
-msgid "%s%% hit rate in file %s"
+msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: 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:58
+msgid "Help is not available if you are not logged in."
+msgstr ""
+
+#: html/helpviewer.php:89
+msgid "previous"
+msgstr ""
+
+#: html/helpviewer.php:93
+#, fuzzy
+msgid "next"
+msgstr "texto"
+
+#: html/helpviewer.php:154
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+
+#: html/helpviewer.php:162 ihtml/themes/default/help.tpl:15
+msgid "Index"
+msgstr ""
+
+#: html/getxls.php:54
+msgid "Birthday"
+msgstr ""
+
+#: html/getxls.php:54
+#, fuzzy
+msgid "Sexe"
+msgstr "Sexo"
+
+#: html/getxls.php:54 html/getxls.php:149 html/getxls.php:194
+#: html/getxls.php:206
+#, fuzzy
+msgid "Firstname"
+msgstr "Nombre de la lista"
+
+#: html/getxls.php:79 html/getxls.php:197
+#, fuzzy
+msgid "Members"
+msgstr "Objetos miembro"
+
+#: html/getxls.php:104 html/getxls.php:214
+#, fuzzy
+msgid "Computers"
+msgstr "incompleto"
+
+#: html/getxls.php:114 html/getxls.php:161 html/getxls.php:287
+#: html/getxls.php:304
+#, fuzzy
+msgid "Common Name"
+msgstr "Nombre de la localización"
+
+#: html/getxls.php:126
+#, fuzzy
+msgid "Server Name"
+msgstr "Nombre del servidor"
+
+#: html/getxls.php:149
+#, fuzzy
+msgid "Common name"
+msgstr "Nombre de la localización"
+
+#: html/getxls.php:149
+#, fuzzy
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+#: html/getxls.php:149
+msgid "Home postal address"
+msgstr ""
+
+#: html/getxls.php:149
+#, fuzzy
+msgid "Mail address"
+msgstr "Dirección MAC"
+
+#: html/getxls.php:149
+#, fuzzy
+msgid "Mobile phone"
+msgstr "Teléfono particular"
+
+#: html/getxls.php:149
+#, fuzzy
+msgid "Postal address"
+msgstr "Código Postal"
+
+#: html/getxls.php:149
+#, fuzzy
+msgid "Adress"
+msgstr "Dirección"
+
+#: html/getxls.php:149
+#, fuzzy
+msgid "Surename"
+msgstr "Nombre del servidor"
+
+#: html/getxls.php:149
+#, fuzzy
+msgid "Function"
+msgstr "Función"
+
+#: html/getxls.php:194
+#, fuzzy
+msgid "BirthDate"
+msgstr "Fecha"
+
+#: html/getxls.php:200
+msgid "Uid"
+msgstr ""
+
+#: html/getxls.php:206
+#, fuzzy
+msgid "DisplayName"
+msgstr "Nombre mostrado"
+
+#: html/getxls.php:206
+#, fuzzy
+msgid "Phone Number"
+msgstr "Números de teléfonos"
+
+#: html/getxls.php:206
+#, fuzzy
+msgid "Postal Adress"
+msgstr "Código Postal"
+
+#: html/getxls.php:206
+#, fuzzy
+msgid "Email address"
+msgstr "Cuenta Principal"
+
+#: html/getxls.php:206
+#, fuzzy
+msgid "mobile"
+msgstr "Teléfono Móvil"
+
+#: html/getxls.php:206
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "De organización"
+
+#: html/getxls.php:206
+#, fuzzy
+msgid "Postal Address"
+msgstr "Código Postal"
+
+#: html/getxls.php:206
+#, fuzzy
+msgid "Postal Code"
+msgstr "Código Postal"
+
+#: html/getxls.php:206
+msgid "Sn"
+msgstr ""
+
+#: html/getxls.php:206
+#, fuzzy
+msgid "st"
+msgstr "Borrar"
+
+#: html/getxls.php:206
+#, fuzzy
+msgid "Title"
+msgstr "Archivo"
+
+#: html/getxls.php:215
+#, fuzzy
+msgid "Adressbook"
+msgstr "Libreta de direcciones"
 
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
@@ -9369,16 +10143,20 @@ msgstr "No puedo seleccionar la base de datos."
 msgid "Database query failed!"
 msgstr "La consulta a la base de datos ha fallado."
 
+#: html/getvcard.php:36
+msgid "Error: getcvard.php needs a parameter to export a vcard!"
+msgstr "Error: getcvard.php necesita un parametro para exportar a vcard."
+
 #: html/setup.php:86
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"Directory '%s' specified as smarty compile directory is not accessable, "
-"check existence and rigths of this directory!"
+"Directory '%s' specified as smarty compile directory is not accessible, "
+"please check existence and rights of this directory!"
 msgstr ""
 "El directorio '%s' especificado como directorio de compilación para smarty  "
 "no es accesible, ¡compruebe la existencia y los permisos de este directorio!"
 
-#: html/main.php:112
+#: html/main.php:114
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -9386,85 +10164,66 @@ msgstr ""
 "'Register globals' está activado. No se permitirá ninguna entrada hasta que "
 "esto sea solucionado por un administrador."
 
-#: html/main.php:155
+#: html/main.php:157
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
-"Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
-
-#: html/main.php:284
-#, php-format
-msgid "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:313
-#, fuzzy
-msgid ""
-"Generating this page caused the W3C conformance checker to raise some errors!"
-msgstr ""
-"¡La generación de esta página provoca que el interprete PHP muestre algunos "
-"errores!"
-
-#: html/helpviewer.php:54
-msgid "Help is not available if you are not logged in."
-msgstr ""
+"Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
 
-#: html/helpviewer.php:85
-msgid "previous"
-msgstr ""
+#: html/main.php:286
+#, php-format
+msgid "Can't find any plugin definitions for plugin '%s'!"
+msgstr "No se pudo encontrar ninguna definición de extensión para '%s'"
 
-#: html/helpviewer.php:89
+#: html/main.php:315
 #, fuzzy
-msgid "next"
-msgstr "texto"
-
-#: html/helpviewer.php:141
-#, php-format
 msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
+"Generating this page caused the W3C conformance checker to raise some errors!"
 msgstr ""
+"¡La generación de esta página provoca que el interprete PHP muestre algunos "
+"errores!"
 
-#: html/index.php:53
+#: html/index.php:49
 #, 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:75
+#: html/index.php:71
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessable!"
 msgstr ""
 "El directorio '%s' especificado como directorio de compilación no es "
 "accesible."
 
-#: html/index.php:148
+#: html/index.php:144
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:156
+#: html/index.php:152
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:184
+#: html/index.php:180
 msgid "Please specify a valid username!"
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: html/index.php:186
+#: html/index.php:182
 msgid "Please specify your password!"
 msgstr "Por favor especifique su contraseña."
 
-#: html/index.php:193
+#: html/index.php:189
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/index.php:231
+#: html/index.php:227
 msgid "Session will not be encrypted."
 msgstr "La sesion no sera encriptada."
 
-#: html/index.php:231
+#: html/index.php:227
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
@@ -9499,24 +10258,6 @@ 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"
-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
-msgid "Directory"
-msgstr "Directorio"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
-msgid "Sign in"
-msgstr "Entrando"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
-msgid "Click here to log in"
-msgstr "Pulse aquí para entrar"
-
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Detectado conflicto de sesiones."
@@ -9545,6 +10286,24 @@ msgstr ""
 msgid "Logout"
 msgstr "Salir"
 
+#: 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"
+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
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+msgid "Sign in"
+msgstr "Entrando"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
+msgid "Click here to log in"
+msgstr "Pulse aquí para entrar"
+
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
@@ -9587,6 +10346,24 @@ msgstr "Salir"
 msgid "Signed in:"
 msgstr "Entrando"
 
+#: 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_step2.tpl:1
+#: ihtml/themes/default/setup_step3.tpl:1
+#: ihtml/themes/default/setup_step4.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/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr "Detectado conflicto de Bloqueos"
@@ -9601,23 +10378,23 @@ msgstr ""
 "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_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_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_useradmin.tpl:10
 msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
+"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 ""
-"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."
+"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/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
@@ -9839,23 +10616,21 @@ msgstr ""
 "servidor web pueda leer gosa.conf y que los otros no deberían poder leerlo. "
 "Para cumplir con este requerimiento puede ejecutar estos comandos:"
 
-#: ihtml/themes/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/default/help.tpl:9
+msgid "GOsa help viewer"
+msgstr ""
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/default/setup_introduction.tpl:17
 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."
+"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 ""
-"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_step4.tpl:100
 msgid ""
@@ -9864,13 +10639,248 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
-#: ihtml/themes/default/help.tpl:9
-msgid "GOsa help viewer"
-msgstr ""
+#, fuzzy
+#~ msgid "Members:"
+#~ msgstr "Objetos miembro"
 
-#: ihtml/themes/default/help.tpl:15
-msgid "Index"
-msgstr ""
+#, fuzzy
+#~ msgid "Initiales"
+#~ msgstr "Iniciales"
+
+#, fuzzy
+#~ msgid "Current used information setup"
+#~ msgstr "Información genérica del usuario"
+
+#, fuzzy
+#~ msgid "Upload new PPD file"
+#~ msgstr "Archivos Subidos / Descargados"
+
+#, fuzzy
+#~ msgid "Initiales)."
+#~ msgstr "Iniciales"
+
+#, fuzzy
+#~ msgid "Create template"
+#~ msgstr "Nueva plantilla"
+
+#, fuzzy
+#~ msgid "Add admin user"
+#~ msgstr "Usuario administrador"
+
+#, fuzzy
+#~ msgid "Add admin group"
+#~ msgstr "Grupo de samba"
+
+#, fuzzy
+#~ msgid "Undefined"
+#~ msgstr "sin definirse"
+
+#, fuzzy
+#~ msgid "Select entry"
+#~ msgstr "Borrar"
+
+#, 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!"
+
+#, fuzzy
+#~ msgid "selected"
+#~ msgstr "Borrar"
+
+#, fuzzy
+#~ msgid "Please select a PPD or press cancel"
+#~ msgstr "¡Por favor introduzca un número de teléfono valido!"
+
+#, fuzzy
+#~ msgid "List of PPDs"
+#~ msgstr "Lista de usuarios"
+
+#~ 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"
+
+#, fuzzy
+#~ msgid "Service"
+#~ msgstr "Servicios"
+
+#, fuzzy
+#~ msgid "List of used class names"
+#~ msgstr "Elija tipo de ratón"
+
+#, fuzzy
+#~ msgid "Profile management"
+#~ msgstr "Mantenimiento de Departamentos"
+
+#, fuzzy
+#~ msgid "Display hotplugs of department"
+#~ msgstr "Mostrar los grupos de departamentos"
+
+#, fuzzy
+#~ msgid "Select printer entry"
+#~ msgstr "Seleccione para ver impresoras"
+
+#, fuzzy
+#~ msgid "Display printers of department"
+#~ msgstr "Mostrar número de Departamentos"
+
+#, fuzzy
+#~ msgid "Logon management"
+#~ msgstr "Mantenimiento de Departamentos"
+
+#, fuzzy
+#~ msgid "ID"
+#~ msgstr "UID"
+
+#, fuzzy
+#~ msgid "Please enter a valid name. Only 0-9 a-Z are allowed here."
+#~ msgstr "Por favor especifique un nombre de usuario valido."
+
+#, fuzzy
+#~ msgid "Please enter a value for task."
+#~ msgstr "Por favor especifique un usuario valido."
+
+#, 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."
+
+#, fuzzy
+#~ msgid "release"
+#~ msgstr "Borrar"
+
+#, fuzzy
+#~ msgid "section"
+#~ msgstr "Acción"
+
+#, fuzzy
+#~ msgid "Profil server"
+#~ msgstr "Servidor de Cola"
+
+#, fuzzy
+#~ msgid "Please enter a valid description."
+#~ msgstr "Por favor introduzca un número de serie válido"
+
+#, fuzzy
+#~ msgid "Please specify a script."
+#~ msgstr "Por favor especifique un nombre de usuario valido."
+
+#, fuzzy
+#~ msgid "Invalid character in description. Please enter a valid description."
+#~ msgstr "Por favor especifique un nombre de usuario valido."
+
+#, fuzzy
+#~ msgid "Please specify a description for this profile."
+#~ msgstr "Por favor especifique un usuario valido."
+
+#, fuzzy
+#~ msgid "Please enter a description for your disk."
+#~ msgstr "Por favor especifique un usuario valido."
+
+#, fuzzy
+#~ msgid "Nagios Authorization"
+#~ msgstr "Estación de trabajo Windows"
+
+#, fuzzy
+#~ msgid "Authorized for configuration information"
+#~ msgstr "Información organizativa"
+
+#, fuzzy
+#~ msgid " name="
+#~ msgstr "Nombre de la lista"
+
+#, fuzzy
+#~ msgid " value="
+#~ msgstr "Valor por defecto"
+
+#, fuzzy
+#~ msgid " type="
+#~ msgstr "Tipo"
+
+#~ msgid "Monitoring"
+#~ msgstr "Monitor"
+
+#, fuzzy
+#~ msgid "FAI management"
+#~ msgstr "Nombre de la maquina"
+
+#, fuzzy
+#~ msgid "New script bundle"
+#~ msgstr "Impresora"
+
+#, fuzzy
+#~ msgid "New hook bundle"
+#~ msgstr "Teléfono"
+
+#, fuzzy
+#~ msgid "New variable bundle"
+#~ msgstr "Mostrar terminales"
+
+#, fuzzy
+#~ msgid "New template bundle"
+#~ msgstr "Nueva plantilla"
+
+#, fuzzy
+#~ msgid "Edit object"
+#~ msgstr "Encontrar objeto"
+
+#, fuzzy
+#~ msgid "Delete object"
+#~ msgstr "Objetos miembro"
+
+#, fuzzy
+#~ msgid "Script set"
+#~ msgstr "Ruta del Script"
+
+#, fuzzy
+#~ msgid "Variable set"
+#~ msgstr "Variable"
+
+#, fuzzy
+#~ msgid "Abort"
+#~ msgstr "Puerto"
+
+#, fuzzy
+#~ msgid "Please enter a valid name for partition %s."
+#~ msgstr "Por favor especifique un usuario valido."
+
+#, fuzzy
+#~ msgid "please enter a unique name for partition %s"
+#~ msgstr "¡Por favor introduzca un número de teléfono valido!"
+
+#, fuzzy
+#~ msgid "Choose a disc name"
+#~ msgstr "Elija modelo de teclado"
+
+#, fuzzy
+#~ msgid "cancel"
+#~ msgstr "Cancelar"
+
+#, fuzzy
+#~ msgid "Available class names."
+#~ msgstr "Aplicaciones disponibles"
+
+#, fuzzy
+#~ msgid "Create new FAI object - set of scripts."
+#~ msgstr "Grupo de objetos"
+
+#, fuzzy
+#~ msgid "Create new FAI object - set of hooks."
+#~ msgstr "Grupo de objetos"
+
+#, fuzzy
+#~ msgid "Obtions"
+#~ msgstr "Opciones"
 
 #, fuzzy
 #~ msgid "FAI partition table entry"
@@ -9895,10 +10905,6 @@ msgstr ""
 #~ "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 "Partition"
-#~ msgstr "Destino"
-
 #, fuzzy
 #~ msgid "Object type"
 #~ msgstr "Nombre de objeto"
@@ -9918,16 +10924,9 @@ msgstr ""
 #~ msgid "You need to specify a Phone PIN."
 #~ msgstr "¡Necesita introducir al menos un número de teléfono!"
 
-#, fuzzy
-#~ msgid "Can't delete '"
-#~ msgstr "Borrar"
-
 #~ msgid "Default printer"
 #~ msgstr "Impresora por defecto"
 
-#~ msgid "Default language"
-#~ msgstr "Lenguaje por defecto"
-
 #, fuzzy
 #~ msgid "Name of Conference"
 #~ msgstr "Nombre del departamento"
@@ -10094,10 +11093,6 @@ msgstr ""
 #~ msgid "Phone category"
 #~ msgstr "Informes telefónicos"
 
-#, fuzzy
-#~ msgid "Serial"
-#~ msgstr "terminales"
-
 #~ msgid ""
 #~ "We've inspected the webserver side now. Your setup seems to fit GOsa's "
 #~ "needs. Lets go for the GOsa configuration part now..."