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 3362ac4e0946cbf981e554a02963ddf5db6456cb..6ed4631029bb9c15103a6edae00a1ec1ff70d6d2 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -47,7 +47,7 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/ogroups/tabs_ogroups.inc:28
+#: plugins/admin/ogroups/tabs_ogroups.inc:29
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Correo Electrónico"
@@ -58,8 +58,9 @@ msgstr "Correo Electrónico"
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:61 plugins/personal/connectivity/main.inc:136
+#: contrib/gosa.conf:61
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/main.inc:136
 msgid "Connectivity"
 msgstr "Conectividad"
 
@@ -73,9 +74,9 @@ msgstr "Fax"
 
 #: contrib/gosa.conf:63 plugins/personal/generic/generic.tpl:214
 #: plugins/personal/generic/generic.tpl:352
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:41
 #: plugins/addons/addressbook/address_edit.tpl:89
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
 #: plugins/admin/departments/generic.tpl:58
@@ -150,186 +151,38 @@ msgstr "Importar"
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:167
+#: contrib/gosa.conf:168
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:184
+#: contrib/gosa.conf:185
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:185
+#: contrib/gosa.conf:186
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:186
+#: contrib/gosa.conf:187
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:188
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:189
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:189
+#: contrib/gosa.conf:190
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:190
+#: contrib/gosa.conf:191
 msgid "Italian"
 msgstr "Italiano"
 
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/reports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:8
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-#: plugins/gofon/reports/class_fonreport.inc:7
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-msgid "This does something"
-msgstr "Esto hace algo"
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:59
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
-
-#: plugins/personal/mail/class_mailAccount.inc:163
-msgid "No DESC tag in vacation file:"
-msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
-
-#: plugins/personal/mail/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:209
-#: plugins/admin/groups/class_groupMail.inc:187
-msgid "Remove mail account"
-msgstr "Borrar cuenta de correo"
-
-#: plugins/personal/mail/class_mailAccount.inc:210
-#: plugins/admin/groups/class_groupMail.inc:188
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
-"apretando a continuación."
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:190
-msgid "Create mail account"
-msgstr "Crear cuenta de correo"
-
-#: plugins/personal/mail/class_mailAccount.inc:212
-#: plugins/admin/groups/class_groupMail.inc:191
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo desactivadas.Puede "
-"activarlas pulsando aqui."
-
-#: plugins/personal/mail/class_mailAccount.inc:260
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-"Esta intentando añadir una dirección de correo no valida a la lista de "
-"reenvíos."
-
-#: plugins/personal/mail/class_mailAccount.inc:266
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-"Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
-"sentido."
-
-#: plugins/personal/mail/class_mailAccount.inc:301
-#: plugins/personal/mail/class_mailAccount.inc:306
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Esta intentando añadir una dirección de correo no valida a la lista de "
-"direcciones alternativas"
-
-#: plugins/personal/mail/class_mailAccount.inc:316
-#: plugins/admin/groups/class_groupMail.inc:283
-msgid "The address you're trying to add is already used by user"
-msgstr ""
-"La dirección de correo que esta intentando añadir, ya esta usada por otro "
-"usuario"
-
-#: plugins/personal/mail/class_mailAccount.inc: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:684
-#: plugins/personal/mail/class_mailAccount.inc:688
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/ogroups/class_mailogroup.inc:45
-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:695
-#: plugins/admin/groups/class_groupMail.inc:619
-#: plugins/admin/ogroups/class_mailogroup.inc:52
-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: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: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:720
-#: plugins/admin/groups/class_groupMail.inc:642
-msgid "You need to set the maximum mail size in order to reject anything."
-msgstr ""
-"Necesita poner un valor máximo en el tamaño de mensaje de correo para poder "
-"rechazar mensajes."
-
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
@@ -369,14 +222,14 @@ msgstr "Lista de direcciones de correo alternativas."
 
 #: plugins/personal/mail/generic.tpl:56 plugins/personal/mail/generic.tpl:126
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/posix/trust_machines.tpl:39
 #: 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:39
-#: plugins/personal/connectivity/class_kolabAccount.inc:199
-#: plugins/personal/connectivity/kolab.tpl:17
+#: 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
@@ -393,7 +246,7 @@ msgstr "Lista de direcciones de correo alternativas."
 #: 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:374
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:375
 #: plugins/gofon/phoneaccount/generic.tpl:11
 msgid "Add"
 msgstr "Añadir"
@@ -402,15 +255,15 @@ msgstr "Añadir"
 #: 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/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
 #: 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/headpage.tpl:18
-#: plugins/admin/groups/remove.tpl:15 plugins/admin/groups/generic.tpl:90
+#: 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:18
@@ -516,70 +369,221 @@ msgstr "Usar 'script sive' propios"
 msgid "disables all Mail options!"
 msgstr "¡Desactivar todas las opciones de correo!"
 
-#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
-#: plugins/personal/samba/main.inc:104
-#: plugins/personal/generic/generic_certs.tpl:76
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:77
-#: plugins/gofax/faxaccount/main.inc:89
-#: 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:440
-#: plugins/admin/ogroups/class_ogroupManagement.inc:271
-#: plugins/gofon/phoneaccount/main.inc:104
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:238
-msgid "Finish"
-msgstr "Terminar"
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/reports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/reports/class_fonreport.inc:7
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+msgid "This does something"
+msgstr "Esto hace algo"
 
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:43
-#: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:74
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
-#: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:78
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:79
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:64
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:108
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:261
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/group_objects.tpl:41
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:509
-#: 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: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:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:273
-#: 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"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:59
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
 
-#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
-#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
-#: plugins/personal/connectivity/main.inc:126
-#: plugins/gofax/faxaccount/main.inc:96
-#: plugins/gofon/phoneaccount/main.inc:111
+#: plugins/personal/mail/class_mailAccount.inc:163
+msgid "No DESC tag in vacation file:"
+msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
+
+#: plugins/personal/mail/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: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:210
+#: plugins/admin/groups/class_groupMail.inc:188
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Create mail account"
+msgstr "Crear cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:212
+#: plugins/admin/groups/class_groupMail.inc:191
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
+
+#: plugins/personal/mail/class_mailAccount.inc:260
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"Esta intentando añadir una dirección de correo no valida a la lista de "
+"reenvíos."
+
+#: plugins/personal/mail/class_mailAccount.inc:266
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+"Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
+"sentido."
+
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"Esta intentando añadir una dirección de correo no valida a la lista de "
+"direcciones alternativas"
+
+#: plugins/personal/mail/class_mailAccount.inc:316
+#: plugins/admin/groups/class_groupMail.inc:283
+msgid "The address you're trying to add is already used by user"
+msgstr ""
+"La dirección de correo que esta intentando añadir, ya esta usada por otro "
+"usuario"
+
+#: plugins/personal/mail/class_mailAccount.inc: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: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: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: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: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:720
+#: plugins/admin/groups/class_groupMail.inc:642
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr ""
+"Necesita poner un valor máximo en el tamaño de mensaje de correo para poder "
+"rechazar mensajes."
+
+#: plugins/personal/mail/main.inc:104 plugins/personal/posix/main.inc:110
+#: plugins/personal/samba/main.inc:104
+#: plugins/personal/generic/generic_certs.tpl:76
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:77
+#: plugins/gofax/faxaccount/main.inc:89
+#: 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: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: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: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:78
+#: plugins/personal/generic/main.inc:160
+#: plugins/personal/connectivity/main.inc:118
+#: plugins/gofax/blocklists/generic.tpl:79
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:64
+#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/address_edit.tpl:108
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:261
+#: plugins/admin/groups/remove.tpl:17
+#: 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: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: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: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"
+
+#: plugins/personal/mail/main.inc:114 plugins/personal/posix/main.inc:120
+#: plugins/personal/samba/main.inc:114 plugins/personal/generic/main.inc:177
+#: plugins/personal/connectivity/main.inc:126
+#: plugins/gofax/faxaccount/main.inc:96
+#: plugins/gofon/phoneaccount/main.inc:111
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
 "Pulse en el botón - Editar - para cambiar la información de esta ventana"
@@ -614,8 +618,8 @@ msgid "Display addresses of department"
 msgstr "Mostrar las direcciones de los departamentos"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/trust_machines.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
@@ -627,7 +631,7 @@ msgstr "Mostrar las direcciones de los departamentos"
 #: plugins/admin/departments/headpage.tpl:47
 #: plugins/admin/systems/headpage.tpl:62
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/headpage.tpl:62 plugins/gofon/macro/headpage.tpl:49
+#: 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"
 
@@ -659,8 +663,8 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
 #: ihtml/themes/altlinux/login.tpl:39
 #: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
 #: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
 msgid "Password"
 msgstr "Contraseña"
 
@@ -729,14 +733,14 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 #: plugins/addons/ldapmanager/contentexport.tpl:66 include/functions.inc:1204
 #: ihtml/themes/altlinux/setup_step2.tpl:12
-#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl: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:99
+#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr "Atras"
@@ -781,20 +785,6 @@ msgstr "No tiene permisos para cambiar su contraseña."
 msgid "External password changer reported a problem: "
 msgstr "El programa externo de cambio de contraseña informo de un problema: "
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Seleccione sistema a añadir"
-
-#: 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:30
-#: plugins/admin/systems/headpage.tpl:71
-msgid "Display systems matching"
-msgstr "Mostrar sistemas que concuerden con"
-
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Seleccione grupo a añadir"
@@ -866,17 +856,17 @@ msgid "Show functional groups"
 msgstr "Mostrar grupos funcionales"
 
 #: plugins/personal/posix/posix_groups.tpl:36
-#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:61
+#: 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:48
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:65
+#: 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:51
-#: plugins/admin/groups/headpage.tpl:70 plugins/admin/ogroups/headpage.tpl:66
+#: 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"
 
@@ -900,9 +890,23 @@ msgstr ""
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Seleccione sistema a añadir"
+
+#: plugins/personal/posix/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: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:621
+#: plugins/personal/samba/class_sambaAccount.inc:626
 msgid "Home directory"
 msgstr "Directorio Principal"
 
