Added Translation Strings.

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

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 26ad10129073ba92ade26f3152fb4494c7df80d5..6ed4631029bb9c15103a6edae00a1ec1ff70d6d2 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -23,16 +23,17 @@ msgstr "Mi cuenta"
 msgid "Administration"
 msgstr "Administradores"
 
-#: contrib/gosa.conf:40
+#: contrib/gosa.conf:42
 msgid "Addons"
 msgstr "Agregados"
 
-#: contrib/gosa.conf:55 contrib/gosa.conf:66 contrib/gosa.conf:74
-#: contrib/gosa.conf:80 contrib/gosa.conf:88 contrib/gosa.conf:97
-#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:115
-#: contrib/gosa.conf:120 contrib/gosa.conf:125 contrib/gosa.conf:130
-#: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
-#: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
+#: contrib/gosa.conf:57 contrib/gosa.conf:68 contrib/gosa.conf:76
+#: contrib/gosa.conf:82 contrib/gosa.conf:88 contrib/gosa.conf:96
+#: contrib/gosa.conf:105 contrib/gosa.conf:113 contrib/gosa.conf:118
+#: contrib/gosa.conf:123 contrib/gosa.conf:128 contrib/gosa.conf:133
+#: contrib/gosa.conf:138 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
@@ -40,29 +41,30 @@ msgstr "Agregados"
 msgid "Generic"
 msgstr "Genérico"
 
-#: contrib/gosa.conf:56
+#: contrib/gosa.conf:58
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:57 contrib/gosa.conf:68
+#: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/admin/ogroups/tabs_ogroups.inc:29
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Correo Electrónico"
 
-#: contrib/gosa.conf:58 plugins/personal/samba/class_sambaAccount.inc:24
+#: contrib/gosa.conf:60 plugins/personal/samba/class_sambaAccount.inc:24
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:59
+#: contrib/gosa.conf:61
 #: plugins/personal/connectivity/class_connectivity.inc:15
 #: plugins/personal/connectivity/main.inc:136
 msgid "Connectivity"
 msgstr "Conectividad"
 
-#: contrib/gosa.conf:60 plugins/personal/generic/generic.tpl:231
+#: contrib/gosa.conf:62 plugins/personal/generic/generic.tpl:231
 #: plugins/personal/generic/generic.tpl:362
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
@@ -70,7 +72,7 @@ msgstr "Conectividad"
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:61 plugins/personal/generic/generic.tpl:214
+#: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
 #: plugins/addons/addressbook/address_edit.tpl:41
 #: plugins/addons/addressbook/address_edit.tpl:89
@@ -85,97 +87,104 @@ msgstr "Fax"
 msgid "Phone"
 msgstr "Teléfono"
 
-#: contrib/gosa.conf:62 contrib/gosa.conf:70 contrib/gosa.conf:76
-#: contrib/gosa.conf:84 contrib/gosa.conf:93 contrib/gosa.conf:101
-#: contrib/gosa.conf:106 contrib/gosa.conf:111 contrib/gosa.conf:116
-#: contrib/gosa.conf:121 contrib/gosa.conf:126 contrib/gosa.conf:131
+#: contrib/gosa.conf:64 contrib/gosa.conf:72 contrib/gosa.conf:78
+#: contrib/gosa.conf:84 contrib/gosa.conf:92 contrib/gosa.conf:101
+#: contrib/gosa.conf:109 contrib/gosa.conf:114 contrib/gosa.conf:119
+#: contrib/gosa.conf:124 contrib/gosa.conf:129 contrib/gosa.conf:134
+#: contrib/gosa.conf:139
 msgid "References"
 msgstr "Referencias"
 
-#: contrib/gosa.conf:67
+#: contrib/gosa.conf:69
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:44
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: contrib/gosa.conf:69
+#: contrib/gosa.conf:71
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:81 contrib/gosa.conf:98
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:224
+#, fuzzy
+msgid "Parameter"
+msgstr "Parametros de inicio"
+
+#: contrib/gosa.conf:89 contrib/gosa.conf:106
 msgid "Devices"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:82 contrib/gosa.conf:99
+#: contrib/gosa.conf:90 contrib/gosa.conf:107
 msgid "Startup"
 msgstr "Inicio"
 
-#: contrib/gosa.conf:83 contrib/gosa.conf:92 contrib/gosa.conf:100
+#: contrib/gosa.conf:91 contrib/gosa.conf:100 contrib/gosa.conf:108
 msgid "Monitoring"
 msgstr "Monitor"
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:97
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: contrib/gosa.conf:90 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:98 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:142 plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:150 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
 msgid "Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:143 plugins/personal/mail/generic.tpl:124
-#: plugins/addons/ldapmanager/contentimport.tpl:53
+#: contrib/gosa.conf:151 plugins/personal/mail/generic.tpl:111
+#: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:117
 #: plugins/addons/ldapmanager/contentcsv.tpl:120
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:144
+#: contrib/gosa.conf:152
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:159
+#: contrib/gosa.conf:168
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:176
+#: contrib/gosa.conf:185
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:177
+#: contrib/gosa.conf:186
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:178
+#: contrib/gosa.conf:187
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:188
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:180
+#: contrib/gosa.conf:189
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:181
+#: contrib/gosa.conf:190
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:182
+#: contrib/gosa.conf:191
 msgid "Italian"
 msgstr "Italiano"
 
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
+#: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr "Cuenta Principal"
 
@@ -188,167 +197,175 @@ msgstr "Servidor"
 msgid "Specify the mail server where the user will be hosted on"
 msgstr "Especificar el servidor de correo donde el usuario estará hospedado."
 
-#: plugins/personal/mail/generic.tpl:25 plugins/admin/groups/mail.tpl:24
+#: plugins/personal/mail/generic.tpl:22 plugins/admin/groups/mail.tpl:25
 msgid "Quota usage"
 msgstr "Uso de la Cola de Correo"
 
-#: plugins/personal/mail/generic.tpl:32 plugins/admin/groups/mail.tpl:31
-#: plugins/admin/systems/class_terminalInfo.inc:136
+#: plugins/personal/mail/generic.tpl:29 plugins/admin/groups/mail.tpl:32
+#: plugins/admin/systems/class_terminalInfo.inc:147
 msgid "not defined"
 msgstr "sin definirse"
 
-#: plugins/personal/mail/generic.tpl:37 plugins/admin/groups/mail.tpl:36
+#: plugins/personal/mail/generic.tpl:34 plugins/admin/groups/mail.tpl:37
 msgid "Quota size"
 msgstr "Tamaño de la Cola de correo"
 
-#: plugins/personal/mail/generic.tpl:51 plugins/admin/groups/mail.tpl:46
+#: plugins/personal/mail/generic.tpl:48 plugins/admin/groups/mail.tpl:47
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
-#: plugins/personal/mail/generic.tpl:53 plugins/admin/groups/mail.tpl:47
+#: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
+#: plugins/admin/systems/phonesettings.tpl:175
+#: plugins/admin/systems/phonesettings.tpl:190
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
 
-#: plugins/personal/mail/generic.tpl:63 plugins/personal/mail/generic.tpl:142
-#: plugins/personal/mail/mail_locals.tpl:49
-#: plugins/personal/posix/posix_groups.tpl:56
-#: plugins/personal/posix/trust_machines.tpl:45
-#: plugins/personal/posix/generic.tpl:63
-#: plugins/personal/posix/generic.tpl:124
+#: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:126
+#: plugins/personal/mail/mail_locals.tpl:41
+#: plugins/personal/posix/posix_groups.tpl:72
+#: plugins/personal/posix/trust_machines.tpl:39
+#: plugins/personal/posix/generic.tpl:73
+#: plugins/personal/posix/generic.tpl:135
 #: plugins/personal/samba/samba3.tpl:287
-#: plugins/personal/samba/samba3_workstations.tpl:45
-#: plugins/personal/connectivity/class_kolabAccount.inc:195
-#: plugins/personal/connectivity/kolab.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:60
-#: plugins/gofax/faxaccount/generic.tpl:77
-#: plugins/gofax/faxaccount/locals.tpl:48
-#: plugins/gofax/faxaccount/lists.tpl:15 plugins/gofax/faxaccount/lists.tpl:19
-#: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
+#: plugins/personal/samba/samba3_workstations.tpl:39
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
+#: plugins/gofax/blocklists/generic.tpl:63
+#: plugins/gofax/faxaccount/generic.tpl:75
+#: plugins/gofax/faxaccount/locals.tpl:62
+#: plugins/gofax/faxaccount/lists.tpl:12 plugins/gofax/faxaccount/lists.tpl:16
+#: plugins/admin/groups/mail.tpl:54 plugins/admin/groups/mail.tpl:101
 #: plugins/admin/groups/class_groupMail.inc:404
-#: plugins/admin/groups/group_objects.tpl:45
-#: plugins/admin/groups/generic.tpl:87 plugins/admin/groups/mail_locals.tpl:49
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:45
-#: plugins/admin/systems/startup.tpl:59 plugins/admin/systems/startup.tpl:72
-#: plugins/admin/systems/startup.tpl:91
-#: plugins/admin/ogroups/ogroup_objects.tpl:56
+#: plugins/admin/groups/group_objects.tpl:39
+#: plugins/admin/groups/generic.tpl:88 plugins/admin/groups/mail_locals.tpl:66
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
+#: plugins/admin/systems/startup.tpl:95
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
+#: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:207
-#: plugins/gofon/phoneaccount/generic.tpl:45
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:375
+#: plugins/gofon/phoneaccount/generic.tpl:11
 msgid "Add"
 msgstr "Añadir"
 
-#: plugins/personal/mail/generic.tpl:65 plugins/personal/mail/generic.tpl:146
-#: plugins/personal/posix/generic.tpl:64
-#: plugins/personal/posix/generic.tpl:126
+#: plugins/personal/mail/generic.tpl:58 plugins/personal/mail/generic.tpl:130
+#: plugins/personal/posix/generic.tpl:74
+#: plugins/personal/posix/generic.tpl:137
 #: plugins/personal/samba/samba3.tpl:289
-#: plugins/personal/connectivity/kolab.tpl:19
-#: plugins/gofax/blocklists/generic.tpl:61
+#: plugins/personal/connectivity/kolab.tpl:20
+#: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
-#: plugins/gofax/blocklists/headpage.tpl:17
-#: plugins/gofax/faxaccount/generic.tpl:79
-#: plugins/gofax/faxaccount/lists.tpl:16
-#: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:53
-#: plugins/admin/groups/mail.tpl:99 plugins/admin/groups/remove.tpl:15
-#: plugins/admin/groups/headpage.tpl:17 plugins/admin/groups/generic.tpl:89
-#: plugins/admin/users/remove.tpl:15 plugins/admin/users/headpage.tpl:22
+#: plugins/gofax/blocklists/headpage.tpl:18
+#: 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/headpage.tpl:18 plugins/admin/groups/generic.tpl:90
+#: plugins/admin/users/remove.tpl:15 plugins/admin/users/headpage.tpl:19
 #: plugins/admin/applications/remove.tpl:14
-#: plugins/admin/applications/headpage.tpl:17
+#: plugins/admin/applications/headpage.tpl:18
 #: plugins/admin/departments/remove.tpl:15
-#: plugins/admin/departments/headpage.tpl:17
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/servservice.tpl:46
+#: plugins/admin/departments/headpage.tpl:18
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
 #: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/headpage.tpl:17
-#: plugins/admin/systems/startup.tpl:60 plugins/admin/systems/startup.tpl:73
-#: plugins/admin/systems/startup.tpl:92 plugins/admin/ogroups/generic.tpl:39
-#: plugins/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/headpage.tpl:17
-#: plugins/gofon/phoneaccount/generic.tpl:47
+#: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
+#: plugins/admin/systems/startup.tpl:96
+#: 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/headpage.tpl:18
+#: plugins/gofon/phoneaccount/generic.tpl:13 plugins/gofon/macro/remove.tpl:14
+#: plugins/gofon/macro/headpage.tpl:18
 msgid "Delete"
 msgstr "Borrar"
 
-#: plugins/personal/mail/generic.tpl:73
+#: plugins/personal/mail/generic.tpl:66
 msgid "Mail options"
 msgstr "Opciones de correo"
 
-#: plugins/personal/mail/generic.tpl:78
+#: plugins/personal/mail/generic.tpl:71
 msgid "Select if you want to forward mails without getting own copies of them"
 msgstr "Seleccione si quiere reenviar correos sin quedarse copias de ellos"
 
-#: plugins/personal/mail/generic.tpl:78
+#: plugins/personal/mail/generic.tpl:71
 msgid "No delivery to own mailbox"
 msgstr "No se enviara a su propia carpeta de correo"
 
-#: plugins/personal/mail/generic.tpl:81
+#: plugins/personal/mail/generic.tpl:74
 msgid ""
 "Select to automatically response with the vacation message defined below"
 msgstr ""
 "Seleccione para responder automáticamente con el mensaje de ausencia "
 "definido aqui"
 
-#: plugins/personal/mail/generic.tpl:81
+#: plugins/personal/mail/generic.tpl:74
 msgid "Activate vacation message"
 msgstr "Activar mensaje de ausencia"
 
-#: plugins/personal/mail/generic.tpl:88
+#: plugins/personal/mail/generic.tpl:81
 msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 "Seleccione aquí si quiere que su correo se filtre a través de spamassassin"
 
-#: plugins/personal/mail/generic.tpl:88
+#: plugins/personal/mail/generic.tpl:81
 msgid "Move mails tagged with spam level greater than"
 msgstr "Mover los correos etiquetados con nivel de spam mayor que"
 
-#: plugins/personal/mail/generic.tpl:89
+#: plugins/personal/mail/generic.tpl:82
 msgid "Choose spam level - smaller values are more sensitive"
 msgstr "Elija el nivele de spam - los mas bajos son mas sensibles"
 
-#: plugins/personal/mail/generic.tpl:92
+#: plugins/personal/mail/generic.tpl:85
 msgid "to folder"
 msgstr "a la carpeta"
 
-#: plugins/personal/mail/generic.tpl:102
+#: plugins/personal/mail/generic.tpl:92
 msgid "Reject mails bigger than"
 msgstr "rechazar correos mayores que"
 
-#: plugins/personal/mail/generic.tpl:104
+#: plugins/personal/mail/generic.tpl:94
 #: plugins/personal/connectivity/pureftpd.tpl:40
-#: plugins/personal/connectivity/class_proxyAccount.inc:75
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
 msgid "MB"
 msgstr "Mb"
 
-#: plugins/personal/mail/generic.tpl:110
+#: plugins/personal/mail/generic.tpl:100
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
-#: plugins/personal/mail/generic.tpl:130
+#: plugins/personal/mail/generic.tpl:117
 msgid "Forward messages to"
 msgstr "reenviar mensajes a"
 
-#: plugins/personal/mail/generic.tpl:144
-#: plugins/gofax/faxaccount/generic.tpl:78 plugins/admin/groups/mail.tpl:98
+#: plugins/personal/mail/generic.tpl:128
+#: plugins/gofax/faxaccount/generic.tpl:76 plugins/admin/groups/mail.tpl:102
 msgid "Add local"
 msgstr "Añadir Cuenta Local"
 
-#: plugins/personal/mail/generic.tpl:154
+#: plugins/personal/mail/generic.tpl:138
 msgid "Advanced mail options"
 msgstr "Opciones de correo avanzadas"
 
-#: plugins/personal/mail/generic.tpl:159
+#: plugins/personal/mail/generic.tpl:143
 msgid "Select if user can only send and receive inside his own domain"
 msgstr ""
 "Seleccione si el usuario solo puede enviar y recibir dentro de su propio "
 "dominio"
 
-#: plugins/personal/mail/generic.tpl:160
+#: plugins/personal/mail/generic.tpl:144
 msgid "User is only allowed to send and receive local mails"
 msgstr ""
 "El usuario solo esta permitido a enviar y recibir correo de forma local"
 
-#: plugins/personal/mail/generic.tpl:167
+#: plugins/personal/mail/generic.tpl:151
 msgid "Use custom sieve script"
 msgstr "Usar 'script sive' propios"
 
-#: plugins/personal/mail/generic.tpl:167
+#: plugins/personal/mail/generic.tpl:151
 msgid "disables all Mail options!"
 msgstr "¡Desactivar todas las opciones de correo!"
 
@@ -361,7 +378,7 @@ msgstr "¡Desactivar todas las opciones de correo!"
 #: plugins/personal/connectivity/class_kolabAccount.inc:6
 #: plugins/personal/connectivity/class_webdavAccount.inc:7
 #: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:6
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
 #: plugins/personal/connectivity/class_connectivity.inc:16
 #: plugins/personal/connectivity/class_proxyAccount.inc:6
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:6
@@ -381,6 +398,7 @@ msgstr "¡Desactivar todas las opciones de correo!"
 #: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
 #: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
 msgid "This does something"
 msgstr "Esto hace algo"
 
@@ -394,16 +412,17 @@ 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:189
+#: plugins/personal/mail/class_mailAccount.inc:200
 msgid "This account has no mail extensions."
 msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/mail/class_mailAccount.inc:197
+#: plugins/personal/mail/class_mailAccount.inc:209
 #: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
 msgid "Remove mail account"
 msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:198
+#: plugins/personal/mail/class_mailAccount.inc:210
 #: plugins/admin/groups/class_groupMail.inc:188
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -412,12 +431,13 @@ msgstr ""
 "Esta cuenta tiene las características de correo activas. Puede desactivarlas "
 "apretando a continuación."
 
-#: plugins/personal/mail/class_mailAccount.inc:200
+#: plugins/personal/mail/class_mailAccount.inc:212
 #: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:201
+#: plugins/personal/mail/class_mailAccount.inc:212
 #: plugins/admin/groups/class_groupMail.inc:191
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -426,22 +446,22 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/mail/class_mailAccount.inc:249
+#: plugins/personal/mail/class_mailAccount.inc:260
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "reenvíos."
 
-#: plugins/personal/mail/class_mailAccount.inc:255
+#: plugins/personal/mail/class_mailAccount.inc:266
 #: plugins/admin/groups/class_groupMail.inc:250
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
 "sentido."
 
-#: plugins/personal/mail/class_mailAccount.inc:290
-#: plugins/personal/mail/class_mailAccount.inc:295
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
 #: plugins/admin/groups/class_groupMail.inc:278
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
@@ -450,42 +470,49 @@ msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "direcciones alternativas"
 
-#: plugins/personal/mail/class_mailAccount.inc:305
+#: plugins/personal/mail/class_mailAccount.inc:316
 #: plugins/admin/groups/class_groupMail.inc:283
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "La dirección de correo que esta intentando añadir, ya esta usada por otro "
 "usuario"
 
-#: plugins/personal/mail/class_mailAccount.inc:700
+#: plugins/personal/mail/class_mailAccount.inc:675
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:680
 #: plugins/admin/groups/class_groupMail.inc:610
 msgid "The required field 'Primary address' is not set."
 msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/personal/mail/class_mailAccount.inc:704
-#: plugins/personal/mail/class_mailAccount.inc:708
-#: plugins/addons/addressbook/class_addressbook.inc:566
+#: plugins/personal/mail/class_mailAccount.inc:684
+#: plugins/personal/mail/class_mailAccount.inc:688
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/ogroups/class_mailogroup.inc:67
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/personal/mail/class_mailAccount.inc:715
+#: plugins/personal/mail/class_mailAccount.inc:695
 #: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
 msgid "The primary address you've entered is already in use."
 msgstr "La cuenta principal que ha introducido ya esta en uso."
 
-#: plugins/personal/mail/class_mailAccount.inc:721
+#: plugins/personal/mail/class_mailAccount.inc:701
 #: plugins/admin/groups/class_groupMail.inc:625
 msgid "Value in 'Quota size' is not valid."
 msgstr "El valor de 'Tamaño de Cola' no es valido."
 
-#: plugins/personal/mail/class_mailAccount.inc:730
+#: plugins/personal/mail/class_mailAccount.inc:710
 #: plugins/admin/groups/class_groupMail.inc:634
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/personal/mail/class_mailAccount.inc:740
+#: plugins/personal/mail/class_mailAccount.inc:720
 #: plugins/admin/groups/class_groupMail.inc:642
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
@@ -494,57 +521,60 @@ msgstr ""
 
 #: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
 #: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:60
+#: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
 #: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:74
+#: plugins/gofax/blocklists/generic.tpl:77
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:257
-#: plugins/admin/users/class_userManagement.inc:503
+#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/users/class_userManagement.inc:507
 #: plugins/admin/applications/class_applicationManagement.inc:239
 #: plugins/admin/departments/class_departmentManagement.inc:228
