Added Translation Strings.

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

diff --git a/locale/es/LC_MESSAGES/messages.po b/locale/es/LC_MESSAGES/messages.po
index 1400a99c181d5b7f45645f5ee32cb172b90f0c97..6ed4631029bb9c15103a6edae00a1ec1ff70d6d2 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -47,6 +47,7 @@ msgstr "Unix"
 
 #: contrib/gosa.conf:59 contrib/gosa.conf:70
 #: plugins/personal/mail/class_mailAccount.inc:22
+#: plugins/admin/ogroups/tabs_ogroups.inc:29
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Correo Electrónico"
@@ -108,7 +109,7 @@ msgstr "ACL"
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:83
+#: contrib/gosa.conf:83 plugins/gofon/phoneaccount/class_phoneAccount.inc:224
 #, fuzzy
 msgid "Parameter"
 msgstr "Parametros de inicio"
@@ -150,39 +151,40 @@ msgstr "Importar"
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:167
+#: contrib/gosa.conf:168
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:184
+#: contrib/gosa.conf:185
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:185
+#: contrib/gosa.conf:186
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:186
+#: contrib/gosa.conf:187
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:187
+#: contrib/gosa.conf:188
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:188
+#: contrib/gosa.conf:189
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:189
+#: contrib/gosa.conf:190
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:190
+#: contrib/gosa.conf:191
 msgid "Italian"
 msgstr "Italiano"
 
 #: plugins/personal/mail/generic.tpl:7 plugins/admin/groups/mail.tpl:10
+#: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 msgstr "Cuenta Principal"
 
@@ -213,8 +215,8 @@ msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
 #: plugins/personal/mail/generic.tpl:50 plugins/admin/groups/mail.tpl:48
-#: plugins/admin/systems/phonesettings.tpl:173
-#: plugins/admin/systems/phonesettings.tpl:188
+#: plugins/admin/systems/phonesettings.tpl:175
+#: plugins/admin/systems/phonesettings.tpl:190
 msgid "List of alternative mail addresses"
 msgstr "Lista de direcciones de correo alternativas."
 
@@ -226,8 +228,8 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/personal/posix/generic.tpl:135
 #: plugins/personal/samba/samba3.tpl:287
 #: plugins/personal/samba/samba3_workstations.tpl:39
-#: plugins/personal/connectivity/class_kolabAccount.inc:199
-#: plugins/personal/connectivity/kolab.tpl:17
+#: plugins/personal/connectivity/class_kolabAccount.inc:200
+#: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:75
 #: plugins/gofax/faxaccount/locals.tpl:62
@@ -240,13 +242,12 @@ msgstr "Lista de direcciones de correo alternativas."
 #: plugins/admin/systems/servservice.tpl:47
 #: plugins/admin/systems/startup.tpl:61 plugins/admin/systems/startup.tpl:75
 #: plugins/admin/systems/startup.tpl:95
-#: plugins/admin/systems/phonesettings.tpl:179
-#: plugins/admin/systems/phonesettings.tpl:194
+#: plugins/admin/systems/phonesettings.tpl:181
+#: plugins/admin/systems/phonesettings.tpl:196
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:38
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
-#: plugins/gofon/phoneaccount/generic.tpl:45
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:158
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:375
+#: plugins/gofon/phoneaccount/generic.tpl:11
 msgid "Add"
 msgstr "Añadir"
 
@@ -254,7 +255,7 @@ msgstr "Añadir"
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:137
 #: plugins/personal/samba/samba3.tpl:289
-#: plugins/personal/connectivity/kolab.tpl:19
+#: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:15
 #: plugins/gofax/blocklists/headpage.tpl:18
@@ -273,11 +274,11 @@ msgstr "Añadir"
 #: plugins/admin/systems/remove.tpl:15 plugins/admin/systems/headpage.tpl:17
 #: plugins/admin/systems/startup.tpl:62 plugins/admin/systems/startup.tpl:76
 #: plugins/admin/systems/startup.tpl:96
-#: plugins/admin/systems/phonesettings.tpl:180
-#: plugins/admin/systems/phonesettings.tpl:195
+#: plugins/admin/systems/phonesettings.tpl:182
+#: plugins/admin/systems/phonesettings.tpl:197
 #: plugins/admin/ogroups/generic.tpl:39 plugins/admin/ogroups/remove.tpl:15
 #: plugins/admin/ogroups/headpage.tpl:18
-#: plugins/gofon/phoneaccount/generic.tpl:47 plugins/gofon/macro/remove.tpl:14
+#: plugins/gofon/phoneaccount/generic.tpl:13 plugins/gofon/macro/remove.tpl:14
 #: plugins/gofon/macro/headpage.tpl:18
 msgid "Delete"
 msgstr "Borrar"
@@ -411,16 +412,17 @@ msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
 msgid "No DESC tag in vacation file:"
 msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
 
-#: plugins/personal/mail/class_mailAccount.inc:189
+#: plugins/personal/mail/class_mailAccount.inc:200
 msgid "This account has no mail extensions."
 msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/mail/class_mailAccount.inc:197
+#: plugins/personal/mail/class_mailAccount.inc:209
 #: plugins/admin/groups/class_groupMail.inc:187
+#: plugins/admin/ogroups/class_mailogroup.inc:37
 msgid "Remove mail account"
 msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:198
+#: plugins/personal/mail/class_mailAccount.inc:210
 #: plugins/admin/groups/class_groupMail.inc:188
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
@@ -429,12 +431,13 @@ msgstr ""
 "Esta cuenta tiene las características de correo activas. Puede desactivarlas "
 "apretando a continuación."
 
-#: plugins/personal/mail/class_mailAccount.inc:200
+#: plugins/personal/mail/class_mailAccount.inc:212
 #: plugins/admin/groups/class_groupMail.inc:190
+#: plugins/admin/ogroups/class_mailogroup.inc:40
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:201
+#: plugins/personal/mail/class_mailAccount.inc:212
 #: plugins/admin/groups/class_groupMail.inc:191
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
@@ -443,22 +446,22 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/mail/class_mailAccount.inc:249
+#: plugins/personal/mail/class_mailAccount.inc:260
 msgid ""
 "You're trying to add an invalid email address to the list of forwarders."
 msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "reenvíos."
 
-#: plugins/personal/mail/class_mailAccount.inc:255
+#: plugins/personal/mail/class_mailAccount.inc:266
 #: plugins/admin/groups/class_groupMail.inc:250
 msgid "Adding your one of your own addresses to the forwarders makes no sense."
 msgstr ""
 "Añadir una de sus propias cuentas de correo a la lista de reenvío no tiene "
 "sentido."
 
-#: plugins/personal/mail/class_mailAccount.inc:290
-#: plugins/personal/mail/class_mailAccount.inc:295
+#: plugins/personal/mail/class_mailAccount.inc:301
+#: plugins/personal/mail/class_mailAccount.inc:306
 #: plugins/admin/groups/class_groupMail.inc:278
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
@@ -467,42 +470,49 @@ msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "direcciones alternativas"
 
-#: plugins/personal/mail/class_mailAccount.inc:305
+#: plugins/personal/mail/class_mailAccount.inc:316
 #: plugins/admin/groups/class_groupMail.inc:283
 msgid "The address you're trying to add is already used by user"
 msgstr ""
 "La dirección de correo que esta intentando añadir, ya esta usada por otro "
 "usuario"
 
-#: plugins/personal/mail/class_mailAccount.inc:670
+#: plugins/personal/mail/class_mailAccount.inc:675
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:680
 #: plugins/admin/groups/class_groupMail.inc:610
 msgid "The required field 'Primary address' is not set."
 msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/personal/mail/class_mailAccount.inc:674
-#: plugins/personal/mail/class_mailAccount.inc:678
-#: plugins/addons/addressbook/class_addressbook.inc:568
+#: plugins/personal/mail/class_mailAccount.inc:684
+#: plugins/personal/mail/class_mailAccount.inc:688
+#: plugins/addons/addressbook/class_addressbook.inc:569
+#: plugins/admin/ogroups/class_mailogroup.inc:67
 msgid "Please enter a valid email address in 'Primary address' field."
 msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/personal/mail/class_mailAccount.inc:685
+#: plugins/personal/mail/class_mailAccount.inc:695
 #: plugins/admin/groups/class_groupMail.inc:619
+#: plugins/admin/ogroups/class_mailogroup.inc:74
 msgid "The primary address you've entered is already in use."
 msgstr "La cuenta principal que ha introducido ya esta en uso."
 
-#: plugins/personal/mail/class_mailAccount.inc:691
+#: plugins/personal/mail/class_mailAccount.inc:701
 #: plugins/admin/groups/class_groupMail.inc:625
 msgid "Value in 'Quota size' is not valid."
 msgstr "El valor de 'Tamaño de Cola' no es valido."
 
-#: plugins/personal/mail/class_mailAccount.inc:700
+#: plugins/personal/mail/class_mailAccount.inc:710
 #: plugins/admin/groups/class_groupMail.inc:634
 msgid "Please specify a vaild mail size for mails to be rejected."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/personal/mail/class_mailAccount.inc:710
+#: plugins/personal/mail/class_mailAccount.inc:720
 #: plugins/admin/groups/class_groupMail.inc:642
 msgid "You need to set the maximum mail size in order to reject anything."
 msgstr ""
@@ -521,7 +531,7 @@ msgstr ""
 #: plugins/admin/applications/class_applicationManagement.inc:239
 #: plugins/admin/departments/class_departmentManagement.inc:228
 #: plugins/admin/systems/class_systemManagement.inc:440
-#: plugins/admin/ogroups/class_ogroupManagement.inc:271
+#: plugins/admin/ogroups/class_ogroupManagement.inc:270
 #: plugins/gofon/phoneaccount/main.inc:104
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:238
 msgid "Finish"
@@ -561,7 +571,7 @@ msgstr "Terminar"
 #: plugins/admin/systems/remove.tpl:17 plugins/admin/systems/password.tpl:27
 #: plugins/admin/systems/chooser.tpl:18
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:273
+#: plugins/admin/ogroups/class_ogroupManagement.inc:272
 #: plugins/admin/ogroups/remove.tpl:17 plugins/gofon/phoneaccount/main.inc:106
 #: plugins/gofon/macro/remove.tpl:16
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:240
@@ -621,7 +631,7 @@ msgstr "Mostrar las direcciones de los departamentos"
 #: plugins/admin/departments/headpage.tpl:47
 #: plugins/admin/systems/headpage.tpl:62
 #: plugins/admin/ogroups/ogroup_objects.tpl:38