@@ -959,10 +963,6 @@ msgstr "Lenguaje por defecto"
 msgid "System trust"
 msgstr "Autentificación del sistema"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Parametros Unix"
-
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
@@ -1267,6 +1267,10 @@ msgstr ""
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Parametros Unix"
+
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr "Directorio Samba"
@@ -1277,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:622
+#: plugins/personal/samba/class_sambaAccount.inc:627
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
@@ -1326,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:629
+#: plugins/personal/samba/class_sambaAccount.inc:634
 msgid "Connection"
 msgstr "Conexión"
 
 #: plugins/personal/samba/samba3.tpl:125
-#: plugins/personal/samba/class_sambaAccount.inc:630
+#: plugins/personal/samba/class_sambaAccount.inc:635
 msgid "Disconnection"
 msgstr "Desconexión"
 
 #: plugins/personal/samba/samba3.tpl:134
-#: plugins/personal/samba/class_sambaAccount.inc:631
+#: plugins/personal/samba/class_sambaAccount.inc:636
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -1393,10 +1397,6 @@ msgstr "La cuenta expirará después de"
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Parametros de samba"
-
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selecciones estaciones de trabajo para añadir"
@@ -1409,6 +1409,10 @@ msgstr "Mostrar estaciones de trabajo de departamentos"
 msgid "Display workstations matching"
 msgstr "Mostrar estaciones de trabajo que concuerden con"
 
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Parametros de samba"
+
 #: plugins/personal/samba/class_sambaAccount.inc:193
 msgid "This account has no samba extensions."
 msgstr "Esta cuenta no tiene extensión samba valida."
@@ -1479,12 +1483,12 @@ msgstr "Desde cualquier cliente"
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:624
+#: 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:634
+#: plugins/personal/samba/class_sambaAccount.inc:639
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1492,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:640
+#: plugins/personal/samba/class_sambaAccount.inc:645
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1500,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:817
+#: 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!"
@@ -1508,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:842
+#: plugins/personal/samba/class_sambaAccount.inc:847
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1516,179 +1520,43 @@ msgstr ""
 "Aviso: No puedo identificar el grupo primario de usuarios - ¡No se puede "
 "realizar una conversión a grupo de samba!"
 
-#: plugins/personal/generic/class_user.inc:231
-msgid "female"
-msgstr "mujer"
+#: plugins/personal/generic/password.tpl:2
+msgid ""
+"You have changed the method your password is stored in the ldap database. "
+"For that reason you've to enter your password at this point again. GOsa will "
+"then encode it with the selected method."
+msgstr ""
+"Ha cambiado el método en que su clave es guardada en la base de datos LDAP. "
+"Por esa razón tiene que volver a reintroducir su contraseña de nuevo. Gosa "
+"codificara esta con el nuevo método seleccionado."
 
-#: plugins/personal/generic/class_user.inc:231
-msgid "male"
-msgstr "hombre"
+#: plugins/personal/generic/generic_picture.tpl:6
+#: plugins/personal/generic/generic.tpl:15
+msgid "Personal picture"
+msgstr "Foto Personal"
 
-#: 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/generic_picture.tpl:23
+msgid "Remove picture"
+msgstr "Eliminar foto"
 
-#: 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: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: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:406
-#, fuzzy
-msgid "No certificate installed"
-msgstr "Editar certificados"
-
-#: 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: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: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: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: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: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: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: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:897
-msgid "The required field 'Login' is not set."
-msgstr " El campo requerido 'Login' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:904
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-"Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
-"base de datos."
-
-#: plugins/personal/generic/class_user.inc:911
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
-"guiones están permitidos."
-
-#: plugins/personal/generic/class_user.inc: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: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: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: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: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: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: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/password.tpl:2
-msgid ""
-"You have changed the method your password is stored in the ldap database. "
-"For that reason you've to enter your password at this point again. GOsa will "
-"then encode it with the selected method."
-msgstr ""
-"Ha cambiado el método en que su clave es guardada en la base de datos LDAP. "
-"Por esa razón tiene que volver a reintroducir su contraseña de nuevo. Gosa "
-"codificara esta con el nuevo método seleccionado."
+#: plugins/personal/generic/generic_picture.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:107
+msgid "Save"
+msgstr "Guardar"
 
 #: plugins/personal/generic/generic.tpl:6
 msgid "Personal information"
 msgstr "Información personal"
 
-#: plugins/personal/generic/generic.tpl:15
-#: plugins/personal/generic/generic_picture.tpl:6
-msgid "Personal picture"
-msgstr "Foto Personal"
-
 #: plugins/personal/generic/generic.tpl:17
 msgid "Change picture"
 msgstr "Cambiar foto"
 
 #: plugins/personal/generic/generic.tpl:24
-#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_edit.tpl:20
-#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Nombre"
@@ -1817,8 +1685,8 @@ msgid "Room No."
 msgstr "Habitación No."
 
 #: plugins/personal/generic/generic.tpl:221
-#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:44
+#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:40
 msgid "Mobile"
 msgstr "Teléfono Móvil"
@@ -1895,15 +1763,6 @@ msgstr "Último envío"
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
-#: plugins/personal/generic/generic_picture.tpl:23
-msgid "Remove picture"
-msgstr "Eliminar foto"
-
-#: plugins/personal/generic/generic_picture.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:107
-msgid "Save"
-msgstr "Guardar"
-
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificado estandar"
@@ -1911,10 +1770,10 @@ msgstr "Certificado estandar"
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:202
+#: 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:376
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:377
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Eliminar"
@@ -1931,6 +1790,151 @@ msgstr "Certificado PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
+#: plugins/personal/generic/class_user.inc:231
+msgid "female"
+msgstr "mujer"
+
+#: plugins/personal/generic/class_user.inc:231
+msgid "male"
+msgstr "hombre"
+
+#: 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: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: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: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:406
+#, fuzzy
+msgid "No certificate installed"
+msgstr "Editar certificados"
+
+#: 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: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: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: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: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: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: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: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:897
+msgid "The required field 'Login' is not set."
+msgstr " El campo requerido 'Login' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:904
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
+"base de datos."
+
+#: plugins/personal/generic/class_user.inc:911
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
+"guiones están permitidos."
+
+#: plugins/personal/generic/class_user.inc: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: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: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: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: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: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: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!"
@@ -1939,31 +1943,6 @@ msgstr "¡No tiene permisos para cambiar su contraseña!"
 msgid "Generic user information"
 msgstr "Información genérica del usuario"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:125
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
-
-#: plugins/personal/connectivity/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: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: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:137
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "El valor especificado como 'relación' no es válido"
-
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
@@ -2027,25 +2006,25 @@ msgstr "Preguntar si hay conflictos"
 msgid "Manual"
 msgstr "Manual"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:176
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: 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:233
+#: 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:247
+#: 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:255
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
@@ -2056,59 +2035,34 @@ msgstr ""
 msgid "WebDAV"
 msgstr "WebDAV"
 
-#: plugins/personal/connectivity/phpgw.tpl:1
-msgid "PHPGroupware account"
-msgstr "Cuenta PHPGroupware"
-
-#: plugins/personal/connectivity/kolab.tpl:1
-msgid "Kolab account"
-msgstr "Cuenta Kolab"
-
-#: plugins/personal/connectivity/kolab.tpl:4
-msgid ""
-"The kolab account is currently disabled. It's features can be adjusted if "
-"you add a mail account."
-msgstr ""
-"La cuenta kolab está actualmente desactivada. Sus características serán "
-"modificadas si añade una cuenta de correo."
-
-#: plugins/personal/connectivity/kolab.tpl:10
-msgid "Delegations"
-msgstr "Delegaciones"
-
-#: plugins/personal/connectivity/kolab.tpl:22
-msgid "Mail size"
-msgstr "Tamaño del correo electrónico"
-
-#: plugins/personal/connectivity/kolab.tpl:23
-msgid "No mail size restriction for this account"
-msgstr "No hay restricción de correo para esta cuenta."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
 
-#: plugins/personal/connectivity/kolab.tpl:31
-msgid "Free Busy information"
-msgstr "Información de estado de presencia"
+#: 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/kolab.tpl:34
-msgid "URL"
-msgstr "URL"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:128
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
 
-#: plugins/personal/connectivity/kolab.tpl:38
-msgid "Future"
-msgstr "Futuro"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:131
+msgid "Value specified as 'Files' is not valid."
+msgstr "El valor especificado como 'Archivos' no es válido"
 
-#: plugins/personal/connectivity/kolab.tpl:39
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
-msgid "days"
-msgstr "días"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:134
+msgid "Value specified as 'Size' is not valid."
+msgstr "El valor especificado como 'Tamaño' no es válido"
 
-#: plugins/personal/connectivity/kolab.tpl:44
-msgid "Invitation policy"
-msgstr "Política de invitación"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "El valor especificado como 'relación' no es válido"
 
-#: plugins/personal/connectivity/webdav.tpl:1
-msgid "WebDAV account"
-msgstr "Cuenta WebDAV"
+#: plugins/personal/connectivity/phpgw.tpl:1
+msgid "PHPGroupware account"
+msgstr "Cuenta PHPGroupware"
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
@@ -2151,6 +2105,56 @@ msgstr ""
 msgid "PHP4 module for Postgresql Database Failed!"
 msgstr "¡El módulo de PHP4 para la base de datos Postgresql falla!"
 