-#: plugins/admin/systems/class_systemManagement.inc:438
-#: plugins/admin/ogroups/class_ogroupManagement.inc:274
+#: plugins/admin/systems/class_systemManagement.inc:440
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
 #: plugins/gofon/phoneaccount/main.inc:104
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
 msgid "Finish"
 msgstr "Terminar"
 
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:51
-#: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/personal/posix/trust_machines.tpl:47
+#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/posix/posix_groups.tpl:74
+#: plugins/personal/posix/trust_machines.tpl:41
 #: plugins/personal/posix/main.inc:112
-#: plugins/personal/samba/samba3_workstations.tpl:47
+#: plugins/personal/samba/samba3_workstations.tpl:41
 #: plugins/personal/samba/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:62
+#: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/generic/main.inc:160
 #: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:76
+#: plugins/gofax/blocklists/generic.tpl:79
 #: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:50
-#: plugins/gofax/faxaccount/lists.tpl:45 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:11
+#: 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:108
 #: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/class_groupManagement.inc:261
 #: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/group_objects.tpl:47
+#: plugins/admin/groups/group_objects.tpl:41
 #: plugins/admin/groups/mail_admins.tpl:39
 #: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/mail_locals.tpl:51 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:505
+#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:509
 #: plugins/admin/users/template.tpl:46 plugins/admin/users/remove.tpl:17
 #: plugins/admin/applications/remove.tpl:16
 #: plugins/admin/applications/class_applicationManagement.inc:241
 #: plugins/admin/departments/remove.tpl:17
 #: plugins/admin/departments/class_departmentManagement.inc:230
-#: plugins/admin/systems/class_systemManagement.inc:440
+#: plugins/admin/systems/class_systemManagement.inc:442
 #: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
 #: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:58
-#: plugins/admin/ogroups/class_ogroupManagement.inc:276
+#: plugins/admin/ogroups/ogroup_objects.tpl:52
+#: plugins/admin/ogroups/class_ogroupManagement.inc:272
 #: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: plugins/gofon/macro/remove.tpl:16
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:240
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr "Cancelar"
@@ -561,15 +591,15 @@ msgstr ""
 #: 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/gofax/blocklists/headpage.tpl:16
-#: plugins/gofax/faxaccount/generic.tpl:92
-#: plugins/gofax/faxaccount/generic.tpl:98
-#: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:71
-#: plugins/admin/groups/headpage.tpl:16 plugins/admin/users/headpage.tpl:21
-#: plugins/admin/applications/headpage.tpl:16
-#: plugins/admin/departments/headpage.tpl:16
-#: plugins/admin/systems/headpage.tpl:16 plugins/admin/ogroups/headpage.tpl:16
-#: plugins/gofon/phoneaccount/main.inc:112
+#: plugins/gofax/blocklists/headpage.tpl:17
+#: 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/groups/headpage.tpl:17 plugins/admin/users/headpage.tpl:18
+#: plugins/admin/applications/headpage.tpl:17
+#: plugins/admin/departments/headpage.tpl:17
+#: plugins/admin/systems/headpage.tpl:16 plugins/admin/ogroups/headpage.tpl:17
+#: plugins/gofon/phoneaccount/main.inc:112 plugins/gofon/macro/headpage.tpl:17
 msgid "Edit"
 msgstr "Editar"
 
@@ -582,58 +612,59 @@ msgstr "Parametros del correo de usuarios"
 msgid "Select addresses to add"
 msgstr "Seleccione dirección para añadir"
 
-#: plugins/personal/mail/mail_locals.tpl:29
-#: plugins/admin/groups/mail_locals.tpl:29
+#: plugins/personal/mail/mail_locals.tpl:26
+#: plugins/admin/groups/mail_locals.tpl:30
 msgid "Display addresses of department"
 msgstr "Mostrar las direcciones de los departamentos"
 
-#: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/personal/posix/posix_groups.tpl:37
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/personal/samba/samba3_workstations.tpl:30
-#: plugins/gofax/blocklists/headpage.tpl:57
-#: plugins/gofax/faxaccount/locals.tpl:29
+#: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:39
+#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/personal/samba/samba3_workstations.tpl:27
+#: plugins/gofax/blocklists/headpage.tpl:58
+#: plugins/gofax/faxaccount/locals.tpl:31
 #: plugins/addons/addressbook/contents.tpl:81
-#: plugins/admin/groups/headpage.tpl:57
-#: plugins/admin/groups/group_objects.tpl:30
-#: plugins/admin/groups/mail_locals.tpl:30 plugins/admin/users/headpage.tpl:65
-#: plugins/admin/applications/headpage.tpl:48
-#: plugins/admin/departments/headpage.tpl:46
+#: plugins/admin/groups/headpage.tpl:66
+#: plugins/admin/groups/group_objects.tpl:27
+#: plugins/admin/groups/mail_locals.tpl:33 plugins/admin/users/headpage.tpl:68
+#: plugins/admin/applications/headpage.tpl:49
+#: plugins/admin/departments/headpage.tpl:47
 #: plugins/admin/systems/headpage.tpl:62
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-#: plugins/admin/ogroups/headpage.tpl:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:38
+#: plugins/admin/ogroups/headpage.tpl:61 plugins/gofon/macro/headpage.tpl:49
 msgid "Choose the department the search will be based on"
 msgstr "Escoja el departamento base de la busqueda"
 
-#: plugins/personal/mail/mail_locals.tpl:35
-#: plugins/admin/groups/mail_locals.tpl:35
+#: plugins/personal/mail/mail_locals.tpl:30
+#: plugins/admin/groups/mail_locals.tpl:42
 msgid "Display addresses matching"
 msgstr "Mostrar direcciones que concuerden con"
 
-#: plugins/personal/mail/mail_locals.tpl:36
-#: plugins/personal/posix/trust_machines.tpl:36
-#: plugins/personal/samba/samba3_workstations.tpl:36
-#: plugins/admin/groups/mail_locals.tpl:36
+#: plugins/personal/mail/mail_locals.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/personal/samba/samba3_workstations.tpl:31
+#: plugins/admin/groups/mail_locals.tpl:45
 msgid "Regular expression for matching addresses"
 msgstr "Expresiones regulares que concuerden con direcciones"
 
-#: plugins/personal/mail/mail_locals.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:39
+#: plugins/personal/mail/mail_locals.tpl:32
+#: plugins/admin/groups/mail_locals.tpl:52
 msgid "Display addresses of user"
 msgstr "Mostrar direcciones del usuario"
 
-#: plugins/personal/mail/mail_locals.tpl:40
-#: plugins/admin/groups/mail_locals.tpl:40
+#: plugins/personal/mail/mail_locals.tpl:33
+#: plugins/admin/groups/mail_locals.tpl:55
 msgid "User name of which addresses are shown"
 msgstr "Nombre de usuario de las direcciones mostradas"
 
 #: plugins/personal/password/class_password.inc:5
 #: 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:34
-#: ihtml/themes/altlinux/login.tpl:38
+#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
+#: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:34 ihtml/themes/default/login.tpl:38
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
 msgid "Password"
 msgstr "Contraseña"
 
@@ -679,7 +710,7 @@ 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/users/headpage.tpl:23
+#: plugins/admin/users/password.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/systems/headpage.tpl:18 plugins/admin/systems/password.tpl:25
 msgid "Set password"
 msgstr "Poner Contraseña"
@@ -698,13 +729,18 @@ msgstr ""
 
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:167 plugins/gofax/reports/detail.tpl:68
-#: plugins/addons/ldapmanager/contentimport.tpl:48
+#: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
-#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1199
+#: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1204
+#: ihtml/themes/altlinux/setup_step2.tpl:12
+#: ihtml/themes/altlinux/setup_step3.tpl:17
+#: ihtml/themes/altlinux/setup_step4.tpl:99
+#: ihtml/themes/altlinux/setup_finish.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:98
+#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr "Atras"
@@ -754,93 +790,93 @@ msgid "Select groups to add"
 msgstr "Seleccione grupo a añadir"
 
 #: plugins/personal/posix/posix_groups.tpl:20
-#: plugins/gofax/blocklists/headpage.tpl:36
+#: plugins/gofax/blocklists/headpage.tpl:37
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
-#: plugins/admin/groups/headpage.tpl:37
+#: plugins/admin/groups/headpage.tpl:38
 #: plugins/admin/groups/group_objects.tpl:20
-#: plugins/admin/users/headpage.tpl:42
-#: plugins/admin/applications/headpage.tpl:36
-#: plugins/admin/departments/headpage.tpl:36
+#: plugins/admin/users/headpage.tpl:39
+#: plugins/admin/applications/headpage.tpl:37
+#: plugins/admin/departments/headpage.tpl:37
 #: plugins/admin/systems/headpage.tpl:37
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
-#: plugins/admin/ogroups/headpage.tpl:37
+#: plugins/admin/ogroups/headpage.tpl:38 plugins/gofon/macro/headpage.tpl:37
 msgid "Filters"
 msgstr "Filtros"
 
-#: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:46
+#: plugins/personal/posix/posix_groups.tpl:27
+#: plugins/admin/groups/headpage.tpl:47
 msgid "Select to see groups that are primary groups of users"
 msgstr "Seleccione para ver que grupos son grupos primarios de usuarios"
 
-#: plugins/personal/posix/posix_groups.tpl:29
-#: plugins/admin/groups/headpage.tpl:46
+#: plugins/personal/posix/posix_groups.tpl:27
+#: plugins/admin/groups/headpage.tpl:47
 msgid "Show primary groups"
 msgstr "Mostrar grupos primarios"
 
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/personal/posix/posix_groups.tpl:28
+#: plugins/admin/groups/headpage.tpl:48
 msgid "Select to see groups that have samba groups mappings"
 msgstr "Seleccione para ver que grupos tienen asignado un grupo samba"
 
-#: plugins/personal/posix/posix_groups.tpl:30
-#: plugins/admin/groups/headpage.tpl:47
+#: plugins/personal/posix/posix_groups.tpl:28
+#: plugins/admin/groups/headpage.tpl:48
 msgid "Show samba groups"
 msgstr "Mostrar los grupos samba"
 
-#: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:48
+#: plugins/personal/posix/posix_groups.tpl:29
+#: plugins/admin/groups/headpage.tpl:49
 msgid "Select to see groups that have applications configured"
 msgstr "Seleccione para ver que grupos tienen aplicaciones configuradas"
 
-#: plugins/personal/posix/posix_groups.tpl:31
-#: plugins/admin/groups/headpage.tpl:48
+#: plugins/personal/posix/posix_groups.tpl:29
+#: plugins/admin/groups/headpage.tpl:49
 msgid "Show application groups"
 msgstr "Mostrar los grupos de aplicaciones"
 
-#: plugins/personal/posix/posix_groups.tpl:32
-#: plugins/admin/groups/headpage.tpl:49
+#: plugins/personal/posix/posix_groups.tpl:30
+#: plugins/admin/groups/headpage.tpl:50
 msgid "Select to see groups that have mail settings"
 msgstr ""
 "Seleccione para ver que grupos tienen configuración de correo electrónico"
 
-#: plugins/personal/posix/posix_groups.tpl:32
-#: plugins/admin/groups/headpage.tpl:49
+#: plugins/personal/posix/posix_groups.tpl:30
+#: plugins/admin/groups/headpage.tpl:50
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/personal/posix/posix_groups.tpl:33
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/personal/posix/posix_groups.tpl:31
+#: plugins/admin/groups/headpage.tpl:51
 msgid "Select to see normal groups that have only functional aspects"
 msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
 
-#: plugins/personal/posix/posix_groups.tpl:33
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/personal/posix/posix_groups.tpl:31
+#: plugins/admin/groups/headpage.tpl:51
 msgid "Show functional groups"
 msgstr "Mostrar grupos funcionales"
 
 #: plugins/personal/posix/posix_groups.tpl:36
-#: plugins/admin/groups/headpage.tpl:56 plugins/admin/ogroups/headpage.tpl:60
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:60
 msgid "Display groups of department"
 msgstr "Mostrar los grupos de departamentos"
 
-#: plugins/personal/posix/posix_groups.tpl:42
-#: plugins/admin/groups/headpage.tpl:60 plugins/admin/ogroups/headpage.tpl:64
+#: plugins/personal/posix/posix_groups.tpl:48
+#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:64
 msgid "Display groups matching"
 msgstr "Mostrar grupos que concuerden con"
 
-#: plugins/personal/posix/posix_groups.tpl:43
-#: plugins/admin/groups/headpage.tpl:61 plugins/admin/ogroups/headpage.tpl:65
+#: plugins/personal/posix/posix_groups.tpl:51
+#: plugins/admin/groups/headpage.tpl:70 plugins/admin/ogroups/headpage.tpl:65
 msgid "Regular expression for matching group names"
 msgstr "Expresión regular que concuerde con nombres de grupos"
 
-#: plugins/personal/posix/posix_groups.tpl:46
-#: plugins/admin/groups/headpage.tpl:62
+#: plugins/personal/posix/posix_groups.tpl:58
+#: plugins/admin/groups/headpage.tpl:71
 msgid "Display groups of user"
 msgstr "Mostrar grupos de usuarios"
 
-#: plugins/personal/posix/posix_groups.tpl:47
-#: plugins/admin/groups/headpage.tpl:63
+#: plugins/personal/posix/posix_groups.tpl:61
+#: plugins/admin/groups/headpage.tpl:72
 msgid "User name of which groups are shown"
 msgstr "Nombres de usuarios de los grupos que se muestran"
 
@@ -858,19 +894,19 @@ msgstr "La contraseña expira en"
 msgid "Select systems to add"
 msgstr "Seleccione sistema a añadir"
 
-#: plugins/personal/posix/trust_machines.tpl:29
+#: plugins/personal/posix/trust_machines.tpl:26
 #: plugins/admin/systems/headpage.tpl:59
 msgid "Display systems of department"
 msgstr "Mostrar sistemas de departamentos"
 
-#: plugins/personal/posix/trust_machines.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:30
 #: plugins/admin/systems/headpage.tpl:71
 msgid "Display systems matching"
 msgstr "Mostrar sistemas que concuerden con"
 
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
-#: plugins/personal/samba/class_sambaAccount.inc:613
+#: plugins/personal/samba/class_sambaAccount.inc:626
 msgid "Home directory"
 msgstr "Directorio Principal"
 
@@ -887,43 +923,43 @@ msgstr "Grupo primario"
 msgid "Status"
 msgstr "Estado"
 
-#: plugins/personal/posix/generic.tpl:38
+#: plugins/personal/posix/generic.tpl:39
 msgid "Force UID/GID"
 msgstr "Forzar UID/GID"
 
-#: plugins/personal/posix/generic.tpl:40
+#: plugins/personal/posix/generic.tpl:43
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/generic.tpl:45
+#: plugins/personal/posix/generic.tpl:52
 msgid "GID"
 msgstr "GID"
 
-#: plugins/personal/posix/generic.tpl:54
+#: plugins/personal/posix/generic.tpl:64
 msgid "Group membership"
 msgstr "Miembros del grupo"
 
-#: plugins/personal/posix/generic.tpl:56
+#: plugins/personal/posix/generic.tpl:66
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
 
-#: plugins/personal/posix/generic.tpl:74
+#: plugins/personal/posix/generic.tpl:84
 msgid "Account"
 msgstr "Cuenta"
 
-#: plugins/personal/posix/generic.tpl:88
+#: plugins/personal/posix/generic.tpl:98
 msgid "Environment"
 msgstr "Entorno"
 
-#: plugins/personal/posix/generic.tpl:91
+#: plugins/personal/posix/generic.tpl:101
 msgid "Default printer"
 msgstr "Impresora por defecto"
 
-#: plugins/personal/posix/generic.tpl:99
+#: plugins/personal/posix/generic.tpl:110
 msgid "Default language"
 msgstr "Lenguaje por defecto"
 
-#: plugins/personal/posix/generic.tpl:112
+#: plugins/personal/posix/generic.tpl:123
 msgid "System trust"
 msgstr "Autentificación del sistema"
 
@@ -933,7 +969,7 @@ msgid "UNIX"
 msgstr "UNIX"
 
 #: plugins/personal/posix/class_posixAccount.inc:132
-#: plugins/personal/posix/class_posixAccount.inc:936
+#: plugins/personal/posix/class_posixAccount.inc:942
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
@@ -942,8 +978,8 @@ msgid "unconfigured"
 msgstr "Desconfigurado"
 
 #: plugins/personal/posix/class_posixAccount.inc:190
-#: plugins/admin/systems/class_terminalService.inc:121
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:99
+#: plugins/admin/systems/class_terminalService.inc:122
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:190
 msgid "automatic"
 msgstr "automático"
 
@@ -1008,223 +1044,225 @@ 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:461
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:214
+#: 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:220
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
 msgstr "Enero"
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:214
+#: 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:220
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
 msgstr "Febrero"
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:214
+#: 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:220
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
 msgstr "Marzo"
 
 #: plugins/personal/posix/class_posixAccount.inc:461
-#: plugins/personal/samba/class_sambaAccount.inc:345
-#: plugins/personal/samba/class_sambaAccount.inc:363
-#: plugins/personal/samba/class_sambaAccount.inc:381
-#: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:214
+#: 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:220
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
 msgstr "Abril"
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:215
+#: 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:221
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
 msgstr "Mayo"
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:215
+#: 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:221
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
 msgstr "Junio"
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:215
+#: 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:221
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
 msgstr "Julio"
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:215
+#: 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:221
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
 msgstr "Agosto"
 
 #: plugins/personal/posix/class_posixAccount.inc:462
-#: plugins/personal/samba/class_sambaAccount.inc:346
-#: plugins/personal/samba/class_sambaAccount.inc:364
-#: plugins/personal/samba/class_sambaAccount.inc:382
-#: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:215
+#: 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:221
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
 msgstr "Septiembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:347
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/generic/class_user.inc:216
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
 msgstr "Octubre"
 
 #: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:347
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/generic/class_user.inc:216
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
 msgstr "Noviembre"
 
 #: plugins/personal/posix/class_posixAccount.inc:463
-#: plugins/personal/samba/class_sambaAccount.inc:347
-#: plugins/personal/samba/class_sambaAccount.inc:365
-#: plugins/personal/samba/class_sambaAccount.inc:383
-#: plugins/personal/samba/class_sambaAccount.inc:401
-#: plugins/personal/generic/class_user.inc:216
+#: 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:222
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
 msgstr "Diciembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:534
-#: plugins/personal/samba/class_sambaAccount.inc:442
-#: plugins/admin/systems/class_terminalGeneric.inc:61
+#: plugins/personal/posix/class_posixAccount.inc:541
+#: plugins/personal/samba/class_sambaAccount.inc:450
+#: plugins/admin/systems/class_terminalGeneric.inc:62
 #: plugins/admin/systems/class_workstationGeneric.inc:70
+#: ihtml/themes/altlinux/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/personal/posix/class_posixAccount.inc:534
+#: plugins/personal/posix/class_posixAccount.inc:541
 msgid "full access"
 msgstr "Acceso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:535
+#: plugins/personal/posix/class_posixAccount.inc:542
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/personal/posix/class_posixAccount.inc:703
+#: plugins/personal/posix/class_posixAccount.inc:710
 msgid "Failed: overriding lock"
 msgstr "Fallo: Sobrepasado bloqueo"
 
-#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:858
 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:854
+#: plugins/personal/posix/class_posixAccount.inc:861
 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:862
+#: plugins/personal/posix/class_posixAccount.inc:869
 msgid "Value specified as 'UID' is not valid."
 msgstr "El valor especificado en 'UID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:865
+#: plugins/personal/posix/class_posixAccount.inc:872
 msgid "Value specified as 'UID' is too small."
 msgstr "El valor especificado como 'UID' es demasiado pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:869
+#: plugins/personal/posix/class_posixAccount.inc:876
 #: plugins/admin/groups/class_groupGeneric.inc:610
 msgid "Value specified as 'GID' is not valid."
 msgstr "El valor especificado como 'GID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:872
+#: plugins/personal/posix/class_posixAccount.inc:879
 #: plugins/admin/groups/class_groupGeneric.inc:613
 msgid "Value specified as 'GID' is too small."
 msgstr "El valor especificado como 'GID' es muy pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:881
+#: plugins/personal/posix/class_posixAccount.inc:887
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "El valor especificado en 'shadowMin' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:886
+#: plugins/personal/posix/class_posixAccount.inc:892
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "El valor especificado en 'shadowMax' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:891
+#: plugins/personal/posix/class_posixAccount.inc:897
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "El valor especificado en 'shadowWarning' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:894
+#: plugins/personal/posix/class_posixAccount.inc:900
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:897
+#: plugins/personal/posix/class_posixAccount.inc:903
 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:900
+#: plugins/personal/posix/class_posixAccount.inc:906
 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:905