-#: plugins/admin/ogroups/headpage.tpl:62 plugins/gofon/macro/headpage.tpl:49
+#: plugins/admin/ogroups/headpage.tpl:61 plugins/gofon/macro/headpage.tpl:49
 msgid "Choose the department the search will be based on"
 msgstr "Escoja el departamento base de la busqueda"
 
@@ -652,6 +662,7 @@ msgstr "Nombre de usuario de las direcciones mostradas"
 #: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
 #: plugins/admin/systems/servdb.tpl:109 ihtml/themes/altlinux/login.tpl:35
 #: ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:30
 #: ihtml/themes/default/login.tpl:35 ihtml/themes/default/login.tpl:39
 msgid "Password"
@@ -725,10 +736,11 @@ msgstr ""
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:99
 #: ihtml/themes/altlinux/setup_finish.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
-#: ihtml/themes/default/setup_step4.tpl:99
+#: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr "Atras"
@@ -844,17 +856,17 @@ msgid "Show functional groups"
 msgstr "Mostrar grupos funcionales"
 
 #: plugins/personal/posix/posix_groups.tpl:36
-#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:61
+#: plugins/admin/groups/headpage.tpl:65 plugins/admin/ogroups/headpage.tpl:60
 msgid "Display groups of department"
 msgstr "Mostrar los grupos de departamentos"
 
 #: plugins/personal/posix/posix_groups.tpl:48
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:65
+#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:64
 msgid "Display groups matching"
 msgstr "Mostrar grupos que concuerden con"
 
 #: plugins/personal/posix/posix_groups.tpl:51
-#: plugins/admin/groups/headpage.tpl:70 plugins/admin/ogroups/headpage.tpl:66
+#: plugins/admin/groups/headpage.tpl:70 plugins/admin/ogroups/headpage.tpl:65
 msgid "Regular expression for matching group names"
 msgstr "Expresión regular que concuerde con nombres de grupos"
 
@@ -894,7 +906,7 @@ msgstr "Mostrar sistemas que concuerden con"
 
 #: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
 #: plugins/personal/samba/samba3.tpl:65
-#: plugins/personal/samba/class_sambaAccount.inc:621
+#: plugins/personal/samba/class_sambaAccount.inc:626
 msgid "Home directory"
 msgstr "Directorio Principal"
 
@@ -967,7 +979,7 @@ msgstr "Desconfigurado"
 
 #: plugins/personal/posix/class_posixAccount.inc:190
 #: plugins/admin/systems/class_terminalService.inc:122
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:99
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:190
 msgid "automatic"
 msgstr "automático"
 
@@ -1036,7 +1048,7 @@ msgstr "Avisar al usuario %s días antes de expirar la contraseña"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/generic/class_user.inc:220
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "January"
@@ -1047,7 +1059,7 @@ msgstr "Enero"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/generic/class_user.inc:220
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "February"
@@ -1058,7 +1070,7 @@ msgstr "Febrero"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/generic/class_user.inc:220
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "March"
@@ -1069,7 +1081,7 @@ msgstr "Marzo"
 #: plugins/personal/samba/class_sambaAccount.inc:370
 #: plugins/personal/samba/class_sambaAccount.inc:388
 #: plugins/personal/samba/class_sambaAccount.inc:406
-#: plugins/personal/generic/class_user.inc:214
+#: plugins/personal/generic/class_user.inc:220
 #: plugins/gofax/reports/class_faxreport.inc:272
 #: plugins/gofon/reports/class_fonreport.inc:208
 msgid "April"
@@ -1080,7 +1092,7 @@ msgstr "Abril"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/generic/class_user.inc:221
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "May"
@@ -1091,7 +1103,7 @@ msgstr "Mayo"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/generic/class_user.inc:221
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "June"
@@ -1102,7 +1114,7 @@ msgstr "Junio"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/generic/class_user.inc:221
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "July"
@@ -1113,7 +1125,7 @@ msgstr "Julio"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/generic/class_user.inc:221
 #: plugins/gofax/reports/class_faxreport.inc:273
 #: plugins/gofon/reports/class_fonreport.inc:209
 msgid "August"
@@ -1124,7 +1136,7 @@ msgstr "Agosto"
 #: plugins/personal/samba/class_sambaAccount.inc:371
 #: plugins/personal/samba/class_sambaAccount.inc:389
 #: plugins/personal/samba/class_sambaAccount.inc:407
-#: plugins/personal/generic/class_user.inc:215
+#: plugins/personal/generic/class_user.inc:221
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "September"
@@ -1135,7 +1147,7 @@ msgstr "Septiembre"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "October"
@@ -1146,7 +1158,7 @@ msgstr "Octubre"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "November"
@@ -1157,7 +1169,7 @@ msgstr "Noviembre"
 #: plugins/personal/samba/class_sambaAccount.inc:372
 #: plugins/personal/samba/class_sambaAccount.inc:390
 #: plugins/personal/samba/class_sambaAccount.inc:408
-#: plugins/personal/generic/class_user.inc:216
+#: plugins/personal/generic/class_user.inc:222
 #: plugins/gofax/reports/class_faxreport.inc:274
 #: plugins/gofon/reports/class_fonreport.inc:210
 msgid "December"
@@ -1269,7 +1281,7 @@ msgstr "Ruta del Script"
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
 #: plugins/personal/samba/samba3.tpl:75
-#: plugins/personal/samba/class_sambaAccount.inc:622
+#: plugins/personal/samba/class_sambaAccount.inc:627
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
@@ -1318,17 +1330,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Características de tiempo de desconexión (en minutos)"
 
 #: plugins/personal/samba/samba3.tpl:116
-#: plugins/personal/samba/class_sambaAccount.inc:629
+#: plugins/personal/samba/class_sambaAccount.inc:634
 msgid "Connection"
 msgstr "Conexión"
 
 #: plugins/personal/samba/samba3.tpl:125
-#: plugins/personal/samba/class_sambaAccount.inc:630
+#: plugins/personal/samba/class_sambaAccount.inc:635
 msgid "Disconnection"
 msgstr "Desconexión"
 
 #: plugins/personal/samba/samba3.tpl:134
-#: plugins/personal/samba/class_sambaAccount.inc:631
+#: plugins/personal/samba/class_sambaAccount.inc:636
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -1471,12 +1483,12 @@ msgstr "Desde cualquier cliente"
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:624
+#: plugins/personal/samba/class_sambaAccount.inc:629
 #, php-format
 msgid "The value specified as '%s' contains invalid characters!"
 msgstr "¡El valor especificado como '%s' contiene caracteres no validos!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:634
+#: plugins/personal/samba/class_sambaAccount.inc:639
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1484,7 +1496,7 @@ msgstr ""
 "¡La propiedad 'tiempo de desconexión' '%s' esta activada y contiene "
 "caracteres no validos o no caracteres!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:640
+#: plugins/personal/samba/class_sambaAccount.inc:645
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1492,7 +1504,7 @@ msgstr ""
 "El gestor de usuarios de windows solo permite ocho clientes. Ha especificado "
 "mas de ocho."
 
-#: plugins/personal/samba/class_sambaAccount.inc:817
+#: plugins/personal/samba/class_sambaAccount.inc:822
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1500,7 +1512,7 @@ msgstr ""
 "Aviso: Esta cuenta tiene asignado un SID indefinido. ¡El problema no puede "
 "ser solucionado por GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:842
+#: plugins/personal/samba/class_sambaAccount.inc:847
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1543,15 +1555,15 @@ msgstr "Cambiar foto"
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/addons/addressbook/address_edit.tpl:20
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:502
+#: plugins/addons/addressbook/class_addressbook.inc:503
 #: plugins/addons/addressbook/address_info.tpl:16
-#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:8
+#: plugins/admin/users/template.tpl:19 plugins/gofon/macro/parameter.tpl:5
 msgid "Name"
 msgstr "Nombre"
 
 #: plugins/personal/generic/generic.tpl:30
 #: plugins/addons/addressbook/address_edit.tpl:20
-#: plugins/addons/addressbook/class_addressbook.inc:502
+#: plugins/addons/addressbook/class_addressbook.inc:503
 #: plugins/admin/users/template.tpl:23
 msgid "Given name"
 msgstr "Nombre"
@@ -1593,7 +1605,7 @@ msgstr "Sexo"
 #: plugins/admin/systems/workstation.tpl:18
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/component.tpl:13 plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/generic.tpl:33
+#: plugins/gofon/macro/generic.tpl:20
 msgid "Base"
 msgstr "Base"
 
@@ -1758,10 +1770,10 @@ msgstr "Certificado estandar"
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
 #: plugins/personal/generic/generic_certs.tpl:57
-#: plugins/personal/connectivity/class_kolabAccount.inc:202
+#: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/admin/groups/class_groupMail.inc:408
 #: plugins/admin/applications/class_applicationParameters.inc:94
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:213
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:377
 #: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/default/islocked.tpl:13
 msgid "Remove"
 msgstr "Eliminar"
@@ -1778,87 +1790,87 @@ msgstr "Certificado PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
-#: plugins/personal/generic/class_user.inc:225
+#: plugins/personal/generic/class_user.inc:231
 msgid "female"
 msgstr "mujer"
 
-#: plugins/personal/generic/class_user.inc:225
+#: plugins/personal/generic/class_user.inc:231
 msgid "male"
 msgstr "hombre"
 
-#: plugins/personal/generic/class_user.inc:235
+#: plugins/personal/generic/class_user.inc:241
 msgid "This account has no valid GOsa extensions."
 msgstr "Esta cuenta no tiene extensiones GOsa validas"
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:270
 msgid "The specified file has not been uploaded via HTTP POST! Aborted."
 msgstr ""
 "¡El archivo especificado no ha podido ser subido vía HTTP POST! Abortado."
 
-#: plugins/personal/generic/class_user.inc:359
+#: plugins/personal/generic/class_user.inc:365
 msgid "Please enter a valid serial number"
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:402
 #, php-format
 msgid ""
 "Certificate is valid from <b>%s</b> to <b>%s</b> and is currently <b>%s</b>."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:402
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:396
+#: plugins/personal/generic/class_user.inc:402
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:400
+#: plugins/personal/generic/class_user.inc:406
 #, fuzzy
 msgid "No certificate installed"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/class_user.inc:789