+#: plugins/personal/connectivity/kolab.tpl:1
+msgid "Kolab account"
+msgstr "Cuenta Kolab"
+
+#: plugins/personal/connectivity/kolab.tpl:4
+msgid ""
+"The kolab account is currently disabled. It's features can be adjusted if "
+"you add a mail account."
+msgstr ""
+"La cuenta kolab está actualmente desactivada. Sus características serán "
+"modificadas si añade una cuenta de correo."
+
+#: plugins/personal/connectivity/kolab.tpl:10
+msgid "Delegations"
+msgstr "Delegaciones"
+
+#: plugins/personal/connectivity/kolab.tpl:23
+msgid "Mail size"
+msgstr "Tamaño del correo electrónico"
+
+#: plugins/personal/connectivity/kolab.tpl:24
+msgid "No mail size restriction for this account"
+msgstr "No hay restricción de correo para esta cuenta."
+
+#: plugins/personal/connectivity/kolab.tpl:32
+msgid "Free Busy information"
+msgstr "Información de estado de presencia"
+
+#: plugins/personal/connectivity/kolab.tpl:35
+msgid "URL"
+msgstr "URL"
+
+#: plugins/personal/connectivity/kolab.tpl:39
+msgid "Future"
+msgstr "Futuro"
+
+#: plugins/personal/connectivity/kolab.tpl:40
+#: plugins/personal/connectivity/oxchange.tpl:18
+#: plugins/personal/connectivity/oxchange.tpl:22
+msgid "days"
+msgstr "días"
+
+#: plugins/personal/connectivity/kolab.tpl:45
+msgid "Invitation policy"
+msgstr "Política de invitación"
+
+#: plugins/personal/connectivity/webdav.tpl:1
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
+
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr "Cuenta FTP"
@@ -2274,6 +2278,52 @@ msgstr ""
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "El valor de 'Tamaño de Cola' no es valido."
 
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
+msgid "FAX Blocklists"
+msgstr "Lista de bloqueos de FAX"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:121
+#, php-format
+msgid "You're about to delete the blocklist '%s'."
+msgstr "Has decidido eliminar la lista de bloqueo '%s'."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:135
+msgid "You have no permission to remove this blocklist."
+msgstr "No tiene permisos para eliminar esta lista de bloqueo."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:153
+msgid "Please specify a valid phone number."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
+msgid "send"
+msgstr "enviar"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
+msgid "receive"
+msgstr "recibir"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:348
+msgid "You have no permissions to create a blocklist on this 'Base'."
+msgstr "No tiene permisos para crear una lista de bloqueo en esta 'Base'."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:354
+#: plugins/admin/departments/class_departmentGeneric.inc:143
+msgid "Required field 'Name' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:357
+msgid "Required field 'Name' contains invalid characters"
+msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:365
+msgid "Specified name is already used."
+msgstr "El nombre especificado ya esta siendo usado"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:372
+msgid "No permission to create a blocklist on this base."
+msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
+
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
 msgstr "Nombre de la lista"
@@ -2288,7 +2338,7 @@ msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 
 #: plugins/gofax/blocklists/generic.tpl:32
 #: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/php_setup.inc:112
+#: include/php_setup.inc:122
 msgid "Type"
 msgstr "Tipo"
 
@@ -2331,58 +2381,12 @@ msgstr "Información"
 msgid "Numbers can also contain wild cards."
 msgstr "Los números pueden contener también comodínes"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:5
-msgid "FAX Blocklists"
-msgstr "Lista de bloqueos de FAX"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:121
-#, php-format
-msgid "You're about to delete the blocklist '%s'."
-msgstr "Has decidido eliminar la lista de bloqueo '%s'."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:135
-msgid "You have no permission to remove this blocklist."
-msgstr "No tiene permisos para eliminar esta lista de bloqueo."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:153
-msgid "Please specify a valid phone number."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
-msgid "send"
-msgstr "enviar"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:226
-msgid "receive"
-msgstr "recibir"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:348
-msgid "You have no permissions to create a blocklist on this 'Base'."
-msgstr "No tiene permisos para crear una lista de bloqueo en esta 'Base'."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:354
-#: plugins/admin/departments/class_departmentGeneric.inc:143
-msgid "Required field 'Name' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:357
-msgid "Required field 'Name' contains invalid characters"
-msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:365
-msgid "Specified name is already used."
-msgstr "El nombre especificado ya esta siendo usado"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:372
-msgid "No permission to create a blocklist on this base."
-msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
-
 #: plugins/gofax/blocklists/remove.tpl:2
 #: plugins/addons/addressbook/remove.tpl:2 plugins/admin/groups/remove.tpl:2
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
 #: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
-#: html/index.php:213 ihtml/themes/altlinux/conflict.tpl:6
+#: 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"
@@ -2581,8 +2585,8 @@ msgid "List of predefined blocklists"
 msgstr "Listas de listas de bloqueos predefinidas"
 
 #: plugins/gofax/faxaccount/lists.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/groups/mail_admins.tpl:37 include/functions.inc:1195
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1195
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -2687,13 +2691,47 @@ msgstr "ID del Receptor"
 msgid "Status message"
 msgstr "Estado del mensaje"
 
-#: plugins/gofax/reports/detail.tpl:54
-msgid "Transfer time"
-msgstr "Tiempo de envio"
+#: plugins/gofax/reports/detail.tpl:54
+msgid "Transfer time"
+msgstr "Tiempo de envio"
+
+#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
+msgid "# pages"
+msgstr "# páginas"
+
+#: plugins/gofax/reports/class_faxreport.inc:6
+msgid "FAX Reports"
+msgstr "Informes de FAX"
+
+#: plugins/gofax/reports/class_faxreport.inc:97
+#: plugins/gofax/reports/class_faxreport.inc:204
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
+"informes!"
+
+#: plugins/gofax/reports/class_faxreport.inc:101
+#: plugins/gofax/reports/class_faxreport.inc:208
+msgid "Can't select fax database for report generation!"
+msgstr ""
+"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
+
+#: plugins/gofax/reports/class_faxreport.inc:109
+#: plugins/gofax/reports/class_faxreport.inc:216
+msgid "Query for fax database failed!"
+msgstr "¡La consulta a la base de datos de fax ha fallado!"
+
+#: plugins/gofax/reports/class_faxreport.inc:117
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
+"¡No tiene permisos para recuperar información sobre el identificador (ID) "
+"del fax!"
 
-#: plugins/gofax/reports/detail.tpl:58 plugins/gofax/reports/contents.tpl:35
-msgid "# pages"
-msgstr "# páginas"
+#: plugins/gofax/reports/class_faxreport.inc:137
+#: plugins/gofax/reports/class_faxreport.inc:224
+#: plugins/gofon/reports/class_fonreport.inc:161
+msgid "Y-M-D"
+msgstr "Y-M-D"
 
 #: plugins/gofax/reports/contents.tpl:2 plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/reports/contents.tpl:2
@@ -2749,50 +2787,67 @@ msgstr "Receptor"
 msgid "Search returned no results..."
 msgstr "La busqueda no ha encontrado resultados"
 
-#: plugins/gofax/reports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Informes de FAX"
-
-#: plugins/gofax/reports/class_faxreport.inc:97
-#: plugins/gofax/reports/class_faxreport.inc:204
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
-"informes!"
+#: plugins/gofax/reports/main.inc:5
+msgid "FAX reports"
+msgstr "Reportes de FAX"
 
-#: plugins/gofax/reports/class_faxreport.inc:101
-#: plugins/gofax/reports/class_faxreport.inc:208
-msgid "Can't select fax database for report generation!"
-msgstr ""
-"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Marcando conexión"
 
-#: plugins/gofax/reports/class_faxreport.inc:109
-#: plugins/gofax/reports/class_faxreport.inc:216
-msgid "Query for fax database failed!"
-msgstr "¡La consulta a la base de datos de fax ha fallado!"
+#: 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"
 
-#: plugins/gofax/reports/class_faxreport.inc:117
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-"¡No tiene permisos para recuperar información sobre el identificador (ID) "
-"del fax!"
+#: plugins/addons/addressbook/address_edit.tpl:4
+msgid "Choose the department to store entry in"
+msgstr "Elija un departamento para guardar la entrada"
 
-#: plugins/gofax/reports/class_faxreport.inc:137
-#: plugins/gofax/reports/class_faxreport.inc:224
-#: plugins/gofon/reports/class_fonreport.inc:161
-msgid "Y-M-D"
-msgstr "Y-M-D"
+#: plugins/addons/addressbook/address_edit.tpl:16
+#: plugins/addons/addressbook/address_info.tpl:12
+msgid "Personal"
+msgstr "Personal"
 
-#: plugins/gofax/reports/main.inc:5
-msgid "FAX reports"
-msgstr "Reportes de FAX"
+#: plugins/addons/addressbook/address_edit.tpl:23
+#: plugins/addons/addressbook/address_info.tpl:19
+msgid "Initials"
+msgstr "Iniciales"
 
-#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_edit.tpl:33
+#: plugins/addons/addressbook/contents.tpl:15
 #: plugins/addons/addressbook/address_info.tpl:29
 msgid "Private"
 msgstr "Privado"
 
+#: plugins/addons/addressbook/address_edit.tpl:47
+#: plugins/addons/addressbook/address_info.tpl:43
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: plugins/addons/addressbook/address_edit.tpl:57
+#: plugins/addons/addressbook/address_info.tpl:53
+msgid "Organizational"
+msgstr "De organización"
+
+#: plugins/addons/addressbook/address_edit.tpl:65
+#: plugins/addons/addressbook/address_info.tpl:61
+msgid "Company"
+msgstr "Compañia"
+
+#: plugins/addons/addressbook/address_edit.tpl:71
+#: plugins/addons/addressbook/address_info.tpl:67
+msgid "City"
+msgstr "Ciudad"
+
+#: plugins/addons/addressbook/address_edit.tpl:77
+#: plugins/addons/addressbook/address_info.tpl:73
+msgid "Country"
+msgstr "Pais"
+
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
 msgstr "Contacto"
@@ -2855,57 +2910,6 @@ msgstr "Encontrar objeto"
 msgid "Choose the object that will be searched in"
 msgstr "Elegir el objeto que sera buscado"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Marcando conexión"