+#: plugins/personal/posix/class_posixAccount.inc:911
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "El valor especificado en 'shadowInactive' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:908
+#: plugins/personal/posix/class_posixAccount.inc:914
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "'shadowInactive' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:913
+#: plugins/personal/posix/class_posixAccount.inc:919
 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:1015
+#: plugins/personal/posix/class_posixAccount.inc:1021
 #: plugins/admin/groups/class_groupGeneric.inc:644
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
@@ -1243,7 +1281,7 @@ msgstr "Ruta del Script"
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
 #: plugins/personal/samba/samba3.tpl:75
-#: plugins/personal/samba/class_sambaAccount.inc:614
+#: plugins/personal/samba/class_sambaAccount.inc:627
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
@@ -1292,17 +1330,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Características de tiempo de desconexión (en minutos)"
 
 #: plugins/personal/samba/samba3.tpl:116
-#: plugins/personal/samba/class_sambaAccount.inc:621
+#: plugins/personal/samba/class_sambaAccount.inc:634
 msgid "Connection"
 msgstr "Conexión"
 
 #: plugins/personal/samba/samba3.tpl:125
-#: plugins/personal/samba/class_sambaAccount.inc:622
+#: plugins/personal/samba/class_sambaAccount.inc:635
 msgid "Disconnection"
 msgstr "Desconexión"
 
 #: plugins/personal/samba/samba3.tpl:134
-#: plugins/personal/samba/class_sambaAccount.inc:623
+#: plugins/personal/samba/class_sambaAccount.inc:636
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -1363,11 +1401,11 @@ msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 msgid "Select workstations to add"
 msgstr "Selecciones estaciones de trabajo para añadir"
 
-#: plugins/personal/samba/samba3_workstations.tpl:29
+#: plugins/personal/samba/samba3_workstations.tpl:26
 msgid "Display workstations of department"
 msgstr "Mostrar estaciones de trabajo de departamentos"
 
-#: plugins/personal/samba/samba3_workstations.tpl:35
+#: plugins/personal/samba/samba3_workstations.tpl:30
 msgid "Display workstations matching"
 msgstr "Mostrar estaciones de trabajo que concuerden con"
 
@@ -1413,44 +1451,44 @@ msgstr ""
 "características Posix son necesarias para las cuentas samba, activelas "
 "primero."
 
-#: plugins/personal/samba/class_sambaAccount.inc:443
+#: plugins/personal/samba/class_sambaAccount.inc:451
 msgid "input on, notify on"
 msgstr "Activación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:444
+#: plugins/personal/samba/class_sambaAccount.inc:452
 msgid "input on, notify off"
 msgstr "Activación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:445
+#: plugins/personal/samba/class_sambaAccount.inc:453
 msgid "input off, notify on"
 msgstr "Desactivación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:446
+#: plugins/personal/samba/class_sambaAccount.inc:454
 msgid "input off, nofify off"
 msgstr "Desactivación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:448
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "disconnect"
 msgstr "desconectar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:449
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "reset"
 msgstr "Borrar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:451
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "from any client"
 msgstr "Desde cualquier cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:452
+#: plugins/personal/samba/class_sambaAccount.inc:460
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:616
+#: plugins/personal/samba/class_sambaAccount.inc:629
 #, 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:626
+#: plugins/personal/samba/class_sambaAccount.inc:639
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1458,7 +1496,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:632
+#: plugins/personal/samba/class_sambaAccount.inc:645
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1466,7 +1504,7 @@ msgstr ""
 "El gestor de usuarios de windows solo permite ocho clientes. Ha especificado "
 "mas de ocho."
 
-#: plugins/personal/samba/class_sambaAccount.inc:809
+#: plugins/personal/samba/class_sambaAccount.inc:822
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1474,7 +1512,7 @@ msgstr ""
 "Aviso: Esta cuenta tiene asignado un SID indefinido. ¡El problema no puede "
 "ser solucionado por GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:834
+#: plugins/personal/samba/class_sambaAccount.inc:847
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1517,15 +1555,15 @@ msgstr "Cambiar foto"
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/addons/addressbook/address_edit.tpl:20
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:500
+#: plugins/addons/addressbook/class_addressbook.inc:503
 #: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/users/template.tpl:19
+#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Nombre"
 
 #: plugins/personal/generic/generic.tpl:30
 #: plugins/addons/addressbook/address_edit.tpl:20
-#: plugins/addons/addressbook/class_addressbook.inc:500
+#: plugins/addons/addressbook/class_addressbook.inc:503
 #: plugins/admin/users/template.tpl:23
 msgid "Given name"
 msgstr "Nombre"
@@ -1567,6 +1605,7 @@ msgstr "Sexo"
 #: plugins/admin/systems/workstation.tpl:18
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
+#: plugins/gofon/macro/generic.tpl:20
 msgid "Base"
 msgstr "Base"
 
@@ -1597,7 +1636,7 @@ msgid "Password storage"
 msgstr "Carpeta de almacenamiento de Contraseñas"
 
 #: plugins/personal/generic/generic.tpl:138
-#: plugins/personal/generic/generic_certs.tpl:7
+#: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificados"
 
@@ -1724,107 +1763,114 @@ msgstr "Último envío"
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
-#: plugins/personal/generic/generic_certs.tpl:14
+#: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificado estandar"
 
-#: plugins/personal/generic/generic_certs.tpl:19
-#: plugins/personal/generic/generic_certs.tpl:30
-#: plugins/personal/generic/generic_certs.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:198
+#: 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/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:377
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Eliminar"
 
-#: plugins/personal/generic/generic_certs.tpl:25
+#: plugins/personal/generic/generic_certs.tpl:28
 msgid "S/MIME certificate"
 msgstr "Certificado S/MIME"
 
-#: plugins/personal/generic/generic_certs.tpl:36
+#: plugins/personal/generic/generic_certs.tpl:48
 msgid "PKCS12 certificate"
 msgstr "Certificado PKCS12"
 
-#: plugins/personal/generic/generic_certs.tpl:48
+#: plugins/personal/generic/generic_certs.tpl:65
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
-#: plugins/personal/generic/class_user.inc:225
+#: plugins/personal/generic/class_user.inc:231
 msgid "female"
 msgstr "mujer"
 
-#: plugins/personal/generic/class_user.inc:225
+#: plugins/personal/generic/class_user.inc:231
 msgid "male"
 msgstr "hombre"
 
-#: plugins/personal/generic/class_user.inc:235
+#: plugins/personal/generic/class_user.inc:241
 msgid "This account has no valid GOsa extensions."
 msgstr "Esta cuenta no tiene extensiones GOsa validas"
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:270
 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:358
+#: plugins/personal/generic/class_user.inc:365
 msgid "Please enter a valid serial number"
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/personal/generic/class_user.inc:362
-#: plugins/personal/generic/class_user.inc:387
-#: plugins/admin/systems/class_terminalInfo.inc:52
-#: plugins/admin/systems/class_terminalInfo.inc:167
-msgid "present"
-msgstr "presente"
+#: plugins/personal/generic/class_user.inc:402
+#, php-format
+msgid ""
+"Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:402
+msgid "valid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:402
+msgid "invalid"
+msgstr ""
 
-#: plugins/personal/generic/class_user.inc:364
-#: plugins/personal/generic/class_user.inc:389
-msgid "absent"
-msgstr "ausente"
+#: plugins/personal/generic/class_user.inc:406
+#, fuzzy
+msgid "No certificate installed"
+msgstr "Editar certificados"
 
-#: plugins/personal/generic/class_user.inc:777
+#: plugins/personal/generic/class_user.inc:800
 msgid "Kerberos database communication failed"
 msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/class_user.inc:794
+#: plugins/personal/generic/class_user.inc:817
 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:805
+#: plugins/personal/generic/class_user.inc:828
 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:845
+#: plugins/personal/generic/class_user.inc:868
 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:850
+#: plugins/personal/generic/class_user.inc:873
 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:856
-#: plugins/addons/addressbook/class_addressbook.inc:523
-#: plugins/admin/users/class_userManagement.inc:422
+#: plugins/personal/generic/class_user.inc:879
+#: plugins/addons/addressbook/class_addressbook.inc:526
+#: plugins/admin/users/class_userManagement.inc:425
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:865
+#: plugins/personal/generic/class_user.inc:888
 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:871
-#: plugins/addons/addressbook/class_addressbook.inc:527
-#: plugins/admin/users/class_userManagement.inc:425
+#: plugins/personal/generic/class_user.inc:894
+#: plugins/addons/addressbook/class_addressbook.inc:530
+#: plugins/admin/users/class_userManagement.inc:428
 msgid "The required field 'Given name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:874
+#: plugins/personal/generic/class_user.inc:897
 msgid "The required field 'Login' is not set."
 msgstr " El campo requerido 'Login' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:881
+#: plugins/personal/generic/class_user.inc:904
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -1832,7 +1878,7 @@ msgstr ""
 "Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
 "base de datos."
 
-#: plugins/personal/generic/class_user.inc:888
+#: plugins/personal/generic/class_user.inc:911
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -1840,50 +1886,55 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/personal/generic/class_user.inc:891
+#: plugins/personal/generic/class_user.inc:914
 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:894
-#: plugins/personal/generic/class_user.inc:922
-#: plugins/addons/addressbook/class_addressbook.inc:533
-#: plugins/addons/addressbook/class_addressbook.inc:561
+#: plugins/personal/generic/class_user.inc:917
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:536
+#: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/admin/departments/class_departmentGeneric.inc:155
 msgid "The field 'Name' contains invalid characters."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/personal/generic/class_user.inc:897
-#: plugins/personal/generic/class_user.inc:919
-#: plugins/addons/addressbook/class_addressbook.inc:536
-#: plugins/addons/addressbook/class_addressbook.inc:558
+#: plugins/personal/generic/class_user.inc:920
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:539
+#: plugins/addons/addressbook/class_addressbook.inc:561
 msgid "The field 'Given name' contains invalid characters."
 msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
 
-#: plugins/personal/generic/class_user.inc:902
-#: plugins/personal/generic/class_user.inc:905
-#: plugins/addons/addressbook/class_addressbook.inc:541
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:928
 #: plugins/addons/addressbook/class_addressbook.inc:544
+#: plugins/addons/addressbook/class_addressbook.inc:547
 #: plugins/admin/departments/class_departmentGeneric.inc:158
 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:908
-#: plugins/addons/addressbook/class_addressbook.inc:547
+#: plugins/personal/generic/class_user.inc:931
+#: plugins/addons/addressbook/class_addressbook.inc:550
 #: plugins/admin/departments/class_departmentGeneric.inc:161
 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:911
-#: plugins/addons/addressbook/class_addressbook.inc:550
+#: plugins/personal/generic/class_user.inc:934
+#: plugins/addons/addressbook/class_addressbook.inc:553
 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:914
-#: plugins/addons/addressbook/class_addressbook.inc:553
+#: plugins/personal/generic/class_user.inc:937
+#: plugins/addons/addressbook/class_addressbook.inc:556
 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:1062
+#, fuzzy
+msgid "Could not open specified certificate!"
+msgstr "No puedo seleccionar la base de datos."
+
 #: plugins/personal/generic/main.inc:107
 msgid "You are not allowed to set your password!"
 msgstr "¡No tiene permisos para cambiar su contraseña!"
@@ -1896,23 +1947,23 @@ msgstr "Información genérica del usuario"
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/proxy.tpl:14
+#: plugins/personal/connectivity/proxy.tpl:16
 msgid "Proxy account"
 msgstr "Cuenta proxy"
 
-#: plugins/personal/connectivity/proxy.tpl:22
+#: plugins/personal/connectivity/proxy.tpl:24
 msgid "Filter unwanted content (i.e. pornographic or violence related)"
 msgstr "Filtrar contenido indeseable (p.e. pornografía o contenido violento)"
 
-#: plugins/personal/connectivity/proxy.tpl:33
+#: plugins/personal/connectivity/proxy.tpl:35
 msgid "Limit proxy access to working time"
 msgstr "Limitar acceso al proxy al horario laboral"
 
-#: plugins/personal/connectivity/proxy.tpl:67
+#: plugins/personal/connectivity/proxy.tpl:69
 msgid "Restrict proxy usage by quota"
 msgstr "Restringir el uso del proxy con cuota"
 
-#: plugins/personal/connectivity/proxy.tpl:77
+#: plugins/personal/connectivity/proxy.tpl:79
 msgid "per"
 msgstr "por"
 
@@ -1955,25 +2006,25 @@ msgstr "Preguntar si hay conflictos"
 msgid "Manual"
 msgstr "Manual"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:172
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:224
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
 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:229
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
 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:243
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
 #, 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:251
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
@@ -1989,23 +2040,23 @@ msgstr "WebDAV"
 msgid "FTP"
 msgstr "FTP"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:120
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
 msgid "Value specified as 'Upload bandwidth' is not valid."
 msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:123
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
 msgid "Value specified as 'Download bandwidth' is not valid."
 msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:126
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
 msgid "Value specified as 'Files' is not valid."
 msgstr "El valor especificado como 'Archivos' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:129
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
 msgid "Value specified as 'Size' is not valid."
 msgstr "El valor especificado como 'Tamaño' no es válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:132
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
 msgid "Value specified as 'Ratio' is not valid."
 msgstr "El valor especificado como 'relación' no es válido"
 
@@ -2013,24 +2064,44 @@ msgstr "El valor especificado como 'relación' no es válido"
 msgid "PHPGroupware account"
 msgstr "Cuenta PHPGroupware"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:5
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:663
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:610
+#, fuzzy
+msgid ""
+"This account has <b>OpenXchange</b> 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
+#, fuzzy
+msgid ""
+"This account has <b>OpenXchange</b> 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:774
 msgid "Couldn't Connect To Postgresql Database"
 msgstr "No puedo conectar al servidor de base de datos postgresql."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:667
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:730
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:700
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:778
 msgid "Needed Parameters to openexchange connectivity plugin failed!"
 msgstr ""
 "¡Los parámetros necesarios para extensión de conectividad open-xchange no "
 "son validos!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:671
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:704
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:782
 msgid "PHP4 module for Postgresql Database Failed!"
 msgstr "¡El módulo de PHP4 para la base de datos Postgresql falla!"
 
@@ -2050,33 +2121,33 @@ msgstr ""
 msgid "Delegations"
 msgstr "Delegaciones"
 
-#: plugins/personal/connectivity/kolab.tpl:22
+#: plugins/personal/connectivity/kolab.tpl:23
 msgid "Mail size"
 msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/connectivity/kolab.tpl:23
+#: plugins/personal/connectivity/kolab.tpl:24
 msgid "No mail size restriction for this account"
 msgstr "No hay restricción de correo para esta cuenta."
 
-#: plugins/personal/connectivity/kolab.tpl:31
+#: plugins/personal/connectivity/kolab.tpl:32
 msgid "Free Busy information"
 msgstr "Información de estado de presencia"
 
-#: plugins/personal/connectivity/kolab.tpl:34
+#: plugins/personal/connectivity/kolab.tpl:35
 msgid "URL"
 msgstr "URL"
 
-#: plugins/personal/connectivity/kolab.tpl:38
+#: plugins/personal/connectivity/kolab.tpl:39
 msgid "Future"
 msgstr "Futuro"
 
-#: plugins/personal/connectivity/kolab.tpl:39
+#: plugins/personal/connectivity/kolab.tpl:40
 #: plugins/personal/connectivity/oxchange.tpl:18
 #: plugins/personal/connectivity/oxchange.tpl:22
 msgid "days"
 msgstr "días"
 
-#: plugins/personal/connectivity/kolab.tpl:44
+#: plugins/personal/connectivity/kolab.tpl:45
 msgid "Invitation policy"
 msgstr "Política de invitación"
 
@@ -2174,27 +2245,27 @@ msgstr "Esta cuenta no tiene extensiones de conectividad"
 msgid "Proxy"
 msgstr "Proxy"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:75
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
 msgid "KB"
 msgstr "Kb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:75
+#: plugins/personal/connectivity/class_proxyAccount.inc:76
 msgid "GB"
 msgstr "Gb"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
 msgid "hour"
 msgstr "hora"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
 msgid "day"
 msgstr "día"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
 msgid "week"
 msgstr "semana"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:76
+#: plugins/personal/connectivity/class_proxyAccount.inc:77
 msgid "month"
 msgstr "mes"
 
@@ -2265,46 +2336,48 @@ msgstr "Nombre de la lista de bloqueos"
 msgid "Select subtree to place blocklist in"
 msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 
-#: plugins/gofax/blocklists/generic.tpl:31
+#: plugins/gofax/blocklists/generic.tpl:32
 #: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/functions.inc:1595
+#: include/php_setup.inc:122
 msgid "Type"
 msgstr "Tipo"
 
-#: plugins/gofax/blocklists/generic.tpl:33
+#: plugins/gofax/blocklists/generic.tpl:34
 msgid "Select wether to filter incoming or outgoing calls"
 msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
 
-#: plugins/gofax/blocklists/generic.tpl:39 plugins/admin/groups/generic.tpl:13
+#: 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:10
 #: plugins/admin/systems/wingeneric.tpl:24
 #: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:36
 #: plugins/generic/references/contents.tpl:11
 msgid "Description"
 msgstr "Descripción"
 
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:43
 msgid "Descriptive text for this blocklist"
 msgstr "Descripción de esta lista de bloqueos"
 
-#: plugins/gofax/blocklists/generic.tpl:54
+#: plugins/gofax/blocklists/generic.tpl:56
 msgid "Blocked numbers"
 msgstr "Números bloqueados"
 
-#: plugins/gofax/blocklists/generic.tpl:64
-#: plugins/gofax/blocklists/headpage.tpl:24
+#: plugins/gofax/blocklists/generic.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:25
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/admin/groups/headpage.tpl:25 plugins/admin/users/headpage.tpl:30
-#: plugins/admin/applications/headpage.tpl:24
-#: plugins/admin/departments/headpage.tpl:24
-#: plugins/admin/systems/headpage.tpl:25 plugins/admin/ogroups/headpage.tpl:25
+#: plugins/admin/groups/headpage.tpl:26 plugins/admin/users/headpage.tpl:27
+#: plugins/admin/applications/headpage.tpl:25
+#: plugins/admin/departments/headpage.tpl:25
+#: plugins/admin/systems/headpage.tpl:25 plugins/admin/ogroups/headpage.tpl:26
+#: plugins/gofon/macro/headpage.tpl:25
 msgid "Information"
 msgstr "Información"
 
-#: plugins/gofax/blocklists/generic.tpl:66
+#: plugins/gofax/blocklists/generic.tpl:69
 msgid "Numbers can also contain wild cards."
 msgstr "Los números pueden contener también comodínes"
 
@@ -2312,9 +2385,10 @@ msgstr "Los números pueden contener también comodínes"
 #: 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 html/index.php:215
-#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
-#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
+#: html/index.php:231 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"
 
@@ -2329,7 +2403,7 @@ msgstr ""
 #: 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/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."
@@ -2341,15 +2415,16 @@ msgstr ""
 msgid "List of blocklists"
 msgstr "Lista de listas de bloqueos"
 
-#: plugins/gofax/blocklists/headpage.tpl:15
-#: plugins/admin/groups/headpage.tpl:15 plugins/admin/users/headpage.tpl:19
-#: plugins/admin/applications/headpage.tpl:15
-#: plugins/admin/departments/headpage.tpl:15
-#: plugins/admin/systems/headpage.tpl:15 plugins/admin/ogroups/headpage.tpl:15
+#: plugins/gofax/blocklists/headpage.tpl:16
+#: plugins/admin/groups/headpage.tpl:16 plugins/admin/users/headpage.tpl:16
+#: plugins/admin/applications/headpage.tpl:16
+#: plugins/admin/departments/headpage.tpl:16
+#: plugins/admin/systems/headpage.tpl:15 plugins/admin/ogroups/headpage.tpl:16
+#: plugins/gofon/macro/headpage.tpl:16
 msgid "New"
 msgstr "Nuevo"
 
-#: plugins/gofax/blocklists/headpage.tpl:28
+#: plugins/gofax/blocklists/headpage.tpl:29
 msgid ""
 "This menu allows you to create, delete and edit selected blocklists. Having "
 "a large size of lists, you might prefer the range selectors on top of the "
@@ -2359,7 +2434,7 @@ msgstr ""
 "el selector de rango en la parte superior de la lista, cuando trabaja con un "
 "gran número de listas de bloqueo."
 
-#: plugins/gofax/blocklists/headpage.tpl:31
+#: plugins/gofax/blocklists/headpage.tpl:32
 msgid ""
 "-Edit- and -New...- will execute an assistant to aid you when performing "
 "changes on your blocklist. -Delete- will ask you for confirmation before "
@@ -2369,39 +2444,39 @@ msgstr ""
 "cree cambios en sus listas de bloqueos. - Eliminar - le pedirá confirmación "
 "antes de eliminar realmente nada."
 