+#: plugins/personal/generic/class_user.inc:800
 msgid "Kerberos database communication failed"
 msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/class_user.inc:806
+#: plugins/personal/generic/class_user.inc:817
 msgid "Can't remove user from kerberos database."
 msgstr "No se puede eliminar el usuario de la base de datos Kerberos"
 
-#: plugins/personal/generic/class_user.inc:817
+#: plugins/personal/generic/class_user.inc:828
 msgid "Can't add user to kerberos database."
 msgstr "No se puede añadir el usuario de la base de datos Kerberos"
 
-#: plugins/personal/generic/class_user.inc:857
+#: plugins/personal/generic/class_user.inc:868
 msgid "You have no permissions to create a user on this 'Base'."
 msgstr "No tiene permisos para crear un usuario en esta 'Base'."
 
-#: plugins/personal/generic/class_user.inc:862
+#: plugins/personal/generic/class_user.inc:873
 msgid "You have no permissions to move a user from the original 'Base'."
 msgstr "No tiene permisos para transladar a un usuario de su base original"
 
-#: plugins/personal/generic/class_user.inc:868
-#: plugins/addons/addressbook/class_addressbook.inc:525
+#: plugins/personal/generic/class_user.inc:879
+#: plugins/addons/addressbook/class_addressbook.inc:526
 #: plugins/admin/users/class_userManagement.inc:425
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:877
+#: plugins/personal/generic/class_user.inc:888
 msgid "There's already a person with this 'Login' in the database."
 msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
-#: plugins/personal/generic/class_user.inc:883
-#: plugins/addons/addressbook/class_addressbook.inc:529
+#: plugins/personal/generic/class_user.inc:894
+#: plugins/addons/addressbook/class_addressbook.inc:530
 #: plugins/admin/users/class_userManagement.inc:428
 msgid "The required field 'Given name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:886
+#: plugins/personal/generic/class_user.inc:897
 msgid "The required field 'Login' is not set."
 msgstr " El campo requerido 'Login' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:893
+#: plugins/personal/generic/class_user.inc:904
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -1866,7 +1878,7 @@ msgstr ""
 "Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
 "base de datos."
 
-#: plugins/personal/generic/class_user.inc:900
+#: plugins/personal/generic/class_user.inc:911
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -1874,51 +1886,51 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/personal/generic/class_user.inc:903
+#: plugins/personal/generic/class_user.inc:914
 msgid "The field 'Homepage' contains an invalid URL definition."
 msgstr "El campo 'Pagina web principal' contiene un URL no valida"
 
-#: plugins/personal/generic/class_user.inc:906
-#: plugins/personal/generic/class_user.inc:934
-#: plugins/addons/addressbook/class_addressbook.inc:535
-#: plugins/addons/addressbook/class_addressbook.inc:563
+#: plugins/personal/generic/class_user.inc:917
+#: plugins/personal/generic/class_user.inc:945
+#: plugins/addons/addressbook/class_addressbook.inc:536
+#: plugins/addons/addressbook/class_addressbook.inc:564
 #: plugins/admin/departments/class_departmentGeneric.inc:155
 msgid "The field 'Name' contains invalid characters."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/personal/generic/class_user.inc:909
-#: plugins/personal/generic/class_user.inc:931
-#: plugins/addons/addressbook/class_addressbook.inc:538
-#: plugins/addons/addressbook/class_addressbook.inc:560
+#: plugins/personal/generic/class_user.inc:920
+#: plugins/personal/generic/class_user.inc:942
+#: plugins/addons/addressbook/class_addressbook.inc:539
+#: plugins/addons/addressbook/class_addressbook.inc:561
 msgid "The field 'Given name' contains invalid characters."
 msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
 
-#: plugins/personal/generic/class_user.inc:914
-#: plugins/personal/generic/class_user.inc:917
-#: plugins/addons/addressbook/class_addressbook.inc:543
-#: plugins/addons/addressbook/class_addressbook.inc:546
+#: plugins/personal/generic/class_user.inc:925
+#: plugins/personal/generic/class_user.inc:928
+#: plugins/addons/addressbook/class_addressbook.inc:544
+#: plugins/addons/addressbook/class_addressbook.inc:547
 #: plugins/admin/departments/class_departmentGeneric.inc:158
 msgid "The field 'Phone' contains an invalid phone number."
 msgstr "El campo 'Teléfono' contiene un número de teléfono no valido."
 
-#: plugins/personal/generic/class_user.inc:920
-#: plugins/addons/addressbook/class_addressbook.inc:549
+#: plugins/personal/generic/class_user.inc:931
+#: plugins/addons/addressbook/class_addressbook.inc:550
 #: plugins/admin/departments/class_departmentGeneric.inc:161
 msgid "The field 'Fax' contains an invalid phone number."
 msgstr "El campo 'Fax' contiene un número de teléfono no valido."
 
-#: plugins/personal/generic/class_user.inc:923
-#: plugins/addons/addressbook/class_addressbook.inc:552
+#: plugins/personal/generic/class_user.inc:934
+#: plugins/addons/addressbook/class_addressbook.inc:553
 msgid "The field 'Mobile' contains an invalid phone number."
 msgstr "El campo 'Teléfono móvil' contiene un número de teléfono invalido."
 
-#: plugins/personal/generic/class_user.inc:926
-#: plugins/addons/addressbook/class_addressbook.inc:555
+#: plugins/personal/generic/class_user.inc:937
+#: plugins/addons/addressbook/class_addressbook.inc:556
 msgid "The field 'Pager' contains an invalid phone number."
 msgstr ""
 "El campo 'Dispositivo de Busqueda' contiene un número de teléfono invalido."
 
-#: plugins/personal/generic/class_user.inc:1051
+#: plugins/personal/generic/class_user.inc:1062
 #, fuzzy
 msgid "Could not open specified certificate!"
 msgstr "No puedo seleccionar la base de datos."
@@ -1994,25 +2006,25 @@ msgstr "Preguntar si hay conflictos"
 msgid "Manual"
 msgstr "Manual"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:176
+#: plugins/personal/connectivity/class_kolabAccount.inc:177
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:228
+#: plugins/personal/connectivity/class_kolabAccount.inc:229
 msgid "The value specified as Free Busy future needs to be an integer."
 msgstr "El valor especificado como presencia futura necesita ser un entero."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:233
+#: plugins/personal/connectivity/class_kolabAccount.inc:234
 msgid "The value specified as Free Busy Information URL is invalid."
 msgstr "El valor especificado como Dirección URL de  no es válido"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:247
+#: plugins/personal/connectivity/class_kolabAccount.inc:248
 #, php-format
 msgid "The invitation policy entry for address '%s' is not valid."
 msgstr ""
 "La entrada de la política de invitación para la dirección '%s' no es valida."
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:255
+#: plugins/personal/connectivity/class_kolabAccount.inc:256
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
@@ -2109,33 +2121,33 @@ msgstr ""
 msgid "Delegations"
 msgstr "Delegaciones"
 
-#: plugins/personal/connectivity/kolab.tpl:22
+#: plugins/personal/connectivity/kolab.tpl:23
 msgid "Mail size"
 msgstr "Tamaño del correo electrónico"
 
-#: plugins/personal/connectivity/kolab.tpl:23
+#: plugins/personal/connectivity/kolab.tpl:24
 msgid "No mail size restriction for this account"
 msgstr "No hay restricción de correo para esta cuenta."
 
-#: plugins/personal/connectivity/kolab.tpl:31
+#: plugins/personal/connectivity/kolab.tpl:32
 msgid "Free Busy information"
 msgstr "Información de estado de presencia"
 
-#: plugins/personal/connectivity/kolab.tpl:34
+#: plugins/personal/connectivity/kolab.tpl:35
 msgid "URL"
 msgstr "URL"
 
-#: plugins/personal/connectivity/kolab.tpl:38
+#: plugins/personal/connectivity/kolab.tpl:39
 msgid "Future"
 msgstr "Futuro"
 
-#: plugins/personal/connectivity/kolab.tpl:39
+#: plugins/personal/connectivity/kolab.tpl:40
 #: plugins/personal/connectivity/oxchange.tpl:18
 #: plugins/personal/connectivity/oxchange.tpl:22
 msgid "days"
 msgstr "días"
 
-#: plugins/personal/connectivity/kolab.tpl:44
+#: plugins/personal/connectivity/kolab.tpl:45
 msgid "Invitation policy"
 msgstr "Política de invitación"
 
@@ -2326,7 +2338,7 @@ msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 
 #: plugins/gofax/blocklists/generic.tpl:32
 #: plugins/admin/systems/service.tpl:42 plugins/admin/systems/service.tpl:120
-#: include/functions.inc:1608
+#: include/php_setup.inc:122
 msgid "Type"
 msgstr "Tipo"
 
@@ -2341,7 +2353,7 @@ msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
 #: plugins/admin/systems/printer.tpl:10
 #: plugins/admin/systems/wingeneric.tpl:24
 #: plugins/admin/systems/component.tpl:24 plugins/admin/ogroups/generic.tpl:13
-#: plugins/gofon/macro/generic.tpl:17
+#: plugins/gofon/macro/generic.tpl:36
 #: plugins/generic/references/contents.tpl:11
 msgid "Description"
 msgstr "Descripción"
@@ -2374,7 +2386,7 @@ msgstr "Los números pueden contener también comodínes"
 #: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
 #: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
 #: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
-#: html/index.php:217 ihtml/themes/altlinux/conflict.tpl:6
+#: html/index.php:231 ihtml/themes/altlinux/conflict.tpl:6
 #: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
 #: ihtml/themes/default/islocked.tpl:6
 msgid "Warning"
@@ -2787,7 +2799,7 @@ msgstr "Marcando conexión"
 #: plugins/addons/addressbook/class_addressbook.inc:359
 #: plugins/addons/addressbook/class_addressbook.inc:366
 #: plugins/addons/addressbook/class_addressbook.inc:370
-#: plugins/addons/addressbook/class_addressbook.inc:452
+#: plugins/addons/addressbook/class_addressbook.inc:453
 msgid "Dial"
 msgstr "Llamar"
 
@@ -2949,53 +2961,53 @@ msgstr "Salvar el contacto %s como una vcard"
 msgid "Send mail to %s"
 msgstr "Enviar correo a %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:464
+#: plugins/addons/addressbook/class_addressbook.inc:465
 msgid "global addressbook"
 msgstr "Directorio de contactos global"
 