-
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc: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"
-
-#: plugins/addons/addressbook/address_edit.tpl:4
-msgid "Choose the department to store entry in"
-msgstr "Elija un departamento para guardar la entrada"
-
-#: plugins/addons/addressbook/address_edit.tpl:16
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Personal"
-
-#: plugins/addons/addressbook/address_edit.tpl:23
-#: plugins/addons/addressbook/address_info.tpl:19
-msgid "Initials"
-msgstr "Iniciales"
-
-#: plugins/addons/addressbook/address_edit.tpl:47
-#: plugins/addons/addressbook/address_info.tpl:43
-msgid "Email"
-msgstr "Correo Electrónico"
-
-#: plugins/addons/addressbook/address_edit.tpl:57
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr "De organización"
-
-#: plugins/addons/addressbook/address_edit.tpl:65
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Compañia"
-
-#: plugins/addons/addressbook/address_edit.tpl:71
-#: plugins/addons/addressbook/address_info.tpl:67
-msgid "City"
-msgstr "Ciudad"
-
-#: plugins/addons/addressbook/address_edit.tpl:77
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Pais"
-
 #: plugins/addons/addressbook/remove.tpl:7
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -3292,6 +3296,45 @@ msgstr "Mensaje"
 msgid "System log view"
 msgstr "Ver registro del sistema"
 
+#: plugins/admin/groups/mail.tpl:11
+msgid "Primary mail address for this shared folder"
+msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
+
+#: plugins/admin/groups/mail.tpl:16
+msgid "Select mail server to place user on"
+msgstr "Seleccione el servidor de correo del usuario"
+
+#: plugins/admin/groups/mail.tpl:66
+msgid "IMAP shared folders"
+msgstr "Carpetas compartidas IMAP"
+
+#: plugins/admin/groups/mail.tpl:70
+msgid "Default permission"
+msgstr "Permisos por defecto"
+
+#: plugins/admin/groups/mail.tpl:79
+msgid "Member permission"
+msgstr "Miembro con Permisos"
+
+#: plugins/admin/groups/mail.tpl:94
+msgid "Forward messages to non group members"
+msgstr "Reenviar mensajes a miembros que no sean del grupo"
+
+#: plugins/admin/groups/class_groupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroupManagement.inc:42
+msgid "Groups"
+msgstr "Grupos"
+
+#: 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: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!"
+
 #: plugins/admin/groups/class_groupGeneric.inc:109
 msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
@@ -3341,29 +3384,17 @@ msgstr ""
 msgid "Value specified as 'Name' is already used."
 msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/groups/mail.tpl:11
-msgid "Primary mail address for this shared folder"
-msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
-
-#: plugins/admin/groups/mail.tpl:16
-msgid "Select mail server to place user on"
-msgstr "Seleccione el servidor de correo del usuario"
-
-#: plugins/admin/groups/mail.tpl:66
-msgid "IMAP shared folders"
-msgstr "Carpetas compartidas IMAP"
-
-#: plugins/admin/groups/mail.tpl:70
-msgid "Default permission"
-msgstr "Permisos por defecto"
-
-#: plugins/admin/groups/mail.tpl:79
-msgid "Member permission"
-msgstr "Miembro con Permisos"
+#: plugins/admin/groups/remove.tpl:7
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Este puede ser un grupo primario. Por favor pinche dos veces si realmente "
+"quiere hacerlo, dado que GOsa no tiene manera de recuperar esta información."
 
-#: plugins/admin/groups/mail.tpl:94
-msgid "Forward messages to non group members"
-msgstr "Reenviar mensajes a miembros que no sean del grupo"
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Administración de grupos"
 
 #: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
 msgid "List of groups"
@@ -3388,44 +3419,13 @@ msgstr ""
 "edición de las propiedades del grupo. - Eliminar - le pedirá confirmación "
 "antes de eliminar los grupos."
 
-#: 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:60 plugins/admin/users/headpage.tpl:62
-msgid "Search in subtrees"
-msgstr "Buscar en el subárbol"
-
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Administración de grupos"
-
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:42
-msgid "Groups"
-msgstr "Grupos"
-
-#: 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: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!"
-
-#: plugins/admin/groups/remove.tpl:7
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Este puede ser un grupo primario. Por favor pinche dos veces si realmente "
-"quiere hacerlo, dado que GOsa no tiene manera de recuperar esta información."
+#: plugins/admin/groups/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/application_options.tpl:1
-msgid "Application options"
-msgstr "Opciones de aplicaciones"
+#: plugins/admin/groups/headpage.tpl:60 plugins/admin/users/headpage.tpl:62
+msgid "Search in subtrees"
+msgstr "Buscar en el subárbol"
 
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
@@ -3566,6 +3566,10 @@ msgstr "Miembros del grupo"
 msgid "Folder administrators"
 msgstr "Administradores de Carpetas"
 
+#: plugins/admin/groups/application_options.tpl:1
+msgid "Application options"
+msgstr "Opciones de aplicaciones"
+
 #: plugins/admin/groups/class_groupApplication.inc:61
 msgid "This 'dn' is no appgroup."
 msgstr "Esta'dn' no es un grupo de aplicaciones."
@@ -3614,41 +3618,6 @@ msgstr ""
 "cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
 "contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Crear un nuevo usuario usando plantillas"
-
-#: plugins/admin/users/template.tpl:6
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose <b>none</b> to skip the usage "
-"of templates."
-msgstr ""
-"Crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
-"valores en la base de datos serán rellenado automáticamente. Elegir "
-"<b>ninguno</b> para saltarse el uso de plantillas."
-
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:618
-msgid "Template"
-msgstr "Plantilla"
-
-#: plugins/admin/users/template.tpl:44
-#: ihtml/themes/altlinux/setup_introduction.tpl:12
-#: ihtml/themes/altlinux/setup_step2.tpl:13
-#: ihtml/themes/altlinux/setup_useradmin.tpl:41
-#: ihtml/themes/altlinux/setup_step3.tpl:18
-#: ihtml/themes/default/setup_introduction.tpl:12
-#: ihtml/themes/default/setup_useradmin.tpl:41
-#: ihtml/themes/default/setup_step2.tpl:13
-#: ihtml/themes/default/setup_step3.tpl:18
-msgid "Continue"
-msgstr "Continuar"
-
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Administración de Usuarios"
-
 #: plugins/admin/users/class_userManagement.inc:25
 msgid "Users"
 msgstr "Usuarios"
@@ -3677,6 +3646,37 @@ msgstr "ninguno"
 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:618
+#: plugins/admin/users/template.tpl:11
+msgid "Template"
+msgstr "Plantilla"
+
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Crear un nuevo usuario usando plantillas"
+
+#: plugins/admin/users/template.tpl:6
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose <b>none</b> to skip the usage "
+"of templates."
+msgstr ""
+"Crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
+"valores en la base de datos serán rellenado automáticamente. Elegir "
+"<b>ninguno</b> para saltarse el uso de plantillas."
+
+#: plugins/admin/users/template.tpl:44
+#: ihtml/themes/altlinux/setup_introduction.tpl:12
+#: ihtml/themes/altlinux/setup_step2.tpl:13
+#: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_introduction.tpl:12
+#: ihtml/themes/default/setup_useradmin.tpl:41
+#: ihtml/themes/default/setup_step2.tpl:13
+#: ihtml/themes/default/setup_step3.tpl:18
+msgid "Continue"
+msgstr "Continuar"
+
 #: plugins/admin/users/remove.tpl:7
 msgid ""
 "This includes all account data, system access rules, imap settings, etc. for "
@@ -3763,6 +3763,46 @@ msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
 msgid "Show proxy users"
 msgstr "Mostrar los usuarios de proxy"
 
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Administración de Usuarios"
+
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr "Eliminar opciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:48
+msgid "This application has options. You can disable them by clicking below."
+msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
+
+#: plugins/admin/applications/class_applicationParameters.inc:50
+msgid "Create options"
+msgstr "Crear opciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:51
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+msgid "Variable"
+msgstr "Variable"
+
+#: plugins/admin/applications/class_applicationParameters.inc:87
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Valor por defecto"
+
+#: plugins/admin/applications/class_applicationParameters.inc:98
+msgid "Add option"
+msgstr "Añadir opción"
+
+#: plugins/admin/applications/class_applicationParameters.inc:149
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "El valor '%s' especificado como nombre de opción no es valido."
+
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
 msgid "Application name"
@@ -3822,42 +3862,6 @@ 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/class_applicationParameters.inc:47
-msgid "Remove options"
-msgstr "Eliminar opciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:48
-msgid "This application has options. You can disable them by clicking below."
-msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
-
-#: plugins/admin/applications/class_applicationParameters.inc:50
-msgid "Create options"
-msgstr "Crear opciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:51
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-msgid "Variable"
-msgstr "Variable"
-
-#: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Valor por defecto"
-
-#: plugins/admin/applications/class_applicationParameters.inc:98
-msgid "Add option"
-msgstr "Añadir opción"
-
-#: plugins/admin/applications/class_applicationParameters.inc:149
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "El valor '%s' especificado como nombre de opción no es valido."
-
 #: plugins/admin/applications/remove.tpl:7 plugins/gofon/macro/remove.tpl:7
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -3907,17 +3911,6 @@ msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/applications/class_applicationManagement.inc:185
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Va ha eliminar la aplicación '%s'."
-
-#: plugins/admin/applications/class_applicationManagement.inc: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!"
-
 #: plugins/admin/applications/class_applicationGeneric.inc:59
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
@@ -3942,6 +3935,17 @@ msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 msgid "There's already an application with this 'Name'."
 msgstr "Ya existe una aplicación con este 'Nombre'."
 
+#: plugins/admin/applications/class_applicationManagement.inc:185
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Va ha eliminar la aplicación '%s'."
+
+#: plugins/admin/applications/class_applicationManagement.inc: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!"
+
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
@@ -4052,20 +4056,6 @@ msgstr "Expresiones regulares para encontrar nombres de departamentos"
 msgid "Department management"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:43