-#: plugins/gofax/blocklists/headpage.tpl:45
+#: plugins/gofax/blocklists/headpage.tpl:46
 msgid "Select to see send blocklists"
 msgstr "Seleccione para mostrar listas de bloqueo salientes"
 
-#: plugins/gofax/blocklists/headpage.tpl:45
+#: plugins/gofax/blocklists/headpage.tpl:46
 msgid "Show send blocklists"
 msgstr "Mostrar listas de bloqueos salientes"
 
-#: plugins/gofax/blocklists/headpage.tpl:46
+#: plugins/gofax/blocklists/headpage.tpl:47
 msgid "Select to see receive blocklists"
 msgstr "Seleccione para mostrar listas de bloqueo entrantes"
 
-#: plugins/gofax/blocklists/headpage.tpl:46
+#: plugins/gofax/blocklists/headpage.tpl:47
 msgid "Show receive blocklists"
 msgstr "Mostrar listas de bloqueos entrantes"
 
-#: plugins/gofax/blocklists/headpage.tpl:54
+#: plugins/gofax/blocklists/headpage.tpl:55
 msgid "Display lists of department"
 msgstr "Mostrar listas de Departamentos"
 
-#: plugins/gofax/blocklists/headpage.tpl:67
+#: plugins/gofax/blocklists/headpage.tpl:69
 msgid "Display lists matching"
 msgstr "Mostrar listas que contengan"
 
-#: plugins/gofax/blocklists/headpage.tpl:70
+#: plugins/gofax/blocklists/headpage.tpl:72
 msgid "Regular expression for matching list names"
 msgstr "Expresiones regulares para encontrar nombres de listas"
 
-#: plugins/gofax/blocklists/headpage.tpl:78
+#: plugins/gofax/blocklists/headpage.tpl:80
 msgid "Display lists containing"
 msgstr "Mostrar listas que contengan"
 
-#: plugins/gofax/blocklists/headpage.tpl:81
+#: plugins/gofax/blocklists/headpage.tpl:83
 msgid "Show lists containing entered numbers"
 msgstr "Mostrar listas que contengan los números ya introducidos"
 
@@ -2451,19 +2526,19 @@ msgstr "Enviar fax como correo electrónico"
 msgid "Deliver fax to printer"
 msgstr "Enviar fax a la impresora"
 
-#: plugins/gofax/faxaccount/generic.tpl:68
+#: plugins/gofax/faxaccount/generic.tpl:69
 msgid "Alternate fax numbers"
 msgstr "Intercambiar los números de fax"
 
-#: plugins/gofax/faxaccount/generic.tpl:87
+#: plugins/gofax/faxaccount/generic.tpl:85
 msgid "Blocklists"
 msgstr "Listas de bloqueo"
 
-#: plugins/gofax/faxaccount/generic.tpl:90
+#: plugins/gofax/faxaccount/generic.tpl:88
 msgid "Blocklists for incoming fax"
 msgstr "Listas de bloqueo para fax entrante"
 
-#: plugins/gofax/faxaccount/generic.tpl:96
+#: plugins/gofax/faxaccount/generic.tpl:94
 msgid "Blocklists for outgoing fax"
 msgstr "Listas de bloqueo para fax saliente"
 
@@ -2475,19 +2550,19 @@ msgstr "Seleccione números para añadir"
 msgid "Display numbers of department"
 msgstr "Mostrar número de Departamentos"
 
-#: plugins/gofax/faxaccount/locals.tpl:34
+#: plugins/gofax/faxaccount/locals.tpl:40
 msgid "Display numbers matching"
 msgstr "Mostrar números que concuerdan con"
 
-#: plugins/gofax/faxaccount/locals.tpl:35
+#: plugins/gofax/faxaccount/locals.tpl:43
 msgid "Regular expression for matching numbers"
 msgstr "Expresiones regulares que concuerden con números"
 
-#: plugins/gofax/faxaccount/locals.tpl:38
+#: plugins/gofax/faxaccount/locals.tpl:49
 msgid "Display numbers of user"
 msgstr "Mostrar números de usuarios"
 
-#: plugins/gofax/faxaccount/locals.tpl:39
+#: plugins/gofax/faxaccount/locals.tpl:52
 msgid "User name of which numbers are shown"
 msgstr "Nombre de usuario cuyos números están siendo mostrados"
 
@@ -2495,23 +2570,23 @@ msgstr "Nombre de usuario cuyos números están siendo mostrados"
 msgid "Blocked numbers/lists"
 msgstr "Listas/Numeros bloqueados"
 
-#: plugins/gofax/faxaccount/lists.tpl:22
+#: plugins/gofax/faxaccount/lists.tpl:19
 #: plugins/admin/groups/mail_admins.tpl:24
 msgid "Select a specific department"
 msgstr "Seleccionar un departamento especifico"
 
-#: plugins/gofax/faxaccount/lists.tpl:28 plugins/admin/groups/acl.tpl:12
+#: plugins/gofax/faxaccount/lists.tpl:25 plugins/admin/groups/acl.tpl:12
 #: plugins/admin/groups/mail_admins.tpl:30
 msgid "Choose"
 msgstr "Elige"
 
-#: plugins/gofax/faxaccount/lists.tpl:30
+#: plugins/gofax/faxaccount/lists.tpl:27
 msgid "List of predefined blocklists"
 msgstr "Listas de listas de bloqueos predefinidas"
 
-#: plugins/gofax/faxaccount/lists.tpl:43
+#: plugins/gofax/faxaccount/lists.tpl:37
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1190
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1195
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -2558,21 +2633,21 @@ msgstr ""
 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:500
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:470
 msgid "The required field 'Fax' is not set."
 msgstr "No ha rellenado el campo requerido 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:504
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
 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:512
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:482
 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:514
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:484
 msgid "The mail address you've entered is invalid."
 msgstr "La cuenta de correo electrónico que ha introducido no es válida."
 
@@ -2664,8 +2739,8 @@ msgid "Filter"
 msgstr "Filtro"
 
 #: plugins/gofax/reports/contents.tpl:6
-#: plugins/addons/addressbook/contents.tpl:91
-#: plugins/addons/logview/contents.tpl:56 plugins/gofon/reports/contents.tpl:6
+#: plugins/addons/addressbook/contents.tpl:92
+#: plugins/addons/logview/contents.tpl:47 plugins/gofon/reports/contents.tpl:6
 msgid "Search for"
 msgstr "Buscar por"
 
@@ -2687,13 +2762,13 @@ msgid "during"
 msgstr "durante"
 
 #: plugins/gofax/reports/contents.tpl:21
-#: plugins/addons/logview/contents.tpl:76
-#: plugins/gofon/reports/contents.tpl:21
+#: plugins/addons/logview/contents.tpl:67
+#: plugins/gofon/reports/contents.tpl:21 ihtml/themes/default/help.tpl:21
 msgid "Search"
 msgstr "Buscar"
 
 #: plugins/gofax/reports/contents.tpl:31
-#: plugins/addons/logview/contents.tpl:93
+#: plugins/addons/logview/contents.tpl:84
 #: plugins/gofon/reports/contents.tpl:30
 msgid "Date"
 msgstr "Fecha"
@@ -2707,7 +2782,7 @@ msgid "Receiver"
 msgstr "Receptor"
 
 #: plugins/gofax/reports/contents.tpl:47
-#: plugins/addons/logview/contents.tpl:106
+#: plugins/addons/logview/contents.tpl:97
 #: plugins/gofon/reports/contents.tpl:48
 msgid "Search returned no results..."
 msgstr "La busqueda no ha encontrado resultados"
@@ -2720,11 +2795,11 @@ msgstr "Reportes de FAX"
 msgid "Dial connection..."
 msgstr "Marcando conexión"
 
-#: plugins/addons/addressbook/dial.tpl:11
-#: plugins/addons/addressbook/class_addressbook.inc:357
-#: plugins/addons/addressbook/class_addressbook.inc:364
-#: plugins/addons/addressbook/class_addressbook.inc:368
-#: plugins/addons/addressbook/class_addressbook.inc:450
+#: 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:453
 msgid "Dial"
 msgstr "Llamar"
 
@@ -2823,15 +2898,15 @@ msgstr "Enseñar las entradas de la libreta de direcciones"
 msgid "Display results for department"
 msgstr "Mostrar resultados para departamentos"
 
-#: plugins/addons/addressbook/contents.tpl:94
+#: plugins/addons/addressbook/contents.tpl:95
 msgid "Search string"
 msgstr "Cadena de busqueda"
 
-#: plugins/addons/addressbook/contents.tpl:102
+#: plugins/addons/addressbook/contents.tpl:103
 msgid "Match object"
 msgstr "Encontrar objeto"
 
-#: plugins/addons/addressbook/contents.tpl:105
+#: plugins/addons/addressbook/contents.tpl:106
 msgid "Choose the object that will be searched in"
 msgstr "Elegir el objeto que sera buscado"
 
@@ -2853,12 +2928,12 @@ msgstr "Libreta de direcciones"
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
 
-#: plugins/addons/addressbook/class_addressbook.inc:147
+#: plugins/addons/addressbook/class_addressbook.inc:149
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "¿Llamar desde %s a %s ahora?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:151
+#: plugins/addons/addressbook/class_addressbook.inc:153
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -2866,73 +2941,73 @@ msgstr ""
 "No tiene configurado un numero de teléfono personal. Por favor cambie esto "
 "para permitir llamadas directas."
 
-#: plugins/addons/addressbook/class_addressbook.inc:180
-#: plugins/addons/addressbook/class_addressbook.inc:284
+#: plugins/addons/addressbook/class_addressbook.inc:182
+#: plugins/addons/addressbook/class_addressbook.inc:286
 msgid "You are not allowed to delete this entry!"
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:278
+#: plugins/addons/addressbook/class_addressbook.inc:280
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Has decidido eliminar la entrada %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:374
+#: plugins/addons/addressbook/class_addressbook.inc:376
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Salvar el contacto %s como una vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:378
+#: plugins/addons/addressbook/class_addressbook.inc:380
 #, php-format
 msgid "Send mail to %s"
 msgstr "Enviar correo a %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:462
+#: plugins/addons/addressbook/class_addressbook.inc:465
 msgid "global addressbook"
 msgstr "Directorio de contactos global"
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:468
 msgid "organizations user database"
 msgstr "bases de datos de organizaciones de usuarios"
 
-#: plugins/addons/addressbook/class_addressbook.inc:469
+#: plugins/addons/addressbook/class_addressbook.inc:472
 #, php-format
 msgid "Contact stored in %s"
 msgstr "Contacto guardado en %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:471
+#: plugins/addons/addressbook/class_addressbook.inc:474
 msgid "Creating new entry in"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/addons/addressbook/class_addressbook.inc:500
+#: plugins/addons/addressbook/class_addressbook.inc:503
 #: plugins/addons/logview/class_logview.inc:63
 #: plugins/addons/logview/class_logview.inc:77
 msgid "All"
 msgstr "Todo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:501
+#: plugins/addons/addressbook/class_addressbook.inc:504
 msgid "Work phone"
 msgstr "Teléfono del trabajo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:501
+#: plugins/addons/addressbook/class_addressbook.inc:504
 msgid "Cell phone"
 msgstr "Móvil"
 
-#: plugins/addons/addressbook/class_addressbook.inc:502
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Home phone"
 msgstr "Teléfono particular"
 
-#: plugins/addons/addressbook/class_addressbook.inc:502
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: plugins/addons/addressbook/class_addressbook.inc:574
+#: plugins/addons/addressbook/class_addressbook.inc:577
 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:586
+#: plugins/addons/addressbook/class_addressbook.inc:589
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -3017,11 +3092,11 @@ msgstr "Visualizar"
 msgid "Modify existing attributes"
 msgstr "Modificar los atributos existentes"
 
-#: plugins/addons/ldapmanager/contentimport.tpl:37
+#: plugins/addons/ldapmanager/contentimport.tpl:33
 msgid "Overwrite existing entry"
 msgstr "Sobreescribir la entrada actual"
 
-#: plugins/addons/ldapmanager/contentimport.tpl:44
+#: plugins/addons/ldapmanager/contentimport.tpl:40
 msgid "Import successful"
 msgstr "Importación correcta"
 
@@ -3189,31 +3264,31 @@ msgstr ""
 msgid "Show hosts"
 msgstr "Mostrar equipos"
 
-#: plugins/addons/logview/contents.tpl:23
+#: plugins/addons/logview/contents.tpl:20
 msgid "Log level"
 msgstr "Nivel de log"
 
-#: plugins/addons/logview/contents.tpl:44
+#: plugins/addons/logview/contents.tpl:38
 msgid "Time interval"
 msgstr "Intervalo de tiempo"
 
-#: plugins/addons/logview/contents.tpl:57
+#: plugins/addons/logview/contents.tpl:48
 msgid "Enter string to search for"
 msgstr "Introducir la cadena de busqueda"
 
-#: plugins/addons/logview/contents.tpl:69
+#: plugins/addons/logview/contents.tpl:60
 msgid "Ruleset"
 msgstr "Paquete de reglas"
 
-#: plugins/addons/logview/contents.tpl:91
+#: plugins/addons/logview/contents.tpl:82
 msgid "Level"
 msgstr "Nivel"
 
-#: plugins/addons/logview/contents.tpl:92
+#: plugins/addons/logview/contents.tpl:83
 msgid "Hostname"
 msgstr "Nombre de Maquina"
 
-#: plugins/addons/logview/contents.tpl:94
+#: plugins/addons/logview/contents.tpl:85
 msgid "Message"
 msgstr "Mensaje"
 
@@ -3229,19 +3304,19 @@ msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
 msgid "Select mail server to place user on"
 msgstr "Seleccione el servidor de correo del usuario"
 
-#: plugins/admin/groups/mail.tpl:64
+#: plugins/admin/groups/mail.tpl:66
 msgid "IMAP shared folders"
 msgstr "Carpetas compartidas IMAP"
 
-#: plugins/admin/groups/mail.tpl:68
+#: plugins/admin/groups/mail.tpl:70
 msgid "Default permission"
 msgstr "Permisos por defecto"
 
-#: plugins/admin/groups/mail.tpl:76
+#: plugins/admin/groups/mail.tpl:79
 msgid "Member permission"
 msgstr "Miembro con Permisos"
 
-#: plugins/admin/groups/mail.tpl:91
+#: plugins/admin/groups/mail.tpl:94
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
@@ -3250,13 +3325,13 @@ msgstr "Reenviar mensajes a miembros que no sean del grupo"
 msgid "Groups"
 msgstr "Grupos"
 
-#: plugins/admin/groups/class_groupManagement.inc:202
+#: plugins/admin/groups/class_groupManagement.inc:204
 #, 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:208
-#: plugins/admin/groups/class_groupManagement.inc:234
+#: plugins/admin/groups/class_groupManagement.inc:210
+#: plugins/admin/groups/class_groupManagement.inc:236
 msgid "You are not allowed to delete this group!"
 msgstr "¡No le está permitido eliminar este grupo!"
 
@@ -3325,7 +3400,7 @@ msgstr "Administración de grupos"
 msgid "List of groups"
 msgstr "Lista de grupos"
 
-#: plugins/admin/groups/headpage.tpl:29
+#: plugins/admin/groups/headpage.tpl:30
 msgid ""
 "This menu allows you to add, edit and remove selected groups. You may want "
 "to use the range selector on top of the group listbox, when working with a "
@@ -3335,7 +3410,7 @@ msgstr ""
 "usar el selector de rango en la parte superior de la lista de grupos, cuando "
 "trabaja con un gran número de grupos."
 
-#: plugins/admin/groups/headpage.tpl:32 plugins/admin/ogroups/headpage.tpl:32
+#: plugins/admin/groups/headpage.tpl:33 plugins/admin/ogroups/headpage.tpl:33
 msgid ""
 "-Edit- and -New...- will execute an assistant to aid you in editing group "
 "properties. -Delete- will ask for confirmation before removing groups."
@@ -3344,11 +3419,11 @@ msgstr ""
 "edición de las propiedades del grupo. - Eliminar - le pedirá confirmación "
 "antes de eliminar los grupos."
 
-#: plugins/admin/groups/headpage.tpl:51 plugins/admin/users/headpage.tpl:59
+#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
 msgid "Dive into LDAP subtrees when searching"
 msgstr "Desciende a todo el árbol LDAP cuando se busca"
 
-#: plugins/admin/groups/headpage.tpl:51 plugins/admin/users/headpage.tpl:59
+#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
 msgid "Search in subtrees"
 msgstr "Buscar en el subárbol"
 
@@ -3402,15 +3477,15 @@ msgstr "Aplicar esta lista de acceso a las entradas de los usuarios"
 msgid "Used applications"
 msgstr "Aplicaciones Usadas"
 
-#: plugins/admin/groups/application.tpl:10
+#: plugins/admin/groups/application.tpl:11
 msgid "Edit parameters"
 msgstr "Editar parametros"
 
-#: plugins/admin/groups/application.tpl:10
+#: plugins/admin/groups/application.tpl:11
 msgid "Edit optional application parameters"
 msgstr "Editar parámetros de aplicaciones opcionales"
 
-#: plugins/admin/groups/application.tpl:20
+#: plugins/admin/groups/application.tpl:21
 msgid "Available applications"
 msgstr "Aplicaciones disponibles"
 
@@ -3418,18 +3493,18 @@ msgstr "Aplicaciones disponibles"
 msgid "Select users to add"
 msgstr "Seleccione usuarios que serán añadidos"
 
-#: plugins/admin/groups/group_objects.tpl:29
-#: plugins/admin/users/headpage.tpl:64
+#: plugins/admin/groups/group_objects.tpl:26
+#: plugins/admin/users/headpage.tpl:67
 msgid "Display users of department"
 msgstr "Mostrar usuarios del departamento"
 
-#: plugins/admin/groups/group_objects.tpl:35
-#: plugins/admin/users/headpage.tpl:68
+#: plugins/admin/groups/group_objects.tpl:30
+#: plugins/admin/users/headpage.tpl:71
 msgid "Display users matching"
 msgstr "Mostrar usuarios que concuerden con"
 
-#: plugins/admin/groups/group_objects.tpl:36
-#: plugins/admin/users/headpage.tpl:69
+#: plugins/admin/groups/group_objects.tpl:31
+#: plugins/admin/users/headpage.tpl:72
 msgid "Regular expression for matching user names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
@@ -3567,11 +3642,11 @@ msgstr "No le es permitido borrar este usuario"
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:434
+#: plugins/admin/users/class_userManagement.inc:437
 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:622
+#: plugins/admin/users/class_userManagement.inc:618
 #: plugins/admin/users/template.tpl:11
 msgid "Template"
 msgstr "Plantilla"
@@ -3591,9 +3666,10 @@ msgstr ""
 "<b>ninguno</b> para saltarse el uso de plantillas."
 
 #: plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:10
-#: ihtml/themes/altlinux/setup_step2.tpl:16
-#: ihtml/themes/altlinux/setup_step3.tpl:12
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
@@ -3616,11 +3692,11 @@ msgstr ""
 msgid "List of users"
 msgstr "Lista de usuarios"
 
-#: plugins/admin/users/headpage.tpl:20
+#: plugins/admin/users/headpage.tpl:17
 msgid "New template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/headpage.tpl:34
+#: plugins/admin/users/headpage.tpl:31
 msgid ""
 "This menu allows you to create, edit and delete selected users. Having a "
 "great number of users, you may want to use the range selectors on top of the "
@@ -3630,7 +3706,7 @@ msgstr ""
 "seleccionados. Si tiene un gran numero de usuarios usted preferirá usar los "
 "selectores de rangos en la parte superior del listado."
 
-#: plugins/admin/users/headpage.tpl:37
+#: plugins/admin/users/headpage.tpl:34
 msgid ""
 "-Edit- and -New...- execute an assistant to aid you in managing your account "
 "informations. -Delete- will ask for confirmation before deleting users."
@@ -3639,70 +3715,54 @@ msgstr ""
 "información de cuentas. -Borrar- le pedirá confirmación antes de borrar los "
 "usuarios del servidor LDAP."
 
-#: plugins/admin/users/headpage.tpl:51
+#: plugins/admin/users/headpage.tpl:48
 msgid "Select to see template pseudo users"
 msgstr "Seleccione para mostrar los usuarios pseudo plantillas"
 
-#: plugins/admin/users/headpage.tpl:51
+#: plugins/admin/users/headpage.tpl:48
 msgid "Show templates"
 msgstr "Mostrar plantillas"
 
-#: plugins/admin/users/headpage.tpl:52
+#: plugins/admin/users/headpage.tpl:49
 msgid "Select to see users that have only a GOsa object"
 msgstr "Seleccione para ver los usuarios que solo tienen un objeto GOsa"
 