-#: plugins/addons/addressbook/class_addressbook.inc:467
+#: plugins/addons/addressbook/class_addressbook.inc:468
 msgid "organizations user database"
 msgstr "bases de datos de organizaciones de usuarios"
 
-#: plugins/addons/addressbook/class_addressbook.inc:471
+#: plugins/addons/addressbook/class_addressbook.inc:472
 #, php-format
 msgid "Contact stored in %s"
 msgstr "Contacto guardado en %s"
 
-#: plugins/addons/addressbook/class_addressbook.inc:473
+#: plugins/addons/addressbook/class_addressbook.inc:474
 msgid "Creating new entry in"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/addons/addressbook/class_addressbook.inc:502
+#: plugins/addons/addressbook/class_addressbook.inc:503
 #: plugins/addons/logview/class_logview.inc:63
 #: plugins/addons/logview/class_logview.inc:77
 msgid "All"
 msgstr "Todo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/addressbook/class_addressbook.inc:504
 msgid "Work phone"
 msgstr "Teléfono del trabajo"
 
-#: plugins/addons/addressbook/class_addressbook.inc:503
+#: plugins/addons/addressbook/class_addressbook.inc:504
 msgid "Cell phone"
 msgstr "Móvil"
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "Home phone"
 msgstr "Teléfono particular"
 
-#: plugins/addons/addressbook/class_addressbook.inc:504
+#: plugins/addons/addressbook/class_addressbook.inc:505
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: plugins/addons/addressbook/class_addressbook.inc:576
+#: plugins/addons/addressbook/class_addressbook.inc:577
 msgid ""
 "Cannot create a unique DN for your entry. Please fill more formular fields."
 msgstr ""
 "No se puede crear un 'DN' único para esta entrada. Por favor rellene los "
 "campos del formulario."
 
-#: plugins/addons/addressbook/class_addressbook.inc:588
+#: plugins/addons/addressbook/class_addressbook.inc:589
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
@@ -3657,6 +3669,7 @@ msgstr ""
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_step2.tpl:13
 #: ihtml/themes/altlinux/setup_step3.tpl:18
+#: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_introduction.tpl:12
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
@@ -3777,7 +3790,7 @@ msgid "Variable"
 msgstr "Variable"
 
 #: plugins/admin/applications/class_applicationParameters.inc:87
-#: plugins/gofon/macro/parameter.tpl:12
+#: plugins/gofon/macro/parameter.tpl:9
 msgid "Default value"
 msgstr "Valor por defecto"
 
@@ -3807,7 +3820,7 @@ msgid "Path and/or binary name of application"
 msgstr "Ruta y nombre del binario de la aplicación"
 
 #: plugins/admin/applications/generic.tpl:18
-#: plugins/gofon/macro/generic.tpl:11
+#: plugins/gofon/macro/generic.tpl:10
 msgid "Display name"
 msgstr "Nombre mostrado"
 
@@ -3817,7 +3830,7 @@ msgstr ""
 "Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
 
 #: plugins/admin/applications/generic.tpl:35
-#: plugins/gofon/macro/generic.tpl:35
+#: plugins/gofon/macro/generic.tpl:22
 msgid "Choose subtree to place application in"
 msgstr "Elija lugar del árbol para colocar la aplicación"
 
@@ -3899,8 +3912,6 @@ msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
 #: plugins/admin/applications/class_applicationGeneric.inc:59
-#: plugins/gofon/macro/class_gofonMacro.inc:51
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:81
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
 
@@ -4129,43 +4140,29 @@ msgstr "Dirección IP"
 msgid "MAC-address"
 msgstr "Dirección MAC"
 
-#: plugins/admin/systems/class_winGeneric.inc:73
+#: plugins/admin/systems/class_winGeneric.inc:70
 #: plugins/admin/systems/class_componentGeneric.inc:48
 msgid "This 'dn' has no network features."
 msgstr "Esta 'dn' no tiene características de red."
 
-#: plugins/admin/systems/class_winGeneric.inc:136
+#: plugins/admin/systems/class_winGeneric.inc:134
 #: plugins/admin/systems/class_componentGeneric.inc:110
 #, fuzzy
 msgid "The required field 'Component name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/class_winGeneric.inc:139
-#: plugins/admin/systems/class_componentGeneric.inc:113
-#: plugins/admin/systems/class_phoneGeneric.inc:263
-#, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
-
-#: plugins/admin/systems/class_winGeneric.inc:142
-#: plugins/admin/systems/class_componentGeneric.inc:116
-#: plugins/admin/systems/class_phoneGeneric.inc:266
-#, fuzzy
-msgid "The required field 'IP-address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
-
-#: plugins/admin/systems/class_winGeneric.inc:149
+#: plugins/admin/systems/class_winGeneric.inc:148
 #: plugins/admin/systems/class_componentGeneric.inc:123
 msgid "You have no permissions to create a component on this 'Base'."
 msgstr "No tiene permisos para crear un componente en esta 'Base'."
 
-#: plugins/admin/systems/class_winGeneric.inc:159
+#: plugins/admin/systems/class_winGeneric.inc:158
 #: plugins/admin/systems/class_terminalGeneric.inc:236
 #: plugins/admin/systems/class_servGeneric.inc:180
 #: plugins/admin/systems/class_workstationGeneric.inc:242
 #: plugins/admin/systems/class_printGeneric.inc:136
 #: plugins/admin/systems/class_componentGeneric.inc:133
-#: plugins/admin/systems/class_phoneGeneric.inc:286
+#: plugins/admin/systems/class_phoneGeneric.inc:292
 #, php-format
 msgid "There is already an entry '%s' in the base choosen by you"
 msgstr "Ya hay una entrada '%s' en la base elegida"
@@ -4308,6 +4305,10 @@ msgstr "Por favor especifique un rango HSync valido"
 msgid "System management"
 msgstr "Gestión del sistema"
 
+#: plugins/admin/systems/class_servService.inc:179
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
 #: plugins/admin/systems/servservice.tpl:11
 msgid "Nfs Export"
 msgstr "Exportación NFS"
@@ -4375,7 +4376,7 @@ msgstr "Gráfico"
 #: plugins/admin/systems/class_terminalGeneric.inc:89
 #: plugins/admin/systems/class_servGeneric.inc:59
 #: plugins/admin/systems/class_workstationGeneric.inc:98
-#: plugins/admin/ogroups/class_termgroup.inc:55
+#: plugins/admin/ogroups/class_termgroup.inc:59
 msgid "No WAKECMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
 
@@ -4388,9 +4389,9 @@ msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
 #: 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:59
-#: plugins/admin/ogroups/class_termgroup.inc:71
-#: plugins/admin/ogroups/class_termgroup.inc:83
+#: plugins/admin/ogroups/class_termgroup.inc:63
+#: plugins/admin/ogroups/class_termgroup.inc:75
+#: plugins/admin/ogroups/class_termgroup.inc:87
 #, php-format
 msgid "Execution of '%s' failed!"
 msgstr "¡La ejecución de '%s' ha fallado!"
@@ -4398,35 +4399,35 @@ msgstr "¡La ejecución de '%s' ha fallado!"
 #: plugins/admin/systems/class_terminalGeneric.inc:101
 #: plugins/admin/systems/class_servGeneric.inc:71
 #: plugins/admin/systems/class_workstationGeneric.inc:110
-#: plugins/admin/ogroups/class_termgroup.inc:67
+#: plugins/admin/ogroups/class_termgroup.inc:71
 msgid "No REBOOTCMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'REBOOTCMD' en 'gosa.conf'"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:113
 #: plugins/admin/systems/class_servGeneric.inc:83
 #: plugins/admin/systems/class_workstationGeneric.inc:122
-#: plugins/admin/ogroups/class_termgroup.inc:79
+#: plugins/admin/ogroups/class_termgroup.inc:83
 msgid "No HALTCMD definition found in your gosa.conf"
 msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:144
 #: plugins/admin/systems/class_servGeneric.inc:112
 #: plugins/admin/systems/class_workstationGeneric.inc:152
-#: plugins/admin/ogroups/class_termgroup.inc:95
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Switch off"
 msgstr "Apagar"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:144
 #: plugins/admin/systems/class_servGeneric.inc:112
 #: plugins/admin/systems/class_workstationGeneric.inc:152
-#: plugins/admin/ogroups/class_termgroup.inc:95
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Reboot"
 msgstr "Reiniciar"
 
 #: plugins/admin/systems/class_terminalGeneric.inc:146
 #: plugins/admin/systems/class_servGeneric.inc:114
 #: plugins/admin/systems/class_workstationGeneric.inc:154
-#: plugins/admin/ogroups/class_termgroup.inc:95
+#: plugins/admin/ogroups/class_termgroup.inc:99
 msgid "Wake up"
 msgstr "Despertar"
 
@@ -4982,6 +4983,18 @@ msgstr "Mostrar terminal(es) del usuario"
 msgid "User name of which terminal(s) are shown"
 msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
 
+#: plugins/admin/systems/class_componentGeneric.inc:113
+#: plugins/admin/systems/class_phoneGeneric.inc:269
+#, fuzzy
+msgid "The required field 'MAC-address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+
+#: plugins/admin/systems/class_componentGeneric.inc:116
+#: plugins/admin/systems/class_phoneGeneric.inc:272
+#, fuzzy
+msgid "The required field 'IP-address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+
 #: plugins/admin/systems/service.tpl:4
 msgid "Keyboard"
 msgstr "Teclado"
@@ -5027,12 +5040,13 @@ msgid "Choose mouse port"
 msgstr "Elija el puerto del ratón"
 
 #: plugins/admin/systems/service.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:5
+#: plugins/gofon/phoneaccount/generic.tpl:22
 msgid "Telephone hardware"
 msgstr "Componente telefónico"
 
 #: plugins/admin/systems/service.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:9
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/generic.tpl:26
 msgid "Telephone"
 msgstr "Teléfono"
 
@@ -5300,43 +5314,43 @@ msgstr "Entradas de fstab adicionales"
 msgid "Add additional filesystems to be mounted during startup"
 msgstr "Añadir sistemas de archivos adicionales que serán montados al arrancar"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:100
+#: plugins/admin/systems/class_phoneGeneric.inc:104
 msgid "This 'dn' has no phone features."
 msgstr "Esta 'dn' no tiene características de teléfono."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:172
+#: plugins/admin/systems/class_phoneGeneric.inc:176
 #, fuzzy
 msgid "yes"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:172
