Fixed Translations.

[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 f978e71157f145f249dca7361fa6efaa560b7122..8a7c58a25abb9456ad6594a74430645836b06a63 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1,3 +1,16 @@
+# translation of messages.po to es_ES
+# Alejandro Escanero Blanco <alex@ofmin.com>, 2003, 2005.
+msgid ""
+msgstr ""
+"Project-Id-Version: messages\n"
+"PO-Revision-Date: 2005-02-23 17:22+0100\n"
+"Last-Translator: \n"
+"Language-Team:  <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+
 #: contrib/gosa.conf:4
 msgid "My account"
 msgstr "Mi cuenta"
@@ -11,9 +24,9 @@ msgid "Addons"
 msgstr "Agregados"
 
 #: contrib/gosa.conf:55 contrib/gosa.conf:66 contrib/gosa.conf:74
-#: contrib/gosa.conf:80 contrib/gosa.conf:88 contrib/gosa.conf:99
-#: contrib/gosa.conf:107 contrib/gosa.conf:112 contrib/gosa.conf:117
-#: contrib/gosa.conf:122 contrib/gosa.conf:127 contrib/gosa.conf:132
+#: contrib/gosa.conf:80 contrib/gosa.conf:88 contrib/gosa.conf:97
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:115
+#: contrib/gosa.conf:120 contrib/gosa.conf:125 contrib/gosa.conf:130
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
@@ -39,8 +52,9 @@ msgstr "Correo Electrónico"
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:59 plugins/personal/connectivity/main.inc:136
+#: contrib/gosa.conf:59
 #: plugins/personal/connectivity/class_connectivity.inc:15
+#: plugins/personal/connectivity/main.inc:136
 msgid "Connectivity"
 msgstr "Conectividad"
 
@@ -54,9 +68,9 @@ msgstr "Fax"
 
 #: contrib/gosa.conf:61 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
@@ -68,9 +82,9 @@ msgid "Phone"
 msgstr "Teléfono"
 
 #: contrib/gosa.conf:62 contrib/gosa.conf:70 contrib/gosa.conf:76
-#: contrib/gosa.conf:84 contrib/gosa.conf:95 contrib/gosa.conf:103
-#: contrib/gosa.conf:108 contrib/gosa.conf:113 contrib/gosa.conf:118
-#: contrib/gosa.conf:123 contrib/gosa.conf:128 contrib/gosa.conf:133
+#: contrib/gosa.conf:84 contrib/gosa.conf:93 contrib/gosa.conf:101
+#: contrib/gosa.conf:106 contrib/gosa.conf:111 contrib/gosa.conf:116
+#: contrib/gosa.conf:121 contrib/gosa.conf:126 contrib/gosa.conf:131
 msgid "References"
 msgstr "Referencias"
 
@@ -88,15 +102,15 @@ msgstr "ACL"
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:81 contrib/gosa.conf:100
+#: contrib/gosa.conf:81 contrib/gosa.conf:98
 msgid "Devices"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:82 contrib/gosa.conf:101
+#: contrib/gosa.conf:82 contrib/gosa.conf:99
 msgid "Startup"
 msgstr "Inicio"
 
-#: contrib/gosa.conf:83 contrib/gosa.conf:93 contrib/gosa.conf:102
+#: contrib/gosa.conf:83 contrib/gosa.conf:92 contrib/gosa.conf:100
 msgid "Monitoring"
 msgstr "Monitor"
 
@@ -110,201 +124,53 @@ msgstr "Fecha"
 msgid "Services"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:91
-msgid "DNS"
-msgstr ""
-
-#: contrib/gosa.conf:92
-msgid "DHCP"
-msgstr ""
-
-#: contrib/gosa.conf:145 plugins/addons/ldapmanager/contentexport.tpl:19
+#: contrib/gosa.conf:143 plugins/addons/ldapmanager/contentexport.tpl:19
 #: plugins/addons/ldapmanager/contentexport.tpl:32
 #: plugins/addons/ldapmanager/contentexport.tpl:47
 #, fuzzy
 msgid "Export"
 msgstr "Importar"
 
-#: contrib/gosa.conf:146 plugins/personal/mail/generic.tpl:107
+#: contrib/gosa.conf:144 plugins/personal/mail/generic.tpl:107
 #: plugins/addons/ldapmanager/contentimport.tpl:56
 #: plugins/addons/ldapmanager/contentcsv.tpl:119
 #: plugins/addons/ldapmanager/contentcsv.tpl:122
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:147
+#: contrib/gosa.conf:145
 #, fuzzy
 msgid "CSV Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:162
+#: contrib/gosa.conf:160
 msgid "{LOCATIONNAME}"
 msgstr ""
 
-#: contrib/gosa.conf:179
+#: contrib/gosa.conf:177
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:180
+#: contrib/gosa.conf:178
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:181
+#: contrib/gosa.conf:179
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:182
+#: contrib/gosa.conf:180
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:181
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:184
+#: contrib/gosa.conf:182
 msgid "English"
 msgstr "Inglés"
 
-#: 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:6
-#: 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
-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:189
-msgid "This account has no mail extensions."
-msgstr "Esta cuenta no tiene extensiones validas de correo."
-
-#: plugins/personal/mail/class_mailAccount.inc:197
-#: plugins/admin/groups/class_groupMail.inc:187
-msgid "Remove mail account"
-msgstr "Borrar cuenta de correo"
-
-#: plugins/personal/mail/class_mailAccount.inc:198
-#: 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:200
-#: plugins/admin/groups/class_groupMail.inc:190
-msgid "Create mail account"
-msgstr "Crear cuenta de correo"
-
-#: plugins/personal/mail/class_mailAccount.inc:201
-#: 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:249
-msgid ""
-"You're trying to add an invalid email address to the list of forwarders."
-msgstr ""
-"Esta intentando añadir una dirección de correo no valida a la lista de "
-"reenvíos."
-
-#: plugins/personal/mail/class_mailAccount.inc:255
-#: plugins/admin/groups/class_groupMail.inc:250
-msgid "Adding your one of your own addresses to the forwarders makes no sense."
-msgstr ""
-"Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
-"sentido."
-
-#: plugins/personal/mail/class_mailAccount.inc:290
-#: plugins/personal/mail/class_mailAccount.inc:295
-#: plugins/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:305
-#: 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:653
-#: 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:657
-#: plugins/personal/mail/class_mailAccount.inc:661
-#: plugins/addons/addressbook/class_addressbook.inc:529
-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:668
-#: plugins/admin/groups/class_groupMail.inc:619
-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:674
-#: 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:683
-#: 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:693
-#: 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
 msgid "Primary address"
 msgstr "Cuenta Principal"
@@ -332,7 +198,8 @@ msgid "Quota size"
 msgstr "Tamaño de la Cola de correo"
 
 #: plugins/personal/mail/generic.tpl:47 plugins/admin/groups/mail.tpl:46
-msgid "Alternate addresses"
+#, fuzzy
+msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
 #: plugins/personal/mail/generic.tpl:49 plugins/admin/groups/mail.tpl:47
@@ -341,13 +208,13 @@ msgstr "Lista de direcciones de correo alternativas."
 
 #: plugins/personal/mail/generic.tpl:55 plugins/personal/mail/generic.tpl:121
 #: plugins/personal/mail/mail_locals.tpl:49
-#: plugins/personal/posix/trust_machines.tpl:45
 #: plugins/personal/posix/posix_groups.tpl:56
+#: plugins/personal/posix/trust_machines.tpl:45
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/generic.tpl:122
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:45
-#: plugins/personal/connectivity/class_kolabAccount.inc:194
+#: plugins/personal/connectivity/class_kolabAccount.inc:195
 #: plugins/personal/connectivity/kolab.tpl:17
 #: plugins/gofax/blocklists/generic.tpl:60
 #: plugins/gofax/faxaccount/generic.tpl:73
@@ -360,10 +227,10 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:45
 #: plugins/admin/systems/startup.tpl:59 plugins/admin/systems/startup.tpl:72
-#: plugins/admin/systems/startup.tpl:91 plugins/admin/systems/servkolab.tpl:95
+#: plugins/admin/systems/startup.tpl:91
 #: plugins/admin/ogroups/ogroup_objects.tpl:56
 #: plugins/admin/ogroups/generic.tpl:38
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:203
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:207
 #: plugins/gofon/phoneaccount/generic.tpl:45
 msgid "Add"
 msgstr "Añadir"
@@ -379,8 +246,8 @@ msgstr "Añadir"
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:12
 #: plugins/addons/addressbook/remove.tpl:15 plugins/admin/groups/mail.tpl:53
-#: plugins/admin/groups/mail.tpl:99 plugins/admin/groups/headpage.tpl:17
-#: plugins/admin/groups/remove.tpl:15 plugins/admin/groups/generic.tpl:89
+#: plugins/admin/groups/mail.tpl:99 plugins/admin/groups/remove.tpl:15
+#: plugins/admin/groups/headpage.tpl:17 plugins/admin/groups/generic.tpl:89
 #: plugins/admin/users/remove.tpl:15 plugins/admin/users/headpage.tpl:18
 #: plugins/admin/applications/remove.tpl:14
 #: plugins/admin/applications/headpage.tpl:17
@@ -390,9 +257,8 @@ msgstr "Añadir"
 #: plugins/admin/systems/servservice.tpl:46
 #: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/headpage.tpl:17
 #: plugins/admin/systems/startup.tpl:60 plugins/admin/systems/startup.tpl:73
-#: plugins/admin/systems/startup.tpl:92 plugins/admin/systems/servkolab.tpl:96
-#: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
-#: plugins/admin/ogroups/headpage.tpl:17
+#: plugins/admin/systems/startup.tpl:92 plugins/admin/ogroups/generic.tpl:39
+#: plugins/admin/ogroups/remove.tpl:15 plugins/admin/ogroups/headpage.tpl:17
 #: plugins/gofon/phoneaccount/generic.tpl:47
 msgid "Delete"
 msgstr "Borrar"
@@ -421,7 +287,8 @@ msgid "Activate vacation message"
 msgstr "Activar mensaje de ausencia"
 
 #: plugins/personal/mail/generic.tpl:80
-msgid "Select if you want to filter this mails thru spamassassin"
+#, fuzzy
+msgid "Select if you want to filter this mails through spamassassin"
 msgstr ""
 "Seleccione aquí si quiere que su correo se filtre a través de spamassassin"
 
@@ -483,66 +350,207 @@ 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:60
-#: plugins/personal/generic/main.inc:158
-#: plugins/personal/connectivity/main.inc:116
-#: plugins/gofax/blocklists/generic.tpl:74
-#: plugins/gofax/faxaccount/main.inc:89
-#: plugins/admin/groups/class_groupManagement.inc:257
-#: plugins/admin/users/class_userManagement.inc:503
-#: plugins/admin/applications/class_applicationManagement.inc:239
-#: plugins/admin/departments/class_departmentManagement.inc:228
-#: plugins/admin/systems/class_systemManagement.inc:438
-#: plugins/admin/ogroups/class_ogroupManagement.inc:274
-#: plugins/gofon/phoneaccount/main.inc:104
-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:6
+#: 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
+msgid "This does something"
+msgstr "Esto hace algo"
 
-#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:51
-#: plugins/personal/posix/trust_machines.tpl:47
-#: plugins/personal/posix/posix_groups.tpl:58
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
-#: plugins/personal/samba/samba3_workstations.tpl:47
-#: plugins/personal/generic/password.tpl:19
-#: plugins/personal/generic/generic_picture.tpl:31
-#: plugins/personal/generic/generic_certs.tpl:62
-#: plugins/personal/generic/main.inc:160
-#: plugins/personal/connectivity/main.inc:118
-#: plugins/gofax/blocklists/generic.tpl:76
-#: plugins/gofax/blocklists/remove.tpl:17
-#: plugins/gofax/faxaccount/locals.tpl:50
-#: plugins/gofax/faxaccount/lists.tpl:39 plugins/gofax/faxaccount/main.inc:91
-#: plugins/addons/addressbook/dial.tpl:11
-#: plugins/addons/addressbook/address_edit.tpl:108
-#: plugins/addons/addressbook/remove.tpl:17
-#: plugins/admin/groups/class_groupManagement.inc:259
-#: plugins/admin/groups/remove.tpl:17
-#: plugins/admin/groups/application_options.tpl:10
-#: plugins/admin/groups/group_objects.tpl:47
-#: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/mail_locals.tpl:51 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/template.tpl:48
-#: plugins/admin/users/class_userManagement.inc:505
-#: plugins/admin/users/remove.tpl:17 plugins/admin/applications/remove.tpl:16
-#: plugins/admin/applications/class_applicationManagement.inc:241
-#: plugins/admin/departments/remove.tpl:17
-#: plugins/admin/departments/class_departmentManagement.inc:230
-#: plugins/admin/systems/class_systemManagement.inc:440
-#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/ogroups/ogroup_objects.tpl:58
-#: plugins/admin/ogroups/class_ogroupManagement.inc:276
-#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
-#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/classic/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/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:189
+msgid "This account has no mail extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
+
+#: plugins/personal/mail/class_mailAccount.inc:197
+#: plugins/admin/groups/class_groupMail.inc:187
+msgid "Remove mail account"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:198
+#: 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:200
+#: plugins/admin/groups/class_groupMail.inc:190
+msgid "Create mail account"
+msgstr "Crear cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:201
+#: 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:249
+msgid ""
+"You're trying to add an invalid email address to the list of forwarders."
+msgstr ""
+"Esta intentando añadir una dirección de correo no valida a la lista de "
+"reenvíos."
+
+#: plugins/personal/mail/class_mailAccount.inc:255
+#: plugins/admin/groups/class_groupMail.inc:250
+msgid "Adding your one of your own addresses to the forwarders makes no sense."
+msgstr ""
+"Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
+"sentido."
+
+#: plugins/personal/mail/class_mailAccount.inc:290
+#: plugins/personal/mail/class_mailAccount.inc:295
+#: plugins/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:305
+#: 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:668
+#: 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:672
+#: plugins/personal/mail/class_mailAccount.inc:676
+#: plugins/addons/addressbook/class_addressbook.inc:551
+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:683
+#: plugins/admin/groups/class_groupMail.inc:619
+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:689
+#: 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:698
+#: 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:708
+#: 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:60
+#: plugins/personal/generic/main.inc:158
+#: plugins/personal/connectivity/main.inc:116
+#: plugins/gofax/blocklists/generic.tpl:74
+#: plugins/gofax/faxaccount/main.inc:89
+#: plugins/admin/groups/class_groupManagement.inc:257
+#: plugins/admin/users/class_userManagement.inc:503
+#: plugins/admin/applications/class_applicationManagement.inc:239
+#: plugins/admin/departments/class_departmentManagement.inc:228
+#: plugins/admin/systems/class_systemManagement.inc:438
+#: plugins/admin/ogroups/class_ogroupManagement.inc:274
+#: plugins/gofon/phoneaccount/main.inc:104
+msgid "Finish"
+msgstr "Terminar"
+
+#: plugins/personal/mail/main.inc:106 plugins/personal/mail/mail_locals.tpl:51
+#: plugins/personal/posix/posix_groups.tpl:58
+#: plugins/personal/posix/trust_machines.tpl:47
+#: plugins/personal/posix/main.inc:112
+#: plugins/personal/samba/samba3_workstations.tpl:47
+#: plugins/personal/samba/main.inc:106
+#: plugins/personal/generic/password.tpl:19
+#: plugins/personal/generic/generic_picture.tpl:31
+#: plugins/personal/generic/generic_certs.tpl:62
+#: plugins/personal/generic/main.inc:160
+#: plugins/personal/connectivity/main.inc:118
+#: plugins/gofax/blocklists/generic.tpl:76
+#: plugins/gofax/blocklists/remove.tpl:17
+#: plugins/gofax/faxaccount/locals.tpl:50
+#: plugins/gofax/faxaccount/lists.tpl:37 plugins/gofax/faxaccount/main.inc:91
+#: plugins/addons/addressbook/dial.tpl:11
+#: plugins/addons/addressbook/address_edit.tpl:108
+#: plugins/addons/addressbook/remove.tpl:17
+#: plugins/admin/groups/class_groupManagement.inc:259
+#: plugins/admin/groups/remove.tpl:17
+#: plugins/admin/groups/group_objects.tpl:47
+#: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/mail_locals.tpl:51 plugins/admin/users/password.tpl:23
+#: plugins/admin/users/class_userManagement.inc:505
+#: plugins/admin/users/template.tpl:48 plugins/admin/users/remove.tpl:17
+#: plugins/admin/applications/remove.tpl:16
+#: plugins/admin/applications/class_applicationManagement.inc:241
+#: plugins/admin/departments/remove.tpl:17
+#: plugins/admin/departments/class_departmentManagement.inc:230
+#: plugins/admin/systems/class_systemManagement.inc:440
+#: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
+#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/ogroups/ogroup_objects.tpl:58
+#: plugins/admin/ogroups/class_ogroupManagement.inc:276
+#: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
+#: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/classic/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"
@@ -579,8 +587,8 @@ msgid "Display addresses of department"
 msgstr "Mostrar las direcciones de los departamentos"
 
 #: plugins/personal/mail/mail_locals.tpl:30
-#: plugins/personal/posix/trust_machines.tpl:30
 #: plugins/personal/posix/posix_groups.tpl:37
+#: plugins/personal/posix/trust_machines.tpl:30
 #: plugins/personal/samba/samba3_workstations.tpl:30
 #: plugins/gofax/blocklists/headpage.tpl:50
 #: plugins/gofax/faxaccount/locals.tpl:29
@@ -621,11 +629,11 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/personal/password/class_password.inc:5
 #: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:33
-#: ihtml/themes/altlinux/login.tpl:37 ihtml/themes/classic/login.tpl:32
-#: ihtml/themes/classic/login.tpl:36 ihtml/themes/default/login.tpl:33
-#: ihtml/themes/default/login.tpl:37
+#: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:34
+#: ihtml/themes/altlinux/login.tpl:38 ihtml/themes/classic/login.tpl:34
+#: ihtml/themes/classic/login.tpl:38
 #: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:34 ihtml/themes/default/login.tpl:38
 msgid "Password"
 msgstr "Contraseña"
 
@@ -743,20 +751,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:29
-#: plugins/admin/systems/headpage.tpl:55
-msgid "Display systems of department"
-msgstr "Mostrar sistemas de departamentos"
-
-#: plugins/personal/posix/trust_machines.tpl:35
-#: plugins/admin/systems/headpage.tpl:61
-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"
@@ -862,9 +856,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:29
+#: plugins/admin/systems/headpage.tpl:55
+msgid "Display systems of department"
+msgstr "Mostrar sistemas de departamentos"
+
+#: plugins/personal/posix/trust_machines.tpl:35
+#: plugins/admin/systems/headpage.tpl:61
+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:593
+#: plugins/personal/samba/class_sambaAccount.inc:609
 msgid "Home directory"
 msgstr "Directorio Principal"
 
@@ -921,17 +929,13 @@ 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"
 msgstr "UNIX"
 
 #: plugins/personal/posix/class_posixAccount.inc:132
-#: plugins/personal/posix/class_posixAccount.inc:900
+#: plugins/personal/posix/class_posixAccount.inc:908
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
@@ -982,251 +986,255 @@ msgstr ""
 "Esta cuenta tiene la extensión posix desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/posix/class_posixAccount.inc:429
+#: plugins/personal/posix/class_posixAccount.inc:431
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "La contraseñas no pueden ser cambiadas hasta %s días desde el último cambio"
 
-#: plugins/personal/posix/class_posixAccount.inc:431
+#: plugins/personal/posix/class_posixAccount.inc:433
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "La contraseñas deben ser cambiadas despues de %s días"
 
-#: plugins/personal/posix/class_posixAccount.inc:433
+#: plugins/personal/posix/class_posixAccount.inc:435
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 "Desactivar cuente despues de %s días de inactividad despues de expirar la "
 "contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:435
+#: plugins/personal/posix/class_posixAccount.inc:437
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr "Avisar al usuario %s días antes de expirar la contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:457
+#: plugins/personal/posix/class_posixAccount.inc:461
 #: plugins/personal/samba/class_sambaAccount.inc:344
 #: plugins/personal/samba/class_sambaAccount.inc:362
 #: plugins/personal/samba/class_sambaAccount.inc:380
 #: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:210
+#: plugins/personal/generic/class_user.inc:214
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
 msgstr "Enero"
 
-#: plugins/personal/posix/class_posixAccount.inc:457
+#: plugins/personal/posix/class_posixAccount.inc:461
 #: plugins/personal/samba/class_sambaAccount.inc:344
 #: plugins/personal/samba/class_sambaAccount.inc:362
 #: plugins/personal/samba/class_sambaAccount.inc:380
 #: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:210
+#: plugins/personal/generic/class_user.inc:214
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
 msgstr "Febrero"
 
-#: plugins/personal/posix/class_posixAccount.inc:457
+#: plugins/personal/posix/class_posixAccount.inc:461
 #: plugins/personal/samba/class_sambaAccount.inc:344
 #: plugins/personal/samba/class_sambaAccount.inc:362
 #: plugins/personal/samba/class_sambaAccount.inc:380
 #: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:210
+#: plugins/personal/generic/class_user.inc:214
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
 msgstr "Marzo"
 
-#: plugins/personal/posix/class_posixAccount.inc:457
+#: plugins/personal/posix/class_posixAccount.inc:461
 #: plugins/personal/samba/class_sambaAccount.inc:344
 #: plugins/personal/samba/class_sambaAccount.inc:362
 #: plugins/personal/samba/class_sambaAccount.inc:380
 #: plugins/personal/samba/class_sambaAccount.inc:398
-#: plugins/personal/generic/class_user.inc:210
+#: plugins/personal/generic/class_user.inc:214
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
 msgstr "Abril"
 
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:345
 #: plugins/personal/samba/class_sambaAccount.inc:363
 #: plugins/personal/samba/class_sambaAccount.inc:381
 #: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:211
+#: plugins/personal/generic/class_user.inc:215
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
 msgstr "Mayo"
 
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:345
 #: plugins/personal/samba/class_sambaAccount.inc:363
 #: plugins/personal/samba/class_sambaAccount.inc:381
 #: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:211
+#: plugins/personal/generic/class_user.inc:215
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
 msgstr "Junio"
 
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:345
 #: plugins/personal/samba/class_sambaAccount.inc:363
 #: plugins/personal/samba/class_sambaAccount.inc:381
 #: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:211
+#: plugins/personal/generic/class_user.inc:215
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
 msgstr "Julio"
 
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:345
 #: plugins/personal/samba/class_sambaAccount.inc:363
 #: plugins/personal/samba/class_sambaAccount.inc:381
 #: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:211
+#: plugins/personal/generic/class_user.inc:215
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
 msgstr "Agosto"
 
-#: plugins/personal/posix/class_posixAccount.inc:458
+#: plugins/personal/posix/class_posixAccount.inc:462
 #: plugins/personal/samba/class_sambaAccount.inc:345
 #: plugins/personal/samba/class_sambaAccount.inc:363
 #: plugins/personal/samba/class_sambaAccount.inc:381
 #: plugins/personal/samba/class_sambaAccount.inc:399
-#: plugins/personal/generic/class_user.inc:211
+#: plugins/personal/generic/class_user.inc:215
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
 msgstr "Septiembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:459
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:346
 #: plugins/personal/samba/class_sambaAccount.inc:364
 #: plugins/personal/samba/class_sambaAccount.inc:382
 #: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:212
+#: plugins/personal/generic/class_user.inc:216
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
 msgstr "Octubre"
 
-#: plugins/personal/posix/class_posixAccount.inc:459
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:346
 #: plugins/personal/samba/class_sambaAccount.inc:364
 #: plugins/personal/samba/class_sambaAccount.inc:382
 #: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:212
+#: plugins/personal/generic/class_user.inc:216
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
 msgstr "Noviembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:459
+#: plugins/personal/posix/class_posixAccount.inc:463
 #: plugins/personal/samba/class_sambaAccount.inc:346
 #: plugins/personal/samba/class_sambaAccount.inc:364
 #: plugins/personal/samba/class_sambaAccount.inc:382
 #: plugins/personal/samba/class_sambaAccount.inc:400
-#: plugins/personal/generic/class_user.inc:212
+#: plugins/personal/generic/class_user.inc:216
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
 msgstr "Diciembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:509
-#: plugins/personal/samba/class_sambaAccount.inc:439
+#: plugins/personal/posix/class_posixAccount.inc:516
+#: plugins/personal/samba/class_sambaAccount.inc:441
 #: plugins/admin/systems/class_terminalGeneric.inc:61
 #: plugins/admin/systems/class_workstationGeneric.inc:70
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/personal/posix/class_posixAccount.inc:509
+#: plugins/personal/posix/class_posixAccount.inc:516
 msgid "full access"
 msgstr "Acceso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:517
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/personal/posix/class_posixAccount.inc:667
+#: plugins/personal/posix/class_posixAccount.inc:675
 msgid "Failed: overriding lock"
 msgstr "Fallo: Sobrepasado bloqueo"
 
-#: plugins/personal/posix/class_posixAccount.inc:815
+#: plugins/personal/posix/class_posixAccount.inc:823
 msgid "The required field 'Home directory' is not set."
 msgstr "El campo requerido 'Directorio de usuario' no esta rellenado."
 
-#: plugins/personal/posix/class_posixAccount.inc:818
+#: plugins/personal/posix/class_posixAccount.inc:826
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 "Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
 
-#: plugins/personal/posix/class_posixAccount.inc:826
+#: plugins/personal/posix/class_posixAccount.inc:834
 msgid "Value specified as 'UID' is not valid."
 msgstr "El valor especificado en 'UID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:829
+#: plugins/personal/posix/class_posixAccount.inc:837
 msgid "Value specified as 'UID' is too small."
 msgstr "El valor especificado como 'UID' es demasiado pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:833
-#: plugins/admin/groups/class_groupGeneric.inc:602
+#: plugins/personal/posix/class_posixAccount.inc:841
+#: plugins/admin/groups/class_groupGeneric.inc:610
 msgid "Value specified as 'GID' is not valid."
 msgstr "El valor especificado como 'GID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:836
-#: plugins/admin/groups/class_groupGeneric.inc:605
+#: plugins/personal/posix/class_posixAccount.inc:844
+#: plugins/admin/groups/class_groupGeneric.inc:613
 msgid "Value specified as 'GID' is too small."
 msgstr "El valor especificado como 'GID' es muy pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:845
+#: plugins/personal/posix/class_posixAccount.inc:853
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "El valor especificado en 'shadowMin' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:850
+#: plugins/personal/posix/class_posixAccount.inc:858
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "El valor especificado en 'shadowMax' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:855
+#: plugins/personal/posix/class_posixAccount.inc:863
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "El valor especificado en 'shadowWarning' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:858
+#: plugins/personal/posix/class_posixAccount.inc:866
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:869
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "El valor especificado como 'shadowWarning' debería ser menor que 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:872
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "El valor especificado como 'shadowWarning' debería ser mayor que 'shadowMin'."
 
-#: plugins/personal/posix/class_posixAccount.inc:869
+#: plugins/personal/posix/class_posixAccount.inc:877
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "El valor especificado en 'shadowInactive' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:872
+#: plugins/personal/posix/class_posixAccount.inc:880
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "'shadowInactive' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:877
+#: plugins/personal/posix/class_posixAccount.inc:885
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 "El valor especificado como 'shadowMin' debería ser menor que 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:979
-#: plugins/admin/groups/class_groupGeneric.inc:636
+#: plugins/personal/posix/class_posixAccount.inc:987
+#: plugins/admin/groups/class_groupGeneric.inc:644
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Parametros Unix"
+
 #: plugins/personal/samba/samba2.tpl:13
 msgid "Samba home"
 msgstr "Directorio Samba"
@@ -1237,7 +1245,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:594
+#: plugins/personal/samba/class_sambaAccount.inc:610
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
@@ -1286,17 +1294,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:601
+#: plugins/personal/samba/class_sambaAccount.inc:617
 msgid "Connection"
 msgstr "Conexión"
 
 #: plugins/personal/samba/samba3.tpl:125
-#: plugins/personal/samba/class_sambaAccount.inc:602
+#: plugins/personal/samba/class_sambaAccount.inc:618
 msgid "Disconnection"
 msgstr "Desconexión"
 
 #: plugins/personal/samba/samba3.tpl:134
-#: plugins/personal/samba/class_sambaAccount.inc:603
+#: plugins/personal/samba/class_sambaAccount.inc:619
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -1354,10 +1362,6 @@ msgstr ""
 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"
@@ -1370,6 +1374,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."
@@ -1408,44 +1416,44 @@ msgstr ""
 "características Posix son necesarias para las cuentas samba, activelas "
 "primero."
 
-#: plugins/personal/samba/class_sambaAccount.inc:440
+#: plugins/personal/samba/class_sambaAccount.inc:442
 msgid "input on, notify on"
 msgstr "Activación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:441
+#: plugins/personal/samba/class_sambaAccount.inc:443
 msgid "input on, notify off"
 msgstr "Activación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:442
+#: plugins/personal/samba/class_sambaAccount.inc:444
 msgid "input off, notify on"
 msgstr "Desactivación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:443
+#: plugins/personal/samba/class_sambaAccount.inc:445
 msgid "input off, nofify off"
 msgstr "Desactivación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:445
+#: plugins/personal/samba/class_sambaAccount.inc:447
 msgid "disconnect"
 msgstr "desconectar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:446
+#: plugins/personal/samba/class_sambaAccount.inc:448
 msgid "reset"
 msgstr "Borrar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:448
+#: plugins/personal/samba/class_sambaAccount.inc:450
 msgid "from any client"
 msgstr "Desde cualquier cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:449
+#: plugins/personal/samba/class_sambaAccount.inc:451
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:596
+#: plugins/personal/samba/class_sambaAccount.inc:612
 #, 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:606
+#: plugins/personal/samba/class_sambaAccount.inc:622
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1453,7 +1461,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:612
+#: plugins/personal/samba/class_sambaAccount.inc:628
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1461,7 +1469,7 @@ msgstr ""
 "El gestor de usuarios de windows solo permite ocho clientes. Ha especificado "
 "mas de ocho."
 
-#: plugins/personal/samba/class_sambaAccount.inc:789
+#: plugins/personal/samba/class_sambaAccount.inc:805
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1469,7 +1477,7 @@ msgstr ""
 "Aviso: Esta cuenta tiene asignado un SID indefinido. ¡El problema no puede "
 "ser solucionado por GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:814
+#: plugins/personal/samba/class_sambaAccount.inc:830
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1477,175 +1485,50 @@ 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:221
-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:221
-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:231
-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:260
-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:354
-msgid "Please enter a valid serial number"
-msgstr "Por favor introduzca un número de serie válido"
-
-#: plugins/personal/generic/class_user.inc:358
-#: plugins/personal/generic/class_user.inc:383
-#: plugins/admin/systems/class_terminalInfo.inc:52
-#: plugins/admin/systems/class_terminalInfo.inc:167
-msgid "present"
-msgstr "presente"
-
-#: plugins/personal/generic/class_user.inc:360
-#: plugins/personal/generic/class_user.inc:385
-msgid "absent"
-msgstr "ausente"
-
-#: plugins/personal/generic/class_user.inc:772
-msgid "Kerberos database communication failed"
-msgstr "La comunicación con la base de datos Kerberos ha fallado"
-
-#: plugins/personal/generic/class_user.inc:789
-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:800
-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:840
-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:845
-#, fuzzy
-msgid "You have no permissions to move a user from the original 'Base'."
-msgstr "No tiene permisos para crear un usuario en esta 'Base'."
-
-#: plugins/personal/generic/class_user.inc:851
-#: plugins/addons/addressbook/class_addressbook.inc:486
-#: plugins/admin/users/class_userManagement.inc:422
-msgid "The required field 'Name' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:860
-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:866
-#: plugins/addons/addressbook/class_addressbook.inc:490
-#: plugins/admin/users/class_userManagement.inc:425
-msgid "The required field 'Given name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:869
-msgid "The required field 'Login' is not set."
-msgstr " El campo requerido 'Login' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:876
-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:883
-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:886
-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:889
-#: plugins/personal/generic/class_user.inc:917
-#: plugins/addons/addressbook/class_addressbook.inc:496
-#: plugins/addons/addressbook/class_addressbook.inc:524
-#: plugins/admin/departments/class_departmentGeneric.inc:153
-msgid "The field 'Name' contains invalid characters."
-msgstr "El campo 'Nombre' contiene caracteres no validos."
-
-#: plugins/personal/generic/class_user.inc:892
-#: plugins/personal/generic/class_user.inc:914
-#: plugins/addons/addressbook/class_addressbook.inc:499
-#: plugins/addons/addressbook/class_addressbook.inc:521
-msgid "The field 'Given name' contains invalid characters."
-msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
-
-#: plugins/personal/generic/class_user.inc:897
-#: plugins/personal/generic/class_user.inc:900
-#: plugins/addons/addressbook/class_addressbook.inc:504
-#: plugins/addons/addressbook/class_addressbook.inc:507
-#: plugins/admin/departments/class_departmentGeneric.inc:156
-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:903
-#: plugins/addons/addressbook/class_addressbook.inc:510
-#: plugins/admin/departments/class_departmentGeneric.inc:159
-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:906
-#: plugins/addons/addressbook/class_addressbook.inc:513
-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:909
-#: plugins/addons/addressbook/class_addressbook.inc:516
-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/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/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:485
 #: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/addons/addressbook/class_addressbook.inc:463
 #: plugins/admin/users/template.tpl:19
 msgid "Name"
 msgstr "Nombre"
 
 #: plugins/personal/generic/generic.tpl:30
 #: plugins/addons/addressbook/address_edit.tpl:20
-#: plugins/addons/addressbook/class_addressbook.inc:463
+#: plugins/addons/addressbook/class_addressbook.inc:485
 #: plugins/admin/users/template.tpl:23
 msgid "Given name"
 msgstr "Nombre"
@@ -1766,8 +1649,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"
@@ -1844,15 +1727,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:14
 msgid "Standard certificate"
 msgstr "Certificado estandar"
@@ -1860,10 +1734,10 @@ msgstr "Certificado estandar"
 #: plugins/personal/generic/generic_certs.tpl:19
 #: plugins/personal/generic/generic_certs.tpl:30
 #: plugins/personal/generic/generic_certs.tpl:41
-#: plugins/personal/connectivity/class_kolabAccount.inc:197
+#: plugins/personal/connectivity/class_kolabAccount.inc:198
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:205
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/classic/islocked.tpl:13
 #: ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
@@ -1881,38 +1755,147 @@ msgstr "Certificado PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "¡No tiene permisos para cambiar su contraseña!"
+#: plugins/personal/generic/class_user.inc:225
+msgid "female"
+msgstr "mujer"
 
-#: plugins/personal/generic/main.inc:187
-msgid "Generic user information"
-msgstr "Información genérica del usuario"
+#: plugins/personal/generic/class_user.inc:225
+msgid "male"
+msgstr "hombre"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
+#: plugins/personal/generic/class_user.inc:235
+msgid "This account has no valid GOsa extensions."
+msgstr "Esta cuenta no tiene extensiones GOsa validas"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:118
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
+#: plugins/personal/generic/class_user.inc:264
+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/connectivity/class_pureftpdAccount.inc:121
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
+#: plugins/personal/generic/class_user.inc:358
+msgid "Please enter a valid serial number"
+msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:124
-msgid "Value specified as 'Files' is not valid."
-msgstr "El valor especificado como 'Archivos' no es válido"
+#: plugins/personal/generic/class_user.inc:362
+#: plugins/personal/generic/class_user.inc:387
+#: plugins/admin/systems/class_terminalInfo.inc:52
+#: plugins/admin/systems/class_terminalInfo.inc:167
+msgid "present"
+msgstr "presente"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:127
-msgid "Value specified as 'Size' is not valid."
-msgstr "El valor especificado como 'Tamaño' no es válido"
+#: plugins/personal/generic/class_user.inc:364
+#: plugins/personal/generic/class_user.inc:389
+msgid "absent"
+msgstr "ausente"
 
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:130
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "El valor especificado como 'relación' no es válido"
+#: plugins/personal/generic/class_user.inc:777
+msgid "Kerberos database communication failed"
+msgstr "La comunicación con la base de datos Kerberos ha fallado"
+
+#: plugins/personal/generic/class_user.inc:794
+msgid "Can't remove user from kerberos database."
+msgstr "No se puede eliminar el usuario de la base de datos Kerberos"
+
+#: plugins/personal/generic/class_user.inc:805
+msgid "Can't add user to kerberos database."
+msgstr "No se puede añadir el usuario de la base de datos Kerberos"
+
+#: plugins/personal/generic/class_user.inc:845
+msgid "You have no permissions to create a user on this 'Base'."
+msgstr "No tiene permisos para crear un usuario en esta 'Base'."
+
+#: plugins/personal/generic/class_user.inc:850
+#, fuzzy
+msgid "You have no permissions to move a user from the original 'Base'."
+msgstr "No tiene permisos para crear un usuario en esta 'Base'."
+
+#: plugins/personal/generic/class_user.inc:856
+#: plugins/addons/addressbook/class_addressbook.inc:508
+#: plugins/admin/users/class_userManagement.inc:422
+msgid "The required field 'Name' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:865
+msgid "There's already a person with this 'Login' in the database."
+msgstr "Ya existe un usuario con este 'Login' en la base de datos."
+
+#: plugins/personal/generic/class_user.inc:871
+#: plugins/addons/addressbook/class_addressbook.inc:512
+#: plugins/admin/users/class_userManagement.inc:425
+msgid "The required field 'Given name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:874
+msgid "The required field 'Login' is not set."
+msgstr " El campo requerido 'Login' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:881
+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:888
+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:891
+msgid "The field 'Homepage' contains an invalid URL definition."
+msgstr "El campo 'Pagina web principal' contiene un URL no valida"
+
+#: plugins/personal/generic/class_user.inc:894
+#: plugins/personal/generic/class_user.inc:922
+#: plugins/addons/addressbook/class_addressbook.inc:518
+#: plugins/addons/addressbook/class_addressbook.inc:546
+#: plugins/admin/departments/class_departmentGeneric.inc:155
+msgid "The field 'Name' contains invalid characters."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
+
+#: plugins/personal/generic/class_user.inc:897
+#: plugins/personal/generic/class_user.inc:919
+#: plugins/addons/addressbook/class_addressbook.inc:521
+#: plugins/addons/addressbook/class_addressbook.inc:543
+msgid "The field 'Given name' contains invalid characters."
+msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
+
+#: plugins/personal/generic/class_user.inc:902
+#: plugins/personal/generic/class_user.inc:905
+#: plugins/addons/addressbook/class_addressbook.inc:526
+#: plugins/addons/addressbook/class_addressbook.inc:529
+#: plugins/admin/departments/class_departmentGeneric.inc:158
+msgid "The field 'Phone' contains an invalid phone number."
+msgstr "El campo 'Teléfono' contiene un número de teléfono no valido."
+
+#: plugins/personal/generic/class_user.inc:908
+#: plugins/addons/addressbook/class_addressbook.inc:532
+#: plugins/admin/departments/class_departmentGeneric.inc:161
+msgid "The field 'Fax' contains an invalid phone number."
+msgstr "El campo 'Fax' contiene un número de teléfono no valido."
+
+#: plugins/personal/generic/class_user.inc:911
+#: plugins/addons/addressbook/class_addressbook.inc:535
+msgid "The field 'Mobile' contains an invalid phone number."
+msgstr "El campo 'Teléfono móvil' contiene un número de teléfono invalido."
+
+#: plugins/personal/generic/class_user.inc:914
+#: plugins/addons/addressbook/class_addressbook.inc:538
+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/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "¡No tiene permisos para cambiar su contraseña!"
+
+#: plugins/personal/generic/main.inc:187
+msgid "Generic user information"
+msgstr "Información genérica del usuario"
 
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
 msgid "PHPGroupware"
@@ -1981,25 +1964,25 @@ msgstr ""
 msgid "Manual"
 msgstr "Enero"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:171
+#: plugins/personal/connectivity/class_kolabAccount.inc:172
 msgid "Anonymous"
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:223
+#: plugins/personal/connectivity/class_kolabAccount.inc:224
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
 #, fuzzy
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "El valor especificado como 'Archivos' no es válido"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:242
+#: plugins/personal/connectivity/class_kolabAccount.inc:243
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:250
+#: plugins/personal/connectivity/class_kolabAccount.inc:251
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
@@ -2008,17 +1991,63 @@ msgstr ""
 msgid "WebDAV"
 msgstr "WebDAV"
 
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:120
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:123
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:126
+msgid "Value specified as 'Files' is not valid."
+msgstr "El valor especificado como 'Archivos' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:129
+msgid "Value specified as 'Size' is not valid."
+msgstr "El valor especificado como 'Tamaño' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:132
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "El valor especificado como 'relación' no es válido"
+
 #: plugins/personal/connectivity/phpgw.tpl:1
 msgid "PHPGroupware account"
 msgstr "Cuenta PHPGroupware"
 
-#: plugins/personal/connectivity/kolab.tpl:1
-#, fuzzy
-msgid "Kolab account"
-msgstr "Mi cuenta"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:5
+msgid "Open-Xchange"
+msgstr ""
 
-#: plugins/personal/connectivity/kolab.tpl:4
-msgid ""
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:663
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
+#, fuzzy
+msgid "Couldn't Connect To Postgresql Database"
+msgstr "No puedo conectar al servidor de base de datos."
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:667
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:730
+msgid "Needed Parameters to openexchange connectivity plugin failed!"
+msgstr ""
+
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:671
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
+#, fuzzy
+msgid "PHP4 module for Postgresql Database Failed!"
+msgstr "¡Consulta a la base de datos de logs fallida!"
+
+#: plugins/personal/connectivity/kolab.tpl:1
+#, fuzzy
+msgid "Kolab account"
+msgstr "Mi cuenta"
+
+#: 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 ""
@@ -2051,8 +2080,8 @@ msgid "Future"
 msgstr ""
 
 #: plugins/personal/connectivity/kolab.tpl:39
-#: plugins/personal/connectivity/oxchange.tpl:20
-#: plugins/personal/connectivity/oxchange.tpl:24
+#: plugins/personal/connectivity/oxchange.tpl:18
+#: plugins/personal/connectivity/oxchange.tpl:22
 #, fuzzy
 msgid "days"
 msgstr "día"
@@ -2065,27 +2094,6 @@ msgstr ""
 msgid "WebDAV account"
 msgstr "Cuenta WebDAV"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:5
-msgid "Open-Xchange"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:663
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:726
-#, fuzzy
-msgid "Couldn't Connect To Postgresql Database"
-msgstr "No puedo conectar al servidor de base de datos."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:667
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:730
-msgid "Needed Parameters to openexchange connectivity plugin failed!"
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:671
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:734
-#, fuzzy
-msgid "PHP4 module for Postgresql Database Failed!"
-msgstr "¡Consulta a la base de datos de logs fallida!"
-
 #: plugins/personal/connectivity/pureftpd.tpl:1
 msgid "FTP account"
 msgstr "Cuenta FTP"
@@ -2139,34 +2147,34 @@ msgstr "Acceso FTP desactivado temporalmente"
 msgid "Open-Xchange Account"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:4
-msgid "Disabled by lack of Postgresql Support"
+#: plugins/personal/connectivity/oxchange.tpl:2
+msgid "disabled, no Postgresql support detected"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:6
+#: plugins/personal/connectivity/oxchange.tpl:4
 #, fuzzy
-msgid "Open Xchange account"
+msgid "Open-Xchange account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/personal/connectivity/oxchange.tpl:15
+#: plugins/personal/connectivity/oxchange.tpl:13
 #, fuzzy
 msgid "Remember"
 msgstr "Diciembre"
 
-#: plugins/personal/connectivity/oxchange.tpl:19
+#: plugins/personal/connectivity/oxchange.tpl:17
 msgid "Appointment Days"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:23
+#: plugins/personal/connectivity/oxchange.tpl:21
 msgid "Task Days"
 msgstr ""
 
-#: plugins/personal/connectivity/oxchange.tpl:35
+#: plugins/personal/connectivity/oxchange.tpl:33
 #, fuzzy
 msgid "User Information"
 msgstr "Información"
 
-#: plugins/personal/connectivity/oxchange.tpl:39
+#: plugins/personal/connectivity/oxchange.tpl:37
 msgid "User Timezone"
 msgstr ""
 
@@ -2203,6 +2211,52 @@ msgstr "semana"
 msgid "month"
 msgstr "mes"
 
+#: 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"
@@ -2217,6 +2271,7 @@ msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 
 #: plugins/gofax/blocklists/generic.tpl:31
 #: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
+#: include/functions.inc:1579
 msgid "Type"
 msgstr "Tipo"
 
@@ -2257,57 +2312,11 @@ 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:343
-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:349
-#: plugins/admin/departments/class_departmentGeneric.inc:141
-msgid "Required field 'Name' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:352
-msgid "Required field 'Name' contains invalid characters"
-msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:360
-msgid "Specified name is already used."
-msgstr "El nombre especificado ya esta siendo usado"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:367
-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 html/index.php:211
+#: plugins/admin/ogroups/remove.tpl:2 html/index.php:215
 #: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
 #: ihtml/themes/classic/conflict.tpl:6 ihtml/themes/classic/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
@@ -2499,18 +2508,18 @@ msgstr "Listas/Numeros bloqueados"
 msgid "Select a specific department"
 msgstr "Seleccionar un departamento especifico"
 
-#: plugins/gofax/faxaccount/lists.tpl:25 plugins/admin/groups/acl.tpl:12
+#: plugins/gofax/faxaccount/lists.tpl:24 plugins/admin/groups/acl.tpl:12
 #: plugins/admin/groups/mail_admins.tpl:30
 msgid "Choose"
 msgstr "Elige"
 
-#: plugins/gofax/faxaccount/lists.tpl:28
+#: plugins/gofax/faxaccount/lists.tpl:26
 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:1190
+#: plugins/gofax/faxaccount/lists.tpl:35
+#: plugins/admin/groups/mail_admins.tpl:37
+#: plugins/admin/groups/application_options.tpl:8 include/functions.inc:1190
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -2525,15 +2534,15 @@ msgstr "Parametros del Fax"
 msgid "FAX"
 msgstr "FAX"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:109
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:111
 msgid "This account has no fax extensions."
 msgstr "Esta cuenta no tiene extensiones de fax."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:118
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:120
 msgid "Remove fax account"
 msgstr "Eliminar cuenta de fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:119
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:121
 msgid ""
 "This account has fax features enabled. You can disable them by clicking "
 "below."
@@ -2541,11 +2550,11 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:121
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:123
 msgid "Create fax account"
 msgstr "Crear cuenta de fax"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:122
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:124
 msgid ""
 "This account has fax features disabled. You can enable them by clicking "
 "below."
@@ -2553,23 +2562,23 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:190
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:192
 msgid "You're trying to add an invalid phone number."
 msgstr "Esta intentando añadir un número de teléfono no valido."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:456
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:462
 msgid "The required field 'Fax' is not set."
 msgstr "No ha rellenado el campo requerido 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:460
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:466
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr "Por favor introduzca un numero de teléfono valido en el campo 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:468
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:474
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:470
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:476
 #, fuzzy
 msgid "The mail address you've entered is invalid."
 msgstr "La cuenta principal que ha introducido ya esta en uso."
@@ -2622,6 +2631,40 @@ msgstr "Tiempo de envio"
 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/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
 msgid "Filter"
@@ -2676,50 +2719,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:11
+#: plugins/addons/addressbook/class_addressbook.inc:354
+#: plugins/addons/addressbook/class_addressbook.inc:356
+#: plugins/addons/addressbook/class_addressbook.inc:357
+#: plugins/addons/addressbook/class_addressbook.inc:435
+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"
@@ -2782,66 +2842,15 @@ 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:11
-#: plugins/addons/addressbook/class_addressbook.inc:337
-#: plugins/addons/addressbook/class_addressbook.inc:339
-#: plugins/addons/addressbook/class_addressbook.inc:340
-#: plugins/addons/addressbook/class_addressbook.inc:414
-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 "
-"your really want to do this since there is no way for GOsa to get your data "
-"back."
-msgstr ""
-"Esto incluye toda la información de la libreta de direcciones en esta "
-"entrada. Por favor pulse dos veces si realmente quiere hacer esta, ya que no "
-"hay forma de que GOsa recupere la información."
+#: plugins/addons/addressbook/remove.tpl:7
+msgid ""
+"This includes all addressbook data in this entry. Please double check if "
+"your really want to do this since there is no way for GOsa to get your data "
+"back."
+msgstr ""
+"Esto incluye toda la información de la libreta de direcciones en esta "
+"entrada. Por favor pulse dos veces si realmente quiere hacer esta, ya que no "
+"hay forma de que GOsa recupere la información."
 
 #: plugins/addons/addressbook/main.inc:23
 msgid "Address book"
@@ -2851,12 +2860,12 @@ msgstr "Libreta de direcciones"
 msgid "Addressbook"
 msgstr "Libreta de direcciones"
 
-#: plugins/addons/addressbook/class_addressbook.inc:143
+#: plugins/addons/addressbook/class_addressbook.inc:147
 #, php-format
 msgid "Dial from %s to %s now?"
 msgstr "¿Llamar desde %s a %s ahora?"
 
-#: plugins/addons/addressbook/class_addressbook.inc:147
+#: plugins/addons/addressbook/class_addressbook.inc:151
 msgid ""
 "You have no personal phone number set. Please change that in order to "
 "perform direct dials."
@@ -2864,73 +2873,73 @@ msgstr ""
 "No tiene configurado un numero de teléfono personal. Por favor cambie esto "
 "para permitir llamadas directas."
 
-#: plugins/addons/addressbook/class_addressbook.inc:176
-#: plugins/addons/addressbook/class_addressbook.inc:280
+#: plugins/addons/addressbook/class_addressbook.inc:180
+#: plugins/addons/addressbook/class_addressbook.inc:284
 msgid "You are not allowed to delete this entry!"
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:274
+#: plugins/addons/addressbook/class_addressbook.inc:278
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Has decidido eliminar la entrada %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:343
+#: plugins/addons/addressbook/class_addressbook.inc:360
 #, php-format
 msgid "Save contact for %s as vcard"
 msgstr "Salvar el contacto %s como una vcard"
 
-#: plugins/addons/addressbook/class_addressbook.inc:346
+#: plugins/addons/addressbook/class_addressbook.inc:363
 #, php-format
 msgid "Send mail to %s"
 msgstr "Enviar correo a %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:426
+#: plugins/addons/addressbook/class_addressbook.inc:447
 msgid "global addressbook"
 msgstr "Directorio de contactos global"
 
-#: plugins/addons/addressbook/class_addressbook.inc:428
+#: plugins/addons/addressbook/class_addressbook.inc:450
 msgid "organizations user database"
 msgstr "bases de datos de organizaciones de usuarios"
 
-#: plugins/addons/addressbook/class_addressbook.inc:432
+#: plugins/addons/addressbook/class_addressbook.inc:454
 #, php-format
 msgid "Contact stored in %s"
 msgstr "Contacto guardado en %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:434
+#: plugins/addons/addressbook/class_addressbook.inc:456
 msgid "Creating new entry in"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/addons/addressbook/class_addressbook.inc:463
+#: plugins/addons/addressbook/class_addressbook.inc:485
 #: plugins/addons/logview/class_logview.inc:62
 #: plugins/addons/logview/class_logview.inc:76
 msgid "All"
 msgstr "Todo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:464
+#: plugins/addons/addressbook/class_addressbook.inc:486
 msgid "Work phone"
 msgstr "Teléfono del trabajo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:464
+#: plugins/addons/addressbook/class_addressbook.inc:486
 msgid "Cell phone"
 msgstr "Móvil"
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:487
 msgid "Home phone"
 msgstr "Teléfono particular"
 
-#: plugins/addons/addressbook/class_addressbook.inc:465
+#: plugins/addons/addressbook/class_addressbook.inc:487
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: plugins/addons/addressbook/class_addressbook.inc:537
+#: plugins/addons/addressbook/class_addressbook.inc:559
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "No se puede crear un 'DN' único para esta entrada. Por favor rellene los "
 "campos del formulario."
 
-#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/addons/addressbook/class_addressbook.inc:571
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -2948,7 +2957,7 @@ msgid "You've no permission to do CSV imports."
 msgstr "No tiene permisos para eliminar este departamento."
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:154
-msgid "Need 'sn','givenName' and 'uid' to create user"
+msgid "Need 'sn','givenName' and 'uid' to create user."
 msgstr ""
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:202
@@ -2971,7 +2980,7 @@ msgid "An Error Occured while inserting entry %s - process aborted"
 msgstr ""
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:292
-msgid "Nothing to import !."
+msgid "Nothing to import!"
 msgstr ""
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:301
@@ -3024,7 +3033,7 @@ msgid "Overwrite existing entry"
 msgstr "Editar entrada"
 
 #: plugins/addons/ldapmanager/contentimport.tpl:47
-msgid "Import successfull"
+msgid "Import successful"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentcsv.tpl:2
@@ -3101,7 +3110,7 @@ msgid "Export IVBB LDIF for"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:59
-msgid "Export successfull"
+msgid "Export successful"
 msgstr ""
 
 #: plugins/addons/ldapmanager/contentexport.tpl:63
@@ -3121,8 +3130,8 @@ msgstr "Exportar a LDIF"
 
 #: plugins/addons/ldapmanager/class_export.inc:7
 #, fuzzy
-msgid "LDIF CSV import"
-msgstr "Exportar a LDIF"
+msgid "CSV import"
+msgstr "Importar"
 
 #: plugins/addons/ldapmanager/class_export.inc:35
 #, fuzzy
@@ -3229,6 +3238,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:64
+msgid "IMAP shared folders"
+msgstr "Carpetas compartidas IMAP"
+
+#: plugins/admin/groups/mail.tpl:68
+msgid "Default permission"
+msgstr "Permisos por defecto"
+
+#: plugins/admin/groups/mail.tpl:76
+msgid "Member permission"
+msgstr "Miembro con Permisos"
+
+#: plugins/admin/groups/mail.tpl:91
+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:202
+#, php-format
+msgid "You're about to delete the group '%s'."
+msgstr "Está a punto de borrar el grupo '%s'."
+
+#: plugins/admin/groups/class_groupManagement.inc:208
+#: plugins/admin/groups/class_groupManagement.inc:234
+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 ""
@@ -3239,33 +3287,33 @@ msgstr ""
 msgid "This 'dn' is no group."
 msgstr "Este 'dn' no es un grupo."
 
-#: plugins/admin/groups/class_groupGeneric.inc:252
+#: plugins/admin/groups/class_groupGeneric.inc:253
 msgid "Samba group"
 msgstr "Grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:252
+#: plugins/admin/groups/class_groupGeneric.inc:253
 msgid "Domain admins"
 msgstr "Administradores del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:252
+#: plugins/admin/groups/class_groupGeneric.inc:253
 msgid "Domain users"
 msgstr "Usuarios del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:253
+#: plugins/admin/groups/class_groupGeneric.inc:254
 msgid "Domain guests"
 msgstr "Invitados del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:258
+#: plugins/admin/groups/class_groupGeneric.inc:259
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:566
-#: plugins/admin/ogroups/class_ogroup.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:574
+#: plugins/admin/ogroups/class_ogroup.inc:490
 msgid "You have no permissions to create a group on this 'Base'."
 msgstr "No tiene permisos para crear un grupo en esta 'Base'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:576
+#: plugins/admin/groups/class_groupGeneric.inc:584
 msgid ""
 "The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -3273,34 +3321,22 @@ msgstr ""
 "El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
 "numeros y guiones."
 
-#: plugins/admin/groups/class_groupGeneric.inc:587
-#: plugins/admin/groups/class_groupGeneric.inc:594
+#: plugins/admin/groups/class_groupGeneric.inc:595
+#: plugins/admin/groups/class_groupGeneric.inc:602
 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:64
-msgid "IMAP shared folders"
-msgstr "Carpetas compartidas IMAP"
-
-#: plugins/admin/groups/mail.tpl:68
-msgid "Default permission"
-msgstr "Permisos por defecto"
-
-#: plugins/admin/groups/mail.tpl:76
-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:91
-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"
@@ -3335,37 +3371,6 @@ msgstr "Desciende a todo el árbol LDAP cuando se busca"
 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:202
-#, php-format
-msgid "You're about to delete the group '%s'."
-msgstr "Está a punto de borrar el grupo '%s'."
-
-#: plugins/admin/groups/class_groupManagement.inc:208
-#: plugins/admin/groups/class_groupManagement.inc:234
-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/application_options.tpl:1
-msgid "Application options"
-msgstr "Opciones de aplicaciones"
-
 #: plugins/admin/groups/class_groupMail.inc:153
 msgid "read"
 msgstr "leer"
@@ -3505,6 +3510,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."
@@ -3544,49 +3553,16 @@ msgid "The selected application has no options."
 msgstr "La aplicación seleccionada no tiene opciones."
 
 #: plugins/admin/users/password.tpl:2
+#, fuzzy
 msgid ""
 "To change the user password use the fields below. The changes take effect "
-"immediately. Please memorize the new password, because the user would't be "
+"immediately. Please memorize the new password, because the user wouldn't be "
 "able to login without it."
 msgstr ""
 "Para cambiar la contraseña del usuario use los campos a continuación. Los "
 "cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
 "contraseña, el usuario no podra autenticarse si 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:617
-msgid "Template"
-msgstr "Plantilla"
-
-#: plugins/admin/users/template.tpl:46
-#: ihtml/themes/altlinux/setup_introduction.tpl:10
-#: ihtml/themes/altlinux/setup_step2.tpl:16
-#: ihtml/themes/altlinux/setup_step3.tpl:12
-#: 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"
@@ -3607,7 +3583,7 @@ msgid "You are not allowed to delete this user!"
 msgstr "No le es permitido borrar este usuario"
 
 #: plugins/admin/users/class_userManagement.inc:368
-#: plugins/admin/ogroups/class_ogroup.inc:202
+#: plugins/admin/ogroups/class_ogroup.inc:203
 msgid "none"
 msgstr "ninguno"
 
@@ -3615,6 +3591,36 @@ 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:617
+#: 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:46
+#: ihtml/themes/altlinux/setup_introduction.tpl:10
+#: ihtml/themes/altlinux/setup_step2.tpl:16
+#: ihtml/themes/altlinux/setup_step3.tpl:12
+#: 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 "
@@ -3719,21 +3725,60 @@ msgstr "Seleccione para ver los usuarios que tienen configuraciones de FAX"
 msgid "Show FAX users"
 msgstr "Mostrar los usuarios de FAX"
 
-#: plugins/admin/applications/generic.tpl:7
-#: plugins/admin/applications/generic.tpl:8
-msgid "Application name"
-msgstr "Nombre de la aplicación"
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Administración de Usuarios"
 
-#: plugins/admin/applications/generic.tpl:12
-#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
-#: plugins/admin/systems/workstation.tpl:109
-#: plugins/admin/ogroups/termgroup.tpl:13
-msgid "Execute"
-msgstr "Ejecute"
+#: plugins/admin/applications/class_applicationParameters.inc:47
+msgid "Remove options"
+msgstr "Eliminar opciones"
 
-#: plugins/admin/applications/generic.tpl:14
-msgid "Path and/or binary name of application"
-msgstr "Ruta y nombre del binario de la aplicación"
+#: 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
+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"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/applications/generic.tpl:12
+#: plugins/admin/systems/server.tpl:48 plugins/admin/systems/terminal.tpl:109
+#: plugins/admin/systems/workstation.tpl:109
+#: plugins/admin/ogroups/termgroup.tpl:13
+msgid "Execute"
+msgstr "Ejecute"
+
+#: plugins/admin/applications/generic.tpl:14
+msgid "Path and/or binary name of application"
+msgstr "Ruta y nombre del binario de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:18
 msgid "Display name"
@@ -3776,41 +3821,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
-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
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -3862,40 +3872,40 @@ 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
-msgid "You are not allowed to delete this application!"
-msgstr "¡No tiene permisos para eliminar esta aplicación!"
-
 #: plugins/admin/applications/class_applicationGeneric.inc:57
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:149
+#: plugins/admin/applications/class_applicationGeneric.inc:146
 msgid "The specified picture has not been uploaded correctly."
 msgstr "La foto indicada no ha sido subida correctamente."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:202
+#: plugins/admin/applications/class_applicationGeneric.inc:227
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr "No tiene permisos para crear una aplicación en esta 'Base'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:207
+#: plugins/admin/applications/class_applicationGeneric.inc:232
 msgid "Required field 'Name' is not filled."
 msgstr "El campo requerido 'Nombre' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:210
+#: plugins/admin/applications/class_applicationGeneric.inc:235
 msgid "Required field 'Execute' is not filled."
 msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:219
+#: plugins/admin/applications/class_applicationGeneric.inc:244
 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
+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
@@ -4008,41 +4018,41 @@ 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:127
+#: 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'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:134
 #: plugins/admin/departments/class_departmentGeneric.inc:136
+#: plugins/admin/departments/class_departmentGeneric.inc:138
 msgid "Department with that 'Name' already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:144
+#: plugins/admin/departments/class_departmentGeneric.inc:146
 msgid "Required field 'Description' is not set."
 msgstr "El campo requerido 'Descripción' no ha sido rellenado."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:149
+#: plugins/admin/departments/class_departmentGeneric.inc:151
 msgid "The field 'Name' contains the reserved word 'incoming'."
 msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:150
+#: plugins/admin/departments/class_departmentGeneric.inc:152
 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:61
 #: plugins/admin/systems/class_terminalService.inc:135
 #: plugins/admin/systems/class_terminalStartup.inc:75
@@ -4100,9 +4110,9 @@ msgid "You have no permissions to create a component on this 'Base'."
 msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 
 #: plugins/admin/systems/class_winGeneric.inc:166
-#: plugins/admin/systems/class_terminalGeneric.inc:233
+#: plugins/admin/systems/class_terminalGeneric.inc:234
 #: plugins/admin/systems/class_servGeneric.inc:178
-#: plugins/admin/systems/class_workstationGeneric.inc:240
+#: plugins/admin/systems/class_workstationGeneric.inc:241
 #: plugins/admin/systems/class_printGeneric.inc:132
 #: plugins/admin/systems/class_componentGeneric.inc:126
 #: plugins/admin/systems/class_phoneGeneric.inc:129
@@ -4136,7 +4146,7 @@ msgstr "Estado del Sistema"
 
 #: plugins/admin/systems/info.tpl:23
 #, fuzzy
-msgid "Inventary number"
+msgid "Inventory number"
 msgstr "Número de teléfono"
 
 #: plugins/admin/systems/info.tpl:27
@@ -4207,6 +4217,45 @@ msgstr "Servicio de sonido"
 msgid "GUI"
 msgstr "GUI"
 
+#: plugins/admin/systems/class_terminalService.inc:82
+msgid "default"
+msgstr "por defecto"
+
+#: plugins/admin/systems/class_terminalService.inc:83
+msgid "show chooser"
+msgstr "mostrar elegidos"
+
+#: plugins/admin/systems/class_terminalService.inc:84
+msgid "direct"
+msgstr "Directo"
+
+#: plugins/admin/systems/class_terminalService.inc:87
+msgid "load balanced"
+msgstr "balanceo de carga"
+
+#: plugins/admin/systems/class_terminalService.inc:90
+msgid "Windows RDP"
+msgstr "Windows RDP"
+
+#: plugins/admin/systems/class_terminalService.inc:91
+msgid "ICA client"
+msgstr "Cliente ICA"
+
+#: plugins/admin/systems/class_terminalService.inc:182
+#, fuzzy
+msgid "Choose the phone located at the current terminal"
+msgstr "Elija un departamento para guardar la entrada"
+
+#: plugins/admin/systems/class_terminalService.inc:246
+#: plugins/admin/systems/class_terminalService.inc:251
+msgid "Please specify a valid VSync range."
+msgstr "Por favor especifique un rango VSync valido"
+
+#: plugins/admin/systems/class_terminalService.inc:261
+#: plugins/admin/systems/class_terminalService.inc:266
+msgid "Please specify a valid HSync range."
+msgstr "Por favor especifique un rango HSync valido"
+
 #: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
 msgid "System management"
 msgstr "Gestión del sistema"
@@ -4251,63 +4300,6 @@ msgstr "Servidor de Logs"
 msgid "Print Service"
 msgstr "Servicio de impresión"
 
-#: plugins/admin/systems/class_terminalService.inc:82
-msgid "default"
-msgstr "por defecto"
-
-#: plugins/admin/systems/class_terminalService.inc:83
-msgid "show chooser"
-msgstr "mostrar elegidos"
-
-#: plugins/admin/systems/class_terminalService.inc:84
-msgid "direct"
-msgstr "Directo"
-
-#: plugins/admin/systems/class_terminalService.inc:87
-msgid "load balanced"
-msgstr "balanceo de carga"
-
-#: plugins/admin/systems/class_terminalService.inc:90
-msgid "Windows RDP"
-msgstr "Windows RDP"
-
-#: plugins/admin/systems/class_terminalService.inc:91
-msgid "ICA client"
-msgstr "Cliente ICA"
-
-#: plugins/admin/systems/class_terminalService.inc:182
-#, fuzzy
-msgid "Choose the phone located at the current terminal"
-msgstr "Elija un departamento para guardar la entrada"
-
-#: plugins/admin/systems/class_terminalService.inc:245
-#: plugins/admin/systems/class_terminalService.inc:250
-msgid "Please specify a valid VSync range."
-msgstr "Por favor especifique un rango VSync valido"
-
-#: plugins/admin/systems/class_terminalService.inc:260
-#: plugins/admin/systems/class_terminalService.inc:265
-msgid "Please specify a valid HSync range."
-msgstr "Por favor especifique un rango HSync valido"
-
-#: plugins/admin/systems/class_servDB.inc:117
-#: plugins/admin/systems/class_servDB.inc:133
-#: plugins/admin/systems/class_servDB.inc:139
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:150
-#, fuzzy, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
-
-#: plugins/admin/systems/class_servDB.inc:123
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr ""
-
-#: plugins/admin/systems/class_servDB.inc:127
-msgid "The sieve port needs to be numeric."
-msgstr ""
-
 #: plugins/admin/systems/server.tpl:6
 #, fuzzy
 msgid "Server name"
@@ -4332,107 +4324,38 @@ msgstr "Acción"
 msgid "Select action to execute for this server"
 msgstr "Seleccione una acción que se ejecutara en este terminal"
 
-#: 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/class_terminalGeneric.inc:62
+#: plugins/admin/systems/class_workstationGeneric.inc:71
+msgid "text"
+msgstr "texto"
 
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Nombre de terminal"
+#: plugins/admin/systems/class_terminalGeneric.inc:63
+#: plugins/admin/systems/class_workstationGeneric.inc:72
+msgid "graphic"
+msgstr "Gráfico"
 
-#: plugins/admin/systems/terminal.tpl:36
-#: plugins/admin/systems/workstation.tpl:36
-msgid "Mode"
-msgstr "Modo"
+#: plugins/admin/systems/class_terminalGeneric.inc:88
+#: plugins/admin/systems/class_servGeneric.inc:58
+#: plugins/admin/systems/class_workstationGeneric.inc:98
+#: plugins/admin/ogroups/class_termgroup.inc:51
+msgid "No WAKECMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/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:62
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "text"
-msgstr "texto"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:63
-#: plugins/admin/systems/class_workstationGeneric.inc:72
-msgid "graphic"
-msgstr "Gráfico"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:88
-#: plugins/admin/systems/class_servGeneric.inc:58
-#: plugins/admin/systems/class_workstationGeneric.inc:98
-#: plugins/admin/ogroups/class_termgroup.inc:51
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:92
-#: plugins/admin/systems/class_terminalGeneric.inc:104
-#: plugins/admin/systems/class_terminalGeneric.inc:116
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/systems/class_workstationGeneric.inc:102
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-#: plugins/admin/systems/class_workstationGeneric.inc:126
-#: plugins/admin/ogroups/class_termgroup.inc:55
-#: plugins/admin/ogroups/class_termgroup.inc:67
-#: plugins/admin/ogroups/class_termgroup.inc:79
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr "¡La ejecución de '%s' ha fallado!"
+#: plugins/admin/systems/class_terminalGeneric.inc:92
+#: plugins/admin/systems/class_terminalGeneric.inc:104
+#: plugins/admin/systems/class_terminalGeneric.inc:116
+#: plugins/admin/systems/class_servGeneric.inc:62
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_workstationGeneric.inc:102
+#: plugins/admin/systems/class_workstationGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:126
+#: plugins/admin/ogroups/class_termgroup.inc:55
+#: plugins/admin/ogroups/class_termgroup.inc:67
+#: plugins/admin/ogroups/class_termgroup.inc:79
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr "¡La ejecución de '%s' ha fallado!"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:100
 #: plugins/admin/systems/class_servGeneric.inc:70
@@ -4469,14 +4392,18 @@ msgstr "Reiniciar"
 msgid "Wake up"
 msgstr "Despertar"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:216
+#: plugins/admin/systems/class_terminalGeneric.inc:217
 msgid "You have no permissions to create a terminal on this 'Base'."
 msgstr "No tiene permisos para crear un terminal en esta 'Base'."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:220
+#: plugins/admin/systems/class_terminalGeneric.inc:221
 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:48
 #, fuzzy
 msgid "This 'dn' has no server features."
@@ -4487,6 +4414,71 @@ msgstr "Esta 'dn' no tiene características de impresora."
 msgid "You have no permissions to create a server on this 'Base'."
 msgstr "No tiene permisos para crear un usuario 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
+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:32
 #, fuzzy
 msgid "Remove DHCP service"
@@ -4515,18 +4507,6 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax 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_systemManagement.inc:32
 msgid "Systems"
 msgstr "Sistemas"
@@ -4574,22 +4554,26 @@ msgstr "Plantilla de estación de trabajo para"
 msgid "This 'dn' has no workstation features."
 msgstr "Esta 'dn' no tiene características de estación de trabajo."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:223
+#: plugins/admin/systems/class_workstationGeneric.inc:224
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr "No tiene permisos para crear una estación de trabajo en esta 'Base'."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:227
+#: plugins/admin/systems/class_workstationGeneric.inc:228
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 " El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
 
-#: plugins/admin/systems/class_printGeneric.inc:56
-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:122
-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:32
 #, fuzzy
@@ -4617,6 +4601,24 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax desactivada. Puede activarla pulsando "
 "aquí."
 
+#: plugins/admin/systems/class_servDB.inc:121
+#: plugins/admin/systems/class_servDB.inc:137
+#: plugins/admin/systems/class_servDB.inc:143
+#: plugins/admin/systems/class_servDB.inc:148
+#: plugins/admin/systems/class_servDB.inc:154
+#, fuzzy, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+
+#: plugins/admin/systems/class_servDB.inc:127
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_servDB.inc:131
+msgid "The sieve port needs to be numeric."
+msgstr ""
+
 #: plugins/admin/systems/workstation.tpl:9
 msgid "Workstation template"
 msgstr "Plantilla de estación de trabajo"
@@ -4694,6 +4696,14 @@ msgstr "bases de datos de organizaciones de usuarios"
 msgid "Logging DB user"
 msgstr ""
 
+#: plugins/admin/systems/class_printGeneric.inc:56
+msgid "This 'dn' has no printer features."
+msgstr "Esta 'dn' no tiene características de impresora."
+
+#: plugins/admin/systems/class_printGeneric.inc:122
+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
 #, fuzzy
 msgid "Machine name"
@@ -5136,12 +5146,12 @@ msgstr "Esta 'dn' no tiene características de teléfono."
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 
-#: plugins/admin/systems/class_servKolab.inc:32
+#: plugins/admin/systems/class_servKolab.inc:145
 #, fuzzy
 msgid "Remove Kolab extension"
 msgstr "Eliminar opciones"
 
-#: plugins/admin/systems/class_servKolab.inc:33
+#: plugins/admin/systems/class_servKolab.inc:145
 #, fuzzy
 msgid ""
 "This server has kolab features enabled. You can disable them by clicking "
@@ -5150,12 +5160,12 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servKolab.inc:35
+#: plugins/admin/systems/class_servKolab.inc:148
 #, fuzzy
 msgid "Add Kolab service"
 msgstr "Servicio SSH"
 
-#: plugins/admin/systems/class_servKolab.inc:36
+#: plugins/admin/systems/class_servKolab.inc:148
 #, fuzzy
 msgid ""
 "This server has kolab features disabled. You can enable them by clicking "
@@ -5164,86 +5174,162 @@ msgstr ""
 "Esta cuenta tiene la extensión de fax desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/servkolab.tpl:85
-#, fuzzy
-msgid "Kolab Hosts"
-msgstr "Mi cuenta"
+#: plugins/admin/systems/class_servKolab.inc:167
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:109
-#, fuzzy
-msgid "Quota settings"
-msgstr "Parametros de samba"
+#: plugins/admin/systems/class_servKolab.inc:173
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:130
-#, fuzzy
-msgid "Free/Busy settings"
-msgstr "Parametros del Fax"
+#: plugins/admin/systems/class_servKolab.inc:197
+msgid "Free/Busy settings -> Future days must be set."
+msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:160
-msgid "Privileged Networks"
+#: plugins/admin/systems/class_servKolab.inc:199
+msgid "Free/Busy settings -> Future days must be a positive value."
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:181
-msgid "SMTP "
+#: plugins/admin/systems/class_servKolab.inc:201
+msgid "Free/Busy settings -> Future days must be a value."
 msgstr ""
 
-# translation of messages.po to 
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
-# translation of p.po to es_ES
-# translation of messages.po to es_ES
-# Alejandro Escanero Blanco <alex@ofmin.com>, 2003, 2005.
-#: plugins/admin/systems/servkolab.tpl:181
+#: plugins/admin/systems/class_servKolab.inc:205
 msgid ""
+"Cyrus Quota settings -> The given Quota settings value must be a number."
 msgstr ""
-"Project-Id-Version: messages\n"
-"PO-Revision-Date: 2005-02-23 17:22+0100\n"
-"Last-Translator: \n"
-"Language-Team:  <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
 
-#: plugins/admin/systems/servkolab.tpl:203
-msgid "Accept Internet Mai"
+#: plugins/admin/systems/class_servKolab.inc:207
+msgid ""
+"Cyrus Quota settings -> Please choose a value between 1 and 100 for Quota "
+"settings."
 msgstr ""
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:19
-#, fuzzy
-msgid "Terminals"
-msgstr "terminales"
+#: plugins/admin/systems/class_servKolab.inc:209
+msgid "Cyrus Quota settings -> Future days must be a value."
+msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Seleccione objetos a añadir"
+#: plugins/admin/systems/class_servKolab.inc:214
+msgid "SMTP privileged networks -> No value is given."
+msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Select to see departments"
-msgstr "Seleccione para ver los departamentos"
+#: plugins/admin/systems/class_servKolab.inc:219
+msgid "SMTP smarthost/relayhost -> No value is given."
+msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:29
-msgid "Show departments"
-msgstr "Mostrar departamentos"
+#: plugins/admin/systems/servkolab.tpl:14
+#, fuzzy
+msgid "POP3 service"
+msgstr "Servicio de impresión"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Select to see GOsa accounts"
-msgstr "Seleccione para ver las cuentas GOsa"
+#: plugins/admin/systems/servkolab.tpl:22
+#, fuzzy
+msgid "POP3/SSL service"
+msgstr "Servicio SSH"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:30
-msgid "Show people"
-msgstr "Mostrar personal"
+#: plugins/admin/systems/servkolab.tpl:30
+#, fuzzy
+msgid "IMAP service"
+msgstr "Servidor LDAP"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Select to see GOsa groups"
-msgstr "Seleccione para ver los grupos GOsa"
+#: plugins/admin/systems/servkolab.tpl:38
+#, fuzzy
+msgid "IMAP/SSL service"
+msgstr "Servicio SSH"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show groups"
-msgstr "Mostrar grupos"
+#: plugins/admin/systems/servkolab.tpl:46
+#, fuzzy
+msgid "Sieve service"
+msgstr "Servicio SSH"
+
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:81
+#, fuzzy
+msgid "Quota settings"
+msgstr "Parametros de samba"
+
+#: plugins/admin/systems/servkolab.tpl:97
+#, fuzzy
+msgid "Free/Busy settings"
+msgstr "Parametros del Fax"
+
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:136
+msgid "SMTP smarthost/relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:142
+msgid "Enable MX lookup for relayhost"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:147
+msgid "Host used to relay mails"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:161
+msgid "Accept Internet Mail"
+msgstr ""
+
+#: plugins/admin/systems/servkolab.tpl:167
+msgid "Accept mail from other domains over non-authenticated SMTP"
+msgstr ""
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:19
+#, fuzzy
+msgid "Terminals"
+msgstr "terminales"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Seleccione objetos a añadir"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Select to see departments"
+msgstr "Seleccione para ver los departamentos"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:29
+msgid "Show departments"
+msgstr "Mostrar departamentos"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
+msgid "Select to see GOsa accounts"
+msgstr "Seleccione para ver las cuentas GOsa"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:30
+msgid "Show people"
+msgstr "Mostrar personal"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Select to see GOsa groups"
+msgstr "Seleccione para ver los grupos GOsa"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show groups"
+msgstr "Mostrar grupos"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:32
 msgid "Select to see applications"
@@ -5297,102 +5383,102 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Seleccione una acción que se ejecutara en este terminal"
 
+#: 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:153
+#, php-format
+msgid "You're about to delete the object group '%s'."
+msgstr "Has decidido eliminar el objeto grupo '%s'."
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:159
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
+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."
 
-#: plugins/admin/ogroups/class_ogroup.inc:204
+#: plugins/admin/ogroups/class_ogroup.inc:205
 msgid "too many different objects!"
 msgstr "¡Demasiados objetos diferentes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:206
+#: plugins/admin/ogroups/class_ogroup.inc:207
 msgid "users"
 msgstr "usuarios"
 
-#: plugins/admin/ogroups/class_ogroup.inc:207
+#: plugins/admin/ogroups/class_ogroup.inc:208
 msgid "groups"
 msgstr "grupos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:208
+#: plugins/admin/ogroups/class_ogroup.inc:209
 msgid "applications"
 msgstr "Aplicaciones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:209
+#: plugins/admin/ogroups/class_ogroup.inc:210
 msgid "departments"
 msgstr "departamentos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:210
+#: plugins/admin/ogroups/class_ogroup.inc:211
 msgid "servers"
 msgstr "servidores"
 
-#: plugins/admin/ogroups/class_ogroup.inc:211
+#: plugins/admin/ogroups/class_ogroup.inc:212
 msgid "workstations"
 msgstr "estaciones de trabajo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:212
+#: plugins/admin/ogroups/class_ogroup.inc:213
 msgid "terminals"
 msgstr "terminales"
 
-#: plugins/admin/ogroups/class_ogroup.inc:213
+#: plugins/admin/ogroups/class_ogroup.inc:214
 msgid "phones"
 msgstr "teléfonos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:214
+#: plugins/admin/ogroups/class_ogroup.inc:215
 msgid "printers"
 msgstr "servidores de Impresión"
 
-#: plugins/admin/ogroups/class_ogroup.inc:221
+#: plugins/admin/ogroups/class_ogroup.inc:222
 msgid "and"
 msgstr "y"
 
-#: plugins/admin/ogroups/class_ogroup.inc:363
+#: plugins/admin/ogroups/class_ogroup.inc:369
 msgid "Non existing dn: "
 msgstr "No existe 'dn':"
 
-#: plugins/admin/ogroups/class_ogroup.inc:494
+#: plugins/admin/ogroups/class_ogroup.inc:500
 msgid "Object groups need at least one member!"
 msgstr "'Grupos de objetos que necesitan al menos un miembro!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:499
+#: plugins/admin/ogroups/class_ogroup.inc:505
 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:153
-#, php-format
-msgid "You're about to delete the object group '%s'."
-msgstr "Has decidido eliminar el objeto grupo '%s'."
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:159
-#: plugins/admin/ogroups/class_ogroupManagement.inc:185
-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"
@@ -5456,10 +5542,6 @@ msgstr "Mostrar grupos que contienen terminales"
 msgid "Show groups containing printers"
 msgstr "Mostrar grupos que contienen impresoras"
 
-#: plugins/gofon/phoneaccount/main.inc:120
-msgid "Phone settings"
-msgstr "Configuración telefónica"
-
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:114
 msgid "This account has no phone extensions."
 msgstr "Esta cuenta no tiene extensiones telefónicas"
@@ -5496,17 +5578,17 @@ msgstr "¡Por favor introduzca un número de teléfono valido!"
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:281
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:287
 #, 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:295
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:301
 #, 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:298
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:304
 #, php-format
 msgid "The timeout '%s' contains invalid characters!"
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
@@ -5536,6 +5618,10 @@ msgstr "Número de teléfono"
 msgid "Timeout (s)"
 msgstr "Tiempo(s) excedido(s)"
 
+#: 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"
@@ -5633,99 +5719,376 @@ msgstr "El equipo de GOsa"
 msgid "Welcome %s!"
 msgstr "¡Bienvenido %s!"
 
-#: include/class_mail-methods-cyrus.inc:44
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-"Aviso: ¡No se puede acceder al servidor IMAP! Si guarda esta cuenta, algunos "
-"de los valores de la configuración del correo no serán guardados en el "
-"servidor"
-
-#: include/class_mail-methods-cyrus.inc:107
+#: include/functions.inc:267
 #, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
+msgid "Error when connecting the LDAP. Server said '%s'."
 msgstr ""
-"No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
+"Hay un error trantando de conectarse al servidor LDAP. El error del servidor "
+"es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:123
+#: include/functions.inc:288
 #, php-format
-msgid "Can't write IMAP quota. Server says '%s'."
-msgstr "No se puede activar una cuota IMAP. El error del servidor es: '%s'"
+msgid "User login failed. LDAP server said '%s'."
+msgstr "Autenticación del usuario fallida. El servidor LDAP contesto '%s'."
 
-#: include/class_mail-methods-cyrus.inc:134
-msgid ""
-"Warning: imap_getacl is not implemented, wouldn't modify acl informations."
+#: include/functions.inc:308
+msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
-"Aviso: imap_getacl no ha sido implementado, no se modificara información "
-"sobre las listas de acceso."
+"Nombre de usuario o UID no son únicos. Por favor, compruebe su base de datos "
+"LDAP."
 
-#: include/class_mail-methods-cyrus.inc:169
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+#: include/functions.inc:346
+msgid ""
+"Error while adding a lock. Parameters are not set correctly, please check "
+"the source!"
 msgstr ""
-"Aviso: no esta disponible imap_getacl, ¡no se puede acceder a los permisos "
-"IMAP!"
+"Error al tratar de agregar un bloqueo. Los parámetros no son correctos, por "
+"favor, compruebe el código fuente."
 
-#: include/class_mail-methods-cyrus.inc:191
+#: include/functions.inc:356
 #, php-format
-msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgid ""
+"Can't set locking information in LDAP database. Please check the 'config' "
+"entry in gosa.conf! LDAP server says '%s'."
 msgstr ""
-"No se puede eliminar la carpeta de correo IMAP. El error del servidor es: '%"
-"s'"
-
-#: include/class_mail-methods-cyrus.inc:219
-#, php-format
-msgid "Can't log into SIEVE server. Server says '%s'."
-msgstr "No se puede conectar al servidor SIEVE. El error del servidor es: '%s'"
-
-#: include/class_mail-methods-cyrus.inc:232
-#, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
+"No se pudo generar el bloqueo a la base de datos LDAP. Por favor, compruebe "
+"la entrada 'config' en gosa.conf. El servidor LDAP contesto '%s'."
 
-#: include/class_mail-methods-cyrus.inc:303
+#: include/functions.inc:371
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "No puedo subir un 'script' SIEVE. El error del servidor es: '%s'"
+msgid "Adding a lock failed. LDAP server says '%s'."
+msgstr "Fallo al tratar de agregar un bloqueo. El servidor LDAP contesto '%s'."
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/functions.inc:397
 #, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
-msgstr ""
-"No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
-"s'"
+msgid "Removing a lock failed. LDAP server says '%s'."
+msgstr "Fallo al tratar de agregar un bloqueo. El servidor LDAP contesto '%s'."
 
-#: include/class_pluglist.inc:98
+#: include/functions.inc:427
+#, fuzzy
 msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
+"Getting the lock from LDAP failed. Parameters are not set correctly, please "
+"check the source!"
 msgstr ""
-"El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
-"favor actualízela usando el script 'fix_config.sh'!"
+"Fallo al tratar de obtener un bloqueo del LDAP. Los parámetros no fueron "
+"correctamente configurados, por favor, compruebe el código."
 
-#: include/class_pluglist.inc:113 ihtml/themes/altlinux/framework.tpl:13
-#: ihtml/themes/altlinux/framework.tpl:23
-#: ihtml/themes/default/framework.tpl:13 ihtml/themes/default/framework.tpl:23
+#: include/functions.inc:437
 msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+"Can't get locking information in LDAP database. Please check the 'config' "
+"entry in gosa.conf!"
 msgstr ""
-"Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
-"los cambios?"
+"No puedo bloquear la información en la base de datos LDAP. Por favor, "
+"compruebe la entrada 'config' en el archivos gosa.conf."
 
-#: include/setup_checks.inc:80
-msgid "Can't bind to LDAP. No schema check possible!"
+#: include/functions.inc:445
+msgid ""
+"Found multiple locks for object to be locked. This should not be possible - "
+"cleaning up multiple references."
 msgstr ""
-"No se pudo establecer la conexión al servidor LDAP. ¡No se pudo comprobar el "
-"esquema.!"
+"Se encontraron varios bloqueos para el objeto a bloquear. Esto no debería "
+"ser posible, eliminando referencias múltiples."
 
-#: include/setup_checks.inc:89 include/setup_checks.inc:98
-msgid "Can't get schema information from server. No schema check possible!"
-msgstr ""
+#: include/functions.inc:517
+#, php-format
+msgid "The size limit of %d entries is exceed!"
+msgstr "¡Ha excedido el tamaño máximo de %d entradas!"
+
+#: include/functions.inc:519
+#, php-format
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
+msgstr ""
+"Indique el nuevo tamaño limite a %s y enséñame este mensaje si el tamaño "
+"limite es todavía superado"
+
+#: include/functions.inc:531
+msgid "Configure"
+msgstr "Configurar"
+
+#: include/functions.inc:536
+msgid "incomplete"
+msgstr "incompleto"
+
+#: include/functions.inc:919
+#, php-format
+msgid ""
+"You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
+"Please contact the person in order to clarify proceedings."
+msgstr ""
+"Va ha editar la entrada LDAP '%s' que parece estar siendo usada por '%s'. "
+"Por favor, contacte con esta persona para clarificar los procedimientos."
+
+#: include/functions.inc:1018
+msgid "LDAP error:"
+msgstr "Error LDAP:"
+
+#: include/functions.inc:1460
+msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+
+#: include/functions.inc:1505
+#, php-format
+msgid "GOsa development snapshot (Rev %s)"
+msgstr ""
+
+#: include/functions.inc:1531
+msgid "Generating this page caused the PHP interpreter to raise some errors!"
+msgstr ""
+
+#: include/functions.inc:1531
+#, fuzzy
+msgid "Toggle information"
+msgstr "Información personal"
+
+#: include/functions.inc:1539
+#, fuzzy
+msgid "PHP error"
+msgstr "Error LDAP:"
+
+#: include/functions.inc:1546
+msgid "class"
+msgstr ""
+
+#: include/functions.inc:1552
+#, fuzzy
+msgid "function"
+msgstr "Acción"
+
+#: include/functions.inc:1557
+#, fuzzy
+msgid "static"
+msgstr "Estado"
+
+#: include/functions.inc:1561
+#, fuzzy
+msgid "method"
+msgstr "Opciones de correo"
+
+#: include/functions.inc:1578
+msgid "Trace"
+msgstr ""
+
+#: include/functions.inc:1579
+#, fuzzy
+msgid "File"
+msgstr "Archivos"
+
+#: include/functions.inc:1579
+#, fuzzy
+msgid "Line"
+msgstr "en"
+
+#: include/functions.inc:1580
+#, fuzzy
+msgid "Arguments"
+msgstr "departamentos"
+
+#: include/class_mail-methods-cyrus.inc:43
+msgid ""
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
+msgstr ""
+"Aviso: ¡No se puede acceder al servidor IMAP! Si guarda esta cuenta, algunos "
+"de los valores de la configuración del correo no serán guardados en el "
+"servidor"
+
+#: include/class_mail-methods-cyrus.inc:106
+#, php-format
+msgid "Can't create IMAP mailbox. Server says '%s'."
+msgstr ""
+"No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:122
+#, php-format
+msgid "Can't write IMAP quota. Server says '%s'."
+msgstr "No se puede activar una cuota IMAP. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:133
+msgid ""
+"Warning: imap_getacl is not implemented, wouldn't modify acl informations."
+msgstr ""
+"Aviso: imap_getacl no ha sido implementado, no se modificara información "
+"sobre las listas de acceso."
+
+#: include/class_mail-methods-cyrus.inc:168
+msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+msgstr ""
+"Aviso: no esta disponible imap_getacl, ¡no se puede acceder a los permisos "
+"IMAP!"
+
+#: include/class_mail-methods-cyrus.inc:190
+#, php-format
+msgid "Can't remove IMAP mailbox. Server says '%s'."
+msgstr ""
+"No se puede eliminar la carpeta de correo IMAP. El error del servidor es: '%"
+"s'"
+
+#: include/class_mail-methods-cyrus.inc:218
+#, php-format
+msgid "Can't log into SIEVE server. Server says '%s'."
+msgstr "No se puede conectar al servidor SIEVE. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:231
+#, php-format
+msgid "Can't get sieve script. Server says '%s'."
+msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:302
+#, php-format
+msgid "Can't send sieve script. Server says '%s'."
+msgstr "No puedo subir un 'script' SIEVE. El error del servidor es: '%s'"
+
+#: include/class_mail-methods-cyrus.inc:306
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr ""
+"No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
+"s'"
+
+#: include/class_plugin.inc:180
+msgid "This 'dn' has no account extensions."
+msgstr "Este 'dn' no tiene extensiones de cuenta."
+
+#: include/class_plugin.inc:185
+msgid "This is an empty plugin."
+msgstr "Esta es un extensión vacía."
+
+#: include/class_plugin.inc:386
+#, php-format
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
+
+#: include/class_plugin.inc:412
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
+"parece existir."
+
+#: include/class_plugin.inc:438
+#, php-format
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
+"parece existir."
+
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+msgstr ""
+
+#: 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:169
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
+
+#: include/class_password-methods.inc:188
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+msgstr ""
+"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
+"pueden cambiar las contraseñas de SAMBA."
+
+#: include/class_config.inc:69
+#, php-format
+msgid "XML error in gosa.conf: %s at line %d"
+msgstr "Error XML en 'gosa.conf': %s en la linea %d"
+
+#: include/class_config.inc:195 html/index.php:142
+msgid "Can't bind to LDAP. Please contact the system administrator."
+msgstr ""
+"NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
+"sistemas."
+
+#: include/class_config.inc:426
+msgid "SID and/or RIDBASE missing in your configuration!"
+msgstr "SID y/o RIDBASE no se encuentran en su configuración."
+
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+msgstr ""
+
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
+"soporte Kerberos, la contraseña no ha sido cambiada."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "¡La comunicación con la base de datos Kerberos fallo!."
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
+
+#: include/class_ldap.inc:398
+#, php-format
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Actualmente no esta soportada la creación automática del tipo '%s'. Por "
+"favor, informe de esto al equipo de desarrollo de GOsa."
+
+#: include/class_ldap.inc:630
+#, php-format
+msgid ""
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
+msgstr ""
+
+#: include/class_ldap.inc:646
+#, php-format
+msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgstr ""
+
+#: include/class_ldap.inc:661
+#, php-format
+msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgstr ""
+
+#: include/setup_checks.inc:110
+msgid "Can't bind to LDAP. No schema check possible!"
+msgstr ""
+"No se pudo establecer la conexión al servidor LDAP. ¡No se pudo comprobar el "
+"esquema.!"
+
+#: include/setup_checks.inc:119 include/setup_checks.inc:128
+msgid "Can't get schema information from server. No schema check possible!"
+msgstr ""
 "No se pudo obtener la información del esquema del servidor. No se pudo "
 "comprobar el esquema."
 
-#: include/setup_checks.inc:118
+#: include/setup_checks.inc:148
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
@@ -5734,7 +6097,7 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no esta disponible en configuración de LDAP."
 
-#: include/setup_checks.inc:121
+#: include/setup_checks.inc:151
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
@@ -5742,124 +6105,121 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no tiene la versión %s"
 
-#: include/setup_checks.inc:133
+#: include/setup_checks.inc:163
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr ""
 "No se encuentra el objeto de clase (object class) requerido '%s' en la "
 "configuración del servidor LDAP."
 
-#: include/setup_checks.inc:136
+#: include/setup_checks.inc:166
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr "El objeto de clase (objectclass) requerido '%s' no tiene la versión %s"
 
-#: include/setup_checks.inc:144
+#: include/setup_checks.inc:174
 #, fuzzy
-msgid "<b>SAMBA 3</b> support disabled, no schema seems to be installed"
+msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr ""
 "El soporte de SAMBA 3 se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:146
-msgid ""
-"<b>SAMBA 3</b> support enabled<td class=\"check\">gosa+samba3.schema</td>"
+#: include/setup_checks.inc:177
+msgid "SAMBA 3 support enabled"
 msgstr ""
 
-#: include/setup_checks.inc:149
+#: include/setup_checks.inc:181
 #, fuzzy
-msgid "<b>SAMBA 2</b> support disabled, no schema seems to be installed"
+msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr ""
 "El soporte de SAMBA 2 se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:151
-msgid "<b>SAMBA 2</b> support enabled<td class=\"check\">samba.schema</td>"
+#: include/setup_checks.inc:184
+msgid "SAMBA 2 support enabled"
 msgstr ""
 
-#: include/setup_checks.inc:155
+#: include/setup_checks.inc:189
 #, fuzzy
-msgid "Support for <b>pureftp</b> disabled, no schema seems to be installed"
+msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para pureftp se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:157
-msgid ""
-"Support for <b>pureftp</b> enabled<td class=\"check\">pureftpd.schema</td>"
+#: include/setup_checks.inc:192
+msgid "Support for pureftp enabled"
 msgstr ""
 
-#: include/setup_checks.inc:160
+#: include/setup_checks.inc:196
 #, fuzzy
-msgid "Support for <b>WebDAV</b> disabled, no schema seems to be installed"
+msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para pureftp se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:162
-msgid ""
-"Support for <b>WebDAV</b> enabled<td class=\"check\">gosa+samba3.schema</td>"
+#: include/setup_checks.inc:199
+msgid "Support for WebDAV enabled"
 msgstr ""
 
-#: include/setup_checks.inc:165
+#: include/setup_checks.inc:203
 #, fuzzy
-msgid ""
-"Support for <b>phpgroupware</b> disabled, no schema seems to be installed"
+msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para pureftp se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:167
-msgid ""
-"Support for <b>phpgroupware</b> enabled<td class=\"check\">phpgwaccount."
-"schema</td>"
+#: include/setup_checks.inc:206
+#, fuzzy
+msgid "Support for phpgroupware enabled"
 msgstr ""
+"El soporte para pureftp se encuentra desactivado, no parece haber esquemas "
+"instalados"
 
-#: include/setup_checks.inc:170
+#: include/setup_checks.inc:210
 #, fuzzy
-msgid "Support for <b>gofon</b> disabled, no schema seems to be installed"
+msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para pureftp se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:172
-msgid "Support for <b>gofon</b> enabled<td class=\"check\">gofon.schema</td>"
+#: include/setup_checks.inc:213
+msgid "Support for gofon enabled"
 msgstr ""
 
-#: include/setup_checks.inc:178
+#: include/setup_checks.inc:220
 #, fuzzy
 msgid ""
-"Support for <b>Kolab</b> disabled, no schema seems to be installed, setting "
-"mail-method to cyrus"
+"Support for Kolab disabled, no schema seems to be installed, setting mail-"
+"method to cyrus"
 msgstr ""
 "El soporte para pureftp se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/setup_checks.inc:182
-msgid "Support for <b>Kolab</b> enabled<td class=\"check\">gofon.schema</td>"
+#: include/setup_checks.inc:225
+msgid "Support for Kolab enabled"
 msgstr ""
 
-#: include/setup_checks.inc:197
+#: include/setup_checks.inc:241
 msgid "OK"
 msgstr "Perfecto"
 
-#: include/setup_checks.inc:200
+#: include/setup_checks.inc:244
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: include/setup_checks.inc:202
+#: include/setup_checks.inc:246
 msgid "Failed"
 msgstr "Fallado"
 
-#: include/setup_checks.inc:218
+#: include/setup_checks.inc:262
 msgid "PHP setup inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/setup_checks.inc:219
+#: include/setup_checks.inc:263
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Comprobando la versión de PHP (>=4.1.0)"
 
-#: include/setup_checks.inc:220
+#: include/setup_checks.inc:264
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -5867,13 +6227,22 @@ msgstr ""
 "Debe tener una versión de PHP 4.1.0 o superior para el correcto "
 "funcionamiento de GOsa."
 
-#: include/setup_checks.inc:223
+#: include/setup_checks.inc:267
+#, fuzzy
+msgid "Checking for PHP version (<=5)"
+msgstr "Comprobando la versión de PHP (>=4.1.0)"
+
+#: include/setup_checks.inc:268
+msgid "PHP must be below version 5."
+msgstr ""
+
+#: include/setup_checks.inc:272
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 "Comprobando si el registro de variables globales (register_globals) esta "
 "desactivado."
 
-#: include/setup_checks.inc:224
+#: include/setup_checks.inc:273
 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 "
@@ -5883,39 +6252,39 @@ msgstr ""
 "que permite acceder a variables globales sin cambiar el ambito. Esto puede "
 "ser un problema de seguridad. GOsa funcionará en los dos modos."
 
-#: include/setup_checks.inc:227
+#: include/setup_checks.inc:276
 msgid "Checking for ldap module"
 msgstr "Comprobando los módulos de ldap"
 
-#: include/setup_checks.inc:228
+#: include/setup_checks.inc:277
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr "Este es el módulo más usado por GOsa, es realmente requerido."
 
-#: include/setup_checks.inc:231
+#: include/setup_checks.inc:280
 msgid "Checking for gettext support"
 msgstr "Comprobando el soporte de gettext"
 
-#: include/setup_checks.inc:232
+#: include/setup_checks.inc:281
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 "El soporte de gettext es requerido para la intenacionalización de GOsa."
 
-#: include/setup_checks.inc:234
+#: include/setup_checks.inc:283
 #, fuzzy
 msgid "Checking for iconv support"
 msgstr "Comprobando el soporte de gettext"
 
-#: include/setup_checks.inc:235
+#: include/setup_checks.inc:284
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
 msgstr ""
 
-#: include/setup_checks.inc:238
+#: include/setup_checks.inc:287
 msgid "Checking for mhash module"
 msgstr "Comprobando por el módulo de mhash"
 
-#: include/setup_checks.inc:239
+#: include/setup_checks.inc:288
 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."
@@ -5923,11 +6292,11 @@ msgstr ""
 "Necesitará este módulo para usar crifrado SSHA. Si usted solo usa crypt o "
 "md5, ignore este mensaje. GOsa correra si él."
 
-#: include/setup_checks.inc:242
+#: include/setup_checks.inc:291
 msgid "Checking for imap module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/setup_checks.inc:243
+#: include/setup_checks.inc:292
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -5935,11 +6304,11 @@ msgstr ""
 "El módulo de IMAP es necesario para comunicarse con el servidor IMAP. "
 "Obtiene el estado, crea y borra usuarios del correo."
 
-#: include/setup_checks.inc:245
+#: include/setup_checks.inc:294
 msgid "Checking for getacl in imap"
 msgstr "Comprobando por getacl en imap"
 
-#: include/setup_checks.inc:246
+#: include/setup_checks.inc:295
 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 "
@@ -5949,21 +6318,21 @@ msgstr ""
 "módulo IAMP estandar no es capaz de leer acls. Necesitará una versión "
 "reciente de PHP para obtener está caracteristica. "
 
-#: include/setup_checks.inc:248
+#: include/setup_checks.inc:297
 msgid "Checking for mysql module"
 msgstr "Comprobando el módulo de mysql"
 
-#: include/setup_checks.inc:249
+#: include/setup_checks.inc:298
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "El soporte de MySQL es necesario para leer los repotes de GOfax de la base "
 "de datos."
 
-#: include/setup_checks.inc:251
+#: include/setup_checks.inc:300
 msgid "Checking for cups module"
 msgstr "Comprobando el módulo de cups"
 
-#: include/setup_checks.inc:252
+#: include/setup_checks.inc:301
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -5971,11 +6340,11 @@ msgstr ""
 "Para poder leer las impresoras disponibles a través del protocolo IPP, en "
 "vez de los archivos printcap, tiene que tener instalado el módulo de CUPS."
 
-#: include/setup_checks.inc:254
+#: include/setup_checks.inc:303
 msgid "Checking for kadm5 module"
 msgstr "Comprobando el módulo kadm5"
 
-#: include/setup_checks.inc:255
+#: include/setup_checks.inc:304
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -5983,15 +6352,15 @@ msgstr ""
 "Manejando usuarios en kerberos requiere el módulo kadm5 que esta disponible "
 "en la red PEAR."
 
-#: include/setup_checks.inc:264
+#: include/setup_checks.inc:313
 msgid "Checking for some additional programms"
 msgstr "Comprobando programas adicionales"
 
-#: include/setup_checks.inc:273
+#: include/setup_checks.inc:322
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Comprobando por ImageMagick (>=5.4.0)"
 
-#: include/setup_checks.inc:274
+#: include/setup_checks.inc:323
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -5999,12 +6368,12 @@ msgstr ""
 "ImageMagick se usa para convertir las imagenes de los usuarios para que "
 "encajen en el tamaño sugerido y el formato JPEG."
 
-#: include/setup_checks.inc:277
+#: include/setup_checks.inc:326
 #, fuzzy
 msgid "Checking imagick module for PHP"
 msgstr "Comprobando el módulo de imap"
 
-#: include/setup_checks.inc:278
+#: include/setup_checks.inc:327
 #, fuzzy
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
@@ -6013,11 +6382,11 @@ msgstr ""
 "ImageMagick se usa para convertir las imagenes de los usuarios para que "
 "encajen en el tamaño sugerido y el formato JPEG."
 
-#: include/setup_checks.inc:285
+#: include/setup_checks.inc:334
 msgid "Checking for fping utility"
 msgstr "Comprobando la herramienta fping"
 
-#: include/setup_checks.inc:286
+#: include/setup_checks.inc:335
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -6025,346 +6394,134 @@ msgstr ""
 "La herramienta fping solo se usa si tiene un entorno de terminales clientes "
 "delgados (thinclient)."
 
-#: include/setup_checks.inc:301
+#: include/setup_checks.inc:350
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Buscando una manera de generar hashes de contraseñas LM/NT"
 
-#: include/setup_checks.inc:302
+#: include/setup_checks.inc:351
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
 msgstr ""
-"Para poder usar SAMBA 2/3, tiene que instalar algunos paquetes adicionales "
-"para generar los hashes de contraseñas."
-
-#: include/setup_checks.inc:333
-msgid "PHP.ini check -> session.auto_register"
-msgstr ""
-
-#: include/setup_checks.inc:334
-msgid ""
-"In Order to use GOsa without any trouble, the session.auto_register option "
-"in your php.ini musst be 'Off'."
-msgstr ""
-
-#: include/setup_checks.inc:340
-msgid "PHP.ini check -> implicit_flush"
-msgstr ""
-
-#: include/setup_checks.inc:341
-msgid ""
-"This Option defines the Ouput handling, turn this Option off, to increase "
-"performance."
-msgstr ""
-
-#: include/setup_checks.inc:347
-msgid "PHP.ini check -> max_execution_time"
-msgstr ""
-
-#: include/setup_checks.inc:348
-msgid ""
-"The Execution time, should be 30 seconds minimun, cause some actions will "
-"need huge ammount of time ."
-msgstr ""
-
-#: include/setup_checks.inc:354
-msgid "PHP.ini check -> memory_limit"
-msgstr ""
-
-#: include/setup_checks.inc:355
-msgid ""
-"GOsa need at least 8M of memory, less will cause unpredictable errors, "
-"sometimes without error message!. Best would be 32 M here."
-msgstr ""
-
-#: include/setup_checks.inc:359
-msgid "PHP.ini check -> expose_php"
-msgstr ""
-
-#: include/setup_checks.inc:360
-msgid ""
-"PHP won't send any Information about the Server you are running, should be a "
-"security fact."
-msgstr ""
-
-#: include/setup_checks.inc:364
-msgid "PHP.ini check -> magic_quotes_gpc"
-msgstr ""
-
-#: include/setup_checks.inc:365
-msgid "Security option, php will escape all quotes in strings ."
-msgstr ""
-
-#: include/setup_checks.inc:667
-msgid "You've to specify an ldap server before continuing!"
-msgstr "Tiene que especificar un servidor ldap antes de continuar."
-
-#: include/setup_checks.inc:677
-msgid ""
-"Can't connect to the specified LDAP server! Please make sure that is "
-"reachable for GOsa."
-msgstr ""
-"No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
-"este accesible para GOsa."
-
-#: include/setup_checks.inc:694
-msgid ""
-"Can't bind to the specified LDAP server! Please make sure that is reachable "
-"for GOsa."
-msgstr ""
-"No se pudo autentificar con el servidor LDAP especificado. Por favor, "
-"asegure que este accesible para GOsa."
-
-#: include/setup_checks.inc:800
-msgid ""
-"Bind to server successfull, but the server seems to be completly empty, "
-"please check all informations twice"
-msgstr ""
-
-#: include/setup_checks.inc:839
-#, php-format
-msgid ""
-"You're missing the required attribute '%s' from this formular. Please "
-"complete!"
-msgstr ""
-"Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
-
-#: include/setup_checks.inc:876
-#, php-format
-msgid "Can't log into LDAP server. Reason was: %s."
-msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
-
-#: include/setup_checks.inc:1002 include/setup_checks.inc:1020
-#: html/index.php:156 ihtml/themes/default/setup_useradmin.tpl:6
-msgid ""
-"You're missing an administrative account for GOsa, you'll not be able to "
-"administrate anything!"
-msgstr ""
-"No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
-
-#: include/class_plugin.inc:180
-msgid "This 'dn' has no account extensions."
-msgstr "Este 'dn' no tiene extensiones de cuenta."
-
-#: include/class_plugin.inc:185
-msgid "This is an empty plugin."
-msgstr "Esta es un extensión vacía."
-
-#: include/class_plugin.inc:386
-#, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
-"parece existir."
-
-#: include/class_plugin.inc:412
-#, fuzzy, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
-"parece existir."
-
-#: include/class_plugin.inc:438
-#, php-format
-msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
-"parece existir."
-
-#: include/class_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:138
-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 ""
-
-#: include/class_password-methods.inc:169
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
-msgstr ""
-"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
-
-#: include/class_password-methods.inc:188
-msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
-msgstr ""
-"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
-"pueden cambiar las contraseñas de SAMBA."
-
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
-"soporte Kerberos, la contraseña no ha sido cambiada."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "¡La comunicación con la base de datos Kerberos fallo!."
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
-
-#: include/class_password-methods-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
-msgstr ""
-
-#: include/functions.inc:267
-#, php-format
-msgid "Error when connecting the LDAP. Server said '%s'."
-msgstr ""
-"Hay un error trantando de conectarse al servidor LDAP. El error del servidor "
-"es: '%s'"
-
-#: include/functions.inc:288
-#, php-format
-msgid "User login failed. LDAP server said '%s'."
-msgstr "Autenticación del usuario fallida. El servidor LDAP contesto '%s'."
+"Para poder usar SAMBA 2/3, tiene que instalar algunos paquetes adicionales "
+"para generar los hashes de contraseñas."
 
-#: include/functions.inc:308
-msgid "Username / UID is not unique. Please check your LDAP database."
+#: include/setup_checks.inc:382
+msgid "php.ini check -> session.auto_register"
 msgstr ""
-"Nombre de usuario o UID no son únicos. Por favor, compruebe su base de datos "
-"LDAP."
 
-#: include/functions.inc:346
+#: include/setup_checks.inc:383
 msgid ""
-"Error while adding a lock. Parameters are not set correctly, please check "
-"the source!"
+"In Order to use GOsa without any trouble, the session.auto_register option "
+"in your php.ini must be set to 'Off'."
 msgstr ""
-"Error al tratar de agregar un bloqueo. Los parámetros no son correctos, por "
-"favor, compruebe el código fuente."
 
-#: include/functions.inc:356
-#, php-format
-msgid ""
-"Can't set locking information in LDAP database. Please check the 'config' "
-"entry in gosa.conf! LDAP server says '%s'."
+#: include/setup_checks.inc:388
+msgid "php.ini check -> implicit_flush"
 msgstr ""
-"No se pudo generar el bloqueo a la base de datos LDAP. Por favor, compruebe "
-"la entrada 'config' en gosa.conf. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:371
-#, php-format
-msgid "Adding a lock failed. LDAP server says '%s'."
-msgstr "Fallo al tratar de agregar un bloqueo. El servidor LDAP contesto '%s'."
+#: include/setup_checks.inc:389
+msgid ""
+"This option influences the Output handling. Turn this Option off, to "
+"increase performance."
+msgstr ""
 
-#: include/functions.inc:397
-#, php-format
-msgid "Removing a lock failed. LDAP server says '%s'."
-msgstr "Fallo al tratar de agregar un bloqueo. El servidor LDAP contesto '%s'."
+#: include/setup_checks.inc:396
+msgid "php.ini check -> max_execution_time"
+msgstr ""
 
-#: include/functions.inc:427
+#: include/setup_checks.inc:397
 msgid ""
-"Getting the lock from LDAP failed. Parameters are not sed correctly, please "
-"check the source!"
+"The Execution time should be at least 30 seconds, because some actions may "
+"consume more time."
 msgstr ""
-"Fallo al tratar de obtener un bloqueo del LDAP. Los parámetros no fueron "
-"correctamente configurados, por favor, compruebe el código."
 
-#: include/functions.inc:437
-msgid ""
-"Can't get locking information in LDAP database. Please check the 'config' "
-"entry in gosa.conf!"
+#: include/setup_checks.inc:404
+msgid "php.ini check -> memory_limit"
 msgstr ""
-"No puedo bloquear la información en la base de datos LDAP. Por favor, "
-"compruebe la entrada 'config' en el archivos gosa.conf."
 
-#: include/functions.inc:445
+#: include/setup_checks.inc:405
 msgid ""
-"Found multiple locks for object to be locked. This should not be possible - "
-"cleaning up multiple references."
+"GOsa needs at least 8MB of memory, less will cause unpredictable errors! An "
+"optimal setting would be 16MB, increase it for larger setups."
 msgstr ""
-"Se encontraron varios bloqueos para el objeto a bloquear. Esto no debería "
-"ser posible, eliminando referencias múltiples."
 
-#: include/functions.inc:517
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "¡Ha excedido el tamaño máximo de %d entradas!"
+#: include/setup_checks.inc:409
+msgid "php.ini check -> expose_php"
+msgstr ""
 
-#: include/functions.inc:519
-#, php-format
+#: include/setup_checks.inc:410
 msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
+"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."
 msgstr ""
-"Indique el nuevo tamaño limite a %s y enséñame este mensaje si el tamaño "
-"limite es todavía superado"
 
-#: include/functions.inc:531
-msgid "Configure"
-msgstr "Configurar"
-
-#: include/functions.inc:536
-msgid "incomplete"
-msgstr "incompleto"
+#: include/setup_checks.inc:414
+msgid "php.ini check -> magic_quotes_gpc"
+msgstr ""
 
-#: include/functions.inc:919
-#, php-format
+#: include/setup_checks.inc:415
 msgid ""
-"You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
-"Please contact the person in order to clarify proceedings."
+"Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
+"escape all quotes in strings in this case."
 msgstr ""
-"Va ha editar la entrada LDAP '%s' que parece estar siendo usada por '%s'. "
-"Por favor, contacte con esta persona para clarificar los procedimientos."
 
-#: include/functions.inc:1018
-msgid "LDAP error:"
-msgstr "Error LDAP:"
+#: include/setup_checks.inc:717
+msgid "You've to specify an ldap server before continuing!"
+msgstr "Tiene que especificar un servidor ldap antes de continuar."
 
-#: include/functions.inc:1460
-msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+#: include/setup_checks.inc:727 include/setup_checks.inc:830
+msgid ""
+"Can't connect to the specified LDAP server! Please make sure that is "
+"reachable for GOsa."
+msgstr ""
+"No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
+"este accesible para GOsa."
 
-#: include/functions.inc:1505
-#, php-format
-msgid "GOsa development snapshot (Rev %s)"
+#: include/setup_checks.inc:744 include/setup_checks.inc:842
+#, fuzzy
+msgid ""
+"Can't bind to the specified LDAP server! Please make sure that it is "
+"reachable for GOsa."
 msgstr ""
+"No se pudo autentificar con el servidor LDAP especificado. Por favor, "
+"asegure que este accesible para GOsa."
 
-#: include/class_ldap.inc:398
-#, php-format
+#: include/setup_checks.inc:836
+#, fuzzy
 msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+"Can't bind to the specified LDAP server!. Please make sure that it is "
+"reachable for GOsa."
 msgstr ""
-"Actualmente no esta soportada la creación automática del tipo '%s'. Por "
-"favor, informe de esto al equipo de desarrollo de GOsa."
+"No se pudo autentificar con el servidor LDAP especificado. Por favor, "
+"asegure que este accesible para GOsa."
 
-#: include/class_ldap.inc:630
-#, php-format
+#: include/setup_checks.inc:856
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"Bind to server successful, but the server seems to be completly empty, "
+"please check all informations twice"
 msgstr ""
 
-#: include/class_ldap.inc:646
+#: include/setup_checks.inc:895
 #, php-format
-msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
+msgid ""
+"You're missing the required attribute '%s' from this formular. Please "
+"complete!"
 msgstr ""
+"Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
 
-#: include/class_ldap.inc:661
+#: include/setup_checks.inc:932
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid "Can't log into LDAP server. Reason was: %s."
+msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
+
+#: include/setup_checks.inc:1058 include/setup_checks.inc:1076
+#: html/index.php:160 ihtml/themes/default/setup_useradmin.tpl:6
+msgid ""
+"You're missing an administrative account for GOsa, you'll not be able to "
+"administrate anything!"
 msgstr ""
+"No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
 
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
@@ -6391,7 +6548,7 @@ msgstr ""
 "El directorio '%s' especificado como directorio de compilación no es "
 "accesible."
 
-#: html/main.php:106
+#: html/main.php:100
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -6399,81 +6556,50 @@ msgstr ""
 "'Register globals' está activado. No se permitirá ninguna entrada hasta que "
 "esto sea solucionado por un administrador."
 
-#: html/main.php:149
+#: html/main.php:143
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 "Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
 
-#: html/main.php:267
+#: html/main.php:261
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr "No se pudo encontrar ninguna definición de extensión para '%s'"
 
-#: html/index.php:53
+#: html/index.php:57
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 "No se puede leer la configuración de GOsa (%s/gosa.conf). Se ha abortado la "
 "operación."
 
-#: html/index.php:75
+#: html/index.php:79
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessable!"
 msgstr ""
 "El directorio '%s' especificado como directorio de compilación no es "
 "accesible."
 
-#: html/index.php:164
+#: html/index.php:168
 msgid "Please specify a valid username!"
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: html/index.php:166
+#: html/index.php:170
 msgid "Please specify your password!"
 msgstr "Por favor especifique su contraseña."
 
-#: html/index.php:173
+#: html/index.php:177
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/index.php:211
+#: html/index.php:215
 msgid "Session will not be encrypted."
 msgstr "La sesion no sera encriptada."
 
-#: html/index.php:211
+#: html/index.php:215
 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."
-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"
-msgstr ""
-"ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit int the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-"ignore este error y enseñe 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/classic/conflict.tpl:2
 #: ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
@@ -6506,36 +6632,6 @@ msgstr ""
 msgid "Logout"
 msgstr "Salir"
 
-#: ihtml/themes/altlinux/login.tpl:13 ihtml/themes/classic/login.tpl:12
-#: ihtml/themes/default/login.tpl:13
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-"Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
-
-#: ihtml/themes/altlinux/login.tpl:24 ihtml/themes/altlinux/login.tpl:28
-#: ihtml/themes/classic/login.tpl:23 ihtml/themes/classic/login.tpl:27
-#: ihtml/themes/default/login.tpl:24 ihtml/themes/default/login.tpl:28
-#: ihtml/themes/default/setup_useradmin.tpl:22
-msgid "Username"
-msgstr "Nombre de Usuario"
-
-#: ihtml/themes/altlinux/login.tpl:42 ihtml/themes/altlinux/login.tpl:45
-#: ihtml/themes/classic/login.tpl:41 ihtml/themes/classic/login.tpl:44
-#: ihtml/themes/default/login.tpl:42 ihtml/themes/default/login.tpl:45
-msgid "Directory"
-msgstr "Directorio"
-
-#: ihtml/themes/altlinux/login.tpl:53
-#: ihtml/themes/altlinux/setup_finish.tpl:24 ihtml/themes/classic/login.tpl:52
-#: ihtml/themes/default/login.tpl:53
-msgid "Sign in"
-msgstr "Entrando"
-
-#: ihtml/themes/altlinux/login.tpl:54 ihtml/themes/classic/login.tpl:53
-#: ihtml/themes/default/login.tpl:54
-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!"
@@ -6558,26 +6654,103 @@ msgstr ""
 "programas opcionales y, luego de ingresar la información necesaria para "
 "conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
 
-#: ihtml/themes/altlinux/framework.tpl:14
-#: ihtml/themes/classic/framework.tpl:13 ihtml/themes/default/framework.tpl:14
+#: ihtml/themes/altlinux/login.tpl:14 ihtml/themes/classic/login.tpl:14
+#: ihtml/themes/default/login.tpl:14
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+"Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
+
+#: ihtml/themes/altlinux/login.tpl:25 ihtml/themes/altlinux/login.tpl:29
+#: ihtml/themes/classic/login.tpl:25 ihtml/themes/classic/login.tpl:29
+#: ihtml/themes/default/setup_useradmin.tpl:22
+#: ihtml/themes/default/login.tpl:25 ihtml/themes/default/login.tpl:29
+msgid "Username"
+msgstr "Nombre de Usuario"
+
+#: ihtml/themes/altlinux/login.tpl:43 ihtml/themes/altlinux/login.tpl:46
+#: ihtml/themes/classic/login.tpl:43 ihtml/themes/classic/login.tpl:46
+#: ihtml/themes/default/login.tpl:43 ihtml/themes/default/login.tpl:46
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/altlinux/login.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:24 ihtml/themes/classic/login.tpl:54
+#: ihtml/themes/default/login.tpl:54
+msgid "Sign in"
+msgstr "Entrando"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/classic/login.tpl:55
+#: ihtml/themes/default/login.tpl:55
+msgid "Click here to log in"
+msgstr "Pulse aquí para entrar"
+
+#: 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/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
+#, fuzzy
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+"ignore este error y enseñe 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/classic/framework.tpl:14 ihtml/themes/default/framework.tpl:15
 msgid "Main"
 msgstr "Inicio"
 
-#: ihtml/themes/altlinux/framework.tpl:19
-#: ihtml/themes/classic/framework.tpl:15 ihtml/themes/default/framework.tpl:19
+#: ihtml/themes/altlinux/framework.tpl:20
+#: ihtml/themes/classic/framework.tpl:16 ihtml/themes/default/framework.tpl:20
 msgid "Help"
 msgstr "Ayuda"
 
-#: ihtml/themes/altlinux/framework.tpl:24
-#: ihtml/themes/classic/framework.tpl:17 ihtml/themes/default/framework.tpl:24
+#: ihtml/themes/altlinux/framework.tpl:25
+#: ihtml/themes/classic/framework.tpl:18 ihtml/themes/default/framework.tpl:25
 msgid "Sign out"
 msgstr "Salir"
 
-#: ihtml/themes/altlinux/framework.tpl:32
-#: ihtml/themes/classic/framework.tpl:22 ihtml/themes/default/framework.tpl:32
+#: ihtml/themes/altlinux/framework.tpl:33
+#: ihtml/themes/classic/framework.tpl:23 ihtml/themes/default/framework.tpl:33
 msgid "Signed in:"
 msgstr "Entrando"
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/classic/islocked.tpl:2
+#: ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Detectado conflicto de Bloqueos"
+
+#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+"Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
+"mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
+"pulsando en el botón <i>Eliminar</i>."
+
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
@@ -6604,21 +6777,6 @@ msgstr ""
 "Hemos inspeccionado el servidor web. Su configuración parece cumplir con los "
 "requerimientos de GOsa. Continuamos la configuración de GOsa..."
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/classic/islocked.tpl:2
-#: ihtml/themes/default/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Detectado conflicto de Bloqueos"
-
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/default/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-"Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
-"mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
-"pulsando en el botón <i>Eliminar</i>."
-
 #: ihtml/themes/altlinux/setup_step3.tpl:4
 #: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
@@ -6832,6 +6990,18 @@ msgstr "Configurar"
 msgid "Download configuration"
 msgstr "Información de sistema"
 
+#, fuzzy
+#~ msgid "Send report"
+#~ msgstr "Remitente"
+
+#, fuzzy
+#~ msgid "LDIF CSV import"
+#~ msgstr "Exportar a LDIF"
+
+#, fuzzy
+#~ msgid "Kolab Hosts"
+#~ msgstr "Mi cuenta"
+
 #~ msgid "GONICUS"
 #~ msgstr "GONICUS"