-#: plugins/admin/users/headpage.tpl:52
+#: plugins/admin/users/headpage.tpl:49
 msgid "Show functional users"
 msgstr "Mostrar usuarios funcionales"
 
-#: plugins/admin/users/headpage.tpl:53
+#: plugins/admin/users/headpage.tpl:50
 msgid "Select to see users that have posix settings"
 msgstr "Seleccione para ver usuario que tienen configuraciones posix"
 
-#: plugins/admin/users/headpage.tpl:53
+#: plugins/admin/users/headpage.tpl:50
 msgid "Show unix users"
 msgstr "Mostrar los usuarios unix"
 
-#: plugins/admin/users/headpage.tpl:54
+#: plugins/admin/users/headpage.tpl:51
 msgid "Select to see users that have mail settings"
 msgstr "Seleccione para ver los usuarios que tiene confiraciones de correo"
 
-#: plugins/admin/users/headpage.tpl:54
+#: plugins/admin/users/headpage.tpl:51
 msgid "Show mail users"
 msgstr "Mostrar los usuarios de correo"
 
-#: plugins/admin/users/headpage.tpl:55
+#: plugins/admin/users/headpage.tpl:52
 msgid "Select to see users that have samba settings"
 msgstr "Seleccione para ver los usuarios que tiene configuraciones samba"
 
-#: plugins/admin/users/headpage.tpl:55
+#: plugins/admin/users/headpage.tpl:52
 msgid "Show samba users"
 msgstr "Mostrar usuarios samba"
 
-#: plugins/admin/users/headpage.tpl:56
+#: plugins/admin/users/headpage.tpl:53
 msgid "Select to see users that have proxy settings"
 msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
 
-#: plugins/admin/users/headpage.tpl:56
+#: plugins/admin/users/headpage.tpl:53
 msgid "Show proxy users"
 msgstr "Mostrar los usuarios de proxy"
 
-#: plugins/admin/users/headpage.tpl:57
-msgid "Select to see users that have ftp settings"
-msgstr "Selecctione para ver los usuarios que tienen configuraciones de ftp"
-
-#: plugins/admin/users/headpage.tpl:57
-msgid "Show FTP users"
-msgstr "Mostrar los usuarios de FTP"
-
-#: plugins/admin/users/headpage.tpl:58
-msgid "Select to see users that have FAX settings"
-msgstr "Seleccione para ver los usuarios que tienen configuraciones de FAX"
-
-#: plugins/admin/users/headpage.tpl:58
-msgid "Show FAX users"
-msgstr "Mostrar los usuarios de FAX"
-
 #: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
 msgid "User administration"
 msgstr "Administración de Usuarios"
@@ -3730,6 +3790,7 @@ msgid "Variable"
 msgstr "Variable"
 
 #: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr "Valor por defecto"
 
@@ -3759,6 +3820,7 @@ msgid "Path and/or binary name of application"
 msgstr "Ruta y nombre del binario de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:18
+#: plugins/gofon/macro/generic.tpl:10
 msgid "Display name"
 msgstr "Nombre mostrado"
 
@@ -3768,6 +3830,7 @@ msgstr ""
 "Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
 
 #: plugins/admin/applications/generic.tpl:35
+#: plugins/gofon/macro/generic.tpl:22
 msgid "Choose subtree to place application in"
 msgstr "Elija lugar del árbol para colocar la aplicación"
 
@@ -3799,7 +3862,7 @@ msgstr "Colocar icono en los escritorios de los miembros "
 msgid "Place entry in members startmenu"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
-#: plugins/admin/applications/remove.tpl:7
+#: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 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."
@@ -3812,7 +3875,7 @@ msgstr ""
 msgid "List of applications"
 msgstr "Lista de aplicaciones"
 
-#: plugins/admin/applications/headpage.tpl:28
+#: plugins/admin/applications/headpage.tpl:29
 msgid ""
 "This menu allows you to add, edit and remove selected applications. You may "
 "want to use the range selector on top of the application listbox, when "
@@ -3822,7 +3885,7 @@ msgstr ""
 "Puede usar el selector de rango en la parte superior de la lista de "
 "aplicaciones, cuando trabaja con un gran número de aplicaciones."
 
-#: plugins/admin/applications/headpage.tpl:31
+#: plugins/admin/applications/headpage.tpl:32
 msgid ""
 "-Edit- and -New...- will execute an assistant to aid you in editing "
 "properties. -Delete- will ask for confirmation before removing applications."
@@ -3831,15 +3894,15 @@ msgstr ""
 "propiedades de la aplicación. - Eliminar - le pedirá comprobación antes de "
 "eliminar la aplicación."
 
-#: plugins/admin/applications/headpage.tpl:45
+#: plugins/admin/applications/headpage.tpl:46
 msgid "Display applications of department"
 msgstr "Mostrar aplicaciones de departamentos"
 
-#: plugins/admin/applications/headpage.tpl:57
+#: plugins/admin/applications/headpage.tpl:58
 msgid "Display applications matching"
 msgstr "Mostrar aplicaciones que concuerden con"
 
-#: plugins/admin/applications/headpage.tpl:60
+#: plugins/admin/applications/headpage.tpl:61
 msgid "Regular expression for matching application names"
 msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 
@@ -3848,27 +3911,27 @@ msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:57
+#: plugins/admin/applications/class_applicationGeneric.inc:59
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:146
+#: plugins/admin/applications/class_applicationGeneric.inc:148
 msgid "The specified picture has not been uploaded correctly."
 msgstr "La foto indicada no ha sido subida correctamente."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:227
+#: plugins/admin/applications/class_applicationGeneric.inc:229
 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:232
+#: plugins/admin/applications/class_applicationGeneric.inc:234
 msgid "Required field 'Name' is not filled."
 msgstr "El campo requerido 'Nombre' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:235
+#: plugins/admin/applications/class_applicationGeneric.inc:237
 msgid "Required field 'Execute' is not filled."
 msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:244
+#: plugins/admin/applications/class_applicationGeneric.inc:246
 msgid "There's already an application with this 'Name'."
 msgstr "Ya existe una aplicación con este 'Nombre'."
 
@@ -3879,6 +3942,7 @@ msgstr "Va ha eliminar la aplicación '%s'."
 
 #: plugins/admin/applications/class_applicationManagement.inc:191
 #: plugins/admin/applications/class_applicationManagement.inc:217
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:217
 msgid "You are not allowed to delete this application!"
 msgstr "¡No tiene permisos para eliminar esta aplicación!"
 
@@ -3956,7 +4020,7 @@ msgstr ""
 msgid "List of departments"
 msgstr "Lista de Departamentos"
 
-#: plugins/admin/departments/headpage.tpl:28
+#: plugins/admin/departments/headpage.tpl:29
 msgid ""
 "This menu allows you to create, delete and edit selected departments. Having "
 "a large size of departments, you might prefer the range selectors on top of "
@@ -3966,7 +4030,7 @@ 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/admin/departments/headpage.tpl:31
+#: plugins/admin/departments/headpage.tpl:32
 msgid ""
 "-Edit- and -New...- will provide an assistant to aid you when performing "
 "changes on your departments. -Delete- will ask for confirmation before "
@@ -3976,15 +4040,15 @@ msgstr ""
 "crear cambios en los departamentos. - Eliminar - le pedirá confirmación "
 "antes de realmente eliminar el departamento."
 
-#: plugins/admin/departments/headpage.tpl:44
+#: plugins/admin/departments/headpage.tpl:45
 msgid "Display subdepartments of"
 msgstr "Mostrar subdepartamentos de "
 
-#: plugins/admin/departments/headpage.tpl:55
+#: plugins/admin/departments/headpage.tpl:56
 msgid "Display departments matching"
 msgstr "Mostrar Departamentos que concuerden con"
 
-#: plugins/admin/departments/headpage.tpl:58
+#: plugins/admin/departments/headpage.tpl:59
 msgid "Regular expression for matching department names"
 msgstr "Expresiones regulares para encontrar nombres de departamentos"
 
@@ -4027,35 +4091,40 @@ msgstr "Esta a punto de borrar todo el subárbol LDAP colocado bajo '%s'."
 msgid "You have no permission to remove this department."
 msgstr "No tiene permisos para eliminar este departamento."
 
-#: plugins/admin/systems/class_terminalInfo.inc:61
-#: plugins/admin/systems/class_terminalService.inc:135
+#: plugins/admin/systems/class_terminalInfo.inc:53
+#: plugins/admin/systems/class_terminalInfo.inc:178
+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:126
+#: plugins/admin/systems/class_terminalGeneric.inc:127
 msgid "This 'dn' has no terminal features."
 msgstr "Esta 'dn' no tiene características de terminal."
 
-#: plugins/admin/systems/class_terminalInfo.inc:68
+#: plugins/admin/systems/class_terminalInfo.inc:69
 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:80
+#: plugins/admin/systems/class_terminalInfo.inc:89
 msgid "online"
 msgstr "en linea"
 
-#: plugins/admin/systems/class_terminalInfo.inc:130
+#: plugins/admin/systems/class_terminalInfo.inc:141
 msgid "running"
 msgstr "Activo"
 
-#: plugins/admin/systems/class_terminalInfo.inc:133
+#: plugins/admin/systems/class_terminalInfo.inc:144
 msgid "not running"
 msgstr "no esta activo"
 
-#: plugins/admin/systems/class_terminalInfo.inc:141
+#: plugins/admin/systems/class_terminalInfo.inc:152
 msgid "unknown status"
 msgstr "estado desconocido"
 
-#: plugins/admin/systems/class_terminalInfo.inc:159
+#: plugins/admin/systems/class_terminalInfo.inc:170
 msgid "offline"
 msgstr "fuera de linea"
 
@@ -4071,23 +4140,29 @@ msgstr "Dirección IP"
 msgid "MAC-address"
 msgstr "Dirección MAC"
 
-#: plugins/admin/systems/class_winGeneric.inc:85
-#: plugins/admin/systems/class_componentGeneric.inc:47
+#: plugins/admin/systems/class_winGeneric.inc:70
+#: plugins/admin/systems/class_componentGeneric.inc:48
 msgid "This 'dn' has no network features."
 msgstr "Esta 'dn' no tiene características de red."
 
-#: plugins/admin/systems/class_winGeneric.inc:156
-#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_winGeneric.inc:134
+#: plugins/admin/systems/class_componentGeneric.inc:110
+#, fuzzy
+msgid "The required field 'Component name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/admin/systems/class_winGeneric.inc:148
+#: plugins/admin/systems/class_componentGeneric.inc:123
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr "No tiene permisos para crear un componente en esta 'Base'."
 
-#: plugins/admin/systems/class_winGeneric.inc:166
-#: plugins/admin/systems/class_terminalGeneric.inc:234
-#: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_workstationGeneric.inc:241
-#: plugins/admin/systems/class_printGeneric.inc:132
-#: plugins/admin/systems/class_componentGeneric.inc:126
-#: plugins/admin/systems/class_phoneGeneric.inc:129
+#: plugins/admin/systems/class_winGeneric.inc:158
+#: plugins/admin/systems/class_terminalGeneric.inc:236
+#: plugins/admin/systems/class_servGeneric.inc:180
+#: plugins/admin/systems/class_workstationGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:136
+#: plugins/admin/systems/class_componentGeneric.inc:133
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 #, 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"
@@ -4188,41 +4263,41 @@ msgstr "Servicio de sonido"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/class_terminalService.inc:82
+#: plugins/admin/systems/class_terminalService.inc:83
 msgid "default"
 msgstr "por defecto"
 
-#: plugins/admin/systems/class_terminalService.inc:83
+#: plugins/admin/systems/class_terminalService.inc:84
 msgid "show chooser"
 msgstr "mostrar elegidos"
 
-#: plugins/admin/systems/class_terminalService.inc:84
+#: plugins/admin/systems/class_terminalService.inc:85
 msgid "direct"
 msgstr "Directo"
 
-#: plugins/admin/systems/class_terminalService.inc:87
+#: plugins/admin/systems/class_terminalService.inc:88
 msgid "load balanced"
 msgstr "balanceo de carga"
 
-#: plugins/admin/systems/class_terminalService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:91
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
-#: plugins/admin/systems/class_terminalService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:92
 msgid "ICA client"
 msgstr "Cliente ICA"
 
-#: plugins/admin/systems/class_terminalService.inc:182
+#: plugins/admin/systems/class_terminalService.inc:184
 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:246
-#: plugins/admin/systems/class_terminalService.inc:251
+#: plugins/admin/systems/class_terminalService.inc:248
+#: plugins/admin/systems/class_terminalService.inc:253
 msgid "Please specify a valid VSync range."
 msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/admin/systems/class_terminalService.inc:261
-#: plugins/admin/systems/class_terminalService.inc:266
+#: plugins/admin/systems/class_terminalService.inc:263
+#: plugins/admin/systems/class_terminalService.inc:268
 msgid "Please specify a valid HSync range."
 msgstr "Por favor especifique un rango HSync valido"
 
@@ -4230,35 +4305,39 @@ msgstr "Por favor especifique un rango HSync valido"
 msgid "System management"
 msgstr "Gestión del sistema"
 
+#: plugins/admin/systems/class_servService.inc:179
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
 #: plugins/admin/systems/servservice.tpl:11
 msgid "Nfs Export"
 msgstr "Exportación NFS"
 
-#: plugins/admin/systems/servservice.tpl:36
+#: plugins/admin/systems/servservice.tpl:37
 msgid "Time Service"
 msgstr "Servicio de Hora"
 
-#: plugins/admin/systems/servservice.tpl:59
+#: plugins/admin/systems/servservice.tpl:61
 msgid "LDAP Service"
 msgstr "Servicio LDAP"
 
-#: plugins/admin/systems/servservice.tpl:70
+#: plugins/admin/systems/servservice.tpl:72
 msgid "Terminal Service"
 msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/servservice.tpl:75
+#: plugins/admin/systems/servservice.tpl:77
 msgid "Temporary disable login"
 msgstr "Desactivación temporal del acceso"
 
-#: plugins/admin/systems/servservice.tpl:78
+#: plugins/admin/systems/servservice.tpl:80
 msgid "Font path"
 msgstr "Ruta a las fuentes tipográficas"
 
-#: plugins/admin/systems/servservice.tpl:91
+#: plugins/admin/systems/servservice.tpl:93
 msgid "Syslog Service"
 msgstr "Servicio de Logs"
 
-#: plugins/admin/systems/servservice.tpl:99
+#: plugins/admin/systems/servservice.tpl:101
 msgid "Print Service"
 msgstr "Servicio de impresión"
 
@@ -4284,79 +4363,79 @@ msgstr "Acción"
 msgid "Select action to execute for this server"
 msgstr "Seleccione una acción que se ejecutara en este servidor"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
 msgstr "texto"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:63
+#: 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:88
-#: plugins/admin/systems/class_servGeneric.inc:58
+#: 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:51
+#: plugins/admin/ogroups/class_termgroup.inc:59
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:92
-#: plugins/admin/systems/class_terminalGeneric.inc:104
-#: plugins/admin/systems/class_terminalGeneric.inc:116
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/systems/class_servGeneric.inc:86
+#: 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:55
-#: plugins/admin/ogroups/class_termgroup.inc:67
-#: plugins/admin/ogroups/class_termgroup.inc:79
+#: plugins/admin/ogroups/class_termgroup.inc:63
+#: plugins/admin/ogroups/class_termgroup.inc:75
+#: plugins/admin/ogroups/class_termgroup.inc:87
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr "¡La ejecución de '%s' ha fallado!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:100
-#: plugins/admin/systems/class_servGeneric.inc:70
+#: 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:63
+#: plugins/admin/ogroups/class_termgroup.inc:71
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'REBOOTCMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:112
-#: plugins/admin/systems/class_servGeneric.inc:82
+#: 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:75
+#: plugins/admin/ogroups/class_termgroup.inc:83
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:142
-#: plugins/admin/systems/class_servGeneric.inc:110
-#: plugins/admin/systems/class_workstationGeneric.inc:151
-#: plugins/admin/ogroups/class_termgroup.inc:91
+#: 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
 msgid "Switch off"
 msgstr "Apagar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:142
-#: plugins/admin/systems/class_servGeneric.inc:110
-#: plugins/admin/systems/class_workstationGeneric.inc:151
-#: plugins/admin/ogroups/class_termgroup.inc:91
+#: 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
 msgid "Reboot"
 msgstr "Reiniciar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:144
-#: plugins/admin/systems/class_servGeneric.inc:112
-#: plugins/admin/systems/class_workstationGeneric.inc:153
-#: plugins/admin/ogroups/class_termgroup.inc:91
+#: 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
 msgid "Wake up"
 msgstr "Despertar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:217
+#: plugins/admin/systems/class_terminalGeneric.inc:219
 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:221
+#: plugins/admin/systems/class_terminalGeneric.inc:223
 msgid "The required field 'Terminal name' is not set."
 msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
 
@@ -4364,11 +4443,16 @@ msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
 msgid "Phone name"
 msgstr "Número de teléfono"
 
-#: plugins/admin/systems/class_servGeneric.inc:48
+#: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr "Esta 'dn' no tiene características de servidor."
 
-#: plugins/admin/systems/class_servGeneric.inc:168
+#: plugins/admin/systems/class_servGeneric.inc:163
+#, 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
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "No tiene permisos para crear un servidor en esta 'Base'."
 
@@ -4382,6 +4466,7 @@ msgstr "Nombre de terminal"
 
 #: plugins/admin/systems/terminal.tpl:36
 #: plugins/admin/systems/workstation.tpl:36
+#: plugins/admin/systems/phonesettings.tpl:25
 msgid "Mode"
 msgstr "Modo"
 
@@ -4437,11 +4522,11 @@ msgstr "Elija un servidor que será usado para sincronización horaria"
 msgid "Select action to execute for this terminal"
 msgstr "Seleccione una acción que se ejecutara en este terminal"
 
-#: plugins/admin/systems/class_servDHCP.inc:32
+#: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr "Eliminar servicio DHCP"
 
-#: plugins/admin/systems/class_servDHCP.inc:33
+#: plugins/admin/systems/class_servDHCP.inc:34
 msgid ""
 "This server has DHCP features enabled. You can disable them by clicking "
 "below."
@@ -4449,11 +4534,11 @@ msgstr ""
 "Este servidor tiene la extensión DHCP activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servDHCP.inc:35
+#: plugins/admin/systems/class_servDHCP.inc:36
 msgid "Add DHCP service"
 msgstr "Añadir servicio DHCP"
 
-#: plugins/admin/systems/class_servDHCP.inc:36
+#: plugins/admin/systems/class_servDHCP.inc:37
 msgid ""
 "This server has DHCP features disabled. You can enable them by clicking "
 "below."
@@ -4465,11 +4550,11 @@ msgstr ""
 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:224
+#: plugins/admin/systems/class_workstationGeneric.inc:225
 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:228
+#: plugins/admin/systems/class_workstationGeneric.inc:229
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 " El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
@@ -4501,19 +4586,19 @@ msgstr ""
 msgid "You are not allowed to delete this component!"
 msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/systems/class_systemManagement.inc:642
+#: plugins/admin/systems/class_systemManagement.inc:644
 msgid "New terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:645
+#: plugins/admin/systems/class_systemManagement.inc:647
 msgid "New workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:661
+#: plugins/admin/systems/class_systemManagement.inc:663
 msgid "Thin client template for"
 msgstr "Plantilla de cliente ligero para"
 
-#: plugins/admin/systems/class_systemManagement.inc:673
+#: plugins/admin/systems/class_systemManagement.inc:675
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
@@ -4529,46 +4614,51 @@ msgstr "URL de la impresora"
 msgid "Path to PPD"
 msgstr "Ruta al 'PPD'"
 
-#: plugins/admin/systems/class_servDNS.inc:32
+#: plugins/admin/systems/class_servDNS.inc:33
 msgid "Remove DNS service"
 msgstr "Eliminar servicio DNS"
 
-#: plugins/admin/systems/class_servDNS.inc:33
+#: plugins/admin/systems/class_servDNS.inc:34
 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:35
+#: plugins/admin/systems/class_servDNS.inc:36
 msgid "Add DNS service"
 msgstr "Añadir servicio DNS"
 
-#: plugins/admin/systems/class_servDNS.inc:36
+#: plugins/admin/systems/class_servDNS.inc:37
 msgid ""
 "This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
 "Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servDB.inc:123
-#: plugins/admin/systems/class_servDB.inc:139
-#: plugins/admin/systems/class_servDB.inc:145
-#: plugins/admin/systems/class_servDB.inc:150
-#: plugins/admin/systems/class_servDB.inc:156
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
 #, php-format
 msgid "The attribute '%s' is empty or contains invalid characters."
 msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