+#: plugins/admin/systems/class_phoneGeneric.inc:176
 #, fuzzy
 msgid "no"
 msgstr "ninguno"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:244
-msgid "Wrong IP format in field goFonDefaultIP."
+#: plugins/admin/systems/class_phoneGeneric.inc:197
+msgid "dynamic"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:251
+#: plugins/admin/systems/class_phoneGeneric.inc:197
 #, fuzzy
-msgid "The given value for goFonQualify is not a valid number."
-msgstr "El valor de 'Tamaño de Cola' no es valido."
+msgid "Networksettings"
+msgstr "Configuración de red"
 
-#: plugins/admin/systems/class_phoneGeneric.inc:257
+#: plugins/admin/systems/class_phoneGeneric.inc:263
 #, fuzzy
 msgid "The required field 'Phone name' is not set."
 msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:260
+#: plugins/admin/systems/class_phoneGeneric.inc:266
 msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:269
+#: plugins/admin/systems/class_phoneGeneric.inc:275
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:276
+#: plugins/admin/systems/class_phoneGeneric.inc:282
 msgid "You have no permissions to create a phone on this 'Base'."
 msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
 
@@ -5353,14 +5367,16 @@ msgstr "Número de teléfono"
 #: plugins/admin/systems/phonesettings.tpl:10
 #: plugins/admin/systems/phonesettings.tpl:28
 #: plugins/admin/systems/phonesettings.tpl:38
-#: plugins/admin/systems/phonesettings.tpl:81
-#: plugins/admin/systems/phonesettings.tpl:112
-#: plugins/admin/systems/phonesettings.tpl:159
+#: plugins/admin/systems/phonesettings.tpl:52
+#: plugins/admin/systems/phonesettings.tpl:83
+#: plugins/admin/systems/phonesettings.tpl:114
+#: plugins/admin/systems/phonesettings.tpl:161
 #, fuzzy
 msgid "Choose a phone type"
 msgstr "Elija tipo de ratón"
 
 #: plugins/admin/systems/phonesettings.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:64
 msgid "refresh"
 msgstr ""
 
@@ -5370,59 +5386,59 @@ msgid "DTMF mode"
 msgstr "Modo"
 
 #: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:88
+#: plugins/admin/systems/phonesettings.tpl:90
 #, fuzzy
 msgid "Default IP"
 msgstr "por defecto"
 
-#: plugins/admin/systems/phonesettings.tpl:57
-#: plugins/admin/systems/phonesettings.tpl:96
+#: plugins/admin/systems/phonesettings.tpl:59
+#: plugins/admin/systems/phonesettings.tpl:98
 msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:80
 #, fuzzy
 msgid "Modus"
 msgstr "Ratón"
 
-#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:111
 msgid "Authtype"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:119
+#: plugins/admin/systems/phonesettings.tpl:121
 #, fuzzy
 msgid "Secret"
 msgstr "Calle"
 
-#: plugins/admin/systems/phonesettings.tpl:127
+#: plugins/admin/systems/phonesettings.tpl:129
 msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:135
+#: plugins/admin/systems/phonesettings.tpl:137
 msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:148
+#: plugins/admin/systems/phonesettings.tpl:150
 #, fuzzy
 msgid "Account code"
 msgstr "Cuenta"
 
-#: plugins/admin/systems/phonesettings.tpl:156
+#: plugins/admin/systems/phonesettings.tpl:158
 #, fuzzy
 msgid "Trunk lines"
 msgstr "Clientes Ligeros"
 
-#: plugins/admin/systems/phonesettings.tpl:171
+#: plugins/admin/systems/phonesettings.tpl:173
 #, fuzzy
 msgid "Hosts that are allowed to connect"
 msgstr "Equipos/Redes que son permitidos para hacer relay"
 
-#: plugins/admin/systems/phonesettings.tpl:186
+#: plugins/admin/systems/phonesettings.tpl:188
 #, fuzzy
 msgid "Hosts that are not allowed to connect"
 msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/systems/phonesettings.tpl:210
+#: plugins/admin/systems/phonesettings.tpl:212
 msgid "MSN"
 msgstr ""
 
@@ -5538,13 +5554,13 @@ msgstr "Estaciones de trabajo"
 msgid "Printer"
 msgstr "Impresora"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:150
+#: plugins/admin/ogroups/class_ogroupManagement.inc:149
 #, php-format
 msgid "You're about to delete the object group '%s'."
 msgstr "Has decidido eliminar el objeto grupo '%s'."
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:156
-#: plugins/admin/ogroups/class_ogroupManagement.inc:182
+#: plugins/admin/ogroups/class_ogroupManagement.inc:155
+#: plugins/admin/ogroups/class_ogroupManagement.inc:181
 msgid "You are not allowed to delete this object group!"
 msgstr "¡No tiene permisos para eliminar este objeto grupo!"
 
@@ -5635,50 +5651,87 @@ msgstr ""
 "cuando trabaja con un gran número de grupos."
 
 #: plugins/admin/ogroups/headpage.tpl:48
-msgid "Show empty groups"
-msgstr "Mostrar grupos vacios"
-
-#: plugins/admin/ogroups/headpage.tpl:49
 msgid "Show groups containing users"
 msgstr "Mostrar grupos que tienen usuarios"
 
-#: plugins/admin/ogroups/headpage.tpl:50
+#: plugins/admin/ogroups/headpage.tpl:49
 msgid "Show groups containing groups"
 msgstr "Mostrar grupos que contienen grupos"
 
-#: plugins/admin/ogroups/headpage.tpl:51
+#: plugins/admin/ogroups/headpage.tpl:50
 msgid "Show groups containing applications"
 msgstr "Mostrar grupos que contienen aplicaciones"
 
-#: plugins/admin/ogroups/headpage.tpl:52
+#: plugins/admin/ogroups/headpage.tpl:51
 msgid "Show groups containing departments"
 msgstr "Mostrar grupos que contienen departamentos"
 
-#: plugins/admin/ogroups/headpage.tpl:53
+#: plugins/admin/ogroups/headpage.tpl:52
 msgid "Show groups containing servers"
 msgstr "Mostrar grupos que contienen servidores"
 
-#: plugins/admin/ogroups/headpage.tpl:54
+#: plugins/admin/ogroups/headpage.tpl:53
 msgid "Show groups containing workstations"
 msgstr "Mostrar grupos que contienen estaciones de trabajo"
 
-#: plugins/admin/ogroups/headpage.tpl:55
+#: plugins/admin/ogroups/headpage.tpl:54
 msgid "Show groups containing terminals"
 msgstr "Mostrar grupos que contienen terminales"
 
-#: plugins/admin/ogroups/headpage.tpl:56
+#: plugins/admin/ogroups/headpage.tpl:55
 msgid "Show groups containing printers"
 msgstr "Mostrar grupos que contienen impresoras"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:114
+#: plugins/admin/ogroups/mail.tpl:7
+msgid "Mail distribution list"
+msgstr ""
+
+#: plugins/admin/ogroups/mail.tpl:11
+#, fuzzy
+msgid "Primary mail address for this distribution list"
+msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:38
+#, fuzzy
+msgid ""
+"This group has mail features enabled. You can disable them by clicking below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
+
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+#, fuzzy
+msgid ""
+"This group has mail features disabled. You can enable them by clicking below."
+msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:100
+#, fuzzy
+msgid "no macro"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:117
+#, fuzzy
+msgid "undefined"
+msgstr "sin definirse"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:209
+msgid ""
+"The macro you selected in the past, is no longer available for you, please "
+"choose another one."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:280
 msgid "This account has no phone extensions."
 msgstr "Esta cuenta no tiene extensiones telefónicas"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:124
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:290
 msgid "Remove phone account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:125
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:291
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -5686,11 +5739,11 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:127
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:293
 msgid "Create phone account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:128
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:294
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -5698,54 +5751,74 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:140
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
 msgid "Please enter a valid phone number!"
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:180
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:344
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:291
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:454
 #, php-format
 msgid "You need to specify at least one phone number!"
 msgstr "¡Necesita introducir al menos un número de teléfono!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:305
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:461
+#, php-format
+msgid "The given PIN is not valid, only numbers are allowed for this type."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:463
+#, php-format
+msgid "The given PIN is too short"
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:478
 #, php-format
 msgid "The number '%s' is no valid phone number!"
 msgstr "¡El número '%s' no es un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:308
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:481
 #, php-format
 msgid "The timeout '%s' contains invalid characters!"
 msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/gofon/phoneaccount/generic.tpl:16
-msgid "Answering machine"
-msgstr "Contestador automático"
-
-#: plugins/gofon/phoneaccount/generic.tpl:22
-#: plugins/gofon/phoneaccount/generic.tpl:25
-msgid "Deliver missed calls as mail"
-msgstr "Enviar llamadas perdidas como correo electrónico"
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:489
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:319
+#, fuzzy, php-format
+msgid "The parameter %s contains invalid char. '!,#' is used as delimiter"
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/gofon/phoneaccount/generic.tpl:39
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
 msgid "Phone numbers"
 msgstr "Números de teléfonos"
 
-#: plugins/gofon/phoneaccount/generic.tpl:56
+#: plugins/gofon/phoneaccount/generic.tpl:38
 msgid "Forward calls to"
 msgstr "Reenviar llamadas a"
 
-#: plugins/gofon/phoneaccount/generic.tpl:60
+#: plugins/gofon/phoneaccount/generic.tpl:40
+#: plugins/gofon/phoneaccount/generic.tpl:42
 msgid "Phone number"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/phoneaccount/generic.tpl:60
+#: plugins/gofon/phoneaccount/generic.tpl:42
 msgid "Timeout (s)"
 msgstr "Tiempo(s) excedido(s)"
 
+#: plugins/gofon/phoneaccount/generic.tpl:57
+#: plugins/gofon/phoneaccount/generic.tpl:59
+#, fuzzy
+msgid "Phone macro"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/phoneaccount/generic.tpl:75
+#, fuzzy
+msgid "Phone PIN"
+msgstr "Teléfono"
+
 #: plugins/gofon/phoneaccount/main.inc:120
 msgid "Phone settings"
 msgstr "Configuración telefónica"