-msgid "Departments"
-msgstr "Departamentos"
-
-#: plugins/admin/departments/class_departmentManagement.inc:130
-#, php-format
-msgid "You're about to delete the whole LDAP subtree placed under '%s'."
-msgstr "Esta a punto de borrar todo el subárbol LDAP colocado bajo '%s'."
-
-#: plugins/admin/departments/class_departmentManagement.inc:145
-msgid "You have no permission to remove this department."
-msgstr "No tiene permisos para eliminar este departamento."
-
 #: plugins/admin/departments/class_departmentGeneric.inc:129
 msgid "You have no permissions to create a department on this 'Base'."
 msgstr "No tiene permisos para crear un departamento en esta 'Base'."
@@ -4087,6 +4077,20 @@ msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
 msgid " Please choose another name."
 msgstr "Por favor elija otro nombre."
 
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/ogroups/class_ogroupManagement.inc:43
+msgid "Departments"
+msgstr "Departamentos"
+
+#: plugins/admin/departments/class_departmentManagement.inc:130
+#, php-format
+msgid "You're about to delete the whole LDAP subtree placed under '%s'."
+msgstr "Esta a punto de borrar todo el subárbol LDAP colocado bajo '%s'."
+
+#: plugins/admin/departments/class_departmentManagement.inc:145
+msgid "You have no permission to remove this department."
+msgstr "No tiene permisos para eliminar este departamento."
+
 #: plugins/admin/systems/class_terminalInfo.inc:53
 #: plugins/admin/systems/class_terminalInfo.inc:178
 msgid "present"
@@ -4136,37 +4140,23 @@ msgstr "Dirección IP"
 msgid "MAC-address"
 msgstr "Dirección MAC"
 
-#: plugins/admin/systems/class_winGeneric.inc:73
+#: 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:136
+#: 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:139
-#: 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_winGeneric.inc:142
-#: 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/class_winGeneric.inc:149
+#: 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:159
+#: 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
@@ -4269,45 +4259,9 @@ msgstr "Servicio de exploración"
 msgid "Sound service"
 msgstr "Servicio de sonido"
 
-#: plugins/admin/systems/info.tpl:128
-msgid "GUI"
-msgstr "GUI"
-
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Gestión del sistema"
-
-#: plugins/admin/systems/servservice.tpl:11
-msgid "Nfs Export"
-msgstr "Exportación NFS"
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Servicio de Hora"
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Servicio LDAP"
-
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Servidor de terminal"
-
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Desactivación temporal del acceso"
-
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Ruta a las fuentes tipográficas"
-
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Servicio de Logs"
-
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Servicio de impresión"
+#: plugins/admin/systems/info.tpl:128
+msgid "GUI"
+msgstr "GUI"
 
 #: plugins/admin/systems/class_terminalService.inc:83
 msgid "default"
@@ -4347,28 +4301,45 @@ msgstr "Por favor especifique un rango VSync valido"
 msgid "Please specify a valid HSync range."
 msgstr "Por favor especifique un rango HSync valido"
 
-#: plugins/admin/systems/class_servDB.inc:131
-#: plugins/admin/systems/class_servDB.inc:147
-#: plugins/admin/systems/class_servDB.inc:153
-#: plugins/admin/systems/class_servDB.inc:158
-#: plugins/admin/systems/class_servDB.inc:164
-#, 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/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Gestión del sistema"
 
-#: 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_servService.inc:179
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
 
-#: 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/servservice.tpl:11
+msgid "Nfs Export"
+msgstr "Exportación NFS"
 
-#: 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/servservice.tpl:37
+msgid "Time Service"
+msgstr "Servicio de Hora"
+
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Servicio LDAP"
+
+#: plugins/admin/systems/servservice.tpl:72
+msgid "Terminal Service"
+msgstr "Servidor de terminal"
+
+#: plugins/admin/systems/servservice.tpl:77
+msgid "Temporary disable login"
+msgstr "Desactivación temporal del acceso"
+
+#: plugins/admin/systems/servservice.tpl:80
+msgid "Font path"
+msgstr "Ruta a las fuentes tipográficas"
+
+#: plugins/admin/systems/servservice.tpl:93
+msgid "Syslog Service"
+msgstr "Servicio de Logs"
+
+#: plugins/admin/systems/servservice.tpl:101
+msgid "Print Service"
+msgstr "Servicio de impresión"
 
 #: plugins/admin/systems/server.tpl:6
 msgid "Server name"
@@ -4392,76 +4363,6 @@ 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/phone.tpl:6
-msgid "Phone name"
-msgstr "Número de teléfono"
-
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Plantilla de terminal"
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-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"
-
-#: plugins/admin/systems/terminal.tpl:38
-#: plugins/admin/systems/workstation.tpl:38
-msgid "Select terminal mode"
-msgstr "Seleccionar modo de terminal"
-
-#: plugins/admin/systems/terminal.tpl:52
-#: plugins/admin/systems/workstation.tpl:52
-msgid "Root server"
-msgstr "Servidor Raíz"
-
-#: plugins/admin/systems/terminal.tpl:54
-#: plugins/admin/systems/workstation.tpl:54
-msgid "Select NFS root filesystem to use"
-msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
-
-#: plugins/admin/systems/terminal.tpl:60
-#: plugins/admin/systems/workstation.tpl:60
-msgid "Swap server"
-msgstr "Servidor de Intercambio"
-
-#: plugins/admin/systems/terminal.tpl:62
-#: plugins/admin/systems/workstation.tpl:62
-msgid "Choose NFS filesystem to place swap files on"
-msgstr ""
-"Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
-"intercambio"
-
-#: plugins/admin/systems/terminal.tpl:74
-#: plugins/admin/systems/workstation.tpl:74
-msgid "Syslog server"
-msgstr "Servidor de Logs"
-
-#: plugins/admin/systems/terminal.tpl:76
-#: plugins/admin/systems/workstation.tpl:76
-msgid "Choose server to use for logging"
-msgstr "Elija un servidor que será usado para registro"
-
-#: plugins/admin/systems/terminal.tpl:82
-#: plugins/admin/systems/workstation.tpl:82
-msgid "NTP server"
-msgstr "Servidor NTP"
-
-#: plugins/admin/systems/terminal.tpl:84
-#: plugins/admin/systems/workstation.tpl:84
-msgid "Choose server to use for synchronizing time"
-msgstr "Elija un servidor que será usado para sincronización horaria"
-
-#: plugins/admin/systems/terminal.tpl:103
-#: plugins/admin/systems/workstation.tpl:103
-msgid "Select action to execute for this terminal"
-msgstr "Seleccione una acción que se ejecutara en este terminal"
-
 #: plugins/admin/systems/class_terminalGeneric.inc:63
 #: plugins/admin/systems/class_workstationGeneric.inc:71
 msgid "text"
@@ -4538,6 +4439,10 @@ msgstr "No tiene permisos para crear un terminal en esta 'Base'."
 msgid "The required field 'Terminal name' is not set."
 msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
 
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Número de teléfono"
+
 #: plugins/admin/systems/class_servGeneric.inc:49
 msgid "This 'dn' has no server features."
 msgstr "Esta 'dn' no tiene características de servidor."
@@ -4551,6 +4456,72 @@ msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "No tiene permisos para crear un servidor en esta 'Base'."
 
+#: plugins/admin/systems/terminal.tpl:9
+msgid "Terminal template"
+msgstr "Plantilla de terminal"
+
+#: plugins/admin/systems/terminal.tpl:11
+msgid "Terminal name"
+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"
+
+#: plugins/admin/systems/terminal.tpl:38
+#: plugins/admin/systems/workstation.tpl:38
+msgid "Select terminal mode"
+msgstr "Seleccionar modo de terminal"
+
+#: plugins/admin/systems/terminal.tpl:52
+#: plugins/admin/systems/workstation.tpl:52
+msgid "Root server"
+msgstr "Servidor Raíz"
+
+#: plugins/admin/systems/terminal.tpl:54
+#: plugins/admin/systems/workstation.tpl:54
+msgid "Select NFS root filesystem to use"
+msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
+
+#: plugins/admin/systems/terminal.tpl:60
+#: plugins/admin/systems/workstation.tpl:60
+msgid "Swap server"
+msgstr "Servidor de Intercambio"
+
+#: plugins/admin/systems/terminal.tpl:62
+#: plugins/admin/systems/workstation.tpl:62
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+"Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
+"intercambio"
+
+#: plugins/admin/systems/terminal.tpl:74
+#: plugins/admin/systems/workstation.tpl:74
+msgid "Syslog server"
+msgstr "Servidor de Logs"
+
+#: plugins/admin/systems/terminal.tpl:76
+#: plugins/admin/systems/workstation.tpl:76
+msgid "Choose server to use for logging"
+msgstr "Elija un servidor que será usado para registro"
+
+#: plugins/admin/systems/terminal.tpl:82
+#: plugins/admin/systems/workstation.tpl:82
+msgid "NTP server"
+msgstr "Servidor NTP"
+
+#: plugins/admin/systems/terminal.tpl:84
+#: plugins/admin/systems/workstation.tpl:84
+msgid "Choose server to use for synchronizing time"
+msgstr "Elija un servidor que será usado para sincronización horaria"
+
+#: plugins/admin/systems/terminal.tpl:103
+#: plugins/admin/systems/workstation.tpl:103
+msgid "Select action to execute for this terminal"
+msgstr "Seleccione una acción que se ejecutara en este terminal"
+
 #: plugins/admin/systems/class_servDHCP.inc:33
 msgid "Remove DHCP service"
 msgstr "Eliminar servicio DHCP"
@@ -4575,18 +4546,6 @@ msgstr ""
 "Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/printer.tpl:6
-msgid "Printer name"
-msgstr "Nombre de la impresora"
-
-#: plugins/admin/systems/printer.tpl:32
-msgid "Printer URL"
-msgstr "URL de la impresora"
-
-#: plugins/admin/systems/printer.tpl:36
-msgid "Path to PPD"
-msgstr "Ruta al 'PPD'"
-
 #: plugins/admin/systems/class_workstationGeneric.inc:136
 msgid "This 'dn' has no workstation features."
 msgstr "Esta 'dn' no tiene características de estación de trabajo."