-#: plugins/admin/systems/class_servDB.inc:129
+#: plugins/admin/systems/class_servDB.inc:137
 #, php-format
 msgid "The imap connect string needs to be in the form '%s'."
 msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 
-#: plugins/admin/systems/class_servDB.inc:133
+#: plugins/admin/systems/class_servDB.inc:141
 msgid "The sieve port needs to be numeric."
 msgstr "El puerto sieve necesita ser un numero."
 
+#: plugins/admin/systems/class_servDB.inc:172
+#, fuzzy, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
+
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr "Plantilla de estación de trabajo"
@@ -4637,11 +4727,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:145
+#: plugins/admin/systems/class_servKolab.inc:88
 msgid "Remove Kolab extension"
 msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/class_servKolab.inc:145
+#: plugins/admin/systems/class_servKolab.inc:88
 msgid ""
 "This server has kolab features enabled. You can disable them by clicking "
 "below."
@@ -4649,11 +4739,11 @@ msgstr ""
 "Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servKolab.inc:148
+#: plugins/admin/systems/class_servKolab.inc:91
 msgid "Add Kolab service"
 msgstr "Añadir el servicio Kolab"
 
-#: plugins/admin/systems/class_servKolab.inc:148
+#: plugins/admin/systems/class_servKolab.inc:91
 msgid ""
 "This server has kolab features disabled. You can enable them by clicking "
 "below."
@@ -4661,13 +4751,13 @@ msgstr ""
 "Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servKolab.inc:167
+#: plugins/admin/systems/class_servKolab.inc:119
 #, 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:173
+#: plugins/admin/systems/class_servKolab.inc:125
 #, php-format
 msgid "Warn users when using more than %s%% of their mail quota"
 msgstr ""
@@ -4695,11 +4785,11 @@ msgstr ""
 msgid "Future days must be a value."
 msgstr "Días futuros debe ser un valor"
 
-#: plugins/admin/systems/class_servKolab.inc:212
+#: plugins/admin/systems/class_servKolab.inc:211
 msgid "No SMTP privileged networks set."
 msgstr "No se han indicado redes privilegiadas SMTP."
 
-#: plugins/admin/systems/class_servKolab.inc:217
+#: plugins/admin/systems/class_servKolab.inc:215
 msgid "No SMTP smarthost/relayhost set."
 msgstr "No se ha indicado SMTP smarthost/relayhost"
 
@@ -4778,11 +4868,11 @@ msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
 "Aceptar correo desde otros dominios que usen ninguna autentificación SMTP"
 
-#: plugins/admin/systems/class_printGeneric.inc:56
+#: plugins/admin/systems/class_printGeneric.inc:57
 msgid "This 'dn' has no printer features."
 msgstr "Esta 'dn' no tiene características de impresora."
 
-#: plugins/admin/systems/class_printGeneric.inc:122
+#: plugins/admin/systems/class_printGeneric.inc:126
 msgid "You have no permissions to create a printer on this 'Base'."
 msgstr "No tiene permisos para crear una impresora en esta 'Base'."
 
@@ -4821,12 +4911,12 @@ msgstr ""
 "del sistema. -Borrar- le pedirá confirmación antes de eliminar los sistemas."
 
 #: plugins/admin/systems/headpage.tpl:46
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Seleccione para ver los servidores"
 
 #: plugins/admin/systems/headpage.tpl:46
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Show servers"
 msgstr "Mostrar servidores"
 
@@ -4835,7 +4925,7 @@ msgid "Select to see Linux terminals"
 msgstr "Seleccione para ver los terminales Linux"
 
 #: plugins/admin/systems/headpage.tpl:47
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Show terminals"
 msgstr "Mostrar terminales"
 
@@ -4844,7 +4934,7 @@ msgid "Select to see Linux workstations"
 msgstr "Seleccione para ver las estaciones de trabajo Linux"
 
 #: plugins/admin/systems/headpage.tpl:48
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Show workstations"
 msgstr "Mostrar estaciones de trabajo"
 
@@ -4869,7 +4959,7 @@ msgid "Select to see VOIP phones"
 msgstr "Seleccione para ver teléfonos VOIP"
 
 #: plugins/admin/systems/headpage.tpl:51
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Show phones"
 msgstr "Mostrar teléfonos"
 
@@ -4893,6 +4983,18 @@ msgstr "Mostrar terminal(es) del usuario"
 msgid "User name of which terminal(s) are shown"
 msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:269
+#, 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:272
+#, 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:4
 msgid "Keyboard"
 msgstr "Teclado"
@@ -4938,12 +5040,13 @@ msgid "Choose mouse port"
 msgstr "Elija el puerto del ratón"
 
 #: plugins/admin/systems/service.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:5
+#: plugins/gofon/phoneaccount/generic.tpl:22
 msgid "Telephone hardware"
 msgstr "Componente telefónico"
 
 #: plugins/admin/systems/service.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:9
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/generic.tpl:26
 msgid "Telephone"
 msgstr "Teléfono"
 
@@ -5142,19 +5245,19 @@ msgstr ""
 "Elija que servidor LDAP se usara para gestión de cuentas de usuario y "
 "terminales"
 
-#: plugins/admin/systems/startup.tpl:16
+#: plugins/admin/systems/startup.tpl:17
 msgid "Boot kernel"
 msgstr "Kernel de inicio"
 
-#: plugins/admin/systems/startup.tpl:18
+#: 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:21
+#: plugins/admin/systems/startup.tpl:22
 msgid "Custom options"
 msgstr "Otras opciones"
 
-#: plugins/admin/systems/startup.tpl:23
+#: plugins/admin/systems/startup.tpl:24
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
@@ -5162,63 +5265,183 @@ msgstr ""
 "Introducir que parametros serán pasados a la configuración de arranque del "
 "nucleo"
 
-#: plugins/admin/systems/startup.tpl:34
+#: 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:35
+#: plugins/admin/systems/startup.tpl:36
 msgid "use graphical bootup"
 msgstr "Usar arranque gráfico"
 
-#: plugins/admin/systems/startup.tpl:37
+#: 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:38
+#: plugins/admin/systems/startup.tpl:39
 msgid "use standard linux textual bootup"
 msgstr "Usar arranque en modo texto"
 
-#: plugins/admin/systems/startup.tpl:40
+#: 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:41
+#: 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:52
+#: 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:54
+#: 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:65
+#: 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:67
+#: plugins/admin/systems/startup.tpl:69
 msgid "Add additional automount entries"
 msgstr "Añadir entradas adicionales de automontaje"
 
-#: plugins/admin/systems/startup.tpl:84
+#: plugins/admin/systems/startup.tpl:87
 msgid "Additional fstab entries"
 msgstr "Entradas de fstab adicionales"
 
-#: plugins/admin/systems/startup.tpl:86
+#: 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:47
+#: plugins/admin/systems/class_phoneGeneric.inc:104
 msgid "This 'dn' has no phone features."
 msgstr "Esta 'dn' no tiene características de teléfono."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:119
+#: plugins/admin/systems/class_phoneGeneric.inc:176
+#, fuzzy
+msgid "yes"
+msgstr "Sistemas"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:176
+#, fuzzy
+msgid "no"
+msgstr "ninguno"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:197
+msgid "dynamic"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:197
+#, fuzzy
+msgid "Networksettings"
+msgstr "Configuración de red"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:263
+#, 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:266
+msgid "The 'Phone name' '0' is reserved and cannot be used."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:275
+msgid "Wrong IP format in field IP-address."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:282
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 
+#: plugins/admin/systems/phonesettings.tpl:1
+#, fuzzy
+msgid "Specific Phone settings"
+msgstr "Configuración telefónica"
+
+#: plugins/admin/systems/phonesettings.tpl:9
+#, fuzzy
+msgid "Phone type"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/phonesettings.tpl:10
+#: plugins/admin/systems/phonesettings.tpl:28
+#: plugins/admin/systems/phonesettings.tpl:38
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
+#, fuzzy
+msgid "Choose a phone type"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:64
+msgid "refresh"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:35
+#, fuzzy
+msgid "DTMF mode"
+msgstr "Modo"
+
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:90
+#, fuzzy
+msgid "Default IP"
+msgstr "por defecto"
+
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
+msgid "Response timeout"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:80
+#, fuzzy
+msgid "Modus"
+msgstr "Ratón"
+
+#: plugins/admin/systems/phonesettings.tpl:111
+msgid "Authtype"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:121
+#, fuzzy
+msgid "Secret"
+msgstr "Calle"
+
+#: plugins/admin/systems/phonesettings.tpl:129
+msgid "GoFonInkeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:137
+msgid "GoFonOutKeys"
+msgstr ""
+
+#: plugins/admin/systems/phonesettings.tpl:150
+#, fuzzy
+msgid "Account code"
+msgstr "Cuenta"
+
+#: plugins/admin/systems/phonesettings.tpl:158
+#, fuzzy
+msgid "Trunk lines"
+msgstr "Clientes Ligeros"
+
+#: plugins/admin/systems/phonesettings.tpl:173
+#, fuzzy
+msgid "Hosts that are allowed to connect"
+msgstr "Equipos/Redes que son permitidos para hacer relay"
+
+#: plugins/admin/systems/phonesettings.tpl:188
+#, fuzzy
+msgid "Hosts that are not allowed to connect"
+msgstr "¡No tiene permisos para eliminar este componente!"
+
+#: plugins/admin/systems/phonesettings.tpl:212
+msgid "MSN"
+msgstr ""
+
 #: plugins/admin/ogroups/tabs_ogroups.inc:19
 msgid "Terminals"
 msgstr "Terminales"
@@ -5227,67 +5450,67 @@ msgstr "Terminales"
 msgid "Select objects to add"
 msgstr "Seleccione objetos a añadir"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Seleccione para ver los departamentos"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
+#: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Show departments"
 msgstr "Mostrar departamentos"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
 msgid "Select to see GOsa accounts"
 msgstr "Seleccione para ver las cuentas GOsa"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
+#: plugins/admin/ogroups/ogroup_objects.tpl:28
 msgid "Show people"
 msgstr "Mostrar personal"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
 msgid "Select to see GOsa groups"
 msgstr "Seleccione para ver los grupos GOsa"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
 msgid "Show groups"
 msgstr "Mostrar grupos"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
 msgid "Select to see applications"
 msgstr "Seleccione para ver las aplicaciones"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
 msgid "Show applications"
 msgstr "Mostrar aplicaciones"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:34
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Select to see workstations"
 msgstr "Seleccione para ver las estaciones de trabajo"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
 msgid "Select to see terminals"
 msgstr "Seleccione para ver los terminales"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
 msgid "Select to see printers"
 msgstr "Seleccione para ver impresoras"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
+#: plugins/admin/ogroups/ogroup_objects.tpl:34
 msgid "Show printers"
 msgstr "Mostrar impresoras"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
 msgid "Select to see phones"
 msgstr "Seleccione para ver teléfonos"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
 msgid "Display objects of department"
 msgstr "Mostrar objetos de departamentos"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:46
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects matching"
 msgstr "Mostrar objetos que concuerden con"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:47
+#: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Regular expression for matching object names"
 msgstr "Expresiones regulares que concuerden con nombres de objetos"
 
@@ -5331,13 +5554,13 @@ msgstr "Estaciones de trabajo"
 msgid "Printer"
 msgstr "Impresora"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:153
+#: plugins/admin/ogroups/class_ogroupManagement.inc:149
 #, 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:159
-#: plugins/admin/ogroups/class_ogroupManagement.inc:185
+#: plugins/admin/ogroups/class_ogroupManagement.inc:155
+#: plugins/admin/ogroups/class_ogroupManagement.inc:181
 msgid "You are not allowed to delete this object group!"
 msgstr "¡No tiene permisos para eliminar este objeto grupo!"
 
@@ -5417,7 +5640,7 @@ msgstr ""
 "Por favor pulse dos veces si quiere hacer esto, ya que no hay forma de que "
 "GOsa pueda recuperar posteriormente esa información"
 
-#: plugins/admin/ogroups/headpage.tpl:29
+#: plugins/admin/ogroups/headpage.tpl:30
 msgid ""
 "This menu allows you to add, edit or remove selected groups. You may want to "
 "use the range selector on top of the group listbox, when working with a "
@@ -5427,10 +5650,6 @@ msgstr ""
 "Puede usar el selector de rango en la parte superior de la lista de grupos, "
 "cuando trabaja con un gran número de grupos."
 
-#: plugins/admin/ogroups/headpage.tpl:47
-msgid "Show empty groups"
-msgstr "Mostrar grupos vacios"
-
 #: plugins/admin/ogroups/headpage.tpl:48
 msgid "Show groups containing users"
 msgstr "Mostrar grupos que tienen usuarios"
@@ -5463,15 +5682,56 @@ msgstr "Mostrar grupos que contienen terminales"
 msgid "Show groups containing printers"
 msgstr "Mostrar grupos que contienen impresoras"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:114
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr ""
+
+#: plugins/admin/ogroups/mail.tpl:11
+#, fuzzy
+msgid "Primary mail address for this distribution list"
+msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+#, fuzzy
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
+
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+#, fuzzy
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:100
+#, fuzzy
+msgid "no macro"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:117
+#, fuzzy
+msgid "undefined"
+msgstr "sin definirse"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
+msgid ""
+"The macro you selected in the past, is no longer available for you, please "
+"choose another one."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:280
 msgid "This account has no phone extensions."
 msgstr "Esta cuenta no tiene extensiones telefónicas"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:124
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:290
 msgid "Remove phone account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:125
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:291
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -5479,11 +5739,11 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:127
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:293
 msgid "Create phone account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:128
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -5491,54 +5751,74 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:140
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
 msgid "Please enter a valid phone number!"
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:176
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:344
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:287
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
 #, 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:301
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:461
+#, php-format
+msgid "The given PIN is not valid, only numbers are allowed for this type."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:463
+#, php-format
+msgid "The given PIN is too short"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:478
 #, php-format
 msgid "The number '%s' is no valid phone number!"
 msgstr "¡El número '%s' no es un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:304
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:481
 #, php-format
 msgid "The timeout '%s' contains invalid characters!"
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/gofon/phoneaccount/generic.tpl:16
-msgid "Answering machine"
-msgstr "Contestador automático"
-
-#: plugins/gofon/phoneaccount/generic.tpl:22
-#: plugins/gofon/phoneaccount/generic.tpl:25
-msgid "Deliver missed calls as mail"
-msgstr "Enviar llamadas perdidas como correo electrónico"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:489
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:319
+#, 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/generic.tpl:39
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
 msgid "Phone numbers"
 msgstr "Números de teléfonos"
 
-#: plugins/gofon/phoneaccount/generic.tpl:56
+#: plugins/gofon/phoneaccount/generic.tpl:38
 msgid "Forward calls to"
 msgstr "Reenviar llamadas a"
 
-#: plugins/gofon/phoneaccount/generic.tpl:60
+#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:42
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/phoneaccount/generic.tpl:60
+#: plugins/gofon/phoneaccount/generic.tpl:42
 msgid "Timeout (s)"
 msgstr "Tiempo(s) excedido(s)"
 
+#: plugins/gofon/phoneaccount/generic.tpl:57
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#, fuzzy
+msgid "Phone macro"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/phoneaccount/generic.tpl:75
+#, fuzzy
+msgid "Phone PIN"
+msgstr "Teléfono"
+
 #: plugins/gofon/phoneaccount/main.inc:120
 msgid "Phone settings"
 msgstr "Configuración telefónica"
@@ -5588,6 +5868,148 @@ msgstr "Duración"
 msgid "Phone reports"
 msgstr "Informes telefónicos"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:80
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:182
+#, fuzzy
+msgid "This 'dn' is no phone macro."
+msgstr "Esta 'dn' no tiene características de teléfono."
+
+#: plugins/gofon/macro/class_gofonMacro.inc:161
+#, fuzzy, php-format
+msgid "The given cn '%s' already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
+
+#: plugins/gofon/macro/class_gofonMacro.inc:166
+msgid "You must specify the 'Display Name' in order to save this macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:171
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:180
+msgid "Makro length must be lower than 100 lines"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
+#, fuzzy
+msgid "Macro name"
+msgstr "Nombre de la maquina"
+
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
+
+#: plugins/gofon/macro/generic.tpl:43
+#, fuzzy
+msgid "Visible for user"
+msgstr "Lista de usuarios"
+
+#: plugins/gofon/macro/generic.tpl:52
+#, fuzzy
+msgid "Macro text"
+msgstr "Nombre de la maquina"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:229
+#, fuzzy
+msgid "String"
+msgstr "durante"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:230
+msgid "Combobox"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:231
+msgid "Bool"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:237
+#, fuzzy
+msgid "Delete unused"
+msgstr "Borrar"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:311
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:324
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
+msgstr ""
+
+#: plugins/gofon/macro/headpage.tpl:6
+#, fuzzy
+msgid "List of macros"
+msgstr "Lista de grupos"
+
+#: plugins/gofon/macro/headpage.tpl:29
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
+"usar el selector de rango en la parte superior de la lista de grupos, cuando "
+"trabaja con un gran número de grupos."
+
+#: plugins/gofon/macro/headpage.tpl:32
+#, fuzzy
+msgid ""
+"-Edit- and -New...- will execute an assistant to aid you in editing "
+"properties. -Delete- will ask for confirmation before removing macros."
+msgstr ""
+"-Editar y - Nueva... - ejecutaran un asistente para ayudarle a editar las "
+"propiedades de la aplicación. - Eliminar - le pedirá comprobación antes de "
+"eliminar la aplicación."
+
+#: plugins/gofon/macro/headpage.tpl:46
+#, fuzzy
+msgid "Display macros of department"
+msgstr "Mostrar los grupos de departamentos"
+
+#: plugins/gofon/macro/headpage.tpl:59
+#, fuzzy
+msgid "Display macros  matching"
+msgstr "Mostrar grupos que concuerden con"
+
+#: plugins/gofon/macro/headpage.tpl:62
+#, fuzzy
+msgid "Regular expression for matching macro names"
+msgstr "Expresión regular que concuerde con nombres de grupos"
+
+#: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
+#, fuzzy
+msgid "Phone macro management"
+msgstr "Gestión del sistema"
+
+#: plugins/gofon/macro/parameter.tpl:3
+#, fuzzy
+msgid "Argument"
+msgstr "Argumentos"
+
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Tipo"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Phone macros"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:186
+#, 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:192
+#, fuzzy
+msgid "You are not allowed to delete this macro!"
+msgstr "¡No le está permitido eliminar este grupo!"
+
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Grupo"
@@ -5608,6 +6030,11 @@ msgstr "Grupo de objetos"
 msgid "Object name"
 msgstr "Nombre de objeto"
 
+#: plugins/generic/references/contents.tpl:11
+#, fuzzy
+msgid "Contents"
+msgstr "Contacto"
+
 #: plugins/generic/references/contents.tpl:18
 msgid "This object has no relationship to other objects."
 msgstr "Este objeto no tiene ninguna relación con otros objetos."
@@ -5639,52 +6066,98 @@ msgstr "El equipo de GOsa"
 msgid "Welcome %s!"
 msgstr "¡Bienvenido %s!"
 
-#: include/functions.inc:267
-#, php-format
-msgid "Error when connecting the LDAP. Server said '%s'."
+#: include/php_setup.inc:71
+msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
-"Hay un error trantando de conectarse al servidor LDAP. El error del servidor "
-"es: '%s'"
-
-#: include/functions.inc:288
-#, php-format
-msgid "User login failed. LDAP server said '%s'."
-msgstr "Autenticación del usuario fallida. El servidor LDAP contesto '%s'."
+"¡La generación de esta página provoca que el interprete PHP muestre algunos "
+"errores!"
 
-#: include/functions.inc:308
-msgid "Username / UID is not unique. Please check your LDAP database."
-msgstr ""
-"Nombre de usuario o UID no son únicos. Por favor, compruebe su base de datos "
-"LDAP."
+#: include/php_setup.inc:71 html/main.php:292
+msgid "Toggle information"
+msgstr "Información de intercambio"
 
-#: include/functions.inc:346
-msgid ""
-"Error while adding a lock. Parameters are not set correctly, please check "
-"the source!"
-msgstr ""
-"Error al tratar de agregar un bloqueo. Los parámetros no son correctos, por "
-"favor, compruebe el código fuente."
+#: include/php_setup.inc:76
+msgid "PHP error"
+msgstr "Error PHP:"
 
-#: include/functions.inc:356
-#, php-format
-msgid ""
-"Can't set locking information in LDAP database. Please check the 'config' "
-"entry in gosa.conf! LDAP server says '%s'."
-msgstr ""
-"No se pudo generar el bloqueo a la base de datos LDAP. Por favor, compruebe "
-"la entrada 'config' en gosa.conf. El servidor LDAP contesto '%s'."
+#: include/php_setup.inc:87
+msgid "class"
+msgstr "clase"
 