@@ -5795,34 +5868,76 @@ msgstr "Duración"
 msgid "Phone reports"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/class_gofonMacro.inc:123
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:208
+#: plugins/gofon/macro/class_gofonMacro.inc:80
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:182
+#, fuzzy
+msgid "This 'dn' is no phone macro."
+msgstr "Esta 'dn' no tiene características de teléfono."
+
+#: plugins/gofon/macro/class_gofonMacro.inc:161
+#, fuzzy, php-format
+msgid "The given cn '%s' already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
+
+#: plugins/gofon/macro/class_gofonMacro.inc:166
+msgid "You must specify the 'Display Name' in order to save this macro"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacro.inc:171
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:132
+#: plugins/gofon/macro/class_gofonMacro.inc:180
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:7 plugins/gofon/macro/generic.tpl:8
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 #, fuzzy
 msgid "Macro name"
 msgstr "Nombre de la maquina"
 
-#: plugins/gofon/macro/generic.tpl:13
+#: plugins/gofon/macro/generic.tpl:12
 msgid "Macro name to be displayed"
 msgstr ""
 
-#: plugins/gofon/macro/generic.tpl:23
+#: plugins/gofon/macro/generic.tpl:43
 #, fuzzy
 msgid "Visible for user"
 msgstr "Lista de usuarios"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:159
+#: plugins/gofon/macro/generic.tpl:52
 #, fuzzy
-msgid "Refresh"
-msgstr "Referencias"
+msgid "Macro text"
+msgstr "Nombre de la maquina"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:229
+#, fuzzy
+msgid "String"
+msgstr "durante"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:230
+msgid "Combobox"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:231
+msgid "Bool"
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:237
+#, fuzzy
+msgid "Delete unused"
+msgstr "Borrar"
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:311
+#, php-format
+msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
+msgstr ""
+
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:324
+#, php-format
+msgid "The parameter %s has incorrect value for type bool."
+msgstr ""
 
 #: plugins/gofon/macro/headpage.tpl:6
 #, fuzzy
@@ -5855,12 +5970,12 @@ msgstr ""
 msgid "Display macros of department"
 msgstr "Mostrar los grupos de departamentos"
 
-#: plugins/gofon/macro/headpage.tpl:58
+#: plugins/gofon/macro/headpage.tpl:59
 #, fuzzy
 msgid "Display macros  matching"
 msgstr "Mostrar grupos que concuerden con"
 
-#: plugins/gofon/macro/headpage.tpl:61
+#: plugins/gofon/macro/headpage.tpl:62
 #, fuzzy
 msgid "Regular expression for matching macro names"
 msgstr "Expresión regular que concuerde con nombres de grupos"
@@ -5870,21 +5985,16 @@ msgstr "Expresión regular que concuerde con nombres de grupos"
 msgid "Phone macro management"
 msgstr "Gestión del sistema"
 
-#: plugins/gofon/macro/parameter.tpl:6
+#: plugins/gofon/macro/parameter.tpl:3
 #, fuzzy
-msgid "Number"
-msgstr "Noviembre"
+msgid "Argument"
+msgstr "Argumentos"
 
-#: plugins/gofon/macro/parameter.tpl:10
+#: plugins/gofon/macro/parameter.tpl:7
 #, fuzzy
 msgid "type"
 msgstr "Tipo"
 
-#: plugins/gofon/macro/parameter.tpl:14
-#, fuzzy
-msgid "Option"
-msgstr "Opciones"
-
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
 msgid "Phone macros"
@@ -5956,6 +6066,52 @@ msgstr "El equipo de GOsa"
 msgid "Welcome %s!"
 msgstr "¡Bienvenido %s!"
 
+#: include/php_setup.inc:71
+msgid "Generating this page caused the PHP interpreter to raise some errors!"
+msgstr ""
+"¡La generación de esta página provoca que el interprete PHP muestre algunos "
+"errores!"
+
+#: include/php_setup.inc:71 html/main.php:292
+msgid "Toggle information"
+msgstr "Información de intercambio"
+
+#: include/php_setup.inc:76
+msgid "PHP error"
+msgstr "Error PHP:"
+
+#: include/php_setup.inc:87
+msgid "class"
+msgstr "clase"
+
+#: include/php_setup.inc:93
+msgid "function"
+msgstr "Función"
+
+#: include/php_setup.inc:98
+msgid "static"
+msgstr "estatico"
+
+#: include/php_setup.inc:102
+msgid "method"
+msgstr "método"
+
+#: include/php_setup.inc:121
+msgid "Trace"
+msgstr "Traza"
+
+#: include/php_setup.inc:122
+msgid "File"
+msgstr "Archivo"
+
+#: include/php_setup.inc:122
+msgid "Line"
+msgstr "Linea"
+
+#: include/php_setup.inc:123
+msgid "Arguments"
+msgstr "Argumentos"
+
 #: include/functions.inc:272
 #, php-format
 msgid "Error when connecting the LDAP. Server said '%s'."
@@ -6069,59 +6225,13 @@ msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Versión de desarrollo de GOsa (Rev %s)"
 
-#: include/functions.inc:1559
-msgid "Generating this page caused the PHP interpreter to raise some errors!"
-msgstr ""
-"¡La generación de esta página provoca que el interprete PHP muestre algunos "
-"errores!"
-
-#: include/functions.inc:1559
-msgid "Toggle information"
-msgstr "Información de intercambio"
-
-#: include/functions.inc:1564
-msgid "PHP error"
-msgstr "Error PHP:"
-
-#: include/functions.inc:1575
-msgid "class"
-msgstr "clase"
-
-#: include/functions.inc:1581
-msgid "function"
-msgstr "Función"
-
-#: include/functions.inc:1586
-msgid "static"
-msgstr "estatico"
-
-#: include/functions.inc:1590
-msgid "method"
-msgstr "método"
-
-#: include/functions.inc:1607
-msgid "Trace"
-msgstr "Traza"
-
-#: include/functions.inc:1608
-msgid "File"
-msgstr "Archivo"
-
-#: include/functions.inc:1608
-msgid "Line"
-msgstr "Linea"
-
-#: include/functions.inc:1609
-msgid "Arguments"
-msgstr "Argumentos"
-
-#: include/class_mail-methods-cyrus.inc:38
+#: include/class_mail-methods-cyrus.inc:39
 msgid ""
 "Warning: Account has an invalid mailserver string! Please check the mail "
 "server settings in the mail tab."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:51
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
 "Warning: IMAP Server cannot be reached! If you save this account, some mail "
 "settings will not be stored on your server!"
@@ -6130,53 +6240,53 @@ msgstr ""
 "de los valores de la configuración del correo no serán guardados en el "
 "servidor"
 
-#: include/class_mail-methods-cyrus.inc:114
+#: include/class_mail-methods-cyrus.inc:115
 #, php-format
 msgid "Can't create IMAP mailbox. Server says '%s'."
 msgstr ""
 "No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:130
+#: include/class_mail-methods-cyrus.inc:131
 #, php-format
 msgid "Can't write IMAP quota. Server says '%s'."
 msgstr "No se puede activar una cuota IMAP. El error del servidor es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:141
-msgid ""
-"Warning: imap_getacl is not implemented, wouldn't modify acl informations."
+#: include/class_mail-methods-cyrus.inc:155
+#, fuzzy
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
 "Aviso: imap_getacl no ha sido implementado, no se modificara información "
 "sobre las listas de acceso."
 
-#: include/class_mail-methods-cyrus.inc:176
+#: include/class_mail-methods-cyrus.inc:173
 msgid "Warning: imap_getacl is not available, can't get imap permissions!"
 msgstr ""
 "Aviso: no esta disponible imap_getacl, ¡no se puede acceder a los permisos "
 "IMAP!"
 
-#: include/class_mail-methods-cyrus.inc:198
+#: include/class_mail-methods-cyrus.inc:195
 #, php-format
 msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
 "No se puede eliminar la carpeta de correo IMAP. El error del servidor es: '%"
 "s'"
 
-#: include/class_mail-methods-cyrus.inc:226
+#: include/class_mail-methods-cyrus.inc:223
 #, php-format
 msgid "Can't log into SIEVE server. Server says '%s'."
 msgstr "No se puede conectar al servidor SIEVE. El error del servidor es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:239
+#: include/class_mail-methods-cyrus.inc:236
 #, php-format
 msgid "Can't get sieve script. Server says '%s'."
 msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:310
+#: include/class_mail-methods-cyrus.inc:307
 #, php-format
 msgid "Can't send sieve script. Server says '%s'."
 msgstr "No puedo subir un 'script' SIEVE. El error del servidor es: '%s'"
 
-#: include/class_mail-methods-cyrus.inc:314
+#: include/class_mail-methods-cyrus.inc:311
 #, php-format
 msgid "Can't activate GOsa sieve script. Server says '%s'."
 msgstr ""
@@ -6256,7 +6366,7 @@ msgstr ""
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Error XML en 'gosa.conf': %s en la linea %d"
 
-#: include/class_config.inc:195 html/index.php:144
+#: include/class_config.inc:195 html/index.php:140
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
@@ -6297,7 +6407,7 @@ msgstr ""
 "Actualmente no esta soportada la creación automática del tipo '%s'. Por "
 "favor, informe de esto al equipo de desarrollo de GOsa."
 
-#: include/class_ldap.inc:630
+#: include/class_ldap.inc:631
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -6306,12 +6416,12 @@ msgstr ""
 "El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
 "en la linea %s"
 
-#: include/class_ldap.inc:643
+#: include/class_ldap.inc:644
 #, php-format
 msgid "The dn: '%s' (from line %s) already exists in the LDAP database."
 msgstr "El DN: '%s' (de la linea %s) ya existe en la base de datos LDAP."
 
-#: include/class_ldap.inc:659
+#: include/class_ldap.inc:660
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
@@ -6343,19 +6453,19 @@ msgstr "Fichero de configuración"
 msgid "No valid certificate loaded"
 msgstr ""
 
-#: include/functions_setup.inc:72
+#: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
 msgstr ""
 "No se pudo establecer la conexión al servidor LDAP. ¡No se pudo comprobar el "
 "esquema.!"
 
-#: include/functions_setup.inc:81 include/functions_setup.inc:90
+#: include/functions_setup.inc:107 include/functions_setup.inc:116
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 "No se pudo obtener la información del esquema del servidor. No se pudo "
 "comprobar el esquema."
 
-#: include/functions_setup.inc:110
+#: include/functions_setup.inc:136
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
@@ -6364,7 +6474,7 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no esta disponible en configuración de LDAP."
 
-#: include/functions_setup.inc:114
+#: include/functions_setup.inc:140
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
@@ -6372,84 +6482,84 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no tiene la versión %s"
 
