updated french locale

[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 25465f9d98e0c742a249d38acf658d2afdf71e70..60797d2cb4c5c5f689a29fdd539103ead65fee60 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1,187 +1,295 @@
+# 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:70 contrib/gosa.conf:83 contrib/gosa.conf:92
+#: contrib/gosa.conf:98 contrib/gosa.conf:103 contrib/gosa.conf:109
+#: contrib/gosa.conf:118 contrib/gosa.conf:127 contrib/gosa.conf:136
+#: contrib/gosa.conf:141 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
 #: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/groups/mail.tpl:7
+#: 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:71
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:61 contrib/gosa.conf:72
+#: contrib/gosa.conf:72 contrib/gosa.conf:84
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:377
-#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/groups/class_groupManagement.inc:380
+#: plugins/admin/users/class_userManagement.inc:729
 msgid "Environment"
 msgstr "Entorno"
 
-#: contrib/gosa.conf:62 contrib/gosa.conf:74
+#: contrib/gosa.conf:73 contrib/gosa.conf:86
 #: 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:47
-#: plugins/admin/ogroups/class_ogroupManagement.inc:380
+#: plugins/admin/groups/class_groupManagement.inc:376
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/ogroups/tabs_ogroups.inc:73
+#: plugins/admin/ogroups/tabs_ogroups.inc:161
+#: plugins/admin/ogroups/class_ogroupManagement.inc:383
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Correo Electrónico"
 
-#: contrib/gosa.conf:63 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:374
-#: plugins/admin/users/class_userManagement.inc:720
+#: contrib/gosa.conf:74 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:377
+#: plugins/admin/users/class_userManagement.inc:737
 #: 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:75 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:76 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:735
+#: plugins/admin/departments/generic.tpl:62 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:66 plugins/personal/generic/generic.tpl:214
-#: plugins/personal/generic/generic.tpl:352
+#: contrib/gosa.conf:77 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/groups/class_groupManagement.inc:379
+#: plugins/admin/users/class_userManagement.inc:733
 #: plugins/admin/departments/generic.tpl:58
-#: plugins/admin/systems/class_systemManagement.inc:702
+#: plugins/admin/systems/class_systemManagement.inc:709
 #: plugins/admin/systems/chooser.tpl:12
 #: plugins/admin/ogroups/class_ogroupManagement.inc:48
-#: plugins/admin/ogroups/class_ogroupManagement.inc:484
+#: plugins/admin/ogroups/class_ogroupManagement.inc:487
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 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:78 plugins/personal/nagios/class_nagiosAccount.inc:18
+msgid "Nagios"
+msgstr ""
+
+#: 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 contrib/gosa.conf:162
 msgid "References"
 msgstr "Referencias"
 
-#: contrib/gosa.conf:73
+#: contrib/gosa.conf:85
 #: 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:87
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:81 plugins/admin/ogroups/phonequeue.tpl:31
+#: contrib/gosa.conf:93 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:566
+#: contrib/gosa.conf:104 plugins/gofon/phoneaccount/class_phoneAccount.inc:640
 #, fuzzy
 msgid "Parameter"
 msgstr "Parametros de inicio"
 
-#: contrib/gosa.conf:98 contrib/gosa.conf:115
+#: contrib/gosa.conf:110 contrib/gosa.conf:128
+#: plugins/admin/ogroups/tabs_ogroups.inc:93
+msgid "Startup"
+msgstr "Inicio"
+
+#: contrib/gosa.conf:111 contrib/gosa.conf:129
+#: 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:112 contrib/gosa.conf:130
+#: plugins/personal/environment/environment.tpl:168
+#: plugins/admin/systems/class_systemManagement.inc:715
+#: plugins/admin/ogroups/class_ogroupManagement.inc:49
+#: plugins/admin/ogroups/class_ogroupManagement.inc:490
+#: 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:113 contrib/gosa.conf:122 contrib/gosa.conf:131
+#: 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:119
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: contrib/gosa.conf:107 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:120 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:160 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:176 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:177
+#, fuzzy
+msgid "Excel Export"
+msgstr "Exportar"
+
+#: contrib/gosa.conf:178 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/admin/applications/generic.tpl:83
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:162
+#: contrib/gosa.conf:179
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:178
+#: contrib/gosa.conf:183
+#, fuzzy
+msgid "Partitions"
+msgstr "Destino"
+
+#: contrib/gosa.conf:187 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:191 plugins/admin/fai/class_faiManagement.inc:545
+#: plugins/admin/fai/class_faiManagement.inc:546
+msgid "Hooks"
+msgstr ""
+
+#: contrib/gosa.conf:195 plugins/admin/fai/class_faiManagement.inc:538
+#: plugins/admin/fai/class_faiManagement.inc:539
+#, fuzzy
+msgid "Variables"
+msgstr "Variable"
+
+#: contrib/gosa.conf:199 plugins/admin/fai/class_faiManagement.inc:559
+#: plugins/admin/fai/class_faiManagement.inc:560
+#, fuzzy
+msgid "Templates"
+msgstr "Plantilla"
+
+#: contrib/gosa.conf:203 plugins/personal/environment/environment.tpl:7
+#, fuzzy
+msgid "Profiles"
+msgstr "Ruta del Perfil"
+
+#: contrib/gosa.conf:207
+#, fuzzy
+msgid "Packages"
+msgstr "Mostrar teléfonos"
+
+#: contrib/gosa.conf:223
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:195 plugins/admin/ogroups/class_phonequeue.inc:160
+#: contrib/gosa.conf:240 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:241
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:197
+#: contrib/gosa.conf:242
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:243
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:199
+#: contrib/gosa.conf:244
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:200
+#: contrib/gosa.conf:245
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:201
+#: contrib/gosa.conf:246
 msgid "Italian"
 msgstr "Italiano"
 
@@ -198,7 +306,10 @@ msgstr "Italiano"
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:7
+#: plugins/personal/connectivity/class_pptpAccount.inc:7
 #: 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
@@ -207,7 +318,9 @@ msgstr "Italiano"
 #: 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/addons/mailqueue/class_mailqueue.inc:7
 #: plugins/admin/groups/class_groupManagement.inc:26
 #: plugins/admin/users/class_userManagement.inc:26
 #: plugins/admin/applications/class_applicationManagement.inc:26
@@ -230,18 +343,18 @@ msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
 msgid "No DESC tag in vacation file:"
 msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
 
-#: plugins/personal/mail/class_mailAccount.inc:200
+#: plugins/personal/mail/class_mailAccount.inc:203
 msgid "This account has no mail extensions."
 msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/mail/class_mailAccount.inc:209
-#: plugins/admin/groups/class_groupMail.inc:187
-#: plugins/admin/ogroups/class_mailogroup.inc:37
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Remove mail account"
 msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
+#: plugins/personal/mail/class_mailAccount.inc:213
+#: plugins/admin/groups/class_groupMail.inc:191
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -249,14 +362,14 @@ 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
+#: plugins/personal/mail/class_mailAccount.inc:215
+#: plugins/admin/groups/class_groupMail.inc:193
+#: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
+#: plugins/personal/mail/class_mailAccount.inc:215
+#: plugins/admin/groups/class_groupMail.inc:194
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -264,23 +377,23 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/mail/class_mailAccount.inc:260
+#: plugins/personal/mail/class_mailAccount.inc:263
 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
+#: plugins/personal/mail/class_mailAccount.inc:269
+#: plugins/admin/groups/class_groupMail.inc:253
 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
+#: plugins/personal/mail/class_mailAccount.inc:304
+#: plugins/personal/mail/class_mailAccount.inc:309
+#: plugins/admin/groups/class_groupMail.inc:281
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
@@ -288,56 +401,56 @@ 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
+#: plugins/personal/mail/class_mailAccount.inc:319
+#: plugins/admin/groups/class_groupMail.inc:286
 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
+#: plugins/personal/mail/class_mailAccount.inc:692
 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
+#: plugins/personal/mail/class_mailAccount.inc:697
+#: plugins/admin/groups/class_groupMail.inc:613
 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
+#: plugins/personal/mail/class_mailAccount.inc:701
+#: plugins/personal/mail/class_mailAccount.inc:705
+#: plugins/addons/addressbook/class_addressbook.inc:573
+#: plugins/admin/ogroups/class_mailogroup.inc:70
 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
+#: plugins/personal/mail/class_mailAccount.inc:712
+#: plugins/admin/groups/class_groupMail.inc:622
+#: plugins/admin/ogroups/class_mailogroup.inc:77
 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
+#: plugins/personal/mail/class_mailAccount.inc:718
+#: plugins/admin/groups/class_groupMail.inc:628
 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
+#: plugins/personal/mail/class_mailAccount.inc:727
+#: plugins/admin/groups/class_groupMail.inc:637
 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
+#: plugins/personal/mail/class_mailAccount.inc:737
+#: plugins/admin/groups/class_groupMail.inc:645
 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
+#: plugins/personal/mail/class_mailAccount.inc:741
 msgid "You specified Spam settings, but there is no Folder specified."
 msgstr ""
 
@@ -347,8 +460,8 @@ 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/ogroups/class_ogroupManagement.inc:483
+#: plugins/admin/systems/class_systemManagement.inc:710
+#: plugins/admin/ogroups/class_ogroupManagement.inc:486
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Servidor"
@@ -362,7 +475,8 @@ msgid "Quota usage"
 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_terminalInfo.inc:150
+#: plugins/admin/systems/class_printGeneric.inc:360
 msgid "not defined"
 msgstr "sin definirse"
 
@@ -388,32 +502,40 @@ msgstr "Lista de direcciones de correo alternativas."
 #: 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/class_kolabAccount.inc:203
 #: plugins/personal/connectivity/kolab.tpl:18
-#: plugins/personal/environment/environment.tpl:114
-#: plugins/personal/environment/environment.tpl:169
+#: 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:70
 #: 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/class_groupMail.inc:407
 #: plugins/admin/groups/group_objects.tpl:49
-#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:68
-#: plugins/admin/systems/servservice.tpl:21
+#: 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/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/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:30
-#: plugins/admin/FAI/faiScript.tpl:30 plugins/admin/FAI/faiTemplate.tpl:30
-#: plugins/admin/FAI/faiVariable.tpl:30 plugins/admin/FAI/faiHook.tpl:30
+#: plugins/admin/fai/faiPartitionTable.tpl:43
+#: plugins/admin/fai/faiVariable.tpl:43 plugins/admin/fai/faiPackage.tpl:73
+#: plugins/admin/fai/class_faiProfile.inc:153
+#: 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"
@@ -423,31 +545,34 @@ msgstr "Añadir"
 #: 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/blocklists/remove.tpl:14
 #: 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/applications/remove.tpl:14
-#: plugins/admin/departments/remove.tpl:15
+#: plugins/addons/addressbook/remove.tpl:14 plugins/admin/groups/mail.tpl:55
+#: plugins/admin/groups/mail.tpl:103 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/generic.tpl:101 plugins/admin/users/remove.tpl:14
+#: plugins/admin/applications/remove.tpl:13
+#: plugins/admin/departments/remove.tpl:14
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/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:14
 #: plugins/admin/systems/phonesettings.tpl:182
 #: plugins/admin/systems/phonesettings.tpl:197
-#: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/admin/FAI/faiPartitionTable.tpl:32
-#: plugins/admin/FAI/faiScript.tpl:32 plugins/admin/FAI/faiTemplate.tpl:32
-#: plugins/admin/FAI/remove.tpl:15 plugins/admin/FAI/faiVariable.tpl:32
-#: plugins/admin/FAI/faiHook.tpl:32 plugins/gofon/phoneaccount/generic.tpl:15
-#: plugins/gofon/macro/remove.tpl:14 plugins/gofon/conference/remove.tpl:15
+#: 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:14
+#: 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:13 plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
 msgstr "Borrar"
 
@@ -497,8 +622,8 @@ 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/connectivity/class_proxyAccount.inc:81
+#: plugins/personal/environment/environment.tpl:71
 msgid "MB"
 msgstr "Mb"
 
@@ -542,20 +667,21 @@ msgstr "¡Desactivar todas las opciones de correo!"
 #: plugins/personal/samba/main.inc:104
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
+#: 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/applications/class_applicationManagement.inc:301
-#: plugins/admin/departments/class_departmentManagement.inc:348
-#: plugins/admin/systems/class_systemManagement.inc:527
-#: plugins/admin/ogroups/class_ogroupManagement.inc:336
-#: plugins/admin/FAI/class_faiManagement.inc:285
+#: plugins/admin/groups/class_groupManagement.inc:331
+#: plugins/admin/users/class_userManagement.inc:632
+#: plugins/admin/applications/class_applicationManagement.inc:304
+#: plugins/admin/departments/class_departmentManagement.inc:350
+#: plugins/admin/systems/class_systemManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:339
+#: plugins/admin/fai/class_faiManagement.inc:384
 #: plugins/gofon/phoneaccount/main.inc:104
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:261
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:303
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:272
 msgid "Finish"
 msgstr "Terminar"
 
@@ -568,72 +694,82 @@ msgstr "Terminar"
 #: 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:118
+#: plugins/personal/connectivity/main.inc:117
 #: 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/personal/environment/hotplugDialog.tpl:74
+#: plugins/personal/environment/selectPrinterDialog.tpl:71
+#: 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/blocklists/remove.tpl:16
 #: 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/addons/addressbook/remove.tpl:16
+#: plugins/admin/groups/class_groupManagement.inc:333
+#: plugins/admin/groups/remove.tpl:16
 #: 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:617
-#: 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: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/users/class_userManagement.inc:634
+#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
+#: plugins/admin/applications/class_applicationManagement.inc:306
+#: plugins/admin/departments/remove.tpl:16
+#: plugins/admin/departments/class_departmentManagement.inc:352
+#: plugins/admin/systems/class_systemManagement.inc:541
+#: plugins/admin/systems/remove.tpl:16 plugins/admin/systems/password.tpl:30
+#: 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/class_faiManagement.inc:287
-#: plugins/admin/FAI/class_faiManagement.inc:291
-#: plugins/admin/FAI/remove.tpl:17 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:263
-#: plugins/gofon/conference/remove.tpl:17
+#: plugins/admin/ogroups/class_ogroupManagement.inc:341
+#: plugins/admin/ogroups/remove.tpl:16 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/class_faiManagement.inc:386
+#: plugins/admin/fai/class_faiManagement.inc:391
+#: 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:15
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:305
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:274
+#: plugins/gofon/conference/remove.tpl:16
 #: 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:177
-#: 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:170
-#: plugins/personal/connectivity/main.inc:127
+#: 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:116
+#: 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:31
-#: plugins/admin/FAI/faiScript.tpl:31 plugins/admin/FAI/faiTemplate.tpl:31
-#: plugins/admin/FAI/faiVariable.tpl:31 plugins/admin/FAI/faiHook.tpl:31
+#: 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"
@@ -651,7 +787,7 @@ msgstr "Seleccione dirección para añadir"
 #: 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/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
@@ -661,11 +797,14 @@ msgstr "Seleccione dirección para añadir"
 #: 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/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/headpage.tpl:29
+#: 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:28
+#: plugins/gofon/conference/headpage.tpl:29
 msgid "Filters"
 msgstr "Filtros"
 
@@ -711,7 +850,7 @@ msgid "User name of which addresses are shown"
 msgstr "Nombre de usuario de las direcciones mostradas"
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:649
+#: plugins/admin/systems/class_systemManagement.inc:661
 #: 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
@@ -724,7 +863,7 @@ 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:681
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
@@ -753,19 +892,19 @@ msgstr "Contraseña actual"
 
 #: plugins/personal/password/password.tpl:20
 #: plugins/personal/generic/password.tpl:7 plugins/admin/users/password.tpl:11
-#: plugins/admin/systems/password.tpl:11
+#: plugins/admin/systems/password.tpl:14
 msgid "New password"
 msgstr "Nueva contraseña"
 
 #: plugins/personal/password/password.tpl:25
 #: plugins/personal/generic/password.tpl:11
-#: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:16
+#: plugins/admin/users/password.tpl:15 plugins/admin/systems/password.tpl:19
 msgid "Repeat new password"
 msgstr "Repetir la nueva contraseña"
 
 #: plugins/personal/password/password.tpl:34
 #: plugins/personal/generic/password.tpl:17
-#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:25
+#: plugins/admin/users/password.tpl:21 plugins/admin/systems/password.tpl:28
 msgid "Set password"
 msgstr "Poner Contraseña"
 
@@ -782,11 +921,12 @@ msgstr ""
 "todos los programas configurados también."
 
 #: plugins/personal/password/changed.tpl:12
-#: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
+#: plugins/personal/generic/main.inc:169 plugins/gofax/reports/detail.tpl:68
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1285
-#: ihtml/themes/altlinux/setup_step2.tpl:12
+#: 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
@@ -810,7 +950,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:261
+#: plugins/admin/users/class_userManagement.inc:264
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -819,7 +959,7 @@ msgstr ""
 "contraseña' no concuerdan."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:266
+#: plugins/admin/users/class_userManagement.inc:269
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La contraseña que ingreso como 'Nueva contraseña' está vacia."
 
@@ -917,17 +1057,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"
 
@@ -943,7 +1083,7 @@ msgstr "La contraseña expira en"
 
 #: 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
+#: plugins/personal/samba/class_sambaAccount.inc:633
 msgid "Home directory"
 msgstr "Directorio Principal"
 
@@ -1003,7 +1143,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:963
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
@@ -1013,20 +1153,21 @@ msgstr "Desconfigurado"
 
 #: plugins/personal/posix/class_posixAccount.inc:191
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:206
+#: plugins/admin/systems/class_workstationService.inc:107
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:219
+#: plugins/personal/posix/class_posixAccount.inc:222
 msgid "This account has no unix extensions."
 msgstr "Este cuenta no tiene extensiones unix."
 
-#: plugins/personal/posix/class_posixAccount.inc:240
 #: plugins/personal/posix/class_posixAccount.inc:243
+#: plugins/personal/posix/class_posixAccount.inc:246
 msgid "Remove posix account"
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:241
+#: plugins/personal/posix/class_posixAccount.inc:244
 #, fuzzy
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
@@ -1035,7 +1176,7 @@ msgstr ""
 "Esta cuenta tiene características unix activadas. Para desactivarlas, "
 "necesita eliminar la cuenta samba primero."
 
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:247
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1043,11 +1184,11 @@ msgstr ""
 "Esta cuenta tiene características posix activadas. Puede desactivarla "
 "pulsando aqui"
 
-#: plugins/personal/posix/class_posixAccount.inc:247
+#: plugins/personal/posix/class_posixAccount.inc:250
 msgid "Create posix account"
 msgstr "Crear cuenta posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:248
+#: plugins/personal/posix/class_posixAccount.inc:251
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1055,250 +1196,249 @@ msgstr ""
 "Esta cuenta tiene la extensión posix desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/posix/class_posixAccount.inc:432
+#: plugins/personal/posix/class_posixAccount.inc:435
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "La contraseñas no pueden ser cambiadas hasta %s días desde el último cambio"
 
-#: plugins/personal/posix/class_posixAccount.inc:434
+#: plugins/personal/posix/class_posixAccount.inc:437
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "La contraseñas deben ser cambiadas despues de %s días"
 
-#: plugins/personal/posix/class_posixAccount.inc:436
+#: plugins/personal/posix/class_posixAccount.inc:439
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 "Desactivar cuente despues de %s días de inactividad despues de expirar la "
 "contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:438
+#: plugins/personal/posix/class_posixAccount.inc:441
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr "Avisar al usuario %s días antes de expirar la contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: 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:222
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:355
+#: plugins/personal/samba/class_sambaAccount.inc:373
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/generic/class_user.inc:240
+#: plugins/gofax/reports/class_faxreport.inc:275
+#: plugins/gofon/reports/class_fonreport.inc:211
 msgid "January"
 msgstr "Enero"
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: 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:222
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:355
+#: plugins/personal/samba/class_sambaAccount.inc:373
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/generic/class_user.inc:240
+#: plugins/gofax/reports/class_faxreport.inc:275
+#: plugins/gofon/reports/class_fonreport.inc:211
 msgid "February"
 msgstr "Febrero"
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: 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:222
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:355
+#: plugins/personal/samba/class_sambaAccount.inc:373
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/generic/class_user.inc:240
+#: plugins/gofax/reports/class_faxreport.inc:275
+#: plugins/gofon/reports/class_fonreport.inc:211
 msgid "March"
 msgstr "Marzo"
 
-#: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:352
-#: 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:222
-#: plugins/gofax/reports/class_faxreport.inc:272
-#: plugins/gofon/reports/class_fonreport.inc:208
+#: plugins/personal/posix/class_posixAccount.inc:465
+#: plugins/personal/samba/class_sambaAccount.inc:355
+#: plugins/personal/samba/class_sambaAccount.inc:373
+#: plugins/personal/samba/class_sambaAccount.inc:391
+#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/generic/class_user.inc:240
+#: plugins/gofax/reports/class_faxreport.inc:275
+#: plugins/gofon/reports/class_fonreport.inc:211
 msgid "April"
 msgstr "Abril"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: 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:223
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:356
+#: plugins/personal/samba/class_sambaAccount.inc:374
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/generic/class_user.inc:241
+#: plugins/gofax/reports/class_faxreport.inc:276
+#: plugins/gofon/reports/class_fonreport.inc:212
 msgid "May"
 msgstr "Mayo"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: 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:223
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:356
+#: plugins/personal/samba/class_sambaAccount.inc:374
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/generic/class_user.inc:241
+#: plugins/gofax/reports/class_faxreport.inc:276
+#: plugins/gofon/reports/class_fonreport.inc:212
 msgid "June"
 msgstr "Junio"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: 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:223
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:356
+#: plugins/personal/samba/class_sambaAccount.inc:374
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/generic/class_user.inc:241
+#: plugins/gofax/reports/class_faxreport.inc:276
+#: plugins/gofon/reports/class_fonreport.inc:212
 msgid "July"
 msgstr "Julio"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: 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:223
-#: plugins/gofax/reports/class_faxreport.inc:273
-#: plugins/gofon/reports/class_fonreport.inc:209
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:356
+#: plugins/personal/samba/class_sambaAccount.inc:374
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/generic/class_user.inc:241
+#: plugins/gofax/reports/class_faxreport.inc:276
+#: plugins/gofon/reports/class_fonreport.inc:212
 msgid "August"
 msgstr "Agosto"
 
-#: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:353
-#: 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:223
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc:466
+#: plugins/personal/samba/class_sambaAccount.inc:356
+#: plugins/personal/samba/class_sambaAccount.inc:374
+#: plugins/personal/samba/class_sambaAccount.inc:392
+#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/generic/class_user.inc:241
+#: plugins/gofax/reports/class_faxreport.inc:277
+#: plugins/gofon/reports/class_fonreport.inc:213
 msgid "September"
 msgstr "Septiembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:354
-#: 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:224
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/gofax/reports/class_faxreport.inc:277
+#: plugins/gofon/reports/class_fonreport.inc:213
 msgid "October"
 msgstr "Octubre"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:354
-#: 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:224
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/gofax/reports/class_faxreport.inc:277
+#: plugins/gofon/reports/class_fonreport.inc:213
 msgid "November"
 msgstr "Noviembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:464
-#: plugins/personal/samba/class_sambaAccount.inc:354
-#: 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:224
-#: plugins/gofax/reports/class_faxreport.inc:274
-#: plugins/gofon/reports/class_fonreport.inc:210
+#: plugins/personal/posix/class_posixAccount.inc:467
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/generic/class_user.inc:242
+#: plugins/gofax/reports/class_faxreport.inc:277
+#: plugins/gofon/reports/class_fonreport.inc:213
 msgid "December"
 msgstr "Diciembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:542
-#: plugins/personal/samba/class_sambaAccount.inc:450
+#: plugins/personal/posix/class_posixAccount.inc:548
+#: plugins/personal/samba/class_sambaAccount.inc:453
 #: 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:548
 msgid "full access"
 msgstr "Acceso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:543
+#: plugins/personal/posix/class_posixAccount.inc:549
 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:718
 msgid "Failed: overriding lock"
 msgstr "Fallo: Sobrepasado bloqueo"
 
-#: plugins/personal/posix/class_posixAccount.inc:871
+#: plugins/personal/posix/class_posixAccount.inc:877
 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:880
 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:888
 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:891
 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:895
+#: plugins/admin/groups/class_groupGeneric.inc:645
 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:898
+#: plugins/admin/groups/class_groupGeneric.inc:648
 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:906
 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:911
 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:916
 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:919
 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:922
 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:925
 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:930
 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:933
 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:938
 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:1042
+#: plugins/admin/groups/class_groupGeneric.inc:679
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
@@ -1312,7 +1452,7 @@ msgstr "Ruta del Script"
 
 #: 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
+#: plugins/personal/samba/class_sambaAccount.inc:634
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
@@ -1361,17 +1501,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Características de tiempo de desconexión (en minutos)"
 
 #: plugins/personal/samba/samba3.tpl:136
-#: plugins/personal/samba/class_sambaAccount.inc:638
+#: plugins/personal/samba/class_sambaAccount.inc:641
 msgid "Connection"
 msgstr "Conexión"
 
 #: plugins/personal/samba/samba3.tpl:145
-#: plugins/personal/samba/class_sambaAccount.inc:639
+#: plugins/personal/samba/class_sambaAccount.inc:642
 msgid "Disconnection"
 msgstr "Desconexión"
 
 #: plugins/personal/samba/samba3.tpl:154
-#: plugins/personal/samba/class_sambaAccount.inc:640
+#: plugins/personal/samba/class_sambaAccount.inc:643
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -1444,15 +1584,15 @@ msgstr "Mostrar estaciones de trabajo de departamentos"
 msgid "Display workstations matching"
 msgstr "Mostrar estaciones de trabajo que concuerden con"
 
-#: plugins/personal/samba/class_sambaAccount.inc:193
+#: plugins/personal/samba/class_sambaAccount.inc:196
 msgid "This account has no samba extensions."
 msgstr "Esta cuenta no tiene extensión samba valida."
 
-#: plugins/personal/samba/class_sambaAccount.inc:202
+#: plugins/personal/samba/class_sambaAccount.inc:205
 msgid "Remove samba account"
 msgstr "Eliminar cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:203
+#: plugins/personal/samba/class_sambaAccount.inc:206
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1460,12 +1600,12 @@ msgstr ""
 "Esta cuenta tiene la extensión samba activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:213
 #: plugins/personal/samba/class_sambaAccount.inc:216
+#: plugins/personal/samba/class_sambaAccount.inc:219
 msgid "Create samba account"
 msgstr "Crear cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:214
+#: plugins/personal/samba/class_sambaAccount.inc:217
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -1473,7 +1613,7 @@ msgstr ""
 "Esta cuenta tiene la extensión samba desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:217
+#: plugins/personal/samba/class_sambaAccount.inc:220
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1482,44 +1622,44 @@ msgstr ""
 "características Posix son necesarias para las cuentas samba, activelas "
 "primero."
 
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:454
 msgid "input on, notify on"
 msgstr "Activación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:455
 msgid "input on, notify off"
 msgstr "Activación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:453
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "input off, notify on"
 msgstr "Desactivación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "input off, nofify off"
 msgstr "Desactivación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "disconnect"
 msgstr "desconectar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "reset"
 msgstr "Borrar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "from any client"
 msgstr "Desde cualquier cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:460
+#: plugins/personal/samba/class_sambaAccount.inc:463
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:633
+#: plugins/personal/samba/class_sambaAccount.inc:636
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "¡El valor especificado como '%s' contiene caracteres no validos!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/class_sambaAccount.inc:646
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1527,7 +1667,7 @@ msgstr ""
 "¡La propiedad 'tiempo de desconexión' '%s' esta activada y contiene "
 "caracteres no validos o no caracteres!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:649
+#: plugins/personal/samba/class_sambaAccount.inc:652
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1535,7 +1675,7 @@ msgstr ""
 "El gestor de usuarios de windows solo permite ocho clientes. Ha especificado "
 "mas de ocho."
 
-#: plugins/personal/samba/class_sambaAccount.inc:833
+#: plugins/personal/samba/class_sambaAccount.inc:836
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1543,7 +1683,7 @@ msgstr ""
 "Aviso: Esta cuenta tiene asignado un SID indefinido. ¡El problema no puede "
 "ser solucionado por GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:858
+#: plugins/personal/samba/class_sambaAccount.inc:861
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1551,87 +1691,91 @@ 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:233
+#: plugins/personal/generic/class_user.inc:251
 msgid "female"
 msgstr "mujer"
 
-#: plugins/personal/generic/class_user.inc:233
+#: plugins/personal/generic/class_user.inc:251
 msgid "male"
 msgstr "hombre"
 
-#: plugins/personal/generic/class_user.inc:243
+#: plugins/personal/generic/class_user.inc:265
 msgid "This account has no valid GOsa extensions."
 msgstr "Esta cuenta no tiene extensiones GOsa validas"
 
-#: plugins/personal/generic/class_user.inc:272
+#: plugins/personal/generic/class_user.inc:294
 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:367
+#: plugins/personal/generic/class_user.inc:390
 msgid "Please enter a valid serial number"
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:427
 #, php-format
-msgid ""
-"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:427
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:404
+#: plugins/personal/generic/class_user.inc:427
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:408
+#: plugins/personal/generic/class_user.inc:431
 #, fuzzy
 msgid "No certificate installed"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/class_user.inc:808
+#: plugins/personal/generic/class_user.inc:838
 msgid "Kerberos database communication failed"
 msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/class_user.inc:825
+#: plugins/personal/generic/class_user.inc:855
 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:836
+#: plugins/personal/generic/class_user.inc:866
 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:876
+#: plugins/personal/generic/class_user.inc:896
+#, fuzzy
+msgid "Invalid characters in uid."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
+
+#: plugins/personal/generic/class_user.inc:910
 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:881
+#: plugins/personal/generic/class_user.inc:915
 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:887
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:529
+#: plugins/personal/generic/class_user.inc:921
+#: plugins/addons/addressbook/class_addressbook.inc:530
+#: plugins/admin/users/class_userManagement.inc:546
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:896
+#: plugins/personal/generic/class_user.inc:930
 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:902
-#: plugins/addons/addressbook/class_addressbook.inc:531
-#: plugins/admin/users/class_userManagement.inc:532
+#: plugins/personal/generic/class_user.inc:936
+#: plugins/addons/addressbook/class_addressbook.inc:534
+#: plugins/admin/users/class_userManagement.inc:549
 msgid "The required field 'Given name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:905
+#: plugins/personal/generic/class_user.inc:939
 msgid "The required field 'Login' is not set."
 msgstr " El campo requerido 'Login' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:912
+#: plugins/personal/generic/class_user.inc:946
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -1639,7 +1783,7 @@ msgstr ""
 "Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
 "base de datos."
 
-#: plugins/personal/generic/class_user.inc:919
+#: plugins/personal/generic/class_user.inc:953
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -1647,51 +1791,51 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/personal/generic/class_user.inc:922
+#: plugins/personal/generic/class_user.inc:956
 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:925
-#: plugins/personal/generic/class_user.inc:953
-#: plugins/addons/addressbook/class_addressbook.inc:537
-#: plugins/addons/addressbook/class_addressbook.inc:565
-#: plugins/admin/departments/class_departmentGeneric.inc:166
+#: plugins/personal/generic/class_user.inc:959
+#: plugins/personal/generic/class_user.inc:987
+#: plugins/addons/addressbook/class_addressbook.inc:540
+#: plugins/addons/addressbook/class_addressbook.inc:568
+#: plugins/admin/departments/class_departmentGeneric.inc:169
 msgid "The field 'Name' contains invalid characters."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/personal/generic/class_user.inc:928
-#: plugins/personal/generic/class_user.inc:950
-#: plugins/addons/addressbook/class_addressbook.inc:540
-#: plugins/addons/addressbook/class_addressbook.inc:562
+#: plugins/personal/generic/class_user.inc:962
+#: plugins/personal/generic/class_user.inc:984
+#: plugins/addons/addressbook/class_addressbook.inc:543
+#: plugins/addons/addressbook/class_addressbook.inc:565
 msgid "The field 'Given name' contains invalid characters."
 msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
 
-#: plugins/personal/generic/class_user.inc:933
-#: plugins/personal/generic/class_user.inc:936
-#: plugins/addons/addressbook/class_addressbook.inc:545
+#: plugins/personal/generic/class_user.inc:967
+#: plugins/personal/generic/class_user.inc:970
 #: plugins/addons/addressbook/class_addressbook.inc:548
-#: plugins/admin/departments/class_departmentGeneric.inc:169
+#: plugins/addons/addressbook/class_addressbook.inc:551
+#: plugins/admin/departments/class_departmentGeneric.inc:172
 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:939
-#: plugins/addons/addressbook/class_addressbook.inc:551
-#: plugins/admin/departments/class_departmentGeneric.inc:172
+#: plugins/personal/generic/class_user.inc:973
+#: plugins/addons/addressbook/class_addressbook.inc:554
+#: plugins/admin/departments/class_departmentGeneric.inc:175
 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:942
-#: plugins/addons/addressbook/class_addressbook.inc:554
+#: plugins/personal/generic/class_user.inc:976
+#: plugins/addons/addressbook/class_addressbook.inc:557
 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:945
-#: plugins/addons/addressbook/class_addressbook.inc:557
+#: plugins/personal/generic/class_user.inc:979
+#: plugins/addons/addressbook/class_addressbook.inc:560
 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:1070
+#: plugins/personal/generic/class_user.inc:1106
 #, fuzzy
 msgid "Could not open specified certificate!"
 msgstr "No puedo seleccionar la base de datos."
@@ -1720,29 +1864,25 @@ 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/address_info.tpl:16
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:507
 #: 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/faiPartitionTableEntry.tpl:6
-#: plugins/admin/FAI/faiPartitionTable.tpl:6 plugins/admin/FAI/faiScript.tpl:6
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/FAI/faiVariableEntry.tpl:7
-#: plugins/admin/FAI/faiTemplate.tpl:6 plugins/admin/FAI/faiHookEntry.tpl:7
-#: plugins/admin/FAI/faiVariable.tpl:6 plugins/admin/FAI/faiScriptEntry.tpl:7
-#: plugins/admin/FAI/faiTemplateEntry.tpl:7 plugins/admin/FAI/faiHook.tpl:6
-#: 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:174 html/getxls.php:233
 msgid "Name"
 msgstr "Nombre"
 
 #: plugins/personal/generic/generic.tpl:30
 #: plugins/addons/addressbook/address_edit.tpl:22
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:507
 #: plugins/admin/users/template.tpl:23
 msgid "Given name"
 msgstr "Nombre"
@@ -1771,29 +1911,35 @@ msgstr "Fecha de nacimiento"
 msgid "Set"
 msgstr "por debajo"
 
-#: plugins/personal/generic/generic.tpl:81
+#: plugins/personal/generic/generic.tpl:81 html/getxls.php:65
+#: html/getxls.php:224
 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/server.tpl:13 plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/terminal.tpl:18 plugins/admin/systems/printer.tpl:29
-#: plugins/admin/systems/workstation.tpl:18
+#: 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
@@ -1802,151 +1948,153 @@ 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:236
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/generic.tpl:177
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
+#: plugins/personal/generic/generic.tpl:187
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
 #: 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/applications/class_applicationManagement.inc:354
-#: plugins/admin/systems/class_systemManagement.inc:577
-#: plugins/admin/ogroups/class_ogroupManagement.inc:414
-#: plugins/admin/ogroups/class_ogroupManagement.inc:482
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/admin/groups/class_groupManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:689
+#: plugins/admin/applications/class_applicationManagement.inc:357
+#: plugins/admin/systems/class_systemManagement.inc:589
+#: plugins/admin/ogroups/class_ogroupManagement.inc:417
+#: plugins/admin/ogroups/class_ogroupManagement.inc:485
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
 #: plugins/generic/references/class_reference.inc:38
 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/personal/nagios/nagios.tpl:48
 #: plugins/addons/addressbook/address_edit.tpl:102
-#: plugins/addons/addressbook/address_info.tpl:91
+#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
+#: html/getxls.php:236
 msgid "Pager"
 msgstr "Dispositivo de aviso"
 
-#: plugins/personal/generic/generic.tpl: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:174
 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:174
 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:174
 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"
 
@@ -1955,15 +2103,10 @@ 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/faiPartitionTableEntry.tpl:31
-#: plugins/admin/FAI/faiVariableEntry.tpl:41
-#: plugins/admin/FAI/faiHookEntry.tpl:41
-#: plugins/admin/FAI/faiScriptEntry.tpl:47
-#: plugins/admin/FAI/faiTemplateEntry.tpl:41
+#: plugins/admin/systems/servnfs.tpl:91
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
 msgid "Save"
 msgstr "Guardar"
 
@@ -1974,11 +2117,16 @@ msgstr "Certificado estandar"
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:203
+#: plugins/personal/connectivity/class_kolabAccount.inc:206
+#: 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/groups/class_groupMail.inc:411
+#: plugins/admin/applications/class_applicationParameters.inc:97
+#: 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:248
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Eliminar"
@@ -1999,7 +2147,7 @@ msgstr "Numero de serie del certificado"
 msgid "You are not allowed to set your password!"
 msgstr "¡No tiene permisos para cambiar su contraseña!"
 
-#: plugins/personal/generic/main.inc:187
+#: plugins/personal/generic/main.inc:189
 msgid "Generic user information"
 msgstr "Información genérica del usuario"
 
@@ -2008,23 +2156,23 @@ msgstr "Información genérica del usuario"
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
 msgid "Value specified as 'Files' is not valid."
 msgstr "El valor especificado como 'Archivos' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
 msgid "Value specified as 'Size' is not valid."
 msgstr "El valor especificado como 'Tamaño' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "El valor especificado como 'relación' no es válido"
 
@@ -2056,14 +2204,14 @@ msgstr "por"
 msgid "Kolab"
 msgstr "Kolab"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:102
+#: plugins/personal/connectivity/class_kolabAccount.inc:105
 msgid ""
 "You're trying to add an invalid email address to the list of delegations."
 msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "reenvíos."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:110
+#: plugins/personal/connectivity/class_kolabAccount.inc:113
 msgid ""
 "The mail address you're trying to add is no primary mail address of an "
 "existing user."
@@ -2071,45 +2219,45 @@ msgstr ""
 "La dirección de correo primaria que esta intentando añadir, ya esta usada "
 "por otro usuario"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:137
+#: plugins/personal/connectivity/class_kolabAccount.inc:140
 msgid "Always accept"
 msgstr "Aceptar siempre"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:138
+#: plugins/personal/connectivity/class_kolabAccount.inc:141
 msgid "Always reject"
 msgstr "Denegar siempre"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:139
+#: plugins/personal/connectivity/class_kolabAccount.inc:142
 msgid "Reject if conflicts"
 msgstr "Denegar si hay conflictos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:140
+#: plugins/personal/connectivity/class_kolabAccount.inc:143
 msgid "Manual if conflicts"
 msgstr "Preguntar si hay conflictos"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:141
+#: plugins/personal/connectivity/class_kolabAccount.inc:144
 msgid "Manual"
 msgstr "Manual"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:177
+#: plugins/personal/connectivity/class_kolabAccount.inc:180
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:229
+#: plugins/personal/connectivity/class_kolabAccount.inc:232
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr "El valor especificado como presencia futura necesita ser un entero."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:234
+#: plugins/personal/connectivity/class_kolabAccount.inc:237
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "El valor especificado como Dirección URL de  no es válido"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:248
+#: plugins/personal/connectivity/class_kolabAccount.inc:251
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 "La entrada de la política de invitación para la dirección '%s' no es valida."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:256
+#: plugins/personal/connectivity/class_kolabAccount.inc:259
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
@@ -2178,41 +2326,50 @@ msgstr "Cuenta WebDAV"
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
-#, fuzzy
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
+#, fuzzy, php-format
 msgid ""
-"This account has <b>OpenXchange</b> features disabled. Posix features are "
-"needed for openXchange accounts, enable them first."
+"This account has %s features disabled. Posix features are needed for "
+"openXchange accounts, enable them first."
 msgstr ""
 "Esta cuenta tiene sus características samba desactivadas, las "
 "características Posix son necesarias para las cuentas samba, activelas "
 "primero."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:614
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
 #, fuzzy
+msgid "OpenXchange"
+msgstr "Open-Xchange"
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
+#, fuzzy, php-format
 msgid ""
-"This account has <b>OpenXchange</b> features disabled. Mail features are "
-"needed for openXchange accounts, enable them first."
+"This account has %s features disabled. Mail features are needed for "
+"openXchange accounts, enable them first."
 msgstr ""
 "Esta cuenta tiene sus características samba desactivadas, las "
 "características Posix son necesarias para las cuentas samba, activelas "
 "primero."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:696
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "Couldn't Connect To Postgresql Database"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:699
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:789
+#, fuzzy
+msgid "Couldn't connect to postgresql database!"
 msgstr "No puedo conectar al servidor de base de datos postgresql."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:790
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:703
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:793
+#, fuzzy
+msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 "¡Los parámetros necesarios para extensión de conectividad open-xchange no "
 "son validos!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:794
-msgid "PHP4 module for Postgresql Database Failed!"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:707
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:797
+#, fuzzy
+msgid "PHP4 module for postgresql database is missing!"
 msgstr "¡El módulo de PHP4 para la base de datos Postgresql falla!"
 
 #: plugins/personal/connectivity/pureftpd.tpl:1
@@ -2237,7 +2394,7 @@ msgid "Download bandwidth"
 msgstr "Ancho de banda descendente"
 
 #: plugins/personal/connectivity/pureftpd.tpl:31
-#: plugins/personal/environment/environment.tpl:53
+#: plugins/personal/environment/environment.tpl:65
 msgid "Quota"
 msgstr "Cuota"
 
@@ -2246,6 +2403,7 @@ msgid "Files"
 msgstr "Archivos"
 
 #: plugins/personal/connectivity/pureftpd.tpl:39
+#: plugins/addons/mailqueue/contents.tpl:27
 msgid "Size"
 msgstr "Tamaño"
 
@@ -2302,7 +2460,7 @@ msgstr "Zona de uso horario del usuario"
 msgid "Intranet account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/personal/connectivity/class_connectivity.inc:60
+#: plugins/personal/connectivity/class_connectivity.inc:63
 msgid "This account has no connectivity extensions."
 msgstr "Esta cuenta no tiene extensiones de conectividad"
 
@@ -2311,35 +2469,35 @@ msgstr "Esta cuenta no tiene extensiones de conectividad"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:81
 msgid "KB"
 msgstr "Kb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:78
+#: plugins/personal/connectivity/class_proxyAccount.inc:81
 msgid "GB"
 msgstr "Gb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:82
 msgid "hour"
 msgstr "hora"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:82
 msgid "day"
 msgstr "día"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:82
 msgid "week"
 msgstr "semana"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:79
+#: plugins/personal/connectivity/class_proxyAccount.inc:82
 msgid "month"
 msgstr "mes"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:130
+#: plugins/personal/connectivity/class_proxyAccount.inc:133
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:133
+#: plugins/personal/connectivity/class_proxyAccount.inc:136
 #, fuzzy
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "El valor de 'Tamaño de Cola' no es valido."
@@ -2348,85 +2506,103 @@ msgstr "El valor de 'Tamaño de Cola' no es valido."
 msgid "Intranet"
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:6
+msgid "PHPscheduleit Account"
+msgstr ""
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:6
+#, fuzzy
+msgid "PPTP Server"
+msgstr "Servidor NTP"
+
+#: plugins/personal/connectivity/phpscheduleit.tpl:1
+#, fuzzy
+msgid "PHPscheduleit account"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/personal/connectivity/pptp.tpl:1
+#, fuzzy
+msgid "PPTP Server account"
+msgstr "Cuenta FTP"
+
 #: plugins/personal/environment/main.inc:124
 #, fuzzy
 msgid "User environment settings"
 msgstr "Parametros del correo de usuarios"
 
-#: plugins/personal/environment/class_environment.inc:204
-#: plugins/personal/environment/class_environment.inc:236
+#: plugins/personal/environment/class_environment.inc:217
+#: plugins/personal/environment/class_environment.inc:253
 #, fuzzy
 msgid "Remove environment extension"
 msgstr "Eliminar extensión Kolab"
 
-#: plugins/personal/environment/class_environment.inc:205
-#: plugins/personal/environment/class_environment.inc:237
+#: plugins/personal/environment/class_environment.inc:218
+#: plugins/personal/environment/class_environment.inc:254
 #, fuzzy
-msgid ""
-"This server has environment extension enabled. You can disable it by "
-"clicking below."
+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:209
-#: plugins/personal/environment/class_environment.inc:214
-#: plugins/personal/environment/class_environment.inc:241
-#: plugins/personal/environment/class_environment.inc:246
+#: plugins/personal/environment/class_environment.inc:227
+#: plugins/personal/environment/class_environment.inc:232
+#: plugins/personal/environment/class_environment.inc:260
+#: plugins/personal/environment/class_environment.inc:265
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:210
-#: plugins/personal/environment/class_environment.inc:242
+#: plugins/personal/environment/class_environment.inc:228
+#: plugins/personal/environment/class_environment.inc:261
 #, fuzzy
-msgid ""
-"This server has environment extension disabled. You can enable it by "
-"clicking below."
+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:215
-#: plugins/personal/environment/class_environment.inc:247
+#: plugins/personal/environment/class_environment.inc:233
+#: plugins/personal/environment/class_environment.inc:266
 #, fuzzy
 msgid ""
-"This server has environment extension disabled. You have to setup a posix "
-"account before you can enable this feature."
+"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:410
+#: plugins/personal/environment/class_environment.inc:456
+#: plugins/personal/environment/class_environment.inc:458
+#: plugins/admin/systems/class_terminalStartup.inc:134
+#: plugins/admin/systems/class_workstationStartup.inc:280
 #, fuzzy
 msgid "You must specify a valid mount point."
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/personal/environment/class_environment.inc:622
+#: plugins/personal/environment/class_environment.inc:686
 #, fuzzy
 msgid "Please set a valid profile quota size."
 msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/personal/environment/class_environment.inc:629
+#: plugins/personal/environment/class_environment.inc:693
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:651
+#: plugins/personal/environment/class_environment.inc:715
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:725
+#: plugins/personal/environment/class_environment.inc:808
 #, fuzzy
 msgid "Error while writing printer"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/personal/environment/class_environment.inc:804
+#: plugins/personal/environment/class_environment.inc:878
 #, fuzzy
 msgid "Error while writing printer settings"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/personal/environment/class_environment.inc:966
+#: plugins/personal/environment/class_environment.inc:993
 #, fuzzy
 msgid "Admin"
 msgstr "DN del administrador"
@@ -2435,215 +2611,193 @@ msgstr "DN del administrador"
 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/admin/groups/class_groupManagement.inc:354
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/personal/environment/environment.tpl:160
+#: plugins/admin/groups/class_groupManagement.inc:357
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 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/class_hotplugDialog.inc:109
+#: plugins/personal/environment/class_hotplugDialog.inc:112
 #, fuzzy
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:112
+#: plugins/personal/environment/class_hotplugDialog.inc:115
 #, fuzzy
 msgid "Invalid character in description. Please specify a valid description."
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:115
+#: plugins/personal/environment/class_hotplugDialog.inc:118
 #, fuzzy
 msgid "Please specify a valid id."
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:121
+#: plugins/personal/environment/class_hotplugDialog.inc:124
 #, fuzzy
 msgid "An Entry with this name already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:126
+#: plugins/personal/environment/class_hotplugDialog.inc:129
 #, fuzzy
 msgid "Please select an entry 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/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:24
-#: plugins/admin/ogroups/headpage.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_selectPrinterDialog.inc:64
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:92
+#: plugins/personal/environment/class_selectPrinterDialog.inc:67
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:95
 #, fuzzy
 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"
@@ -2651,124 +2805,133 @@ msgstr "Seleccione números para añadir"
 #: plugins/personal/environment/selectPrinterDialog.tpl:28
 #, fuzzy
 msgid ""
-"This menu allows you to create, edit and delete selected printers. \n"
-"\t\t\t\t\t\t\tHaving a great number of printers, you may want to use the "
-"range selectors on top of the printers list."
+"This menu allows you to create, edit and delete selected printers. Having a "
+"great number of printers, you may want to use the range selectors on top of "
+"the printers list."
 msgstr ""
 "Este menú provee la funcionalidad de crear, editar o borrar los usuarios "
 "seleccionados. Si tiene un gran numero de usuarios usted preferirá usar los "
 "selectores de rangos en la parte superior del listado."
 
-#: 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:53
 #, fuzzy
 msgid "Display printers matching"
 msgstr "Mostrar números que concuerdan con"
 
-#: plugins/personal/environment/selectPrinterDialog.tpl:63
+#: plugins/personal/environment/selectPrinterDialog.tpl:58
 #, fuzzy
 msgid "Regular expression for matching printer names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: 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/faiPartitionTableEntry.tpl:15
-#: plugins/admin/FAI/faiPartitionTable.tpl:14
-#: plugins/admin/FAI/faiScript.tpl:14
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:193
-#: plugins/admin/FAI/faiVariableEntry.tpl:15
-#: plugins/admin/FAI/faiTemplate.tpl:14 plugins/admin/FAI/faiHookEntry.tpl:15
-#: plugins/admin/FAI/faiVariable.tpl:14
-#: plugins/admin/FAI/faiScriptEntry.tpl:15
-#: plugins/admin/FAI/faiTemplateEntry.tpl:15 plugins/admin/FAI/faiHook.tpl:14
+#: 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:123
+#: html/getxls.php:230
 msgid "Description"
 msgstr "Descripción"
 
 #: plugins/personal/environment/logonManagement.tpl:24
-#: plugins/admin/FAI/faiScriptEntry.tpl:23
+#: 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_logonManagementDialog.inc:93
+#: plugins/personal/environment/class_logonManagementDialog.inc:96
 #, fuzzy
 msgid "Specified name is invalid."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:97
+#: plugins/personal/environment/class_logonManagementDialog.inc:100
 #, 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:28
+#, fuzzy
+msgid "Device ID"
+msgstr "Servicios"
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:29
+#: plugins/personal/environment/hotplugDialogNew.tpl:38
 #, fuzzy
 msgid "save"
 msgstr "Guardar"
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:54
+#: plugins/personal/environment/class_kioskManagementDialog.inc:57
 #, php-format
 msgid "Can't delete '%s'. Error was: permission denied."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:57
+#: plugins/personal/environment/class_kioskManagementDialog.inc:60
 #, php-format
 msgid "Can't delete '%s'. Errow was: file doesn't exist."
 msgstr ""
 
-#: plugins/personal/environment/class_kioskManagementDialog.inc:80
+#: plugins/personal/environment/class_kioskManagementDialog.inc:84
+msgid ""
+"There is no KIOSKPATH defined in your gosa.conf. Can't manage kiosk profiles!"
+msgstr ""
+
+#: plugins/personal/environment/class_kioskManagementDialog.inc:90
 #, php-format
-msgid "Can't open '%s'. Error was: permission denied."
+msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
 
 #: plugins/personal/environment/kioskManagement.tpl:1
@@ -2784,12 +2947,122 @@ 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/personal/nagios/main.inc:124
+#, fuzzy
+msgid "Nagios settings"
+msgstr "Parametros del correo de usuarios"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:85
+#, fuzzy
+msgid "This account has no nagios extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:94
+#, fuzzy
+msgid "Remove nagios account"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:95
+#, fuzzy
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#, fuzzy
+msgid "Create nagios account"
+msgstr "Crear cuenta de correo"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:97
+#, 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/personal/nagios/class_nagiosAccount.inc:172
+#, fuzzy
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:175
+#, fuzzy
+msgid "The required field 'NagiosMail' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:179
+#: plugins/personal/nagios/class_nagiosAccount.inc:183
+#, 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/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 html/getxls.php:174
+#, fuzzy
+msgid "Mail address"
+msgstr "Dirección MAC"
+
+#: plugins/personal/nagios/nagios.tpl:17
+#, fuzzy
+msgid "Host notification period"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/personal/nagios/nagios.tpl:25
+#, fuzzy
+msgid "Service notification period"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/personal/nagios/nagios.tpl:32
+#, fuzzy
+msgid "Service notification options"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/personal/nagios/nagios.tpl:41
+#, fuzzy
+msgid "Host notification options"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/personal/nagios/nagios.tpl:53
+#, fuzzy
+msgid "Service notification commands"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/personal/nagios/nagios.tpl:57
+#, fuzzy
+msgid "Host notification commands"
+msgstr "Opciones de aplicaciones"
+
+#: plugins/personal/nagios/nagios.tpl:66
+#, fuzzy
+msgid "Nagios authentification"
+msgstr "Estación de trabajo Windows"
+
+#: plugins/personal/nagios/nagios.tpl:68
+#, fuzzy
+msgid "can view system informations"
+msgstr "Información de sistema"
+
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
 msgstr "Nombre de la lista"
@@ -2803,9 +3076,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:179
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:122
 msgid "Type"
 msgstr "Tipo"
@@ -2830,240 +3106,244 @@ msgstr "Los números pueden contener también comodínes"
 msgid "FAX Blocklists"
 msgstr "Lista de bloqueos de FAX"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:203
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:206
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr "Has decidido eliminar la lista de bloqueo '%s'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:217
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:220
 msgid "You have no permission to remove this blocklist."
 msgstr "No tiene permisos para eliminar esta lista de bloqueo."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:238
 msgid "Please specify a valid phone number."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:291
-#: plugins/admin/groups/class_groupManagement.inc:348
-#: plugins/admin/users/class_userManagement.inc:652
-#: plugins/admin/applications/class_applicationManagement.inc:323
-#: plugins/admin/departments/class_departmentManagement.inc:277
-#: plugins/admin/systems/class_systemManagement.inc:553
-#: plugins/admin/ogroups/class_ogroupManagement.inc:356
-#: plugins/admin/FAI/class_faiManagement.inc:308
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:280
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
+#: plugins/admin/groups/class_groupManagement.inc:351
+#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/applications/class_applicationManagement.inc:326
+#: plugins/admin/departments/class_departmentManagement.inc:280
+#: plugins/admin/systems/class_systemManagement.inc:565
+#: plugins/admin/ogroups/class_ogroupManagement.inc:359
+#: plugins/admin/fai/class_faiManagement.inc:420
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 #, fuzzy
 msgid "Go up one department"
 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/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/ogroups/class_ogroupManagement.inc:356
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:294
+#: plugins/admin/groups/class_groupManagement.inc:351
+#: plugins/admin/users/class_userManagement.inc:669
+#: plugins/admin/applications/class_applicationManagement.inc:326
+#: plugins/admin/departments/class_departmentManagement.inc:280
+#: plugins/admin/systems/class_systemManagement.inc:565
+#: plugins/admin/ogroups/class_ogroupManagement.inc:359
 #: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/admin/FAI/class_faiManagement.inc:308
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:280
+#: plugins/admin/fai/class_faiManagement.inc:420
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 msgid "Up"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
-#: plugins/admin/groups/class_groupManagement.inc:349
-#: plugins/admin/users/class_userManagement.inc:653
-#: plugins/admin/applications/class_applicationManagement.inc:324
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:554
-#: plugins/admin/ogroups/class_ogroupManagement.inc:357
-#: plugins/admin/FAI/class_faiManagement.inc:309
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:281
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+#: plugins/admin/groups/class_groupManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/departments/class_departmentManagement.inc:281
+#: plugins/admin/systems/class_systemManagement.inc:566
+#: plugins/admin/ogroups/class_ogroupManagement.inc:360
+#: plugins/admin/fai/class_faiManagement.inc:423
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 #, fuzzy
 msgid "Go to root department"
 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/applications/class_applicationManagement.inc:324
-#: plugins/admin/departments/class_departmentManagement.inc:278
-#: plugins/admin/systems/class_systemManagement.inc:554
-#: plugins/admin/ogroups/class_ogroupManagement.inc:358
-#: plugins/admin/FAI/class_faiManagement.inc:309
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:281
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+#: plugins/admin/groups/class_groupManagement.inc:352
+#: plugins/admin/users/class_userManagement.inc:670
+#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/departments/class_departmentManagement.inc:281
+#: plugins/admin/systems/class_systemManagement.inc:566
+#: plugins/admin/ogroups/class_ogroupManagement.inc:361
+#: plugins/admin/fai/class_faiManagement.inc:423
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 #, fuzzy
 msgid "Root"
 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/applications/class_applicationManagement.inc:325
-#: plugins/admin/systems/class_systemManagement.inc:555
-#: plugins/admin/ogroups/class_ogroupManagement.inc:359
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:282
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:353
+#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/admin/applications/class_applicationManagement.inc:328
+#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 #, fuzzy
 msgid "Go to users department"
 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/applications/class_applicationManagement.inc:325
-#: plugins/admin/departments/class_departmentManagement.inc:279
-#: plugins/admin/systems/class_systemManagement.inc:555
-#: plugins/admin/ogroups/class_ogroupManagement.inc:360
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:282
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:296
+#: plugins/admin/groups/class_groupManagement.inc:354
+#: plugins/admin/users/class_userManagement.inc:671
+#: plugins/admin/applications/class_applicationManagement.inc:328
+#: plugins/admin/departments/class_departmentManagement.inc:282
+#: plugins/admin/systems/class_systemManagement.inc:567
+#: plugins/admin/ogroups/class_ogroupManagement.inc:363
+#: plugins/admin/fai/class_faiManagement.inc:426
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
 #, fuzzy
 msgid "Home"
 msgstr "Nombre de Maquina"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
 #, fuzzy
 msgid "Create new blocklist"
 msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:295
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:298
 #, fuzzy
 msgid "New Blocklist"
 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/applications/class_applicationManagement.inc:329
-#: plugins/admin/departments/class_departmentManagement.inc:283
-#: plugins/admin/systems/class_systemManagement.inc:564
-#: plugins/admin/ogroups/class_ogroupManagement.inc:364
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:299
+#: plugins/admin/groups/class_groupManagement.inc:359
+#: plugins/admin/users/class_userManagement.inc:676
+#: plugins/admin/applications/class_applicationManagement.inc:332
+#: plugins/admin/departments/class_departmentManagement.inc:286
+#: plugins/admin/systems/class_systemManagement.inc:576
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/admin/fai/class_faiManagement.inc:455
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:333
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
 #, fuzzy
 msgid "Current base"
 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/applications/class_applicationManagement.inc:330
-#: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:565
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/admin/groups/class_groupManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/admin/applications/class_applicationManagement.inc:333
+#: plugins/admin/departments/class_departmentManagement.inc:287
+#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/ogroups/class_ogroupManagement.inc:368
+#: plugins/admin/fai/class_faiManagement.inc:456
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
 #, fuzzy
 msgid "Submit department"
 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/applications/class_applicationManagement.inc:330
-#: plugins/admin/departments/class_departmentManagement.inc:284
-#: plugins/admin/systems/class_systemManagement.inc:565
-#: plugins/admin/ogroups/class_ogroupManagement.inc:365
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
+#: plugins/admin/groups/class_groupManagement.inc:360
+#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/admin/applications/class_applicationManagement.inc:333
+#: plugins/admin/departments/class_departmentManagement.inc:287
+#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/ogroups/class_ogroupManagement.inc:368
+#: plugins/admin/fai/class_faiManagement.inc:456
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
 msgid "Submit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/users/class_userManagement.inc:663
-#: plugins/admin/applications/class_applicationManagement.inc:334
-#: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/systems/class_systemManagement.inc:570
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/admin/FAI/class_faiManagement.inc:333
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:303
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/applications/class_applicationManagement.inc:337
+#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/systems/class_systemManagement.inc:582
+#: plugins/admin/ogroups/class_ogroupManagement.inc:372
+#: plugins/admin/fai/class_faiManagement.inc:474
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:339
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
 #, fuzzy
 msgid "edit"
 msgstr "Editar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:300
-#: plugins/admin/users/class_userManagement.inc:663
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:303
+#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:339
 #, fuzzy
 msgid "Edit user"
 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/applications/class_applicationManagement.inc:335
-#: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/systems/class_systemManagement.inc:571
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/admin/FAI/class_faiManagement.inc:334
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:294
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:304
+#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/admin/applications/class_applicationManagement.inc:338
+#: plugins/admin/departments/class_departmentManagement.inc:295
+#: plugins/admin/systems/class_systemManagement.inc:583
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
+#: plugins/admin/fai/class_faiManagement.inc:475
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:340
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:303
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
 #, fuzzy
 msgid "delete"
 msgstr "Borrar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:301
-#: plugins/admin/users/class_userManagement.inc:665
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:304
+#: plugins/admin/users/class_userManagement.inc:682
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:340
 #, fuzzy
 msgid "Delete user"
 msgstr "Borrar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
 #, fuzzy
 msgid "Blocklist name"
 msgstr "Gestión de listas de bloqueo"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/groups/class_groupManagement.inc:387
-#: plugins/admin/users/class_userManagement.inc:674
-#: plugins/admin/applications/class_applicationManagement.inc:355
-#: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_systemManagement.inc:578
-#: plugins/admin/ogroups/class_ogroupManagement.inc:391
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:307
+#: plugins/admin/groups/class_groupManagement.inc:390
+#: plugins/admin/users/class_userManagement.inc:691
+#: plugins/admin/applications/class_applicationManagement.inc:358
+#: plugins/admin/departments/class_departmentManagement.inc:302
+#: plugins/admin/systems/class_systemManagement.inc:590
+#: plugins/admin/ogroups/class_ogroupManagement.inc:394
+#: plugins/admin/fai/class_faiManagement.inc:471
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:318
 msgid "Actions"
 msgstr "Acciones"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
 msgid "This table displays faxblocklists for the selected tree."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:382
 msgid "send"
 msgstr "enviar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:379
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:382
 msgid "receive"
 msgstr "recibir"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:525
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:528
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "No tiene permisos para crear una lista de bloqueo en esta 'Base'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:531
-#: plugins/admin/departments/class_departmentGeneric.inc:154
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
+#: plugins/admin/departments/class_departmentGeneric.inc:157
 msgid "Required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:534
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:537
 msgid "Required field 'Name' contains invalid characters"
 msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:542
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:545
 msgid "Specified name is already used."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
 msgid "No permission to create a blocklist on this base."
 msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
 
@@ -3071,15 +3351,15 @@ 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"
 msgstr "Aviso"
 
-#: plugins/gofax/blocklists/remove.tpl:7
+#: plugins/gofax/blocklists/remove.tpl:6
 msgid ""
 "Please double check if your really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -3087,13 +3367,12 @@ msgstr ""
 "Por favor pulse dos veces si realmente quiere hacer esto, ya que no hay "
 "manera de que GOsa recupere posteriormente la información."
 
-#: plugins/gofax/blocklists/remove.tpl:11
-#: plugins/addons/addressbook/remove.tpl:11 plugins/admin/groups/remove.tpl:11
-#: plugins/admin/users/remove.tpl:11 plugins/admin/applications/remove.tpl:10
-#: plugins/admin/ogroups/remove.tpl:11 plugins/gofon/macro/remove.tpl:10
-msgid ""
-"So - if you're sure - press <i>Delete</i> to continue or <i>Cancel</i> to "
-"abort."
+#: plugins/gofax/blocklists/remove.tpl:10
+#: plugins/addons/addressbook/remove.tpl:10 plugins/admin/groups/remove.tpl:10
+#: plugins/admin/users/remove.tpl:10 plugins/admin/applications/remove.tpl:9
+#: plugins/admin/ogroups/remove.tpl:10 plugins/gofon/macro/remove.tpl:9
+#, fuzzy
+msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Entonces si esta seguro - presione <i>Eliminar</i> para continuar o "
 "<i>Cancelar</i> para Abortar."
@@ -3145,7 +3424,8 @@ 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:65
+#: html/getxls.php:224
 msgid "Language"
 msgstr "Lenguaje"
 
@@ -3243,7 +3523,14 @@ 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 include/functions.inc:1276
+#: plugins/admin/groups/mail_admins.tpl:37
+#: 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"
 
@@ -3258,15 +3545,15 @@ msgstr "Parametros del Fax"
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:111
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:114
 msgid "This account has no fax extensions."
 msgstr "Esta cuenta no tiene extensiones de fax."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:120
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:123
 msgid "Remove fax account"
 msgstr "Eliminar cuenta de fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:121
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:124
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
@@ -3274,11 +3561,11 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:123
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:126
 msgid "Create fax account"
 msgstr "Crear cuenta de fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:124
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:127
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
@@ -3286,29 +3573,29 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:192
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:195
 msgid "You're trying to add an invalid phone number."
 msgstr "Esta intentando añadir un número de teléfono no valido."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:470
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:473
 msgid "The required field 'Fax' is not set."
 msgstr "No ha rellenado el campo requerido 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:477
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr "Por favor introduzca un numero de teléfono valido en el campo 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:482
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:485
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 "Envío de correo ha sido seleccionado, pero no se ha especificado ninguna "
 "dirección de correo."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:484
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:487
 msgid "The mail address you've entered is invalid."
 msgstr "La cuenta de correo electrónico que ha introducido no es válida."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:490
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:493
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -3327,8 +3614,9 @@ msgid "FAX ID"
 msgstr "FAX ID"
 
 #: plugins/gofax/reports/detail.tpl:22 plugins/gofax/reports/contents.tpl:30
-#: plugins/admin/systems/class_printGeneric.inc:513
-#: plugins/admin/ogroups/class_ogroupManagement.inc:479
+#: plugins/admin/systems/class_printGeneric.inc:567
+#: plugins/admin/ogroups/class_ogroupManagement.inc:482
+#: plugins/admin/fai/faiTemplateEntry.tpl:94
 msgid "User"
 msgstr "Usuario"
 
@@ -3371,7 +3659,9 @@ msgstr "Filtro"
 
 #: plugins/gofax/reports/contents.tpl:6
 #: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
+#: plugins/addons/logview/contents.tpl:47
+#: plugins/addons/mailqueue/contents.tpl:8
+#: plugins/gofon/reports/contents.tpl:6
 msgid "Search for"
 msgstr "Buscar por"
 
@@ -3405,6 +3695,7 @@ msgid "Date"
 msgstr "Fecha"
 
 #: plugins/gofax/reports/contents.tpl:33
+#: plugins/addons/mailqueue/contents.tpl:29
 msgid "Sender"
 msgstr "Remitente"
 
@@ -3422,33 +3713,33 @@ msgstr "La busqueda no ha encontrado resultados"
 msgid "FAX Reports"
 msgstr "Informes de FAX"
 
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
+#: plugins/gofax/reports/class_faxreport.inc:100
+#: plugins/gofax/reports/class_faxreport.inc:207
 msgid "Can't connect to fax database, no reports can be shown!"
 msgstr ""
 "No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
 "informes!"
 
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
+#: plugins/gofax/reports/class_faxreport.inc:104
+#: plugins/gofax/reports/class_faxreport.inc:211
 msgid "Can't select fax database for report generation!"
 msgstr ""
 "¡No puedo seleccionar la base de datos de fax para la generación de informes!"
 
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
+#: plugins/gofax/reports/class_faxreport.inc:112
+#: plugins/gofax/reports/class_faxreport.inc:219
 msgid "Query for fax database failed!"
 msgstr "¡La consulta a la base de datos de fax ha fallado!"
 
-#: plugins/gofax/reports/class_faxreport.inc:117
+#: plugins/gofax/reports/class_faxreport.inc:120
 msgid "You have no permission to retrieve informations about this fax id!"
 msgstr ""
 "¡No tiene permisos para recuperar información sobre el identificador (ID) "
 "del fax!"
 
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
+#: plugins/gofax/reports/class_faxreport.inc:140
+#: plugins/gofax/reports/class_faxreport.inc:227
+#: plugins/gofon/reports/class_fonreport.inc:164
 msgid "Y-M-D"
 msgstr "Y-M-D"
 
@@ -3525,10 +3816,10 @@ msgid "Dial connection..."
 msgstr "Marcando conexión"
 
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:359
-#: plugins/addons/addressbook/class_addressbook.inc:366
-#: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:454
+#: plugins/addons/addressbook/class_addressbook.inc:362
+#: plugins/addons/addressbook/class_addressbook.inc:369
+#: plugins/addons/addressbook/class_addressbook.inc:373
+#: plugins/addons/addressbook/class_addressbook.inc:457
 msgid "Dial"
 msgstr "Llamar"
 
@@ -3542,7 +3833,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:174
+#: html/getxls.php:236
 msgid "Initials"
 msgstr "Iniciales"
 
@@ -3562,7 +3854,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:174
+#: html/getxls.php:236
 msgid "City"
 msgstr "Ciudad"
 
@@ -3571,7 +3864,7 @@ msgstr "Ciudad"
 msgid "Country"
 msgstr "Pais"
 
-#: plugins/addons/addressbook/remove.tpl:7
+#: plugins/addons/addressbook/remove.tpl:6
 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 "
@@ -3589,12 +3882,12 @@ msgstr "Libreta de direcciones"
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
 
-#: plugins/addons/addressbook/class_addressbook.inc:149
+#: plugins/addons/addressbook/class_addressbook.inc:152
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "¿Llamar desde %s a %s ahora?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:153
+#: plugins/addons/addressbook/class_addressbook.inc:156
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -3602,73 +3895,76 @@ msgstr ""
 "No tiene configurado un numero de teléfono personal. Por favor cambie esto "
 "para permitir llamadas directas."
 
-#: plugins/addons/addressbook/class_addressbook.inc:182
-#: plugins/addons/addressbook/class_addressbook.inc:286
+#: plugins/addons/addressbook/class_addressbook.inc:185
+#: plugins/addons/addressbook/class_addressbook.inc:289
 msgid "You are not allowed to delete this entry!"
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:280
+#: plugins/addons/addressbook/class_addressbook.inc:283
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Has decidido eliminar la entrada %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:376
+#: plugins/addons/addressbook/class_addressbook.inc:379
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Salvar el contacto %s como una vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:380
+#: plugins/addons/addressbook/class_addressbook.inc:383
 #, php-format
 msgid "Send mail to %s"
 msgstr "Enviar correo a %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:466
+#: plugins/addons/addressbook/class_addressbook.inc:469
 msgid "global addressbook"
 msgstr "Directorio de contactos global"
 
-#: plugins/addons/addressbook/class_addressbook.inc:469
-msgid "organizations user database"
-msgstr "bases de datos de organizaciones de usuarios"
+#: plugins/addons/addressbook/class_addressbook.inc:472
+#, fuzzy
+msgid "user database"
+msgstr "Base de datos de FAX"
 
-#: plugins/addons/addressbook/class_addressbook.inc:473
-#, php-format
-msgid "Contact stored in %s"
+#: plugins/addons/addressbook/class_addressbook.inc:476
+#, fuzzy, php-format
+msgid "Contact stored in '%s'"
 msgstr "Contacto guardado en %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:475
+#: plugins/addons/addressbook/class_addressbook.inc:478
 msgid "Creating new entry in"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:507
 #: plugins/addons/logview/class_logview.inc:63
 #: plugins/addons/logview/class_logview.inc:77
 msgid "All"
 msgstr "Todo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:508
 msgid "Work phone"
 msgstr "Teléfono del trabajo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:505
+#: plugins/addons/addressbook/class_addressbook.inc:508
 msgid "Cell phone"
 msgstr "Móvil"
 
-#: plugins/addons/addressbook/class_addressbook.inc:506
+#: plugins/addons/addressbook/class_addressbook.inc:509 html/getxls.php:174
 msgid "Home phone"
 msgstr "Teléfono particular"
 
-#: plugins/addons/addressbook/class_addressbook.inc:506
+#: plugins/addons/addressbook/class_addressbook.inc:509 html/getxls.php:80
+#: html/getxls.php:108 html/getxls.php:123 html/getxls.php:282
+#: html/getxls.php:299
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: plugins/addons/addressbook/class_addressbook.inc:578
+#: plugins/addons/addressbook/class_addressbook.inc:581
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "No se puede crear un 'DN' único para esta entrada. Por favor rellene los "
 "campos del formulario."
 
-#: plugins/addons/addressbook/class_addressbook.inc:590
+#: plugins/addons/addressbook/class_addressbook.inc:593
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -3680,51 +3976,51 @@ msgstr ""
 msgid "LDIF export"
 msgstr "Exportar a LDIF"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:93
+#: plugins/addons/ldapmanager/class_csvimport.inc:96
 msgid "You've no permission to do CSV imports."
 msgstr "No tiene permisos para hacer importaciones desde CVS."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:154
+#: plugins/addons/ldapmanager/class_csvimport.inc:157
 msgid "Need 'sn','givenName' and 'uid' to create user."
 msgstr "Se necesita 'sn', 'givenName' y 'uid' para crear usuario."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:200
+#: plugins/addons/ldapmanager/class_csvimport.inc:203
 msgid "failed"
 msgstr "Fallado"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:204
+#: plugins/addons/ldapmanager/class_csvimport.inc:207
 msgid "ok"
 msgstr "ok"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:261
+#: plugins/addons/ldapmanager/class_csvimport.inc:264
 msgid "status"
 msgstr "Estado"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:265
+#: plugins/addons/ldapmanager/class_csvimport.inc:268
 #, php-format
 msgid "An Error Occured while inserting entry %s - process aborted"
 msgstr ""
 "Un error ha ocurrido cuando se insertaba la entrada '%s' - El proceso ha "
 "sido abortado."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:290
+#: plugins/addons/ldapmanager/class_csvimport.inc:293
 msgid "Nothing to import!"
 msgstr "¡No hay nada que importar!"
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:302
-#: plugins/addons/ldapmanager/class_csvimport.inc:313
-#: plugins/addons/ldapmanager/class_csvimport.inc:318
-#: plugins/addons/ldapmanager/class_import.inc:59
-#: plugins/addons/ldapmanager/class_import.inc:67
+#: plugins/addons/ldapmanager/class_csvimport.inc:305
+#: plugins/addons/ldapmanager/class_csvimport.inc:316
+#: plugins/addons/ldapmanager/class_csvimport.inc:321
+#: plugins/addons/ldapmanager/class_import.inc:62
+#: plugins/addons/ldapmanager/class_import.inc:70
 msgid "There is no file uploaded."
 msgstr "No se ha subido ningún archivo."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:307
-#: plugins/addons/ldapmanager/class_import.inc:52
+#: plugins/addons/ldapmanager/class_csvimport.inc:310
+#: plugins/addons/ldapmanager/class_import.inc:55
 msgid "The specified file is empty."
 msgstr "El archivo especificado está vacío."
 
-#: plugins/addons/ldapmanager/class_csvimport.inc:446
+#: plugins/addons/ldapmanager/class_csvimport.inc:449
 msgid "The selected file does not contain any CSV Data..."
 msgstr "El archivo seleccionado no contiene datos CSV..."
 
@@ -3793,11 +4089,11 @@ msgstr "Este es el informe de estado de la importación:"
 msgid "Selected Template"
 msgstr "Plantilla seleccionada"
 
-#: plugins/addons/ldapmanager/class_import.inc:38
+#: plugins/addons/ldapmanager/class_import.inc:41
 msgid "You've no permission to do LDAP imports."
 msgstr "No tiene permisos para hacer importaciones LDAP"
 
-#: plugins/addons/ldapmanager/class_import.inc:105
+#: plugins/addons/ldapmanager/class_import.inc:108
 msgid "Unknown Error"
 msgstr "Error desconocido"
 
@@ -3812,6 +4108,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"
 
@@ -3821,14 +4118,18 @@ 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"
 
@@ -3849,14 +4150,52 @@ msgstr "Gestor LDAP"
 msgid "CSV import"
 msgstr "Importar desde CSV"
 
-#: plugins/addons/ldapmanager/class_export.inc:35
+#: plugins/addons/ldapmanager/class_export.inc:38
+#: plugins/addons/ldapmanager/class_exportxls.inc:38
 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_export.inc:83
+#: plugins/addons/ldapmanager/class_exportxls.inc:88
 msgid "Error while exporting the requested entries!"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
+#: plugins/addons/ldapmanager/contentexportxls.tpl:3
+#, fuzzy
+msgid ""
+"The XLS export plugin provides methods to download a complete snapshot of "
+"the running LDAP directory as xls. You may save these files for "
+"documentation."
+msgstr ""
+"La extensión exportar LDIF provee los metodos para descargar una copia "
+"espejo del directorio LDAP actual como un archivo LDIF. Puede grabar estos "
+"ficheros como copias de seguridad o para iniciar un nuevo servidor."
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:14
+#, fuzzy
+msgid "Choose the data you want to Export"
+msgstr "Elija el departamento que quiera exportar"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:24
+#, fuzzy
+msgid "Export complete XLS for"
+msgstr "Exportación del LDIF completada para"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+#, fuzzy
+msgid "Click here to save the complete LDAP database to a xls file"
+msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
+
+#: 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/ldapmanager/class_exportxls.inc:7
+#, fuzzy
+msgid "XLS import"
+msgstr "Importar desde CSV"
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr "Registro del sistema"
@@ -3866,7 +4205,7 @@ msgid "No LOG servers defined!"
 msgstr "¡No se han definido servidores LOG!"
 
 #: plugins/addons/logview/class_logview.inc:48
-#: plugins/addons/logview/class_logview.inc:138
+#: plugins/addons/logview/class_logview.inc:141
 msgid "Can't select log database for log generation!"
 msgstr ""
 "No puedo consultar la base de datos de registro para la generación de "
@@ -3874,7 +4213,7 @@ msgstr ""
 
 #: plugins/addons/logview/class_logview.inc:57
 #: plugins/addons/logview/class_logview.inc:71
-#: plugins/addons/logview/class_logview.inc:210
+#: plugins/addons/logview/class_logview.inc:213
 msgid "Query for log database failed!"
 msgstr "¡Consulta a la base de datos de logs fallida!"
 
@@ -3910,7 +4249,7 @@ msgstr "2 semanas"
 msgid "one month"
 msgstr "un mes"
 
-#: plugins/addons/logview/class_logview.inc:135
+#: plugins/addons/logview/class_logview.inc:138
 msgid "Can't connect to log database, no logs can be shown!"
 msgstr ""
 "No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
@@ -3952,43 +4291,120 @@ msgstr "Mensaje"
 msgid "System log view"
 msgstr "Ver registro del sistema"
 
-#: plugins/admin/groups/class_groupGeneric.inc:109
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
+#: plugins/addons/mailqueue/main.inc:23
+#, fuzzy
+msgid "Mail queue"
+msgstr "Servidor"
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:61
+msgid "up"
 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/addons/mailqueue/class_mailqueue.inc:63
+#, fuzzy
+msgid "down"
+msgstr "Dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Samba group"
-msgstr "Grupo de samba"
+#: plugins/addons/mailqueue/class_mailqueue.inc:68
+msgid ""
+"Please check your 'gosa.conf' the value for 'MAILQUEUE_QUERY_COMMAND' can't "
+"be executed."
+msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain admins"
-msgstr "Administradores del dominio"
+#: plugins/addons/mailqueue/class_mailqueue.inc:75
+#: plugins/admin/users/class_userManagement.inc:488
+#: plugins/admin/systems/class_workstationStartup.inc:49
+#: plugins/admin/ogroups/class_ogroup.inc:235
+msgid "none"
+msgstr "ninguno"
 
-#: plugins/admin/groups/class_groupGeneric.inc:260
-msgid "Domain users"
-msgstr "Usuarios del dominio"
+#: plugins/addons/mailqueue/class_mailqueue.inc:87
+#, fuzzy
+msgid "all"
+msgstr "Todo"
 
-#: plugins/admin/groups/class_groupGeneric.inc:261
-msgid "Domain guests"
-msgstr "Invitados del dominio"
+#: plugins/addons/mailqueue/class_mailqueue.inc:90
+#, fuzzy
+msgid "day ago"
+msgstr "día"
 
-#: plugins/admin/groups/class_groupGeneric.inc:266
+#: plugins/addons/mailqueue/class_mailqueue.inc:92
+#, fuzzy
+msgid "days ago"
+msgstr "días"
+
+#: plugins/addons/mailqueue/contents.tpl:9
+#, fuzzy
+msgid "Please enter a search string here."
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/addons/mailqueue/contents.tpl:11
+#, fuzzy
+msgid "Select a server"
+msgstr "Seleccione para ver los servidores"
+
+#: plugins/addons/mailqueue/contents.tpl:14
+#, fuzzy
+msgid "Select time periode"
+msgstr "Seleccionar modo de terminal"
+
+#: plugins/addons/mailqueue/contents.tpl:26
+#, fuzzy
+msgid "ID"
+msgstr "UID"
+
+#: plugins/addons/mailqueue/contents.tpl:28
+#, fuzzy
+msgid "Arrival"
+msgstr "Abril"
+
+#: plugins/addons/mailqueue/contents.tpl:30
+#, fuzzy
+msgid "Recipient"
+msgstr "Descripción"
+
+#: plugins/addons/mailqueue/contents.tpl:31
+msgid "Error"
+msgstr ""
+
+#: 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:164
+msgid "This 'dn' is no group."
+msgstr "Este 'dn' no es un grupo."
+
+#: plugins/admin/groups/class_groupGeneric.inc:269
+msgid "Samba group"
+msgstr "Grupo de samba"
+
+#: plugins/admin/groups/class_groupGeneric.inc:269
+msgid "Domain admins"
+msgstr "Administradores del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:269
+msgid "Domain users"
+msgstr "Usuarios del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:270
+msgid "Domain guests"
+msgstr "Invitados del dominio"
+
+#: plugins/admin/groups/class_groupGeneric.inc:275
 #, php-format
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:581
-#: plugins/admin/ogroups/class_ogroup.inc:492
+#: plugins/admin/groups/class_groupGeneric.inc:609
+#: plugins/admin/ogroups/class_ogroup.inc:526
 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/class_groupGeneric.inc:619
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -3996,8 +4412,8 @@ 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
+#: plugins/admin/groups/class_groupGeneric.inc:630
+#: plugins/admin/groups/class_groupGeneric.inc:637
 msgid "Value specified as 'Name' is already used."
 msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
@@ -4044,80 +4460,82 @@ 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:97
+#: html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Grupos"
 
-#: plugins/admin/groups/class_groupManagement.inc:273
+#: plugins/admin/groups/class_groupManagement.inc:276
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Está a punto de borrar el grupo '%s'."
 
-#: plugins/admin/groups/class_groupManagement.inc:279
-#: plugins/admin/groups/class_groupManagement.inc:305
+#: plugins/admin/groups/class_groupManagement.inc:282
+#: plugins/admin/groups/class_groupManagement.inc:308
 msgid "You are not allowed to delete this group!"
 msgstr "¡No le está permitido eliminar este grupo!"
 
-#: plugins/admin/groups/class_groupManagement.inc:353
+#: plugins/admin/groups/class_groupManagement.inc:356
 #, fuzzy
 msgid "Create new group"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/groups/class_groupManagement.inc:361
-#: plugins/admin/applications/class_applicationManagement.inc:334
-#: plugins/admin/departments/class_departmentManagement.inc:291
-#: plugins/admin/ogroups/class_ogroupManagement.inc:369
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
+#: plugins/admin/groups/class_groupManagement.inc:364
+#: plugins/admin/applications/class_applicationManagement.inc:337
+#: plugins/admin/departments/class_departmentManagement.inc:294
+#: plugins/admin/ogroups/class_ogroupManagement.inc:372
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:302
 #, fuzzy
 msgid "Edit this entry"
 msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupManagement.inc:362
-#: plugins/admin/applications/class_applicationManagement.inc:335
-#: plugins/admin/departments/class_departmentManagement.inc:292
-#: plugins/admin/ogroups/class_ogroupManagement.inc:370
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:294
+#: plugins/admin/groups/class_groupManagement.inc:365
+#: plugins/admin/applications/class_applicationManagement.inc:338
+#: plugins/admin/departments/class_departmentManagement.inc:295
+#: plugins/admin/ogroups/class_ogroupManagement.inc:373
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:303
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
 #, fuzzy
 msgid "Delete this entry"
 msgstr "Borrar"
 
-#: plugins/admin/groups/class_groupManagement.inc:372
-#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/groups/class_groupManagement.inc:375
+#: plugins/admin/users/class_userManagement.inc:727
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
 
-#: plugins/admin/groups/class_groupManagement.inc:375
-#: plugins/admin/applications/class_applicationManagement.inc:345
-#: plugins/admin/ogroups/class_ogroupManagement.inc:481
+#: plugins/admin/groups/class_groupManagement.inc:378
+#: plugins/admin/applications/class_applicationManagement.inc:348
+#: plugins/admin/ogroups/class_ogroupManagement.inc:484
 #: plugins/gofon/reports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Aplicación"
 
-#: plugins/admin/groups/class_groupManagement.inc:385
+#: plugins/admin/groups/class_groupManagement.inc:388
 #, fuzzy
 msgid "Groupname"
 msgstr "Nombre del grupo"
 
-#: plugins/admin/groups/class_groupManagement.inc:386
-#: plugins/admin/users/class_userManagement.inc:673
+#: plugins/admin/groups/class_groupManagement.inc:389
+#: plugins/admin/users/class_userManagement.inc:690
 #: 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/ogroups/class_ogroupManagement.inc:393
+#: plugins/admin/fai/faiScriptEntry.tpl:29
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Propiedades"
 
-#: plugins/admin/groups/class_groupManagement.inc:391
-#: plugins/admin/applications/class_applicationManagement.inc:359
-#: plugins/admin/ogroups/class_ogroupManagement.inc:395
+#: plugins/admin/groups/class_groupManagement.inc:394
+#: plugins/admin/applications/class_applicationManagement.inc:362
+#: plugins/admin/ogroups/class_ogroupManagement.inc:398
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:7
+#: plugins/admin/groups/remove.tpl:6
 msgid ""
 "This may be a primary user group. Please double check if you really want to "
 "do this since there is no way for GOsa to get your data back."
@@ -4149,30 +4567,30 @@ msgstr "añadir"
 msgid "write"
 msgstr "escribir"
 
-#: plugins/admin/groups/class_groupMail.inc:179
+#: plugins/admin/groups/class_groupMail.inc:182
 msgid "This 'dn' has no valid mail extensions."
 msgstr "Esta 'dn' no tiene extensiones validas de correo."
 
-#: plugins/admin/groups/class_groupMail.inc:244
+#: plugins/admin/groups/class_groupMail.inc:247
 msgid "You're trying to add an invalid email address "
 msgstr "Esta intentando añadir una dirección de correo no valida"
 
-#: plugins/admin/groups/class_groupMail.inc:245
+#: plugins/admin/groups/class_groupMail.inc:248
 msgid "to the list of forwarders."
 msgstr "a la lista de remitentes."
 
-#: plugins/admin/groups/class_groupMail.inc:613
+#: plugins/admin/groups/class_groupMail.inc:616
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/admin/groups/class_groupMail.inc:646
+#: plugins/admin/groups/class_groupMail.inc:649
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:650
+#: plugins/admin/groups/class_groupMail.inc:653
 #, fuzzy
 msgid "Please select a valid mail server."
 msgstr "Por favor introduzca un número de serie válido"
@@ -4214,11 +4632,11 @@ msgstr "Mostrar usuarios del departamento"
 msgid "Regular expression for matching user names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/admin/groups/class_groupAcl.inc:54
+#: plugins/admin/groups/class_groupAcl.inc:58
 msgid "This 'dn' is no acl container."
 msgstr "Este 'dn' no es un contenedor de listas de acceso."
 
-#: plugins/admin/groups/class_groupAcl.inc:199
+#: plugins/admin/groups/class_groupAcl.inc:203
 msgid "All fields are writeable"
 msgstr "Todos los campos son rellenarles."
 
@@ -4264,7 +4682,12 @@ 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"
 
@@ -4272,15 +4695,15 @@ msgstr "Miembros del grupo"
 msgid "Folder administrators"
 msgstr "Administradores de Carpetas"
 
-#: plugins/admin/groups/class_groupApplication.inc:61
+#: plugins/admin/groups/class_groupApplication.inc:64
 msgid "This 'dn' is no appgroup."
 msgstr "Esta'dn' no es un grupo de aplicaciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:69
+#: plugins/admin/groups/class_groupApplication.inc:72
 msgid "Remove applications"
 msgstr "Borrar aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:70
+#: plugins/admin/groups/class_groupApplication.inc:73
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -4288,11 +4711,11 @@ msgstr ""
 "Este grupo tiene la características de aplicación activa. Puede "
 "desactivarlas apretando a continuación."
 
-#: plugins/admin/groups/class_groupApplication.inc:72
+#: plugins/admin/groups/class_groupApplication.inc:75
 msgid "Create applications"
 msgstr "Crear aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:73
+#: plugins/admin/groups/class_groupApplication.inc:76
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -4300,17 +4723,17 @@ msgstr ""
 "Este grupo tiene la característica de aplicacióon desactivada. Puede "
 "activarlas apretando a continuación."
 
-#: plugins/admin/groups/class_groupApplication.inc:107
+#: plugins/admin/groups/class_groupApplication.inc:110
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "El nombre seleccionado de aplicación no es único. Por favor compruebe su "
 "base de datos LDAP."
 
-#: plugins/admin/groups/class_groupApplication.inc:143
+#: plugins/admin/groups/class_groupApplication.inc:146
 msgid "The selected application has no options."
 msgstr "La aplicación seleccionada no tiene opciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:278
+#: plugins/admin/groups/class_groupApplication.inc:281
 #, php-format
 msgid "The application named %s is no longer available and has been removed."
 msgstr ""
@@ -4330,23 +4753,25 @@ msgid "Creating a new user using templates"
 msgstr "Crear un nuevo usuario usando plantillas"
 
 #: plugins/admin/users/template.tpl:6
+#, fuzzy
 msgid ""
 "Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
 msgstr ""
 "Crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
 "valores en la base de datos serán rellenado automáticamente. Elegir "
 "<b>ninguno</b> para saltarse el uso de plantillas."
 
 #: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:993
-#: plugins/admin/systems/class_systemManagement.inc:699
-#: plugins/admin/FAI/class_faiManagement.inc:391
+#: plugins/admin/users/class_userManagement.inc:1013
+#: plugins/admin/systems/class_systemManagement.inc:706
 msgid "Template"
 msgstr "Plantilla"
 
 #: plugins/admin/users/template.tpl:44
+#: plugins/admin/fai/class_faiManagement.inc:390
+#: 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
@@ -4363,60 +4788,56 @@ 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:68 html/getxls.php:70
+#: html/getxls.php:243
 msgid "Users"
 msgstr "Usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:244
-#: plugins/admin/users/class_userManagement.inc:314
+#: plugins/admin/users/class_userManagement.inc:247
+#: plugins/admin/users/class_userManagement.inc:317
 msgid "You are not allowed to set this users password!"
 msgstr "No le es permitido cambiarle la contraseña a estos usuarios."
 
-#: plugins/admin/users/class_userManagement.inc:350
+#: plugins/admin/users/class_userManagement.inc:353
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Esta a punto de borrar el usuario %s"
 
-#: plugins/admin/users/class_userManagement.inc:356
-#: plugins/admin/users/class_userManagement.inc:384
+#: plugins/admin/users/class_userManagement.inc:359
+#: plugins/admin/users/class_userManagement.inc:387
 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
-msgid "none"
-msgstr "ninguno"
-
-#: plugins/admin/users/class_userManagement.inc:541
+#: plugins/admin/users/class_userManagement.inc:558
 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:673
 #, fuzzy
 msgid "Create new user"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/admin/users/class_userManagement.inc:656
+#: plugins/admin/users/class_userManagement.inc:673
 #, fuzzy
 msgid "New user"
 msgstr "usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:657
+#: plugins/admin/users/class_userManagement.inc:674
 #, fuzzy
 msgid "Create new template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:657
+#: plugins/admin/users/class_userManagement.inc:674
 msgid "New template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:664
+#: plugins/admin/users/class_userManagement.inc:681
 #, fuzzy
 msgid "password"
 msgstr "Contraseña"
 
-#: plugins/admin/users/class_userManagement.inc:672
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/admin/users/class_userManagement.inc:689
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
@@ -4424,70 +4845,70 @@ msgstr "Contraseña"
 msgid "Username"
 msgstr "Nombre de Usuario"
 
-#: plugins/admin/users/class_userManagement.inc:677
+#: plugins/admin/users/class_userManagement.inc:694
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/users/class_userManagement.inc:725
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:709
+#: plugins/admin/users/class_userManagement.inc:726
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:728
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:730
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:732
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:717
+#: plugins/admin/users/class_userManagement.inc:734
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:719
+#: plugins/admin/users/class_userManagement.inc:736
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:721
+#: plugins/admin/users/class_userManagement.inc:738
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/users/class_userManagement.inc:739
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:740
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:778
+#: plugins/admin/users/class_userManagement.inc:795
 #, fuzzy
 msgid "Online"
 msgstr "en linea"
 
-#: plugins/admin/users/class_userManagement.inc:785
+#: plugins/admin/users/class_userManagement.inc:802
 #, fuzzy
 msgid "Offline"
 msgstr "fuera de linea"
 
-#: plugins/admin/users/remove.tpl:7
+#: plugins/admin/users/remove.tpl:6
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
 "this user. Please double check if your really want to do this since there is "
@@ -4516,7 +4937,7 @@ msgstr ""
 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
+#: plugins/admin/users/headpage.tpl:38 plugins/admin/fai/headpage.tpl:37
 msgid "Show templates"
 msgstr "Mostrar plantillas"
 
@@ -4562,14 +4983,15 @@ msgstr "Mostrar los usuarios de proxy"
 
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationManagement.inc:354
+#: plugins/admin/applications/class_applicationManagement.inc:357
 msgid "Application name"
 msgstr "Nombre de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:12
 #: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
-#: plugins/admin/systems/workstation.tpl:109
+#: plugins/admin/systems/workstation.tpl:88
 #: plugins/admin/ogroups/termgroup.tpl:13
+#: plugins/admin/fai/faiTemplateEntry.tpl:89
 msgid "Execute"
 msgstr "Ejecute"
 
@@ -4603,59 +5025,66 @@ 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/class_applicationParameters.inc:47
+#: 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:50
 msgid "Remove options"
 msgstr "Eliminar opciones"
 
-#: plugins/admin/applications/class_applicationParameters.inc:48
+#: plugins/admin/applications/class_applicationParameters.inc:51
 msgid "This application has options. You can disable them by clicking below."
 msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
 
-#: plugins/admin/applications/class_applicationParameters.inc:50
+#: plugins/admin/applications/class_applicationParameters.inc:53
 msgid "Create options"
 msgstr "Crear opciones"
 
-#: plugins/admin/applications/class_applicationParameters.inc:51
+#: plugins/admin/applications/class_applicationParameters.inc:54
 msgid ""
 "This application has options disabled. You can enable them by clicking below."
 msgstr ""
 "Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
 
-#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/admin/applications/class_applicationParameters.inc:90
 msgid "Variable"
 msgstr "Variable"
 
-#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/admin/applications/class_applicationParameters.inc:90
 #: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr "Valor por defecto"
 
-#: plugins/admin/applications/class_applicationParameters.inc:98
+#: plugins/admin/applications/class_applicationParameters.inc:101
 msgid "Add option"
 msgstr "Añadir opción"
 
-#: plugins/admin/applications/class_applicationParameters.inc:149
+#: plugins/admin/applications/class_applicationParameters.inc:152
 #, php-format
 msgid "Value '%s' specified as option name is not valid."
 msgstr "El valor '%s' especificado como nombre de opción no es valido."
 
-#: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
+#: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
 "to do this since there is no way for GOsa to get your data back."
@@ -4691,59 +5120,65 @@ msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/applications/class_applicationManagement.inc:247
+#: plugins/admin/applications/class_applicationManagement.inc:250
 #, php-format
 msgid "You're about to delete the application '%s'."
 msgstr "Va ha eliminar la aplicación '%s'."
 
-#: plugins/admin/applications/class_applicationManagement.inc:253
-#: plugins/admin/applications/class_applicationManagement.inc:279
+#: plugins/admin/applications/class_applicationManagement.inc:256
+#: plugins/admin/applications/class_applicationManagement.inc:282
 msgid "You are not allowed to delete this application!"
 msgstr "¡No tiene permisos para eliminar esta aplicación!"
 
-#: plugins/admin/applications/class_applicationManagement.inc:327
-#: plugins/admin/ogroups/class_ogroupManagement.inc:362
+#: plugins/admin/applications/class_applicationManagement.inc:330
+#: plugins/admin/ogroups/class_ogroupManagement.inc:365
 #, fuzzy
 msgid "new"
 msgstr "Nuevo"
 
-#: plugins/admin/applications/class_applicationManagement.inc:327
+#: plugins/admin/applications/class_applicationManagement.inc:330
 #, fuzzy
 msgid "Create new application"
 msgstr "Crear aplicaciones"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:63
+#: plugins/admin/applications/class_applicationGeneric.inc:82
+#, fuzzy
+msgid "no example"
+msgstr "incompleto"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:100
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:160
+#: plugins/admin/applications/class_applicationGeneric.inc:216
 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
+#: plugins/admin/applications/class_applicationGeneric.inc:297
 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
+#: plugins/admin/applications/class_applicationGeneric.inc:302
 msgid "Required field 'Name' is not filled."
 msgstr "El campo requerido 'Nombre' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:250
+#: plugins/admin/applications/class_applicationGeneric.inc:306
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:254
+#: plugins/admin/applications/class_applicationGeneric.inc:310
 msgid "Required field 'Execute' is not filled."
 msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:263
+#: plugins/admin/applications/class_applicationGeneric.inc:319
 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/tabsPartition.inc:33 plugins/admin/FAI/tabsHook.inc:30
-#: plugins/admin/FAI/tabsScript.inc:30 plugins/admin/FAI/tabsTemplate.inc:30
-#: plugins/admin/FAI/tabsVariable.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 ""
 
@@ -4756,7 +5191,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"
 
@@ -4793,23 +5228,25 @@ 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/remove.tpl:7
-#: plugins/gofon/conference/remove.tpl:7
+#: plugins/admin/departments/remove.tpl:6
+#: plugins/gofon/conference/remove.tpl:6
+#, fuzzy
 msgid ""
-"This includes <b>all</b> accounts, systems, etc. in this subtree. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
+"This includes 'all' accounts, systems, etc. in this subtree. Please double "
+"check if your really want to do this since there is no way for GOsa to get "
+"your data back."
 msgstr ""
 "Esto incluye <b>todas</b> las cuentas, sistemas, etc. en este subárbol. Por "
 "favor pulse dos veces si quiere realmente hacer esto, ya que no hay forma de "
 "que GOsa recupere la información posteriormente."
 
-#: 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/departments/remove.tpl:10 plugins/admin/systems/remove.tpl:10
+#: plugins/admin/fai/remove.tpl:11 plugins/gofon/conference/remove.tpl:10
+#, fuzzy
 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 "
-"<i>Delete</i> to continue or <i>Cancel</i> to abort."
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
 "actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
@@ -4843,104 +5280,108 @@ msgstr "Mantenimiento de Departamentos"
 
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:43
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#: plugins/admin/ogroups/class_ogroupManagement.inc:392
 msgid "Departments"
 msgstr "Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:185
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:175
+#: plugins/admin/departments/class_departmentManagement.inc:188
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:178
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr "Esta a punto de borrar todo el subárbol LDAP colocado bajo '%s'."
 
-#: plugins/admin/departments/class_departmentManagement.inc:202
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:192
+#: plugins/admin/departments/class_departmentManagement.inc:205
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:195
 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/departments/class_departmentManagement.inc:282
+#: plugins/admin/fai/class_faiManagement.inc:426
 #, fuzzy
 msgid "Go to users home department"
 msgstr "Mostrar usuarios del departamento"
 
-#: plugins/admin/departments/class_departmentManagement.inc:281
+#: plugins/admin/departments/class_departmentManagement.inc:284
 #, fuzzy
 msgid "Create new department"
 msgstr "Nombre del departamento"
 
-#: plugins/admin/departments/class_departmentManagement.inc:289
+#: plugins/admin/departments/class_departmentManagement.inc:292
 msgid "This table displays all departments, in the selected tree."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:297
+#: plugins/admin/departments/class_departmentManagement.inc:301
 #, fuzzy
 msgid "Department name"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:316
+#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/fai/class_faiManagement.inc:495
 #, fuzzy
 msgid "department"
 msgstr "departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:393
+#: plugins/admin/departments/class_departmentManagement.inc:395
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:140
+#: plugins/admin/departments/class_departmentGeneric.inc:143
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr "No tiene permisos para crear un departamento en esta 'Base'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:147
-#: plugins/admin/departments/class_departmentGeneric.inc:149
+#: plugins/admin/departments/class_departmentGeneric.inc:150
+#: plugins/admin/departments/class_departmentGeneric.inc:152
 msgid "Department with that 'Name' already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:157
+#: plugins/admin/departments/class_departmentGeneric.inc:160
 msgid "Required field 'Description' is not set."
 msgstr "El campo requerido 'Descripción' no ha sido rellenado."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:162
+#: plugins/admin/departments/class_departmentGeneric.inc:165
 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
+#: plugins/admin/departments/class_departmentGeneric.inc:166
 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
+#: plugins/admin/systems/class_terminalInfo.inc:181
 msgid "present"
 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_terminalGeneric.inc:127
+#: plugins/admin/systems/class_terminalInfo.inc:65
+#: plugins/admin/systems/class_terminalService.inc:139
+#: plugins/admin/systems/class_terminalStartup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:130
+#: plugins/admin/systems/class_workstationService.inc:124
+#: plugins/admin/systems/class_workstationStartup.inc:215
 msgid "This 'dn' has no terminal features."
 msgstr "Esta 'dn' no tiene características de terminal."
 
-#: plugins/admin/systems/class_terminalInfo.inc:69
+#: plugins/admin/systems/class_terminalInfo.inc:72
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 "Este es un terminal virtual que no tiene propiedades que puedan ser mostradas"
 
-#: plugins/admin/systems/class_terminalInfo.inc:89
+#: plugins/admin/systems/class_terminalInfo.inc:92
 msgid "online"
 msgstr "en linea"
 
-#: plugins/admin/systems/class_terminalInfo.inc:141
+#: plugins/admin/systems/class_terminalInfo.inc:144
 msgid "running"
 msgstr "Activo"
 
-#: plugins/admin/systems/class_terminalInfo.inc:144
+#: plugins/admin/systems/class_terminalInfo.inc:147
 msgid "not running"
 msgstr "no esta activo"
 
-#: plugins/admin/systems/class_terminalInfo.inc:152
+#: plugins/admin/systems/class_terminalInfo.inc:155
 msgid "unknown status"
 msgstr "estado desconocido"
 
-#: plugins/admin/systems/class_terminalInfo.inc:170
+#: plugins/admin/systems/class_terminalInfo.inc:173
 msgid "offline"
 msgstr "fuera de linea"
 
@@ -4956,33 +5397,33 @@ msgstr "Dirección IP"
 msgid "MAC-address"
 msgstr "Dirección MAC"
 
-#: plugins/admin/systems/class_servService.inc:240
+#: plugins/admin/systems/class_servService.inc:264
 msgid "Terminal server, must have fontpath specified."
 msgstr ""
 
-#: plugins/admin/systems/class_winGeneric.inc:70
-#: plugins/admin/systems/class_componentGeneric.inc:48
+#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_componentGeneric.inc:51
 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
+#: plugins/admin/systems/class_winGeneric.inc:142
+#: plugins/admin/systems/class_componentGeneric.inc:113
 #, fuzzy
 msgid "The required field 'Component name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/class_winGeneric.inc:153
-#: plugins/admin/systems/class_componentGeneric.inc:123
+#: plugins/admin/systems/class_winGeneric.inc:156
+#: plugins/admin/systems/class_componentGeneric.inc:126
 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:399
-#: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:299
+#: plugins/admin/systems/class_winGeneric.inc:166
+#: plugins/admin/systems/class_terminalGeneric.inc:260
+#: plugins/admin/systems/class_servGeneric.inc:183
+#: plugins/admin/systems/class_workstationGeneric.inc:214
+#: plugins/admin/systems/class_printGeneric.inc:445
+#: plugins/admin/systems/class_componentGeneric.inc:136
+#: plugins/admin/systems/class_phoneGeneric.inc:302
 #, 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"
@@ -5039,7 +5480,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"
 
@@ -5119,63 +5562,84 @@ msgstr "Servicio de Logs"
 msgid "Print Service"
 msgstr "Servicio de impresión"
 
+#: plugins/admin/systems/servservice.tpl:109
+#, fuzzy
+msgid "Mail server"
+msgstr "Servidor"
+
 #: 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_terminalService.inc:187
+#: plugins/admin/systems/class_workstationService.inc:171
 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_terminalService.inc:251
+#: plugins/admin/systems/class_terminalService.inc:256
+#: plugins/admin/systems/class_workstationService.inc:236
+#: plugins/admin/systems/class_workstationService.inc:241
 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_terminalService.inc:266
+#: plugins/admin/systems/class_terminalService.inc:271
+#: plugins/admin/systems/class_workstationService.inc:251
+#: plugins/admin/systems/class_workstationService.inc:256
 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:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
+#: plugins/admin/systems/class_servDB.inc:134
+#: plugins/admin/systems/class_servDB.inc:150
+#: plugins/admin/systems/class_servDB.inc:160
+#: plugins/admin/systems/class_servDB.inc:165
+#: plugins/admin/systems/class_servDB.inc:171
 #, 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
+#: plugins/admin/systems/class_servDB.inc:140
 #, 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
+#: plugins/admin/systems/class_servDB.inc:144
 msgid "The sieve port needs to be numeric."
 msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/systems/class_servDB.inc:172
+#: plugins/admin/systems/class_servDB.inc:155
+#, fuzzy, php-format
+msgid "The specified kerberos password is empty."
+msgstr "El archivo especificado está vacío."
+
+#: plugins/admin/systems/class_servDB.inc:179
 #, 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'."
@@ -5185,15 +5649,15 @@ 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:31
-#: plugins/admin/systems/workstation.tpl:20
+#: 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:99
+#: plugins/admin/systems/workstation.tpl:78
 #: plugins/admin/ogroups/termgroup.tpl:3
 msgid "Action"
 msgstr "Acción"
@@ -5215,157 +5679,146 @@ msgid "Terminal name"
 msgstr "Nombre de terminal"
 
 #: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/workstation.tpl:45
 #: plugins/admin/systems/phonesettings.tpl:25
 msgid "Mode"
 msgstr "Modo"
 
 #: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
+#: plugins/admin/systems/workstation.tpl:47
 msgid "Select terminal mode"
 msgstr "Seleccionar modo de terminal"
 
 #: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
 msgid "Root server"
 msgstr "Servidor Raíz"
 
 #: 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
+#: plugins/admin/systems/workstation.tpl:54
 msgid "Syslog server"
 msgstr "Servidor de Logs"
 
 #: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
+#: plugins/admin/systems/workstation.tpl:56
 msgid "Choose server to use for logging"
 msgstr "Elija un servidor que será usado para registro"
 
 #: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
+#: plugins/admin/systems/workstation.tpl:62
 msgid "NTP server"
 msgstr "Servidor NTP"
 
 #: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.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: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
+#: plugins/admin/systems/class_terminalGeneric.inc:92
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/ogroups/class_termgroup.inc:62
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:93
-#: plugins/admin/systems/class_terminalGeneric.inc:105
-#: plugins/admin/systems/class_terminalGeneric.inc:117
-#: 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/ogroups/class_termgroup.inc:63
-#: plugins/admin/ogroups/class_termgroup.inc:75
-#: plugins/admin/ogroups/class_termgroup.inc:87
+#: plugins/admin/systems/class_terminalGeneric.inc:96
+#: plugins/admin/systems/class_terminalGeneric.inc:108
+#: plugins/admin/systems/class_terminalGeneric.inc:120
+#: plugins/admin/systems/class_servGeneric.inc:66
+#: plugins/admin/systems/class_servGeneric.inc:78
+#: plugins/admin/systems/class_servGeneric.inc:90
+#: plugins/admin/systems/class_workstationGeneric.inc:101
+#: plugins/admin/ogroups/class_termgroup.inc:66
+#: plugins/admin/ogroups/class_termgroup.inc:78
+#: plugins/admin/ogroups/class_termgroup.inc:90
 #, php-format
 msgid "Execution of '%s' failed!"
 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
+#: plugins/admin/systems/class_terminalGeneric.inc:104
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/ogroups/class_termgroup.inc:74
 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
+#: plugins/admin/systems/class_terminalGeneric.inc:116
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/ogroups/class_termgroup.inc:86
 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/ogroups/class_termgroup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:147
+#: plugins/admin/systems/class_servGeneric.inc:115
+#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: plugins/admin/ogroups/class_termgroup.inc:102
 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/ogroups/class_termgroup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:147
+#: plugins/admin/systems/class_servGeneric.inc:115
+#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: plugins/admin/ogroups/class_termgroup.inc:102
 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/ogroups/class_termgroup.inc:99
+#: plugins/admin/systems/class_terminalGeneric.inc:149
+#: plugins/admin/systems/class_servGeneric.inc:117
+#: plugins/admin/systems/class_workstationGeneric.inc:131
+#: plugins/admin/ogroups/class_termgroup.inc:102
 msgid "Wake up"
 msgstr "Despertar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:237
+#: plugins/admin/systems/class_terminalGeneric.inc:243
 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:247
 msgid "The required field 'Terminal name' is not set."
 msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
 
-#: plugins/admin/systems/class_servGeneric.inc:49
+#: plugins/admin/systems/class_servGeneric.inc:52
 msgid "This 'dn' has no server features."
 msgstr "Esta 'dn' no tiene características de servidor."
 
-#: plugins/admin/systems/class_servGeneric.inc:163
+#: plugins/admin/systems/class_servGeneric.inc:166
 #, fuzzy
 msgid "The required field 'Server name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/class_servGeneric.inc:170
+#: plugins/admin/systems/class_servGeneric.inc:173
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "No tiene permisos para crear un servidor en esta 'Base'."
 
-#: plugins/admin/systems/class_servDHCP.inc:33
+#: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Remove DHCP service"
 msgstr "Eliminar servicio DHCP"
 
-#: plugins/admin/systems/class_servDHCP.inc:34
+#: plugins/admin/systems/class_servDHCP.inc:37
 msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
 "below."
@@ -5373,11 +5826,11 @@ msgstr ""
 "Este servidor tiene la extensión DHCP activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servDHCP.inc:36
+#: plugins/admin/systems/class_servDHCP.inc:39
 msgid "Add DHCP service"
 msgstr "Añadir servicio DHCP"
 
-#: plugins/admin/systems/class_servDHCP.inc:37
+#: plugins/admin/systems/class_servDHCP.inc:40
 msgid ""
 "This server has DHCP features disabled. You can enable them by clicking "
 "below."
@@ -5390,49 +5843,103 @@ msgstr ""
 msgid "General"
 msgstr "Genérico"
 
-#: plugins/admin/systems/printer.tpl:14
+#: plugins/admin/systems/printer.tpl:9
 msgid "Printer name"
 msgstr "Nombre de la impresora"
 
-#: plugins/admin/systems/printer.tpl:46
+#: plugins/admin/systems/printer.tpl:30
 msgid "Details"
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:53
+#: 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:61
-msgid "PPD"
-msgstr ""
+#: 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:71
+#: plugins/admin/systems/printer.tpl:57
 #, fuzzy
 msgid "Permissions"
 msgstr "Miembro con Permisos"
 
-#: plugins/admin/systems/printer.tpl:79
-msgid "Following objects are assigned as user."
-msgstr ""
+#: 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:96
-msgid "Following objects are assigned as admin."
-msgstr ""
+#: 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:97
+#: plugins/admin/systems/printer.tpl:81
 #, fuzzy
 msgid "Admins"
 msgstr "DN del administrador"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:136
+#: 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:97
+#, 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:109
 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:127
+#, fuzzy
+msgid "Instant update"
+msgstr "Crear cuenta telefónica"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:128
+#: plugins/admin/systems/class_workstationGeneric.inc:132
+#, fuzzy
+msgid "Scheduled update"
+msgstr "Plantilla seleccionada"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:129
+#, fuzzy
+msgid "Rescan hardware"
+msgstr "Componente telefónico"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:197
 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:201
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 " El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
@@ -5441,184 +5948,193 @@ msgstr ""
 msgid "Systems"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:322
+#: plugins/admin/systems/class_systemManagement.inc:334
 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:350
 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:363
 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:151
+#: plugins/admin/systems/class_systemManagement.inc:407
 #, 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:157
-#: plugins/admin/FAI/class_faiManagement.inc:190
+#: plugins/admin/systems/class_systemManagement.inc:413
+#: plugins/admin/systems/class_systemManagement.inc:477
+#: plugins/admin/fai/class_faiManagement.inc:210
+#: plugins/admin/fai/class_faiManagement.inc:249
 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:569
+#, fuzzy
+msgid "New Terminal template"
+msgstr "Plantilla de terminal"
+
+#: plugins/admin/systems/class_systemManagement.inc:569
+#: plugins/admin/systems/class_systemManagement.inc:711
 #, 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:570
+#, fuzzy
+msgid "New Workstation template"
+msgstr "Plantilla de estación de trabajo"
+
+#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:712
 #, fuzzy
 msgid "New Workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:559
+#: plugins/admin/systems/class_systemManagement.inc:571
 #, fuzzy
 msgid "New Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:560
+#: plugins/admin/systems/class_systemManagement.inc:572
 #, fuzzy
 msgid "New Printer"
 msgstr "Impresora"
 
-#: plugins/admin/systems/class_systemManagement.inc:561
+#: plugins/admin/systems/class_systemManagement.inc:573
 #, fuzzy
 msgid "New Phone"
 msgstr "Teléfono"
 
-#: plugins/admin/systems/class_systemManagement.inc:562
+#: plugins/admin/systems/class_systemManagement.inc:574
 #, fuzzy
 msgid "New Component"
 msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/class_systemManagement.inc:570
+#: plugins/admin/systems/class_systemManagement.inc:582
 #, fuzzy
 msgid "Edit system"
 msgstr "Lista de sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:571
+#: plugins/admin/systems/class_systemManagement.inc:583
 #, fuzzy
 msgid "Delete system"
 msgstr "Borrar"
 
-#: plugins/admin/systems/class_systemManagement.inc:577
+#: plugins/admin/systems/class_systemManagement.inc:589
 #, fuzzy
 msgid "System"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:581
-#: plugins/admin/FAI/class_faiManagement.inc:324
+#: plugins/admin/systems/class_systemManagement.inc:593
+#: plugins/admin/fai/class_faiManagement.inc:465
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:614
+#: plugins/admin/systems/class_systemManagement.inc:626
 #, fuzzy
 msgid "Cups Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:615
+#: plugins/admin/systems/class_systemManagement.inc:627
 msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:616
+#: plugins/admin/systems/class_systemManagement.inc:628
 #, fuzzy
 msgid "Syslog Server"
 msgstr "Servidor de Logs"
 
-#: plugins/admin/systems/class_systemManagement.inc:617
+#: plugins/admin/systems/class_systemManagement.inc:629
 #, fuzzy
 msgid "Mail Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:618
+#: plugins/admin/systems/class_systemManagement.inc:630
 #, fuzzy
 msgid "Imap Server"
 msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/class_systemManagement.inc:619
+#: plugins/admin/systems/class_systemManagement.inc:631
 #, fuzzy
 msgid "Nfs Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:620
+#: plugins/admin/systems/class_systemManagement.inc:632
 #, fuzzy
 msgid "Kerberos Server"
 msgstr "Kerberos"
 
-#: plugins/admin/systems/class_systemManagement.inc:621
+#: plugins/admin/systems/class_systemManagement.inc:633
 #, fuzzy
 msgid "Asterisk Server"
 msgstr "Base de datos de usuarios Asterisk"
 
-#: plugins/admin/systems/class_systemManagement.inc:622
+#: plugins/admin/systems/class_systemManagement.inc:634
 #, fuzzy
 msgid "Fax Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:623
+#: plugins/admin/systems/class_systemManagement.inc:635
 #, fuzzy
 msgid "Ldap Server"
 msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/class_systemManagement.inc:649
+#: plugins/admin/systems/class_systemManagement.inc:661
 #, fuzzy
 msgid "Set root password"
 msgstr "Poner Contraseña"
 
-#: plugins/admin/systems/class_systemManagement.inc:700
-#: plugins/admin/ogroups/class_ogroupManagement.inc:486
+#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/ogroups/class_ogroupManagement.inc:489
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminales"
 
-#: plugins/admin/systems/class_systemManagement.inc:701
-#: plugins/admin/ogroups/class_ogroupManagement.inc:485
+#: plugins/admin/systems/class_systemManagement.inc:708
+#: plugins/admin/ogroups/class_ogroupManagement.inc:488
 #: 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:713
 #, fuzzy
 msgid "Winstation"
 msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:707
+#: plugins/admin/systems/class_systemManagement.inc:714
 #, fuzzy
 msgid "Network Device"
 msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/class_systemManagement.inc:917
+#: plugins/admin/systems/class_systemManagement.inc:931
 msgid "New terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:920
+#: plugins/admin/systems/class_systemManagement.inc:934
 msgid "New workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:937
+#: plugins/admin/systems/class_systemManagement.inc:951
 #, fuzzy
 msgid "Terminal template for"
 msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:948
+#: plugins/admin/systems/class_systemManagement.inc:963
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
-#: plugins/admin/systems/class_printGeneric.inc:167
-#: plugins/admin/systems/class_printGeneric.inc:183
-#: plugins/admin/systems/class_printGeneric.inc:186
+#: plugins/admin/systems/class_printGeneric.inc:189
+#: plugins/admin/systems/class_printGeneric.inc:210
+#: plugins/admin/systems/class_printGeneric.inc:213
 msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:168
+#: plugins/admin/systems/class_printGeneric.inc:190
 #, fuzzy
 msgid ""
 "This workstation has printer extension disabled. You can't enable it while "
@@ -5628,13 +6144,13 @@ msgstr ""
 "Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:175
-#: plugins/admin/systems/class_printGeneric.inc:178
+#: plugins/admin/systems/class_printGeneric.inc:202
+#: plugins/admin/systems/class_printGeneric.inc:205
 #, fuzzy
 msgid "Remove printer extension"
 msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/class_printGeneric.inc:176
+#: plugins/admin/systems/class_printGeneric.inc:203
 #, fuzzy
 msgid ""
 "This workstation has printer extension enabled.You can disable it by "
@@ -5643,7 +6159,7 @@ msgstr ""
 "Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:179
+#: plugins/admin/systems/class_printGeneric.inc:206
 #, fuzzy
 msgid ""
 "This terminal has printer extension enabled. You can disable it by clicking "
@@ -5652,7 +6168,7 @@ msgstr ""
 "Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:184
+#: plugins/admin/systems/class_printGeneric.inc:211
 #, fuzzy
 msgid ""
 "This workstation has printer extension disabled. You can enable it by "
@@ -5661,7 +6177,7 @@ msgstr ""
 "Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:187
+#: plugins/admin/systems/class_printGeneric.inc:214
 #, fuzzy
 msgid ""
 "This terminal has printer extension disabled. You can enable it by clicking "
@@ -5670,70 +6186,54 @@ msgstr ""
 "Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:197
+#: plugins/admin/systems/class_printGeneric.inc:225
 msgid "This 'dn' has no printer features."
 msgstr "Esta 'dn' no tiene características de impresora."
 
-#: plugins/admin/systems/class_printGeneric.inc:315
-#, fuzzy
-msgid "Undefined"
-msgstr "sin definirse"
+#: plugins/admin/systems/class_printGeneric.inc:355
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
+msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:326
+#: plugins/admin/systems/class_printGeneric.inc:371
 #, php-format
 msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:328
+#: plugins/admin/systems/class_printGeneric.inc:373
 #, php-format
 msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-# 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:332
-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/class_printGeneric.inc:389
+#: plugins/admin/systems/class_printGeneric.inc:435
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr "No tiene permisos para crear una impresora en esta 'Base'."
 
-#: plugins/admin/systems/class_printGeneric.inc:508
-#: plugins/admin/systems/class_printGeneric.inc:510
-#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/admin/systems/class_printGeneric.inc:562
+#: plugins/admin/systems/class_printGeneric.inc:564
+#: plugins/admin/ogroups/class_ogroupManagement.inc:483
+#: 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
+#: plugins/admin/systems/class_servDNS.inc:36
 msgid "Remove DNS service"
 msgstr "Eliminar servicio DNS"
 
-#: plugins/admin/systems/class_servDNS.inc:34
+#: plugins/admin/systems/class_servDNS.inc:37
 msgid ""
 "This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
 "Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servDNS.inc:36
+#: plugins/admin/systems/class_servDNS.inc:39
 msgid "Add DNS service"
 msgstr "Añadir servicio DNS"
 
-#: plugins/admin/systems/class_servDNS.inc:37
+#: plugins/admin/systems/class_servDNS.inc:40
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
@@ -5808,11 +6308,11 @@ msgstr "Base de datos de Logs"
 msgid "Logging DB user"
 msgstr "Base de datos de acceso de usuarios"
 
-#: plugins/admin/systems/class_servKolab.inc:112
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid "Remove Kolab extension"
 msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/class_servKolab.inc:112
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid ""
 "This server has kolab features enabled. You can disable them by clicking "
 "below."
@@ -5820,11 +6320,11 @@ msgstr ""
 "Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servKolab.inc:118
 msgid "Add Kolab service"
 msgstr "Añadir el servicio Kolab"
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servKolab.inc:118
 msgid ""
 "This server has kolab features disabled. You can enable them by clicking "
 "below."
@@ -5832,45 +6332,45 @@ msgstr ""
 "Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servKolab.inc:143
+#: plugins/admin/systems/class_servKolab.inc:146
 #, php-format
 msgid "Include data from %s days in the past when creating free/busy lists"
 msgstr ""
 "Incluye información desde hace '%s' días cuando cree listas de presencia"
 
-#: plugins/admin/systems/class_servKolab.inc:149
+#: plugins/admin/systems/class_servKolab.inc:152
 #, php-format
 msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
 "Avisar a los usuarios de que están usando mas de %s%% de su cuota de correo"
 
-#: plugins/admin/systems/class_servKolab.inc:221
+#: plugins/admin/systems/class_servKolab.inc:224
 msgid "Future days in Free/Busy settings must be set."
 msgstr "Se deben poner días futuros en la configuración de presencia"
 
-#: plugins/admin/systems/class_servKolab.inc:223
+#: plugins/admin/systems/class_servKolab.inc:226
 msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
 "Días futuros en la configuración de presencia debe ser un número positivo."
 
-#: plugins/admin/systems/class_servKolab.inc:227
+#: plugins/admin/systems/class_servKolab.inc:230
 msgid "The given Quota settings value must be a number."
 msgstr "El valor introducido como cuota debe ser un número."
 
-#: plugins/admin/systems/class_servKolab.inc:229
+#: plugins/admin/systems/class_servKolab.inc:232
 msgid "Please choose a value between 1 and 100 for Quota settings."
 msgstr ""
 "Por favor introduzca un valor entre 1 y 100 para el parámetro de cuota."
 
-#: plugins/admin/systems/class_servKolab.inc:231
+#: plugins/admin/systems/class_servKolab.inc:234
 msgid "Future days must be a value."
 msgstr "Días futuros debe ser un valor"
 
-#: plugins/admin/systems/class_servKolab.inc:235
+#: plugins/admin/systems/class_servKolab.inc:238
 msgid "No SMTP privileged networks set."
 msgstr "No se han indicado redes privilegiadas SMTP."
 
-#: plugins/admin/systems/class_servKolab.inc:239
+#: plugins/admin/systems/class_servKolab.inc:242
 msgid "No SMTP smarthost/relayhost set."
 msgstr "No se ha indicado SMTP smarthost/relayhost"
 
@@ -5957,7 +6457,7 @@ msgstr ""
 msgid "Machine name"
 msgstr "Nombre de la maquina"
 
-#: plugins/admin/systems/remove.tpl:7 plugins/admin/FAI/remove.tpl:7
+#: plugins/admin/systems/remove.tpl:6
 msgid ""
 "This includes <b>all</b> system and setup informations. Please double check "
 "if your really want to do this since there is no way for GOsa to get your "
@@ -6053,204 +6553,40 @@ msgstr "Mostrar direcciones del usuario"
 msgid "User name of which terminal(s) are shown"
 msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
 
-#: 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/password.tpl:2
+#, fuzzy
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
+msgstr ""
+"Para cambiar la contraseña del usuario use los campos a continuación. Los "
+"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
+"contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/systems/service.tpl:17
-msgid "Choose keyboard layout"
-msgstr "Elija localización del teclado"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+msgstr ""
 
-#: plugins/admin/systems/service.tpl:23
-msgid "Variant"
-msgstr "Variante"
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+msgstr "Cambiar la contraseña afecta solamente a la autenticación."
 
-#: plugins/admin/systems/service.tpl:25
-msgid "Choose keyboard variant"
-msgstr "Elija variante de teclado"
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:279
+#, fuzzy
+msgid "The required field 'MAC-address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/admin/systems/service.tpl:39
-msgid "Mouse"
-msgstr "Ratón"
+#: plugins/admin/systems/class_componentGeneric.inc:119
+#: plugins/admin/systems/class_phoneGeneric.inc:282
+#, fuzzy
+msgid "The required field 'IP-address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/admin/systems/service.tpl:44
-msgid "Choose mouse type"
-msgstr "Elija tipo de ratón"
-
-#: plugins/admin/systems/service.tpl:50
-msgid "Port"
-msgstr "Puerto"
-
-#: plugins/admin/systems/service.tpl:52
-msgid "Choose mouse port"
-msgstr "Elija el puerto del ratón"
-
-#: plugins/admin/systems/service.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-msgid "Telephone hardware"
-msgstr "Componente telefónico"
-
-#: 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/service.tpl:86
-msgid "Driver"
-msgstr "Controlador"
-
-#: plugins/admin/systems/service.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/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/service.tpl:102
-msgid "Color depth"
-msgstr "Profundidad del Color"
-
-#: 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/service.tpl:117
-msgid "Display device"
-msgstr "Mostrar dispositivo"
-
-#: plugins/admin/systems/service.tpl:124
-msgid "HSync"
-msgstr "HSync"
-
-#: 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/service.tpl:129
-msgid "VSync"
-msgstr "VSync"
-
-#: 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/service.tpl:141
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
-#: plugins/admin/systems/service.tpl:145
-msgid "Connect method"
-msgstr "Método de conexión"
-
-#: 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/service.tpl:154
-msgid "Terminal server"
-msgstr "Servidor de terminal"
-
-#: 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/service.tpl:163
-msgid "Font server"
-msgstr "Servidor de fuentes"
-
-#: 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/service.tpl:181
-msgid "Print device"
-msgstr "Dispositivo de Impresión"
-
-#: 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/service.tpl:183
-msgid "Provide print services"
-msgstr "Proveer servicios de impresión"
-
-#: plugins/admin/systems/service.tpl:189
-msgid "Spool server"
-msgstr "Servidor de Cola"
-
-#: plugins/admin/systems/service.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr ""
-"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
-
-#: plugins/admin/systems/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"
-
-#: 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: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 ""
-"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/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:276
-#, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
-
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:279
-#, fuzzy
-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"
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr "Elija el tipo de componente del sistema que desea crear"
 
 #: plugins/admin/systems/chooser.tpl:4
 msgid ""
@@ -6297,135 +6633,52 @@ msgstr "Otros componentes de red"
 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/class_phoneGeneric.inc:102
+#: plugins/admin/systems/class_phoneGeneric.inc:105
 msgid "This 'dn' has no phone features."
 msgstr "Esta 'dn' no tiene características de teléfono."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:174
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/admin/systems/class_phoneGeneric.inc:177
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:382
 #, fuzzy
 msgid "yes"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:174
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/admin/systems/class_phoneGeneric.inc:177
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:383
 #, fuzzy
 msgid "no"
 msgstr "ninguno"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:195
+#: plugins/admin/systems/class_phoneGeneric.inc:198
 msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:195
+#: plugins/admin/systems/class_phoneGeneric.inc:198
 #, fuzzy
 msgid "Networksettings"
 msgstr "Configuración de red"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:213
+#: plugins/admin/systems/class_phoneGeneric.inc:216
 #, php-format
 msgid ""
 "Can't delete because there are user which are depending on this phone. One "
 "of them is user '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:270
+#: plugins/admin/systems/class_phoneGeneric.inc:273
 #, fuzzy
 msgid "The required field 'Phone name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:273
+#: plugins/admin/systems/class_phoneGeneric.inc:276
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:282
+#: plugins/admin/systems/class_phoneGeneric.inc:285
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:289
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 
@@ -6516,32 +6769,163 @@ msgstr "¡No tiene permisos para eliminar este componente!"
 msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:101
+#: 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:104
 #, fuzzy
 msgid "Please specify a valid path for your setup."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_servNfs.inc:107
+#: plugins/admin/systems/class_servNfs.inc:110
 #, fuzzy
 msgid "Please specify a valid name for your setup."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_servNfs.inc:110
+#: plugins/admin/systems/class_servNfs.inc:113
 #, fuzzy
 msgid "Please specify a name for your setup."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_servNfs.inc:115
+#: plugins/admin/systems/class_servNfs.inc:118
 #, fuzzy
 msgid "Description contains invalid characters."
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/admin/systems/class_servNfs.inc:119
+#: plugins/admin/systems/class_servNfs.inc:122
 #, fuzzy
 msgid "Path contains invalid characters."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/admin/systems/class_servNfs.inc:123
+#: plugins/admin/systems/class_servNfs.inc:126
 #, fuzzy
 msgid "Option contains invalid characters."
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
@@ -6564,37 +6948,33 @@ msgstr ""
 msgid "Option"
 msgstr "Opciones"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:2
-msgid "Printer driver information file setup"
-msgstr ""
-
-#: plugins/admin/systems/printerPPDDialog.tpl:7
+#: plugins/admin/systems/printerPPDDialog.tpl:1
 #, fuzzy
-msgid "Current used information setup : "
-msgstr "Información genérica del usuario"
+msgid "Printer driver"
+msgstr "Dispositivo de Impresión"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:13
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:57
 #, fuzzy
 msgid "Select"
 msgstr "Borrar"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:1
+#: plugins/admin/systems/printerPPDDialog.tpl:9
 #, fuzzy
-msgid "Select entry"
-msgstr "Borrar"
+msgid "New driver"
+msgstr "Servidor"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:10
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
 #, fuzzy
-msgid "Select user/group to add"
-msgstr "Seleccione grupo a añadir"
+msgid "Select entries to add"
+msgstr "Seleccione usuarios que serán añadidos"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:28
+#: 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 "
@@ -6605,59 +6985,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/class_printerPPDSelectionDialog.inc:85
-msgid "Reset list"
+#: plugins/admin/systems/class_printerPPDDialog.inc:53
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:103
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:116
+#, 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:123
+#, fuzzy, php-format
+msgid "Can't save file '%s'."
+msgstr "Borrar"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:139
+#: plugins/admin/systems/class_printerPPDDialog.inc:142
+#, fuzzy
+msgid "Please specify a valid ppd file."
+msgstr "Por favor especifique un nombre de usuario valido."
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:166
+#, fuzzy
+msgid "Please select a valid ppd."
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:273
+#: plugins/admin/fai/faiPackage.tpl:41
+#, fuzzy
+msgid "Section"
+msgstr "Acción"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:323
+#: plugins/admin/systems/class_printerPPDDialog.inc:326
+#, fuzzy
+msgid "True"
+msgstr "Futuro"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:324
+#: plugins/admin/systems/class_printerPPDDialog.inc:327
+#, fuzzy
+msgid "False"
+msgstr "mujer"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:332
+#, 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:251
+#, 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/workstationStartup.tpl:41
+#: plugins/admin/fai/faiPackage.tpl:57 plugins/admin/fai/faiPackageNew.tpl:59
+#, fuzzy
+msgid "set"
+msgstr "Borrar"
+
+#: plugins/admin/systems/workstationStartup.tpl:42
+#, fuzzy
+msgid "Assigned FAI classes"
+msgstr "Elija tipo de ratón"
+
+#: 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/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/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
+
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr "Método de conexión"
+
+#: 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/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Servidor de terminal"
+
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr "Seleccione específicamente que servidor de terminal usará"
+
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr "Servidor de fuentes"
+
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr "Seleccione específicamente que servidor de fuentes usará"
+
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr "Dispositivo de Impresión"
+
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
 msgstr ""
+"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
+"terminal"
+
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
+msgstr "Proveer servicios de impresión"
+
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Servidor de Cola"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:87
-msgid "Upload PPD"
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
 msgstr ""
+"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
+
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Seleccione que controladores de escáner se usaran"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:92
-msgid "List with all available ppd files."
-msgstr ""
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr "Seleccione si el terminal soporta inicio gráfico con barra de progreso"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:99
-msgid "Entries"
-msgstr ""
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "Usar arranque gráfico"
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:117
-#, fuzzy
-msgid "selected"
-msgstr "Borrar"
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Seleccione si el terminal debería arrancar en modo texto"
 
-#: plugins/admin/systems/class_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/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "Usar arranque en modo texto"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#, fuzzy
-msgid "List of PPDs"
-msgstr "Lista de usuarios"
+#: 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/ogroups/tabs_ogroups.inc:19
-msgid "Terminals"
-msgstr "Terminales"
+#: 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:37
+#: plugins/admin/ogroups/tabs_ogroups.inc:59
+#: plugins/admin/ogroups/tabs_ogroups.inc:151
 #, 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:131
+msgid "Terminals"
+msgstr "Terminales"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
@@ -6711,20 +7296,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/headpage.tpl:47
-msgid "Display objects matching"
-msgstr "Mostrar objetos que concuerden con"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:42
-#: 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 "
@@ -6739,63 +7310,59 @@ 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_ogroup.inc:95
+#: plugins/admin/ogroups/class_ogroup.inc:127
 msgid "This 'dn' is no object group."
 msgstr "Este 'dn' no es un objeto tipo grupo."
 
-#: plugins/admin/ogroups/class_ogroup.inc:203
+#: plugins/admin/ogroups/class_ogroup.inc:237
 msgid "too many different objects!"
 msgstr "¡Demasiados objetos diferentes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:205
+#: plugins/admin/ogroups/class_ogroup.inc:239
 msgid "users"
 msgstr "usuarios"
 
-#: plugins/admin/ogroups/class_ogroup.inc:206
+#: plugins/admin/ogroups/class_ogroup.inc:240
 msgid "groups"
 msgstr "grupos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:207
+#: plugins/admin/ogroups/class_ogroup.inc:241
 msgid "applications"
 msgstr "Aplicaciones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:208
+#: plugins/admin/ogroups/class_ogroup.inc:242
 msgid "departments"
 msgstr "departamentos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:209
+#: plugins/admin/ogroups/class_ogroup.inc:243
 msgid "servers"
 msgstr "servidores"
 
-#: plugins/admin/ogroups/class_ogroup.inc:210
+#: plugins/admin/ogroups/class_ogroup.inc:244
 msgid "workstations"
 msgstr "estaciones de trabajo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:211
+#: plugins/admin/ogroups/class_ogroup.inc:245
 msgid "terminals"
 msgstr "terminales"
 
-#: plugins/admin/ogroups/class_ogroup.inc:212
+#: plugins/admin/ogroups/class_ogroup.inc:246
 msgid "phones"
 msgstr "teléfonos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:213
+#: plugins/admin/ogroups/class_ogroup.inc:247
 msgid "printers"
 msgstr "servidores de Impresión"
 
-#: plugins/admin/ogroups/class_ogroup.inc:220
+#: plugins/admin/ogroups/class_ogroup.inc:254
 msgid "and"
 msgstr "y"
 
-#: plugins/admin/ogroups/class_ogroup.inc:371
+#: plugins/admin/ogroups/class_ogroup.inc:405
 msgid "Non existing dn: "
 msgstr "No existe 'dn':"
 
-#: 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_ogroup.inc:507
+#: plugins/admin/ogroups/class_ogroup.inc:536
 msgid "You can combine two different object types at maximum only!"
 msgstr "¡Solo se pueden combinar dos objetos diferentes hasta un máximo!"
 
@@ -6808,7 +7375,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:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
 msgid "Servers"
 msgstr "Servidores"
 
@@ -6820,27 +7389,27 @@ msgstr "Clientes Ligeros"
 msgid "Workstations"
 msgstr "Estaciones de trabajo"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:215
+#: plugins/admin/ogroups/class_ogroupManagement.inc:218
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr "Has decidido eliminar el objeto grupo '%s'."
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:221
-#: plugins/admin/ogroups/class_ogroupManagement.inc:247
+#: plugins/admin/ogroups/class_ogroupManagement.inc:224
+#: plugins/admin/ogroups/class_ogroupManagement.inc:250
 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:365
 #, fuzzy
 msgid "Create new object group"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:389
+#: plugins/admin/ogroups/class_ogroupManagement.inc:392
 #, fuzzy
 msgid "Name of object groups"
 msgstr "Nombre del grupo"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:438
+#: plugins/admin/ogroups/class_ogroupManagement.inc:441
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr "Grupo de objetos"
@@ -6917,7 +7486,7 @@ msgstr ""
 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
+#: plugins/admin/ogroups/class_mailogroup.inc:41
 #, fuzzy
 msgid ""
 "This group has mail features enabled. You can disable them by clicking below."
@@ -6925,7 +7494,7 @@ 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/ogroups/class_mailogroup.inc:43
 #, fuzzy
 msgid ""
 "This group has mail features disabled. You can enable them by clicking below."
@@ -6959,12 +7528,12 @@ msgstr "y"
 msgid "round robin with memory"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:110
+#: plugins/admin/ogroups/class_phonequeue.inc:113
 #, fuzzy
 msgid "Remove the phone queue from this Account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:111
+#: plugins/admin/ogroups/class_phonequeue.inc:114
 #, fuzzy
 msgid ""
 "Phone queue is enabled for this group. You can disable it by clicking below."
@@ -6972,12 +7541,12 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
+#: plugins/admin/ogroups/class_phonequeue.inc:116
 #, fuzzy
 msgid "Create phone queue"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/ogroups/class_phonequeue.inc:113
+#: plugins/admin/ogroups/class_phonequeue.inc:117
 #, fuzzy
 msgid ""
 "For this group the phone queues are disabled. You can enable them by "
@@ -6986,74 +7555,81 @@ 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
+#: plugins/admin/ogroups/class_phonequeue.inc:202
 #, fuzzy
 msgid "Timeout must be numeric"
 msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:201
+#: plugins/admin/ogroups/class_phonequeue.inc:205
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:204
+#: plugins/admin/ogroups/class_phonequeue.inc:208
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:207
+#: plugins/admin/ogroups/class_phonequeue.inc:211
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:210
+#: plugins/admin/ogroups/class_phonequeue.inc:214
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:233
-#: plugins/admin/ogroups/class_phonequeue.inc:596
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:76
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:273
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:947
-#: plugins/gofon/macro/class_gofonMacro.inc:181
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:226
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:335
+#: plugins/admin/ogroups/class_phonequeue.inc:228
+msgid ""
+"There is currently no asterisk server defined. Your settings can't be saved."
+msgstr ""
+
+#: plugins/admin/ogroups/class_phonequeue.inc:241
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:237
 #, php-format
 msgid ""
-"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:243
-#: plugins/admin/ogroups/class_phonequeue.inc:606
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:83
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:284
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:958
-#: plugins/gofon/macro/class_gofonMacro.inc:192
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:237
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#: plugins/admin/ogroups/class_phonequeue.inc:251
+#: plugins/admin/ogroups/class_phonequeue.inc:625
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:84
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1033
+#: plugins/gofon/macro/class_gofonMacro.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:248
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:357
 #, 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:274
-#: plugins/admin/ogroups/class_phonequeue.inc:478
-#: plugins/admin/ogroups/class_phonequeue.inc:642
+#: plugins/admin/ogroups/class_phonequeue.inc:282
+#: plugins/admin/ogroups/class_phonequeue.inc:496
+#: plugins/admin/ogroups/class_phonequeue.inc:661
 #, 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:507
-#: plugins/admin/ogroups/class_phonequeue.inc:509
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1058
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1060
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:385
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:387
+#: plugins/admin/ogroups/class_phonequeue.inc:526
+#: plugins/admin/ogroups/class_phonequeue.inc:528
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1134
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1136
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:397
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:399
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
+#: plugins/admin/ogroups/class_phonequeue.inc:615
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:77
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:283
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1022
+#: plugins/gofon/macro/class_gofonMacro.inc:191
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#, php-format
+msgid ""
+"The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
+"error."
+msgstr ""
+
 #: plugins/admin/ogroups/phonequeue.tpl:1
 #, fuzzy
 msgid "Queue Settings"
@@ -7104,528 +7680,957 @@ msgstr ""
 msgid "(in seconds)"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:94
-msgid "Queue sound setup"
+#: plugins/admin/ogroups/phonequeue.tpl:94
+msgid "Queue sound setup"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:99
+msgid "Use music on hold instead of ringing"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:108
+msgid "Music on hold"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:116
+#, fuzzy
+msgid "Welcome sound file"
+msgstr "¡Bienvenido %s!"
+
+#: plugins/admin/ogroups/phonequeue.tpl:124
+#, fuzzy
+msgid "Announce message"
+msgstr "Mensaje de ausencia"
+
+#: plugins/admin/ogroups/phonequeue.tpl:132
+msgid "Sound file for 'You are next ...'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:140
+msgid "'There are ...'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:148
+msgid "'... calls waiting'"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:156
+#, fuzzy
+msgid "'Thank you' message"
+msgstr "Estado del mensaje"
+
+#: plugins/admin/ogroups/phonequeue.tpl:164
+msgid "'minutes' sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:172
+msgid "'seconds' sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:180
+msgid "Hold sound file"
+msgstr ""
+
+#: plugins/admin/ogroups/phonequeue.tpl:188
+#, fuzzy
+msgid "Less Than sound file"
+msgstr "¡Bienvenido %s!"
+
+#: plugins/admin/ogroups/phonequeue.tpl:204
+#, fuzzy
+msgid "Phone attributes "
+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/fai/remove.tpl:7
+#, fuzzy
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
+"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
+"esto, no hay forma de que GOsa recupere la información."
+
+#: 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:32
+#, fuzzy
+msgid "FAI"
+msgstr "FAX ID"
+
+#: plugins/admin/fai/class_faiManagement.inc:33
+#, fuzzy
+msgid "Fully Automatic Installation - management"
+msgstr "Mantenimiento de aplicaciones"
+
+#: plugins/admin/fai/class_faiManagement.inc:204
+#, 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:431
+#, fuzzy
+msgid "New profile"
+msgstr "Gestión de Asterisk PBX"
+
+#: plugins/admin/fai/class_faiManagement.inc:431
+msgid "P"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:436
+#, fuzzy
+msgid "New partition table"
+msgstr "Impresora"
+
+#: plugins/admin/fai/class_faiManagement.inc:436
+msgid "PT"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:439
+#, fuzzy
+msgid "New scripts"
+msgstr "Mostrar equipos"
+
+#: plugins/admin/fai/class_faiManagement.inc:439
+msgid "S"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:442
+#, fuzzy
+msgid "New hooks"
+msgstr "Mostrar equipos"
+
+#: plugins/admin/fai/class_faiManagement.inc:442
+msgid "H"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:445
+#, fuzzy
+msgid "New variables"
+msgstr "Mostrar terminales"
+
+#: plugins/admin/fai/class_faiManagement.inc:445
+msgid "V"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:448
+#, fuzzy
+msgid "New templates"
+msgstr "Nueva plantilla"
+
+#: plugins/admin/fai/class_faiManagement.inc:448
+msgid "T"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:451
+#, fuzzy
+msgid "New package list"
+msgstr "# páginas"
+
+#: plugins/admin/fai/class_faiManagement.inc:451
+msgid "PK"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:469
+#, fuzzy
+msgid "Name of FAI class"
+msgstr "Nombre de la lista de bloqueos"
+
+#: plugins/admin/fai/class_faiManagement.inc:470
+msgid "Class type"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:474
+#, fuzzy
+msgid "Edit class"
+msgstr "clase"
+
+#: plugins/admin/fai/class_faiManagement.inc:475
+#, fuzzy
+msgid "Delete class"
+msgstr "Borrar"
+
+#: plugins/admin/fai/class_faiManagement.inc:517
+#: plugins/admin/fai/class_faiManagement.inc:518
+#: plugins/admin/fai/class_faiProfile.inc:161
+#: plugins/admin/fai/class_faiProfileEntry.inc:123
+#, fuzzy
+msgid "Partition table"
+msgstr "Variable"
+
+#: plugins/admin/fai/class_faiManagement.inc:524
+#: plugins/admin/fai/class_faiManagement.inc:525
+msgid "Package list"
+msgstr ""
+
+#: plugins/admin/fai/class_faiManagement.inc:531
+#: plugins/admin/fai/class_faiManagement.inc:532
+#, fuzzy
+msgid "Scripts"
+msgstr "Ruta del Script"
+
+#: plugins/admin/fai/class_faiManagement.inc:552
+#: plugins/admin/fai/class_faiManagement.inc:553
+#, fuzzy
+msgid "Profile"
+msgstr "Ruta del Perfil"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
+#, fuzzy
+msgid "Device"
+msgstr "Servicios"
+
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
+#, fuzzy
+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
+#, fuzzy
+msgid "Objects"
+msgstr "Objeto"
+
+#: plugins/admin/fai/faiPartitionTable.tpl:34
+#, fuzzy
+msgid "Discs"
+msgstr "Servicios"
+
+#: plugins/admin/fai/faiPartitionTable.tpl:40
+msgid "Choose a disk to delete or edit"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:6
+msgid "List of FAI objects (Fully Automatic Installation)"
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:27
+msgid ""
+"This menu allows you to select FAI class names and to add them to the "
+"currently edited profile."
+msgstr ""
+
+#: plugins/admin/fai/faiProfileEntry.tpl:40
+#, fuzzy
+msgid "Show only classes with templates"
+msgstr "Mostrar plantillas"
+
+#: plugins/admin/fai/faiProfileEntry.tpl:42
+msgid "Show only classes with scripts"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:99
-msgid "Use music on hold instead of ringing"
+#: plugins/admin/fai/faiProfileEntry.tpl:44
+msgid "Show only classes with hooks"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:108
-msgid "Music on hold"
+#: plugins/admin/fai/faiProfileEntry.tpl:46
+#, fuzzy
+msgid "Show only classes with variables"
+msgstr "Mostrar terminales"
+
+#: plugins/admin/fai/faiProfileEntry.tpl:48
+msgid "Show only classes with packages"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:116
+#: plugins/admin/fai/faiProfileEntry.tpl:50
 #, fuzzy
-msgid "Welcome sound file"
-msgstr "¡Bienvenido %s!"
+msgid "Show only classes with partitions"
+msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/ogroups/phonequeue.tpl:124
+#: plugins/admin/fai/faiVariable.tpl:34
 #, fuzzy
-msgid "Announce message"
-msgstr "Mensaje de ausencia"
+msgid "List of assigned variables"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/ogroups/phonequeue.tpl:132
-msgid "Sound file for 'You are next ...'"
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:140
-msgid "'There are ...'"
-msgstr ""
+#: plugins/admin/fai/class_faiScriptEntry.inc:51
+#: plugins/admin/fai/class_faiHookEntry.inc:54
+#, fuzzy
+msgid "Please select a valid file."
+msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/ogroups/phonequeue.tpl:148
-msgid "'... calls waiting'"
-msgstr ""
+#: plugins/admin/fai/class_faiScriptEntry.inc:54
+#: plugins/admin/fai/class_faiHookEntry.inc:57
+#, fuzzy
+msgid "Selected file is empty."
+msgstr "El archivo especificado está vacío."
 
-#: plugins/admin/ogroups/phonequeue.tpl:156
+#: plugins/admin/fai/class_faiScriptEntry.inc:99
+#: plugins/admin/fai/class_faiVariableEntry.inc:86
+#: plugins/admin/fai/class_faiHookEntry.inc:104
+#: plugins/admin/fai/class_faiTemplateEntry.inc:164
 #, fuzzy
-msgid "'Thank you' message"
-msgstr "Estado del mensaje"
+msgid "Please enter a name."
+msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/admin/ogroups/phonequeue.tpl:164
-msgid "'minutes' sound file"
-msgstr ""
+#: plugins/admin/fai/class_faiScriptEntry.inc:103
+#, fuzzy
+msgid "Please enter a script."
+msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/ogroups/phonequeue.tpl:172
-msgid "'seconds' sound file"
-msgstr ""
+#: plugins/admin/fai/faiScriptEntry.tpl:29
+#: plugins/admin/fai/faiScriptEntry.tpl:48
+#, fuzzy
+msgid "Script attributes"
+msgstr "Atributo 'dn' de los usuarios"
 
-#: plugins/admin/ogroups/phonequeue.tpl:180
-msgid "Hold sound file"
-msgstr ""
+#: plugins/admin/fai/faiScriptEntry.tpl:38 plugins/admin/fai/faiProfile.tpl:33
+#, fuzzy
+msgid "Choose a priority"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/ogroups/phonequeue.tpl:188
+#: plugins/admin/fai/faiScriptEntry.tpl:63
+#: plugins/admin/fai/faiHookEntry.tpl:63
 #, fuzzy
-msgid "Less Than sound file"
-msgstr "¡Bienvenido %s!"
+msgid "Import script"
+msgstr "Mostrar equipos"
 
-#: plugins/admin/ogroups/phonequeue.tpl:204
+#: plugins/admin/fai/class_faiPackage.inc:121
 #, fuzzy
-msgid "Phone 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/ogroups/phonequeue.tpl:212
-msgid "Announce holdtime"
+#: plugins/admin/fai/class_faiPackage.inc:259
+#, php-format
+msgid "Can't read configuration folder '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:218
-msgid "Allow the called user to transfer his call"
-msgstr ""
+#: plugins/admin/fai/class_faiPackage.inc:341
+#, fuzzy
+msgid "Please select a least one Package."
+msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/admin/ogroups/phonequeue.tpl:224
-msgid "Allows calling user to transfer call"
-msgstr ""
+#: plugins/admin/fai/class_faiPackage.inc:345
+#, fuzzy
+msgid "Please choose a valid combination for your repository setup."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/ogroups/phonequeue.tpl:234
-msgid "Allow the called to hangup by pressing *"
+#: plugins/admin/fai/class_faiPackage.inc:376
+#, php-format
+msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:240
-msgid "Allows calling to hangup by pressing *"
+#: plugins/admin/fai/faiPackage.tpl:29
+#, fuzzy
+msgid "Repository"
+msgstr "Reintentar"
+
+#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:29
+#, fuzzy
+msgid "Release"
+msgstr "Paquete de reglas"
+
+#: plugins/admin/fai/faiPackage.tpl:50
+msgid "Mirror"
 msgstr ""
 
-#: plugins/admin/ogroups/phonequeue.tpl:246
-msgid "Ring instead of playing background music"
+#: plugins/admin/fai/faiPackage.tpl:54 plugins/admin/fai/faiPackageNew.tpl:51
+msgid "mirror"
 msgstr ""
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:1
+#: plugins/admin/fai/faiPackage.tpl:67
 #, fuzzy
-msgid "FAI partition table entry"
-msgstr "Entradas de fstab adicionales"
+msgid "Used packages"
+msgstr "Mostrar teléfonos"
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:9
+#: plugins/admin/fai/faiPackage.tpl:69
 #, fuzzy
-msgid "Choose a disc name"
-msgstr "Elija modelo de teclado"
+msgid "Choosen packages"
+msgstr "Mostrar teléfonos"
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:26
-#, fuzzy
-msgid "Add partition"
-msgstr "Añadir opción"
+#: plugins/admin/fai/faiPackage.tpl:75 include/functions.inc:587
+msgid "Configure"
+msgstr "Configurar"
+
+#: plugins/admin/fai/class_faiProfile.inc:145
+#: plugins/admin/fai/class_faiProfileEntry.inc:151
+msgid "This list displays all assigned class names for this profile."
+msgstr ""
 
-#: plugins/admin/FAI/faiPartitionTableEntry.tpl:32
+#: plugins/admin/fai/class_faiProfile.inc:153
 #, fuzzy
-msgid "cancel"
-msgstr "Cancelar"
+msgid "Append new class names"
+msgstr "Aplicaciones disponibles"
 
-#: plugins/admin/FAI/faiPartitionTable.tpl:1
-msgid "FAI partition table"
+#: plugins/admin/fai/class_faiProfile.inc:156
+#: plugins/admin/fai/class_faiProfileEntry.inc:118
+msgid "Hook bundle"
 msgstr ""
 
-#: plugins/admin/FAI/faiPartitionTable.tpl:23
-msgid "Already defined disk"
-msgstr ""
+#: plugins/admin/fai/class_faiProfile.inc:157
+#: plugins/admin/fai/class_faiProfileEntry.inc:119
+#, fuzzy
+msgid "Template bundle"
+msgstr "Plantilla"
 
-#: plugins/admin/FAI/faiPartitionTable.tpl:27
-msgid "Choose a disk to delete or edit"
-msgstr ""
+#: plugins/admin/fai/class_faiProfile.inc:158
+#: plugins/admin/fai/class_faiProfileEntry.inc:120
+#, fuzzy
+msgid "Script bundle"
+msgstr "Ruta del Script"
 
-#: plugins/admin/FAI/faiScript.tpl:1 plugins/admin/FAI/faiVariableEntry.tpl:1
-#: plugins/admin/FAI/faiTemplate.tpl:1 plugins/admin/FAI/faiHookEntry.tpl:1
-#: plugins/admin/FAI/faiVariable.tpl:1 plugins/admin/FAI/faiScriptEntry.tpl:1
-#: plugins/admin/FAI/faiTemplateEntry.tpl:1 plugins/admin/FAI/faiHook.tpl:1
+#: plugins/admin/fai/class_faiProfile.inc:159
+#: plugins/admin/fai/class_faiProfileEntry.inc:121
 #, fuzzy
-msgid "FAI script set"
-msgstr "Parametros Unix"
+msgid "Variable bundle"
+msgstr "Variable"
 
-#: plugins/admin/FAI/faiScript.tpl:23 plugins/admin/FAI/faiTemplate.tpl:23
-#: plugins/admin/FAI/faiVariable.tpl:23 plugins/admin/FAI/faiHook.tpl:23
-msgid "Already defined scripts"
+#: plugins/admin/fai/class_faiProfile.inc:160
+msgid "Packages bundle"
 msgstr ""
 
-#: plugins/admin/FAI/faiScript.tpl:27 plugins/admin/FAI/faiTemplate.tpl:27
-#: plugins/admin/FAI/faiVariable.tpl:27 plugins/admin/FAI/faiHook.tpl:27
-msgid "Choose a script to delete or edit"
+#: plugins/admin/fai/class_faiProfile.inc:163
+msgid "Remove class from profile"
 msgstr ""
 
-#: plugins/admin/FAI/headpage.tpl:6
-msgid "List of FAI objects (Fully Automatic Installation)"
+#: plugins/admin/fai/class_faiProfile.inc:226
+msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/FAI/headpage.tpl:24
+#: plugins/admin/fai/class_faiProfile.inc:230
 #, fuzzy
-msgid ""
-"This menu allows you to create, delete and edit selected FAI obejcts. Having "
-"a large size of objects, you might prefer the range selectors on top of this "
-"list."
+msgid "Please enter a valid name."
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/admin/fai/class_faiProfile.inc:238
+#, 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:32
+#, fuzzy
+msgid "FAI classes"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/fai/headpage.tpl:6
+#, fuzzy
+msgid "List of FAI classes"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/fai/headpage.tpl:24
+msgid "This menu allows you to create, delete and edit FAI classes."
 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/admin/FAI/headpage.tpl:36
+#: plugins/admin/fai/headpage.tpl:36
 #, fuzzy
 msgid "Show profiles"
 msgstr "Mostrar impresoras"
 
-#: plugins/admin/FAI/headpage.tpl:38
+#: plugins/admin/fai/headpage.tpl:38
 #, fuzzy
 msgid "Show scripts"
 msgstr "Mostrar equipos"
 
-#: plugins/admin/FAI/headpage.tpl:39
+#: plugins/admin/fai/headpage.tpl:39
 #, fuzzy
 msgid "Show hooks"
 msgstr "Mostrar equipos"
 
-#: plugins/admin/FAI/headpage.tpl:40
+#: plugins/admin/fai/headpage.tpl:40
 #, fuzzy
 msgid "Show variables"
 msgstr "Mostrar terminales"
 
-#: plugins/admin/FAI/headpage.tpl:41
+#: plugins/admin/fai/headpage.tpl:41
 #, fuzzy
 msgid "Show packages"
 msgstr "Mostrar teléfonos"
 
-#: plugins/admin/FAI/headpage.tpl:42
+#: plugins/admin/fai/headpage.tpl:42
 #, fuzzy
 msgid "Show partitions"
 msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:191
-msgid "Nr"
-msgstr ""
-
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:195
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:180
 #, fuzzy
 msgid "FS type"
 msgstr "Tipo"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:196
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:181
 #, fuzzy
 msgid "Mount point"
 msgstr "Monitor"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:197
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:182
 #, fuzzy
 msgid "Size in MB"
 msgstr "Entrando"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:198
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:183
 #, fuzzy
 msgid "Mount options"
 msgstr "Otras opciones"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:199
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:184
 #, fuzzy
 msgid "FS option"
 msgstr "Añadir opción"
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:200
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:185
 #, 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:297
-#, fuzzy
-msgid ""
-"Please enter a valid description for your disk. Only a-Z 0-9 are allowed."
-msgstr "Por favor especifique un nombre de usuario valido."
-
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:313
-#, 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:317
-#, 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:321
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:337
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:325
-#, 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:329
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:342
 #, 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:334
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:347
 #, 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:340
-#, php-format
-msgid "Please enter a range for partition size, 'from-to', for partition %s."
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:351
+msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:342
-#: plugins/admin/FAI/class_faiPartitionTableEntry.inc:344
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:357
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
+#, fuzzy, php-format
+msgid "Please enter a valid partition size for partition %s."
+msgstr ""
+"Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
+
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:367
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:369
 #, 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:387
-#, php-format
-msgid ""
-"Size settings for partition %s, overlap with size settings for partition %s."
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:374
+#, 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/faiScript.tpl:34
+#, fuzzy
+msgid "List of scripts"
+msgstr "Lista de usuarios"
+
+#: plugins/admin/fai/faiScript.tpl:40
+msgid "Choose a script to delete or edit"
+msgstr ""
+
+#: plugins/admin/fai/class_faiVariableEntry.inc:82
+#, fuzzy
+msgid "Please specify a value for the attribute 'content'."
+msgstr "Por favor especifique un usuario valido."
+
+#: 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:34
+#, fuzzy
+msgid "List of template files"
+msgstr "Lista de Departamentos"
+
+#: 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/class_faiPartitionTable.inc:222
+#: plugins/admin/fai/class_faiPartitionTable.inc:228
+#, fuzzy, php-format
+msgid "%s partition"
+msgstr "Mostrar estaciones de trabajo"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:224
+#: plugins/admin/fai/class_faiPartitionTable.inc:230
+#, fuzzy, php-format
+msgid "%s partition(s)"
+msgstr "Mostrar estaciones de trabajo"
+
+#: plugins/admin/fai/class_faiHookEntry.inc:100
+#, 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:122
+msgid "Package bundle"
+msgstr ""
+
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+#, fuzzy
+msgid "Hook attributes"
+msgstr "Atributo 'dn' de los usuarios"
+
+#: plugins/admin/fai/faiHookEntry.tpl:34
+#, fuzzy
+msgid "Task"
+msgstr "Días para tareas"
+
+#: plugins/admin/fai/faiHookEntry.tpl:36
+msgid "Choose an existing FAI task"
 msgstr ""
 
-#: plugins/admin/FAI/class_askClassName.inc:67
+#: plugins/admin/fai/class_askClassName.inc:71
 #, fuzzy
 msgid "Create new FAI object - partition table."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:68
+#: plugins/admin/fai/class_askClassName.inc:72
 #, 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:69
+#: plugins/admin/fai/class_askClassName.inc:73
 #, 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:70
-msgid "Create new FAI object - set of variables."
-msgstr ""
+#: plugins/admin/fai/class_askClassName.inc:74
+#, fuzzy
+msgid "Create new FAI object - variable bundle."
+msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:71
+#: plugins/admin/fai/class_askClassName.inc:75
 #, 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:72
+#: plugins/admin/fai/class_askClassName.inc:76
 #, fuzzy
 msgid "Create new FAI object - profile."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:73
+#: plugins/admin/fai/class_askClassName.inc:77
 #, fuzzy
 msgid "Create new FAI object - template."
 msgstr "Nueva plantilla"
 
-#: plugins/admin/FAI/class_askClassName.inc:74
+#: plugins/admin/fai/class_askClassName.inc:78
 #, fuzzy
-msgid "Create nre FAI object"
+msgid "Create new FAI object"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/FAI/class_askClassName.inc:125
+#: plugins/admin/fai/class_askClassName.inc:129
 #, 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:133
 #, 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
+#: plugins/admin/fai/askClassName.tpl:6
 msgid ""
-"Please select a class name for this object. The class name specifies a set "
-"of configurations."
+"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:7
+#: plugins/admin/fai/askClassName.tpl:12
 msgid ""
-"Every Class name must be unique. But it can be used for diffrent 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."
+"Please use one of the following methods to choose the name for the new FAI "
+"class."
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:11
-msgid ""
-"The list box below shows all available class names you can use, for this "
-"object, to avoid duplicates."
+#: plugins/admin/fai/askClassName.tpl:26
+msgid "Enter FAI class name manually"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:17
-msgid "You can select one the following class names for this object."
+#: plugins/admin/fai/askClassName.tpl:32 plugins/admin/fai/askClassName.tpl:54
+#, fuzzy
+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:21
+#: plugins/admin/fai/askClassName.tpl:54
+#, fuzzy
+msgid "Choose class name"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
+#, fuzzy
+msgid "Use"
+msgstr "Usuario"
+
+#: plugins/admin/fai/askClassName.tpl:74
 #, fuzzy
-msgid "Available class names."
+msgid "A new class name."
 msgstr "Aplicaciones disponibles"
 
-#: plugins/admin/FAI/askClassName.tpl:24
+#: plugins/admin/fai/class_faiTemplateEntry.inc:74
 #, fuzzy
-msgid "Choose class name"
-msgstr "Elija tipo de ratón"
+msgid "no file uploaded yet"
+msgstr "No se ha subido ningún archivo."
 
-#: plugins/admin/FAI/askClassName.tpl:36
-msgid "Please enter your class name here, if want to create a new class."
+#: plugins/admin/fai/class_faiTemplateEntry.inc:76
+#, php-format
+msgid "exists in database (size: %s bytes)"
 msgstr ""
 
-#: plugins/admin/FAI/askClassName.tpl:40
-msgid "A new class name.</b>"
-msgstr ""
+#: plugins/admin/fai/class_faiTemplateEntry.inc:156
+#, fuzzy
+msgid "Please specify a value for attribute 'file'."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/FAI/class_faiManagement.inc:29 plugins/admin/FAI/main.inc:38
-#: plugins/admin/FAI/main.inc:40
+#: plugins/admin/fai/class_faiTemplateEntry.inc:160
 #, fuzzy
-msgid "FAI management"
-msgstr "Nombre de la maquina"
+msgid "Please specify a value for attribute 'path'."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/FAI/class_faiManagement.inc:30
+#: plugins/admin/fai/class_faiTemplateEntry.inc:168
 #, fuzzy
-msgid "Fully Automatic Installation - management"
-msgstr "Mantenimiento de aplicaciones"
+msgid "Please enter a user."
+msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/admin/FAI/class_faiManagement.inc:312
+#: plugins/admin/fai/class_faiTemplateEntry.inc:171
 #, fuzzy
-msgid "New partition table"
-msgstr "Impresora"
+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_faiManagement.inc:312
-#: plugins/admin/FAI/class_faiManagement.inc:315
+#: plugins/admin/fai/class_faiTemplateEntry.inc:175
 #, fuzzy
-msgid "Partition"
-msgstr "Destino"
+msgid "Please enter a group."
+msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/admin/FAI/class_faiManagement.inc:315
+#: plugins/admin/fai/class_faiTemplateEntry.inc:178
 #, fuzzy
-msgid "New packages"
-msgstr "# páginas"
+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:29 include/php_setup.inc:122
+msgid "File"
+msgstr "Archivo"
+
+#: 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/class_faiManagement.inc:328
-msgid "FAI objects / ObjectClasses"
+#: plugins/admin/fai/faiTemplateEntry.tpl:62
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:316
+msgid "Owner"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:329
+#: 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 "Object type"
-msgstr "Nombre de objeto"
+msgid "SUID"
+msgstr "UID"
 
-#: plugins/admin/FAI/class_faiManagement.inc:330
+#: plugins/admin/fai/faiTemplateEntry.tpl:109
 #, fuzzy
-msgid "Obtions"
-msgstr "Opciones"
+msgid "SGID"
+msgstr "GID"
 
-#: plugins/admin/FAI/class_faiManagement.inc:333
+#: plugins/admin/fai/faiTemplateEntry.tpl:112
 #, fuzzy
-msgid "Edit object"
-msgstr "Encontrar objeto"
+msgid "Others"
+msgstr "Filtros"
 
-#: plugins/admin/FAI/class_faiManagement.inc:334
+#: plugins/admin/fai/faiTemplateEntry.tpl:118
 #, fuzzy
-msgid "Delete object"
-msgstr "Objetos miembro"
+msgid "sticky"
+msgstr "estatico"
 
-#: plugins/admin/FAI/class_faiManagement.inc:349
+#: plugins/admin/fai/faiHook.tpl:34
 #, fuzzy
-msgid "Partition table"
-msgstr "Variable"
+msgid "List of hook scripts"
+msgstr "Lista de listas de bloqueos"
 
-#: plugins/admin/FAI/class_faiManagement.inc:356
-msgid "Package list"
+#: plugins/admin/fai/faiHook.tpl:40
+msgid "Choose a hook to delete or edit"
 msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:363
-#, fuzzy
-msgid "Script set"
-msgstr "Ruta del Script"
+#: plugins/admin/fai/class_faiPackageEntry.inc:46
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr ""
 
-#: plugins/admin/FAI/class_faiManagement.inc:370
+#: plugins/admin/fai/faiPackageEntry.tpl:6
 #, fuzzy
-msgid "Varialbe set"
-msgstr "Variable"
+msgid "List of available packages"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/FAI/class_faiManagement.inc:377
-msgid "Hook set"
+#: 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/admin/FAI/class_faiManagement.inc:384
+#: plugins/admin/fai/faiPackageNew.tpl:2
 #, fuzzy
-msgid "Profile"
-msgstr "Ruta del Perfil"
+msgid "Repository settings"
+msgstr "Configuración de red"
 
-#: plugins/admin/FAI/class_faiPartitionTable.inc:213
-#: plugins/admin/FAI/class_faiPartitionTable.inc:215
-msgid "Number of Partitions"
+#: 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/class_faiPartitionTable.inc:254
-#: plugins/admin/FAI/class_faiScript.inc:193
-#: plugins/admin/FAI/class_faiTemplate.inc:193
-#: plugins/admin/FAI/class_faiVariable.inc:193
-#: plugins/admin/FAI/class_faiHook.inc:193
-#, fuzzy
-msgid "Please enter a valid description."
-msgstr "Por favor introduzca un número de serie válido"
+#: 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/faiVariableEntry.tpl:24
-#: plugins/admin/FAI/faiHookEntry.tpl:24
-#: plugins/admin/FAI/faiScriptEntry.tpl:35
-#: plugins/admin/FAI/faiTemplateEntry.tpl:24
-#, fuzzy
-msgid "Script"
-msgstr "Ruta del Script"
+#: 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/faiVariableEntry.tpl:42
-#: plugins/admin/FAI/faiHookEntry.tpl:42
-#: plugins/admin/FAI/faiScriptEntry.tpl:48
-#: plugins/admin/FAI/faiTemplateEntry.tpl:42
-#, fuzzy
-msgid "Abort"
-msgstr "Puerto"
+#: plugins/admin/fai/faiPackageNew.tpl:17
+msgid ""
+"First select the preferred release, then the section and finally the mirror."
+msgstr ""
 
-#: plugins/admin/FAI/faiScriptEntry.tpl:26
+#: plugins/admin/fai/faiPackageNew.tpl:25
+msgid "Following releases are available"
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:37
 #, fuzzy
-msgid "Choose a priority"
-msgstr "Elija tipo de ratón"
+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:115
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:116
 #, fuzzy
 msgid "no macro"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:132
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:133
 #, fuzzy
 msgid "undefined"
 msgstr "sin definirse"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:520
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:244
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:632
+#: plugins/gofon/macro/class_gofonMacro.inc:91
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:225
+msgid ""
+"There is currently no asterisk server defined. Possibly you are missing a "
+"server that handles the asterisk management (goFonServer). Your settings "
+"can't be saved to asterisk database."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc: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:534
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:652
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:603
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:727
 msgid "This account has no phone extensions."
 msgstr "Esta cuenta no tiene extensiones telefónicas"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:551
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:623
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:662
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:737
 msgid "Remove phone account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:663
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:738
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -7633,12 +8638,12 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:666
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:669
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:744
 msgid "Create phone account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:667
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:742
 #, fuzzy
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
@@ -7647,7 +8652,7 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:670
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:745
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -7655,32 +8660,32 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:683
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
 msgid "Please enter a valid phone number!"
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:713
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:788
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:799
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:874
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:802
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:877
 #, 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 "
 "guiones están permitidos."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:808
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:883
 msgid "Phone PIN must be 4 characters long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:811
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:886
 #, fuzzy
 msgid ""
 "The specified phone PIN contains invalid characters, only numeric values are "
@@ -7689,22 +8694,22 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:821
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:896
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "¡Necesita introducir al menos un número de teléfono!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:828
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:329
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:903
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:332
 #, fuzzy, php-format
 msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:990
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1065
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1025
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1100
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
@@ -7729,28 +8734,23 @@ msgstr "Informes telefónicos"
 msgid "Refresh"
 msgstr "Referencias"
 
-#: plugins/gofon/phoneaccount/generic.tpl:68
-#, fuzzy
-msgid "Complete"
-msgstr "incompleto"
-
 #: plugins/gofon/reports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/reports/class_fonreport.inc:141
+#: plugins/gofon/reports/class_fonreport.inc:144
 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
+#: plugins/gofon/reports/class_fonreport.inc:148
 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
+#: plugins/gofon/reports/class_fonreport.inc:157
 msgid "Query for phone database failed!"
 msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
 
@@ -7774,62 +8774,62 @@ msgstr "Duración"
 msgid "Phone reports"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:91
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:191
+#: plugins/gofon/macro/class_gofonMacro.inc:97
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:194
 #, fuzzy
 msgid "This 'dn' is no phone macro."
 msgstr "Esta 'dn' no tiene características de teléfono."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:147
+#: plugins/gofon/macro/class_gofonMacro.inc:153
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:232
+#: plugins/gofon/macro/class_gofonMacro.inc:247
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:250
+#: plugins/gofon/macro/class_gofonMacro.inc:265
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:259
-#: plugins/gofon/macro/class_gofonMacro.inc:267
+#: plugins/gofon/macro/class_gofonMacro.inc:274
+#: plugins/gofon/macro/class_gofonMacro.inc:282
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:281
+#: plugins/gofon/macro/class_gofonMacro.inc:296
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:323
+#: plugins/gofon/macro/class_gofonMacro.inc:339
 #, fuzzy, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:328
+#: plugins/gofon/macro/class_gofonMacro.inc:344
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:332
+#: plugins/gofon/macro/class_gofonMacro.inc:348
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:337
+#: plugins/gofon/macro/class_gofonMacro.inc:353
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:343
+#: plugins/gofon/macro/class_gofonMacro.inc:359
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:348
+#: plugins/gofon/macro/class_gofonMacro.inc:364
 #, fuzzy
 msgid "Please choose a valid  base."
 msgstr "Por favor especifique un rango VSync valido"
@@ -7894,35 +8894,35 @@ msgstr "Expresión regular que concuerde con nombres de grupos"
 msgid "Phone macro management"
 msgstr "Gestión del sistema"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:239
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:242
 #, fuzzy
 msgid "String"
 msgstr "durante"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:240
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:243
 msgid "Combobox"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:241
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:244
 msgid "Bool"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:247
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:250
 #, fuzzy
 msgid "Delete unused"
 msgstr "Borrar"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:321
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:324
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:334
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:337
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:363
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:366
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
@@ -7934,42 +8934,42 @@ msgstr ""
 msgid "Phone macros"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:251
 #, 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/macro/class_gofonMacroManagement.inc:257
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:282
 #, fuzzy
 msgid "You are not allowed to delete this macro!"
 msgstr "¡No le está permitido eliminar este grupo!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:328
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
 #, fuzzy
 msgid "Create new phone macro"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:346
 #, fuzzy
 msgid "Visible"
 msgstr "Variable"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:347
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:350
 msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:378
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
 #, fuzzy
 msgid "Macro"
 msgstr "Nombre de la maquina"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:382
 #, fuzzy
 msgid "visible"
 msgstr "Visible Publicamente"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:383
 #, fuzzy
 msgid "invisible"
 msgstr "Visible Publicamente"
@@ -8000,11 +9000,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:174
 #, fuzzy
 msgid "Phone number"
 msgstr "Números de teléfonos"
@@ -8015,7 +9015,7 @@ msgid "Preset PIN"
 msgstr "presente"
 
 #: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:317
 msgid "PIN"
 msgstr ""
 
@@ -8056,30 +9056,26 @@ msgstr "Número de teléfono"
 msgid "Management"
 msgstr "Nombre de la maquina"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 #, fuzzy
 msgid "Create new conference"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 #, fuzzy
 msgid "New conference"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "This table displays all available conference rooms."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:304
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:315
 #, fuzzy
 msgid "Name - Number"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:305
-msgid "Owner"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:360
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:371
 #, fuzzy
 msgid "Conference"
 msgstr "Referencias"
@@ -8100,32 +9096,32 @@ msgstr ""
 "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/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:186
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:191
 msgid ""
 "You have specified a conference 'without PIN' ... please leave the PIN "
 "fields empty."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:195
 #, fuzzy
 msgid "Please enter a PIN."
 msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:199
 #, fuzzy
 msgid "Please enter a name for the conference."
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:203
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:207
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
@@ -8162,9 +9158,10 @@ msgstr ""
 "se aplican directamente sobre los servidores LDAP de su compañía."
 
 #: plugins/generic/welcome/welcome.tpl:8
+#, fuzzy
 msgid ""
-"Use <b>Sign out</b> on the upper left to close the connection and <b>Main</"
-"b> to get back to the pictogram view."
+"Use 'Sign out' on the upper left to close the connection and 'Main' to get "
+"back to the pictogram view."
 msgstr ""
 "Para cerrar la conexión use <b>Cerrar</b> en la parte superior izquierda y "
 "para volver a la vista de íconos use <b>Principal</b>"
@@ -8184,7 +9181,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:316
 msgid "Toggle information"
 msgstr "Información de intercambio"
 
@@ -8212,10 +9209,6 @@ msgstr "método"
 msgid "Trace"
 msgstr "Traza"
 
-#: include/php_setup.inc:122
-msgid "File"
-msgstr "Archivo"
-
 #: include/php_setup.inc:122
 msgid "Line"
 msgstr "Linea"
@@ -8307,10 +9300,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"
@@ -8405,7 +9394,11 @@ msgstr ""
 "No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
 "s'"
 
-#: include/class_pluglist.inc:98
+#: include/class_pluglist.inc:91
+msgid "plHeadline"
+msgstr ""
+
+#: include/class_pluglist.inc:115
 msgid ""
 "Your gosa.conf information has changed partly. Please convert it using the "
 "contributed script fix_config.sh!"
@@ -8413,7 +9406,7 @@ msgstr ""
 "El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
 "favor actualízela usando el script 'fix_config.sh'!"
 
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:14
+#: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
 msgid ""
@@ -8423,15 +9416,7 @@ msgstr ""
 "Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
 "los cambios?"
 
-#: 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
+#: include/class_plugin.inc:391
 #, php-format
 msgid ""
 "Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
@@ -8439,7 +9424,7 @@ 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
+#: include/class_plugin.inc:419 include/class_password-methods.inc:181
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -8447,7 +9432,7 @@ msgstr ""
 "El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
 "parece existir."
 
-#: include/class_plugin.inc:454
+#: include/class_plugin.inc:447
 #, php-format
 msgid ""
 "Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
@@ -8460,7 +9445,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Error XML en 'gosa.conf': %s en la linea %d"
 
-#: include/class_config.inc: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 "
@@ -8510,7 +9495,7 @@ 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:438
+#: include/class_ldap.inc:437
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -8519,7 +9504,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:699
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -8528,12 +9513,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:712
 #, 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:728
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -8565,12 +9550,30 @@ msgstr "Fichero de configuración"
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/functions_helpviewer.inc:260
+#: include/functions_helpviewer.inc:43
+#, fuzzy, php-format
+msgid "XML error in guide.xml: %s at line %d"
+msgstr "Error XML en 'gosa.conf': %s en la linea %d"
+
+#: include/functions_helpviewer.inc:83
+msgid "No help available for this plugin."
+msgstr ""
+
+#: include/functions_helpviewer.inc:92
+msgid "previous"
+msgstr ""
+
+#: include/functions_helpviewer.inc:96
+#, fuzzy
+msgid "next"
+msgstr "texto"
+
+#: include/functions_helpviewer.inc:384
 #, php-format
 msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: include/functions_helpviewer.inc:335
+#: include/functions_helpviewer.inc:459
 #, php-format
 msgid "%s%% hit rate in file %s"
 msgstr ""
@@ -8681,7 +9684,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"
@@ -8689,31 +9704,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."
@@ -8721,13 +9736,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 "
@@ -8737,37 +9752,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."
@@ -8776,11 +9791,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."
@@ -8788,11 +9803,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."
@@ -8800,11 +9815,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 "
@@ -8814,21 +9829,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."
@@ -8836,11 +9851,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."
@@ -8848,25 +9863,45 @@ 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 %s"
+msgstr "Comprobando el soporte de iconv"
+
+#: include/functions_setup.inc:384
+#, fuzzy, php-format
+msgid ""
+"The function %s is used by GOsa. There is no information if it's optional or "
+"required yet."
+msgstr ""
+"Este módulo es usado por GOsa para convertir información de MungedDial (N.T: "
+"Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
+"tanto requerido."
+
+#: 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."
@@ -8874,11 +9909,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."
@@ -8886,11 +9921,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."
@@ -8898,11 +9933,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."
@@ -8910,11 +9945,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'."
@@ -8922,11 +9957,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."
@@ -8934,11 +9969,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."
@@ -8946,11 +9981,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! "
@@ -8960,11 +9995,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."
@@ -8973,11 +10008,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."
@@ -8985,95 +10020,282 @@ 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
-msgid "You've to specify an ldap server before continuing!"
-msgstr "Tiene que especificar un servidor ldap antes de continuar."
+#: include/functions_setup.inc:720
+msgid "You've to specify an ldap server before continuing!"
+msgstr "Tiene que especificar un servidor ldap antes de continuar."
+
+#: 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."
+msgstr ""
+"No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
+"este accesible para GOsa."
+
+#: 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."
+msgstr ""
+"¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
+"asegure que este accesible para GOsa."
+
+#: include/functions_setup.inc:832
+msgid ""
+"Bind to server successful, but the server seems to be completly empty, "
+"please check all informations twice"
+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:888
+#, php-format
+msgid ""
+"You're missing the required attribute '%s' from this formular. Please "
+"complete!"
+msgstr ""
+"Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
+
+#: 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: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: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 ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
+msgstr ""
+"No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
+
+#: include/class_ppdManager.inc:124 include/class_ppdManager.inc:242
+#, php-format
+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/class_ppdManager.inc:263
+#, php-format
+msgid "Parsing PPD file %s failed - no information found."
+msgstr ""
+
+#: html/helpviewer.php:113
+#, fuzzy
+msgid "There is no helpfile specified for this class."
+msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
+
+#: html/helpviewer.php:221
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+
+#: html/getxls.php:65
+msgid "Birthday"
+msgstr ""
+
+#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
+#: html/getxls.php:236
+#, fuzzy
+msgid "Surname"
+msgstr "Nombre del servidor"
+
+#: html/getxls.php:65 html/getxls.php:174 html/getxls.php:224
+#: html/getxls.php:236
+#, fuzzy
+msgid "Given Name"
+msgstr "Nombre"
+
+#: html/getxls.php:74 html/getxls.php:276
+#, fuzzy
+msgid "User List of "
+msgstr "Lista de usuarios"
+
+#: html/getxls.php:74 html/getxls.php:104 html/getxls.php:156
+#: html/getxls.php:184 html/getxls.php:276 html/getxls.php:295
+#: html/getxls.php:314 html/getxls.php:330 html/getxls.php:349
+msgid " on "
+msgstr ""
+
+#: html/getxls.php:94 html/getxls.php:227
+#, fuzzy
+msgid "Members"
+msgstr "Objetos miembro"
+
+#: html/getxls.php:104 html/getxls.php:295
+#, fuzzy
+msgid "Groups of "
+msgstr "Grupo de usuarios"
+
+#: html/getxls.php:124 html/getxls.php:246
+#, fuzzy
+msgid "Computers"
+msgstr "incompleto"
+
+#: html/getxls.php:133 html/getxls.php:190 html/getxls.php:336
+#: html/getxls.php:356
+#, fuzzy
+msgid "Common Name"
+msgstr "Nombre de la localización"
+
+#: html/getxls.php:146
+#, fuzzy
+msgid "Server Name"
+msgstr "Nombre del servidor"
+
+#: html/getxls.php:156 html/getxls.php:314
+#, fuzzy
+msgid "Servers of "
+msgstr "Servidores"
+
+#: html/getxls.php:174
+#, fuzzy
+msgid "Common name"
+msgstr "Nombre de la localización"
+
+#: html/getxls.php:174
+#, fuzzy
+msgid "Display Name"
+msgstr "Nombre mostrado"
+
+#: html/getxls.php:174
+msgid "Home postal address"
+msgstr ""
+
+#: html/getxls.php:174
+#, fuzzy
+msgid "Mobile phone"
+msgstr "Teléfono particular"
+
+#: html/getxls.php:174
+#, fuzzy
+msgid "Postal address"
+msgstr "Código Postal"
+
+#: html/getxls.php:174
+#, fuzzy
+msgid "Adress"
+msgstr "Dirección"
+
+#: html/getxls.php:174
+#, fuzzy
+msgid "Function"
+msgstr "Función"
+
+#: html/getxls.php:177 html/getxls.php:247
+#, fuzzy
+msgid "Adressbook"
+msgstr "Libreta de direcciones"
 
-#: include/functions_setup.inc:675 include/functions_setup.inc:758
-msgid ""
-"Can't connect to the specified LDAP server! Please make sure that is "
-"reachable for GOsa."
-msgstr ""
-"No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
-"este accesible para GOsa."
+#: html/getxls.php:184 html/getxls.php:349
+#, fuzzy
+msgid "Adressbook of "
+msgstr "Libreta de direcciones"
 
-#: include/functions_setup.inc:689 include/functions_setup.inc:763
-#: include/functions_setup.inc:768
-msgid ""
-"Can't bind to the specified LDAP server! Please make sure that it is "
-"reachable for GOsa."
-msgstr ""
-"¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
-"asegure que este accesible para GOsa."
+#: html/getxls.php:224
+#, fuzzy
+msgid "BirthDate"
+msgstr "Fecha"
 
-#: include/functions_setup.inc:778
-msgid ""
-"Bind to server successful, but the server seems to be completly empty, "
-"please check all informations twice"
+#: html/getxls.php:230
+msgid "Uid"
 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
-#, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
-msgstr ""
-"Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
+#: html/getxls.php:236
+#, fuzzy
+msgid "DisplayName"
+msgstr "Nombre mostrado"
 
-#: include/functions_setup.inc:865
-msgid ""
-"Can't read schema informations, GOsa needs to know your schema setup. Please "
-"verify that it is readable for GOsa"
-msgstr ""
+#: html/getxls.php:236
+#, fuzzy
+msgid "Phone Number"
+msgstr "Números de teléfonos"
 
-#: include/functions_setup.inc:874
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
-msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
+#: html/getxls.php:236
+#, fuzzy
+msgid "Postal Adress"
+msgstr "Código Postal"
 
-#: include/functions_setup.inc:984 include/functions_setup.inc:1007
-#: include/functions_setup.inc:1016 html/index.php:176
-#: ihtml/themes/altlinux/setup_useradmin.tpl:6
-#: ihtml/themes/default/setup_useradmin.tpl:6
-msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr ""
-"No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
+#: html/getxls.php:236
+#, fuzzy
+msgid "Email address"
+msgstr "Cuenta Principal"
 
-#: include/class_ppdManager.inc:57
-#, php-format
-msgid ""
-"Parsing PPD file %s faild - line too long. Trailing characters have been "
-"ignored"
-msgstr ""
+#: html/getxls.php:236
+#, fuzzy
+msgid "mobile"
+msgstr "Teléfono Móvil"
 
-#: include/class_ppdManager.inc:78
-#, php-format
-msgid "Parsing PPD file %s failed - no information found."
-msgstr ""
+#: html/getxls.php:236
+#, fuzzy
+msgid "Organizational Unit"
+msgstr "De organización"
 
-#: html/helpviewer.php:54
-msgid "Help is not available if you are not logged in."
-msgstr ""
+#: html/getxls.php:236
+#, fuzzy
+msgid "Postal Address"
+msgstr "Código Postal"
 
-#: html/helpviewer.php:85
-msgid "previous"
+#: html/getxls.php:236
+#, fuzzy
+msgid "Postal Code"
+msgstr "Código Postal"
+
+#: html/getxls.php:236
+msgid "Sn"
 msgstr ""
 
-#: html/helpviewer.php:89
+#: html/getxls.php:236
 #, fuzzy
-msgid "next"
-msgstr "texto"
+msgid "st"
+msgstr "Borrar"
 
-#: html/helpviewer.php:141
-#, php-format
-msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
+#: html/getxls.php:236
+#, fuzzy
+msgid "Title"
+msgstr "Archivo"
+
+#: html/getxls.php:239
+msgid "Full"
 msgstr ""
 
+#: html/getxls.php:330
+#, fuzzy
+msgid "Computers of "
+msgstr "incompleto"
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "No puedo conectar al servidor de base de datos."
@@ -9091,15 +10313,15 @@ 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."
@@ -9107,17 +10329,17 @@ 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
+#: html/main.php:287
 #, 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
+#: html/main.php:316
 #, fuzzy
 msgid ""
 "Generating this page caused the W3C conformance checker to raise some errors!"
@@ -9125,48 +10347,48 @@ 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"
 
@@ -9567,6 +10789,18 @@ msgstr ""
 msgid "Index"
 msgstr ""
 
+#: ihtml/themes/default/setup_introduction.tpl:17
+msgid ""
+"You can also use the new and more-advanced way of inspecting your PHP-"
+"installation. It will give you information about the exact function that "
+"could not be found (functions that could be found are not mentioned). This "
+"is useful if you know what you're doing."
+msgstr ""
+
+#: ihtml/themes/default/setup_introduction.tpl:19
+msgid "Toggle Show/Hide"
+msgstr ""
+
 #: ihtml/themes/default/setup_step4.tpl:100
 msgid ""
 "GOsa may cause PHP interpreter errors, particularly in case of Beta "
@@ -9574,6 +10808,326 @@ msgid ""
 "(But it could be a security risk)  "
 msgstr ""
 
+#, fuzzy
+#~ msgid "Firstname"
+#~ msgstr "Nombre de la lista"
+
+#, fuzzy
+#~ msgid "Sexe"
+#~ msgstr "Sexo"
+
+#, fuzzy
+#~ msgid "Needed parameters to openexchange connectivity plugin are missing!"
+#~ msgstr ""
+#~ "¡Los parámetros necesarios para extensión de conectividad open-xchange no "
+#~ "son validos!"
+
+#, fuzzy
+#~ msgid "XLS export"
+#~ msgstr "Importar desde CSV"
+
+#, fuzzy
+#~ msgid "You've no permission to do XLS exports."
+#~ msgstr "No tiene permisos para hacer exportaciones LDAP."
+
+#~ msgid "This 'dn' has no account extensions."
+#~ msgstr "Este 'dn' no tiene extensiones de cuenta."
+
+#~ msgid "This is an empty plugin."
+#~ msgstr "Esta es un extensión vacía."
+
+#, fuzzy
+#~ msgid "email"
+#~ msgstr "Correo Electrónico"
+
+#, fuzzy
+#~ msgid "pager"
+#~ msgstr "Dispositivo de aviso"
+
+#, fuzzy
+#~ msgid "Nagios Auth"
+#~ msgstr "Contacto"
+
+#, fuzzy
+#~ msgid "authorized_for_system_information"
+#~ msgstr "Información de sistema"
+
+#~ msgid "organizations user database"
+#~ msgstr "bases de datos de organizaciones de usuarios"
+
+#~ msgid ""
+#~ "To change the terminal root password use the fields below. The changes "
+#~ "take effect during next reboot. Please memorize the new password, because "
+#~ "the you would't be able to log in. <b>Leave fields blank for password "
+#~ "inheritance from default entries.</b>"
+#~ msgstr ""
+#~ "Para cambiarla clave de administrador ('root') del terminal use los "
+#~ "campos mas abajo. Los cambios tendrán efecto durante el próximo inicio. "
+#~ "Por favor memorice la nueva clave, ya que deberá iniciar sesion. <b> "
+#~ "Dejando los campos en blanco se pondrán los valores por defecto.</b>"
+
+#, fuzzy
+#~ msgid "Checking for function <b>%s</b>"
+#~ msgstr "Comprobando el soporte de iconv"
+
+#, fuzzy
+#~ msgid "Members:"
+#~ msgstr "Objetos miembro"
+
+#, 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!"
+
+#~ 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 "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 "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"
+#~ msgstr "Entradas de fstab adicionales"
+
+#, fuzzy
+#~ msgid "FAI script set"
+#~ msgstr "Parametros Unix"
+
+#, fuzzy
+#~ msgid ""
+#~ "This menu allows you to create, delete and edit selected FAI obejcts. "
+#~ "Having a large size of objects, you might prefer the range selectors on "
+#~ "top of this list."
+#~ 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."
+
+#, fuzzy
+#~ msgid ""
+#~ "Please enter a valid description for your disk. Only a-Z 0-9 are allowed."
+#~ msgstr "Por favor especifique un nombre de usuario valido."
+
+#, fuzzy
+#~ msgid "Object type"
+#~ msgstr "Nombre de objeto"
+
 #, fuzzy
 #~ msgid "Set phone password"
 #~ msgstr "Poner Contraseña"
@@ -9589,16 +11143,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"
@@ -9765,10 +11312,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..."