-#: include/functions.inc:371
+#: include/php_setup.inc:93
+msgid "function"
+msgstr "Función"
+
+#: include/php_setup.inc:98
+msgid "static"
+msgstr "estatico"
+
+#: include/php_setup.inc:102
+msgid "method"
+msgstr "método"
+
+#: include/php_setup.inc:121
+msgid "Trace"
+msgstr "Traza"
+
+#: include/php_setup.inc:122
+msgid "File"
+msgstr "Archivo"
+
+#: include/php_setup.inc:122
+msgid "Line"
+msgstr "Linea"
+
+#: include/php_setup.inc:123
+msgid "Arguments"
+msgstr "Argumentos"
+
+#: include/functions.inc:272
+#, php-format
+msgid "Error when connecting the LDAP. Server said '%s'."
+msgstr ""
+"Hay un error trantando de conectarse al servidor LDAP. El error del servidor "
+"es: '%s'"
+
+#: include/functions.inc:293
+#, php-format
+msgid "User login failed. LDAP server said '%s'."
+msgstr "Autenticación del usuario fallida. El servidor LDAP contesto '%s'."
+
+#: include/functions.inc:313
+msgid "Username / UID is not unique. Please check your LDAP database."
+msgstr ""
+"Nombre de usuario o UID no son únicos. Por favor, compruebe su base de datos "
+"LDAP."
+
+#: include/functions.inc:351
+msgid ""
+"Error while adding a lock. Parameters are not set correctly, please check "
+"the source!"
+msgstr ""
+"Error al tratar de agregar un bloqueo. Los parámetros no son correctos, por "
+"favor, compruebe el código fuente."
+
+#: include/functions.inc:361
+#, php-format
+msgid ""
+"Can't set locking information in LDAP database. Please check the 'config' "
+"entry in gosa.conf! LDAP server says '%s'."
+msgstr ""
+"No se pudo generar el bloqueo a la base de datos LDAP. Por favor, compruebe "
+"la entrada 'config' en gosa.conf. El servidor LDAP contesto '%s'."
+
+#: include/functions.inc:376
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr "Fallo al tratar de agregar un bloqueo. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:397
+#: include/functions.inc:402
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr "Fallo al tratar de agregar un bloqueo. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:427
+#: include/functions.inc:432
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
@@ -5692,7 +6165,7 @@ msgstr ""
 "Fallo al tratar de obtener un bloqueo de LDAP. Los parámetros no fueron "
 "correctamente configurados, por favor, compruebe el código fuente."
 
-#: include/functions.inc:437
+#: include/functions.inc:442
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -5700,7 +6173,7 @@ msgstr ""
 "No puedo bloquear la información en la base de datos LDAP. Por favor, "
 "compruebe la entrada 'config' en el archivos gosa.conf."
 
-#: include/functions.inc:445
+#: include/functions.inc:450
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -5708,12 +6181,12 @@ msgstr ""
 "Se encontraron varios bloqueos para el objeto a bloquear. Esto no debería "
 "ser posible, eliminando referencias múltiples."
 
-#: include/functions.inc:517
+#: include/functions.inc:522
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡Ha excedido el tamaño máximo de %d entradas!"
 
-#: include/functions.inc:519
+#: include/functions.inc:524
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -5722,15 +6195,15 @@ 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:531
+#: include/functions.inc:536
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:536
+#: include/functions.inc:541
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:919
+#: include/functions.inc:924
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -5739,66 +6212,26 @@ msgstr ""
 "Va ha editar la entrada LDAP '%s' que parece estar siendo usada por '%s'. "
 "Por favor, contacte con esta persona para clarificar los procedimientos."
 
-#: include/functions.inc:1018
+#: include/functions.inc:1023
 msgid "LDAP error:"
 msgstr "Error LDAP:"
 
-#: include/functions.inc:1460
+#: include/functions.inc:1469
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1505
+#: include/functions.inc:1512
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Versión de desarrollo de GOsa (Rev %s)"
 
-#: include/functions.inc:1547
-msgid "Generating this page caused the PHP interpreter to raise some errors!"
+#: include/class_mail-methods-cyrus.inc:39
+msgid ""
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
 msgstr ""
-"¡La generación de esta página provoca que el interprete PHP muestre algunos "
-"errores!"
-
-#: include/functions.inc:1547
-msgid "Toggle information"
-msgstr "Información de intercambio"
-
-#: include/functions.inc:1555
-msgid "PHP error"
-msgstr "Error PHP:"
-
-#: include/functions.inc:1562
-msgid "class"
-msgstr "clase"
-
-#: include/functions.inc:1568
-msgid "function"
-msgstr "Función"
-
-#: include/functions.inc:1573
-msgid "static"
-msgstr "estatico"
-
-#: include/functions.inc:1577
-msgid "method"
-msgstr "método"
-
-#: include/functions.inc:1594
-msgid "Trace"
-msgstr "Traza"
-
-#: include/functions.inc:1595
-msgid "File"
-msgstr "Archivo"
-
-#: include/functions.inc:1595
-msgid "Line"
-msgstr "Linea"
 
-#: include/functions.inc:1596
-msgid "Arguments"
-msgstr "Argumentos"
-
-#: include/class_mail-methods-cyrus.inc:43
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
 "Warning: IMAP Server cannot be reached! If you save this account, some mail "
 "settings will not be stored on your server!"
@@ -5807,72 +6240,232 @@ msgstr ""
 "de los valores de la configuración del correo no serán guardados en el "
 "servidor"
 
-#: include/class_mail-methods-cyrus.inc:106
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
 "No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:122
+#: include/class_mail-methods-cyrus.inc:131
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr "No se puede activar una cuota IMAP. El error del servidor es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:133
-msgid ""
-"Warning: imap_getacl is not implemented, wouldn't modify acl informations."
+#: include/class_mail-methods-cyrus.inc:155
+#, fuzzy
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 "Aviso: imap_getacl no ha sido implementado, no se modificara información "
 "sobre las listas de acceso."
 
-#: include/class_mail-methods-cyrus.inc:168
+#: include/class_mail-methods-cyrus.inc:173
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 "Aviso: no esta disponible imap_getacl, ¡no se puede acceder a los permisos "
 "IMAP!"
 
-#: include/class_mail-methods-cyrus.inc:190
+#: include/class_mail-methods-cyrus.inc:195
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
 "No se puede eliminar la carpeta de correo IMAP. El error del servidor es: '%"
 "s'"
 
-#: include/class_mail-methods-cyrus.inc:218
+#: include/class_mail-methods-cyrus.inc:223
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr "No se puede conectar al servidor SIEVE. El error del servidor es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:231
+#: include/class_mail-methods-cyrus.inc:236
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:302
+#: include/class_mail-methods-cyrus.inc:307
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr "No puedo subir un 'script' SIEVE. El error del servidor es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:306
+#: include/class_mail-methods-cyrus.inc:311
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
 "No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
 "s'"
 
-#: include/setup_checks.inc:72
+#: 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:386
+#, php-format
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
+
+#: include/class_plugin.inc:412 include/class_password-methods.inc:178
+#, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
+"parece existir."
+
+#: include/class_plugin.inc:438
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
+"parece existir."
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+"No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
+
+#: include/class_pluglist.inc:98
+msgid ""
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
+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
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
+msgid ""
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
+msgstr ""
+"Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
+"los cambios?"
+
+#: include/class_password-methods.inc:162
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
+
+#: include/class_password-methods.inc:199
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgstr ""
+"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
+"pueden cambiar las contraseñas de SAMBA."
+
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr "Error XML en 'gosa.conf': %s en la linea %d"
+
+#: include/class_config.inc:195 html/index.php:140
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+"NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
+"sistemas."
+
+#: include/class_config.inc:426
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr "SID y/o RIDBASE no se encuentran en su configuración."
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
+
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
+"soporte Kerberos, la contraseña no ha sido cambiada."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "¡La comunicación con la base de datos Kerberos fallo!."
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
+
+#: include/class_ldap.inc:398
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+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:631
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
+"en la linea %s"
+
+#: include/class_ldap.inc:644
+#, 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:660
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
+"el LDIF desde la linea %s en adelante!"
+
+#: include/class_certificate.inc:35
+msgid "Can't open specified file, check accessibility and or existence"
+msgstr ""
+
+#: include/class_certificate.inc:53
+msgid "Can't read specified certificate / or empty string given"
+msgstr ""
+
+#: include/class_certificate.inc:80
+msgid "Can't load certificate, possibly unsupported format (use PEM/DER) "
+msgstr ""
+
+#: include/class_certificate.inc:95
+msgid "The Format must be PEM, to output certificate informations"
+msgstr ""
+
+#: include/class_certificate.inc:192
+#, fuzzy
+msgid "Can't create/open File"
+msgstr "Fichero de configuración"
+
+#: include/class_certificate.inc:199
+msgid "No valid certificate loaded"
+msgstr ""
+
+#: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
 "No se pudo establecer la conexión al servidor LDAP. ¡No se pudo comprobar el "
 "esquema.!"
 
-#: include/setup_checks.inc:81 include/setup_checks.inc:90
+#: include/functions_setup.inc:107 include/functions_setup.inc:116
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 "No se pudo obtener la información del esquema del servidor. No se pudo "
 "comprobar el esquema."
 
-#: include/setup_checks.inc:110
+#: include/functions_setup.inc:136
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
@@ -5881,7 +6474,7 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no esta disponible en configuración de LDAP."
 
-#: include/setup_checks.inc:114
+#: include/functions_setup.inc:140
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
@@ -5889,84 +6482,84 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no tiene la versión %s"
 
-#: include/setup_checks.inc:118
+#: include/functions_setup.inc:145
 #, php-format
 msgid "Support for '%s' enabled"
 msgstr "Es soporte para '%s' esta activado"
 
-#: include/setup_checks.inc:128
+#: include/functions_setup.inc:155
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr ""
 "No se encuentra el objeto de clase (object class) requerido '%s' en la "
 "configuración del servidor LDAP."
 
-#: include/setup_checks.inc:132
+#: include/functions_setup.inc:159
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr "El objeto de clase (objectclass) requerido '%s' no tiene la versión %s"
 
-#: include/setup_checks.inc:141
+#: include/functions_setup.inc:170
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr ""
 "El soporte de SAMBA 3 se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:146
+#: include/functions_setup.inc:175
 msgid "SAMBA 3 support enabled"
 msgstr "Soporte de SAMBA 3 activado"
 
-#: include/setup_checks.inc:151
+#: include/functions_setup.inc:180
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr ""
 "El soporte de SAMBA 2 se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:156
+#: include/functions_setup.inc:185
 msgid "SAMBA 2 support enabled"
 msgstr "Soporte de SAMBA 2 activado"
 
-#: include/setup_checks.inc:162
+#: include/functions_setup.inc:191
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para pureftp se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:167
+#: include/functions_setup.inc:196
 msgid "Support for pureftp enabled"
 msgstr "Soporte de PUREFTP activado"
 
-#: include/setup_checks.inc:172
+#: include/functions_setup.inc:201
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para WebDAV se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:177
+#: include/functions_setup.inc:206
 msgid "Support for WebDAV enabled"
 msgstr "Soporte de WebDAV activado"
 
-#: include/setup_checks.inc:182
+#: include/functions_setup.inc:211
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para phpgroupware se encuentra desactivado, no parece haber "
 "esquemas instalados"
 
-#: include/setup_checks.inc:187
+#: include/functions_setup.inc:216
 msgid "Support for phpgroupware enabled"
 msgstr "El soporte para phpgroupware está activado"
 
-#: include/setup_checks.inc:192
+#: include/functions_setup.inc:221
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para gofon se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:197
+#: include/functions_setup.inc:226
 msgid "Support for gofon enabled"
 msgstr "Soporte de GOFON activado"
 
-#: include/setup_checks.inc:204
+#: include/functions_setup.inc:233
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -5974,31 +6567,31 @@ msgstr ""
 "El soporte para Kolab se encuentra desactivado, no parece haber esquemas "
 "instalados, cambiando el método de correo a cyrus"
 
-#: include/setup_checks.inc:212
+#: include/functions_setup.inc:241
 msgid "Support for Kolab enabled"
 msgstr "Soporte de KOLAB activado"
 
-#: include/setup_checks.inc:229
+#: include/functions_setup.inc:258
 msgid "OK"
 msgstr "Perfecto"
 
-#: include/setup_checks.inc:232
+#: include/functions_setup.inc:261
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: include/setup_checks.inc:234
+#: include/functions_setup.inc:263
 msgid "Failed"
 msgstr "Fallado"
 
-#: include/setup_checks.inc:251
+#: include/functions_setup.inc:280
 msgid "PHP setup inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/setup_checks.inc:252
+#: include/functions_setup.inc:281
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Comprobando la versión de PHP (>=4.1.0)"
 
-#: include/setup_checks.inc:253
+#: include/functions_setup.inc:282
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -6006,13 +6599,13 @@ msgstr ""
 "Debe tener una versión de PHP 4.1.0 o superior para el correcto "
 "funcionamiento de GOsa."
 
-#: include/setup_checks.inc:256
+#: include/functions_setup.inc:285
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 "Comprobando si el registro de variables globales (register_globals) esta "
 "desactivado."
 
-#: include/setup_checks.inc:257
+#: include/functions_setup.inc:286
 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 "
@@ -6022,28 +6615,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/setup_checks.inc:260
+#: include/functions_setup.inc:289
 msgid "Checking for ldap module"
 msgstr "Comprobando los módulos de ldap"
 
-#: include/setup_checks.inc:261
+#: include/functions_setup.inc:290
 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/setup_checks.inc:264
+#: include/functions_setup.inc:293
+#, fuzzy
+msgid "Checking for XML functions"
+msgstr "Comprobando el soporte de iconv"
+
+#: include/functions_setup.inc:294
+msgid "XML functions are required to parse the configuration file."
+msgstr ""
+
+#: include/functions_setup.inc:297
 msgid "Checking for gettext support"
 msgstr "Comprobando el soporte de gettext"
 
-#: include/setup_checks.inc:265
+#: include/functions_setup.inc:298
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 "El soporte de gettext es requerido para la intenacionalización de GOsa."
 
-#: include/setup_checks.inc:267
+#: include/functions_setup.inc:300
 msgid "Checking for iconv support"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/setup_checks.inc:268
+#: include/functions_setup.inc:301
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -6052,11 +6654,11 @@ msgstr ""
 "Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
 "tanto requerido."
 
-#: include/setup_checks.inc:271
+#: include/functions_setup.inc:304
 msgid "Checking for mhash module"
 msgstr "Comprobando por el módulo de mhash"
 
-#: include/setup_checks.inc:272
+#: include/functions_setup.inc:305
 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."
@@ -6064,11 +6666,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/setup_checks.inc:275
+#: include/functions_setup.inc:308
 msgid "Checking for imap module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/setup_checks.inc:276
+#: include/functions_setup.inc:309
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -6076,11 +6678,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/setup_checks.inc:278
+#: include/functions_setup.inc:312
 msgid "Checking for getacl in imap"
 msgstr "Comprobando por getacl en imap"
 
-#: include/setup_checks.inc:279
+#: include/functions_setup.inc:313
 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 "
@@ -6090,21 +6692,21 @@ msgstr ""
 "módulo IAMP estandar no es capaz de leer acls. Necesitará una versión "
 "reciente de PHP para obtener está caracteristica. "
 
-#: include/setup_checks.inc:281
+#: include/functions_setup.inc:316
 msgid "Checking for mysql module"
 msgstr "Comprobando el módulo de mysql"
 
-#: include/setup_checks.inc:282
+#: include/functions_setup.inc:317
 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/setup_checks.inc:284
+#: include/functions_setup.inc:320
 msgid "Checking for cups module"
 msgstr "Comprobando el módulo de cups"
 
-#: include/setup_checks.inc:285
+#: include/functions_setup.inc:321
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -6112,11 +6714,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/setup_checks.inc:287
+#: include/functions_setup.inc:324
 msgid "Checking for kadm5 module"
 msgstr "Comprobando el módulo kadm5"
 
-#: include/setup_checks.inc:288
+#: include/functions_setup.inc:325
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -6124,15 +6726,25 @@ msgstr ""
 "Manejando usuarios en kerberos requiere el módulo kadm5 que esta disponible "
 "en la red PEAR."
 
-#: include/setup_checks.inc:297
+#: include/functions_setup.inc:328
+#, fuzzy
+msgid "Checking for snmp Module"
+msgstr "Comprobando el módulo de imap"
+
+#: include/functions_setup.inc:329
+msgid ""
+"Simple Network Management Protocol (SNMP) is required for client monitoring."
+msgstr ""
+
+#: include/functions_setup.inc:338
 msgid "Checking for some additional programms"
 msgstr "Comprobando programas adicionales"
 
-#: include/setup_checks.inc:306
+#: include/functions_setup.inc:347
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Comprobando por ImageMagick (>=5.4.0)"
 
-#: include/setup_checks.inc:307
+#: include/functions_setup.inc:348
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -6140,11 +6752,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/setup_checks.inc:310
+#: include/functions_setup.inc:351
 msgid "Checking imagick module for PHP"
 msgstr "Comprobando el módulo PHP de imagick"
 
-#: include/setup_checks.inc:311
+#: include/functions_setup.inc:352
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
@@ -6152,11 +6764,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/setup_checks.inc:318
+#: include/functions_setup.inc:359
 msgid "Checking for fping utility"
 msgstr "Comprobando la herramienta fping"
 
-#: include/setup_checks.inc:319
+#: include/functions_setup.inc:360
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -6164,11 +6776,11 @@ msgstr ""
 "La herramienta fping solo se usa si tiene un entorno de terminales clientes "
 "delgados (thinclient)."
 
-#: include/setup_checks.inc:334
+#: include/functions_setup.inc:375
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Buscando una manera de generar hashes de contraseñas LM/NT"
 
-#: include/setup_checks.inc:335
+#: include/functions_setup.inc:376
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -6176,11 +6788,11 @@ msgstr ""
 "Para poder usar SAMBA 2/3, tiene que instalar algunos paquetes adicionales "
 "para generar los hashes de contraseñas."
 
-#: include/setup_checks.inc:350
+#: include/functions_setup.inc:389
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini comprobación -> session.auto_register"
 
-#: include/setup_checks.inc:351
+#: include/functions_setup.inc:390
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -6188,11 +6800,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/setup_checks.inc:354
+#: include/functions_setup.inc:393
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini comprobación -> implicit_flush"
 
-#: include/setup_checks.inc:355
+#: include/functions_setup.inc:394
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -6200,11 +6812,11 @@ msgstr ""
 "Esta opción controla el manejador de salida. Desactive esta opción para "
 "mejorar el rendimiento."
 
-#: include/setup_checks.inc:362
+#: include/functions_setup.inc:401
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini comprobación -> max_execution_time"
 
-#: include/setup_checks.inc:363
+#: include/functions_setup.inc:402
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -6212,11 +6824,11 @@ msgstr ""
 "El tiempo máximo de ejecución debe ser de al menos 30 segundos, algunas "
 "acciones pueden consumir mucho tiempo."
 
-#: include/setup_checks.inc:370
+#: include/functions_setup.inc:409
 msgid "php.ini check -> memory_limit"
 msgstr "pnp.ini comprobación -> memory_limit"
 
-#: include/setup_checks.inc:371
+#: include/functions_setup.inc:410
 #, fuzzy
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
@@ -6226,11 +6838,11 @@ msgstr ""
 "impredecibles! Una cantidad recomendada es 16Mb, para sitios con grandes "
 "cargas seria aún mayor."
 
-#: include/setup_checks.inc:375
+#: include/functions_setup.inc:414
 msgid "php.ini check -> expose_php"
 msgstr "php.ini comprobación -> expose_php"
 
-#: include/setup_checks.inc:376
+#: include/functions_setup.inc:415
 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."
@@ -6239,11 +6851,11 @@ msgstr ""
 "debería enviar ninguna información sobre el servidor sobre el que está "
 "funcionando en ningún caso."
 
-#: include/setup_checks.inc:380
+#: include/functions_setup.inc:419
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini comprobación -> magic_quotes_gpc"
 
-#: include/setup_checks.inc:381
+#: include/functions_setup.inc:420
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -6251,11 +6863,11 @@ msgstr ""
 "Aumenta la seguridad de su servidor poniendo 'magic_quotes_gpc' en 'on'. PHP "
 "escapara en este caso todas las comillas que encuentre en las cadenas."
 
-#: include/setup_checks.inc:610
+#: include/functions_setup.inc:659
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Tiene que especificar un servidor ldap antes de continuar."
 