-#: include/functions_setup.inc:118
+#: include/functions_setup.inc:145
 #, php-format
 msgid "Support for '%s' enabled"
 msgstr "Es soporte para '%s' esta activado"
 
-#: include/functions_setup.inc:128
+#: include/functions_setup.inc:155
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr ""
 "No se encuentra el objeto de clase (object class) requerido '%s' en la "
 "configuración del servidor LDAP."
 
-#: include/functions_setup.inc:132
+#: include/functions_setup.inc:159
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr "El objeto de clase (objectclass) requerido '%s' no tiene la versión %s"
 
-#: include/functions_setup.inc:141
+#: include/functions_setup.inc:170
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr ""
 "El soporte de SAMBA 3 se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:146
+#: include/functions_setup.inc:175
 msgid "SAMBA 3 support enabled"
 msgstr "Soporte de SAMBA 3 activado"
 
-#: include/functions_setup.inc:151
+#: include/functions_setup.inc:180
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr ""
 "El soporte de SAMBA 2 se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:156
+#: include/functions_setup.inc:185
 msgid "SAMBA 2 support enabled"
 msgstr "Soporte de SAMBA 2 activado"
 
-#: include/functions_setup.inc:162
+#: include/functions_setup.inc:191
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para pureftp se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:167
+#: include/functions_setup.inc:196
 msgid "Support for pureftp enabled"
 msgstr "Soporte de PUREFTP activado"
 
-#: include/functions_setup.inc:172
+#: include/functions_setup.inc:201
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para WebDAV se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:177
+#: include/functions_setup.inc:206
 msgid "Support for WebDAV enabled"
 msgstr "Soporte de WebDAV activado"
 
-#: include/functions_setup.inc:182
+#: include/functions_setup.inc:211
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para phpgroupware se encuentra desactivado, no parece haber "
 "esquemas instalados"
 
-#: include/functions_setup.inc:187
+#: include/functions_setup.inc:216
 msgid "Support for phpgroupware enabled"
 msgstr "El soporte para phpgroupware está activado"
 
-#: include/functions_setup.inc:192
+#: include/functions_setup.inc:221
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para gofon se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:197
+#: include/functions_setup.inc:226
 msgid "Support for gofon enabled"
 msgstr "Soporte de GOFON activado"
 
-#: include/functions_setup.inc:204
+#: include/functions_setup.inc:233
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -6457,31 +6567,31 @@ msgstr ""
 "El soporte para Kolab se encuentra desactivado, no parece haber esquemas "
 "instalados, cambiando el método de correo a cyrus"
 
-#: include/functions_setup.inc:212
+#: include/functions_setup.inc:241
 msgid "Support for Kolab enabled"
 msgstr "Soporte de KOLAB activado"
 
-#: include/functions_setup.inc:229
+#: include/functions_setup.inc:258
 msgid "OK"
 msgstr "Perfecto"
 
-#: include/functions_setup.inc:232
+#: include/functions_setup.inc:261
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: include/functions_setup.inc:234
+#: include/functions_setup.inc:263
 msgid "Failed"
 msgstr "Fallado"
 
-#: include/functions_setup.inc:251
+#: include/functions_setup.inc:280
 msgid "PHP setup inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.inc:252
+#: include/functions_setup.inc:281
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Comprobando la versión de PHP (>=4.1.0)"
 
-#: include/functions_setup.inc:253
+#: include/functions_setup.inc:282
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -6489,13 +6599,13 @@ msgstr ""
 "Debe tener una versión de PHP 4.1.0 o superior para el correcto "
 "funcionamiento de GOsa."
 
-#: include/functions_setup.inc:256
+#: include/functions_setup.inc:285
 msgid "Checking if register_globals is set to 'off'"
 msgstr ""
 "Comprobando si el registro de variables globales (register_globals) esta "
 "desactivado."
 
-#: include/functions_setup.inc:257
+#: include/functions_setup.inc:286
 msgid ""
 "register_globals is a PHP mechanism to register all global varibales to be "
 "accessible from scripts without changing the scope. This may be a security "
@@ -6505,37 +6615,37 @@ msgstr ""
 "que permite acceder a variables globales sin cambiar el ambito. Esto puede "
 "ser un problema de seguridad. GOsa funcionará en los dos modos."
 
-#: include/functions_setup.inc:260
+#: include/functions_setup.inc:289
 msgid "Checking for ldap module"
 msgstr "Comprobando los módulos de ldap"
 
-#: include/functions_setup.inc:261
+#: include/functions_setup.inc:290
 msgid "This is the main module used by GOsa and therefore really required."
 msgstr "Este es el módulo más usado por GOsa, es realmente requerido."
 
-#: include/functions_setup.inc:264
+#: include/functions_setup.inc:293
 #, fuzzy
 msgid "Checking for XML functions"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:265
+#: include/functions_setup.inc:294
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:268
+#: include/functions_setup.inc:297
 msgid "Checking for gettext support"
 msgstr "Comprobando el soporte de gettext"
 
-#: include/functions_setup.inc:269
+#: include/functions_setup.inc:298
 msgid "Gettext support is required for internationalized GOsa."
 msgstr ""
 "El soporte de gettext es requerido para la intenacionalización de GOsa."
 
-#: include/functions_setup.inc:271
+#: include/functions_setup.inc:300
 msgid "Checking for iconv support"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:272
+#: include/functions_setup.inc:301
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -6544,11 +6654,11 @@ msgstr ""
 "Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
 "tanto requerido."
 
-#: include/functions_setup.inc:275
+#: include/functions_setup.inc:304
 msgid "Checking for mhash module"
 msgstr "Comprobando por el módulo de mhash"
 
-#: include/functions_setup.inc:276
+#: include/functions_setup.inc:305
 msgid ""
 "To use SSHA encryption, you'll need this module. If you are just using crypt "
 "or md5 encryption, ignore this message. GOsa will run without it."
@@ -6556,11 +6666,11 @@ msgstr ""
 "Necesitará este módulo para usar crifrado SSHA. Si usted solo usa crypt o "
 "md5, ignore este mensaje. GOsa correra si él."
 
-#: include/functions_setup.inc:279
+#: include/functions_setup.inc:308
 msgid "Checking for imap module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:280
+#: include/functions_setup.inc:309
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -6568,11 +6678,11 @@ msgstr ""
 "El módulo de IMAP es necesario para comunicarse con el servidor IMAP. "
 "Obtiene el estado, crea y borra usuarios del correo."
 
-#: include/functions_setup.inc:283
+#: include/functions_setup.inc:312
 msgid "Checking for getacl in imap"
 msgstr "Comprobando por getacl en imap"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:313
 msgid ""
 "The getacl support is needed for shared folder permissions. The standard "
 "IMAP module is not capable of reading acl's. You need a recend PHP version "
@@ -6582,21 +6692,21 @@ msgstr ""
 "módulo IAMP estandar no es capaz de leer acls. Necesitará una versión "
 "reciente de PHP para obtener está caracteristica. "
 
-#: include/functions_setup.inc:287
+#: include/functions_setup.inc:316
 msgid "Checking for mysql module"
 msgstr "Comprobando el módulo de mysql"
 
-#: include/functions_setup.inc:288
+#: include/functions_setup.inc:317
 msgid "MySQL support is needed for reading GOfax reports from databases."
 msgstr ""
 "El soporte de MySQL es necesario para leer los repotes de GOfax de la base "
 "de datos."
 
-#: include/functions_setup.inc:291
+#: include/functions_setup.inc:320
 msgid "Checking for cups module"
 msgstr "Comprobando el módulo de cups"
 
-#: include/functions_setup.inc:292
+#: include/functions_setup.inc:321
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -6604,11 +6714,11 @@ msgstr ""
 "Para poder leer las impresoras disponibles a través del protocolo IPP, en "
 "vez de los archivos printcap, tiene que tener instalado el módulo de CUPS."
 
-#: include/functions_setup.inc:295
+#: include/functions_setup.inc:324
 msgid "Checking for kadm5 module"
 msgstr "Comprobando el módulo kadm5"
 
-#: include/functions_setup.inc:296
+#: include/functions_setup.inc:325
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -6616,25 +6726,25 @@ msgstr ""
 "Manejando usuarios en kerberos requiere el módulo kadm5 que esta disponible "
 "en la red PEAR."
 
-#: include/functions_setup.inc:299
+#: include/functions_setup.inc:328
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:300
+#: include/functions_setup.inc:329
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:309
+#: include/functions_setup.inc:338
 msgid "Checking for some additional programms"
 msgstr "Comprobando programas adicionales"
 
-#: include/functions_setup.inc:318
+#: include/functions_setup.inc:347
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Comprobando por ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:319
+#: include/functions_setup.inc:348
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -6642,11 +6752,11 @@ msgstr ""
 "ImageMagick se usa para convertir las imagenes de los usuarios para que "
 "encajen en el tamaño sugerido y el formato JPEG."
 
-#: include/functions_setup.inc:322
+#: include/functions_setup.inc:351
 msgid "Checking imagick module for PHP"
 msgstr "Comprobando el módulo PHP de imagick"
 
-#: include/functions_setup.inc:323
+#: include/functions_setup.inc:352
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
@@ -6654,11 +6764,11 @@ msgstr ""
 "ImageMagick se usa para convertir las imagenes de los usuarios para que "
 "encajen en el tamaño sugerido y tengan formato JPEG."
 
-#: include/functions_setup.inc:330
+#: include/functions_setup.inc:359
 msgid "Checking for fping utility"
 msgstr "Comprobando la herramienta fping"
 
-#: include/functions_setup.inc:331
+#: include/functions_setup.inc:360
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -6666,11 +6776,11 @@ msgstr ""
 "La herramienta fping solo se usa si tiene un entorno de terminales clientes "
 "delgados (thinclient)."
 
-#: include/functions_setup.inc:346
+#: include/functions_setup.inc:375
 msgid "Checking for a way to generate LM/NT password hashes"
 msgstr "Buscando una manera de generar hashes de contraseñas LM/NT"
 
-#: include/functions_setup.inc:347
+#: include/functions_setup.inc:376
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -6678,11 +6788,11 @@ msgstr ""
 "Para poder usar SAMBA 2/3, tiene que instalar algunos paquetes adicionales "
 "para generar los hashes de contraseñas."
 
-#: include/functions_setup.inc:360
+#: include/functions_setup.inc:389
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini comprobación -> session.auto_register"
 