@@ -4643,13 +4602,17 @@ msgstr "Plantilla de cliente ligero para"
 msgid "Workstation template for"
 msgstr "Plantilla de estación de trabajo para"
 
-#: 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/printer.tpl:6
+msgid "Printer name"
+msgstr "Nombre de la impresora"
 
-#: 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'."
+#: plugins/admin/systems/printer.tpl:32
+msgid "Printer URL"
+msgstr "URL de la impresora"
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Path to PPD"
+msgstr "Ruta al 'PPD'"
 
 #: plugins/admin/systems/class_servDNS.inc:33
 msgid "Remove DNS service"
@@ -4673,6 +4636,29 @@ msgstr ""
 "Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
 "aquí."
 
+#: plugins/admin/systems/class_servDB.inc:131
+#: plugins/admin/systems/class_servDB.inc:147
+#: plugins/admin/systems/class_servDB.inc:153
+#: plugins/admin/systems/class_servDB.inc:158
+#: plugins/admin/systems/class_servDB.inc:164
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_servDB.inc:137
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
+
+#: plugins/admin/systems/class_servDB.inc:141
+msgid "The sieve port needs to be numeric."
+msgstr "El puerto sieve necesita ser un numero."
+
+#: plugins/admin/systems/class_servDB.inc:172
+#, fuzzy, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
+
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr "Plantilla de estación de trabajo"
@@ -4877,10 +4863,18 @@ msgstr "Equipo usado para reenviar correos"
 msgid "Accept Internet Mail"
 msgstr "Aceptar correo desde internet"
 
-#: plugins/admin/systems/servkolab.tpl:167
-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/servkolab.tpl:167
+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:57
+msgid "This 'dn' has no printer features."
+msgstr "Esta 'dn' no tiene características de impresora."
+
+#: 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'."
 
 #: plugins/admin/systems/wingeneric.tpl:6
 msgid "Machine name"
@@ -4989,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"
@@ -5370,7 +5376,7 @@ msgid "Choose a phone type"
 msgstr "Elija tipo de ratón"
 
 #: plugins/admin/systems/phonesettings.tpl:13
-#: plugins/gofon/phoneaccount/generic.tpl:61
+#: plugins/gofon/phoneaccount/generic.tpl:64
 msgid "refresh"
 msgstr ""
 
@@ -5522,6 +5528,42 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Seleccione una acción que se ejecutara en este grupo de terminales"
 
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+msgid "Object groups"
+msgstr "Grupos de objetos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:41
+msgid "UNIX accounts"
+msgstr "Cuentas UNIX"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:45
+msgid "Servers"
+msgstr "Servidores"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:46
+msgid "Thin Clients"
+msgstr "Clientes Ligeros"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:47
+msgid "Workstations"
+msgstr "Estaciones de trabajo"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:49
+#: plugins/generic/references/class_reference.inc:52
+msgid "Printer"
+msgstr "Impresora"
+
+#: 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: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!"
+
 #: plugins/admin/ogroups/class_ogroup.inc:91
 msgid "This 'dn' is no object group."
 msgstr "Este 'dn' no es un objeto tipo grupo."
@@ -5582,42 +5624,6 @@ msgstr "'Grupos de objetos que necesitan al menos un miembro!"
 msgid "You can combine two different object types at maximum only!"
 msgstr "¡Solo se pueden combinar dos objetos diferentes hasta un máximo!"
 
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-msgid "Object groups"
-msgstr "Grupos de objetos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:41
-msgid "UNIX accounts"
-msgstr "Cuentas UNIX"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:45
-msgid "Servers"
-msgstr "Servidores"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:46
-msgid "Thin Clients"
-msgstr "Clientes Ligeros"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:47
-msgid "Workstations"
-msgstr "Estaciones de trabajo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:49
-#: plugins/generic/references/class_reference.inc:52
-msgid "Printer"
-msgstr "Impresora"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:150
-#, 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:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:182
-msgid "You are not allowed to delete this object group!"
-msgstr "¡No tiene permisos para eliminar este objeto grupo!"
-
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Nombre del grupo"
@@ -5645,38 +5651,34 @@ msgstr ""
 "cuando trabaja con un gran número de grupos."
 
 #: plugins/admin/ogroups/headpage.tpl:48
-msgid "Show empty groups"
-msgstr "Mostrar grupos vacios"
-
-#: plugins/admin/ogroups/headpage.tpl:49
 msgid "Show groups containing users"
 msgstr "Mostrar grupos que tienen usuarios"
 
-#: plugins/admin/ogroups/headpage.tpl:50
+#: plugins/admin/ogroups/headpage.tpl:49
 msgid "Show groups containing groups"
 msgstr "Mostrar grupos que contienen grupos"
 
-#: plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/ogroups/headpage.tpl:50
 msgid "Show groups containing applications"
 msgstr "Mostrar grupos que contienen aplicaciones"
 
-#: plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/ogroups/headpage.tpl:51
 msgid "Show groups containing departments"
 msgstr "Mostrar grupos que contienen departamentos"
 
-#: plugins/admin/ogroups/headpage.tpl:53
+#: plugins/admin/ogroups/headpage.tpl:52
 msgid "Show groups containing servers"
 msgstr "Mostrar grupos que contienen servidores"
 
-#: plugins/admin/ogroups/headpage.tpl:54
+#: plugins/admin/ogroups/headpage.tpl:53
 msgid "Show groups containing workstations"
 msgstr "Mostrar grupos que contienen estaciones de trabajo"
 
-#: plugins/admin/ogroups/headpage.tpl:55
+#: plugins/admin/ogroups/headpage.tpl:54
 msgid "Show groups containing terminals"
 msgstr "Mostrar grupos que contienen terminales"
 
-#: plugins/admin/ogroups/headpage.tpl:56
+#: plugins/admin/ogroups/headpage.tpl:55
 msgid "Show groups containing printers"
 msgstr "Mostrar grupos que contienen impresoras"
 
@@ -5689,9 +5691,21 @@ msgstr ""
 msgid "Primary mail address for this distribution list"
 msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr "Configuración telefónica"
+#: 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
@@ -5741,27 +5755,37 @@ msgstr ""
 msgid "Please enter a valid phone number!"
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:343
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:344
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:453
+#: 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:467
+#: 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:470
+#: 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/class_phoneAccount.inc:478
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:277
+#: 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!"
@@ -5784,12 +5808,21 @@ msgstr "Número de teléfono"
 msgid "Timeout (s)"
 msgstr "Tiempo(s) excedido(s)"
 
-#: plugins/gofon/phoneaccount/generic.tpl:54
-#: plugins/gofon/phoneaccount/generic.tpl:56
+#: 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"
+
 #: plugins/gofon/reports/class_fonreport.inc:6
 msgid "Phone Reports"
 msgstr "Informes telefónicos"
@@ -5835,22 +5868,27 @@ msgstr "Duración"
 msgid "Phone reports"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:58
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:153
+#: 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:136
+#: 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:141
+#: 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:150
+#: plugins/gofon/macro/class_gofonMacro.inc:180
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
@@ -5873,6 +5911,34 @@ msgstr "Lista de usuarios"
 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"
@@ -5919,33 +5985,15 @@ msgstr "Expresión regular que concuerde con nombres de grupos"
 msgid "Phone macro management"
 msgstr "Gestión del sistema"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:200
+#: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
-msgid "String"
-msgstr "durante"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:201
-msgid "Combobox"
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:202
-msgid "Bool"
-msgstr ""
+msgid "Argument"
+msgstr "Argumentos"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:208
+#: plugins/gofon/macro/parameter.tpl:7
 #, fuzzy
-msgid "Delete unused"
-msgstr "Borrar"
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:269
-#, php-format
-msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
-msgstr ""
-
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:282
-#, php-format
-msgid "The parameter %s has incorrect value for type bool."
-msgstr ""
+msgid "type"
+msgstr "Tipo"
 
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
@@ -5962,16 +6010,6 @@ msgstr "Está a punto de borrar el grupo '%s'."
 msgid "You are not allowed to delete this macro!"
 msgstr "¡No le está permitido eliminar este grupo!"
 
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "Argumentos"
-
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Tipo"
-
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Grupo"
@@ -6028,49 +6066,49 @@ msgstr "El equipo de GOsa"
 msgid "Welcome %s!"
 msgstr "¡Bienvenido %s!"
 
-#: include/php_setup.inc:61
+#: include/php_setup.inc:71
 msgid "Generating this page caused the PHP interpreter to raise some errors!"
 msgstr ""
 "¡La generación de esta página provoca que el interprete PHP muestre algunos "
 "errores!"
 
-#: include/php_setup.inc:61 html/main.php:292
+#: include/php_setup.inc:71 html/main.php:292
 msgid "Toggle information"
 msgstr "Información de intercambio"
 
-#: include/php_setup.inc:66
+#: include/php_setup.inc:76
 msgid "PHP error"
 msgstr "Error PHP:"
 
-#: include/php_setup.inc:77
+#: include/php_setup.inc:87
 msgid "class"
 msgstr "clase"
 
-#: include/php_setup.inc:83
+#: include/php_setup.inc:93
 msgid "function"
 msgstr "Función"
 
-#: include/php_setup.inc:88
+#: include/php_setup.inc:98
 msgid "static"
 msgstr "estatico"
 
-#: include/php_setup.inc:92
+#: include/php_setup.inc:102
 msgid "method"
 msgstr "método"
 
-#: include/php_setup.inc:111
+#: include/php_setup.inc:121
 msgid "Trace"
 msgstr "Traza"
 
-#: include/php_setup.inc:112
+#: include/php_setup.inc:122
 msgid "File"
 msgstr "Archivo"
 
-#: include/php_setup.inc:112
+#: include/php_setup.inc:122
 msgid "Line"
 msgstr "Linea"
 