-#: include/setup_checks.inc:619 include/setup_checks.inc:701
+#: include/functions_setup.inc:668 include/functions_setup.inc:750
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -6263,8 +6875,8 @@ msgstr ""
 "No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
 "este accesible para GOsa."
 
-#: include/setup_checks.inc:633 include/setup_checks.inc:706
-#: include/setup_checks.inc:711
+#: include/functions_setup.inc:682 include/functions_setup.inc:755
+#: include/functions_setup.inc:760
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -6272,7 +6884,7 @@ msgstr ""
 "¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
 "asegure que este accesible para GOsa."
 
-#: include/setup_checks.inc:721
+#: include/functions_setup.inc:770
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
@@ -6280,7 +6892,7 @@ msgstr ""
 "Conexión al servidor correcta, pero el servidor aparenta estar completamente "
 "vacíos, por favor compruebe la información de nuevo."
 
-#: include/setup_checks.inc:777
+#: include/functions_setup.inc:826
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -6288,153 +6900,36 @@ msgid ""
 msgstr ""
 "Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
 
-#: include/setup_checks.inc:808
+#: include/functions_setup.inc:857
+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:866
 #, 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/setup_checks.inc:905 include/setup_checks.inc:920
-#: html/index.php:160 ihtml/themes/default/setup_useradmin.tpl:6
+#: include/functions_setup.inc:976 include/functions_setup.inc:999
+#: include/functions_setup.inc:1008 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."
 
-#: 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/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
+msgstr ""
 
-#: include/class_plugin.inc:386
+#: include/functions_helpviewer.inc:335
 #, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgid "%s%% hit rate in file %s"
 msgstr ""
-"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
-"parece existir."
-
-#: include/class_plugin.inc:412
-#, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
-"parece existir."
-
-#: include/class_plugin.inc:438
-#, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
-"parece existir."
-
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
-msgstr ""
-"No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
-
-#: include/class_pluglist.inc:98
-msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
-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
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
-msgstr ""
-"Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
-"los cambios?"
-
-#: include/class_password-methods.inc:170
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
-msgstr ""
-"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
-
-#: include/class_password-methods.inc:189
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
-msgstr ""
-"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
-"pueden cambiar las contraseñas de SAMBA."
-
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Error XML en 'gosa.conf': %s en la linea %d"
-
-#: include/class_config.inc:195 html/index.php:142
-msgid "Can't bind to LDAP. Please contact the system administrator."
-msgstr ""
-"NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
-"sistemas."
-
-#: include/class_config.inc:426
-msgid "SID and/or RIDBASE missing in your configuration!"
-msgstr "SID y/o RIDBASE no se encuentran en su configuración."
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
-"soporte Kerberos, la contraseña no ha sido cambiada."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "¡La comunicación con la base de datos Kerberos fallo!."
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
-
-#: include/class_ldap.inc:398
-#, php-format
-msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
-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:630
-#, php-format
-msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
-msgstr ""
-"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
-"en la linea %s"
-
-#: include/class_ldap.inc:643
-#, 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:659
-#, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
-msgstr ""
-"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
-"el LDIF desde la linea %s en adelante!"
 
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
@@ -6452,7 +6947,7 @@ msgstr "La consulta a la base de datos ha fallado."
 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:75
+#: html/setup.php:86
 #, php-format
 msgid ""
 "Directory '%s' specified as smarty compile directory is not accessable, "
@@ -6461,7 +6956,7 @@ 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:100
+#: html/main.php:96
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -6469,50 +6964,88 @@ msgstr ""
 "'Register globals' está activado. No se permitirá ninguna entrada hasta que "
 "esto sea solucionado por un administrador."
 
-#: html/main.php:143
+#: html/main.php:139
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 "Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
 
-#: html/main.php:264
+#: html/main.php:263
 #, 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/index.php:57
+#: html/main.php:292
+#, fuzzy
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+"¡La generación de esta página provoca que el interprete PHP muestre algunos "
+"errores!"
+
+#: html/index.php:53
 #, 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:79
+#: html/index.php:75
 #, 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:168
+#: html/index.php:148
+msgid ""
+"GOsa cannot retrieve information about the installed schema files. Please "
+"make sure, that this is possible."
+msgstr ""
+
+#: html/index.php:156
+msgid ""
+"Your ldap setup contains old schema definitions. Please re-run the setup."
+msgstr ""
+
+#: html/index.php:184
 msgid "Please specify a valid username!"
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: html/index.php:170
+#: html/index.php:186
 msgid "Please specify your password!"
 msgstr "Por favor especifique su contraseña."
 
-#: html/index.php:177
+#: html/index.php:193
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/index.php:215
+#: html/index.php:231
 msgid "Session will not be encrypted."
 msgstr "La sesion no sera encriptada."
 
-#: html/index.php:215
+#: html/index.php:231
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
+#: html/helpviewer.php:54
+msgid "Help is not available if you are not logged in."
+msgstr ""
+
+#: html/helpviewer.php:85
+msgid "previous"
+msgstr ""
+
+#: html/helpviewer.php:89
+#, fuzzy
+msgid "next"
+msgstr "texto"
+
+#: html/helpviewer.php:141
+#, php-format
+msgid ""
+"Can't read any helpfiles from ' %s ', possibly there is no help available."
+msgstr ""
+
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Detectado conflicto de sesiones."
@@ -6563,28 +7096,28 @@ msgstr ""
 "programas opcionales y, luego de ingresar la información necesaria para "
 "conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
 
-#: ihtml/themes/altlinux/login.tpl:14 ihtml/themes/default/login.tpl:14
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
 msgid "Please use your <i>username</i> and <i>password</i> to log in"
 msgstr ""
 "Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
 
-#: ihtml/themes/altlinux/login.tpl:25 ihtml/themes/altlinux/login.tpl:29
+#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:25 ihtml/themes/default/login.tpl:29
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
 msgstr "Nombre de Usuario"
 
-#: ihtml/themes/altlinux/login.tpl:43 ihtml/themes/altlinux/login.tpl:46
-#: ihtml/themes/default/login.tpl:43 ihtml/themes/default/login.tpl:46
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:44 ihtml/themes/default/login.tpl:47
 msgid "Directory"
 msgstr "Directorio"
 
-#: ihtml/themes/altlinux/login.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:24 ihtml/themes/default/login.tpl:54
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
 msgid "Sign in"
 msgstr "Entrando"
 
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:55
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:56
 msgid "Click here to log in"
 msgstr "Pulse aquí para entrar"
 
@@ -6671,14 +7204,6 @@ msgstr ""
 "El paso dos busca por una colección de programas/herramientas de soporte y "
 "comprueba si tienen al menos la mínima versión necesaria."
 
-#: ihtml/themes/altlinux/setup_step2.tpl:11
-msgid ""
-"We've inspected the webserver side now. Your setup seems to fit GOsa's "
-"needs. Lets go for the GOsa configuration part now..."
-msgstr ""
-"Hemos inspeccionado el servidor web. Su configuración parece cumplir con los "
-"requerimientos de GOsa. Continuamos la configuración de GOsa..."
-
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -6695,44 +7220,59 @@ msgstr ""
 "instalados. Los detalles sobre como el árbol LDAP está organizado serán "
 "preguntados más adelante."
 
-#: ihtml/themes/altlinux/setup_step3.tpl:7
-msgid "Please enter the server URI"
-msgstr "Por favor especifique una dirección de servidor - URI - válida."
+#: ihtml/themes/altlinux/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10
+msgid ""
+"Please enter the server URI to allow the setup to connect your LDAP server "
+"<i>(Example: ldap://your.server:389).</i>"
+msgstr ""
+"Por favor introduzca la dirección URI del servidor para que el programa de "
+"configuración pueda conectar con su servidor LDAP <i>(Ejemplo: ldap://su."
+"servidor:389).</i>"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:4
+#: ihtml/themes/altlinux/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2
+msgid ""
+"The following fields allow the basic configuration of GOsa's behaviour and "
+"affect various properties in your main configuration."
+msgstr ""
+"Los campos siguientes permiten la configuración básica del control de GOsa y "
+"afectara a varios parámetros de su configuración principal."
+
+#: ihtml/themes/altlinux/setup_step4.tpl:7
 #: ihtml/themes/default/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr "Ingrese una descripción para la ubicación que está configurando"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:8
+#: ihtml/themes/altlinux/setup_step4.tpl:11
 #: ihtml/themes/default/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Nombre de la localización"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:14
+#: ihtml/themes/altlinux/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18
 msgid ""
-"Finally, you need to specify parameters to access the LDAP server. GOsa "
-"always acts as admin and manages access rights internally. This is a "
+"GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
 "this to work, we need the admin DN and the corresponding password."
 msgstr ""
-"Finalmente, necesita especificar parámetros para acceder al servidor LDAP. "
-"GOsa siempre actúa como administrador y maneja los derechos de acceso "
-"internamente. Este comportamiento cambiará cuando el manejo de derechos de "
-"acceso de OpenLDAP este completamente implementado. Para que esto funcione, "
-"necesitamos el DN del administrador y la contraseña correspondiente."
+"GOsa siempre actúa en modo administrador y controla los permisos de acceso "
+"internamente. Esto es una solución temporal hasta que las ACI (Access "
+"control information) estén completamente implementadas en OPENLDAP.  Para "
+"que esto funcione, necesitamos el DN del administrador y la contraseña "
+"correspondiente."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:19
+#: ihtml/themes/altlinux/setup_step4.tpl:23
 #: ihtml/themes/default/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "DN del administrador"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:23
+#: ihtml/themes/altlinux/setup_step4.tpl:27
 #: ihtml/themes/default/setup_step4.tpl:27
 msgid "Admin password"
 msgstr "Nueva contraseña"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:29
+#: ihtml/themes/altlinux/setup_step4.tpl:34
 #: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
@@ -6744,28 +7284,67 @@ msgstr ""
 "incluyendo la manera en que las cuentas son creadas. Compruebe los valores a "
 "continuación si se ajustan a sus necesidades."
 
-#: ihtml/themes/altlinux/setup_step4.tpl:34
+#: ihtml/themes/altlinux/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39
+#, fuzzy
+msgid "Base "
+msgstr "Base"
+
+#: ihtml/themes/altlinux/setup_step4.tpl:43
 #: ihtml/themes/default/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "Carpeta de almacenamiento - ou - para los usuarios"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:38
+#: ihtml/themes/altlinux/setup_step4.tpl:47
 #: ihtml/themes/default/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:46
+#: ihtml/themes/altlinux/setup_step4.tpl:55
 #: ihtml/themes/default/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "Carpeta de almacenamiento - ou - para los grupos"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:50
+#: ihtml/themes/altlinux/setup_step4.tpl:59
 #: ihtml/themes/default/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "Identificador base - ID -, para usuarios y grupos"
 
-#: ihtml/themes/altlinux/setup_step4.tpl:56
-#: ihtml/themes/default/setup_step4.tpl:99
+#: ihtml/themes/altlinux/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67
+msgid ""
+"GOsa supports several encryption types for your passwords. Normally this is "
+"adjustable via user templates, but you can specify a default method to be "
+"used here, too."
+msgstr ""
+"Gosa soporta varios tipos diferentes de encriptación para las claves. "
+"Normalmente esto es ajustable a través de las plantillas de usuario, pero "
+"usted puede especificar un método para ser usado por defecto."
+
+#: ihtml/themes/altlinux/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72
+msgid "Encryption algorithm"
+msgstr "Algoritmo de encriptación"
+
+#: ihtml/themes/altlinux/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83
+msgid ""
+"GOsa has modular support for several mail methods. These methods provide "
+"interfaces to users mailboxes and general handling for quotas. You can "
+"choose the dummy plugin to leave all your mail settings untouched."
+msgstr ""
+"Gosa tiene un soporte modular para diferentes métodos de correo electrónico. "
+"Estos proveen de herramientas de control de la cuentas de correo y control "
+"general de cuotas. Puede elegir el método 'dummy' para dejar su "
+"configuración de correo limpia."
+
+#: ihtml/themes/altlinux/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88
+msgid "Mail method"
+msgstr "Método de correo"
+
+#: ihtml/themes/altlinux/setup_step4.tpl:100
+#: ihtml/themes/default/setup_step4.tpl:115
 msgid "Check"
 msgstr "Comprobación"
 
@@ -6774,7 +7353,26 @@ msgstr "Comprobación"
 msgid "Setup finished"
 msgstr "Configuración finalizada"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:4
+#: ihtml/themes/altlinux/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3
+msgid ""
+"Basically the setup is finished. You can check the result of the schema "
+"check here and download the autogenerated gosa.conf below."
+msgstr ""
+"Básicamente la configuración ha terminado. Puede comprobar los resultados de "
+"este esquema aquí y descargar el gosa.conf generado automáticamente."
+
+#: ihtml/themes/altlinux/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7
+msgid "Schema Configuration"
+msgstr "Configuración de esquemas"
+
+#: ihtml/themes/altlinux/setup_finish.tpl:12
+#: ihtml/themes/default/setup_finish.tpl:12
+msgid "Configuration File"
+msgstr "Fichero de configuración"
+
+#: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
@@ -6785,7 +7383,12 @@ msgstr ""
 "crear una configuración inicial. Guarde esta configuración como gosa.conf en "
 "'/etc/gosa/'. Modifíquela tanto como sea necesario"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:12
+#: ihtml/themes/altlinux/setup_finish.tpl:17
+#: ihtml/themes/default/setup_finish.tpl:17
+msgid "Download configuration"
+msgstr "Descargar configuración"
+
+#: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
@@ -6796,15 +7399,17 @@ msgstr ""
 "servidor web pueda leer gosa.conf y que los otros no deberían poder leerlo. "
 "Para cumplir con este requerimiento puede ejecutar estos comandos:"
 
-#: ihtml/themes/altlinux/setup_finish.tpl:22
+#: ihtml/themes/altlinux/setup_finish.tpl:31
 #: ihtml/themes/default/setup_finish.tpl:31
 msgid "Retry"
 msgstr "Reintentar"
 
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
 #: ihtml/themes/default/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr "Ya tiene una cuenta y un grupo administrativo."
 
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
 #: ihtml/themes/default/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
@@ -6817,88 +7422,110 @@ msgstr ""
 "configuración puede ayudarle en esta tarea. Introduzca el nombre y "
 "contraseñas deseadas para crear las entradas necesarias."
 
-#: ihtml/themes/default/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step4.tpl:100
 msgid ""
-"Please enter the server URI to allow the setup to connect your LDAP server "
-"<i>(Example: ldap://your.server:389).</i>"
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting. "
+"(But it could be a security risk)  "
 msgstr ""
-"Por favor introduzca la dirección URI del servidor para que el programa de "
-"configuración pueda conectar con su servidor LDAP <i>(Ejemplo: ldap://su."
-"servidor:389).</i>"
 
-#: ihtml/themes/default/setup_step4.tpl:2
-msgid ""
-"The following fields allow the basic configuration of GOsa's behaviour and "
-"affect various properties in your main configuration."
+#: ihtml/themes/default/setup_step4.tpl:104
+#, fuzzy
+msgid "Display PHP errors"
+msgstr "Error PHP:"
+
+#: ihtml/themes/default/setup_step4.tpl:107
+#, fuzzy
+msgid "true"
+msgstr "Futuro"
+
+#: ihtml/themes/default/setup_step4.tpl:108
+#, fuzzy
+msgid "false"
+msgstr "mujer"
+
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
 msgstr ""
-"Los campos siguientes permiten la configuración básica del control de GOsa y "
-"afectara a varios parámetros de su configuración principal."
 
-#: ihtml/themes/default/setup_step4.tpl:18
-msgid ""
-"GOsa always acts as admin and manages access rights internally. This is a "
-"workaround till OpenLDAP's in directory ACI's are fully implemented. For "
-"this to work, we need the admin DN and the corresponding password."
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
 msgstr ""
-"GOsa siempre actúa en modo administrador y controla los permisos de acceso "
-"internamente. Esto es una solución temporal hasta que las ACI (Access "
-"control information) estén completamente implementadas en OPENLDAP.  Para "
-"que esto funcione, necesitamos el DN del administrador y la contraseña "
-"correspondiente."
 
-#: ihtml/themes/default/setup_step4.tpl:39
 #, fuzzy
-msgid "Base "
-msgstr "Base"
+#~ msgid "Telefon PIN"
+#~ msgstr "Teléfono"
 
-#: ihtml/themes/default/setup_step4.tpl:67
-msgid ""
-"GOsa supports several encryption types for your passwords. Normally this is "
-"adjustable via user templates, but you can specify a default method to be "
-"used here, too."
-msgstr ""
-"Gosa soporta varios tipos diferentes de encriptación para las claves. "
-"Normalmente esto es ajustable a través de las plantillas de usuario, pero "
-"usted puede especificar un método para ser usado por defecto."
+#~ msgid "Show empty groups"
+#~ msgstr "Mostrar grupos vacios"
 
-#: ihtml/themes/default/setup_step4.tpl:72
-msgid "Encryption algorithm"
-msgstr "Algoritmo de encriptación"
+#, fuzzy
+#~ msgid "The given value for goFonQualify is not a valid number."
+#~ msgstr "El valor de 'Tamaño de Cola' no es valido."
 
-#: ihtml/themes/default/setup_step4.tpl:83
-msgid ""
-"GOsa has modular support for several mail methods. These methods provide "
-"interfaces to users mailboxes and general handling for quotas. You can "
-"choose the dummy plugin to leave all your mail settings untouched."
-msgstr ""
-"Gosa tiene un soporte modular para diferentes métodos de correo electrónico. "
-"Estos proveen de herramientas de control de la cuentas de correo y control "
-"general de cuotas. Puede elegir el método 'dummy' para dejar su "
-"configuración de correo limpia."
+#~ msgid "Answering machine"
+#~ msgstr "Contestador automático"
 
-#: ihtml/themes/default/setup_step4.tpl:88
-msgid "Mail method"
-msgstr "Método de correo"
+#~ msgid "Deliver missed calls as mail"
+#~ msgstr "Enviar llamadas perdidas como correo electrónico"
 
-#: ihtml/themes/default/setup_finish.tpl:3
-msgid ""
-"Basically the setup is finished. You can check the result of the schema "
-"check here and download the autogenerated gosa.conf below."
-msgstr ""
-"Básicamente la configuración ha terminado. Puede comprobar los resultados de "
-"este esquema aquí y descargar el gosa.conf generado automáticamente."
+#, fuzzy
+#~ msgid "Refresh"
+#~ msgstr "Referencias"
 
-#: ihtml/themes/default/setup_finish.tpl:7
-msgid "Schema Configuration"
-msgstr "Configuración de esquemas"
+#, fuzzy
+#~ msgid "Number"
+#~ msgstr "Noviembre"
 
-#: ihtml/themes/default/setup_finish.tpl:12
-msgid "Configuration File"
-msgstr "Fichero de configuración"
+#, fuzzy
+#~ msgid "Option"
+#~ msgstr "Opciones"
 
-#: ihtml/themes/default/setup_finish.tpl:17
-msgid "Download configuration"
-msgstr "Descargar configuración"
+#~ msgid "Select to see users that have ftp settings"
+#~ msgstr "Selecctione para ver los usuarios que tienen configuraciones de ftp"
+
+#~ msgid "Show FTP users"
+#~ msgstr "Mostrar los usuarios de FTP"
+
+#~ msgid "Select to see users that have FAX settings"
+#~ msgstr "Seleccione para ver los usuarios que tienen configuraciones de FAX"
+
+#~ msgid "Show FAX users"
+#~ msgstr "Mostrar los usuarios de FAX"
+
+#, fuzzy
+#~ msgid "Phone category"
+#~ msgstr "Informes telefónicos"
+
+#, 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..."
+#~ msgstr ""
+#~ "Hemos inspeccionado el servidor web. Su configuración parece cumplir con "
+#~ "los requerimientos de GOsa. Continuamos la configuración de GOsa..."
+
+#~ msgid "Please enter the server URI"
+#~ msgstr "Por favor especifique una dirección de servidor - URI - válida."
+
+#~ msgid ""
+#~ "Finally, you need to specify parameters to access the LDAP server. GOsa "
+#~ "always acts as admin and manages access rights internally. This is a "
+#~ "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
+#~ "this to work, we need the admin DN and the corresponding password."
+#~ msgstr ""
+#~ "Finalmente, necesita especificar parámetros para acceder al servidor "
+#~ "LDAP. GOsa siempre actúa como administrador y maneja los derechos de "
+#~ "acceso internamente. Este comportamiento cambiará cuando el manejo de "
+#~ "derechos de acceso de OpenLDAP este completamente implementado. Para que "
+#~ "esto funcione, necesitamos el DN del administrador y la contraseña "
+#~ "correspondiente."
+
+#~ msgid "absent"
+#~ msgstr "ausente"
 
 #, fuzzy
 #~ msgid "Value specified as 'Quota Size' is empty."