-#: include/functions_setup.inc:361
+#: include/functions_setup.inc:390
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -6690,11 +6800,11 @@ msgstr ""
 "Para poder usar GOsa sin ningún problema la opción session.auto_register de "
 "su php.ini debe estar puesta en 'Off'."
 
-#: include/functions_setup.inc:364
+#: include/functions_setup.inc:393
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini comprobación -> implicit_flush"
 
-#: include/functions_setup.inc:365
+#: include/functions_setup.inc:394
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -6702,11 +6812,11 @@ msgstr ""
 "Esta opción controla el manejador de salida. Desactive esta opción para "
 "mejorar el rendimiento."
 
-#: include/functions_setup.inc:372
+#: include/functions_setup.inc:401
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini comprobación -> max_execution_time"
 
-#: include/functions_setup.inc:373
+#: include/functions_setup.inc:402
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -6714,11 +6824,11 @@ msgstr ""
 "El tiempo máximo de ejecución debe ser de al menos 30 segundos, algunas "
 "acciones pueden consumir mucho tiempo."
 
-#: include/functions_setup.inc:380
+#: include/functions_setup.inc:409
 msgid "php.ini check -> memory_limit"
 msgstr "pnp.ini comprobación -> memory_limit"
 
-#: include/functions_setup.inc:381
+#: include/functions_setup.inc:410
 #, fuzzy
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
@@ -6728,11 +6838,11 @@ msgstr ""
 "impredecibles! Una cantidad recomendada es 16Mb, para sitios con grandes "
 "cargas seria aún mayor."
 
-#: include/functions_setup.inc:385
+#: include/functions_setup.inc:414
 msgid "php.ini check -> expose_php"
 msgstr "php.ini comprobación -> expose_php"
 
-#: include/functions_setup.inc:386
+#: include/functions_setup.inc:415
 msgid ""
 "Increase the server security by setting expose_php to 'off'. PHP won't send "
 "any Information about the server you are running in this case."
@@ -6741,11 +6851,11 @@ msgstr ""
 "debería enviar ninguna información sobre el servidor sobre el que está "
 "funcionando en ningún caso."
 
-#: include/functions_setup.inc:390
+#: include/functions_setup.inc:419
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini comprobación -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:391
+#: include/functions_setup.inc:420
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -6753,11 +6863,11 @@ msgstr ""
 "Aumenta la seguridad de su servidor poniendo 'magic_quotes_gpc' en 'on'. PHP "
 "escapara en este caso todas las comillas que encuentre en las cadenas."
 
-#: include/functions_setup.inc:629
+#: include/functions_setup.inc:659
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Tiene que especificar un servidor ldap antes de continuar."
 
-#: include/functions_setup.inc:638 include/functions_setup.inc:720
+#: include/functions_setup.inc:668 include/functions_setup.inc:750
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -6765,8 +6875,8 @@ msgstr ""
 "No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
 "este accesible para GOsa."
 
-#: include/functions_setup.inc:652 include/functions_setup.inc:725
-#: include/functions_setup.inc:730
+#: include/functions_setup.inc:682 include/functions_setup.inc:755
+#: include/functions_setup.inc:760
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -6774,7 +6884,7 @@ msgstr ""
 "¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
 "asegure que este accesible para GOsa."
 
-#: include/functions_setup.inc:740
+#: include/functions_setup.inc:770
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
 "please check all informations twice"
@@ -6782,7 +6892,7 @@ msgstr ""
 "Conexión al servidor correcta, pero el servidor aparenta estar completamente "
 "vacíos, por favor compruebe la información de nuevo."
 
-#: include/functions_setup.inc:796
+#: include/functions_setup.inc:826
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -6790,13 +6900,20 @@ msgid ""
 msgstr ""
 "Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
 
-#: include/functions_setup.inc:827
+#: include/functions_setup.inc:857
+msgid ""
+"Can't read schema informations, GOsa needs to know your schema setup. Please "
+"verify that it is readable for GOsa"
+msgstr ""
+
+#: include/functions_setup.inc:866
 #, php-format
 msgid "Can't log into LDAP server. Reason was: %s."
 msgstr "No se puede conectar al servidor LDAP. El motivo fue: %s."
 
-#: include/functions_setup.inc:938 include/functions_setup.inc:961
-#: include/functions_setup.inc:970 html/index.php:162
+#: include/functions_setup.inc:976 include/functions_setup.inc:999
+#: include/functions_setup.inc:1008 html/index.php:176
+#: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
@@ -6830,7 +6947,7 @@ msgstr "La consulta a la base de datos ha fallado."
 msgid "Error: getcvard.php needs a parameter to export a vcard!"
 msgstr "Error: getcvard.php necesita un parametro para exportar a vcard."
 
-#: html/setup.php:75
+#: html/setup.php:86
 #, php-format
 msgid ""
 "Directory '%s' specified as smarty compile directory is not accessable, "
@@ -6839,7 +6956,7 @@ msgstr ""
 "El directorio '%s' especificado como directorio de compilación para smarty  "
 "no es accesible, ¡compruebe la existencia y los permisos de este directorio!"
 
-#: html/main.php:100
+#: html/main.php:96
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
 "administrator."
@@ -6847,47 +6964,66 @@ msgstr ""
 "'Register globals' está activado. No se permitirá ninguna entrada hasta que "
 "esto sea solucionado por un administrador."
 
-#: html/main.php:143
+#: html/main.php:139
 msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 "Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
 
-#: html/main.php:267
+#: html/main.php:263
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr "No se pudo encontrar ninguna definición de extensión para '%s'"
 
-#: html/index.php:57
+#: html/main.php:292
+#, fuzzy
+msgid ""
+"Generating this page caused the W3C conformance checker to raise some errors!"
+msgstr ""
+"¡La generación de esta página provoca que el interprete PHP muestre algunos "
+"errores!"
+
+#: html/index.php:53
 #, php-format
 msgid "GOsa configuration %s/gosa.conf is not readable. Aborted."
 msgstr ""
 "No se puede leer la configuración de GOsa (%s/gosa.conf). Se ha abortado la "
 "operación."
 
-#: html/index.php:79
+#: html/index.php:75
 #, php-format
 msgid "Directory '%s' specified as compile directory is not accessable!"
 msgstr ""
 "El directorio '%s' especificado como directorio de compilación no es "
 "accesible."
 
-#: html/index.php:170
+#: html/index.php:148
+msgid ""
+"GOsa cannot retrieve information about the installed schema files. Please "
+"make sure, that this is possible."
+msgstr ""
+
+#: html/index.php:156
+msgid ""
+"Your ldap setup contains old schema definitions. Please re-run the setup."
+msgstr ""
+
+#: html/index.php:184
 msgid "Please specify a valid username!"
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: html/index.php:172
+#: html/index.php:186
 msgid "Please specify your password!"
 msgstr "Por favor especifique su contraseña."
 
-#: html/index.php:179
+#: html/index.php:193
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/index.php:217
+#: html/index.php:231
 msgid "Session will not be encrypted."
 msgstr "La sesion no sera encriptada."
 
-#: html/index.php:217
+#: html/index.php:231
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
@@ -6904,7 +7040,7 @@ msgstr ""
 msgid "next"
 msgstr "texto"
 
-#: html/helpviewer.php:144
+#: html/helpviewer.php:141
 #, php-format
 msgid ""
 "Can't read any helpfiles from ' %s ', possibly there is no help available."
@@ -6966,6 +7102,7 @@ msgstr ""
 "Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
 
 #: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: ihtml/themes/altlinux/setup_useradmin.tpl:22
 #: ihtml/themes/default/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:26 ihtml/themes/default/login.tpl:30
 msgid "Username"
@@ -7207,7 +7344,7 @@ msgid "Mail method"
 msgstr "Método de correo"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:100
-#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/default/setup_step4.tpl:115
 msgid "Check"
 msgstr "Comprobación"
 
@@ -7267,10 +7404,12 @@ msgstr ""
 msgid "Retry"
 msgstr "Reintentar"
 
+#: ihtml/themes/altlinux/setup_useradmin.tpl:3
 #: ihtml/themes/default/setup_useradmin.tpl:3
 msgid "You already have an Administrative Account and a Group."
 msgstr "Ya tiene una cuenta y un grupo administrativo."
 
+#: ihtml/themes/altlinux/setup_useradmin.tpl:10
 #: ihtml/themes/default/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
@@ -7283,6 +7422,28 @@ msgstr ""
 "configuración puede ayudarle en esta tarea. Introduzca el nombre y "
 "contraseñas deseadas para crear las entradas necesarias."
 
+#: ihtml/themes/default/setup_step4.tpl:100
+msgid ""
+"GOsa may cause PHP interpreter errors, particularly in case of Beta "
+"versions. In some cases it would be helpful to enable the error reporting. "
+"(But it could be a security risk)  "
+msgstr ""
+
+#: ihtml/themes/default/setup_step4.tpl:104
+#, fuzzy
+msgid "Display PHP errors"
+msgstr "Error PHP:"
+
+#: ihtml/themes/default/setup_step4.tpl:107
+#, fuzzy
+msgid "true"
+msgstr "Futuro"
+
+#: ihtml/themes/default/setup_step4.tpl:108
+#, fuzzy
+msgid "false"
+msgstr "mujer"
+
 #: ihtml/themes/default/help.tpl:9
 msgid "GOsa help viewer"
 msgstr ""
@@ -7291,6 +7452,35 @@ msgstr ""
 msgid "Index"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Telefon PIN"
+#~ msgstr "Teléfono"
+
+#~ msgid "Show empty groups"
+#~ msgstr "Mostrar grupos vacios"
+
+#, fuzzy
+#~ msgid "The given value for goFonQualify is not a valid number."
+#~ msgstr "El valor de 'Tamaño de Cola' no es valido."
+
+#~ msgid "Answering machine"
+#~ msgstr "Contestador automático"
+
+#~ msgid "Deliver missed calls as mail"
+#~ msgstr "Enviar llamadas perdidas como correo electrónico"
+
+#, fuzzy
+#~ msgid "Refresh"
+#~ msgstr "Referencias"
+
+#, fuzzy
+#~ msgid "Number"
+#~ msgstr "Noviembre"
+
+#, fuzzy
+#~ msgid "Option"
+#~ msgstr "Opciones"
+
 #~ msgid "Select to see users that have ftp settings"
 #~ msgstr "Selecctione para ver los usuarios que tienen configuraciones de ftp"