-#: include/php_setup.inc:113
+#: include/php_setup.inc:123
 msgid "Arguments"
 msgstr "Argumentos"
 
@@ -6255,24 +6293,6 @@ msgstr ""
 "No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
 "s'"
 
-#: 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_plugin.inc:180
 msgid "This 'dn' has no account extensions."
 msgstr "Este 'dn' no tiene extensiones de cuenta."
@@ -6305,38 +6325,61 @@ msgstr ""
 "El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
 "parece existir."
 
-#: include/class_config.inc:69
-#, php-format
-msgid "XML error in gosa.conf: %s at line %d"
-msgstr "Error XML en 'gosa.conf': %s en la linea %d"
-
-#: include/class_config.inc:195 html/index.php:140
-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-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'."
+"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_password-methods.inc:199
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+#: 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 ""
-"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
-"pueden cambiar las contraseñas de SAMBA."
+"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
 
 #: include/class_password-methods-kerberos.inc:43
 msgid ""
@@ -6355,11 +6398,6 @@ 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_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
-
 #: include/class_ldap.inc:398
 #, php-format
 msgid ""
@@ -6369,7 +6407,7 @@ msgstr ""
 "Actualmente no esta soportada la creación automática del tipo '%s'. Por "
 "favor, informe de esto al equipo de desarrollo de GOsa."
 
-#: include/class_ldap.inc:630
+#: include/class_ldap.inc:631
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -6378,12 +6416,12 @@ msgstr ""
 "El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
 "en la linea %s"
 
-#: include/class_ldap.inc:643
+#: 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:659
+#: include/class_ldap.inc:660
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -6415,29 +6453,19 @@ msgstr "Fichero de configuración"
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/functions_helpviewer.inc:260
-#, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
-msgstr ""
-
-#: include/functions_helpviewer.inc:335
-#, php-format
-msgid "%s%% hit rate in file %s"
-msgstr ""
-
-#: include/functions_setup.inc:72
+#: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
 "No se pudo establecer la conexión al servidor LDAP. ¡No se pudo comprobar el "
 "esquema.!"
 
-#: include/functions_setup.inc:81 include/functions_setup.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/functions_setup.inc:110
+#: include/functions_setup.inc:136
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
@@ -6446,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/functions_setup.inc:114
+#: include/functions_setup.inc:140
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
@@ -6454,84 +6482,84 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no tiene la versión %s"
 
-#: include/functions_setup.inc:118
+#: include/functions_setup.inc:145
 #, php-format
 msgid "Support for '%s' enabled"
 msgstr "Es soporte para '%s' esta activado"
 
-#: include/functions_setup.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/functions_setup.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/functions_setup.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/functions_setup.inc:146
+#: include/functions_setup.inc:175
 msgid "SAMBA 3 support enabled"
 msgstr "Soporte de SAMBA 3 activado"
 
-#: include/functions_setup.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/functions_setup.inc:156
+#: include/functions_setup.inc:185
 msgid "SAMBA 2 support enabled"
 msgstr "Soporte de SAMBA 2 activado"
 
-#: include/functions_setup.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/functions_setup.inc:167
+#: include/functions_setup.inc:196
 msgid "Support for pureftp enabled"
 msgstr "Soporte de PUREFTP activado"
 
-#: include/functions_setup.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/functions_setup.inc:177
+#: include/functions_setup.inc:206
 msgid "Support for WebDAV enabled"
 msgstr "Soporte de WebDAV activado"
 
-#: include/functions_setup.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/functions_setup.inc:187
+#: include/functions_setup.inc:216
 msgid "Support for phpgroupware enabled"
 msgstr "El soporte para phpgroupware está activado"
 
-#: include/functions_setup.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/functions_setup.inc:197
+#: include/functions_setup.inc:226
 msgid "Support for gofon enabled"
 msgstr "Soporte de GOFON activado"
 
-#: include/functions_setup.inc:204
+#: include/functions_setup.inc:233
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -6539,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/functions_setup.inc:212
+#: include/functions_setup.inc:241
 msgid "Support for Kolab enabled"
 msgstr "Soporte de KOLAB activado"
 
-#: include/functions_setup.inc:229
+#: include/functions_setup.inc:258
 msgid "OK"
 msgstr "Perfecto"
 
-#: include/functions_setup.inc:232
+#: include/functions_setup.inc:261
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: include/functions_setup.inc:234
+#: include/functions_setup.inc:263
 msgid "Failed"
 msgstr "Fallado"
 
-#: include/functions_setup.inc:251
+#: include/functions_setup.inc:280
 msgid "PHP setup inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.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/functions_setup.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."
@@ -6571,13 +6599,13 @@ msgstr ""
 "Debe tener una versión de PHP 4.1.0 o superior para el correcto "
 "funcionamiento de GOsa."
 
-#: include/functions_setup.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/functions_setup.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 "
@@ -6587,37 +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/functions_setup.inc:260
+#: include/functions_setup.inc:289
 msgid "Checking for ldap module"
 msgstr "Comprobando los módulos de ldap"
 
-#: include/functions_setup.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/functions_setup.inc:264
+#: include/functions_setup.inc:293
 #, fuzzy
 msgid "Checking for XML functions"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:265
+#: include/functions_setup.inc:294
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:268
+#: include/functions_setup.inc:297
 msgid "Checking for gettext support"
 msgstr "Comprobando el soporte de gettext"
 
-#: include/functions_setup.inc:269
+#: 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/functions_setup.inc:271
+#: include/functions_setup.inc:300
 msgid "Checking for iconv support"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:272
+#: include/functions_setup.inc:301
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -6626,11 +6654,11 @@ msgstr ""
 "Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
 "tanto requerido."
 
-#: include/functions_setup.inc:275
+#: include/functions_setup.inc:304
 msgid "Checking for mhash module"
 msgstr "Comprobando por el módulo de mhash"
 
-#: include/functions_setup.inc:276
+#: 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."
@@ -6638,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/functions_setup.inc:279
+#: include/functions_setup.inc:308
 msgid "Checking for imap module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:280
+#: 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."
@@ -6650,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/functions_setup.inc:283
+#: include/functions_setup.inc:312
 msgid "Checking for getacl in imap"
 msgstr "Comprobando por getacl en imap"
 
-#: include/functions_setup.inc:284
+#: 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 "
@@ -6664,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/functions_setup.inc:287
+#: include/functions_setup.inc:316
 msgid "Checking for mysql module"
 msgstr "Comprobando el módulo de mysql"
 
-#: include/functions_setup.inc:288
+#: 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/functions_setup.inc:291
+#: include/functions_setup.inc:320
 msgid "Checking for cups module"
 msgstr "Comprobando el módulo de cups"
 
-#: include/functions_setup.inc:292
+#: 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."
@@ -6686,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/functions_setup.inc:295
+#: include/functions_setup.inc:324
 msgid "Checking for kadm5 module"
 msgstr "Comprobando el módulo kadm5"
 
-#: include/functions_setup.inc:296
+#: include/functions_setup.inc:325
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -6698,25 +6726,25 @@ msgstr ""
 "Manejando usuarios en kerberos requiere el módulo kadm5 que esta disponible "
 "en la red PEAR."
 
-#: include/functions_setup.inc:299
+#: include/functions_setup.inc:328
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:300
+#: include/functions_setup.inc:329
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:338
 msgid "Checking for some additional programms"
 msgstr "Comprobando programas adicionales"
 
-#: include/functions_setup.inc:318
+#: include/functions_setup.inc:347
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Comprobando por ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:319
+#: include/functions_setup.inc:348
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -6724,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/functions_setup.inc:322
+#: include/functions_setup.inc:351
 msgid "Checking imagick module for PHP"
 msgstr "Comprobando el módulo PHP de imagick"
 
-#: include/functions_setup.inc:323
+#: 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."
@@ -6736,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/functions_setup.inc:330
+#: include/functions_setup.inc:359
 msgid "Checking for fping utility"
 msgstr "Comprobando la herramienta fping"
 
-#: include/functions_setup.inc:331
+#: include/functions_setup.inc:360
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -6748,11 +6776,11 @@ msgstr ""
 "La herramienta fping solo se usa si tiene un entorno de terminales clientes "
 "delgados (thinclient)."
 
-#: include/functions_setup.inc:346
+#: 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/functions_setup.inc:347
+#: include/functions_setup.inc:376
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -6760,11 +6788,11 @@ msgstr ""
 "Para poder usar SAMBA 2/3, tiene que instalar algunos paquetes adicionales "
 "para generar los hashes de contraseñas."
 
-#: include/functions_setup.inc:360
+#: include/functions_setup.inc:389
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini comprobación -> session.auto_register"
 
-#: include/functions_setup.inc:361
+#: 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'."
@@ -6772,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/functions_setup.inc:364
+#: include/functions_setup.inc:393
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini comprobación -> implicit_flush"
 
-#: include/functions_setup.inc:365
+#: include/functions_setup.inc:394
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -6784,11 +6812,11 @@ msgstr ""
 "Esta opción controla el manejador de salida. Desactive esta opción para "
 "mejorar el rendimiento."
 
-#: include/functions_setup.inc:372
+#: include/functions_setup.inc:401
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini comprobación -> max_execution_time"
 
-#: include/functions_setup.inc:373
+#: include/functions_setup.inc:402
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -6796,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/functions_setup.inc:380
+#: include/functions_setup.inc:409
 msgid "php.ini check -> memory_limit"
 msgstr "pnp.ini comprobación -> memory_limit"
 
-#: include/functions_setup.inc:381
+#: include/functions_setup.inc:410
 #, fuzzy
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
@@ -6810,11 +6838,11 @@ msgstr ""
 "impredecibles! Una cantidad recomendada es 16Mb, para sitios con grandes "
 "cargas seria aún mayor."
 
-#: include/functions_setup.inc:385
+#: include/functions_setup.inc:414
 msgid "php.ini check -> expose_php"
 msgstr "php.ini comprobación -> expose_php"
 
-#: include/functions_setup.inc:386
+#: 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."
@@ -6823,11 +6851,11 @@ msgstr ""
 "debería enviar ninguna información sobre el servidor sobre el que está "
 "funcionando en ningún caso."
 
-#: include/functions_setup.inc:390
+#: include/functions_setup.inc:419
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini comprobación -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:391
+#: 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."
@@ -6835,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/functions_setup.inc:629
+#: 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/functions_setup.inc:638 include/functions_setup.inc:720
+#: 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."
@@ -6847,8 +6875,8 @@ msgstr ""
 "No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
 "este accesible para GOsa."
 
-#: include/functions_setup.inc:652 include/functions_setup.inc:725
-#: include/functions_setup.inc:730
+#: 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."
@@ -6856,7 +6884,7 @@ msgstr ""
 "¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
 "asegure que este accesible para GOsa."
 
-#: include/functions_setup.inc:740
+#: include/functions_setup.inc:770
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
@@ -6864,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/functions_setup.inc:796
+#: include/functions_setup.inc:826
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -6872,13 +6900,19 @@ msgid ""
 msgstr ""
 "Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
 
-#: include/functions_setup.inc:827
+#: 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/functions_setup.inc:938 include/functions_setup.inc:961
-#: include/functions_setup.inc:970 html/index.php:158
+#: 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 ""
@@ -6887,23 +6921,14 @@ msgid ""
 msgstr ""
 "No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
 
-#: html/helpviewer.php:54
-msgid "Help is not available if you are not logged in."
-msgstr ""
-
-#: html/helpviewer.php:85
-msgid "previous"
+#: include/functions_helpviewer.inc:260
+#, php-format
+msgid "%s results for your search with the keyword %s interpreted as %s"
 msgstr ""
 
-#: html/helpviewer.php:89
-#, fuzzy
-msgid "next"
-msgstr "texto"
-
-#: html/helpviewer.php:141
+#: include/functions_helpviewer.inc:335
 #, php-format
-msgid ""
-"Can't read any helpfiles from ' %s ', possibly there is no help available."
+msgid "%s%% hit rate in file %s"
 msgstr ""
 
 #: html/getfax.php:53
@@ -6922,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, "
@@ -6971,56 +6996,55 @@ msgstr ""
 "El directorio '%s' especificado como directorio de compilación no es "
 "accesible."
 
-#: html/index.php:166
+#: 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:168
+#: html/index.php:186
 msgid "Please specify your password!"
 msgstr "Por favor especifique su contraseña."
 
-#: html/index.php:175
+#: html/index.php:193
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/index.php:213
+#: html/index.php:231
 msgid "Session will not be encrypted."
 msgstr "La sesion no sera encriptada."
 
-#: html/index.php:213
+#: html/index.php:231
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
+#: html/helpviewer.php:54
+msgid "Help is not available if you are not logged in."
 msgstr ""
-"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
-"protege al servidor LDAP de alcanzar una mayor carga. La manera mas fácil de "
-"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
-"la busqueda a valores pequeños y usar filtros para encontrar las entradas "
-"que está buscando."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Por favor elije la manera en que la sesión reaccione"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
+#: html/helpviewer.php:85
+msgid "previous"
 msgstr ""
-"ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
+#: html/helpviewer.php:89
+#, fuzzy
+msgid "next"
+msgstr "texto"
+
+#: html/helpviewer.php:141
+#, php-format
 msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
+"Can't read any helpfiles from ' %s ', possibly there is no help available."
 msgstr ""
-"ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
-"limite' definido y active el uso de filtros en su lugar"
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
@@ -7050,6 +7074,28 @@ msgstr ""
 msgid "Logout"
 msgstr "Salir"
 
+#: ihtml/themes/altlinux/setup_introduction.tpl:1
+#: ihtml/themes/default/setup_introduction.tpl:1
+msgid "Welcome to the GOsa setup!"
+msgstr "Bienvenido a la configuración de GOsa"
+
+#: ihtml/themes/altlinux/setup_introduction.tpl:4
+#: ihtml/themes/default/setup_introduction.tpl:4
+msgid ""
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic informations for your LDAP "
+"connectivity, we're going to check your LDAP setup."
+msgstr ""
+"Parece que esta ejecutando GOsa por primera vez - no se encontró la "
+"configuración. Los siguientes pasos tratarán de asistirlo en crear una "
+"configuración funcional, efectuando las siguientes tareas: comprobar la "
+"instalación de PHP y de los módulos necesarios, luego comprobar los "
+"programas opcionales y, luego de ingresar la información necesaria para "
+"conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
+
 #: 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 ""
@@ -7057,8 +7103,8 @@ msgstr ""
 
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
-#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
 msgstr "Nombre de Usuario"
 
@@ -7075,27 +7121,36 @@ msgstr "Entrando"
 msgid "Click here to log in"
 msgstr "Pulse aquí para entrar"
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:1
-#: ihtml/themes/default/setup_introduction.tpl:1
-msgid "Welcome to the GOsa setup!"
-msgstr "Bienvenido a la configuración de GOsa"
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
+"protege al servidor LDAP de alcanzar una mayor carga. La manera mas fácil de "
+"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
+"la busqueda a valores pequeños y usar filtros para encontrar las entradas "
+"que está buscando."
 
-#: ihtml/themes/altlinux/setup_introduction.tpl:4
-#: ihtml/themes/default/setup_introduction.tpl:4
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Por favor elije la manera en que la sesión reaccione"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+"ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
 msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic informations for your LDAP "
-"connectivity, we're going to check your LDAP setup."
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
 msgstr ""
-"Parece que esta ejecutando GOsa por primera vez - no se encontró la "
-"configuración. Los siguientes pasos tratarán de asistirlo en crear una "
-"configuración funcional, efectuando las siguientes tareas: comprobar la "
-"instalación de PHP y de los módulos necesarios, luego comprobar los "
-"programas opcionales y, luego de ingresar la información necesaria para "
-"conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
+"ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
+"limite' definido y active el uso de filtros en su lugar"
 
 #: ihtml/themes/altlinux/framework.tpl:15
 #: ihtml/themes/default/framework.tpl:15
@@ -7117,24 +7172,6 @@ msgstr "Salir"
 msgid "Signed in:"
 msgstr "Entrando"
 
-#: ihtml/themes/altlinux/setup_step2.tpl:1
-#: ihtml/themes/altlinux/setup_step3.tpl:1
-#: ihtml/themes/altlinux/setup_step4.tpl:1
-#: ihtml/themes/default/setup_step2.tpl:1
-#: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1
-msgid "Setup continued..."
-msgstr "La instalación continua"
-
-#: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4
-msgid ""
-"Step two looks for a set of helper programms and checks if they have the "
-"correct minimum version."
-msgstr ""
-"El paso dos busca por una colección de programas/herramientas de soporte y "
-"comprueba si tienen al menos la mínima versión necesaria."
-
 #: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
 msgid "Locking conflict detected"
 msgstr "Detectado conflicto de Bloqueos"
@@ -7149,23 +7186,23 @@ msgstr ""
 "mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
 "pulsando en el botón <i>Eliminar</i>."
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:3
-#: ihtml/themes/default/setup_useradmin.tpl:3
-msgid "You already have an Administrative Account and a Group."
-msgstr "Ya tiene una cuenta y un grupo administrativo."
+#: ihtml/themes/altlinux/setup_step2.tpl:1
+#: ihtml/themes/altlinux/setup_step3.tpl:1
+#: ihtml/themes/altlinux/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step2.tpl:1
+#: ihtml/themes/default/setup_step3.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1
+msgid "Setup continued..."
+msgstr "La instalación continua"
 
-#: ihtml/themes/altlinux/setup_useradmin.tpl:10
-#: ihtml/themes/default/setup_useradmin.tpl:10
+#: ihtml/themes/altlinux/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
 msgid ""
-"To provide full administrative access to GOsa, you need to create a special "
-"group which contains the administrative user. The setup program can assist "
-"you with this task. Enter the desired username and the password below to "
-"create the missing entries."
+"Step two looks for a set of helper programms and checks if they have the "
+"correct minimum version."
 msgstr ""
-"Para proveer de acceso administrativo total a GOsa, se necesita crear un "
-"grupo especial que contendrá los usuarios administrativos. Este programa de "
-"configuración puede ayudarle en esta tarea. Introduzca el nombre y "
-"contraseñas deseadas para crear las entradas necesarias."
+"El paso dos busca por una colección de programas/herramientas de soporte y "
+"comprueba si tienen al menos la mínima versión necesaria."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
@@ -7307,7 +7344,7 @@ msgid "Mail method"
 msgstr "Método de correo"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:100
-#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/default/setup_step4.tpl:115
 msgid "Check"
 msgstr "Comprobación"
 
@@ -7367,6 +7404,46 @@ msgstr ""
 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 "
+"group which contains the administrative user. The setup program can assist "
+"you with this task. Enter the desired username and the password below to "
+"create the missing entries."
+msgstr ""
+"Para proveer de acceso administrativo total a GOsa, se necesita crear un "
+"grupo especial que contendrá los usuarios administrativos. Este programa de "
+"configuración puede ayudarle en esta tarea. Introduzca el nombre y "
+"contraseñas deseadas para crear las entradas necesarias."
+
+#: ihtml/themes/default/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting. "
+"(But it could be a security risk)  "
+msgstr ""
+
+#: 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 ""
@@ -7376,12 +7453,11 @@ msgid "Index"
 msgstr ""
 
 #, fuzzy
-#~ msgid "false"
-#~ msgstr "mujer"
+#~ msgid "Telefon PIN"
+#~ msgstr "Teléfono"
 
-#, fuzzy
-#~ msgid "true"
-#~ msgstr "Futuro"
+#~ msgid "Show empty groups"
+#~ msgstr "Mostrar grupos vacios"
 
 #, fuzzy
 #~ msgid "The given value for goFonQualify is not a valid number."