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 42ef06572b87643b802c350beab1c24e2376785a..c534804aceeed9f10c1940282c3092d1b54a275c 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -19,495 +19,516 @@ msgstr ""
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: contrib/gosa.conf:28
+#: contrib/gosa.conf:30
 msgid "Administration"
 msgstr "Administradores"
 
-#: contrib/gosa.conf:57
+#: contrib/gosa.conf:59
 msgid "Addons"
 msgstr "Agregados"
 
-#: contrib/gosa.conf:74 contrib/gosa.conf:87 contrib/gosa.conf:96
-#: contrib/gosa.conf:102 contrib/gosa.conf:107 contrib/gosa.conf:113
-#: contrib/gosa.conf:122 contrib/gosa.conf:138 contrib/gosa.conf:147
-#: contrib/gosa.conf:152 contrib/gosa.conf:157 contrib/gosa.conf:162
-#: contrib/gosa.conf:167 contrib/gosa.conf:172
+#: contrib/gosa.conf:76 contrib/gosa.conf:90 contrib/gosa.conf:99
+#: contrib/gosa.conf:105 contrib/gosa.conf:110 contrib/gosa.conf:116
+#: contrib/gosa.conf:125 contrib/gosa.conf:141 contrib/gosa.conf:150
+#: contrib/gosa.conf:155 contrib/gosa.conf:160 contrib/gosa.conf:165
+#: contrib/gosa.conf:170 contrib/gosa.conf:175
 #: plugins/personal/mail/generic.tpl:4 plugins/personal/posix/generic.tpl:4
 #: plugins/personal/samba/samba2.tpl:6 plugins/personal/samba/samba3.tpl:6
 #: plugins/personal/generic/class_user.inc:16
 #: plugins/gofax/blocklists/generic.tpl:1
-#: plugins/gofax/faxaccount/generic.tpl:6 plugins/admin/fai/faiVariable.tpl:4
+#: plugins/gofax/faxaccount/generic.tpl:6
+#: plugins/gofax/faxaccount/paste_generic.tpl:4
 #: plugins/admin/fai/faiPartitionTable.tpl:4
+#: plugins/admin/fai/faiVariable.tpl:4 plugins/admin/fai/faiScriptEntry.tpl:5
+#: plugins/admin/fai/faiPackage.tpl:4 plugins/admin/fai/faiProfile.tpl:4
+#: plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-#: plugins/admin/fai/faiScriptEntry.tpl:5 plugins/admin/fai/faiPackage.tpl:4
-#: plugins/admin/fai/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiScript.tpl:4 plugins/admin/fai/faiVariableEntry.tpl:5
 #: plugins/admin/fai/faiTemplate.tpl:4 plugins/admin/fai/faiHookEntry.tpl:5
 #: plugins/admin/fai/faiTemplateEntry.tpl:3 plugins/admin/fai/faiHook.tpl:4
-#: plugins/admin/groups/mail.tpl:7 plugins/admin/systems/glpi.tpl:6
-#: plugins/admin/systems/glpiPrinter.tpl:6
-#: plugins/admin/systems/servdnseditzone.tpl:1
+#: plugins/admin/groups/mail.tpl:7
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:4
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:34
+#: plugins/admin/systems/glpi.tpl:6 plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:1
 #: plugins/generic/references/class_reference.inc:20
 msgid "Generic"
 msgstr "Genérico"
 
-#: contrib/gosa.conf:75
+#: contrib/gosa.conf:77
 msgid "Unix"
 msgstr "Unix"
 
-#: contrib/gosa.conf:76 contrib/gosa.conf:88
+#: contrib/gosa.conf:78 contrib/gosa.conf:91
 #: plugins/personal/environment/class_environment.inc:12
-#: plugins/admin/groups/class_groupManagement.inc:515
-#: plugins/admin/users/class_userManagement.inc:859
+#: plugins/admin/groups/class_groupManagement.inc:466
+#: plugins/admin/users/class_userManagement.inc:767
 msgid "Environment"
 msgstr "Entorno"
 
-#: contrib/gosa.conf:77 contrib/gosa.conf:90
+#: contrib/gosa.conf:79 contrib/gosa.conf:93
 #: plugins/personal/mail/class_mailAccount.inc:22
-#: plugins/admin/groups/class_groupManagement.inc:503
-#: plugins/admin/users/class_userManagement.inc:861
+#: plugins/admin/groups/class_groupManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:769
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
 #: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:484
+#: plugins/admin/ogroups/class_ogroupManagement.inc:492
 #: plugins/generic/references/class_reference.inc:24
 msgid "Mail"
 msgstr "Correo Electrónico"
 
-#: contrib/gosa.conf:78 plugins/personal/samba/class_sambaAccount.inc:24
-#: plugins/admin/groups/class_groupManagement.inc:506
-#: plugins/admin/users/class_userManagement.inc:867
+#: contrib/gosa.conf:80 plugins/personal/samba/class_sambaAccount.inc:24
+#: plugins/admin/groups/class_groupManagement.inc:457
+#: plugins/admin/users/class_userManagement.inc:775
 #: plugins/generic/references/class_reference.inc:26
 #: plugins/generic/references/class_reference.inc:28
 msgid "Samba"
 msgstr "Samba"
 
-#: contrib/gosa.conf:79 plugins/personal/connectivity/main.inc:139
+#: contrib/gosa.conf:81 plugins/personal/netatalk/class_netatalk.inc:36
+#: plugins/admin/users/class_userManagement.inc:777
+msgid "Netatalk"
+msgstr ""
+
+#: contrib/gosa.conf:82 plugins/personal/connectivity/main.inc:139
 #: plugins/personal/connectivity/class_connectivity.inc:15
 msgid "Connectivity"
 msgstr "Conectividad"
 
-#: contrib/gosa.conf:80 plugins/personal/generic/generic.tpl:267
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:267
 #: plugins/personal/generic/generic.tpl:398
 #: plugins/gofax/faxaccount/generic.tpl:10
+#: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:865
+#: plugins/admin/users/class_userManagement.inc:773
 #: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:39 html/getxls.php:174
 #: html/getxls.php:236
 msgid "Fax"
 msgstr "Fax"
 
-#: contrib/gosa.conf:81 plugins/personal/generic/generic.tpl:250
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:250
 #: plugins/personal/generic/generic.tpl:388
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_edit.tpl:85
-#: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/admin/groups/class_groupManagement.inc:512
-#: plugins/admin/users/class_userManagement.inc:863
+#: plugins/addons/addressbook/address_edit.tpl:85
+#: plugins/addons/addressbook/address_edit.tpl:195
+#: plugins/admin/groups/class_groupManagement.inc:463
+#: plugins/admin/users/class_userManagement.inc:771
 #: plugins/admin/departments/generic.tpl:59
-#: plugins/admin/systems/class_systemManagement.inc:921
 #: plugins/admin/systems/chooser.tpl:12
+#: plugins/admin/systems/class_systemManagement.inc:886
 #: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:588
+#: plugins/admin/ogroups/class_ogroupManagement.inc:596
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:6
 #: plugins/generic/references/class_reference.inc:40
 msgid "Phone"
 msgstr "Teléfono"
 
-#: contrib/gosa.conf:82 plugins/personal/nagios/class_nagiosAccount.inc:18
+#: contrib/gosa.conf:85 plugins/personal/nagios/class_nagiosAccount.inc:18
 msgid "Nagios"
 msgstr ""
 
-#: contrib/gosa.conf:83 contrib/gosa.conf:92 contrib/gosa.conf:98
-#: contrib/gosa.conf:103 contrib/gosa.conf:109 contrib/gosa.conf:118
-#: contrib/gosa.conf:134 contrib/gosa.conf:143 contrib/gosa.conf:148
-#: contrib/gosa.conf:153 contrib/gosa.conf:158 contrib/gosa.conf:163
-#: contrib/gosa.conf:168 contrib/gosa.conf:173
+#: contrib/gosa.conf:86 contrib/gosa.conf:95 contrib/gosa.conf:101
+#: contrib/gosa.conf:106 contrib/gosa.conf:112 contrib/gosa.conf:121
+#: contrib/gosa.conf:137 contrib/gosa.conf:146 contrib/gosa.conf:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
+#: contrib/gosa.conf:171 contrib/gosa.conf:176
 msgid "References"
 msgstr "Referencias"
 
-#: contrib/gosa.conf:89
+#: contrib/gosa.conf:92
 #: plugins/admin/applications/class_applicationManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:57
 msgid "Applications"
 msgstr "Aplicaciones"
 
-#: contrib/gosa.conf:91
+#: contrib/gosa.conf:94
 msgid "ACL"
 msgstr "ACL"
 
-#: contrib/gosa.conf:97 plugins/admin/applications/generic.tpl:66
-#: plugins/admin/systems/class_servRepository.inc:244
+#: contrib/gosa.conf:100 plugins/admin/applications/generic.tpl:67
 #: plugins/admin/systems/printerPPDDialog.tpl:17
+#: plugins/admin/systems/class_servRepository.inc:250
 #: plugins/admin/ogroups/phonequeue.tpl:31
 #: plugins/gofon/conference/generic.tpl:87
 msgid "Options"
 msgstr "Opciones"
 
-#: contrib/gosa.conf:108 plugins/gofon/phoneaccount/class_phoneAccount.inc:653
+#: contrib/gosa.conf:111 plugins/gofon/phoneaccount/class_phoneAccount.inc:654
 #, fuzzy
 msgid "Parameter"
 msgstr "Parametros de inicio"
 
-#: contrib/gosa.conf:114 contrib/gosa.conf:139
+#: contrib/gosa.conf:117 contrib/gosa.conf:142
 #: plugins/admin/ogroups/tabs_ogroups.inc:92
 msgid "Startup"
 msgstr "Inicio"
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
+#: contrib/gosa.conf:118 contrib/gosa.conf:143
 #: plugins/admin/ogroups/tabs_ogroups.inc:96
 msgid "Devices"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:116 contrib/gosa.conf:141
-#: plugins/personal/environment/environment.tpl:172
-#: plugins/admin/systems/class_systemManagement.inc:927
+#: contrib/gosa.conf:119 contrib/gosa.conf:144
+#: plugins/personal/environment/environment.tpl:173
+#: plugins/admin/systems/class_systemManagement.inc:892
 #: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:591
+#: plugins/admin/ogroups/class_ogroupManagement.inc:599
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Impresora"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
+#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
 #: plugins/gofax/blocklists/generic.tpl:70
 #: plugins/gofax/blocklists/headpage.tpl:20
 #: plugins/addons/addressbook/contents.tpl:33
-#: plugins/addons/godfs/contents.tpl:22
-#: plugins/admin/fai/faiProfileEntry.tpl:21
-#: plugins/admin/fai/faiPackageEntry.tpl:22 plugins/admin/fai/headpage.tpl:20
+#: plugins/admin/fai/faiProfileEntry.tpl:21 plugins/admin/fai/headpage.tpl:20
+#: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/admin/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
 #: plugins/admin/applications/headpage.tpl:20
 #: plugins/admin/departments/headpage.tpl:20
+#: plugins/admin/systems/headpage.tpl:20
 #: plugins/admin/systems/glpiPrinter.tpl:104
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/servRepository.tpl:24
+#: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/admin/systems/glpiSelectUser.tpl:20
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
-#: plugins/admin/systems/glpiAttachmentPool.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
 #: plugins/gofon/conference/headpage.tpl:20
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:22
-#: ihtml/themes/default/MultiSelectWindow.tpl:22
+#: ihtml/themes/default/MultiSelectWindow.tpl:23
+#: ihtml/themes/default/MultiSelectWindow.tpl:58
 msgid "Information"
 msgstr "Información"
 
-#: contrib/gosa.conf:123
+#: contrib/gosa.conf:126
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:127 plugins/admin/systems/servkolab.tpl:7
 msgid "Services"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
+#: contrib/gosa.conf:133 contrib/gosa.conf:135
 #: plugins/admin/fai/faiPackage.tpl:29
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #, fuzzy
 msgid "Repository"
 msgstr "Reintentar"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:186
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexportxls.tpl:19
-#: plugins/addons/ldapmanager/contentexportxls.tpl:32
-#: plugins/addons/ldapmanager/contentexportxls.tpl:47
-#: plugins/addons/ldapmanager/contentexport.tpl:16
+#: contrib/gosa.conf:198 plugins/addons/ldapmanager/contentexport.tpl:16
 #: plugins/addons/ldapmanager/contentexport.tpl:29
 #: plugins/addons/ldapmanager/contentexport.tpl:44
+#: plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: plugins/addons/ldapmanager/contentexportxls.tpl:32
+#: plugins/addons/ldapmanager/contentexportxls.tpl:47
 msgid "Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:199
 #, fuzzy
 msgid "Excel Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:200 plugins/personal/mail/generic.tpl:113
 #: plugins/personal/environment/logonManagement.tpl:65
 #: plugins/addons/ldapmanager/contentimport.tpl:49
 #: plugins/addons/ldapmanager/contentcsv.tpl:109
 #: plugins/addons/ldapmanager/contentcsv.tpl:112
-#: plugins/admin/applications/generic.tpl:94
+#: plugins/admin/applications/generic.tpl:95
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:201
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:205
 #, fuzzy
 msgid "Partitions"
 msgstr "Destino"
 
-#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:209 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
-#: plugins/admin/applications/generic.tpl:92
+#: plugins/admin/applications/generic.tpl:93
 #, fuzzy
 msgid "Script"
 msgstr "Ruta del Script"
 
-#: contrib/gosa.conf:210 plugins/admin/fai/class_faiManagement.inc:767
-#: plugins/admin/fai/class_faiManagement.inc:768
+#: contrib/gosa.conf:213 plugins/admin/fai/class_faiManagement.inc:768
+#: plugins/admin/fai/class_faiManagement.inc:769
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
-#: plugins/admin/fai/class_faiManagement.inc:761
+#: contrib/gosa.conf:217 plugins/admin/fai/class_faiManagement.inc:761
+#: plugins/admin/fai/class_faiManagement.inc:762
 #, fuzzy
 msgid "Variables"
 msgstr "Variable"
 
-#: contrib/gosa.conf:218 plugins/admin/fai/class_faiManagement.inc:781
-#: plugins/admin/fai/class_faiManagement.inc:782
+#: contrib/gosa.conf:221 plugins/admin/fai/class_faiManagement.inc:782
+#: plugins/admin/fai/class_faiManagement.inc:783
 #, fuzzy
 msgid "Templates"
 msgstr "Plantilla"
 
-#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:225 plugins/personal/environment/environment.tpl:7
 #, fuzzy
 msgid "Profiles"
 msgstr "Ruta del Perfil"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:229
 #, fuzzy
 msgid "Packages"
 msgstr "Mostrar teléfonos"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:252
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:270 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:271
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:272
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:273
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:274
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:275
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:276
 msgid "Italian"
 msgstr "Italiano"
 
-#: plugins/personal/nagios/nagios.tpl:4
-#, fuzzy
-msgid "Nagios Account"
-msgstr "Contacto"
-
-#: plugins/personal/nagios/nagios.tpl:7
-#, fuzzy
-msgid "Alias"
-msgstr "Italiano"
-
-#: plugins/personal/nagios/nagios.tpl:12
-#: plugins/admin/systems/servdnseditzone.tpl:47 html/getxls.php:174
-#, fuzzy
-msgid "Mail address"
-msgstr "Dirección MAC"
-
-#: plugins/personal/nagios/nagios.tpl:17
-#, fuzzy
-msgid "Host notification period"
-msgstr "Opciones de aplicaciones"
-
-#: plugins/personal/nagios/nagios.tpl:25
-#, fuzzy
-msgid "Service notification period"
-msgstr "Opciones de aplicaciones"
+#: plugins/personal/nagios/class_nagiosAccount.inc:19
+#: plugins/personal/mail/class_mailAccount.inc:23
+#: plugins/personal/password/class_password.inc:6
+#: plugins/personal/posix/class_posixAccount.inc:17
+#: plugins/personal/samba/class_sambaAccount.inc:25
+#: plugins/personal/environment/class_environment.inc:13
+#: plugins/personal/generic/class_user.inc:17
+#: plugins/personal/connectivity/class_webdavAccount.inc:7
+#: plugins/personal/connectivity/class_proxyAccount.inc:6
+#: plugins/personal/connectivity/class_intranetAccount.inc:16
+#: plugins/personal/connectivity/class_phpgwAccount.inc:6
+#: plugins/personal/connectivity/class_kolabAccount.inc:6
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
+#: plugins/personal/connectivity/class_connectivity.inc:16
+#: plugins/personal/connectivity/class_pptpAccount.inc:27
+#: plugins/personal/connectivity/class_opengwAccount.inc:7
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
+#: plugins/gofax/faxreports/class_faxreport.inc:7
+#: plugins/addons/addressbook/class_addressbook.inc:7
+#: plugins/addons/ldapmanager/class_csvimport.inc:7
+#: plugins/addons/ldapmanager/class_import.inc:7
+#: plugins/addons/ldapmanager/class_ldif.inc:8
+#: plugins/addons/ldapmanager/class_export.inc:7
+#: plugins/addons/ldapmanager/class_exportxls.inc:8
+#: plugins/addons/logview/class_logview.inc:7
+#: plugins/addons/mailqueue/class_mailqueue.inc:7
+#: plugins/admin/groups/class_groupManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:29
+#: plugins/admin/applications/class_applicationManagement.inc:26
+#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/systems/class_systemManagement.inc:33
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
+#: plugins/gofon/fonreports/class_fonreport.inc:7
+msgid "This does something"
+msgstr "Esto hace algo"
 
-#: plugins/personal/nagios/nagios.tpl:32
+#: plugins/personal/nagios/class_nagiosAccount.inc:92
 #, fuzzy
-msgid "Service notification options"
-msgstr "Opciones de aplicaciones"
+msgid "This account has no nagios extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
 
-#: plugins/personal/nagios/nagios.tpl:41
+#: plugins/personal/nagios/class_nagiosAccount.inc:101
 #, fuzzy
-msgid "Host notification options"
-msgstr "Opciones de aplicaciones"
-
-#: plugins/personal/nagios/nagios.tpl:48
-#: plugins/personal/generic/generic.tpl:261
-#: plugins/addons/addressbook/address_edit.tpl:217
-#: plugins/addons/addressbook/address_info.tpl:91 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Pager"
-msgstr "Dispositivo de aviso"
+msgid "Remove nagios account"
+msgstr "Borrar cuenta de correo"
 
-#: plugins/personal/nagios/nagios.tpl:53
+#: plugins/personal/nagios/class_nagiosAccount.inc:102
 #, fuzzy
-msgid "Service notification commands"
-msgstr "Opciones de aplicaciones"
+msgid ""
+"This account has nagios features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
 
-#: plugins/personal/nagios/nagios.tpl:57
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 #, fuzzy
-msgid "Host notification commands"
-msgstr "Opciones de aplicaciones"
+msgid "Create nagios account"
+msgstr "Crear cuenta de correo"
 
-#: plugins/personal/nagios/nagios.tpl:66
+#: plugins/personal/nagios/class_nagiosAccount.inc:104
 #, fuzzy
-msgid "Nagios authentification"
-msgstr "Estación de trabajo Windows"
+msgid ""
+"This account has nagios features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
 
-#: plugins/personal/nagios/nagios.tpl:69
+#: plugins/personal/nagios/class_nagiosAccount.inc:167
 #, fuzzy
-msgid "view system informations"
-msgstr "Información de sistema"
+msgid "The required field 'NagiosAlias' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/nagios/nagios.tpl:72
+#: plugins/personal/nagios/class_nagiosAccount.inc:170
 #, fuzzy
-msgid "view configuration information"
-msgstr "Información organizativa"
-
-#: plugins/personal/nagios/nagios.tpl:75
-msgid "trigger system commands"
-msgstr ""
+msgid "The required field 'NagiosMail' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/nagios/nagios.tpl:78
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:178
 #, fuzzy
-msgid "view all services"
-msgstr "Provee servicios de exploración"
-
-#: plugins/personal/nagios/nagios.tpl:81
-msgid "view all hosts"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:83
-msgid "trigger all service commands"
-msgstr ""
-
-#: plugins/personal/nagios/nagios.tpl:86
-msgid "trigger all host commands"
+msgid "Please enter a valid email address in 'NagiosMail' field."
 msgstr ""
+"Por favor introduzca una dirección valida de correo electrónico en el campo "
+"'Cuenta Principal'."
 
 #: plugins/personal/nagios/main.inc:104 plugins/personal/mail/main.inc:104
 #: plugins/personal/posix/main.inc:110 plugins/personal/samba/main.inc:104
+#: plugins/personal/environment/hotplugDialogNew.tpl:38
 #: plugins/personal/environment/main.inc:104
+#: plugins/personal/generic/generic_picture.tpl:33
 #: plugins/personal/generic/generic_certs.tpl:76
 #: plugins/personal/generic/main.inc:158
 #: plugins/personal/connectivity/main.inc:118
 #: plugins/gofax/blocklists/generic.tpl:80
 #: plugins/gofax/faxaccount/main.inc:89
-#: plugins/addons/godfs/class_dfsManagment.inc:217
-#: plugins/admin/fai/class_faiManagement.inc:605
-#: plugins/admin/groups/class_groupManagement.inc:412
-#: plugins/admin/users/class_userManagement.inc:720
-#: plugins/admin/applications/class_applicationManagement.inc:430
-#: plugins/admin/departments/class_departmentManagement.inc:367
-#: plugins/admin/systems/class_systemManagement.inc:720
-#: plugins/admin/ogroups/class_ogroupManagement.inc:400
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:300
+#: plugins/addons/addressbook/address_edit.tpl:233
+#: plugins/admin/fai/class_faiManagement.inc:606
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/groups/class_groupManagement.inc:372
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/applications/class_applicationManagement.inc:403
+#: plugins/admin/departments/class_departmentManagement.inc:372
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/servnfs.tpl:97
+#: plugins/admin/systems/class_systemManagement.inc:684
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servdnseditzone.tpl:121
+#: plugins/admin/ogroups/class_ogroupManagement.inc:408
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:305
 #: plugins/gofon/phoneaccount/main.inc:105
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
-#: ihtml/themes/default/copyPasteDialog.tpl:20
-msgid "Finish"
-msgstr "Terminar"
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:264
+#: include/class_MultiSelectWindow.inc:61
+#: ihtml/themes/default/copyPasteDialog.tpl:14
+msgid "Save"
+msgstr "Guardar"
 
 #: plugins/personal/nagios/main.inc:106 plugins/personal/mail/main.inc:106
 #: plugins/personal/mail/mail_locals.tpl:43
+#: plugins/personal/posix/posix_groups.tpl:71
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/posix_groups.tpl:67
-#: plugins/personal/posix/main.inc:112 plugins/personal/samba/main.inc:106
+#: plugins/personal/posix/main.inc:112
 #: plugins/personal/samba/samba3_workstations.tpl:41
-#: plugins/personal/environment/main.inc:106
+#: plugins/personal/samba/main.inc:106
 #: plugins/personal/environment/hotplugDialog.tpl:64
 #: plugins/personal/environment/selectPrinterDialog.tpl:61
 #: plugins/personal/environment/logonManagement.tpl:76
 #: plugins/personal/environment/hotplugDialogNew.tpl:39
+#: plugins/personal/environment/main.inc:106
 #: plugins/personal/generic/password.tpl:19
 #: plugins/personal/generic/generic_picture.tpl:35
 #: plugins/personal/generic/generic_certs.tpl:78
 #: plugins/personal/generic/main.inc:160
 #: plugins/personal/connectivity/main.inc:120
+#: plugins/personal/netatalk/main.inc:106
 #: plugins/gofax/blocklists/generic.tpl:82
 #: plugins/gofax/blocklists/remove.tpl:16
 #: plugins/gofax/faxaccount/locals.tpl:62
 #: plugins/gofax/faxaccount/lists.tpl:33 plugins/gofax/faxaccount/main.inc:91
 #: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/address_edit.tpl:234
 #: plugins/addons/addressbook/remove.tpl:16
-#: plugins/addons/godfs/class_dfsManagment.inc:219
-#: plugins/admin/fai/class_faiManagement.inc:607
-#: plugins/admin/fai/class_faiManagement.inc:612
-#: plugins/admin/fai/faiPackageConfiguration.tpl:7
+#: plugins/addons/addressbook/address_edit.tpl:234
+#: plugins/admin/fai/class_faiManagement.inc:608
+#: plugins/admin/fai/class_faiManagement.inc:613
 #: plugins/admin/fai/faiProfileEntry.tpl:71
+#: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiScriptEntry.tpl:69 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiVariableEntry.tpl:49 plugins/admin/fai/remove.tpl:17
+#: plugins/admin/fai/faiHookEntry.tpl:71
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
+#: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiPackageNew.tpl:45
 #: plugins/admin/fai/faiNewBranch.tpl:20
-#: plugins/admin/fai/faiVariableEntry.tpl:49
 #: plugins/admin/fai/faiPackageEntry.tpl:57
-#: plugins/admin/fai/faiHookEntry.tpl:71
 #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/groups/class_groupManagement.inc:374
 #: plugins/admin/groups/remove.tpl:16
-#: plugins/admin/groups/application_options.tpl:10
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
+#: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/template.tpl:46
-#: plugins/admin/users/class_userManagement.inc:722
-#: plugins/admin/users/remove.tpl:16 plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:432
+#: plugins/admin/users/class_userManagement.inc:642
+#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:50
+#: plugins/admin/applications/remove.tpl:15
+#: plugins/admin/applications/class_applicationManagement.inc:405
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:369
+#: plugins/admin/departments/class_departmentManagement.inc:374
+#: plugins/admin/systems/class_baseSelectDialog.inc:41
+#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
+#: plugins/admin/systems/printerPPDDialog.tpl:23
+#: plugins/admin/systems/servnfs.tpl:98 plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/password.tpl:30
 #: plugins/admin/systems/glpi_edit_type.tpl:29
+#: plugins/admin/systems/glpi_edit_os.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
-#: plugins/admin/systems/servnfs.tpl:76
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
-#: plugins/admin/systems/servdnseditzone.tpl:118
+#: plugins/admin/systems/servRepositorySetup.tpl:43
+#: plugins/admin/systems/glpiAttachmentPool.tpl:52
+#: plugins/admin/systems/class_systemManagement.inc:686
 #: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
 #: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/servRepositorySetup.tpl:43
-#: plugins/admin/systems/glpi_edit_os.tpl:29
-#: plugins/admin/systems/printerPPDDialog.tpl:23
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:52
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
 #: plugins/admin/systems/remove_glpi.tpl:16
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/password.tpl:30 plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
+#: plugins/admin/systems/servdnseditzone.tpl:122
 #: plugins/admin/systems/SelectDeviceType.tpl:45
-#: plugins/admin/systems/class_baseSelectDialog.inc:41
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:13
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:402
+#: plugins/admin/ogroups/class_ogroupManagement.inc:410
 #: plugins/admin/ogroups/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:307
 #: plugins/gofon/macro/remove.tpl:15 plugins/gofon/phoneaccount/main.inc:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:268
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:266
 #: plugins/gofon/conference/remove.tpl:16
 #: ihtml/themes/altlinux/islocked.tpl:15 ihtml/themes/default/islocked.tpl:15
-#: ihtml/themes/default/copyPasteDialog.tpl:13
-#: ihtml/themes/lhs/islocked.tpl:15
+#: ihtml/themes/default/copyPasteDialog.tpl:15
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -516,7 +537,7 @@ msgstr "Cancelar"
 #: plugins/personal/environment/main.inc:114
 #: plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
-#: plugins/gofax/faxaccount/main.inc:96
+#: plugins/personal/netatalk/main.inc:111 plugins/gofax/faxaccount/main.inc:96
 #: plugins/gofon/phoneaccount/main.inc:112
 msgid "Click the 'Edit' button below to change informations in this dialog"
 msgstr ""
@@ -524,27 +545,25 @@ msgstr ""
 
 #: plugins/personal/nagios/main.inc:115 plugins/personal/mail/main.inc:115
 #: plugins/personal/posix/main.inc:122 plugins/personal/samba/main.inc:115
+#: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/main.inc:115
-#: plugins/personal/environment/environment.tpl:139
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
+#: plugins/personal/netatalk/main.inc:112
 #: plugins/gofax/faxaccount/generic.tpl:86
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
-#: plugins/admin/fai/faiVariable.tpl:45
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiScript.tpl:45 plugins/admin/fai/faiTemplate.tpl:42
-#: plugins/admin/fai/faiHook.tpl:45 plugins/admin/systems/glpi.tpl:48
-#: plugins/admin/systems/glpi.tpl:56 plugins/admin/systems/glpi.tpl:85
-#: plugins/admin/systems/glpiPrinter.tpl:73
-#: plugins/admin/systems/glpiPrinter.tpl:82
+#: plugins/admin/fai/faiVariable.tpl:45
+#: plugins/admin/systems/servservice.tpl:21
+#: plugins/admin/systems/printer.tpl:47 plugins/admin/systems/servdns.tpl:7
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
-#: plugins/admin/systems/servdns.tpl:7
+#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
+#: plugins/admin/systems/glpi.tpl:85 plugins/admin/systems/glpiPrinter.tpl:73
+#: plugins/admin/systems/glpiPrinter.tpl:82
 #: plugins/admin/systems/glpiManufacturer.tpl:7
-#: plugins/admin/systems/servdnseditzone.tpl:27
+#: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
-#: plugins/admin/systems/servservice.tpl:21
-#: plugins/admin/systems/printer.tpl:47
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Editar"
@@ -554,218 +573,94 @@ msgstr "Editar"
 msgid "Nagios settings"
 msgstr "Parametros del correo de usuarios"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:19
-#: plugins/personal/mail/class_mailAccount.inc:23
-#: plugins/personal/password/class_password.inc:6
-#: plugins/personal/posix/class_posixAccount.inc:17
-#: plugins/personal/samba/class_sambaAccount.inc:25
-#: plugins/personal/environment/class_environment.inc:13
-#: plugins/personal/generic/class_user.inc:17
-#: plugins/personal/connectivity/class_webdavAccount.inc:7
-#: plugins/personal/connectivity/class_proxyAccount.inc:6
-#: plugins/personal/connectivity/class_intranetAccount.inc:16
-#: plugins/personal/connectivity/class_pptpAccount.inc:27
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:7
-#: plugins/personal/connectivity/class_phpgwAccount.inc:6
-#: plugins/personal/connectivity/class_kolabAccount.inc:6
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:25
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
-#: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:6
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:7
-#: plugins/gofax/faxreports/class_faxreport.inc:7
-#: plugins/addons/addressbook/class_addressbook.inc:7
-#: plugins/addons/mailqueue/class_mailqueue.inc:7
-#: plugins/addons/ldapmanager/class_csvimport.inc:7
-#: plugins/addons/ldapmanager/class_exportxls.inc:8
-#: plugins/addons/ldapmanager/class_import.inc:7
-#: plugins/addons/ldapmanager/class_ldif.inc:8
-#: plugins/addons/ldapmanager/class_export.inc:7
-#: plugins/addons/logview/class_logview.inc:7
-#: plugins/addons/godfs/class_dfsManagment.inc:17
-#: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.inc:26
-#: plugins/admin/applications/class_applicationManagement.inc:26
-#: plugins/admin/departments/class_departmentManagement.inc:26
-#: plugins/admin/systems/class_systemManagement.inc:33
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/gofon/fonreports/class_fonreport.inc:7
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:26
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:7
-msgid "This does something"
-msgstr "Esto hace algo"
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:92
-#, fuzzy
-msgid "This account has no nagios extensions."
-msgstr "Esta cuenta no tiene extensiones validas de correo."
-
-#: plugins/personal/nagios/class_nagiosAccount.inc:101
+#: plugins/personal/nagios/nagios.tpl:4
 #, fuzzy
-msgid "Remove nagios account"
-msgstr "Borrar cuenta de correo"
+msgid "Nagios Account"
+msgstr "Contacto"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:102
+#: plugins/personal/nagios/nagios.tpl:7
 #, fuzzy
-msgid ""
-"This account has nagios features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
-"apretando a continuación."
+msgid "Alias"
+msgstr "Italiano"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
+#: plugins/personal/nagios/nagios.tpl:12
+#: plugins/admin/systems/servdnseditzone.tpl:51 html/getxls.php:174
 #, fuzzy
-msgid "Create nagios account"
-msgstr "Crear cuenta de correo"
+msgid "Mail address"
+msgstr "Dirección MAC"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:104
+#: plugins/personal/nagios/nagios.tpl:17
 #, fuzzy
-msgid ""
-"This account has nagios features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo desactivadas.Puede "
-"activarlas pulsando aqui."
+msgid "Host notification period"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
+#: plugins/personal/nagios/nagios.tpl:25
 #, fuzzy
-msgid "The required field 'NagiosAlias' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+msgid "Service notification period"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
+#: plugins/personal/nagios/nagios.tpl:32
 #, fuzzy
-msgid "The required field 'NagiosMail' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+msgid "Service notification options"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
+#: plugins/personal/nagios/nagios.tpl:41
 #, fuzzy
-msgid "Please enter a valid email address in 'NagiosMail' field."
-msgstr ""
-"Por favor introduzca una dirección valida de correo electrónico en el campo "
-"'Cuenta Principal'."
-
-#: plugins/personal/mail/class_mailAccount.inc:79
-#: plugins/admin/groups/class_groupMail.inc:75
-#, php-format
-msgid "There is no mail method '%s' specified in your gosa.conf available."
-msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
-
-#: plugins/personal/mail/class_mailAccount.inc:176
-msgid "No DESC tag in vacation file:"
-msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
-
-#: plugins/personal/mail/class_mailAccount.inc:216
-msgid "This account has no mail extensions."
-msgstr "Esta cuenta no tiene extensiones validas de correo."
-
-#: plugins/personal/mail/class_mailAccount.inc:225
-#: plugins/admin/groups/class_groupMail.inc:314
-#: plugins/admin/ogroups/class_mailogroup.inc:40
-msgid "Remove mail account"
-msgstr "Borrar cuenta de correo"
-
-#: plugins/personal/mail/class_mailAccount.inc:226
-#: plugins/admin/groups/class_groupMail.inc:315
-msgid ""
-"This account has mail features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
-"apretando a continuación."
+msgid "Host notification options"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:317
-#: plugins/admin/ogroups/class_mailogroup.inc:43
-msgid "Create mail account"
-msgstr "Crear cuenta de correo"
+#: plugins/personal/nagios/nagios.tpl:48
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/addons/addressbook/address_info.tpl:91
+#: plugins/addons/addressbook/address_edit.tpl:217 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Pager"
+msgstr "Dispositivo de aviso"
 
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
-msgid ""
-"This account has mail features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Esta cuenta tiene las características de correo desactivadas.Puede "
-"activarlas pulsando aqui."
+#: plugins/personal/nagios/nagios.tpl:53
+#, fuzzy
+msgid "Service notification commands"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/mail/class_mailAccount.inc:276
-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/nagios/nagios.tpl:57
+#, fuzzy
+msgid "Host notification commands"
+msgstr "Opciones de aplicaciones"
 
-#: plugins/personal/mail/class_mailAccount.inc:282
-#: plugins/admin/groups/class_groupMail.inc:377
-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/nagios/nagios.tpl:66
+#, fuzzy
+msgid "Nagios authentification"
+msgstr "Estación de trabajo Windows"
 
-#: plugins/personal/mail/class_mailAccount.inc:317
-#: plugins/personal/mail/class_mailAccount.inc:322
-#: plugins/admin/groups/class_groupMail.inc:405
-msgid ""
-"You're trying to add an invalid email address to the list of alternate "
-"addresses."
-msgstr ""
-"Esta intentando añadir una dirección de correo no valida a la lista de "
-"direcciones alternativas"
+#: plugins/personal/nagios/nagios.tpl:69
+#, fuzzy
+msgid "view system informations"
+msgstr "Información de sistema"
 
-#: plugins/personal/mail/class_mailAccount.inc:332
-#: plugins/admin/groups/class_groupMail.inc:410
-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/nagios/nagios.tpl:72
+#, fuzzy
+msgid "view configuration information"
+msgstr "Información organizativa"
 
-#: plugins/personal/mail/class_mailAccount.inc:714
-msgid ""
-"There is no valid mailserver specified, please add one in the system setup."
+#: plugins/personal/nagios/nagios.tpl:75
+msgid "trigger system commands"
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:719
-#: plugins/admin/groups/class_groupMail.inc:798
-msgid "The required field 'Primary address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+#: plugins/personal/nagios/nagios.tpl:78
+#, fuzzy
+msgid "view all services"
+msgstr "Provee servicios de exploración"
 
-#: plugins/personal/mail/class_mailAccount.inc:723
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
-msgid "Please enter a valid email address in 'Primary address' field."
+#: plugins/personal/nagios/nagios.tpl:81
+msgid "view all hosts"
 msgstr ""
-"Por favor introduzca una dirección valida de correo electrónico en el campo "
-"'Cuenta Principal'."
 
-#: plugins/personal/mail/class_mailAccount.inc:733
-#: plugins/admin/groups/class_groupMail.inc:807
-#: plugins/admin/ogroups/class_mailogroup.inc:77
-msgid "The primary address you've entered is already in use."
-msgstr "La cuenta principal que ha introducido ya esta en uso."
-
-#: plugins/personal/mail/class_mailAccount.inc:739
-#: plugins/admin/groups/class_groupMail.inc:813
-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:748
-#: plugins/admin/groups/class_groupMail.inc:822
-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:758
-#: plugins/admin/groups/class_groupMail.inc:830
-msgid "You need to set the maximum mail size in order to reject anything."
+#: plugins/personal/nagios/nagios.tpl:83
+msgid "trigger all service commands"
 msgstr ""
-"Necesita poner un valor máximo en el tamaño de mensaje de correo para poder "
-"rechazar mensajes."
 
-#: plugins/personal/mail/class_mailAccount.inc:762
-msgid "You specified Spam settings, but there is no Folder specified."
+#: plugins/personal/nagios/nagios.tpl:86
+msgid "trigger all host commands"
 msgstr ""
 
 #: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
@@ -776,9 +671,9 @@ msgstr "Cuenta Principal"
 
 #: plugins/personal/mail/generic.tpl:11
 #: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
-#: plugins/admin/systems/class_systemManagement.inc:922
 #: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:587
+#: plugins/admin/systems/class_systemManagement.inc:887
+#: plugins/admin/ogroups/class_ogroupManagement.inc:595
 #: plugins/generic/references/class_reference.inc:44
 msgid "Server"
 msgstr "Servidor"
@@ -793,7 +688,7 @@ msgstr "Uso de la Cola de Correo"
 
 #: plugins/personal/mail/generic.tpl:30 plugins/admin/groups/mail.tpl:32
 #: plugins/admin/systems/class_terminalInfo.inc:170
-#: plugins/admin/systems/class_printGeneric.inc:424
+#: plugins/admin/systems/class_printGeneric.inc:478
 msgid "not defined"
 msgstr "sin definirse"
 
@@ -801,12 +696,12 @@ msgstr "sin definirse"
 msgid "Quota size"
 msgstr "Tamaño de la Cola de correo"
 
-#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:35
+#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:25
 #: plugins/admin/groups/mail.tpl:44 plugins/admin/groups/paste_mail.tpl:23
 msgid "Alternative addresses"
 msgstr "Direcciones alternativas"
 
-#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:38
+#: plugins/personal/mail/generic.tpl:51 plugins/personal/mail/copypaste.tpl:55
 #: plugins/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
 #: plugins/admin/systems/phonesettings.tpl:170
 #: plugins/admin/systems/phonesettings.tpl:185
@@ -815,117 +710,121 @@ msgstr "Lista de direcciones de correo alternativas."
 
 #: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
 #: plugins/personal/mail/mail_locals.tpl:41
-#: plugins/personal/mail/copypaste.tpl:21
-#: plugins/personal/mail/copypaste.tpl:44
+#: plugins/personal/mail/copypaste.tpl:43
+#: plugins/personal/mail/copypaste.tpl:61
+#: plugins/personal/posix/posix_groups.tpl:69
 #: plugins/personal/posix/trust_machines.tpl:39
-#: plugins/personal/posix/posix_groups.tpl:65
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
+#: plugins/personal/posix/paste_generic.tpl:61
 #: plugins/personal/samba/samba3.tpl:330
 #: plugins/personal/samba/samba3_workstations.tpl:39
 #: plugins/personal/environment/hotplugDialog.tpl:63
 #: plugins/personal/environment/selectPrinterDialog.tpl:60
-#: plugins/personal/environment/environment.tpl:120
-#: plugins/personal/environment/environment.tpl:137
-#: plugins/personal/environment/environment.tpl:181
+#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/environment/environment.tpl:138
+#: plugins/personal/environment/environment.tpl:182
 #: plugins/personal/environment/kioskManagement.tpl:14
 #: plugins/personal/connectivity/kolab.tpl:18
 #: plugins/personal/connectivity/class_kolabAccount.inc:203
 #: plugins/gofax/blocklists/generic.tpl:63
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
-#: plugins/gofax/faxaccount/lists.tpl:13 plugins/admin/fai/faiVariable.tpl:44
+#: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiPackage.tpl:71 plugins/admin/fai/faiProfile.tpl:38
-#: plugins/admin/fai/faiScript.tpl:48 plugins/admin/fai/faiTemplate.tpl:41
-#: plugins/admin/fai/faiHook.tpl:48 plugins/admin/groups/mail.tpl:51
-#: plugins/admin/groups/mail.tpl:95
-#: plugins/admin/groups/class_groupMail.inc:533
-#: plugins/admin/groups/application.tpl:15
+#: plugins/admin/fai/faiVariable.tpl:44 plugins/admin/fai/faiPackage.tpl:71
+#: plugins/admin/fai/faiProfile.tpl:38 plugins/admin/fai/faiScript.tpl:41
+#: plugins/admin/fai/faiTemplate.tpl:35 plugins/admin/fai/faiHook.tpl:41
+#: plugins/admin/groups/mail.tpl:51 plugins/admin/groups/mail.tpl:95
+#: plugins/admin/groups/class_groupMail.inc:534
+#: plugins/admin/groups/application.tpl:27
 #: plugins/admin/groups/group_objects.tpl:55
 #: plugins/admin/groups/generic.tpl:104
 #: plugins/admin/groups/mail_locals.tpl:66
 #: plugins/admin/groups/paste_mail.tpl:30
-#: plugins/admin/groups/paste_mail.tpl:41 plugins/admin/systems/glpi.tpl:100
-#: plugins/admin/systems/glpiPrinter.tpl:93
+#: plugins/admin/groups/paste_mail.tpl:41
+#: plugins/admin/systems/servservice.tpl:20
+#: plugins/admin/systems/servservice.tpl:47
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
+#: plugins/admin/systems/terminal.tpl:94 plugins/admin/systems/servdns.tpl:6
+#: plugins/admin/systems/workstation.tpl:74
+#: plugins/admin/systems/phonesettings.tpl:176
+#: plugins/admin/systems/phonesettings.tpl:191
+#: plugins/admin/systems/glpi.tpl:100 plugins/admin/systems/glpiPrinter.tpl:93
 #: plugins/admin/systems/glpiPrinter.tpl:121
 #: plugins/admin/systems/glpi_edit_type.tpl:8
+#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:7
+#: plugins/admin/systems/servRepositorySetup.tpl:36
 #: plugins/admin/systems/workstationStartup.tpl:61
 #: plugins/admin/systems/workstationStartup.tpl:81
 #: plugins/admin/systems/workstationStartup.tpl:100
-#: plugins/admin/systems/servdns.tpl:6
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:388
 #: plugins/admin/systems/terminalStartup.tpl:61
 #: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/class_termDNS.inc:461
-#: plugins/admin/systems/class_termDNS.inc:482
-#: plugins/admin/systems/servdnseditzone.tpl:102
-#: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/servservice.tpl:20
-#: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/glpi_edit_os.tpl:8
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:106
 #: plugins/admin/systems/class_servDNSeditZone.inc:478
-#: plugins/admin/systems/phonesettings.tpl:176
-#: plugins/admin/systems/phonesettings.tpl:191
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:270
+#: plugins/admin/systems/class_termDNS.inc:426
+#: plugins/admin/systems/class_termDNS.inc:446
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
 #: plugins/admin/ogroups/generic.tpl:39
 #: plugins/admin/ogroups/phonequeue.tpl:24
 #: plugins/gofon/phoneaccount/generic.tpl:13
-#: plugins/gofon/phoneaccount/paste_generic.tpl:14
+#: plugins/gofon/phoneaccount/paste_generic.tpl:18
 msgid "Add"
 msgstr "Añadir"
 
 #: plugins/personal/mail/generic.tpl:59 plugins/personal/mail/generic.tpl:132
-#: plugins/personal/mail/copypaste.tpl:23
 #: plugins/personal/mail/copypaste.tpl:45
+#: plugins/personal/mail/copypaste.tpl:62
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
+#: plugins/personal/posix/paste_generic.tpl:62
 #: plugins/personal/samba/samba3.tpl:332
-#: plugins/personal/environment/environment.tpl:138
-#: plugins/personal/environment/environment.tpl:166
-#: plugins/personal/environment/environment.tpl:182
+#: plugins/personal/environment/environment.tpl:139
+#: plugins/personal/environment/environment.tpl:167
+#: plugins/personal/environment/environment.tpl:183
 #: plugins/personal/connectivity/kolab.tpl:20
 #: plugins/gofax/blocklists/generic.tpl:64
 #: plugins/gofax/blocklists/remove.tpl:14
 #: plugins/gofax/faxaccount/generic.tpl:78
 #: plugins/gofax/faxaccount/lists.tpl:14
 #: plugins/addons/addressbook/remove.tpl:14
-#: plugins/admin/fai/faiVariable.tpl:46
-#: plugins/admin/fai/faiPartitionTable.tpl:45 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiScript.tpl:46 plugins/admin/fai/faiTemplate.tpl:43
-#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/fai/faiHook.tpl:46
-#: plugins/admin/groups/mail.tpl:52 plugins/admin/groups/mail.tpl:97
-#: plugins/admin/groups/remove.tpl:14 plugins/admin/groups/generic.tpl:106
-#: plugins/admin/groups/paste_mail.tpl:31
+#: plugins/admin/fai/faiPartitionTable.tpl:45
+#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/remove.tpl:15
+#: plugins/admin/fai/remove_branch.tpl:14 plugins/admin/groups/mail.tpl:52
+#: plugins/admin/groups/mail.tpl:97 plugins/admin/groups/remove.tpl:14
+#: plugins/admin/groups/generic.tpl:106 plugins/admin/groups/paste_mail.tpl:31
 #: plugins/admin/groups/paste_mail.tpl:43 plugins/admin/users/remove.tpl:14
 #: plugins/admin/applications/remove.tpl:13
 #: plugins/admin/departments/remove.tpl:14
+#: plugins/admin/systems/servservice.tpl:22
+#: plugins/admin/systems/servservice.tpl:48
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
+#: plugins/admin/systems/terminal.tpl:96 plugins/admin/systems/printer.tpl:71
+#: plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/workstation.tpl:76
+#: plugins/admin/systems/phonesettings.tpl:177
+#: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/remove.tpl:14
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/glpi_edit_type.tpl:10
+#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/workstationStartup.tpl:62
 #: plugins/admin/systems/workstationStartup.tpl:82
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/terminalStartup.tpl:62
-#: plugins/admin/systems/class_termDNS.inc:476
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/servservice.tpl:22
-#: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/glpi_edit_os.tpl:10
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/class_servDNSeditZone.inc:279
+#: plugins/admin/systems/class_servDNSeditZone.inc:292
 #: plugins/admin/systems/class_servDNSeditZone.inc:472
-#: plugins/admin/systems/phonesettings.tpl:177
-#: plugins/admin/systems/phonesettings.tpl:192
-#: plugins/admin/systems/remove.tpl:14 plugins/admin/ogroups/generic.tpl:40
-#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
-#: plugins/gofon/macro/remove.tpl:13 plugins/gofon/phoneaccount/generic.tpl:15
-#: plugins/gofon/phoneaccount/paste_generic.tpl:15
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:192
+#: plugins/admin/systems/class_termDNS.inc:440
+#: plugins/admin/ogroups/generic.tpl:40 plugins/admin/ogroups/remove.tpl:14
+#: plugins/admin/ogroups/phonequeue.tpl:25 plugins/gofon/macro/remove.tpl:13
+#: plugins/gofon/phoneaccount/generic.tpl:15
+#: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
 msgstr "Borrar"
@@ -992,7 +891,7 @@ msgid "Forward messages to"
 msgstr "reenviar mensajes a"
 
 #: plugins/personal/mail/generic.tpl:130
-#: plugins/personal/mail/copypaste.tpl:22
+#: plugins/personal/mail/copypaste.tpl:44
 #: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
 #: plugins/admin/groups/paste_mail.tpl:42
 msgid "Add local"
@@ -1031,40 +930,40 @@ msgid "Select addresses to add"
 msgstr "Seleccione dirección para añadir"
 
 #: plugins/personal/mail/mail_locals.tpl:20
-#: plugins/personal/posix/posix_groups.tpl:20
+#: plugins/personal/posix/posix_groups.tpl:21
 #: plugins/personal/samba/samba3_workstations.tpl:20
 #: plugins/personal/environment/hotplugDialog.tpl:24
 #: plugins/personal/environment/selectPrinterDialog.tpl:24
 #: plugins/gofax/blocklists/headpage.tpl:29
 #: plugins/gofax/faxaccount/locals.tpl:19
 #: plugins/addons/addressbook/contents.tpl:58
-#: plugins/addons/godfs/contents.tpl:31
-#: plugins/admin/fai/faiProfileEntry.tpl:31
-#: plugins/admin/fai/faiPackageEntry.tpl:32 plugins/admin/fai/headpage.tpl:64
+#: plugins/admin/fai/faiProfileEntry.tpl:31 plugins/admin/fai/headpage.tpl:64
+#: plugins/admin/fai/faiPackageEntry.tpl:32
 #: plugins/admin/groups/headpage.tpl:30
 #: plugins/admin/groups/group_objects.tpl:20
 #: plugins/admin/groups/mail_locals.tpl:22 plugins/admin/users/headpage.tpl:29
 #: plugins/admin/applications/headpage.tpl:47
 #: plugins/admin/departments/headpage.tpl:29
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/headpage.tpl:29
 #: plugins/admin/systems/servRepository.tpl:36
+#: plugins/admin/systems/glpiAttachmentPool.tpl:27
 #: plugins/admin/systems/glpiSelectUser.tpl:27
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/glpiPrinterCartridges.tpl:27
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/ogroups/headpage.tpl:29 plugins/gofon/macro/headpage.tpl:29
 #: plugins/gofon/conference/headpage.tpl:29
 #: ihtml/themes/altlinux/MultiSelectWindow.tpl:31
-#: ihtml/themes/default/MultiSelectWindow.tpl:31
+#: ihtml/themes/default/MultiSelectWindow.tpl:32
+#: ihtml/themes/default/MultiSelectWindow.tpl:67
 msgid "Filters"
 msgstr "Filtros"
 
 #: plugins/personal/mail/mail_locals.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:34
 #: plugins/personal/posix/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
 #: plugins/gofax/faxaccount/locals.tpl:29
@@ -1093,30 +992,152 @@ msgstr "Mostrar direcciones del usuario"
 msgid "User name of which addresses are shown"
 msgstr "Nombre de usuario de las direcciones mostradas"
 
-#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
-#, fuzzy
-msgid "Mail settings"
-msgstr "Parametros del correo de usuarios"
-
-#: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:872
-#: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
-#: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
-#: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
-#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
-#: ihtml/themes/altlinux/setup_useradmin.tpl:30
-#: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
-#: ihtml/themes/default/setup_useradmin.tpl:30 ihtml/themes/lhs/login.tpl:37
-#: ihtml/themes/lhs/login.tpl:41 ihtml/themes/lhs/setup_useradmin.tpl:30
-msgid "Password"
-msgstr "Contraseña"
+#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/admin/groups/class_groupMail.inc:75
+#, php-format
+msgid "There is no mail method '%s' specified in your gosa.conf available."
+msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
 
-#: plugins/personal/password/password.tpl:2
-#: plugins/personal/password/changed.tpl:2
-#: plugins/admin/users/class_userManagement.inc:802
-#: plugins/admin/users/class_userManagement.inc:809
-msgid "Change password"
-msgstr "Cambiar contraseña"
+#: plugins/personal/mail/class_mailAccount.inc:180
+msgid "No DESC tag in vacation file:"
+msgstr "En el archivo de ausencia no existe la etiqueta 'DESC':"
+
+#: plugins/personal/mail/class_mailAccount.inc:220
+msgid "This account has no mail extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
+
+#: plugins/personal/mail/class_mailAccount.inc:229
+#: plugins/admin/groups/class_groupMail.inc:314
+#: plugins/admin/ogroups/class_mailogroup.inc:40
+msgid "Remove mail account"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:230
+#: plugins/admin/groups/class_groupMail.inc:315
+msgid ""
+"This account has mail features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
+
+#: plugins/personal/mail/class_mailAccount.inc:232
+#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/admin/ogroups/class_mailogroup.inc:43
+msgid "Create mail account"
+msgstr "Crear cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:232
+#: plugins/admin/groups/class_groupMail.inc:318
+msgid ""
+"This account has mail features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
+
+#: plugins/personal/mail/class_mailAccount.inc:280
+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:286
+#: plugins/admin/groups/class_groupMail.inc:377
+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:321
+#: plugins/personal/mail/class_mailAccount.inc:326
+#: plugins/admin/groups/class_groupMail.inc:405
+msgid ""
+"You're trying to add an invalid email address to the list of alternate "
+"addresses."
+msgstr ""
+"Esta intentando añadir una dirección de correo no valida a la lista de "
+"direcciones alternativas"
+
+#: plugins/personal/mail/class_mailAccount.inc:336
+#: plugins/admin/groups/class_groupMail.inc:410
+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:720
+msgid ""
+"There is no valid mailserver specified, please add one in the system setup."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:725
+#: plugins/admin/groups/class_groupMail.inc:807
+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:729
+#: plugins/personal/mail/class_mailAccount.inc:733
+#: plugins/addons/addressbook/class_addressbook.inc:589
+#: plugins/admin/ogroups/class_mailogroup.inc:71
+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:739
+#: plugins/admin/groups/class_groupMail.inc:816
+#: plugins/admin/ogroups/class_mailogroup.inc:78
+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:745
+#: plugins/admin/groups/class_groupMail.inc:822
+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:754
+#: plugins/admin/groups/class_groupMail.inc:831
+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:764
+#: plugins/admin/groups/class_groupMail.inc:839
+msgid "You need to set the maximum mail size in order to reject anything."
+msgstr ""
+"Necesita poner un valor máximo en el tamaño de mensaje de correo para poder "
+"rechazar mensajes."
+
+#: plugins/personal/mail/class_mailAccount.inc:768
+msgid "You specified Spam settings, but there is no Folder specified."
+msgstr ""
+
+#: plugins/personal/mail/copypaste.tpl:1 plugins/admin/groups/paste_mail.tpl:1
+#, fuzzy
+msgid "Mail settings"
+msgstr "Parametros del correo de usuarios"
+
+#: plugins/personal/password/class_password.inc:5
+#: plugins/personal/generic/paste_generic.tpl:32
+#: plugins/admin/systems/servdb.tpl:18 plugins/admin/systems/servdb.tpl:34
+#: plugins/admin/systems/servdb.tpl:50 plugins/admin/systems/servdb.tpl:86
+#: plugins/admin/systems/servdb.tpl:109 plugins/admin/systems/servdb.tpl:128
+#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_divListSystem.inc:169
+#: ihtml/themes/altlinux/setup_useradmin.tpl:30
+#: ihtml/themes/altlinux/login.tpl:35 ihtml/themes/altlinux/login.tpl:39
+#: ihtml/themes/default/setup_useradmin.tpl:30
+#: ihtml/themes/default/login.tpl:37 ihtml/themes/default/login.tpl:41
+msgid "Password"
+msgstr "Contraseña"
+
+#: plugins/personal/password/password.tpl:2
+#: plugins/personal/password/changed.tpl:2
+#: plugins/admin/users/class_userManagement.inc:714
+#: plugins/admin/users/class_userManagement.inc:721
+msgid "Change password"
+msgstr "Cambiar contraseña"
 
 #: plugins/personal/password/password.tpl:6
 msgid ""
@@ -1174,12 +1195,12 @@ msgstr ""
 #: plugins/personal/password/changed.tpl:12
 #: plugins/personal/generic/main.inc:169
 #: plugins/gofax/faxreports/detail.tpl:67
-#: plugins/addons/ldapmanager/contentexportxls.tpl:69
 #: plugins/addons/ldapmanager/contentimport.tpl:44
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
+#: plugins/addons/ldapmanager/contentexportxls.tpl:69
 #: plugins/admin/fai/faiNewBranch.tpl:50
-#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1382
+#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1339
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
@@ -1190,9 +1211,6 @@ msgstr ""
 #: ihtml/themes/default/setup_step3.tpl:17
 #: ihtml/themes/default/setup_step4.tpl:114
 #: ihtml/themes/default/setup_finish.tpl:30
-#: ihtml/themes/lhs/setup_useradmin.tpl:40 ihtml/themes/lhs/setup_step2.tpl:12
-#: ihtml/themes/lhs/setup_step3.tpl:17 ihtml/themes/lhs/setup_step4.tpl:114
-#: ihtml/themes/lhs/setup_finish.tpl:30
 msgid "Back"
 msgstr "Atras"
 
@@ -1207,7 +1225,7 @@ msgid "You need to specify your current password in order to proceed."
 msgstr "Necesita introducir su contraseña actual para continuar."
 
 #: plugins/personal/password/main.inc:48 plugins/personal/generic/main.inc:84
-#: plugins/admin/users/class_userManagement.inc:351
+#: plugins/admin/users/class_userManagement.inc:275
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1216,7 +1234,7 @@ msgstr ""
 "contraseña' no concuerdan."
 
 #: plugins/personal/password/main.inc:51 plugins/personal/generic/main.inc:89
-#: plugins/admin/users/class_userManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:280
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La contraseña que ingreso como 'Nueva contraseña' está vacia."
 
@@ -1236,43 +1254,30 @@ msgstr "No tiene permisos para cambiar su contraseña."
 msgid "External password changer reported a problem: "
 msgstr "El programa externo de cambio de contraseña informo de un problema: "
 
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Seleccione sistema a añadir"
-
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Mostrar sistemas de departamentos"
-
-#: plugins/personal/posix/trust_machines.tpl:30
-#: plugins/admin/systems/headpage.tpl:50
-msgid "Display systems matching"
-msgstr "Mostrar sistemas que concuerden con"
-
 #: plugins/personal/posix/posix_groups.tpl:6
 msgid "Select groups to add"
 msgstr "Seleccione grupo a añadir"
 
-#: plugins/personal/posix/posix_groups.tpl:29
+#: plugins/personal/posix/posix_groups.tpl:31
 msgid "Display groups of department"
 msgstr "Mostrar los grupos de departamentos"
 
-#: plugins/personal/posix/posix_groups.tpl:41
+#: plugins/personal/posix/posix_groups.tpl:43
 #: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:51
 msgid "Display groups matching"
 msgstr "Mostrar grupos que concuerden con"
 
-#: plugins/personal/posix/posix_groups.tpl:44
+#: plugins/personal/posix/posix_groups.tpl:47
 #: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
 msgid "Regular expression for matching group names"
 msgstr "Expresión regular que concuerde con nombres de grupos"
 
-#: plugins/personal/posix/posix_groups.tpl:51
+#: plugins/personal/posix/posix_groups.tpl:54
 #: plugins/admin/groups/headpage.tpl:75
 msgid "Display groups of user"
 msgstr "Mostrar grupos de usuarios"
 
-#: plugins/personal/posix/posix_groups.tpl:54
+#: plugins/personal/posix/posix_groups.tpl:58
 #: plugins/admin/groups/headpage.tpl:78
 msgid "User name of which groups are shown"
 msgstr "Nombres de usuarios de los grupos que se muestran"
@@ -1287,10 +1292,24 @@ msgstr ""
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Seleccione sistema a añadir"
+
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Mostrar sistemas de departamentos"
+
+#: plugins/personal/posix/trust_machines.tpl:30
+#: plugins/admin/systems/headpage.tpl:50
+#: plugins/admin/systems/class_divListSystem.inc:68
+msgid "Display systems matching"
+msgstr "Mostrar sistemas que concuerden con"
+
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 #: plugins/personal/samba/samba3.tpl:13 plugins/personal/samba/samba3.tpl:94
-#: plugins/personal/samba/class_sambaAccount.inc:640
+#: plugins/personal/samba/class_sambaAccount.inc:643
 msgid "Home directory"
 msgstr "Directorio Principal"
 
@@ -1311,25 +1330,27 @@ msgid "Status"
 msgstr "Estado"
 
 #: plugins/personal/posix/generic.tpl:39
-#: plugins/personal/posix/paste_generic.tpl:21
+#: plugins/personal/posix/paste_generic.tpl:23
 msgid "Force UID/GID"
 msgstr "Forzar UID/GID"
 
 #: plugins/personal/posix/generic.tpl:43
-#: plugins/personal/posix/paste_generic.tpl:26 html/getxls.php:230
+#: plugins/personal/posix/paste_generic.tpl:28 html/getxls.php:230
 msgid "UID"
 msgstr "UID"
 
 #: plugins/personal/posix/generic.tpl:52
-#: plugins/personal/posix/paste_generic.tpl:35
+#: plugins/personal/posix/paste_generic.tpl:37
 msgid "GID"
 msgstr "GID"
 
 #: plugins/personal/posix/generic.tpl:64
+#: plugins/personal/posix/paste_generic.tpl:47
 msgid "Group membership"
 msgstr "Miembros del grupo"
 
 #: plugins/personal/posix/generic.tpl:66
+#: plugins/personal/posix/paste_generic.tpl:54
 msgid "(Warning: more than 16 groups are not supported by NFS!)"
 msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
 
@@ -1346,42 +1367,62 @@ msgstr "Autentificación del sistema"
 msgid "Trust mode"
 msgstr "Modo"
 
-#: plugins/personal/posix/main.inc:131
-msgid "Unix settings"
-msgstr "Parametros Unix"
-
 #: plugins/personal/posix/class_posixAccount.inc:16
 #: plugins/generic/references/class_reference.inc:22
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:137
-#: plugins/personal/posix/class_posixAccount.inc:993
+#: plugins/personal/posix/class_posixAccount.inc:121
+#, fuzzy
+msgid "expired"
+msgstr "Exportar"
+
+#: plugins/personal/posix/class_posixAccount.inc:123
+msgid ", grace time active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:126
+#, fuzzy
+msgid "active, password not changable"
+msgstr "Nueva contraseña"
+
+#: plugins/personal/posix/class_posixAccount.inc:128
+#, fuzzy
+msgid "active, password expired"
+msgstr "La contraseña expira en"
+
+#: plugins/personal/posix/class_posixAccount.inc:130
+#, fuzzy
+msgid "active"
+msgstr "Privado"
+
+#: plugins/personal/posix/class_posixAccount.inc:141
+#: plugins/personal/posix/class_posixAccount.inc:990
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: plugins/personal/posix/class_posixAccount.inc:177
+#: plugins/personal/posix/class_posixAccount.inc:181
 msgid "unconfigured"
 msgstr "Desconfigurado"
 
-#: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_workstationService.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:623
+#: plugins/personal/posix/class_posixAccount.inc:199
 #: plugins/admin/systems/class_terminalService.inc:141
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
+#: plugins/admin/systems/class_workstationService.inc:133
+#: plugins/admin/systems/class_workstationStartup.inc:690
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:212
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:227
+#: plugins/personal/posix/class_posixAccount.inc:238
 msgid "This account has no unix extensions."
 msgstr "Este cuenta no tiene extensiones unix."
 
-#: plugins/personal/posix/class_posixAccount.inc:248
-#: plugins/personal/posix/class_posixAccount.inc:251
+#: plugins/personal/posix/class_posixAccount.inc:258
+#: plugins/personal/posix/class_posixAccount.inc:261
 msgid "Remove posix account"
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:249
+#: plugins/personal/posix/class_posixAccount.inc:259
 #, fuzzy
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
@@ -1390,7 +1431,7 @@ msgstr ""
 "Esta cuenta tiene características unix activadas. Para desactivarlas, "
 "necesita eliminar la cuenta samba primero."
 
-#: plugins/personal/posix/class_posixAccount.inc:252
+#: plugins/personal/posix/class_posixAccount.inc:262
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1398,11 +1439,11 @@ msgstr ""
 "Esta cuenta tiene características posix activadas. Puede desactivarla "
 "pulsando aqui"
 
-#: plugins/personal/posix/class_posixAccount.inc:255
+#: plugins/personal/posix/class_posixAccount.inc:265
 msgid "Create posix account"
 msgstr "Crear cuenta posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:256
+#: plugins/personal/posix/class_posixAccount.inc:266
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1410,252 +1451,256 @@ msgstr ""
 "Esta cuenta tiene la extensión posix desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/posix/class_posixAccount.inc:455
+#: plugins/personal/posix/class_posixAccount.inc:467
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "La contraseñas no pueden ser cambiadas hasta %s días desde el último cambio"
 
-#: plugins/personal/posix/class_posixAccount.inc:457
+#: plugins/personal/posix/class_posixAccount.inc:469
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "La contraseñas deben ser cambiadas despues de %s días"
 
-#: plugins/personal/posix/class_posixAccount.inc:459
+#: plugins/personal/posix/class_posixAccount.inc:471
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiery"
 msgstr ""
 "Desactivar cuente despues de %s días de inactividad despues de expirar la "
 "contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:461
+#: plugins/personal/posix/class_posixAccount.inc:473
 #, php-format
 msgid "Warn user %s days before password expiery"
 msgstr "Avisar al usuario %s días antes de expirar la contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
 #: plugins/gofax/faxreports/class_faxreport.inc:76
 #: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "January"
 msgstr "Enero"
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
 #: plugins/gofax/faxreports/class_faxreport.inc:76
 #: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "February"
 msgstr "Febrero"
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
 #: plugins/gofax/faxreports/class_faxreport.inc:76
 #: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "March"
 msgstr "Marzo"
 
-#: plugins/personal/posix/class_posixAccount.inc:485
-#: plugins/personal/samba/class_sambaAccount.inc:355
-#: plugins/personal/samba/class_sambaAccount.inc:373
-#: plugins/personal/samba/class_sambaAccount.inc:391
-#: plugins/personal/samba/class_sambaAccount.inc:409
+#: plugins/personal/posix/class_posixAccount.inc:497
+#: plugins/personal/samba/class_sambaAccount.inc:357
+#: plugins/personal/samba/class_sambaAccount.inc:375
+#: plugins/personal/samba/class_sambaAccount.inc:393
+#: plugins/personal/samba/class_sambaAccount.inc:411
 #: plugins/personal/generic/class_user.inc:245
 #: plugins/gofax/faxreports/class_faxreport.inc:76
 #: plugins/gofon/fonreports/class_fonreport.inc:71
 msgid "April"
 msgstr "Abril"
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
 #: plugins/gofax/faxreports/class_faxreport.inc:77
 #: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "May"
 msgstr "Mayo"
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
 #: plugins/gofax/faxreports/class_faxreport.inc:77
 #: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "June"
 msgstr "Junio"
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
 #: plugins/gofax/faxreports/class_faxreport.inc:77
 #: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "July"
 msgstr "Julio"
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
 #: plugins/gofax/faxreports/class_faxreport.inc:77
 #: plugins/gofon/fonreports/class_fonreport.inc:72
 msgid "August"
 msgstr "Agosto"
 
-#: plugins/personal/posix/class_posixAccount.inc:486
-#: plugins/personal/samba/class_sambaAccount.inc:356
-#: plugins/personal/samba/class_sambaAccount.inc:374
-#: plugins/personal/samba/class_sambaAccount.inc:392
-#: plugins/personal/samba/class_sambaAccount.inc:410
+#: plugins/personal/posix/class_posixAccount.inc:498
+#: plugins/personal/samba/class_sambaAccount.inc:358
+#: plugins/personal/samba/class_sambaAccount.inc:376
+#: plugins/personal/samba/class_sambaAccount.inc:394
+#: plugins/personal/samba/class_sambaAccount.inc:412
 #: plugins/personal/generic/class_user.inc:246
 #: plugins/gofax/faxreports/class_faxreport.inc:78
 #: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "September"
 msgstr "Septiembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
 #: plugins/gofax/faxreports/class_faxreport.inc:78
 #: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "October"
 msgstr "Octubre"
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
 #: plugins/gofax/faxreports/class_faxreport.inc:78
 #: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "November"
 msgstr "Noviembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:487
-#: plugins/personal/samba/class_sambaAccount.inc:357
-#: plugins/personal/samba/class_sambaAccount.inc:375
-#: plugins/personal/samba/class_sambaAccount.inc:393
-#: plugins/personal/samba/class_sambaAccount.inc:411
+#: plugins/personal/posix/class_posixAccount.inc:499
+#: plugins/personal/samba/class_sambaAccount.inc:359
+#: plugins/personal/samba/class_sambaAccount.inc:377
+#: plugins/personal/samba/class_sambaAccount.inc:395
+#: plugins/personal/samba/class_sambaAccount.inc:413
 #: plugins/personal/generic/class_user.inc:247
 #: plugins/gofax/faxreports/class_faxreport.inc:78
 #: plugins/gofon/fonreports/class_fonreport.inc:73
 msgid "December"
 msgstr "Diciembre"
 
-#: plugins/personal/posix/class_posixAccount.inc:569
-#: plugins/personal/samba/class_sambaAccount.inc:453
-#: plugins/admin/systems/class_terminalGeneric.inc:60
+#: plugins/personal/posix/class_posixAccount.inc:581
+#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/admin/systems/class_terminalGeneric.inc:87
 #: ihtml/themes/altlinux/setup_step4.tpl:91
-#: ihtml/themes/default/setup_step4.tpl:91 ihtml/themes/lhs/setup_step4.tpl:91
+#: ihtml/themes/default/setup_step4.tpl:91
 msgid "disabled"
 msgstr "desactivado"
 
-#: plugins/personal/posix/class_posixAccount.inc:569
+#: plugins/personal/posix/class_posixAccount.inc:581
 msgid "full access"
 msgstr "Acceso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:570
+#: plugins/personal/posix/class_posixAccount.inc:582
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/personal/posix/class_posixAccount.inc:742
+#: plugins/personal/posix/class_posixAccount.inc:754
 msgid "Failed: overriding lock"
 msgstr "Fallo: Sobrepasado bloqueo"
 
-#: plugins/personal/posix/class_posixAccount.inc:907
+#: plugins/personal/posix/class_posixAccount.inc:904
 msgid "The required field 'Home directory' is not set."
 msgstr "El campo requerido 'Directorio de usuario' no esta rellenado."
 
-#: plugins/personal/posix/class_posixAccount.inc:910
+#: plugins/personal/posix/class_posixAccount.inc:907
 msgid "Please enter a valid path in 'Home directory' field."
 msgstr ""
 "Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
 
-#: plugins/personal/posix/class_posixAccount.inc:918
+#: plugins/personal/posix/class_posixAccount.inc:915
 msgid "Value specified as 'UID' is not valid."
 msgstr "El valor especificado en 'UID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:921
+#: plugins/personal/posix/class_posixAccount.inc:918
 msgid "Value specified as 'UID' is too small."
 msgstr "El valor especificado como 'UID' es demasiado pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:925
-#: plugins/admin/groups/class_groupGeneric.inc:768
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/admin/groups/class_groupGeneric.inc:772
 msgid "Value specified as 'GID' is not valid."
 msgstr "El valor especificado como 'GID' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:928
-#: plugins/admin/groups/class_groupGeneric.inc:771
+#: plugins/personal/posix/class_posixAccount.inc:925
+#: plugins/admin/groups/class_groupGeneric.inc:775
 msgid "Value specified as 'GID' is too small."
 msgstr "El valor especificado como 'GID' es muy pequeño."
 
-#: plugins/personal/posix/class_posixAccount.inc:936
+#: plugins/personal/posix/class_posixAccount.inc:933
 msgid "Value specified as 'shadowMin' is not valid."
 msgstr "El valor especificado en 'shadowMin' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:941
+#: plugins/personal/posix/class_posixAccount.inc:938
 msgid "Value specified as 'shadowMax' is not valid."
 msgstr "El valor especificado en 'shadowMax' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:946
+#: plugins/personal/posix/class_posixAccount.inc:943
 msgid "Value specified as 'shadowWarning' is not valid."
 msgstr "El valor especificado en 'shadowWarning' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:949
+#: plugins/personal/posix/class_posixAccount.inc:946
 msgid "'shadowWarning' without 'shadowMax' makes no sense."
 msgstr "'shadowWarning' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:952
+#: plugins/personal/posix/class_posixAccount.inc:949
 msgid "Value specified as 'shadowWarning' should be smaller than 'shadowMax'."
 msgstr ""
 "El valor especificado como 'shadowWarning' debería ser menor que 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:955
+#: plugins/personal/posix/class_posixAccount.inc:952
 msgid "Value specified as 'shadowWarning' should be greater than 'shadowMin'."
 msgstr ""
 "El valor especificado como 'shadowWarning' debería ser mayor que 'shadowMin'."
 
-#: plugins/personal/posix/class_posixAccount.inc:960
+#: plugins/personal/posix/class_posixAccount.inc:957
 msgid "Value specified as 'shadowInactive' is not valid."
 msgstr "El valor especificado en 'shadowInactive' no es valido."
 
-#: plugins/personal/posix/class_posixAccount.inc:963
+#: plugins/personal/posix/class_posixAccount.inc:960
 msgid "'shadowInactive' without 'shadowMax' makes no sense."
 msgstr "'shadowInactive' sin 'shadowMax' no tiene sentido."
 
-#: plugins/personal/posix/class_posixAccount.inc:968
+#: plugins/personal/posix/class_posixAccount.inc:965
 msgid "Value specified as 'shadowMin' should be smaller than 'shadowMax'."
 msgstr ""
 "El valor especificado como 'shadowMin' debería ser menor que 'shadowMax'."
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
-#: plugins/admin/groups/class_groupGeneric.inc:807
+#: plugins/personal/posix/class_posixAccount.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:811
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
+#: plugins/personal/posix/main.inc:131
+msgid "Unix settings"
+msgstr "Parametros Unix"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -1671,7 +1716,7 @@ msgstr "Ruta del Script"
 
 #: plugins/personal/samba/samba2.tpl:36 plugins/personal/samba/samba3.tpl:44
 #: plugins/personal/samba/samba3.tpl:104
-#: plugins/personal/samba/class_sambaAccount.inc:641
+#: plugins/personal/samba/class_sambaAccount.inc:644
 msgid "Profile path"
 msgstr "Ruta del Perfil"
 
@@ -1720,17 +1765,17 @@ msgid "Timeout settings (in minutes)"
 msgstr "Características de tiempo de desconexión (en minutos)"
 
 #: plugins/personal/samba/samba3.tpl:158
-#: plugins/personal/samba/class_sambaAccount.inc:648
+#: plugins/personal/samba/class_sambaAccount.inc:651
 msgid "Connection"
 msgstr "Conexión"
 
 #: plugins/personal/samba/samba3.tpl:167
-#: plugins/personal/samba/class_sambaAccount.inc:649
+#: plugins/personal/samba/class_sambaAccount.inc:652
 msgid "Disconnection"
 msgstr "Desconexión"
 
 #: plugins/personal/samba/samba3.tpl:176
-#: plugins/personal/samba/class_sambaAccount.inc:650
+#: plugins/personal/samba/class_sambaAccount.inc:653
 msgid "IDLE"
 msgstr "IDLE"
 
@@ -1787,10 +1832,6 @@ msgstr "La cuenta expirará después de"
 msgid "Allow connection from these workstations only"
 msgstr "Permitir la conexión solo desde estas estaciones de trabajo"
 
-#: plugins/personal/samba/main.inc:123
-msgid "Samba settings"
-msgstr "Parametros de samba"
-
 #: plugins/personal/samba/samba3_workstations.tpl:6
 msgid "Select workstations to add"
 msgstr "Selecciones estaciones de trabajo para añadir"
@@ -1799,15 +1840,19 @@ msgstr "Selecciones estaciones de trabajo para añadir"
 msgid "Display workstations of department"
 msgstr "Mostrar estaciones de trabajo de departamentos"
 
-#: plugins/personal/samba/class_sambaAccount.inc:196
+#: plugins/personal/samba/main.inc:123
+msgid "Samba settings"
+msgstr "Parametros de samba"
+
+#: plugins/personal/samba/class_sambaAccount.inc:198
 msgid "This account has no samba extensions."
 msgstr "Esta cuenta no tiene extensión samba valida."
 
-#: plugins/personal/samba/class_sambaAccount.inc:205
+#: plugins/personal/samba/class_sambaAccount.inc:207
 msgid "Remove samba account"
 msgstr "Eliminar cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:206
+#: plugins/personal/samba/class_sambaAccount.inc:208
 msgid ""
 "This account has samba features enabled. You can disable them by clicking "
 "below."
@@ -1815,12 +1860,12 @@ msgstr ""
 "Esta cuenta tiene la extensión samba activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:216
-#: plugins/personal/samba/class_sambaAccount.inc:219
+#: plugins/personal/samba/class_sambaAccount.inc:218
+#: plugins/personal/samba/class_sambaAccount.inc:221
 msgid "Create samba account"
 msgstr "Crear cuenta samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:217
+#: plugins/personal/samba/class_sambaAccount.inc:219
 msgid ""
 "This account has samba features disabled. You can enable them by clicking "
 "below."
@@ -1828,7 +1873,7 @@ msgstr ""
 "Esta cuenta tiene la extensión samba desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/samba/class_sambaAccount.inc:220
+#: plugins/personal/samba/class_sambaAccount.inc:222
 msgid ""
 "This account has samba features disabled. Posix features are needed for "
 "samba accounts, enable them first."
@@ -1837,44 +1882,44 @@ msgstr ""
 "características Posix son necesarias para las cuentas samba, activelas "
 "primero."
 
-#: plugins/personal/samba/class_sambaAccount.inc:454
+#: plugins/personal/samba/class_sambaAccount.inc:456
 msgid "input on, notify on"
 msgstr "Activación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/personal/samba/class_sambaAccount.inc:457
 msgid "input on, notify off"
 msgstr "Activación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:456
+#: plugins/personal/samba/class_sambaAccount.inc:458
 msgid "input off, notify on"
 msgstr "Desactivación, Notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:457
+#: plugins/personal/samba/class_sambaAccount.inc:459
 msgid "input off, nofify off"
 msgstr "Desactivación, No notificación"
 
-#: plugins/personal/samba/class_sambaAccount.inc:459
+#: plugins/personal/samba/class_sambaAccount.inc:461
 msgid "disconnect"
 msgstr "desconectar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:460
+#: plugins/personal/samba/class_sambaAccount.inc:462
 msgid "reset"
 msgstr "Borrar"
 
-#: plugins/personal/samba/class_sambaAccount.inc:462
+#: plugins/personal/samba/class_sambaAccount.inc:464
 msgid "from any client"
 msgstr "Desde cualquier cliente"
 
-#: plugins/personal/samba/class_sambaAccount.inc:463
+#: plugins/personal/samba/class_sambaAccount.inc:465
 msgid "from previous client only"
 msgstr "solo desde el cliente anterior"
 
-#: plugins/personal/samba/class_sambaAccount.inc:643
+#: plugins/personal/samba/class_sambaAccount.inc:646
 #, 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:653
+#: plugins/personal/samba/class_sambaAccount.inc:656
 #, php-format
 msgid ""
 "The timeout property '%s' is checked and contains invalid or no characters!"
@@ -1882,7 +1927,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:659
+#: plugins/personal/samba/class_sambaAccount.inc:662
 msgid ""
 "The windows user manager only allows eight clients. You've specified more "
 "than eight."
@@ -1890,7 +1935,7 @@ msgstr ""
 "El gestor de usuarios de windows solo permite ocho clientes. Ha especificado "
 "mas de ocho."
 
-#: plugins/personal/samba/class_sambaAccount.inc:843
+#: plugins/personal/samba/class_sambaAccount.inc:846
 msgid ""
 "Warning: This account has an undefined samba SID assigned. The problem can "
 "not be fixed by GOsa!"
@@ -1898,7 +1943,7 @@ msgstr ""
 "Aviso: Esta cuenta tiene asignado un SID indefinido. ¡El problema no puede "
 "ser solucionado por GOsa!"
 
-#: plugins/personal/samba/class_sambaAccount.inc:867
+#: plugins/personal/samba/class_sambaAccount.inc:870
 msgid ""
 "Warning: Can't identify users primary group - no conversion to a samba group "
 "possible!"
@@ -1906,36 +1951,37 @@ msgstr ""
 "Aviso: No puedo identificar el grupo primario de usuarios - ¡No se puede "
 "realizar una conversión a grupo de samba!"
 
-#: plugins/personal/environment/main.inc:124
-#, fuzzy
-msgid "User environment settings"
-msgstr "Parametros del correo de usuarios"
-
-#: plugins/personal/environment/class_hotplugDialog.inc:111
+#: plugins/personal/environment/class_hotplugDialog.inc:113
 #, fuzzy
 msgid "Please specify a valid name. Only 0-9 a-Z is allowed."
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:114
+#: plugins/personal/environment/class_hotplugDialog.inc:116
 #, fuzzy
 msgid "Invalid character in description. Please specify a valid description."
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:117
+#: plugins/personal/environment/class_hotplugDialog.inc:119
 #, fuzzy
 msgid "Please specify a valid id."
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:123
+#: plugins/personal/environment/class_hotplugDialog.inc:125
 #, fuzzy
 msgid "An Entry with this name already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/personal/environment/class_hotplugDialog.inc:128
+#: plugins/personal/environment/class_hotplugDialog.inc:130
 #, fuzzy
 msgid "Please select an entry or press cancel."
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
+#: plugins/personal/environment/class_selectPrinterDialog.inc:69
+#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:101
+#, fuzzy
+msgid "Please select a printer or press cancel."
+msgstr "¡Por favor introduzca un número de teléfono valido!"
+
 #: plugins/personal/environment/hotplugDialog.tpl:1
 #, fuzzy
 msgid "Add hotplug devices"
@@ -1969,43 +2015,37 @@ msgstr "Mostrar usuarios que concuerden con"
 msgid "Regular expression for        matching hotplugs"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
-#, fuzzy
-msgid "Please select a printer or press cancel."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
-
-#: plugins/personal/environment/class_environment.inc:253
-#: plugins/personal/environment/class_environment.inc:290
+#: plugins/personal/environment/class_environment.inc:255
+#: plugins/personal/environment/class_environment.inc:292
 #, fuzzy
 msgid "Remove environment extension"
 msgstr "Eliminar extensión Kolab"
 
-#: plugins/personal/environment/class_environment.inc:254
-#: plugins/personal/environment/class_environment.inc:291
+#: plugins/personal/environment/class_environment.inc:256
+#: plugins/personal/environment/class_environment.inc:293
 #, fuzzy
 msgid "Environment extension enabled. You can disable it by clicking below."
 msgstr ""
 "Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/personal/environment/class_environment.inc:263
-#: plugins/personal/environment/class_environment.inc:268
-#: plugins/personal/environment/class_environment.inc:296
-#: plugins/personal/environment/class_environment.inc:301
+#: plugins/personal/environment/class_environment.inc:265
+#: plugins/personal/environment/class_environment.inc:270
+#: plugins/personal/environment/class_environment.inc:298
+#: plugins/personal/environment/class_environment.inc:303
 msgid "Add environment extension"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:264
-#: plugins/personal/environment/class_environment.inc:297
+#: plugins/personal/environment/class_environment.inc:266
+#: plugins/personal/environment/class_environment.inc:299
 #, fuzzy
 msgid "Environment extension disabled. You can enable it by clicking below."
 msgstr ""
 "Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/environment/class_environment.inc:269
-#: plugins/personal/environment/class_environment.inc:302
+#: plugins/personal/environment/class_environment.inc:271
+#: plugins/personal/environment/class_environment.inc:304
 #, fuzzy
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
@@ -2014,51 +2054,58 @@ msgstr ""
 "Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/environment/class_environment.inc:381
+#: plugins/personal/environment/class_environment.inc:383
 #, fuzzy
 msgid "auto"
 msgstr "Relación"
 
-#: plugins/personal/environment/class_environment.inc:414
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#: plugins/personal/environment/class_environment.inc:416
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 #, fuzzy
 msgid "None"
 msgstr "ninguno"
 
-#: plugins/personal/environment/class_environment.inc:510
-#: plugins/personal/environment/class_environment.inc:521
-#: plugins/admin/systems/class_workstationStartup.inc:503
-#: plugins/admin/systems/class_terminalStartup.inc:134
+#: plugins/personal/environment/class_environment.inc:421
+#, php-format
+msgid ""
+"The selected kiosk profile '%s' is no longer available, setting current "
+"profile to 'none'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:517
+#: plugins/personal/environment/class_environment.inc:528
+#: plugins/admin/systems/class_terminalStartup.inc:156
+#: plugins/admin/systems/class_workstationStartup.inc:533
 #, fuzzy
 msgid "You must specify a valid mount point."
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/personal/environment/class_environment.inc:756
+#: plugins/personal/environment/class_environment.inc:770
 #, fuzzy
 msgid "Please set a valid profile quota size."
 msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/personal/environment/class_environment.inc:763
+#: plugins/personal/environment/class_environment.inc:777
 msgid ""
 "You need to setup a valid posix extension in order to enable evironment "
 "features."
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:801
+#: plugins/personal/environment/class_environment.inc:815
 msgid "Can't save new kiosk profiles, possibly permission denied for folder"
 msgstr ""
 
-#: plugins/personal/environment/class_environment.inc:895
+#: plugins/personal/environment/class_environment.inc:909
 #, fuzzy
 msgid "Error while writing printer"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/personal/environment/class_environment.inc:966
+#: plugins/personal/environment/class_environment.inc:980
 #, fuzzy
 msgid "Error while writing printer settings"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/personal/environment/class_environment.inc:1080
+#: plugins/personal/environment/class_environment.inc:1094
 #, fuzzy
 msgid "Admin"
 msgstr "DN del administrador"
@@ -2090,8 +2137,8 @@ msgid "The environment extension is currently disabled."
 msgstr ""
 
 #: plugins/personal/environment/environment.tpl:8
-#: plugins/personal/environment/environment.tpl:102
-#: plugins/personal/environment/environment.tpl:149
+#: plugins/personal/environment/environment.tpl:103
+#: plugins/personal/environment/environment.tpl:150
 #, fuzzy
 msgid "Environment managment settings"
 msgstr "Parametros del correo de usuarios"
@@ -2139,25 +2186,25 @@ msgstr ""
 msgid "Manage"
 msgstr "Nombre de la maquina"
 
-#: plugins/personal/environment/environment.tpl:81
-msgid "Resolution changeable on runtime"
+#: plugins/personal/environment/environment.tpl:82
+msgid "Resolution changeable during session"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:86
+#: plugins/personal/environment/environment.tpl:87
 #: plugins/admin/systems/workstationService.tpl:94
 #: plugins/admin/systems/terminalService.tpl:94
 msgid "Resolution"
 msgstr "Resolución"
 
-#: plugins/personal/environment/environment.tpl:105
+#: plugins/personal/environment/environment.tpl:106
+#: plugins/admin/systems/servservice.tpl:11
 #: plugins/admin/systems/workstationStartup.tpl:86
 #: plugins/admin/systems/terminalStartup.tpl:66
-#: plugins/admin/systems/servservice.tpl:11
 #, fuzzy
 msgid "Shares"
 msgstr "Borrar"
 
-#: plugins/personal/environment/environment.tpl:121
+#: plugins/personal/environment/environment.tpl:122
 #: plugins/personal/environment/kioskManagement.tpl:15
 #: plugins/personal/generic/generic_certs.tpl:17
 #: plugins/personal/generic/generic_certs.tpl:37
@@ -2165,61 +2212,70 @@ msgstr "Borrar"
 #: plugins/personal/connectivity/class_kolabAccount.inc:206
 #: plugins/admin/fai/faiPackage.tpl:72
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:266
-#: plugins/admin/groups/class_groupMail.inc:537
+#: plugins/admin/groups/class_groupMail.inc:538
 #: plugins/admin/applications/class_applicationParameters.inc:100
+#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
 #: plugins/admin/systems/glpiPrinter.tpl:122
 #: plugins/admin/systems/workstationStartup.tpl:101
-#: plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
 #: plugins/admin/systems/terminalStartup.tpl:81
 #: plugins/admin/systems/glpiManufacturer.tpl:8
-#: plugins/admin/systems/printer.tpl:48
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:274
-#: ihtml/themes/altlinux/islocked.tpl:13 ihtml/themes/lhs/islocked.tpl:13
+#: ihtml/themes/altlinux/islocked.tpl:13
 msgid "Remove"
 msgstr "Eliminar"
 
-#: plugins/personal/environment/environment.tpl:127
+#: plugins/personal/environment/environment.tpl:128
 msgid "Logon scripts"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:128
+#: plugins/personal/environment/environment.tpl:129
 #: plugins/personal/environment/logonManagement.tpl:1
 #: plugins/personal/environment/logonManagement.tpl:5
 #, fuzzy
 msgid "Logon script management"
 msgstr "Gestión del sistema"
 
-#: plugins/personal/environment/environment.tpl:152
+#: plugins/personal/environment/environment.tpl:153
 #, fuzzy
 msgid "Hotplug devices"
 msgstr "Disquetera"
 
-#: plugins/personal/environment/environment.tpl:153
+#: plugins/personal/environment/environment.tpl:154
 #, fuzzy
 msgid "Hotplug device settings"
 msgstr "Disquetera"
 
-#: plugins/personal/environment/environment.tpl:164
-#: plugins/admin/groups/class_groupManagement.inc:456
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:273
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/personal/environment/environment.tpl:165
+#: plugins/admin/groups/class_groupManagement.inc:416
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 msgid "New"
 msgstr "Nuevo"
 
-#: plugins/personal/environment/environment.tpl:165
+#: plugins/personal/environment/environment.tpl:166
 msgid "Existing"
 msgstr ""
 
-#: plugins/personal/environment/environment.tpl:173
+#: plugins/personal/environment/environment.tpl:174
 #, fuzzy
 msgid "Printer settings"
 msgstr "Configuración telefónica"
 
-#: plugins/personal/environment/environment.tpl:183
+#: plugins/personal/environment/environment.tpl:184
 #, fuzzy
 msgid "Admin Toggle"
 msgstr "Usuario administrador"
 
+#: plugins/personal/environment/class_logonManagementDialog.inc:97
+#, fuzzy
+msgid "Specified name is invalid."
+msgstr "El nombre especificado ya esta siendo usado"
+
+#: plugins/personal/environment/class_logonManagementDialog.inc:101
+#, fuzzy
+msgid "Specified description contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+
 #: plugins/personal/environment/logonManagement.tpl:8
 #, fuzzy
 msgid "Logon script settings"
@@ -2232,21 +2288,22 @@ msgstr "Nombre de la lista"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41 plugins/addons/godfs/generic.tpl:12
-#: plugins/addons/godfs/generic.tpl:38 plugins/admin/fai/faiVariable.tpl:19
+#: plugins/gofax/blocklists/generic.tpl:41
 #: plugins/admin/fai/faiPartitionTable.tpl:19
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/faiVariable.tpl:19
 #: plugins/admin/fai/faiScriptEntry.tpl:17 plugins/admin/fai/faiPackage.tpl:19
-#: plugins/admin/fai/faiProfile.tpl:19 plugins/admin/fai/faiScript.tpl:19
+#: plugins/admin/fai/faiProfile.tpl:19
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:11
+#: plugins/admin/fai/faiScript.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:17
 #: plugins/admin/fai/faiTemplate.tpl:19 plugins/admin/fai/faiHookEntry.tpl:17
 #: plugins/admin/fai/faiTemplateEntry.tpl:11 plugins/admin/fai/faiHook.tpl:19
 #: plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/server.tpl:25 plugins/admin/systems/servnfs.tpl:17
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/phone.tpl:25
-#: plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:10
+#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
+#: plugins/admin/systems/servnfs.tpl:17
 #: plugins/admin/systems/wingeneric.tpl:25
 #: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
 #: plugins/gofon/conference/generic.tpl:51
@@ -2279,56 +2336,21 @@ msgstr ""
 
 #: plugins/personal/environment/logonManagement.tpl:75
 #: plugins/gofax/faxaccount/lists.tpl:31
-#: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiScriptEntry.tpl:68
-#: plugins/admin/fai/faiNewBranch.tpl:19
 #: plugins/admin/fai/faiVariableEntry.tpl:48
-#: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/fai/faiHookEntry.tpl:70
 #: plugins/admin/fai/faiTemplateEntry.tpl:130
-#: plugins/admin/groups/application_options.tpl:8
+#: plugins/admin/fai/faiPackageConfiguration.tpl:6
+#: plugins/admin/fai/faiNewBranch.tpl:19
+#: plugins/admin/fai/faiPackageEntry.tpl:56
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/groups/application_options.tpl:11
 #: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/systems/servRepositorySetup.tpl:41
 msgid "Apply"
 msgstr "Aplicar"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
-#, fuzzy
-msgid "Specified name is invalid."
-msgstr "El nombre especificado ya esta siendo usado"
-
-#: plugins/personal/environment/class_logonManagementDialog.inc:100
-#, fuzzy
-msgid "Specified description contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:1
-#, fuzzy
-msgid "Create new hotplug entry"
-msgstr "Crear una nueva entrada en"
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:8
-#, fuzzy
-msgid "Create new hotplug device"
-msgstr "Crear una nueva entrada en"
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:10
-#: plugins/admin/systems/component.tpl:6
-msgid "Device name"
-msgstr "Nombre del dispositivo"
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:28
-#, fuzzy
-msgid "Device ID"
-msgstr "Servicios"
-
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
-#, fuzzy
-msgid "save"
-msgstr "Guardar"
-
 #: plugins/personal/environment/class_kioskManagementDialog.inc:67
 #: plugins/personal/environment/class_kioskManagementDialog.inc:85
 #, php-format
@@ -2351,6 +2373,26 @@ msgstr ""
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
 
+#: plugins/personal/environment/hotplugDialogNew.tpl:1
+#, fuzzy
+msgid "Create new hotplug entry"
+msgstr "Crear una nueva entrada en"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:8
+#, fuzzy
+msgid "Create new hotplug device"
+msgstr "Crear una nueva entrada en"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:10
+#: plugins/admin/systems/component.tpl:6
+msgid "Device name"
+msgstr "Nombre del dispositivo"
+
+#: plugins/personal/environment/hotplugDialogNew.tpl:28
+#, fuzzy
+msgid "Device ID"
+msgstr "Servicios"
+
 #: plugins/personal/environment/kioskManagement.tpl:1
 #: plugins/personal/environment/kioskManagement.tpl:5
 #, fuzzy
@@ -2364,160 +2406,22 @@ msgid "Browse"
 msgstr "Visualizar"
 
 #: plugins/personal/environment/kioskManagement.tpl:25
-#: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
+#: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/glpi_edit_os.tpl:15
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:14
 #: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_os.tpl:15
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: include/class_MultiSelectWindow.inc:45
+#: include/class_MultiSelectWindow.inc:62
 #, fuzzy
 msgid "Close"
 msgstr "Elige"
 
-#: plugins/personal/generic/class_user.inc:256
-msgid "female"
-msgstr "mujer"
-
-#: plugins/personal/generic/class_user.inc:256
-msgid "male"
-msgstr "hombre"
-
-#: plugins/personal/generic/class_user.inc:270
-msgid "This account has no valid GOsa extensions."
-msgstr "Esta cuenta no tiene extensiones GOsa validas"
-
-#: plugins/personal/generic/class_user.inc:324
-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:420
-msgid "Please enter a valid serial number"
-msgstr "Por favor introduzca un número de serie válido"
-
-#: plugins/personal/generic/class_user.inc:457
-#, php-format
-msgid "Certificate is valid from %s to %s and is currently %s."
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "valid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:457
-msgid "invalid"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:461
-#, fuzzy
-msgid "No certificate installed"
-msgstr "Editar certificados"
-
-#: plugins/personal/generic/class_user.inc:879
-msgid "Kerberos database communication failed"
-msgstr "La comunicación con la base de datos Kerberos ha fallado"
-
-#: plugins/personal/generic/class_user.inc:896
-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:907
-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:947
-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:952
-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:958
-#: plugins/addons/addressbook/class_addressbook.inc:545
-#: plugins/admin/users/class_userManagement.inc:634
-msgid "The required field 'Name' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:967
-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:973
-#: plugins/addons/addressbook/class_addressbook.inc:549
-#: plugins/admin/users/class_userManagement.inc:637
-msgid "The required field 'Given name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:976
-msgid "The required field 'Login' is not set."
-msgstr " El campo requerido 'Login' no ha sido rellenado."
-
-#: plugins/personal/generic/class_user.inc:983
-msgid ""
-"There's already a person with this 'Name'/'Given name' combination in the "
-"database."
-msgstr ""
-"Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
-"base de datos."
-
-#: plugins/personal/generic/class_user.inc:990
-msgid ""
-"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
-msgstr ""
-"El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
-"guiones están permitidos."
-
-#: plugins/personal/generic/class_user.inc:993
-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:996
-#: plugins/personal/generic/class_user.inc:1021
-#: plugins/addons/addressbook/class_addressbook.inc:555
-#: plugins/addons/addressbook/class_addressbook.inc:583
-#: plugins/admin/departments/class_departmentGeneric.inc:211
-msgid "The field 'Name' contains invalid characters."
-msgstr "El campo 'Nombre' contiene caracteres no validos."
-
-#: plugins/personal/generic/class_user.inc:999
-#: plugins/personal/generic/class_user.inc:1018
-#: plugins/addons/addressbook/class_addressbook.inc:558
-#: plugins/addons/addressbook/class_addressbook.inc:580
-msgid "The field 'Given name' contains invalid characters."
-msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
-
-#: plugins/personal/generic/class_user.inc:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:214
-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:1007
-#: plugins/addons/addressbook/class_addressbook.inc:569
-#: plugins/admin/departments/class_departmentGeneric.inc:217
-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:1010
-#: plugins/addons/addressbook/class_addressbook.inc:572
-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:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
-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:1140
+#: plugins/personal/environment/main.inc:124
 #, fuzzy
-msgid "Could not open specified certificate!"
-msgstr "No puedo seleccionar la base de datos."
+msgid "User environment settings"
+msgstr "Parametros del correo de usuarios"
 
 #: plugins/personal/generic/password.tpl:2
 msgid ""
@@ -2529,18 +2433,23 @@ msgstr ""
 "Por esa razón tiene que volver a reintroducir su contraseña de nuevo. Gosa "
 "codificara esta con el nuevo método seleccionado."
 
-#: plugins/personal/generic/generic.tpl:6
-msgid "Personal information"
-msgstr "Información personal"
-
-#: plugins/personal/generic/generic.tpl:19
-#: plugins/personal/generic/generic.tpl:32
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
-#: plugins/personal/generic/paste_generic.tpl:41
+#: plugins/personal/generic/generic.tpl:19
+#: plugins/personal/generic/generic.tpl:32
+#: plugins/personal/generic/paste_generic.tpl:50
 msgid "Personal picture"
 msgstr "Foto Personal"
 
+#: plugins/personal/generic/generic_picture.tpl:27
+#: plugins/personal/generic/paste_generic.tpl:27
+msgid "Remove picture"
+msgstr "Eliminar foto"
+
+#: plugins/personal/generic/generic.tpl:6
+msgid "Personal information"
+msgstr "Información personal"
+
 #: plugins/personal/generic/generic.tpl:24
 #: plugins/personal/generic/generic.tpl:34
 msgid "Change picture"
@@ -2549,7 +2458,7 @@ msgstr "Cambiar foto"
 #: plugins/personal/generic/generic.tpl:43
 #: plugins/personal/generic/paste_generic.tpl:7
 #: plugins/addons/addressbook/address_edit.tpl:33
-#: plugins/admin/users/template.tpl:19
+#: plugins/admin/users/template.tpl:23
 #, fuzzy
 msgid "Last name"
 msgstr "Nombre de la lista"
@@ -2562,20 +2471,20 @@ msgstr "Plantilla"
 #: plugins/personal/generic/generic.tpl:55
 #: plugins/personal/generic/paste_generic.tpl:11
 #: plugins/addons/addressbook/address_edit.tpl:30
-#: plugins/admin/users/template.tpl:23
+#: plugins/admin/users/template.tpl:27
 #, fuzzy
 msgid "First name"
 msgstr "Nombre de la lista"
 
 #: plugins/personal/generic/generic.tpl:59
 #: plugins/personal/generic/paste_generic.tpl:15
-#: plugins/admin/users/template.tpl:28
+#: plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Inicio"
 
 #: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_edit.tpl:54
 #: plugins/addons/addressbook/address_info.tpl:22
+#: plugins/addons/addressbook/address_edit.tpl:54
 msgid "Personal title"
 msgstr "Título Personal"
 
@@ -2589,7 +2498,7 @@ msgstr "Fecha de nacimiento"
 
 #: plugins/personal/generic/generic.tpl:100
 #: ihtml/themes/altlinux/sizelimit.tpl:14
-#: ihtml/themes/default/sizelimit.tpl:14 ihtml/themes/lhs/sizelimit.tpl:14
+#: ihtml/themes/default/sizelimit.tpl:14
 msgid "Set"
 msgstr "por debajo"
 
@@ -2604,31 +2513,31 @@ msgid "Preferred langage"
 msgstr "Lenguaje por defecto"
 
 #: plugins/personal/generic/generic.tpl:127
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:319
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
-#: plugins/addons/godfs/class_dfsManagment.inc:186
-#: plugins/admin/fai/class_faiManagement.inc:678
-#: plugins/admin/groups/class_groupManagement.inc:459
+#: plugins/admin/fai/class_faiManagement.inc:679
+#: plugins/admin/groups/class_groupManagement.inc:419
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:787
+#: plugins/admin/users/class_userManagement.inc:702
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/applications/class_applicationManagement.inc:453
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/server.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/workstation.tpl:27
-#: plugins/admin/systems/component.tpl:13
-#: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/phone.tpl:13
-#: plugins/admin/systems/class_systemManagement.inc:772
+#: plugins/admin/departments/class_departmentManagement.inc:306
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
+#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:14
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:17
 #: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/workstation.tpl:23
 #: plugins/admin/systems/wingeneric.tpl:13
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
-#: plugins/admin/ogroups/generic.tpl:21 plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/admin/systems/class_glpiSelectUser.inc:166
+#: plugins/admin/systems/class_systemManagement.inc:736
+#: plugins/admin/systems/class_divListSystem.inc:106
+#: plugins/admin/ogroups/class_ogroupManagement.inc:460
+#: plugins/admin/ogroups/generic.tpl:21
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:336
+#: plugins/gofon/macro/generic.tpl:20
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
 #: plugins/gofon/conference/generic.tpl:33
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
 msgid "Base"
 msgstr "Base"
 
@@ -2639,10 +2548,10 @@ msgstr "Elija el subárbol donde colocar el usuario"
 #: plugins/personal/generic/generic.tpl:134
 #: plugins/admin/groups/generic.tpl:26
 #: plugins/admin/departments/generic.tpl:33
-#: plugins/admin/systems/server.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/workstation.tpl:32
-#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/phone.tpl:18
+#: plugins/admin/systems/component.tpl:18 plugins/admin/systems/server.tpl:20
+#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:22
 #: plugins/admin/systems/printer.tpl:25
+#: plugins/admin/systems/workstation.tpl:28
 #: plugins/admin/systems/wingeneric.tpl:18
 #: plugins/admin/ogroups/generic.tpl:26
 #, fuzzy
@@ -2651,10 +2560,10 @@ msgstr "Seleccione para ver los servidores"
 
 #: plugins/personal/generic/generic.tpl:147
 #: plugins/personal/generic/generic.tpl:291
-#: plugins/addons/addressbook/address_edit.tpl:72
-#: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/addons/addressbook/address_info.tpl:33
 #: plugins/addons/addressbook/address_info.tpl:82
+#: plugins/addons/addressbook/address_edit.tpl:72
+#: plugins/addons/addressbook/address_edit.tpl:182
 #: plugins/admin/departments/generic.tpl:55
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
@@ -2698,16 +2607,16 @@ msgid "Organization"
 msgstr "Organización"
 
 #: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/addons/addressbook/address_edit.tpl:138
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 #: plugins/addons/addressbook/address_info.tpl:64
-#: plugins/admin/groups/class_groupManagement.inc:524
-#: plugins/admin/users/class_userManagement.inc:819
-#: plugins/admin/applications/class_applicationManagement.inc:521
-#: plugins/admin/systems/class_systemManagement.inc:792
-#: plugins/admin/ogroups/class_ogroupManagement.inc:518
-#: plugins/admin/ogroups/class_ogroupManagement.inc:586
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/addons/addressbook/address_edit.tpl:138
+#: plugins/admin/groups/class_groupManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/admin/applications/class_applicationManagement.inc:494
+#: plugins/admin/systems/class_systemManagement.inc:756
+#: plugins/admin/ogroups/class_ogroupManagement.inc:526
+#: plugins/admin/ogroups/class_ogroupManagement.inc:594
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Departamento"
@@ -2731,16 +2640,15 @@ msgstr "Habitación No."
 
 #: plugins/personal/generic/generic.tpl:257
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:95
-#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
+#: plugins/addons/addressbook/address_info.tpl:40
+#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
 msgid "Mobile"
 msgstr "Teléfono Móvil"
 
 #: plugins/personal/generic/generic.tpl:283
-#: plugins/addons/godfs/generic.tpl:34
 #: plugins/admin/departments/generic.tpl:43
 #: plugins/admin/departments/generic.tpl:51
-#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr "Localización"
 
@@ -2783,8 +2691,8 @@ msgid "Street"
 msgstr "Calle"
 
 #: plugins/personal/generic/generic.tpl:365
-#: plugins/addons/addressbook/address_edit.tpl:158
-#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
+#: plugins/addons/addressbook/address_info.tpl:70
+#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
 msgid "Postal code"
 msgstr "Código Postal"
 
@@ -2804,26 +2712,6 @@ msgstr "Último envío"
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
-#: plugins/personal/generic/generic_picture.tpl:27
-#: plugins/personal/generic/paste_generic.tpl:27
-msgid "Remove picture"
-msgstr "Eliminar foto"
-
-#: plugins/personal/generic/generic_picture.tpl:33
-#: plugins/addons/addressbook/address_edit.tpl:233
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
-#: plugins/admin/systems/servnfs.tpl:75
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servdnseditzone.tpl:117
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:12
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:12
-msgid "Save"
-msgstr "Guardar"
-
 #: plugins/personal/generic/generic_certs.tpl:8
 msgid "Standard certificate"
 msgstr "Certificado estandar"
@@ -2840,13 +2728,156 @@ msgstr "Certificado PKCS12"
 msgid "Certificate serial number"
 msgstr "Numero de serie del certificado"
 
-#: plugins/personal/generic/main.inc:107
-msgid "You are not allowed to set your password!"
-msgstr "¡No tiene permisos para cambiar su contraseña!"
-
-#: plugins/personal/generic/main.inc:189
-msgid "Generic user information"
-msgstr "Información genérica del usuario"
+#: plugins/personal/generic/class_user.inc:256
+msgid "female"
+msgstr "mujer"
+
+#: plugins/personal/generic/class_user.inc:256
+msgid "male"
+msgstr "hombre"
+
+#: plugins/personal/generic/class_user.inc:270
+msgid "This account has no valid GOsa extensions."
+msgstr "Esta cuenta no tiene extensiones GOsa validas"
+
+#: plugins/personal/generic/class_user.inc:324
+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:420
+msgid "Please enter a valid serial number"
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/personal/generic/class_user.inc:457
+#, php-format
+msgid "Certificate is valid from %s to %s and is currently %s."
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "valid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:457
+msgid "invalid"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:461
+#, fuzzy
+msgid "No certificate installed"
+msgstr "Editar certificados"
+
+#: plugins/personal/generic/class_user.inc:879
+msgid "Kerberos database communication failed"
+msgstr "La comunicación con la base de datos Kerberos ha fallado"
+
+#: plugins/personal/generic/class_user.inc:896
+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:907
+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:948
+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:953
+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:959
+#: plugins/addons/addressbook/class_addressbook.inc:546
+#: plugins/admin/users/class_userManagement.inc:554
+msgid "The required field 'Name' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:968
+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:974
+#: plugins/addons/addressbook/class_addressbook.inc:550
+#: plugins/admin/users/class_userManagement.inc:557
+msgid "The required field 'Given name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:977
+msgid "The required field 'Login' is not set."
+msgstr " El campo requerido 'Login' no ha sido rellenado."
+
+#: plugins/personal/generic/class_user.inc:984
+msgid ""
+"There's already a person with this 'Name'/'Given name' combination in the "
+"database."
+msgstr ""
+"Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
+"base de datos."
+
+#: plugins/personal/generic/class_user.inc:991
+msgid ""
+"The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
+"guiones están permitidos."
+
+#: plugins/personal/generic/class_user.inc:994
+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:997
+#: plugins/personal/generic/class_user.inc:1022
+#: plugins/addons/addressbook/class_addressbook.inc:556
+#: plugins/addons/addressbook/class_addressbook.inc:584
+#: plugins/admin/departments/class_departmentGeneric.inc:232
+msgid "The field 'Name' contains invalid characters."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
+
+#: plugins/personal/generic/class_user.inc:1000
+#: plugins/personal/generic/class_user.inc:1019
+#: plugins/addons/addressbook/class_addressbook.inc:559
+#: plugins/addons/addressbook/class_addressbook.inc:581
+msgid "The field 'Given name' contains invalid characters."
+msgstr "El campo 'Sobrenombre' contiene caracteres no validos"
+
+#: plugins/personal/generic/class_user.inc:1005
+#: plugins/addons/addressbook/class_addressbook.inc:564
+#: plugins/addons/addressbook/class_addressbook.inc:567
+#: plugins/admin/departments/class_departmentGeneric.inc:235
+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:1008
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/departments/class_departmentGeneric.inc:238
+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:1011
+#: plugins/addons/addressbook/class_addressbook.inc:573
+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:1014
+#: plugins/addons/addressbook/class_addressbook.inc:576
+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:1141
+#, fuzzy
+msgid "Could not open specified certificate!"
+msgstr "No puedo seleccionar la base de datos."
+
+#: plugins/personal/generic/main.inc:107
+msgid "You are not allowed to set your password!"
+msgstr "¡No tiene permisos para cambiar su contraseña!"
+
+#: plugins/personal/generic/main.inc:189
+msgid "Generic user information"
+msgstr "Información genérica del usuario"
 
 #: plugins/personal/generic/paste_generic.tpl:4
 #, fuzzy
@@ -2858,6 +2889,16 @@ msgstr "Parametros del correo de usuarios"
 msgid "User picture"
 msgstr "Foto Personal"
 
+#: plugins/personal/generic/paste_generic.tpl:35
+#, fuzzy
+msgid "Clear password"
+msgstr "Nueva contraseña"
+
+#: plugins/personal/generic/paste_generic.tpl:36
+#, fuzzy
+msgid "Set new password"
+msgstr "Poner Contraseña"
+
 #: plugins/personal/connectivity/proxy.tpl:10
 msgid "Proxy account"
 msgstr "Cuenta proxy"
@@ -2878,29 +2919,19 @@ msgstr "Restringir el uso del proxy con cuota"
 msgid "per"
 msgstr "por"
 
-#: plugins/personal/connectivity/pptp.tpl:3
-#, fuzzy
-msgid "PPTP account"
-msgstr "Cuenta FTP"
-
 #: plugins/personal/connectivity/intranet.tpl:3
 #, fuzzy
 msgid "Intranet account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/personal/connectivity/phpgw.tpl:3
-msgid "PHPGroupware account"
-msgstr "Cuenta PHPGroupware"
-
-#: plugins/personal/connectivity/glpi.tpl:1
-#, fuzzy
-msgid "GLPI account"
-msgstr "Cuenta FTP"
-
 #: plugins/personal/connectivity/class_webdavAccount.inc:6
 msgid "WebDAV"
 msgstr "WebDAV"
 
+#: plugins/personal/connectivity/phpgw.tpl:3
+msgid "PHPGroupware account"
+msgstr "Cuenta PHPGroupware"
+
 #: plugins/personal/connectivity/kolab.tpl:1
 msgid "Kolab account"
 msgstr "Cuenta Kolab"
@@ -3034,31 +3065,6 @@ msgstr "Información de Usuario"
 msgid "User Timezone"
 msgstr "Zona de uso horario del usuario"
 
-#: plugins/personal/connectivity/opengw.tpl:1
-#, fuzzy
-msgid "Opengroupware"
-msgstr "Cuenta PHPGroupware"
-
-#: plugins/personal/connectivity/opengw.tpl:8
-#, fuzzy
-msgid "Location team"
-msgstr "Nombre de la localización"
-
-#: plugins/personal/connectivity/opengw.tpl:21
-#, fuzzy
-msgid "Template user"
-msgstr "Plantilla"
-
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "Locked"
-msgstr ""
-
-#: plugins/personal/connectivity/opengw.tpl:49
-#, fuzzy
-msgid "Teams"
-msgstr "Días para tareas"
-
 #: plugins/personal/connectivity/class_proxyAccount.inc:5
 #: plugins/generic/references/class_reference.inc:32
 msgid "Proxy"
@@ -3089,11 +3095,11 @@ msgstr "semana"
 msgid "month"
 msgstr "mes"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:171
+#: plugins/personal/connectivity/class_proxyAccount.inc:172
 msgid "Numerical value for Quota Setting is empty."
 msgstr ""
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:174
+#: plugins/personal/connectivity/class_proxyAccount.inc:175
 #, fuzzy
 msgid "Numerical value for Quota Setting is not valid."
 msgstr "El valor de 'Tamaño de Cola' no es valido."
@@ -3102,44 +3108,10 @@ msgstr "El valor de 'Tamaño de Cola' no es valido."
 msgid "Intranet"
 msgstr ""
 
-#: plugins/personal/connectivity/class_pptpAccount.inc:26
-msgid "PPTP"
-msgstr ""
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
-#: plugins/generic/references/class_reference.inc:34
-msgid "FTP"
-msgstr "FTP"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:137
-msgid "Value specified as 'Upload bandwidth' is not valid."
-msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:140
-msgid "Value specified as 'Download bandwidth' is not valid."
-msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:143
-msgid "Value specified as 'Files' is not valid."
-msgstr "El valor especificado como 'Archivos' no es válido"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:146
-msgid "Value specified as 'Size' is not valid."
-msgstr "El valor especificado como 'Tamaño' no es válido"
-
-#: plugins/personal/connectivity/class_pureftpdAccount.inc:149
-msgid "Value specified as 'Ratio' is not valid."
-msgstr "El valor especificado como 'relación' no es válido"
-
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
-#: plugins/personal/connectivity/phpscheduleit.tpl:3
-#, fuzzy
-msgid "PHPscheduleit account"
-msgstr "Cuenta PHPGroupware"
-
 #: plugins/personal/connectivity/class_kolabAccount.inc:5
 msgid "Kolab"
 msgstr "Kolab"
@@ -3183,30 +3155,51 @@ msgstr "Manual"
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: plugins/personal/connectivity/class_kolabAccount.inc:232
+#: plugins/personal/connectivity/class_kolabAccount.inc:233
 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:237
+#: plugins/personal/connectivity/class_kolabAccount.inc:238
 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:251
+#: plugins/personal/connectivity/class_kolabAccount.inc:252
 #, 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:259
+#: plugins/personal/connectivity/class_kolabAccount.inc:260
 #, php-format
 msgid "There's no mail user with address '%s' for your invitation policy!"
 msgstr ""
 "¡No hay ningún usuario con cuenta de correo '%s' para su política de "
 "invitación!"
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Cuenta WebDAV"
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:6
+#: plugins/generic/references/class_reference.inc:34
+msgid "FTP"
+msgstr "FTP"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:138
+msgid "Value specified as 'Upload bandwidth' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda ascendente' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:141
+msgid "Value specified as 'Download bandwidth' is not valid."
+msgstr "El valor especificado en 'Ancho de Banda descendente' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:144
+msgid "Value specified as 'Files' is not valid."
+msgstr "El valor especificado como 'Archivos' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:147
+msgid "Value specified as 'Size' is not valid."
+msgstr "El valor especificado como 'Tamaño' no es válido"
+
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:150
+msgid "Value specified as 'Ratio' is not valid."
+msgstr "El valor especificado como 'relación' no es válido"
 
 #: plugins/personal/connectivity/class_oxchangeAccount.inc:24
 msgid "Open-Xchange"
@@ -3268,409 +3261,531 @@ msgstr ""
 msgid "you are not using any strange characters in the loginname."
 msgstr ""
 
-#: plugins/personal/connectivity/class_opengwAccount.inc:6
-#, fuzzy
-msgid "Opengroupware account"
-msgstr "Cuenta PHPGroupware"
-
-#: plugins/personal/connectivity/class_opengwAccount.inc:139
-msgid ""
-"OpenGroupware: Your configuration is missing a postgresql extension. Can't "
-"perform any database queries."
-msgstr ""
-
-#: plugins/personal/connectivity/class_opengwAccount.inc:144
-msgid ""
-"OpenGroupware: Missing database configuration for opengroupware. Can't get "
-"or set any informations."
-msgstr ""
-
-#: plugins/personal/connectivity/class_opengwAccount.inc:152
-msgid ""
-"OpenGroupware: Can't connect to specified database. Please check given "
-"configuration twice."
-msgstr ""
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
 
-#: plugins/personal/connectivity/class_connectivity.inc:63
+#: plugins/personal/connectivity/class_connectivity.inc:65
 msgid "This account has no connectivity extensions."
 msgstr "Esta cuenta no tiene extensiones de conectividad"
 
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+#: plugins/personal/connectivity/pptp.tpl:3
 #, fuzzy
-msgid "PHPscheduleit"
-msgstr "Cuenta PHPGroupware"
-
-#: plugins/gofax/blocklists/generic.tpl:8
-msgid "List name"
-msgstr "Nombre de la lista"
+msgid "PPTP account"
+msgstr "Cuenta FTP"
 
-#: plugins/gofax/blocklists/generic.tpl:10
-msgid "Name of blocklist"
-msgstr "Nombre de la lista de bloqueos"
+#: plugins/personal/connectivity/glpi.tpl:1
+#, fuzzy
+msgid "GLPI account"
+msgstr "Cuenta FTP"
 
-#: plugins/gofax/blocklists/generic.tpl:16
-msgid "Select subtree to place blocklist in"
-msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
+#: plugins/personal/connectivity/opengw.tpl:1
+#, fuzzy
+msgid "Opengroupware"
+msgstr "Cuenta PHPGroupware"
 
-#: plugins/gofax/blocklists/generic.tpl:32
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
-#: plugins/admin/systems/workstationService.tpl:42
-#: plugins/admin/systems/workstationService.tpl:120
-#: plugins/admin/systems/servnfs.tpl:39
-#: plugins/admin/systems/terminalService.tpl:42
-#: plugins/admin/systems/terminalService.tpl:120
-#: plugins/admin/systems/glpi_devices.tpl:427
-#: plugins/admin/systems/glpi_devices.tpl:492
-#: plugins/admin/systems/glpi_devices.tpl:542
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
-#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
-msgid "Type"
-msgstr "Tipo"
+#: plugins/personal/connectivity/opengw.tpl:8
+#, fuzzy
+msgid "Location team"
+msgstr "Nombre de la localización"
 
-#: plugins/gofax/blocklists/generic.tpl:34
-msgid "Select wether to filter incoming or outgoing calls"
-msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
+#: plugins/personal/connectivity/opengw.tpl:21
+#, fuzzy
+msgid "Template user"
+msgstr "Plantilla"
 
-#: plugins/gofax/blocklists/generic.tpl:43
-msgid "Descriptive text for this blocklist"
-msgstr "Descripción de esta lista de bloqueos"
+#: plugins/personal/connectivity/opengw.tpl:34
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/systems/class_workstationGeneric.inc:91
+msgid "Locked"
+msgstr ""
 
-#: plugins/gofax/blocklists/generic.tpl:56
-msgid "Blocked numbers"
-msgstr "Números bloqueados"
+#: plugins/personal/connectivity/opengw.tpl:49
+#, fuzzy
+msgid "Teams"
+msgstr "Días para tareas"
 
-#: plugins/gofax/blocklists/generic.tpl:72
-msgid "Numbers can also contain wild cards."
-msgstr "Los números pueden contener también comodínes"
+#: plugins/personal/connectivity/class_pptpAccount.inc:26
+msgid "PPTP"
+msgstr ""
+
+#: plugins/personal/connectivity/phpscheduleit.tpl:3
+#, fuzzy
+msgid "PHPscheduleit account"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:6
+#, fuzzy
+msgid "Opengroupware account"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:139
+msgid ""
+"OpenGroupware: Your configuration is missing a postgresql extension. Can't "
+"perform any database queries."
+msgstr ""
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:144
+msgid ""
+"OpenGroupware: Missing database configuration for opengroupware. Can't get "
+"or set any informations."
+msgstr ""
+
+#: plugins/personal/connectivity/class_opengwAccount.inc:152
+msgid ""
+"OpenGroupware: Can't connect to specified database. Please check given "
+"configuration twice."
+msgstr ""
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+#, fuzzy
+msgid "PHPscheduleit"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/personal/netatalk/class_netatalk.inc:37
+#, fuzzy
+msgid "Manage netatalk account"
+msgstr "Crear cuenta telefónica"
+
+#: plugins/personal/netatalk/class_netatalk.inc:110
+#, fuzzy
+msgid "This account has no netatalk extensions."
+msgstr "Esta cuenta no tiene extensiones validas de correo."
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid "Remove netatalk account"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/netatalk/class_netatalk.inc:133
+#, fuzzy
+msgid ""
+"This account has netatalk features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo activas. Puede desactivarlas "
+"apretando a continuación."
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#: plugins/personal/netatalk/class_netatalk.inc:146
+#, fuzzy
+msgid "Create netatalk account"
+msgstr "Crear cuenta de correo"
+
+#: plugins/personal/netatalk/class_netatalk.inc:144
+#, fuzzy
+msgid ""
+"This account has netatalk features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Esta cuenta tiene las características de correo desactivadas.Puede "
+"activarlas pulsando aqui."
+
+#: plugins/personal/netatalk/class_netatalk.inc:202
+msgid "You must select a share to use."
+msgstr ""
+
+#: plugins/personal/netatalk/netatalk.tpl:4
+#, fuzzy
+msgid "Share"
+msgstr "Borrar"
+
+#: plugins/personal/netatalk/netatalk.tpl:11
+#: plugins/admin/systems/servnfs.tpl:25
+msgid "Path"
+msgstr ""
+
+#: plugins/personal/netatalk/main.inc:104
+#: ihtml/themes/default/copyPasteDialog.tpl:23
+msgid "Finish"
+msgstr "Terminar"
+
+#: plugins/personal/netatalk/main.inc:121
+#, fuzzy
+msgid "Netatalk settings"
+msgstr "Configuración de red"
 
 #: plugins/gofax/blocklists/class_blocklistManagement.inc:5
 msgid "FAX Blocklists"
 msgstr "Lista de bloqueos de FAX"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:229
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:235
 #, php-format
 msgid "You're about to delete the blocklist '%s'."
 msgstr "Has decidido eliminar la lista de bloqueo '%s'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:241
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:247
 msgid "You have no permission to remove this blocklist."
 msgstr "No tiene permisos para eliminar esta lista de bloqueo."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:251
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:257
 msgid "Please specify a valid phone number."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/admin/fai/class_faiManagement.inc:641
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/admin/fai/class_faiManagement.inc:642
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
+#: plugins/admin/departments/class_departmentManagement.inc:299
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:442
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_systemManagement.inc:717
+#: plugins/admin/systems/class_divListSystem.inc:87
+#: plugins/admin/ogroups/class_ogroupManagement.inc:450
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:283
 #, fuzzy
 msgid "Go to root department"
 msgstr "Lista de Departamentos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:307
-#: plugins/addons/godfs/class_dfsManagment.inc:183
-#: plugins/admin/fai/class_faiManagement.inc:641
-#: plugins/admin/groups/class_groupManagement.inc:451
-#: plugins/admin/users/class_userManagement.inc:778
-#: plugins/admin/applications/class_applicationManagement.inc:472
-#: plugins/admin/departments/class_departmentManagement.inc:296
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
-#: plugins/admin/systems/class_systemManagement.inc:753
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/admin/fai/class_faiManagement.inc:642
+#: plugins/admin/groups/class_groupManagement.inc:411
+#: plugins/admin/users/class_userManagement.inc:693
+#: plugins/admin/applications/class_applicationManagement.inc:445
+#: plugins/admin/departments/class_departmentManagement.inc:299
 #: plugins/admin/systems/class_baseSelectDialog.inc:26
-#: plugins/admin/ogroups/class_ogroupManagement.inc:443
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:324
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
+#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/admin/systems/class_systemManagement.inc:717
+#: plugins/admin/systems/class_divListSystem.inc:87
+#: plugins/admin/ogroups/class_ogroupManagement.inc:451
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:283
 #, fuzzy
 msgid "Root"
 msgstr "Reiniciar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:644
-#: plugins/admin/groups/class_groupManagement.inc:452
-#: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:473
-#: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_systemManagement.inc:755
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/admin/fai/class_faiManagement.inc:645
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
+#: plugins/admin/departments/class_departmentManagement.inc:300
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:444
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:719
+#: plugins/admin/systems/class_divListSystem.inc:89
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
 #, fuzzy
 msgid "Go up one department"
 msgstr "Nombre del departamento"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/addons/godfs/class_dfsManagment.inc:182
-#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
+#: plugins/admin/fai/class_faiManagement.inc:645
 #: plugins/admin/fai/class_faiProfile.inc:303
-#: plugins/admin/groups/class_groupManagement.inc:452
-#: plugins/admin/users/class_userManagement.inc:779
-#: plugins/admin/applications/class_applicationManagement.inc:473
-#: plugins/admin/departments/class_departmentManagement.inc:297
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
-#: plugins/admin/systems/class_systemManagement.inc:755
-#: plugins/admin/systems/class_servDNSeditZone.inc:276
+#: plugins/admin/groups/class_groupManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:694
+#: plugins/admin/applications/class_applicationManagement.inc:446
+#: plugins/admin/departments/class_departmentManagement.inc:300
 #: plugins/admin/systems/class_baseSelectDialog.inc:28
-#: plugins/admin/ogroups/class_ogroupManagement.inc:444
+#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/systems/class_systemManagement.inc:719
+#: plugins/admin/systems/class_servDNSeditZone.inc:289
+#: plugins/admin/systems/class_divListSystem.inc:89
+#: plugins/admin/ogroups/class_ogroupManagement.inc:452
 #: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:330
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:284
 msgid "Up"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/groups/class_groupManagement.inc:453
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:315
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:445
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:721
+#: plugins/admin/systems/class_divListSystem.inc:91
+#: plugins/admin/ogroups/class_ogroupManagement.inc:453
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 #, fuzzy
 msgid "Go to users department"
 msgstr "Seleccione para ver los departamentos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:309
-#: plugins/admin/fai/class_faiManagement.inc:647
-#: plugins/admin/groups/class_groupManagement.inc:453
-#: plugins/admin/users/class_userManagement.inc:780
-#: plugins/admin/applications/class_applicationManagement.inc:474
-#: plugins/admin/departments/class_departmentManagement.inc:298
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
-#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:315
+#: plugins/admin/fai/class_faiManagement.inc:648
+#: plugins/admin/groups/class_groupManagement.inc:413
+#: plugins/admin/users/class_userManagement.inc:695
+#: plugins/admin/applications/class_applicationManagement.inc:447
+#: plugins/admin/departments/class_departmentManagement.inc:301
 #: plugins/admin/systems/class_baseSelectDialog.inc:30
-#: plugins/admin/ogroups/class_ogroupManagement.inc:446
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:326
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:287
+#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/admin/systems/class_systemManagement.inc:721
+#: plugins/admin/systems/class_divListSystem.inc:91
+#: plugins/admin/ogroups/class_ogroupManagement.inc:454
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:285
 #, fuzzy
 msgid "Home"
 msgstr "Nombre de Maquina"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
-#: plugins/admin/fai/class_faiManagement.inc:649
-#: plugins/admin/groups/class_groupManagement.inc:454
-#: plugins/admin/users/class_userManagement.inc:781
-#: plugins/admin/applications/class_applicationManagement.inc:475
-#: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
-#: plugins/admin/systems/class_systemManagement.inc:758
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/admin/fai/class_faiManagement.inc:650
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/departments/class_departmentManagement.inc:302
 #: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: plugins/admin/ogroups/class_ogroupManagement.inc:447
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/ogroups/class_ogroupManagement.inc:455
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
 msgid "Reload list"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/addons/godfs/class_dfsManagment.inc:187
-#: plugins/admin/fai/class_faiManagement.inc:649
-#: plugins/admin/fai/class_faiManagement.inc:679
-#: plugins/admin/groups/class_groupManagement.inc:454
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:781
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/applications/class_applicationManagement.inc:475
-#: plugins/admin/applications/class_applicationManagement.inc:481
-#: plugins/admin/departments/class_departmentManagement.inc:299
-#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:316
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:320
+#: plugins/admin/fai/class_faiManagement.inc:650
+#: plugins/admin/fai/class_faiManagement.inc:680
+#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:696
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:448
+#: plugins/admin/applications/class_applicationManagement.inc:454
+#: plugins/admin/departments/class_departmentManagement.inc:302
+#: plugins/admin/departments/class_departmentManagement.inc:307
+#: plugins/admin/systems/class_baseSelectDialog.inc:31
 #: plugins/admin/systems/class_glpiSelectUser.inc:165
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/systems/class_systemManagement.inc:758
-#: plugins/admin/systems/class_systemManagement.inc:775
-#: plugins/admin/systems/class_baseSelectDialog.inc:31
-#: plugins/admin/ogroups/class_ogroupManagement.inc:447
-#: plugins/admin/ogroups/class_ogroupManagement.inc:453
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:327
+#: plugins/admin/systems/class_systemManagement.inc:722
+#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_divListSystem.inc:92
+#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/ogroups/class_ogroupManagement.inc:455
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:332
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 msgid "Submit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 #, fuzzy
 msgid "Create new blocklist"
 msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
 #, fuzzy
 msgid "New Blocklist"
 msgstr "Listas de bloqueo"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: plugins/addons/godfs/class_dfsManagment.inc:187
-#: plugins/admin/fai/class_faiManagement.inc:679
-#: plugins/admin/groups/class_groupManagement.inc:460
-#: plugins/admin/users/class_userManagement.inc:788
-#: plugins/admin/applications/class_applicationManagement.inc:481
-#: plugins/admin/departments/class_departmentManagement.inc:304
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:320
+#: plugins/admin/fai/class_faiManagement.inc:680
+#: plugins/admin/groups/class_groupManagement.inc:420
+#: plugins/admin/users/class_userManagement.inc:703
+#: plugins/admin/applications/class_applicationManagement.inc:454
+#: plugins/admin/departments/class_departmentManagement.inc:307
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: plugins/admin/systems/class_systemManagement.inc:775
-#: plugins/admin/ogroups/class_ogroupManagement.inc:453
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:332
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: plugins/admin/systems/class_systemManagement.inc:739
+#: plugins/admin/systems/class_divListSystem.inc:109
+#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:291
 #, fuzzy
 msgid "Submit department"
 msgstr "Mostrar departamentos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/fai/class_faiScript.inc:227
-#: plugins/admin/fai/class_faiScript.inc:230
-#: plugins/admin/fai/class_faiManagement.inc:697
-#: plugins/admin/fai/class_faiManagement.inc:797
-#: plugins/admin/fai/class_faiManagement.inc:802
-#: plugins/admin/fai/class_faiHook.inc:251
-#: plugins/admin/fai/class_faiHook.inc:254
-#: plugins/admin/groups/class_groupManagement.inc:470
-#: plugins/admin/groups/class_groupManagement.inc:475
-#: plugins/admin/users/class_userManagement.inc:799
-#: plugins/admin/users/class_userManagement.inc:806
-#: plugins/admin/applications/class_applicationManagement.inc:492
-#: plugins/admin/applications/class_applicationManagement.inc:498
-#: plugins/admin/departments/class_departmentManagement.inc:311
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/admin/fai/class_faiScript.inc:228
+#: plugins/admin/fai/class_faiScript.inc:231
+#: plugins/admin/fai/class_faiTemplate.inc:198
+#: plugins/admin/fai/class_faiTemplate.inc:201
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:798
+#: plugins/admin/fai/class_faiManagement.inc:803
+#: plugins/admin/fai/class_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/users/class_userManagement.inc:711
+#: plugins/admin/users/class_userManagement.inc:718
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/departments/class_departmentManagement.inc:314
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
 #: plugins/admin/systems/glpi.tpl:15 plugins/admin/systems/glpi.tpl:25
 #: plugins/admin/systems/glpi.tpl:35 plugins/admin/systems/glpiPrinter.tpl:15
 #: plugins/admin/systems/glpiPrinter.tpl:25
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:43
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:53
-#: plugins/admin/systems/class_systemManagement.inc:781
-#: plugins/admin/ogroups/class_ogroupManagement.inc:465
-#: plugins/admin/ogroups/class_ogroupManagement.inc:470
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_divListSystem.inc:135
+#: plugins/admin/ogroups/class_ogroupManagement.inc:473
+#: plugins/admin/ogroups/class_ogroupManagement.inc:478
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 #, fuzzy
 msgid "edit"
 msgstr "Editar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:317
-#: plugins/admin/users/class_userManagement.inc:800
-#: plugins/admin/users/class_userManagement.inc:807
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:337
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:323
+#: plugins/admin/users/class_userManagement.inc:712
+#: plugins/admin/users/class_userManagement.inc:719
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:342
 #, fuzzy
 msgid "Edit user"
 msgstr "Usuario administrador"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
 #: plugins/addons/mailqueue/contents.tpl:93
-#: plugins/admin/fai/class_faiScript.inc:231
-#: plugins/admin/fai/class_faiManagement.inc:698
-#: plugins/admin/fai/class_faiManagement.inc:804
-#: plugins/admin/fai/class_faiHook.inc:255
-#: plugins/admin/groups/class_groupManagement.inc:472
-#: plugins/admin/groups/class_groupManagement.inc:477
-#: plugins/admin/users/class_userManagement.inc:803
-#: plugins/admin/users/class_userManagement.inc:810
-#: plugins/admin/applications/class_applicationManagement.inc:494
-#: plugins/admin/applications/class_applicationManagement.inc:500
-#: plugins/admin/departments/class_departmentManagement.inc:312
-#: plugins/admin/systems/class_systemManagement.inc:782
-#: plugins/admin/ogroups/class_ogroupManagement.inc:467
-#: plugins/admin/ogroups/class_ogroupManagement.inc:472
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
+#: plugins/admin/fai/class_faiManagement.inc:699
+#: plugins/admin/fai/class_faiManagement.inc:805
+#: plugins/admin/fai/class_faiHook.inc:256
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/users/class_userManagement.inc:715
+#: plugins/admin/users/class_userManagement.inc:722
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
+#: plugins/admin/departments/class_departmentManagement.inc:315
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
+#: plugins/admin/ogroups/class_ogroupManagement.inc:475
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 #, fuzzy
 msgid "delete"
 msgstr "Borrar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
-#: plugins/admin/users/class_userManagement.inc:804
-#: plugins/admin/users/class_userManagement.inc:811
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:338
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/admin/users/class_userManagement.inc:716
+#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
 #, fuzzy
 msgid "Delete user"
 msgstr "Borrar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:330
 #, fuzzy
 msgid "Blocklist name"
 msgstr "Gestión de listas de bloqueo"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:331
 #: plugins/addons/addressbook/contents.tpl:42
-#: plugins/admin/fai/class_faiManagement.inc:694
-#: plugins/admin/groups/class_groupManagement.inc:526
-#: plugins/admin/users/class_userManagement.inc:821
-#: plugins/admin/applications/class_applicationManagement.inc:522
-#: plugins/admin/departments/class_departmentManagement.inc:319
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/systems/class_systemManagement.inc:793
+#: plugins/admin/fai/class_faiManagement.inc:695
+#: plugins/admin/groups/class_groupManagement.inc:476
+#: plugins/admin/users/class_userManagement.inc:731
+#: plugins/admin/applications/class_applicationManagement.inc:495
+#: plugins/admin/departments/class_departmentManagement.inc:322
 #: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/ogroups/class_ogroupManagement.inc:495
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
+#: plugins/admin/systems/class_systemManagement.inc:757
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
+#: plugins/admin/systems/class_divListSystem.inc:56
+#: plugins/admin/ogroups/class_ogroupManagement.inc:503
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:350
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
 msgid "Actions"
 msgstr "Acciones"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:334
 msgid "This table displays faxblocklists for the selected tree."
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:402
 msgid "send"
 msgstr "enviar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:402
 msgid "receive"
 msgstr "recibir"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:553
 msgid "You have no permissions to create a blocklist on this 'Base'."
 msgstr "No tiene permisos para crear una lista de bloqueo en esta 'Base'."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:549
-#: plugins/admin/departments/class_departmentGeneric.inc:199
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
+#: plugins/admin/departments/class_departmentGeneric.inc:220
 msgid "Required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:562
 msgid "Required field 'Name' contains invalid characters"
 msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:569
 msgid "Specified name is already used."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:576
 msgid "No permission to create a blocklist on this base."
 msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
 
-#: plugins/gofax/blocklists/remove.tpl:2
-#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
-#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
-#: plugins/admin/departments/remove.tpl:2
-#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/systems/remove.tpl:2
-#: plugins/admin/ogroups/remove.tpl:2 plugins/gofon/macro/remove.tpl:2
-#: plugins/gofon/conference/remove.tpl:2 html/index.php:237 html/index.php:243
-#: html/index.php:301 ihtml/themes/altlinux/conflict.tpl:6
-#: ihtml/themes/altlinux/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
-#: ihtml/themes/default/islocked.tpl:6 ihtml/themes/lhs/conflict.tpl:6
-#: ihtml/themes/lhs/islocked.tpl:6
-msgid "Warning"
-msgstr "Aviso"
-
-#: plugins/gofax/blocklists/remove.tpl:6
-#: plugins/admin/systems/remove_glpi.tpl:6
-msgid ""
-"Please double check if your really want to do this since there is no way for "
-"GOsa to get your data back."
-msgstr ""
-"Por favor pulse dos veces si realmente quiere hacer esto, ya que no hay "
-"manera de que GOsa recupere posteriormente la información."
+#: plugins/gofax/blocklists/generic.tpl:8
+msgid "List name"
+msgstr "Nombre de la lista"
+
+#: plugins/gofax/blocklists/generic.tpl:10
+msgid "Name of blocklist"
+msgstr "Nombre de la lista de bloqueos"
+
+#: plugins/gofax/blocklists/generic.tpl:16
+msgid "Select subtree to place blocklist in"
+msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
+
+#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:192
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:37
+#: plugins/admin/systems/servnfs.tpl:39
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/glpi_devices.tpl:427
+#: plugins/admin/systems/glpi_devices.tpl:492
+#: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
+msgid "Type"
+msgstr "Tipo"
+
+#: plugins/gofax/blocklists/generic.tpl:34
+msgid "Select wether to filter incoming or outgoing calls"
+msgstr "Seleccione la manera de filtrar llamadas entrantes o salientes"
+
+#: plugins/gofax/blocklists/generic.tpl:43
+msgid "Descriptive text for this blocklist"
+msgstr "Descripción de esta lista de bloqueos"
+
+#: plugins/gofax/blocklists/generic.tpl:56
+msgid "Blocked numbers"
+msgstr "Números bloqueados"
+
+#: plugins/gofax/blocklists/generic.tpl:72
+msgid "Numbers can also contain wild cards."
+msgstr "Los números pueden contener también comodínes"
+
+#: plugins/gofax/blocklists/remove.tpl:2
+#: plugins/addons/addressbook/remove.tpl:2 plugins/admin/fai/remove.tpl:2
+#: plugins/admin/fai/remove_branch.tpl:2 plugins/admin/groups/remove.tpl:2
+#: plugins/admin/users/remove.tpl:2 plugins/admin/applications/remove.tpl:2
+#: plugins/admin/departments/remove.tpl:2 plugins/admin/systems/remove.tpl:2
+#: plugins/admin/systems/remove_glpi.tpl:2 plugins/admin/ogroups/remove.tpl:2
+#: plugins/gofon/macro/remove.tpl:2 plugins/gofon/conference/remove.tpl:2
+#: html/index.php:242 html/index.php:248 html/index.php:306
+#: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/altlinux/islocked.tpl:6
+#: ihtml/themes/default/conflict.tpl:6 ihtml/themes/default/islocked.tpl:6
+msgid "Warning"
+msgstr "Aviso"
+
+#: plugins/gofax/blocklists/remove.tpl:6
+#: plugins/admin/systems/remove_glpi.tpl:6
+msgid ""
+"Please double check if your really want to do this since there is no way for "
+"GOsa to get your data back."
+msgstr ""
+"Por favor pulse dos veces si realmente quiere hacer esto, ya que no hay "
+"manera de que GOsa recupere posteriormente la información."
 
 #: plugins/gofax/blocklists/remove.tpl:10
 #: plugins/addons/addressbook/remove.tpl:10
@@ -3726,6 +3841,7 @@ msgid "Blocklist management"
 msgstr "Gestión de listas de bloqueo"
 
 #: plugins/gofax/faxaccount/generic.tpl:12
+#: plugins/gofax/faxaccount/paste_generic.tpl:13
 msgid "Fax number for GOfax to trigger on"
 msgstr "Numero de fax que activa GOfax"
 
@@ -3827,8 +3943,8 @@ msgid "FAX settings"
 msgstr "Parametros del Fax"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_edit.tpl:206
 #: plugins/addons/addressbook/address_info.tpl:88
+#: plugins/addons/addressbook/address_edit.tpl:206
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "FAX"
@@ -3865,34 +3981,34 @@ msgstr ""
 msgid "You're trying to add an invalid phone number."
 msgstr "Esta intentando añadir un número de teléfono no valido."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:431
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:513
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:432
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:514
 #: plugins/addons/mailqueue/header.tpl:5
-#: plugins/admin/groups/class_groupApplication.inc:515
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:88
+#: plugins/admin/groups/class_groupApplication.inc:641
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 #, fuzzy
 msgid "back"
 msgstr "Atras"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:640
 msgid "The required field 'Fax' is not set."
 msgstr "No ha rellenado el campo requerido 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:643
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:644
 msgid "Please enter a valid telephone number in the 'Fax' field."
 msgstr "Por favor introduzca un numero de teléfono valido en el campo 'Fax'"
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:651
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:652
 msgid "Mail delivery is checked, but no address has been specified."
 msgstr ""
 "Envío de correo ha sido seleccionado, pero no se ha especificado ninguna "
 "dirección de correo."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:653
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:654
 msgid "The mail address you've entered is invalid."
 msgstr "La cuenta de correo electrónico que ha introducido no es válida."
 
-#: plugins/gofax/faxaccount/class_gofaxAccount.inc:659
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:660
 msgid ""
 "Deliver fax to printer, is only possible if valid printer is given. Please "
 "correct your choice."
@@ -3913,8 +4029,8 @@ msgstr "FAX ID"
 #: plugins/gofax/faxreports/detail.tpl:21
 #: plugins/gofax/faxreports/contents.tpl:30
 #: plugins/admin/fai/faiTemplateEntry.tpl:94
-#: plugins/admin/systems/class_printGeneric.inc:677
-#: plugins/admin/ogroups/class_ogroupManagement.inc:583
+#: plugins/admin/systems/class_printGeneric.inc:746
+#: plugins/admin/ogroups/class_ogroupManagement.inc:591
 msgid "User"
 msgstr "Usuario"
 
@@ -3951,6 +4067,50 @@ msgstr "Tiempo de envio"
 msgid "# pages"
 msgstr "# páginas"
 
+#: plugins/gofax/faxreports/class_faxreport.inc:6
+msgid "FAX Reports"
+msgstr "Informes de FAX"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:109
+#: plugins/gofax/faxreports/class_faxreport.inc:119
+#: plugins/gofax/faxreports/class_faxreport.inc:165
+#: plugins/gofax/faxreports/class_faxreport.inc:274
+msgid "Can't connect to fax database, no reports can be shown!"
+msgstr ""
+"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
+"informes!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:112
+#: plugins/addons/logview/class_logview.inc:66
+#: plugins/gofon/fonreports/class_fonreport.inc:99
+msgid "There is no mysql extension available, please check your php setup."
+msgstr ""
+
+#: plugins/gofax/faxreports/class_faxreport.inc:123
+#: plugins/gofax/faxreports/class_faxreport.inc:128
+#: plugins/gofax/faxreports/class_faxreport.inc:169
+#: plugins/gofax/faxreports/class_faxreport.inc:278
+msgid "Can't select fax database for report generation!"
+msgstr ""
+"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:286
+msgid "Query for fax database failed!"
+msgstr "¡La consulta a la base de datos de fax ha fallado!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:185
+msgid "You have no permission to retrieve informations about this fax id!"
+msgstr ""
+"¡No tiene permisos para recuperar información sobre el identificador (ID) "
+"del fax!"
+
+#: plugins/gofax/faxreports/class_faxreport.inc:205
+#: plugins/gofax/faxreports/class_faxreport.inc:294
+#: plugins/gofon/fonreports/class_fonreport.inc:220
+msgid "Y-M-D"
+msgstr "Y-M-D"
+
 #: plugins/gofax/faxreports/contents.tpl:2
 #: plugins/addons/logview/contents.tpl:2
 #: plugins/gofon/fonreports/contents.tpl:2
@@ -3959,8 +4119,8 @@ msgstr "Filtro"
 
 #: plugins/gofax/faxreports/contents.tpl:6
 #: plugins/addons/addressbook/contents.tpl:102
-#: plugins/addons/mailqueue/contents.tpl:11
 #: plugins/addons/logview/contents.tpl:47
+#: plugins/addons/mailqueue/contents.tpl:11
 #: plugins/gofon/fonreports/contents.tpl:6
 msgid "Search for"
 msgstr "Buscar por"
@@ -3988,11 +4148,10 @@ msgid "during"
 msgstr "durante"
 
 #: plugins/gofax/faxreports/contents.tpl:21
+#: plugins/addons/logview/contents.tpl:67
 #: plugins/addons/mailqueue/contents.tpl:10
 #: plugins/addons/mailqueue/contents.tpl:26
-#: plugins/addons/logview/contents.tpl:67
 #: plugins/gofon/fonreports/contents.tpl:21 ihtml/themes/default/help.tpl:21
-#: ihtml/themes/lhs/help.tpl:21
 msgid "Search"
 msgstr "Buscar"
 
@@ -4017,67 +4176,36 @@ msgstr "Receptor"
 msgid "Search returned no results..."
 msgstr "La busqueda no ha encontrado resultados"
 
-#: plugins/gofax/faxreports/class_faxreport.inc:6
-msgid "FAX Reports"
-msgstr "Informes de FAX"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:109
-#: plugins/gofax/faxreports/class_faxreport.inc:119
-#: plugins/gofax/faxreports/class_faxreport.inc:165
-#: plugins/gofax/faxreports/class_faxreport.inc:274
-msgid "Can't connect to fax database, no reports can be shown!"
-msgstr ""
-"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
-"informes!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:112
-#: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
-msgid "There is no mysql extension available, please check your php setup."
-msgstr ""
-
-#: plugins/gofax/faxreports/class_faxreport.inc:123
-#: plugins/gofax/faxreports/class_faxreport.inc:128
-#: plugins/gofax/faxreports/class_faxreport.inc:169
-#: plugins/gofax/faxreports/class_faxreport.inc:278
-msgid "Can't select fax database for report generation!"
-msgstr ""
-"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:177
-#: plugins/gofax/faxreports/class_faxreport.inc:286
-msgid "Query for fax database failed!"
-msgstr "¡La consulta a la base de datos de fax ha fallado!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:185
-msgid "You have no permission to retrieve informations about this fax id!"
-msgstr ""
-"¡No tiene permisos para recuperar información sobre el identificador (ID) "
-"del fax!"
-
-#: plugins/gofax/faxreports/class_faxreport.inc:205
-#: plugins/gofax/faxreports/class_faxreport.inc:294
-#: plugins/gofon/fonreports/class_fonreport.inc:220
-msgid "Y-M-D"
-msgstr "Y-M-D"
-
 #: plugins/gofax/faxreports/main.inc:5
 msgid "FAX reports"
 msgstr "Reportes de FAX"
 
+#: plugins/addons/addressbook/dial.tpl:3
+msgid "Dial connection..."
+msgstr "Marcando conexión"
+
+#: plugins/addons/addressbook/dial.tpl:10
+#: plugins/addons/addressbook/class_addressbook.inc:360
+#: plugins/addons/addressbook/class_addressbook.inc:367
+#: plugins/addons/addressbook/class_addressbook.inc:371
+#: plugins/addons/addressbook/class_addressbook.inc:453
+msgid "Dial"
+msgstr "Llamar"
+
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/admin/fai/faiVariable.tpl:9
+#: plugins/addons/addressbook/address_info.tpl:16
 #: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/faiPackage.tpl:9 plugins/admin/fai/faiProfile.tpl:9
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:6
-#: plugins/admin/fai/faiScriptEntry.tpl:9 plugins/admin/fai/faiPackage.tpl:9
-#: plugins/admin/fai/faiProfile.tpl:9 plugins/admin/fai/faiScript.tpl:9
-#: plugins/admin/fai/faiVariableEntry.tpl:9
+#: plugins/admin/fai/faiScript.tpl:9 plugins/admin/fai/faiVariableEntry.tpl:9
 #: plugins/admin/fai/faiTemplate.tpl:9 plugins/admin/fai/faiHookEntry.tpl:9
 #: plugins/admin/fai/faiTemplateEntry.tpl:7 plugins/admin/fai/faiHook.tpl:9
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
 #: plugins/admin/systems/servnfs.tpl:9
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:10
 #: plugins/admin/systems/glpi_devices.tpl:105
 #: plugins/admin/systems/glpi_devices.tpl:146
@@ -4091,16 +4219,14 @@ msgstr "Reportes de FAX"
 #: plugins/admin/systems/glpi_devices.tpl:615
 #: plugins/admin/systems/glpi_devices.tpl:669
 #: plugins/admin/systems/glpi_devices.tpl:715
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
 #: plugins/gofon/macro/parameter.tpl:5 html/getxls.php:174 html/getxls.php:233
 msgid "Name"
 msgstr "Nombre"
 
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_edit.tpl:66
 #: plugins/addons/addressbook/address_info.tpl:29
+#: plugins/addons/addressbook/address_edit.tpl:66
 msgid "Private"
 msgstr "Privado"
 
@@ -4123,7 +4249,7 @@ msgid "Add entry"
 msgstr "Añadir entrada"
 
 #: plugins/addons/addressbook/contents.tpl:50
-#: plugins/admin/groups/class_groupApplication.inc:597
+#: plugins/admin/groups/class_groupApplication.inc:723
 msgid "Edit entry"
 msgstr "Editar entrada"
 
@@ -4163,60 +4289,6 @@ msgstr "Elegir el objeto que sera buscado"
 msgid "Search string"
 msgstr "Cadena de busqueda"
 
-#: plugins/addons/addressbook/dial.tpl:3
-msgid "Dial connection..."
-msgstr "Marcando conexión"
-
-#: plugins/addons/addressbook/dial.tpl:10
-#: plugins/addons/addressbook/class_addressbook.inc:360
-#: plugins/addons/addressbook/class_addressbook.inc:367
-#: plugins/addons/addressbook/class_addressbook.inc:371
-#: plugins/addons/addressbook/class_addressbook.inc:453
-msgid "Dial"
-msgstr "Llamar"
-
-#: plugins/addons/addressbook/address_edit.tpl:7
-msgid "Choose the department to store entry in"
-msgstr "Elija un departamento para guardar la entrada"
-
-#: plugins/addons/addressbook/address_edit.tpl:24
-#: plugins/addons/addressbook/address_info.tpl:12
-msgid "Personal"
-msgstr "Personal"
-
-#: plugins/addons/addressbook/address_edit.tpl:44
-#: plugins/addons/addressbook/address_info.tpl:19 html/getxls.php:174
-#: html/getxls.php:236
-msgid "Initials"
-msgstr "Iniciales"
-
-#: plugins/addons/addressbook/address_edit.tpl:105
-#: plugins/addons/addressbook/address_info.tpl:43
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
-msgid "Email"
-msgstr "Correo Electrónico"
-
-#: plugins/addons/addressbook/address_edit.tpl:119
-#: plugins/addons/addressbook/address_info.tpl:53
-msgid "Organizational"
-msgstr "De organización"
-
-#: plugins/addons/addressbook/address_edit.tpl:128
-#: plugins/addons/addressbook/address_info.tpl:61
-msgid "Company"
-msgstr "Compañia"
-
-#: plugins/addons/addressbook/address_edit.tpl:148
-#: plugins/addons/addressbook/address_info.tpl:67 html/getxls.php:174
-#: html/getxls.php:236
-msgid "City"
-msgstr "Ciudad"
-
-#: plugins/addons/addressbook/address_edit.tpl:168
-#: plugins/addons/addressbook/address_info.tpl:73
-msgid "Country"
-msgstr "Pais"
-
 #: plugins/addons/addressbook/remove.tpl:6
 msgid ""
 "This includes all addressbook data in this entry. Please double check if "
@@ -4287,10 +4359,10 @@ msgid "Creating new entry in"
 msgstr "Crear una nueva entrada en"
 
 #: plugins/addons/addressbook/class_addressbook.inc:513
-#: plugins/addons/mailqueue/class_mailqueue.inc:286
-#: plugins/addons/mailqueue/class_mailqueue.inc:351
 #: plugins/addons/logview/class_logview.inc:94
 #: plugins/addons/logview/class_logview.inc:111
+#: plugins/addons/mailqueue/class_mailqueue.inc:286
+#: plugins/addons/mailqueue/class_mailqueue.inc:351
 msgid "All"
 msgstr "Todo"
 
@@ -4317,248 +4389,61 @@ msgstr "Teléfono particular"
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: plugins/addons/addressbook/class_addressbook.inc:596
+#: plugins/addons/addressbook/class_addressbook.inc:597
 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:604
+#: plugins/addons/addressbook/class_addressbook.inc:605
 msgid ""
 "You have no permissions to create or modify a global address book entry."
 msgstr ""
 "No tiene permisos para crear o modificar una entrada de libreta de "
 "direcciones global."
 
-#: plugins/addons/mailqueue/main.inc:23
-#: plugins/addons/mailqueue/class_mailqueue.inc:6
-#, fuzzy
-msgid "Mail queue"
-msgstr "Servidor"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:58
-msgid ""
-"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
-msgstr ""
+#: plugins/addons/addressbook/address_info.tpl:12
+#: plugins/addons/addressbook/address_edit.tpl:24
+msgid "Personal"
+msgstr "Personal"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:85
-#: plugins/addons/mailqueue/class_mailqueue.inc:93
-#: plugins/addons/mailqueue/class_mailqueue.inc:112
-#: plugins/addons/mailqueue/class_mailqueue.inc:121
-#: plugins/addons/mailqueue/class_mailqueue.inc:176
-#: plugins/addons/mailqueue/class_mailqueue.inc:203
-#, php-format
-msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
-msgstr ""
+#: plugins/addons/addressbook/address_info.tpl:19
+#: plugins/addons/addressbook/address_edit.tpl:44 html/getxls.php:174
+#: html/getxls.php:236
+msgid "Initials"
+msgstr "Iniciales"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:256
-msgid "up"
-msgstr ""
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:258
-#, fuzzy
-msgid "down"
-msgstr "Dominio"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:301
-msgid "no limit"
-msgstr ""
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:306
-#, fuzzy
-msgid "hours"
-msgstr "hora"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:352
-msgid "Hold"
-msgstr ""
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:353
-msgid "Un hold"
-msgstr ""
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:354
-#: plugins/addons/mailqueue/contents.tpl:76
-#, fuzzy
-msgid "Active"
-msgstr "Privado"
-
-#: plugins/addons/mailqueue/class_mailqueue.inc:355
-msgid "Not active"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:12
-#, fuzzy
-msgid "Please enter a search string here."
-msgstr "Por favor introduzca un número de serie válido"
-
-#: plugins/addons/mailqueue/contents.tpl:14
-#, fuzzy
-msgid "Select a server"
-msgstr "Seleccione para ver los servidores"
-
-#: plugins/addons/mailqueue/contents.tpl:17
-#, fuzzy
-msgid "with status"
-msgstr "Estado"
-
-#: plugins/addons/mailqueue/contents.tpl:21
-msgid "within the last"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:29
-msgid "Remove all messages"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:30
-msgid "Remove all messages from selected servers queue"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:31
-#, fuzzy
-msgid "Hold all messages"
-msgstr "reenviar mensajes a"
-
-#: plugins/addons/mailqueue/contents.tpl:32
-msgid "Hold all messages in selected servers queue"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:33
-msgid "Release all messages"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:34
-msgid "Release all messages in selected servers queue"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:35
-msgid "Requeue all messages"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:36
-msgid "Requeue all messages in selected servers queue"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:46
-#, fuzzy
-msgid "Search returned no results"
-msgstr "La busqueda no ha encontrado resultados"
-
-#: plugins/addons/mailqueue/contents.tpl:52
-#, fuzzy
-msgid "ID"
-msgstr "UID"
-
-#: plugins/addons/mailqueue/contents.tpl:55
-#, fuzzy
-msgid "Arrival"
-msgstr "Abril"
-
-#: plugins/addons/mailqueue/contents.tpl:57
-#, fuzzy
-msgid "Recipient"
-msgstr "Descripción"
-
-#: plugins/addons/mailqueue/contents.tpl:58
-msgid "Error"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:93
-#, fuzzy
-msgid "Delete this message"
-msgstr "Borrar"
-
-#: plugins/addons/mailqueue/contents.tpl:97
-msgid "unhold"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:97
-#, fuzzy
-msgid "Release message"
-msgstr "Estado del mensaje"
-
-#: plugins/addons/mailqueue/contents.tpl:101
-#, fuzzy
-msgid "hold"
-msgstr "método"
-
-#: plugins/addons/mailqueue/contents.tpl:101
-#, fuzzy
-msgid "Hold message"
-msgstr "Página Web Principal"
-
-#: plugins/addons/mailqueue/contents.tpl:105
-#, fuzzy
-msgid "requeue"
-msgstr "Número de teléfono"
-
-#: plugins/addons/mailqueue/contents.tpl:105
-msgid "Requeue this message"
-msgstr ""
-
-#: plugins/addons/mailqueue/contents.tpl:108
-#, fuzzy
-msgid "header"
-msgstr "Remitente"
-
-#: plugins/addons/mailqueue/contents.tpl:108
-#, fuzzy
-msgid "Display header from this message"
-msgstr "Mostrar números que concuerdan con"
-
-#: plugins/addons/ldapmanager/contentexportxls.tpl:3
-#, fuzzy
-msgid ""
-"The XLS export plugin provides methods to download a complete snapshot of "
-"the running LDAP directory as xls. You may save these files for "
-"documentation."
-msgstr ""
-"La extensión exportar LDIF provee los metodos para descargar una copia "
-"espejo del directorio LDAP actual como un archivo LDIF. Puede grabar estos "
-"ficheros como copias de seguridad o para iniciar un nuevo servidor."
-
-#: plugins/addons/ldapmanager/contentexportxls.tpl:10
-#: plugins/addons/ldapmanager/contentexport.tpl:10
-msgid "Export single entry"
-msgstr "Exportar solo esta entrada"
-
-#: plugins/addons/ldapmanager/contentexportxls.tpl:14
-#, fuzzy
-msgid "Choose the data you want to Export"
-msgstr "Elija el departamento que quiera exportar"
-
-#: plugins/addons/ldapmanager/contentexportxls.tpl:24
-#, fuzzy
-msgid "Export complete XLS for"
-msgstr "Exportación del LDIF completada para"
+#: plugins/addons/addressbook/address_info.tpl:43
+#: plugins/addons/addressbook/address_edit.tpl:105
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:46
+msgid "Email"
+msgstr "Correo Electrónico"
 
-#: plugins/addons/ldapmanager/contentexportxls.tpl:27
-#: plugins/addons/ldapmanager/contentexportxls.tpl:42
-#: plugins/addons/ldapmanager/contentexport.tpl:24
-#: plugins/addons/ldapmanager/contentexport.tpl:39
-msgid "Choose the department you want to Export"
-msgstr "Elija el departamento que quiera exportar"
+#: plugins/addons/addressbook/address_info.tpl:53
+#: plugins/addons/addressbook/address_edit.tpl:119
+msgid "Organizational"
+msgstr "De organización"
 
-#: plugins/addons/ldapmanager/contentexportxls.tpl:39
-#: plugins/addons/ldapmanager/contentexport.tpl:36
-msgid "Export IVBB LDIF for"
-msgstr "Exportación IVBB LDIF para"
+#: plugins/addons/addressbook/address_info.tpl:61
+#: plugins/addons/addressbook/address_edit.tpl:128
+msgid "Company"
+msgstr "Compañia"
 
-#: plugins/addons/ldapmanager/contentexportxls.tpl:58
-#: plugins/addons/ldapmanager/contentexport.tpl:55
-msgid "Export successful"
-msgstr "Exportación completada"
+#: plugins/addons/addressbook/address_info.tpl:67
+#: plugins/addons/addressbook/address_edit.tpl:148 html/getxls.php:174
+#: html/getxls.php:236
+msgid "City"
+msgstr "Ciudad"
 
-#: plugins/addons/ldapmanager/contentexportxls.tpl:62
-#, fuzzy
-msgid "Click here to save the complete LDAP database to a xls file"
-msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
+#: plugins/addons/addressbook/address_info.tpl:73
+#: plugins/addons/addressbook/address_edit.tpl:168
+msgid "Country"
+msgstr "Pais"
 
-#: plugins/addons/ldapmanager/contentexportxls.tpl:62
-#, fuzzy
-msgid "Click here to save the LDAP Export to a xls file"
-msgstr "Pulse aquí para exportar la base de datos LDAP"
+#: plugins/addons/addressbook/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Elija un departamento para guardar la entrada"
 
 #: plugins/addons/ldapmanager/class_csvimport.inc:6
 #: plugins/addons/ldapmanager/class_import.inc:6
@@ -4679,21 +4564,6 @@ msgstr "Este es el informe de estado de la importación:"
 msgid "Selected Template"
 msgstr "Plantilla seleccionada"
 
-#: plugins/addons/ldapmanager/class_exportxls.inc:7
-#, fuzzy
-msgid "XLS import"
-msgstr "Importar desde CSV"
-
-#: plugins/addons/ldapmanager/class_exportxls.inc:39
-#: plugins/addons/ldapmanager/class_export.inc:38
-msgid "You've no permission to do LDAP exports."
-msgstr "No tiene permisos para hacer exportaciones LDAP."
-
-#: plugins/addons/ldapmanager/class_exportxls.inc:89
-#: plugins/addons/ldapmanager/class_export.inc:83
-msgid "Error while exporting the requested entries!"
-msgstr "¡Error mientras se exportaban las entradas indicadas!"
-
 #: plugins/addons/ldapmanager/class_import.inc:41
 msgid "You've no permission to do LDAP imports."
 msgstr "No tiene permisos para hacer importaciones LDAP"
@@ -4712,17 +4582,39 @@ msgstr ""
 "espejo del directorio LDAP actual como un archivo LDIF. Puede grabar estos "
 "ficheros como copias de seguridad o para iniciar un nuevo servidor."
 
+#: plugins/addons/ldapmanager/contentexport.tpl:10
+#: plugins/addons/ldapmanager/contentexportxls.tpl:10
+msgid "Export single entry"
+msgstr "Exportar solo esta entrada"
+
 #: plugins/addons/ldapmanager/contentexport.tpl:21
 msgid "Export complete LDIF for"
 msgstr "Exportación del LDIF completada para"
 
-#: plugins/addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the complete LDAP database to a file"
-msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
+#: plugins/addons/ldapmanager/contentexport.tpl:24
+#: plugins/addons/ldapmanager/contentexport.tpl:39
+#: plugins/addons/ldapmanager/contentexportxls.tpl:27
+#: plugins/addons/ldapmanager/contentexportxls.tpl:42
+msgid "Choose the department you want to Export"
+msgstr "Elija el departamento que quiera exportar"
 
-#: plugins/addons/ldapmanager/contentexport.tpl:59
-msgid "Click here to save the LDAP Export "
-msgstr "Pulse aquí para exportar la base de datos LDAP"
+#: plugins/addons/ldapmanager/contentexport.tpl:36
+#: plugins/addons/ldapmanager/contentexportxls.tpl:39
+msgid "Export IVBB LDIF for"
+msgstr "Exportación IVBB LDIF para"
+
+#: plugins/addons/ldapmanager/contentexport.tpl:55
+#: plugins/addons/ldapmanager/contentexportxls.tpl:58
+msgid "Export successful"
+msgstr "Exportación completada"
+
+#: plugins/addons/ldapmanager/contentexport.tpl:59
+msgid "Click here to save the complete LDAP database to a file"
+msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
+
+#: plugins/addons/ldapmanager/contentexport.tpl:59
+msgid "Click here to save the LDAP Export "
+msgstr "Pulse aquí para exportar la base de datos LDAP"
 
 #: plugins/addons/ldapmanager/class_ldif.inc:7
 #: plugins/addons/ldapmanager/main.inc:23
@@ -4733,6 +4625,52 @@ msgstr "Gestor LDAP"
 msgid "CSV import"
 msgstr "Importar desde CSV"
 
+#: plugins/addons/ldapmanager/class_export.inc:38
+#: plugins/addons/ldapmanager/class_exportxls.inc:39
+msgid "You've no permission to do LDAP exports."
+msgstr "No tiene permisos para hacer exportaciones LDAP."
+
+#: plugins/addons/ldapmanager/class_export.inc:83
+#: plugins/addons/ldapmanager/class_exportxls.inc:89
+msgid "Error while exporting the requested entries!"
+msgstr "¡Error mientras se exportaban las entradas indicadas!"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:3
+#, fuzzy
+msgid ""
+"The XLS export plugin provides methods to download a complete snapshot of "
+"the running LDAP directory as xls. You may save these files for "
+"documentation."
+msgstr ""
+"La extensión exportar LDIF provee los metodos para descargar una copia "
+"espejo del directorio LDAP actual como un archivo LDIF. Puede grabar estos "
+"ficheros como copias de seguridad o para iniciar un nuevo servidor."
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:14
+#, fuzzy
+msgid "Choose the data you want to Export"
+msgstr "Elija el departamento que quiera exportar"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:24
+#, fuzzy
+msgid "Export complete XLS for"
+msgstr "Exportación del LDIF completada para"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+#, fuzzy
+msgid "Click here to save the complete LDAP database to a xls file"
+msgstr "Pulse aquí para grabar la base de datos LDAP completa a un archivo"
+
+#: plugins/addons/ldapmanager/contentexportxls.tpl:62
+#, fuzzy
+msgid "Click here to save the LDAP Export to a xls file"
+msgstr "Pulse aquí para exportar la base de datos LDAP"
+
+#: plugins/addons/ldapmanager/class_exportxls.inc:7
+#, fuzzy
+msgid "XLS import"
+msgstr "Importar desde CSV"
+
 #: plugins/addons/logview/class_logview.inc:6
 msgid "System logs"
 msgstr "Registro del sistema"
@@ -4828,165 +4766,197 @@ msgstr "Mensaje"
 msgid "System log view"
 msgstr "Ver registro del sistema"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:16
-#: plugins/addons/godfs/contents.tpl:8
+#: plugins/addons/mailqueue/class_mailqueue.inc:6
+#: plugins/addons/mailqueue/main.inc:23
 #, fuzzy
-msgid "DFS Shares"
-msgstr "Borrar"
+msgid "Mail queue"
+msgstr "Servidor"
 
-#: plugins/addons/godfs/class_dfsManagment.inc:141
-msgid "No DFS entries found"
+#: plugins/addons/mailqueue/class_mailqueue.inc:58
+msgid ""
+"Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsManagment.inc:182
-#, fuzzy
-msgid "Go up one dfsshare"
-msgstr "Nombre del departamento"
+#: plugins/addons/mailqueue/class_mailqueue.inc:85
+#: plugins/addons/mailqueue/class_mailqueue.inc:93
+#: plugins/addons/mailqueue/class_mailqueue.inc:112
+#: plugins/addons/mailqueue/class_mailqueue.inc:121
+#: plugins/addons/mailqueue/class_mailqueue.inc:176
+#: plugins/addons/mailqueue/class_mailqueue.inc:203
+#, php-format
+msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
+msgstr ""
 
-#: plugins/addons/godfs/class_dfsManagment.inc:183
-msgid "Go to dfs root"
+#: plugins/addons/mailqueue/class_mailqueue.inc:256
+msgid "up"
 msgstr ""
 
-#: plugins/addons/godfs/class_dfsManagment.inc:184
+#: plugins/addons/mailqueue/class_mailqueue.inc:258
 #, fuzzy
-msgid "Create new dfsshare"
-msgstr "Crear una nueva entrada en"
+msgid "down"
+msgstr "Dominio"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:87
-#, fuzzy
-msgid "You have no premissions to create a dfs share."
-msgstr "No tiene permisos para crear un usuario en esta 'Base'."
+#: plugins/addons/mailqueue/class_mailqueue.inc:301
+msgid "no limit"
+msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:94
-#: plugins/addons/godfs/class_dfsgeneric.inc:96
+#: plugins/addons/mailqueue/class_mailqueue.inc:306
 #, fuzzy
-msgid "Dfs share already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
+msgid "hours"
+msgstr "hora"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:101
-#, fuzzy
-msgid "Required Field \"Name of dfs Share\" is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+#: plugins/addons/mailqueue/class_mailqueue.inc:352
+msgid "Hold"
+msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:104
-#, fuzzy
-msgid "Required Field \"Description\" is not set."
-msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+#: plugins/addons/mailqueue/class_mailqueue.inc:353
+msgid "Un hold"
+msgstr ""
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:107
+#: plugins/addons/mailqueue/class_mailqueue.inc:354
+#: plugins/addons/mailqueue/contents.tpl:76
 #, fuzzy
-msgid "Required Field \"Fileserver\" is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+msgid "Active"
+msgstr "Privado"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:110
+#: plugins/addons/mailqueue/class_mailqueue.inc:355
+msgid "Not active"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:12
 #, fuzzy
-msgid "Required Field \"Share on fileserver\" is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+msgid "Please enter a search string here."
+msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/addons/godfs/class_dfsgeneric.inc:113
+#: plugins/addons/mailqueue/contents.tpl:14
 #, fuzzy
-msgid "Required Field \"Location\" is not set."
-msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+msgid "Select a server"
+msgstr "Seleccione para ver los servidores"
 
-#: plugins/addons/godfs/contents.tpl:26
+#: plugins/addons/mailqueue/contents.tpl:17
 #, fuzzy
-msgid ""
-"This menu allows you to create, delete and edit selected dfs shares. Having "
-"a large numbers of dfs shares, you might prefer the range selectors on top "
-"of the dfs share list."
+msgid "with status"
+msgstr "Estado"
+
+#: plugins/addons/mailqueue/contents.tpl:21
+msgid "within the last"
 msgstr ""
-"Este menú permite añadir, editar o eliminar los departamentos seleccionados. "
-"Puede usar el selector de rango en la parte superior de la lista de "
-"departamentos, cuando trabaja con un gran número de departamentos."
 
-#: plugins/addons/godfs/contents.tpl:40
-#, fuzzy
-msgid "Display dfs shares matching"
-msgstr "Mostrar direcciones que concuerden con"
+#: plugins/addons/mailqueue/contents.tpl:29
+msgid "Remove all messages"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:30
+msgid "Remove all messages from selected servers queue"
+msgstr ""
 
-#: plugins/addons/godfs/contents.tpl:44
+#: plugins/addons/mailqueue/contents.tpl:31
 #, fuzzy
-msgid "Regular expression for matching dfs share names"
-msgstr "Expresiones regulares para encontrar nombres de sistemas"
+msgid "Hold all messages"
+msgstr "reenviar mensajes a"
+
+#: plugins/addons/mailqueue/contents.tpl:32
+msgid "Hold all messages in selected servers queue"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:33
+msgid "Release all messages"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:34
+msgid "Release all messages in selected servers queue"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:35
+msgid "Requeue all messages"
+msgstr ""
+
+#: plugins/addons/mailqueue/contents.tpl:36
+msgid "Requeue all messages in selected servers queue"
+msgstr ""
 
-#: plugins/addons/godfs/generic.tpl:4
+#: plugins/addons/mailqueue/contents.tpl:46
 #, fuzzy
-msgid "DFS Properties"
-msgstr "Propiedades"
+msgid "Search returned no results"
+msgstr "La busqueda no ha encontrado resultados"
 
-#: plugins/addons/godfs/generic.tpl:8
+#: plugins/addons/mailqueue/contents.tpl:52
 #, fuzzy
-msgid "Name of dfs Share"
-msgstr "Nombre del departamento"
+msgid "ID"
+msgstr "UID"
 
-#: plugins/addons/godfs/generic.tpl:16
+#: plugins/addons/mailqueue/contents.tpl:55
 #, fuzzy
-msgid "Fileserver"
-msgstr "Servidor"
+msgid "Arrival"
+msgstr "Abril"
 
-#: plugins/addons/godfs/generic.tpl:20
+#: plugins/addons/mailqueue/contents.tpl:57
 #, fuzzy
-msgid "Share on Fileserver"
-msgstr "Servicio de impresión"
+msgid "Recipient"
+msgstr "Descripción"
+
+#: plugins/addons/mailqueue/contents.tpl:58
+msgid "Error"
+msgstr ""
 
-#: plugins/addons/godfs/generic.tpl:30
+#: plugins/addons/mailqueue/contents.tpl:93
 #, fuzzy
-msgid "DFS Location"
-msgstr "Localización"
+msgid "Delete this message"
+msgstr "Borrar"
 
-#: plugins/addons/godfs/main.inc:21 plugins/addons/godfs/main.inc:27
-msgid "Distributed Filesystem Administration"
+#: plugins/addons/mailqueue/contents.tpl:97
+msgid "unhold"
 msgstr ""
 
-#: plugins/admin/fai/class_faiScript.inc:240
-#: plugins/admin/fai/class_faiScriptEntry.inc:89
-#: plugins/admin/fai/class_faiHook.inc:264
-#: plugins/admin/fai/class_faiHookEntry.inc:84
+#: plugins/addons/mailqueue/contents.tpl:97
 #, fuzzy
-msgid "Download"
-msgstr "Dominio"
+msgid "Release message"
+msgstr "Estado del mensaje"
 
-#: plugins/admin/fai/faiVariable.tpl:32
-#: plugins/admin/fai/faiPartitionTable.tpl:32
-#: plugins/admin/fai/faiScript.tpl:32 plugins/admin/fai/faiTemplate.tpl:29
-#: plugins/admin/fai/class_faiProfileEntry.inc:155
-#: plugins/admin/fai/faiHook.tpl:32
+#: plugins/addons/mailqueue/contents.tpl:101
 #, fuzzy
-msgid "Objects"
-msgstr "Objeto"
+msgid "hold"
+msgstr "método"
 
-#: plugins/admin/fai/faiVariable.tpl:34
+#: plugins/addons/mailqueue/contents.tpl:101
 #, fuzzy
-msgid "List of assigned variables"
-msgstr "Elija tipo de ratón"
+msgid "Hold message"
+msgstr "Página Web Principal"
 
-#: plugins/admin/fai/faiVariable.tpl:40
-msgid "Choose a variable to delete or edit"
-msgstr ""
+#: plugins/addons/mailqueue/contents.tpl:105
+#, fuzzy
+msgid "requeue"
+msgstr "Número de teléfono"
 
-#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
-#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
-#: plugins/admin/fai/tabsTemplate.inc:34 plugins/admin/fai/tabsProfile.inc:34
-#: plugins/admin/fai/tabsScript.inc:34
-#: plugins/admin/departments/tabs_department.inc:31
-msgid "Try to move tree failed. Destination tree is subtree of source tree."
+#: plugins/addons/mailqueue/contents.tpl:105
+msgid "Requeue this message"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:35
+#: plugins/addons/mailqueue/contents.tpl:108
 #, fuzzy
-msgid "Please enter your search string here"
-msgstr "Por favor introduzca un número de serie válido"
+msgid "header"
+msgstr "Remitente"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:48
-msgid ""
-"This list displays all assigned package names for this repository settings."
-msgstr ""
+#: plugins/addons/mailqueue/contents.tpl:108
+#, fuzzy
+msgid "Display header from this message"
+msgstr "Mostrar números que concuerdan con"
 
-#: plugins/admin/fai/class_faiPackageEntry.inc:124
-#, php-format
-msgid ""
-"Your specified search string '%s' returned too many results. Only the first "
-"200 entries are shown, to keep the memory usage low."
+#: plugins/admin/fai/class_faiScript.inc:241
+#: plugins/admin/fai/class_faiTemplate.inc:214
+#: plugins/admin/fai/class_faiScriptEntry.inc:89
+#: plugins/admin/fai/class_faiHook.inc:265
+#: plugins/admin/fai/class_faiHookEntry.inc:84
+#, fuzzy
+msgid "Download"
+msgstr "Dominio"
+
+#: plugins/admin/fai/tabsHook.inc:34 plugins/admin/fai/tabsPartition.inc:34
+#: plugins/admin/fai/tabsVariable.inc:34 plugins/admin/fai/tabsPackage.inc:33
+#: plugins/admin/fai/tabsProfile.inc:34 plugins/admin/fai/tabsScript.inc:34
+#: plugins/admin/fai/tabsTemplate.inc:34
+#: plugins/admin/departments/tabs_department.inc:32
+msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
 #: plugins/admin/fai/class_faiManagement.inc:32
@@ -4999,50 +4969,51 @@ msgstr "FAX ID"
 msgid "Fully Automatic Installation - management"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/fai/class_faiManagement.inc:227
+#: plugins/admin/fai/class_faiManagement.inc:228
 #, fuzzy, php-format
 msgid "You're about to delete all information about the FAI class at '%s'."
 msgstr ""
 "Esta a punto de borrar toda la información sobre el componente en '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:233
-#: plugins/admin/fai/class_faiManagement.inc:271
-#: plugins/admin/systems/class_systemManagement.inc:532
-#: plugins/admin/systems/class_systemManagement.inc:603
+#: plugins/admin/fai/class_faiManagement.inc:234
+#: plugins/admin/fai/class_faiManagement.inc:272
+#: plugins/admin/systems/class_systemManagement.inc:496
+#: plugins/admin/systems/class_systemManagement.inc:567
 msgid "You are not allowed to delete this component!"
 msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/fai/class_faiManagement.inc:323
+#: plugins/admin/fai/class_faiManagement.inc:324
 #, fuzzy, php-format
 msgid "You're about to delete a fai branch / freeze  '%s'."
 msgstr "Está a punto de borrar el grupo '%s'."
 
-#: plugins/admin/fai/class_faiManagement.inc:326
+#: plugins/admin/fai/class_faiManagement.inc:327
 #, fuzzy
 msgid "You are not allowed to delete this release!"
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/fai/class_faiManagement.inc:382
+#: plugins/admin/fai/class_faiManagement.inc:383
 #, fuzzy
 msgid "Specified branch name is invalid."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/fai/class_faiManagement.inc:384
+#: plugins/admin/fai/class_faiManagement.inc:385
 #, fuzzy
 msgid "Specified freeze name is invalid."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/fai/class_faiManagement.inc:391
+#: plugins/admin/fai/class_faiManagement.inc:392
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:351
 #: plugins/admin/systems/class_servRepository.inc:208
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
 #, fuzzy
 msgid "This name is already in use."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/fai/class_faiManagement.inc:444
-#: plugins/admin/fai/class_faiManagement.inc:611
-#: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:44
-#: plugins/admin/departments/class_departmentGeneric.inc:333
+#: plugins/admin/fai/class_faiManagement.inc:445
+#: plugins/admin/fai/class_faiManagement.inc:612
+#: plugins/admin/fai/faiPackageNew.tpl:44 plugins/admin/users/template.tpl:48
+#: plugins/admin/departments/class_departmentGeneric.inc:449
+#: plugins/admin/systems/SelectDeviceType.tpl:44
 #: ihtml/themes/altlinux/setup_introduction.tpl:12
 #: ihtml/themes/altlinux/setup_useradmin.tpl:41
 #: ihtml/themes/altlinux/setup_step2.tpl:13
@@ -5051,137 +5022,134 @@ msgstr "El nombre especificado ya esta siendo usado"
 #: ihtml/themes/default/setup_useradmin.tpl:41
 #: ihtml/themes/default/setup_step2.tpl:13
 #: ihtml/themes/default/setup_step3.tpl:18
-#: ihtml/themes/lhs/setup_introduction.tpl:12
-#: ihtml/themes/lhs/setup_useradmin.tpl:41 ihtml/themes/lhs/setup_step2.tpl:13
-#: ihtml/themes/lhs/setup_step3.tpl:18
 msgid "Continue"
 msgstr "Continuar"
 
-#: plugins/admin/fai/class_faiManagement.inc:647
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/fai/class_faiManagement.inc:648
+#: plugins/admin/departments/class_departmentManagement.inc:301
 #, fuzzy
 msgid "Go to users home department"
 msgstr "Mostrar usuarios del departamento"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:655
 #, fuzzy
 msgid "New profile"
 msgstr "Gestión de Asterisk PBX"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
+#: plugins/admin/fai/class_faiManagement.inc:655
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:229
 msgid "P"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:659
+#: plugins/admin/fai/class_faiManagement.inc:660
 #, fuzzy
 msgid "New partition table"
 msgstr "Impresora"
 
-#: plugins/admin/fai/class_faiManagement.inc:659
+#: plugins/admin/fai/class_faiManagement.inc:660
 msgid "PT"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:662
+#: plugins/admin/fai/class_faiManagement.inc:663
 #, fuzzy
 msgid "New scripts"
 msgstr "Mostrar equipos"
 
-#: plugins/admin/fai/class_faiManagement.inc:662
+#: plugins/admin/fai/class_faiManagement.inc:663
 msgid "S"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:665
+#: plugins/admin/fai/class_faiManagement.inc:666
 #, fuzzy
 msgid "New hooks"
 msgstr "Mostrar equipos"
 
-#: plugins/admin/fai/class_faiManagement.inc:665
+#: plugins/admin/fai/class_faiManagement.inc:666
 msgid "H"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:668
+#: plugins/admin/fai/class_faiManagement.inc:669
 #, fuzzy
 msgid "New variables"
 msgstr "Mostrar terminales"
 
-#: plugins/admin/fai/class_faiManagement.inc:668
+#: plugins/admin/fai/class_faiManagement.inc:669
 msgid "V"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:671
+#: plugins/admin/fai/class_faiManagement.inc:672
 #, fuzzy
 msgid "New templates"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/fai/class_faiManagement.inc:671
+#: plugins/admin/fai/class_faiManagement.inc:672
 msgid "T"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:674
+#: plugins/admin/fai/class_faiManagement.inc:675
 #, fuzzy
 msgid "New package list"
 msgstr "# páginas"
 
-#: plugins/admin/fai/class_faiManagement.inc:674
+#: plugins/admin/fai/class_faiManagement.inc:675
 msgid "PK"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:688
-#: plugins/admin/systems/class_systemManagement.inc:788
+#: plugins/admin/fai/class_faiManagement.inc:689
+#: plugins/admin/systems/class_systemManagement.inc:752
 msgid "This table displays all systems, in the selected tree."
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:692
+#: plugins/admin/fai/class_faiManagement.inc:693
 #, fuzzy
 msgid "Name of FAI class"
 msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/admin/fai/class_faiManagement.inc:693
+#: plugins/admin/fai/class_faiManagement.inc:694
 msgid "Class type"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:697
-#: plugins/admin/fai/class_faiManagement.inc:798
-#: plugins/admin/fai/class_faiManagement.inc:803
+#: plugins/admin/fai/class_faiManagement.inc:698
+#: plugins/admin/fai/class_faiManagement.inc:799
+#: plugins/admin/fai/class_faiManagement.inc:804
 #, fuzzy
 msgid "Edit class"
 msgstr "clase"
 
-#: plugins/admin/fai/class_faiManagement.inc:698
-#: plugins/admin/fai/class_faiManagement.inc:805
+#: plugins/admin/fai/class_faiManagement.inc:699
+#: plugins/admin/fai/class_faiManagement.inc:806
 #, fuzzy
 msgid "Delete class"
 msgstr "Borrar"
 
-#: plugins/admin/fai/class_faiManagement.inc:718
-#: plugins/admin/groups/class_groupApplication.inc:521
-#: plugins/admin/departments/class_departmentManagement.inc:335
+#: plugins/admin/fai/class_faiManagement.inc:719
+#: plugins/admin/groups/class_groupApplication.inc:647
+#: plugins/admin/departments/class_departmentManagement.inc:338
 #, fuzzy
 msgid "department"
 msgstr "departamentos"
 
-#: plugins/admin/fai/class_faiManagement.inc:739
 #: plugins/admin/fai/class_faiManagement.inc:740
+#: plugins/admin/fai/class_faiManagement.inc:741
 #: plugins/admin/fai/class_faiProfile.inc:297
 #: plugins/admin/fai/class_faiProfileEntry.inc:124
 #, fuzzy
 msgid "Partition table"
 msgstr "Variable"
 
-#: plugins/admin/fai/class_faiManagement.inc:746
 #: plugins/admin/fai/class_faiManagement.inc:747
+#: plugins/admin/fai/class_faiManagement.inc:748
 msgid "Package list"
 msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:753
 #: plugins/admin/fai/class_faiManagement.inc:754
+#: plugins/admin/fai/class_faiManagement.inc:755
 #, fuzzy
 msgid "Scripts"
 msgstr "Ruta del Script"
 
-#: plugins/admin/fai/class_faiManagement.inc:774
 #: plugins/admin/fai/class_faiManagement.inc:775
+#: plugins/admin/fai/class_faiManagement.inc:776
 #, fuzzy
 msgid "Profile"
 msgstr "Ruta del Perfil"
@@ -5191,10 +5159,14 @@ msgstr "Ruta del Perfil"
 msgid "Fully Automatic Installation"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+#: plugins/admin/fai/faiPartitionTable.tpl:32
+#: plugins/admin/fai/faiVariable.tpl:32 plugins/admin/fai/faiScript.tpl:32
+#: plugins/admin/fai/faiTemplate.tpl:29
+#: plugins/admin/fai/class_faiProfileEntry.inc:155
+#: plugins/admin/fai/faiHook.tpl:32
 #, fuzzy
-msgid "Package"
-msgstr "Mostrar teléfonos"
+msgid "Objects"
+msgstr "Objeto"
 
 #: plugins/admin/fai/faiPartitionTable.tpl:34
 #, fuzzy
@@ -5243,37 +5215,22 @@ msgid "Show only classes with partitions"
 msgstr "Mostrar estaciones de trabajo"
 
 #: plugins/admin/fai/faiProfileEntry.tpl:54
-#: plugins/admin/fai/faiProfileEntry.tpl:55
-#: plugins/admin/fai/faiPackageEntry.tpl:42 plugins/admin/fai/headpage.tpl:82
+#: plugins/admin/fai/faiProfileEntry.tpl:55 plugins/admin/fai/headpage.tpl:82
+#: plugins/admin/fai/faiPackageEntry.tpl:42
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/systems/servRepository.tpl:46
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Display objects matching"
 msgstr "Mostrar objetos que concuerden con"
 
-#: plugins/admin/fai/faiProfileEntry.tpl:59
-#: plugins/admin/fai/faiPackageEntry.tpl:46 plugins/admin/fai/headpage.tpl:86
+#: plugins/admin/fai/faiProfileEntry.tpl:59 plugins/admin/fai/headpage.tpl:86
+#: plugins/admin/fai/faiPackageEntry.tpl:46
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/systems/servRepository.tpl:50
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
 msgid "Regular expression for matching object names"
 msgstr "Expresiones regulares que concuerden con nombres de objetos"
 
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
-#, fuzzy
-msgid "Device"
-msgstr "Servicios"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
-#, fuzzy
-msgid "Partition entries"
-msgstr "Variable"
-
-#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
-#, fuzzy
-msgid "Add partition"
-msgstr "Añadir opción"
-
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
 #: plugins/admin/fai/class_faiHookEntry.inc:71
 #, fuzzy
@@ -5286,26 +5243,35 @@ msgstr "Por favor introduzca un número de serie válido"
 msgid "Selected file is empty."
 msgstr "El archivo especificado está vacío."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:132
-#: plugins/admin/fai/class_faiVariableEntry.inc:101
-#: plugins/admin/fai/class_faiHookEntry.inc:145
-#: plugins/admin/fai/class_faiTemplateEntry.inc:178
+#: plugins/admin/fai/class_faiScriptEntry.inc:133
+#: plugins/admin/fai/class_faiVariableEntry.inc:102
+#: plugins/admin/fai/class_faiHookEntry.inc:147
+#: plugins/admin/fai/class_faiTemplateEntry.inc:192
 #, fuzzy
 msgid "Please enter a name."
 msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/admin/fai/class_faiScriptEntry.inc:136
+#: plugins/admin/fai/class_faiScriptEntry.inc:137
 #, fuzzy
 msgid "Please enter a script."
 msgstr "Por favor introduzca un número de serie válido"
 
+#: plugins/admin/fai/faiVariable.tpl:34
+#, fuzzy
+msgid "List of assigned variables"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/fai/faiVariable.tpl:40
+msgid "Choose a variable to delete or edit"
+msgstr ""
+
 #: plugins/admin/fai/faiScriptEntry.tpl:29
-#: plugins/admin/groups/class_groupManagement.inc:525
-#: plugins/admin/users/class_userManagement.inc:820
+#: plugins/admin/groups/class_groupManagement.inc:475
+#: plugins/admin/users/class_userManagement.inc:730
 #: plugins/admin/departments/generic.tpl:4
 #: plugins/admin/systems/terminal.tpl:1
 #: plugins/admin/systems/workstation.tpl:1
-#: plugins/admin/ogroups/class_ogroupManagement.inc:494
+#: plugins/admin/ogroups/class_ogroupManagement.inc:502
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Propiedades"
@@ -5327,30 +5293,30 @@ msgstr "Elija tipo de ratón"
 msgid "Import script"
 msgstr "Mostrar equipos"
 
-#: plugins/admin/fai/class_faiPackage.inc:340
+#: plugins/admin/fai/class_faiPackage.inc:352
 #, fuzzy
 msgid "Please select a least one Package."
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/admin/fai/class_faiPackage.inc:344
+#: plugins/admin/fai/class_faiPackage.inc:356
 #, fuzzy
 msgid "Please choose a valid combination for your repository setup."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/fai/class_faiPackage.inc:365
+#: plugins/admin/fai/class_faiPackage.inc:377
 #, fuzzy
 msgid "package is configured"
 msgstr "Desconfigurado"
 
-#: plugins/admin/fai/class_faiPackage.inc:389
+#: plugins/admin/fai/class_faiPackage.inc:401
 #, php-format
 msgid "Package file '%s' does not exist."
 msgstr ""
 
 #: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
-#: plugins/admin/systems/workstationStartup.tpl:39
-#: plugins/admin/systems/class_servRepository.inc:242
+#: plugins/admin/systems/class_servRepository.inc:248
 #: plugins/admin/systems/servRepositorySetup.tpl:8
+#: plugins/admin/systems/workstationStartup.tpl:39
 #, fuzzy
 msgid "Release"
 msgstr "Paquete de reglas"
@@ -5376,7 +5342,7 @@ msgstr "Mostrar teléfonos"
 msgid "Choosen packages"
 msgstr "Mostrar teléfonos"
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:596
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:571
 msgid "Configure"
 msgstr "Configurar"
 
@@ -5417,22 +5383,22 @@ msgid "Remove class from profile"
 msgstr ""
 
 #: plugins/admin/fai/class_faiProfile.inc:304
-#: plugins/admin/systems/class_servDNSeditZone.inc:277
+#: plugins/admin/systems/class_servDNSeditZone.inc:290
 #: plugins/admin/ogroups/phonequeue.tpl:18
 #, fuzzy
 msgid "Down"
 msgstr "Dominio"
 
-#: plugins/admin/fai/class_faiProfile.inc:381
+#: plugins/admin/fai/class_faiProfile.inc:382
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:385
+#: plugins/admin/fai/class_faiProfile.inc:386
 #, fuzzy
 msgid "Please enter a valid name."
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/fai/class_faiProfile.inc:393
+#: plugins/admin/fai/class_faiProfile.inc:394
 #, fuzzy
 msgid "There is already a profile with this class name defined."
 msgstr "Ya existe un usuario con este 'Login' en la base de datos."
@@ -5442,28 +5408,6 @@ msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 msgid "FAI classes"
 msgstr "Elija tipo de ratón"
 
-#: plugins/admin/fai/remove.tpl:7
-#, fuzzy
-msgid ""
-"This includes 'all' object information. Please double check if your really "
-"want to do this since there is no way for GOsa to get your data back."
-msgstr ""
-"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
-"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
-"esto, no hay forma de que GOsa recupere la información."
-
-#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
-#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
-#, fuzzy
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your LDAP tree in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
-msgstr ""
-"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
-"actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
-"presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
-
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:193
 #, fuzzy
 msgid "FS type"
@@ -5494,154 +5438,77 @@ msgstr "Añadir opción"
 msgid "Preserve"
 msgstr "servidores"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:355
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:356
 #, php-format
 msgid "please enter a unique mount point for partition %s"
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:360
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:361
 #, fuzzy, php-format
 msgid "Please enter a valid mount point for partition %s."
 msgstr ""
 "Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:365
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:366
 #, php-format
 msgid ""
 "File system type 'swap' is already used, change file system type for "
 "partition %s."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:369
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:370
 msgid "Please use 'swap' as mount point, if 'swap' is used as fs-type."
 msgstr ""
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:375
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:379
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:376
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:380
 #, fuzzy, php-format
 msgid "Please enter a valid partition size for partition %s."
 msgstr ""
 "Por favor introduzca una ruta valida en el campo 'Directorio de usuario'"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:385
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:387
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:386
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:388
 #, fuzzy, php-format
 msgid "Please enter a valid range for partition %s."
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:392
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:393
 #, fuzzy, php-format
 msgid "Please enter a range for partition size for partition %s."
 msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:407
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:408
 msgid ""
 "You have more than 3 primary partition table entries in your configuration, "
 "please check your configuration twice."
 msgstr ""
 
-#: plugins/admin/fai/faiScript.tpl:34
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #, fuzzy
-msgid "List of scripts"
-msgstr "Lista de usuarios"
-
-#: plugins/admin/fai/faiScript.tpl:42
-msgid "Choose a script to delete or edit"
-msgstr ""
+msgid "Device"
+msgstr "Servicios"
 
-#: plugins/admin/fai/faiPackageNew.tpl:1
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:20
 #, fuzzy
-msgid "Repository settings"
-msgstr "Configuración de red"
-
-#: plugins/admin/fai/faiPackageNew.tpl:3
-msgid ""
-"To add packages to your package list you have to setup the repository "
-"settings first."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:5
-msgid ""
-"Packages are usually stored on different servers called mirrors. These "
-"mirrors have different types of releases (for example woody/sarge/etch), "
-"which finally contain packages sorted by section."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:8
-msgid ""
-"Section and release can't be changed in future dialogs, but the mirror can "
-"be changed by editing the entry."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:14
-msgid ""
-"First select the preferred release, then the section and finally the mirror."
-msgstr ""
-
-#: plugins/admin/fai/faiPackageNew.tpl:21
-msgid "Following releases are available"
-msgstr ""
+msgid "Partition entries"
+msgstr "Variable"
 
-#: plugins/admin/fai/faiPackageNew.tpl:31
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:23
 #, fuzzy
-msgid "Sections for this release"
-msgstr "Localización de este subarbol"
+msgid "Add partition"
+msgstr "Añadir opción"
 
-#: plugins/admin/fai/faiPackageNew.tpl:35
-#: plugins/admin/systems/workstationStartup.tpl:47
+#: plugins/admin/fai/faiScript.tpl:34
 #, fuzzy
-msgid "set"
-msgstr "Borrar"
+msgid "List of scripts"
+msgstr "Lista de usuarios"
 
-#: plugins/admin/fai/class_faiVariableEntry.inc:97
+#: plugins/admin/fai/class_faiVariableEntry.inc:98
 #, fuzzy
 msgid "Please specify a value for the attribute 'content'."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/fai/faiNewBranch.tpl:5
-msgid ""
-"You are now going to create a branch or locked branch. This action clones "
-"the existing release to another release name. Branches can be modified as "
-"usual. FAI classes of locked branches cannot be modified, just additional "
-"classes are possible. Branch names should be alphanumeric, excluding the "
-"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
-"and 'fai'."
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:11
-#, fuzzy
-msgid "Please enter a name for the branch"
-msgstr "¡Por favor introduzca un número de teléfono valido!"
-
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_move.tpl:1
-#, fuzzy
-msgid "Processing the requested operation"
-msgstr "¡Error mientras se exportaban las entradas indicadas!"
-
-#: plugins/admin/fai/faiNewBranch.tpl:34
-msgid ""
-"As soon as the copy operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the fai management "
-"dialog."
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:40
-#: plugins/admin/departments/recursive_move.tpl:7
-msgid ""
-"Your browser doesn't support iframes, please use this link to perform the "
-"requested operation."
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid "Perform requested operation."
-msgstr ""
-
-#: plugins/admin/fai/faiNewBranch.tpl:42
-#, fuzzy
-msgid "Initiate operation"
-msgstr "Crear opciones"
-
 #: plugins/admin/fai/faiVariableEntry.tpl:29
 #, fuzzy
 msgid "Variable attributes"
@@ -5657,21 +5524,27 @@ msgstr "Variable"
 msgid "List of template files"
 msgstr "Lista de Departamentos"
 
-#: plugins/admin/fai/faiTemplate.tpl:38
+#: plugins/admin/fai/remove.tpl:7
 #, fuzzy
-msgid "Choose a template to delete or edit"
-msgstr "Elija un departamento para guardar la entrada"
+msgid ""
+"This includes 'all' object information. Please double check if your really "
+"want to do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
+"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
+"esto, no hay forma de que GOsa recupere la información."
 
-#: plugins/admin/fai/faiPackageEntry.tpl:6
+#: plugins/admin/fai/remove.tpl:11 plugins/admin/departments/remove.tpl:10
+#: plugins/admin/systems/remove.tpl:10 plugins/gofon/conference/remove.tpl:10
 #, fuzzy
-msgid "List of available packages"
-msgstr "Elija tipo de ratón"
-
-#: plugins/admin/fai/faiPackageEntry.tpl:26
 msgid ""
-"This menu allows you to select multiple packages to add them to the "
-"currently edited package list."
+"Best thing to do before performing this action would be to save the current "
+"contents of your LDAP tree in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
+"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
+"actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
+"presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
 
 #: plugins/admin/fai/headpage.tpl:6
 #, fuzzy
@@ -5743,33 +5616,19 @@ msgstr "Mostrar teléfonos"
 msgid "Show partitions"
 msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
-#, fuzzy
-msgid "Hook attributes"
-msgstr "Atributo 'dn' de los usuarios"
-
-#: plugins/admin/fai/faiHookEntry.tpl:34
-#, fuzzy
-msgid "Task"
-msgstr "Días para tareas"
-
-#: plugins/admin/fai/faiHookEntry.tpl:36
-msgid "Choose an existing FAI task"
-msgstr ""
-
-#: plugins/admin/fai/class_faiPartitionTable.inc:263
 #: plugins/admin/fai/class_faiPartitionTable.inc:269
+#: plugins/admin/fai/class_faiPartitionTable.inc:275
 #, fuzzy, php-format
 msgid "%s partition"
 msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:265
 #: plugins/admin/fai/class_faiPartitionTable.inc:271
+#: plugins/admin/fai/class_faiPartitionTable.inc:277
 #, fuzzy, php-format
 msgid "%s partition(s)"
 msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/fai/class_faiHookEntry.inc:141
+#: plugins/admin/fai/class_faiHookEntry.inc:143
 #, fuzzy
 msgid "Please enter a value for script."
 msgstr "Por favor introduzca un número de serie válido"
@@ -5784,57 +5643,66 @@ msgstr ""
 msgid "Class name"
 msgstr "Elija tipo de ratón"
 
-#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
-#, php-format
-msgid "Debconf information for package '%s'"
+#: plugins/admin/fai/faiHookEntry.tpl:29 plugins/admin/fai/faiHookEntry.tpl:48
+#, fuzzy
+msgid "Hook attributes"
+msgstr "Atributo 'dn' de los usuarios"
+
+#: plugins/admin/fai/faiHookEntry.tpl:34
+#, fuzzy
+msgid "Task"
+msgstr "Días para tareas"
+
+#: plugins/admin/fai/faiHookEntry.tpl:36
+msgid "Choose an existing FAI task"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:77
+#: plugins/admin/fai/class_askClassName.inc:81
 #, fuzzy
 msgid "Create new FAI object - partition table."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/fai/class_askClassName.inc:78
+#: plugins/admin/fai/class_askClassName.inc:82
 #, fuzzy
 msgid "Create new FAI object - package bundle."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/fai/class_askClassName.inc:79
+#: plugins/admin/fai/class_askClassName.inc:83
 #, fuzzy
 msgid "Create new FAI object - script bundle."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/fai/class_askClassName.inc:80
+#: plugins/admin/fai/class_askClassName.inc:84
 #, fuzzy
 msgid "Create new FAI object - variable bundle."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/fai/class_askClassName.inc:81
+#: plugins/admin/fai/class_askClassName.inc:85
 #, fuzzy
 msgid "Create new FAI object - hook bundle."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/fai/class_askClassName.inc:82
+#: plugins/admin/fai/class_askClassName.inc:86
 #, fuzzy
 msgid "Create new FAI object - profile."
 msgstr "Grupo de objetos"
 
-#: plugins/admin/fai/class_askClassName.inc:83
+#: plugins/admin/fai/class_askClassName.inc:87
 #, fuzzy
 msgid "Create new FAI object - template."
 msgstr "Nueva plantilla"
 
-#: plugins/admin/fai/class_askClassName.inc:84
+#: plugins/admin/fai/class_askClassName.inc:88
 #, fuzzy
 msgid "Create new FAI object"
 msgstr "Grupo de objetos"
 
-#: plugins/admin/fai/class_askClassName.inc:137
+#: plugins/admin/fai/class_askClassName.inc:142
 #, fuzzy
 msgid "The given class name is empty."
 msgstr "El archivo especificado está vacío."
 
-#: plugins/admin/fai/class_askClassName.inc:141
+#: plugins/admin/fai/class_askClassName.inc:146
 #, fuzzy
 msgid "The specified class name is already in use for this object type."
 msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
@@ -5868,13 +5736,12 @@ msgid "Choose class name"
 msgstr "Elija tipo de ratón"
 
 #: plugins/admin/fai/askClassName.tpl:70 plugins/admin/fai/askClassName.tpl:77
-#: plugins/admin/systems/glpiDeviceManagement.tpl:51
+#: plugins/admin/systems/class_baseSelectDialog.inc:40
 #: plugins/admin/systems/class_glpiSelectUser.inc:113
 #: plugins/admin/systems/class_glpiSelectUser.inc:140
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #: plugins/admin/systems/glpiAttachmentPool.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
+#: plugins/admin/systems/glpiDeviceManagement.tpl:51
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:51
 #, fuzzy
 msgid "Use"
 msgstr "Usuario"
@@ -5884,54 +5751,42 @@ msgstr "Usuario"
 msgid "A new class name."
 msgstr "Aplicaciones disponibles"
 
-#: plugins/admin/fai/remove_branch.tpl:6
-#, fuzzy
-msgid ""
-"This includes all account data, system access, etc. for this branch. Please "
-"double check if your really want to do this since there is no way for GOsa "
-"to get your data back."
-msgstr ""
-"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
-"configuración IMAP, etc. de este usuario. Por favor pulse dos veces si "
-"quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
-"posteriormente la información."
-
-#: plugins/admin/fai/class_faiTemplateEntry.inc:81
+#: plugins/admin/fai/class_faiTemplateEntry.inc:88
 #, fuzzy
 msgid "no file uploaded yet"
 msgstr "No se ha subido ningún archivo."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:83
+#: plugins/admin/fai/class_faiTemplateEntry.inc:93
 #, php-format
 msgid "exists in database (size: %s bytes)"
 msgstr ""
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:170
+#: plugins/admin/fai/class_faiTemplateEntry.inc:184
 #, fuzzy
 msgid "Please specify a value for attribute 'file'."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:174
+#: plugins/admin/fai/class_faiTemplateEntry.inc:188
 #, fuzzy
 msgid "Please specify a value for attribute 'path'."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:182
+#: plugins/admin/fai/class_faiTemplateEntry.inc:196
 #, fuzzy
 msgid "Please enter a user."
 msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:185
+#: plugins/admin/fai/class_faiTemplateEntry.inc:199
 #, fuzzy
 msgid "Please enter a valid user. Only a-z/0-9 are allowed."
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:189
+#: plugins/admin/fai/class_faiTemplateEntry.inc:203
 #, fuzzy
 msgid "Please enter a group."
 msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:192
+#: plugins/admin/fai/class_faiTemplateEntry.inc:206
 #, fuzzy
 msgid "Please enter a valid group. Only a-z/0-9 are allowed."
 msgstr "Por favor especifique un nombre de usuario valido."
@@ -5952,9 +5807,9 @@ msgid "Save template"
 msgstr "Nueva plantilla"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
-#: plugins/admin/applications/generic.tpl:95
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/applications/generic.tpl:96
 #: plugins/admin/systems/printerPPDDialog.tpl:11
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:33
 #, fuzzy
 msgid "Upload"
 msgstr "Carga de CPU"
@@ -5965,15 +5820,15 @@ msgid "Destination path"
 msgstr "Destino"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:309
 msgid "Owner"
 msgstr ""
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:71
 #: plugins/admin/fai/faiTemplateEntry.tpl:103
-#: plugins/admin/systems/class_printGeneric.inc:672
-#: plugins/admin/systems/class_printGeneric.inc:674
-#: plugins/admin/ogroups/class_ogroupManagement.inc:584
+#: plugins/admin/systems/class_printGeneric.inc:741
+#: plugins/admin/systems/class_printGeneric.inc:743
+#: plugins/admin/ogroups/class_ogroupManagement.inc:592
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Grupo"
@@ -5984,7 +5839,7 @@ msgid "Access"
 msgstr "Dirección"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:86
-#: plugins/admin/systems/class_servDNS.inc:299
+#: plugins/admin/systems/class_servDNS.inc:161
 #, fuzzy
 msgid "Class"
 msgstr "clase"
@@ -6001,8 +5856,8 @@ msgstr "escribir"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:89
 #: plugins/admin/applications/generic.tpl:17
-#: plugins/admin/systems/server.tpl:49 plugins/admin/systems/terminal.tpl:110
-#: plugins/admin/systems/workstation.tpl:89
+#: plugins/admin/systems/server.tpl:55 plugins/admin/systems/terminal.tpl:120
+#: plugins/admin/systems/workstation.tpl:99
 #: plugins/admin/ogroups/termgroup.tpl:13
 msgid "Execute"
 msgstr "Ejecute"
@@ -6037,80 +5892,143 @@ msgstr "estatico"
 msgid "List of hook scripts"
 msgstr "Lista de listas de bloqueos"
 
-#: plugins/admin/fai/faiHook.tpl:42
-msgid "Choose a hook to delete or edit"
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:122
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
+#, fuzzy
+msgid "Please enter your search string here"
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
 msgstr ""
-"¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
-"archivo de configuración!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:179
-msgid "This 'dn' is no group."
-msgstr "Este 'dn' no es un grupo."
+#: plugins/admin/fai/class_faiPackageEntry.inc:124
+#, php-format
+msgid ""
+"Your specified search string '%s' returned too many results. Only the first "
+"200 entries are shown, to keep the memory usage low."
+msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Samba group"
-msgstr "Grupo de samba"
+#: plugins/admin/fai/faiPackageConfiguration.tpl:1
+#, fuzzy
+msgid "Package"
+msgstr "Mostrar teléfonos"
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain admins"
-msgstr "Administradores del dominio"
+#: plugins/admin/fai/faiPackageNew.tpl:1
+#, fuzzy
+msgid "Repository settings"
+msgstr "Configuración de red"
 
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain users"
-msgstr "Usuarios del dominio"
+#: plugins/admin/fai/faiPackageNew.tpl:3
+msgid ""
+"To add packages to your package list you have to setup the repository "
+"settings first."
+msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:330
-msgid "Domain guests"
-msgstr "Invitados del dominio"
+#: plugins/admin/fai/faiPackageNew.tpl:5
+msgid ""
+"Packages are usually stored on different servers called mirrors. These "
+"mirrors have different types of releases (for example woody/sarge/etch), "
+"which finally contain packages sorted by section."
+msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:335
-#, php-format
-msgid "Special group (%d)"
-msgstr "Grupo especial (%d)"
+#: plugins/admin/fai/faiPackageNew.tpl:8
+msgid ""
+"Section and release can't be changed in future dialogs, but the mirror can "
+"be changed by editing the entry."
+msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:445
-#, php-format
+#: plugins/admin/fai/faiPackageNew.tpl:14
 msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
+"First select the preferred release, then the section and finally the mirror."
+msgstr ""
+
+#: plugins/admin/fai/faiPackageNew.tpl:21
+msgid "Following releases are available"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:462
+#: plugins/admin/fai/faiPackageNew.tpl:31
 #, fuzzy
-msgid "! unknown id"
-msgstr "estado desconocido"
+msgid "Sections for this release"
+msgstr "Localización de este subarbol"
 
-#: plugins/admin/groups/class_groupGeneric.inc:598
-#, php-format
-msgid "No configured SID found for '%s'."
+#: plugins/admin/fai/faiPackageNew.tpl:35
+#: plugins/admin/systems/workstationStartup.tpl:47
+#, fuzzy
+msgid "set"
+msgstr "Borrar"
+
+#: plugins/admin/fai/faiNewBranch.tpl:5
+msgid ""
+"You are now going to create a branch or locked branch. This action clones "
+"the existing release to another release name. Branches can be modified as "
+"usual. FAI classes of locked branches cannot be modified, just additional "
+"classes are possible. Branch names should be alphanumeric, excluding the "
+"reserved names 'scripts', 'hooks', 'partitions', 'variables', 'templates' "
+"and 'fai'."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:603
-#, php-format
-msgid "No configured RIDBASE found for '%s'."
+#: plugins/admin/fai/faiNewBranch.tpl:11
+#, fuzzy
+msgid "Please enter a name for the branch"
+msgstr "¡Por favor introduzca un número de teléfono valido!"
+
+#: plugins/admin/fai/faiNewBranch.tpl:33
+#: plugins/admin/departments/recursive_move.tpl:1
+#, fuzzy
+msgid "Processing the requested operation"
+msgstr "¡Error mientras se exportaban las entradas indicadas!"
+
+#: plugins/admin/fai/faiNewBranch.tpl:34
+msgid ""
+"As soon as the copy operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the fai management "
+"dialog."
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:716
-#: plugins/admin/ogroups/class_ogroup.inc:655
-msgid "You have no permissions to create a group on this 'Base'."
-msgstr "No tiene permisos para crear un grupo en esta 'Base'."
+#: plugins/admin/fai/faiNewBranch.tpl:40
+#: plugins/admin/departments/recursive_move.tpl:7
+msgid ""
+"Your browser doesn't support iframes, please use this link to perform the "
+"requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+msgid "Perform requested operation."
+msgstr ""
+
+#: plugins/admin/fai/faiNewBranch.tpl:42
+#, fuzzy
+msgid "Initiate operation"
+msgstr "Crear opciones"
+
+#: plugins/admin/fai/faiPackageEntry.tpl:6
+#, fuzzy
+msgid "List of available packages"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/groups/class_groupGeneric.inc:726
+#: plugins/admin/fai/faiPackageEntry.tpl:26
 msgid ""
-"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
-"are allowed."
+"This menu allows you to select multiple packages to add them to the "
+"currently edited package list."
 msgstr ""
-"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
-"numeros y guiones."
 
-#: plugins/admin/groups/class_groupGeneric.inc:738
-#: plugins/admin/groups/class_groupGeneric.inc:752
-#: plugins/admin/groups/class_groupGeneric.inc:759
-msgid "Value specified as 'Name' is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+#: plugins/admin/fai/class_faiPackageConfiguration.inc:45
+#, php-format
+msgid "Debconf information for package '%s'"
+msgstr ""
+
+#: plugins/admin/fai/remove_branch.tpl:6
+#, fuzzy
+msgid ""
+"This includes all account data, system access, etc. for this branch. Please "
+"double check if your really want to do this since there is no way for GOsa "
+"to get your data back."
+msgstr ""
+"Esto incluye toda las información de cuentas, reglas de acceso al sistema, "
+"configuración IMAP, etc. de este usuario. Por favor pulse dos veces si "
+"quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
+"posteriormente la información."
 
 #: plugins/admin/groups/mail.tpl:11 plugins/admin/groups/paste_mail.tpl:12
 msgid "Primary mail address for this shared folder"
@@ -6136,214 +6054,281 @@ msgstr "Miembro con Permisos"
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
-#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
-msgid "List of groups"
-msgstr "Lista de grupos"
-
-#: plugins/admin/groups/headpage.tpl:25
-msgid ""
-"This menu allows you to add, edit and remove selected groups. You may want "
-"to use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
-"usar el selector de rango en la parte superior de la lista de grupos, cuando "
-"trabaja con un gran número de grupos."
-
-#: plugins/admin/groups/headpage.tpl:41
-msgid "Select to see groups that are primary groups of users"
-msgstr "Seleccione para ver que grupos son grupos primarios de usuarios"
-
-#: plugins/admin/groups/headpage.tpl:42
-msgid "Show primary groups"
-msgstr "Mostrar grupos primarios"
-
-#: plugins/admin/groups/headpage.tpl:46
-msgid "Select to see groups that have samba groups mappings"
-msgstr "Seleccione para ver que grupos tienen asignado un grupo samba"
-
-#: plugins/admin/groups/headpage.tpl:47
-msgid "Show samba groups"
-msgstr "Mostrar los grupos samba"
-
-#: plugins/admin/groups/headpage.tpl:50
-msgid "Select to see groups that have applications configured"
-msgstr "Seleccione para ver que grupos tienen aplicaciones configuradas"
-
-#: plugins/admin/groups/headpage.tpl:51
-msgid "Show application groups"
-msgstr "Mostrar los grupos de aplicaciones"
-
-#: plugins/admin/groups/headpage.tpl:54
-msgid "Select to see groups that have mail settings"
-msgstr ""
-"Seleccione para ver que grupos tienen configuración de correo electrónico"
-
-#: plugins/admin/groups/headpage.tpl:55
-msgid "Show mail groups"
-msgstr "Mostrar grupos de correo"
-
-#: plugins/admin/groups/headpage.tpl:58
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
-
-#: plugins/admin/groups/headpage.tpl:59
-msgid "Show functional groups"
-msgstr "Mostrar grupos funcionales"
-
-#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
-msgid "Group administration"
-msgstr "Administración de grupos"
-
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
 #: html/getxls.php:99 html/getxls.php:244
 msgid "Groups"
 msgstr "Grupos"
 
-#: plugins/admin/groups/class_groupManagement.inc:357
+#: plugins/admin/groups/class_groupManagement.inc:317
 #, php-format
 msgid "You're about to delete the group '%s'."
 msgstr "Está a punto de borrar el grupo '%s'."
 
-#: plugins/admin/groups/class_groupManagement.inc:363
-#: plugins/admin/groups/class_groupManagement.inc:389
+#: plugins/admin/groups/class_groupManagement.inc:323
+#: plugins/admin/groups/class_groupManagement.inc:349
 msgid "You are not allowed to delete this group!"
 msgstr "¡No le está permitido eliminar este grupo!"
 
-#: plugins/admin/groups/class_groupManagement.inc:441
-#: plugins/admin/users/class_userManagement.inc:767
-#: plugins/admin/applications/class_applicationManagement.inc:462
-#: plugins/admin/ogroups/class_ogroupManagement.inc:431
+#: plugins/admin/groups/class_groupManagement.inc:401
+#: plugins/admin/applications/class_applicationManagement.inc:435
+#: plugins/admin/ogroups/class_ogroupManagement.inc:439
+#: include/class_CopyPasteHandler.inc:216
 #, fuzzy
 msgid "Paste"
 msgstr "Fecha"
 
-#: plugins/admin/groups/class_groupManagement.inc:443
-#: plugins/admin/users/class_userManagement.inc:769
-#: plugins/admin/applications/class_applicationManagement.inc:464
-#: plugins/admin/ogroups/class_ogroupManagement.inc:433
+#: plugins/admin/groups/class_groupManagement.inc:403
+#: plugins/admin/applications/class_applicationManagement.inc:437
+#: plugins/admin/ogroups/class_ogroupManagement.inc:441
+#: include/class_CopyPasteHandler.inc:218
 #, fuzzy
 msgid "Can't paste"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/groups/class_groupManagement.inc:456
+#: plugins/admin/groups/class_groupManagement.inc:416
 #, fuzzy
 msgid "Create new group"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/groups/class_groupManagement.inc:466
-#: plugins/admin/users/class_userManagement.inc:796
-#: plugins/admin/applications/class_applicationManagement.inc:488
-#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
+#: plugins/admin/ogroups/class_ogroupManagement.inc:469
 #, fuzzy
 msgid "cut"
 msgstr "Ejecute"
 
-#: plugins/admin/groups/class_groupManagement.inc:466
-#: plugins/admin/users/class_userManagement.inc:796
-#: plugins/admin/applications/class_applicationManagement.inc:488
-#: plugins/admin/ogroups/class_ogroupManagement.inc:461
+#: plugins/admin/groups/class_groupManagement.inc:426
+#: plugins/admin/users/class_userManagement.inc:708
+#: plugins/admin/applications/class_applicationManagement.inc:461
+#: plugins/admin/ogroups/class_ogroupManagement.inc:469
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/applications/class_applicationManagement.inc:490
-#: plugins/admin/ogroups/class_ogroupManagement.inc:463
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
+#: plugins/admin/ogroups/class_ogroupManagement.inc:471
 msgid "copy"
 msgstr ""
 
-#: plugins/admin/groups/class_groupManagement.inc:468
-#: plugins/admin/users/class_userManagement.inc:798
-#: plugins/admin/applications/class_applicationManagement.inc:490
-#: plugins/admin/ogroups/class_ogroupManagement.inc:463
+#: plugins/admin/groups/class_groupManagement.inc:428
+#: plugins/admin/users/class_userManagement.inc:710
+#: plugins/admin/applications/class_applicationManagement.inc:463
+#: plugins/admin/ogroups/class_ogroupManagement.inc:471
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupManagement.inc:470
-#: plugins/admin/groups/class_groupManagement.inc:475
-#: plugins/admin/applications/class_applicationManagement.inc:492
-#: plugins/admin/applications/class_applicationManagement.inc:498
-#: plugins/admin/departments/class_departmentManagement.inc:311
-#: plugins/admin/ogroups/class_ogroupManagement.inc:465
-#: plugins/admin/ogroups/class_ogroupManagement.inc:470
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:297
+#: plugins/admin/groups/class_groupManagement.inc:430
+#: plugins/admin/groups/class_groupManagement.inc:435
+#: plugins/admin/applications/class_applicationManagement.inc:465
+#: plugins/admin/applications/class_applicationManagement.inc:471
+#: plugins/admin/departments/class_departmentManagement.inc:314
+#: plugins/admin/ogroups/class_ogroupManagement.inc:473
+#: plugins/admin/ogroups/class_ogroupManagement.inc:478
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:295
 #, fuzzy
 msgid "Edit this entry"
 msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupManagement.inc:472
-#: plugins/admin/groups/class_groupManagement.inc:477
-#: plugins/admin/applications/class_applicationManagement.inc:494
-#: plugins/admin/applications/class_applicationManagement.inc:500
-#: plugins/admin/departments/class_departmentManagement.inc:312
-#: plugins/admin/ogroups/class_ogroupManagement.inc:467
-#: plugins/admin/ogroups/class_ogroupManagement.inc:472
+#: plugins/admin/groups/class_groupManagement.inc:432
+#: plugins/admin/groups/class_groupManagement.inc:437
+#: plugins/admin/applications/class_applicationManagement.inc:467
+#: plugins/admin/applications/class_applicationManagement.inc:473
+#: plugins/admin/departments/class_departmentManagement.inc:315
+#: plugins/admin/ogroups/class_ogroupManagement.inc:475
+#: plugins/admin/ogroups/class_ogroupManagement.inc:480
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:296
 #: plugins/gofon/conference/class_phoneConferenceManagment.inc:298
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
 #, fuzzy
 msgid "Delete this entry"
 msgstr "Borrar"
 
-#: plugins/admin/groups/class_groupManagement.inc:500
-#: plugins/admin/users/class_userManagement.inc:857
+#: plugins/admin/groups/class_groupManagement.inc:451
+#: plugins/admin/users/class_userManagement.inc:765
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
 
-#: plugins/admin/groups/class_groupManagement.inc:509
-#: plugins/admin/applications/class_applicationManagement.inc:512
-#: plugins/admin/ogroups/class_ogroupManagement.inc:585
+#: plugins/admin/groups/class_groupManagement.inc:460
+#: plugins/admin/applications/class_applicationManagement.inc:485
+#: plugins/admin/ogroups/class_ogroupManagement.inc:593
 #: plugins/gofon/fonreports/contents.tpl:34
 #: plugins/generic/references/class_reference.inc:42
 msgid "Application"
 msgstr "Aplicación"
 
-#: plugins/admin/groups/class_groupManagement.inc:524
+#: plugins/admin/groups/class_groupManagement.inc:474
 #, fuzzy
 msgid "Groupname"
 msgstr "Nombre del grupo"
 
-#: plugins/admin/groups/class_groupManagement.inc:529
-#: plugins/admin/applications/class_applicationManagement.inc:526
-#: plugins/admin/ogroups/class_ogroupManagement.inc:499
+#: plugins/admin/groups/class_groupManagement.inc:479
+#: plugins/admin/applications/class_applicationManagement.inc:499
+#: plugins/admin/ogroups/class_ogroupManagement.inc:507
 msgid "This table displays all groups, in the selected tree."
 msgstr ""
 
-#: plugins/admin/groups/remove.tpl:6
-msgid ""
-"This may be a primary user group. Please double check if you really want to "
-"do this since there is no way for GOsa to get your data back."
+#: plugins/admin/groups/class_groupGeneric.inc:122
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
 msgstr ""
-"Este puede ser un grupo primario. Por favor pinche dos veces si realmente "
-"quiere hacerlo, dado que GOsa no tiene manera de recuperar esta información."
+"¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
+"archivo de configuración!"
 
-#: plugins/admin/groups/application_options.tpl:1
-msgid "Application options"
-msgstr "Opciones de aplicaciones"
+#: plugins/admin/groups/class_groupGeneric.inc:176
+msgid "This 'dn' is no group."
+msgstr "Este 'dn' no es un grupo."
 
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid "read"
-msgstr "leer"
+#: plugins/admin/groups/class_groupGeneric.inc:316
+msgid "Samba group"
+msgstr "Grupo de samba"
 
-#: plugins/admin/groups/class_groupMail.inc:279
-msgid "post"
-msgstr "post"
+#: plugins/admin/groups/class_groupGeneric.inc:316
+msgid "Domain admins"
+msgstr "Administradores del dominio"
 
-#: plugins/admin/groups/class_groupMail.inc:280
-msgid "external post"
-msgstr "post externo"
+#: plugins/admin/groups/class_groupGeneric.inc:316
+msgid "Domain users"
+msgstr "Usuarios del dominio"
 
-#: plugins/admin/groups/class_groupMail.inc:281
-msgid "append"
-msgstr "añadir"
+#: plugins/admin/groups/class_groupGeneric.inc:317
+msgid "Domain guests"
+msgstr "Invitados del dominio"
 
-#: plugins/admin/groups/class_groupMail.inc:282
-msgid "write"
-msgstr "escribir"
+#: plugins/admin/groups/class_groupGeneric.inc:322
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
+
+#: plugins/admin/groups/class_groupGeneric.inc:433
+#, fuzzy
+msgid "! unknown id"
+msgstr "estado desconocido"
+
+#: plugins/admin/groups/class_groupGeneric.inc:465
+#, php-format
+msgid ""
+"Your search method returned more than '%s' users, only '%s' users are shown."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:601
+#, php-format
+msgid "No configured SID found for '%s'."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:606
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
+msgstr ""
+
+#: plugins/admin/groups/class_groupGeneric.inc:720
+#: plugins/admin/ogroups/class_ogroup.inc:656
+msgid "You have no permissions to create a group on this 'Base'."
+msgstr "No tiene permisos para crear un grupo en esta 'Base'."
+
+#: plugins/admin/groups/class_groupGeneric.inc:730
+msgid ""
+"The field 'Name' contains invalid characters. Lowercase, numbers and dashes "
+"are allowed."
+msgstr ""
+"El campo 'Nombre' contiene caracteres no validos. Puede utilizar minúsculas, "
+"numeros y guiones."
+
+#: plugins/admin/groups/class_groupGeneric.inc:742
+#: plugins/admin/groups/class_groupGeneric.inc:756
+#: plugins/admin/groups/class_groupGeneric.inc:763
+msgid "Value specified as 'Name' is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+
+#: plugins/admin/groups/remove.tpl:6
+msgid ""
+"This may be a primary user group. Please double check if you really want to "
+"do this since there is no way for GOsa to get your data back."
+msgstr ""
+"Este puede ser un grupo primario. Por favor pinche dos veces si realmente "
+"quiere hacerlo, dado que GOsa no tiene manera de recuperar esta información."
+
+#: plugins/admin/groups/main.inc:39 plugins/admin/groups/main.inc:43
+msgid "Group administration"
+msgstr "Administración de grupos"
+
+#: plugins/admin/groups/headpage.tpl:6 plugins/admin/ogroups/headpage.tpl:6
+msgid "List of groups"
+msgstr "Lista de grupos"
+
+#: plugins/admin/groups/headpage.tpl:25
+msgid ""
+"This menu allows you to add, edit and remove selected groups. You may want "
+"to use the range selector on top of the group listbox, when working with a "
+"large number of groups."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
+"usar el selector de rango en la parte superior de la lista de grupos, cuando "
+"trabaja con un gran número de grupos."
+
+#: plugins/admin/groups/headpage.tpl:41
+msgid "Select to see groups that are primary groups of users"
+msgstr "Seleccione para ver que grupos son grupos primarios de usuarios"
+
+#: plugins/admin/groups/headpage.tpl:42
+msgid "Show primary groups"
+msgstr "Mostrar grupos primarios"
+
+#: plugins/admin/groups/headpage.tpl:46
+msgid "Select to see groups that have samba groups mappings"
+msgstr "Seleccione para ver que grupos tienen asignado un grupo samba"
+
+#: plugins/admin/groups/headpage.tpl:47
+msgid "Show samba groups"
+msgstr "Mostrar los grupos samba"
+
+#: plugins/admin/groups/headpage.tpl:50
+msgid "Select to see groups that have applications configured"
+msgstr "Seleccione para ver que grupos tienen aplicaciones configuradas"
+
+#: plugins/admin/groups/headpage.tpl:51
+msgid "Show application groups"
+msgstr "Mostrar los grupos de aplicaciones"
+
+#: plugins/admin/groups/headpage.tpl:54
+msgid "Select to see groups that have mail settings"
+msgstr ""
+"Seleccione para ver que grupos tienen configuración de correo electrónico"
+
+#: plugins/admin/groups/headpage.tpl:55
+msgid "Show mail groups"
+msgstr "Mostrar grupos de correo"
+
+#: plugins/admin/groups/headpage.tpl:58
+msgid "Select to see normal groups that have only functional aspects"
+msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
+
+#: plugins/admin/groups/headpage.tpl:59
+msgid "Show functional groups"
+msgstr "Mostrar grupos funcionales"
+
+#: plugins/admin/groups/class_groupMail.inc:278
+msgid "read"
+msgstr "leer"
+
+#: plugins/admin/groups/class_groupMail.inc:279
+msgid "post"
+msgstr "post"
+
+#: plugins/admin/groups/class_groupMail.inc:280
+msgid "external post"
+msgstr "post externo"
+
+#: plugins/admin/groups/class_groupMail.inc:281
+msgid "append"
+msgstr "añadir"
+
+#: plugins/admin/groups/class_groupMail.inc:282
+msgid "write"
+msgstr "escribir"
 
 #: plugins/admin/groups/class_groupMail.inc:306
 msgid "This 'dn' has no valid mail extensions."
@@ -6357,25 +6342,25 @@ msgstr "Esta intentando añadir una dirección de correo no valida"
 msgid "to the list of forwarders."
 msgstr "a la lista de remitentes."
 
-#: plugins/admin/groups/class_groupMail.inc:801
+#: plugins/admin/groups/class_groupMail.inc:810
 msgid "Please enter a valid email addres in 'Primary address' field."
 msgstr ""
 "Por favor introduzca una dirección valida de correo electrónico en el campo "
 "'Cuenta Principal'."
 
-#: plugins/admin/groups/class_groupMail.inc:834
+#: plugins/admin/groups/class_groupMail.inc:843
 msgid ""
 "Please choose valid permission settings. Default permission can't be emtpy."
 msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:838
+#: plugins/admin/groups/class_groupMail.inc:847
 #, fuzzy
 msgid "Please select a valid mail server."
 msgstr "Por favor introduzca un número de serie válido"
 
 #: plugins/admin/groups/acl.tpl:4
-#: plugins/admin/departments/class_departmentGeneric.inc:314
-#: include/class_ldap.inc:412
+#: plugins/admin/departments/class_departmentGeneric.inc:430
+#: include/class_ldap.inc:453
 msgid "Object"
 msgstr "Objeto"
 
@@ -6388,16 +6373,26 @@ msgstr "Elige"
 msgid "Apply this acl only for users own entries"
 msgstr "Aplicar esta lista de acceso a las entradas de los usuarios"
 
-#: plugins/admin/groups/application.tpl:4
+#: plugins/admin/groups/application.tpl:3
+#, fuzzy
+msgid "Release focus"
+msgstr "Paquete de reglas"
+
+#: plugins/admin/groups/application.tpl:5
+#, fuzzy
+msgid "Select release name"
+msgstr "Seleccione para ver los servidores"
+
+#: plugins/admin/groups/application.tpl:16
 msgid "Used applications"
 msgstr "Aplicaciones Usadas"
 
-#: plugins/admin/groups/application.tpl:7
+#: plugins/admin/groups/application.tpl:19
 #, fuzzy
 msgid "Add category"
 msgstr "Categoría"
 
-#: plugins/admin/groups/application.tpl:12
+#: plugins/admin/groups/application.tpl:24
 msgid "Available applications"
 msgstr "Aplicaciones disponibles"
 
@@ -6407,6 +6402,7 @@ msgstr "Seleccione usuarios que serán añadidos"
 
 #: plugins/admin/groups/group_objects.tpl:30
 #: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Seleccione para ver los servidores"
@@ -6435,7 +6431,7 @@ msgid "All fields are writeable"
 msgstr "Todos los campos son rellenarles."
 
 #: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
-#: plugins/admin/ogroups/class_ogroup.inc:736
+#: plugins/admin/ogroups/class_ogroup.inc:737
 #: plugins/admin/ogroups/generic.tpl:7
 msgid "Group name"
 msgstr "Nombre del grupo"
@@ -6498,10 +6494,9 @@ msgstr "Administradores de Carpetas"
 msgid "Select a specific department"
 msgstr "Seleccionar un departamento especifico"
 
-#: plugins/admin/groups/paste_generic.tpl:1
-#, fuzzy
-msgid "Group settings"
-msgstr "Parámetros de quotas"
+#: plugins/admin/groups/application_options.tpl:2
+msgid "Application options"
+msgstr "Opciones de aplicaciones"
 
 #: plugins/admin/groups/mail_locals.tpl:32
 msgid "Display addresses of department"
@@ -6511,15 +6506,15 @@ msgstr "Mostrar las direcciones de los departamentos"
 msgid "Display addresses matching"
 msgstr "Mostrar direcciones que concuerden con"
 
-#: plugins/admin/groups/class_groupApplication.inc:295
+#: plugins/admin/groups/class_groupApplication.inc:393
 msgid "This 'dn' is no appgroup."
 msgstr "Esta'dn' no es un grupo de aplicaciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:303
+#: plugins/admin/groups/class_groupApplication.inc:401
 msgid "Remove applications"
 msgstr "Borrar aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:304
+#: plugins/admin/groups/class_groupApplication.inc:402
 msgid ""
 "This group has application features enabled. You can disable them by "
 "clicking below."
@@ -6527,11 +6522,11 @@ msgstr ""
 "Este grupo tiene la características de aplicación activa. Puede "
 "desactivarlas apretando a continuación."
 
-#: plugins/admin/groups/class_groupApplication.inc:306
+#: plugins/admin/groups/class_groupApplication.inc:404
 msgid "Create applications"
 msgstr "Crear aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:307
+#: plugins/admin/groups/class_groupApplication.inc:405
 msgid ""
 "This group has application features disabled. You can enable them by "
 "clicking below."
@@ -6539,52 +6534,84 @@ msgstr ""
 "Este grupo tiene la característica de aplicacióon desactivada. Puede "
 "activarlas apretando a continuación."
 
-#: plugins/admin/groups/class_groupApplication.inc:319
+#: plugins/admin/groups/class_groupApplication.inc:417
 #, fuzzy
 msgid "Invalid character in category name."
 msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/admin/groups/class_groupApplication.inc:327
+#: plugins/admin/groups/class_groupApplication.inc:425
 #, fuzzy
 msgid "The specified category already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/groups/class_groupApplication.inc:393
+#: plugins/admin/groups/class_groupApplication.inc:515
 msgid "The selected application name is not uniq. Please check your LDAP."
 msgstr ""
 "El nombre seleccionado de aplicación no es único. Por favor compruebe su "
 "base de datos LDAP."
 
-#: plugins/admin/groups/class_groupApplication.inc:429
+#: plugins/admin/groups/class_groupApplication.inc:551
 msgid "The selected application has no options."
 msgstr "La aplicación seleccionada no tiene opciones."
 
-#: plugins/admin/groups/class_groupApplication.inc:529
+#: plugins/admin/groups/class_groupApplication.inc:655
 #, fuzzy
 msgid "application"
 msgstr "Aplicaciones"
 
-#: plugins/admin/groups/class_groupApplication.inc:560
-#: plugins/admin/groups/class_groupApplication.inc:596
+#: plugins/admin/groups/class_groupApplication.inc:686
+#: plugins/admin/groups/class_groupApplication.inc:722
 #, fuzzy
 msgid "Delete entry"
 msgstr "Borrar"
 
-#: plugins/admin/groups/class_groupApplication.inc:564
-#: plugins/admin/groups/class_groupApplication.inc:594
+#: plugins/admin/groups/class_groupApplication.inc:690
+#: plugins/admin/groups/class_groupApplication.inc:720
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:565
-#: plugins/admin/groups/class_groupApplication.inc:595
+#: plugins/admin/groups/class_groupApplication.inc:691
+#: plugins/admin/groups/class_groupApplication.inc:721
 #, fuzzy
 msgid "Move down"
 msgstr "Dominio"
 
-#: plugins/admin/groups/class_groupApplication.inc:592
+#: plugins/admin/groups/class_groupApplication.inc:718
 msgid "Insert seperator"
 msgstr ""
 
+#: plugins/admin/groups/class_groupApplication.inc:746
+#, fuzzy
+msgid "This application is no longer available."
+msgstr "La aplicación seleccionada no tiene opciones."
+
+#: plugins/admin/groups/class_groupApplication.inc:749
+#, php-format
+msgid "This application is not available in any release named %s."
+msgstr ""
+
+#: plugins/admin/groups/class_groupApplication.inc:753
+#, fuzzy
+msgid "Check parameter"
+msgstr "Editar parametros"
+
+#: plugins/admin/groups/class_groupApplication.inc:755
+#, fuzzy
+msgid "This application has changed parameters."
+msgstr "La aplicación seleccionada no tiene opciones."
+
+#: plugins/admin/groups/class_groupApplication.inc:928
+#, php-format
+msgid ""
+"Can't resolve the release name '%s', setting release name to '%s'. Possibly "
+"the objects base has changed."
+msgstr ""
+
+#: plugins/admin/groups/paste_generic.tpl:1
+#, fuzzy
+msgid "Group settings"
+msgstr "Parámetros de quotas"
+
 #: plugins/admin/users/password.tpl:2
 msgid ""
 "To change the user password use the fields below. The changes take effect "
@@ -6595,158 +6622,137 @@ msgstr ""
 "cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
 "contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/users/template.tpl:2
-msgid "Creating a new user using templates"
-msgstr "Crear un nuevo usuario usando plantillas"
-
-#: plugins/admin/users/template.tpl:6
-#, fuzzy
-msgid ""
-"Creating a new user can be assisted by using templates. Many database "
-"records will be filled automatically. Choose 'none' to skip the usage of "
-"templates."
-msgstr ""
-"Crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
-"valores en la base de datos serán rellenado automáticamente. Elegir "
-"<b>ninguno</b> para saltarse el uso de plantillas."
-
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/users/class_userManagement.inc:1181
-#: plugins/admin/systems/class_systemManagement.inc:918
-msgid "Template"
-msgstr "Plantilla"
-
-#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
-msgid "User administration"
-msgstr "Administración de Usuarios"
-
-#: plugins/admin/users/class_userManagement.inc:25
-#: plugins/admin/systems/class_glpiSelectUser.inc:112
-#: plugins/admin/systems/printer.tpl:66 html/getxls.php:68 html/getxls.php:70
-#: html/getxls.php:243
+#: plugins/admin/users/class_userManagement.inc:28
+#: plugins/admin/systems/printer.tpl:66
+#: plugins/admin/systems/class_glpiSelectUser.inc:112 html/getxls.php:68
+#: html/getxls.php:70 html/getxls.php:243
 msgid "Users"
 msgstr "Usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:334
-#: plugins/admin/users/class_userManagement.inc:404
+#: plugins/admin/users/class_userManagement.inc:258
+#: plugins/admin/users/class_userManagement.inc:328
 msgid "You are not allowed to set this users password!"
 msgstr "No le es permitido cambiarle la contraseña a estos usuarios."
 
-#: plugins/admin/users/class_userManagement.inc:440
+#: plugins/admin/users/class_userManagement.inc:363
 #, php-format
 msgid "You're about to delete the user %s."
 msgstr "Esta a punto de borrar el usuario %s"
 
-#: plugins/admin/users/class_userManagement.inc:446
-#: plugins/admin/users/class_userManagement.inc:474
+#: plugins/admin/users/class_userManagement.inc:369
+#: plugins/admin/users/class_userManagement.inc:395
 msgid "You are not allowed to delete this user!"
 msgstr "No le es permitido borrar este usuario"
 
-#: plugins/admin/users/class_userManagement.inc:575
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:392
+#: plugins/admin/users/class_userManagement.inc:496
 #: plugins/admin/systems/class_SelectDeviceType.inc:29
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:393
 #: plugins/admin/ogroups/class_ogroup.inc:277
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/users/class_userManagement.inc:646
+#: plugins/admin/users/class_userManagement.inc:566
 msgid "A person with the choosen name is already used in this tree."
 msgstr "Una persona con el nombre elegido ya existe en el árbol"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:698
 #, fuzzy
 msgid "Create new user"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/admin/users/class_userManagement.inc:783
+#: plugins/admin/users/class_userManagement.inc:698
 #, fuzzy
 msgid "New user"
 msgstr "usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:784
+#: plugins/admin/users/class_userManagement.inc:699
 #, fuzzy
 msgid "Create new template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:784
+#: plugins/admin/users/class_userManagement.inc:699
 msgid "New template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/users/class_userManagement.inc:808
+#: plugins/admin/users/class_userManagement.inc:713
+#: plugins/admin/users/class_userManagement.inc:720
 #, fuzzy
 msgid "password"
 msgstr "Contraseña"
 
-#: plugins/admin/users/class_userManagement.inc:819
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: plugins/admin/users/class_userManagement.inc:729
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
 #: ihtml/themes/altlinux/setup_useradmin.tpl:22
+#: ihtml/themes/altlinux/login.tpl:26 ihtml/themes/altlinux/login.tpl:30
+#: ihtml/themes/default/setup_useradmin.tpl:22
 #: ihtml/themes/default/login.tpl:28 ihtml/themes/default/login.tpl:32
-#: ihtml/themes/default/setup_useradmin.tpl:22 ihtml/themes/lhs/login.tpl:28
-#: ihtml/themes/lhs/login.tpl:32 ihtml/themes/lhs/setup_useradmin.tpl:22
 msgid "Username"
 msgstr "Nombre de Usuario"
 
-#: plugins/admin/users/class_userManagement.inc:824
+#: plugins/admin/users/class_userManagement.inc:733
 msgid "This table displays all users, in the selected tree."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:855
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "GOsa"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
+#: plugins/admin/users/class_userManagement.inc:764
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:858
+#: plugins/admin/users/class_userManagement.inc:766
 #, fuzzy
 msgid "Edit UNIX properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:860
+#: plugins/admin/users/class_userManagement.inc:768
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:862
+#: plugins/admin/users/class_userManagement.inc:770
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:864
+#: plugins/admin/users/class_userManagement.inc:772
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:866
+#: plugins/admin/users/class_userManagement.inc:774
 #, fuzzy
 msgid "Edit fax properies"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:868
+#: plugins/admin/users/class_userManagement.inc:776
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Editar propiedades"
 
-#: plugins/admin/users/class_userManagement.inc:869
+#: plugins/admin/users/class_userManagement.inc:778
+#, fuzzy
+msgid "Edit netatalk properties"
+msgstr "Editar propiedades"
+
+#: plugins/admin/users/class_userManagement.inc:779
 #, fuzzy
 msgid "Create user from template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/users/class_userManagement.inc:780
 #, fuzzy
 msgid "Create user with this template"
 msgstr "Nueva plantilla"
 
-#: plugins/admin/users/class_userManagement.inc:929
+#: plugins/admin/users/class_userManagement.inc:838
 #, fuzzy
 msgid "Online"
 msgstr "en linea"
 
-#: plugins/admin/users/class_userManagement.inc:936
+#: plugins/admin/users/class_userManagement.inc:845
 #, fuzzy
 msgid "Offline"
 msgstr "fuera de linea"
@@ -6821,10 +6827,70 @@ msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
 msgid "Show proxy users"
 msgstr "Mostrar los usuarios de proxy"
 
+#: plugins/admin/users/main.inc:40 plugins/admin/users/main.inc:46
+msgid "User administration"
+msgstr "Administración de Usuarios"
+
+#: plugins/admin/users/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Crear un nuevo usuario usando plantillas"
+
+#: plugins/admin/users/template.tpl:6
+#, fuzzy
+msgid ""
+"Creating a new user can be assisted by using templates. Many database "
+"records will be filled automatically. Choose 'none' to skip the usage of "
+"templates."
+msgstr ""
+"Crear un nuevo usuario puede ser asistido a través de plantillas. Algunos "
+"valores en la base de datos serán rellenado automáticamente. Elegir "
+"<b>ninguno</b> para saltarse el uso de plantillas."
+
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:883
+msgid "Template"
+msgstr "Plantilla"
+
+#: plugins/admin/applications/class_applicationParameters.inc:52
+msgid "Remove options"
+msgstr "Eliminar opciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:53
+msgid "This application has options. You can disable them by clicking below."
+msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
+
+#: plugins/admin/applications/class_applicationParameters.inc:55
+msgid "Create options"
+msgstr "Crear opciones"
+
+#: plugins/admin/applications/class_applicationParameters.inc:56
+msgid ""
+"This application has options disabled. You can enable them by clicking below."
+msgstr ""
+"Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+msgid "Variable"
+msgstr "Variable"
+
+#: plugins/admin/applications/class_applicationParameters.inc:93
+#: plugins/gofon/macro/parameter.tpl:9
+msgid "Default value"
+msgstr "Valor por defecto"
+
+#: plugins/admin/applications/class_applicationParameters.inc:104
+msgid "Add option"
+msgstr "Añadir opción"
+
+#: plugins/admin/applications/class_applicationParameters.inc:159
+#, php-format
+msgid "Value '%s' specified as option name is not valid."
+msgstr "El valor '%s' especificado como nombre de opción no es valido."
+
 #: plugins/admin/applications/generic.tpl:7
 #: plugins/admin/applications/generic.tpl:8
-#: plugins/admin/applications/class_applicationManagement.inc:521
-#: plugins/admin/applications/class_applicationGeneric.inc:379
+#: plugins/admin/applications/class_applicationGeneric.inc:417
+#: plugins/admin/applications/class_applicationManagement.inc:494
 msgid "Application name"
 msgstr "Nombre de la aplicación"
 
@@ -6834,7 +6900,7 @@ msgid "Display name"
 msgstr "Nombre mostrado"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:384
+#: plugins/admin/applications/class_applicationGeneric.inc:422
 msgid "Application name to be displayed (i.e. below icons)"
 msgstr ""
 "Nombre que sera mostrado de la aplicación(por ejemplo despues de los iconos)."
@@ -6847,75 +6913,39 @@ msgstr "Ruta y nombre del binario de la aplicación"
 msgid "Choose subtree to place application in"
 msgstr "Elija lugar del árbol para colocar la aplicación"
 
-#: plugins/admin/applications/generic.tpl:48
+#: plugins/admin/applications/generic.tpl:49
 msgid "Icon"
 msgstr "Icono"
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:57
 msgid "Update"
 msgstr "Actualizar"
 
-#: plugins/admin/applications/generic.tpl:56
+#: plugins/admin/applications/generic.tpl:57
 msgid "Reload picture from LDAP"
 msgstr "Recargar imagen desde LDAP"
 
-#: plugins/admin/applications/generic.tpl:70
+#: plugins/admin/applications/generic.tpl:71
 msgid "Only executable for members"
 msgstr "Solo ejecutables para los miembros"
 
-#: plugins/admin/applications/generic.tpl:72
+#: plugins/admin/applications/generic.tpl:73
 msgid "Replace user configuration on startup"
 msgstr "Reemplazar la configuración del usuario en el inicio"
 
-#: plugins/admin/applications/generic.tpl:76
+#: plugins/admin/applications/generic.tpl:77
 msgid "Place icon on members desktop"
 msgstr "Colocar icono en los escritorios de los miembros "
 
-#: plugins/admin/applications/generic.tpl:79
+#: plugins/admin/applications/generic.tpl:80
 msgid "Place entry in members startmenu"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
-#: plugins/admin/applications/generic.tpl:82
+#: plugins/admin/applications/generic.tpl:83
 #, fuzzy
 msgid "Place entry in members launch bar"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr "Eliminar opciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:53
-msgid "This application has options. You can disable them by clicking below."
-msgstr "Esta aplicación tiene opciones. Puede desactivarlas pulsando aquí."
-
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr "Crear opciones"
-
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
-msgstr ""
-"Esta aplicación tiene opciones desactivadas. Puede activarlas pulsando aquí."
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-msgid "Variable"
-msgstr "Variable"
-
-#: plugins/admin/applications/class_applicationParameters.inc:93
-#: plugins/gofon/macro/parameter.tpl:9
-msgid "Default value"
-msgstr "Valor por defecto"
-
-#: plugins/admin/applications/class_applicationParameters.inc:104
-msgid "Add option"
-msgstr "Añadir opción"
-
-#: plugins/admin/applications/class_applicationParameters.inc:158
-#, php-format
-msgid "Value '%s' specified as option name is not valid."
-msgstr "El valor '%s' especificado como nombre de opción no es valido."
-
 #: plugins/admin/applications/remove.tpl:6 plugins/gofon/macro/remove.tpl:6
 msgid ""
 "This may be used by several groups. Please double check if your really want "
@@ -6952,65 +6982,70 @@ msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/applications/class_applicationManagement.inc:376
-#, php-format
-msgid "You're about to delete the application '%s'."
-msgstr "Va ha eliminar la aplicación '%s'."
-
-#: plugins/admin/applications/class_applicationManagement.inc:382
-#: plugins/admin/applications/class_applicationManagement.inc:408
-msgid "You are not allowed to delete this application!"
-msgstr "¡No tiene permisos para eliminar esta aplicación!"
-
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#: plugins/admin/ogroups/class_ogroupManagement.inc:449
-#, fuzzy
-msgid "new"
-msgstr "Nuevo"
-
-#: plugins/admin/applications/class_applicationManagement.inc:477
-#, fuzzy
-msgid "Create new application"
-msgstr "Crear aplicaciones"
-
-#: plugins/admin/applications/class_applicationGeneric.inc:87
+#: plugins/admin/applications/class_applicationGeneric.inc:96
 #, fuzzy
 msgid "no example"
 msgstr "incompleto"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:107
+#: plugins/admin/applications/class_applicationGeneric.inc:116
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:216
+#: plugins/admin/applications/class_applicationGeneric.inc:231
 msgid "The specified picture has not been uploaded correctly."
 msgstr "La foto indicada no ha sido subida correctamente."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:298
+#: plugins/admin/applications/class_applicationGeneric.inc:307
+msgid "Specified execute path must start with '/'."
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:321
 msgid "You have no permissions to create a application on this 'Base'."
 msgstr "No tiene permisos para crear una aplicación en esta 'Base'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:303
+#: plugins/admin/applications/class_applicationGeneric.inc:326
 msgid "Required field 'Name' is not filled."
 msgstr "El campo requerido 'Nombre' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:307
+#: plugins/admin/applications/class_applicationGeneric.inc:330
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:311
+#: plugins/admin/applications/class_applicationGeneric.inc:334
 msgid "Required field 'Execute' is not filled."
 msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:320
+#: plugins/admin/applications/class_applicationGeneric.inc:349
+#: plugins/admin/applications/class_applicationGeneric.inc:357
 msgid "There's already an application with this 'Name'."
 msgstr "Ya existe una aplicación con este 'Nombre'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:375
+#: plugins/admin/applications/class_applicationGeneric.inc:413
 #, fuzzy
 msgid "Application settings"
 msgstr "Opciones de aplicaciones"
 
+#: plugins/admin/applications/class_applicationManagement.inc:349
+#, php-format
+msgid "You're about to delete the application '%s'."
+msgstr "Va ha eliminar la aplicación '%s'."
+
+#: plugins/admin/applications/class_applicationManagement.inc:355
+#: plugins/admin/applications/class_applicationManagement.inc:381
+msgid "You are not allowed to delete this application!"
+msgstr "¡No tiene permisos para eliminar esta aplicación!"
+
+#: plugins/admin/applications/class_applicationManagement.inc:450
+#: plugins/admin/ogroups/class_ogroupManagement.inc:457
+#, fuzzy
+msgid "new"
+msgstr "Nuevo"
+
+#: plugins/admin/applications/class_applicationManagement.inc:450
+#, fuzzy
+msgid "Create new application"
+msgstr "Crear aplicaciones"
+
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
 msgstr "Nombre del departamento"
@@ -7057,6 +7092,15 @@ msgstr "Número base de teléfono de este subarbol"
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Número base de fax de este subarbol"
 
+#: plugins/admin/departments/generic.tpl:77
+#, fuzzy
+msgid "Administrative settings"
+msgstr "Administradores"
+
+#: plugins/admin/departments/generic.tpl:79
+msgid "Tag department as an independent administrative unit"
+msgstr ""
+
 #: plugins/admin/departments/remove.tpl:6
 #: plugins/gofon/conference/remove.tpl:6
 #, fuzzy
@@ -7095,73 +7139,77 @@ msgstr "Expresiones regulares para encontrar nombres de departamentos"
 msgid "Department management"
 msgstr "Mantenimiento de Departamentos"
 
+#: plugins/admin/departments/class_departmentGeneric.inc:206
+msgid "You have no permissions to create a department on this 'Base'."
+msgstr "No tiene permisos para crear un departamento en esta 'Base'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:213
+#: plugins/admin/departments/class_departmentGeneric.inc:215
+msgid "Department with that 'Name' already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:223
+msgid "Required field 'Description' is not set."
+msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:228
+msgid "The field 'Name' contains the reserved word 'incoming'."
+msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:229
+msgid " Please choose another name."
+msgstr "Por favor elija otro nombre."
+
+#: plugins/admin/departments/class_departmentGeneric.inc:270
+msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:394
+#, php-format
+msgid "Moving %s to %s"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:433
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
 #: plugins/admin/departments/class_departmentManagement.inc:25
 #: plugins/admin/systems/class_glpiSelectUser.inc:112
 #: plugins/admin/ogroups/class_ogroupManagement.inc:56
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_ogroupManagement.inc:501
 msgid "Departments"
 msgstr "Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:186
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
+#: plugins/admin/departments/class_departmentManagement.inc:189
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:180
 #, php-format
 msgid "You're about to delete the whole LDAP subtree placed under '%s'."
 msgstr "Esta a punto de borrar todo el subárbol LDAP colocado bajo '%s'."
 
-#: plugins/admin/departments/class_departmentManagement.inc:203
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:197
+#: plugins/admin/departments/class_departmentManagement.inc:206
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:195
 msgid "You have no permission to remove this department."
 msgstr "No tiene permisos para eliminar este departamento."
 
-#: plugins/admin/departments/class_departmentManagement.inc:301
+#: plugins/admin/departments/class_departmentManagement.inc:304
 #, fuzzy
 msgid "Create new department"
 msgstr "Nombre del departamento"
 
-#: plugins/admin/departments/class_departmentManagement.inc:309
+#: plugins/admin/departments/class_departmentManagement.inc:312
 msgid "This table displays all departments, in the selected tree."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:318
+#: plugins/admin/departments/class_departmentManagement.inc:321
 #, fuzzy
 msgid "Department name"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:412
+#: plugins/admin/departments/class_departmentManagement.inc:417
 msgid ".."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:185
-msgid "You have no permissions to create a department on this 'Base'."
-msgstr "No tiene permisos para crear un departamento en esta 'Base'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:192
-#: plugins/admin/departments/class_departmentGeneric.inc:194
-msgid "Department with that 'Name' already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:202
-msgid "Required field 'Description' is not set."
-msgstr "El campo requerido 'Descripción' no ha sido rellenado."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:207
-msgid "The field 'Name' contains the reserved word 'incoming'."
-msgstr "El campo 'Nombre' contiene la palabra reservada 'incoming'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:208
-msgid " Please choose another name."
-msgstr "Por favor elija otro nombre."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:278
-#, php-format
-msgid "Moving %s to %s"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:317
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
 #: plugins/admin/departments/recursive_move.tpl:2
 msgid ""
 "As soon as the move operation has finished, you can scroll down to end of "
@@ -7169,52 +7217,33 @@ msgid ""
 "management dialog."
 msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:200
-msgid "present"
-msgstr "presente"
-
-#: plugins/admin/systems/class_terminalInfo.inc:68
-#: plugins/admin/systems/class_workstationService.inc:151
-#: plugins/admin/systems/class_workstationStartup.inc:372
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
-#: plugins/admin/systems/class_terminalGeneric.inc:153
-msgid "This 'dn' has no terminal features."
-msgstr "Esta 'dn' no tiene características de terminal."
-
-#: plugins/admin/systems/class_terminalInfo.inc:75
+#: plugins/admin/systems/class_baseSelectDialog.inc:23
 #, fuzzy
-msgid "There is no php snmp module installed, can't gather any informations."
-msgstr ""
-"Aviso: imap_getacl no ha sido implementado, no se modificara información "
-"sobre las listas de acceso."
-
-#: plugins/admin/systems/class_terminalInfo.inc:81
-#: plugins/admin/systems/class_terminalInfo.inc:175
-msgid "unknown status"
-msgstr "estado desconocido"
+msgid "Choose a base"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/class_terminalInfo.inc:90
-msgid "This is a virtual terminal which has no properties to show here."
+#: plugins/admin/systems/class_baseSelectDialog.inc:34
+msgid ""
+"Step in the prefered tree and click save to use the current subtree as base. "
+"Or click the image at the end of each entry."
 msgstr ""
-"Este es un terminal virtual que no tiene propiedades que puedan ser mostradas"
-
-#: plugins/admin/systems/class_terminalInfo.inc:108
-msgid "online"
-msgstr "en linea"
 
-#: plugins/admin/systems/class_terminalInfo.inc:164
-msgid "running"
-msgstr "Activo"
+#: plugins/admin/systems/class_baseSelectDialog.inc:45
+#: plugins/admin/systems/server.tpl:45 plugins/admin/systems/terminal.tpl:110
+#: plugins/admin/systems/workstation.tpl:89
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
+#: plugins/admin/ogroups/termgroup.tpl:3
+msgid "Action"
+msgstr "Acción"
 
-#: plugins/admin/systems/class_terminalInfo.inc:167
-msgid "not running"
-msgstr "no esta activo"
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
+msgid "Filter entries with this syntax"
+msgstr ""
 
-#: plugins/admin/systems/class_terminalInfo.inc:192
-msgid "offline"
-msgstr "fuera de linea"
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "Borrar"
 
 #: plugins/admin/systems/network.tpl:1
 #, fuzzy
@@ -7234,7 +7263,7 @@ msgid "Enable DNS for this device"
 msgstr ""
 
 #: plugins/admin/systems/network.tpl:30
-#: plugins/admin/systems/servdnseditzone.tpl:63
+#: plugins/admin/systems/servdnseditzone.tpl:67
 #: plugins/gofon/phoneaccount/generic.tpl:67
 #, fuzzy
 msgid "Refresh"
@@ -7246,8 +7275,8 @@ msgid "Zone"
 msgstr "teléfonos"
 
 #: plugins/admin/systems/network.tpl:42
-#: plugins/admin/systems/servdnseditzone.tpl:81
-#: plugins/admin/systems/class_servDNS.inc:298
+#: plugins/admin/systems/class_servDNS.inc:160
+#: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
 
@@ -7256,203 +7285,49 @@ msgstr ""
 msgid "Dns records"
 msgstr "Directorio"
 
-#: plugins/admin/systems/workstationService.tpl:4
-#: plugins/admin/systems/terminalService.tpl:4
-msgid "Keyboard"
-msgstr "Teclado"
+#: plugins/admin/systems/info.tpl:1
+msgid "System information"
+msgstr "Información de sistema"
 
-#: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:7
-#: plugins/admin/systems/terminalService.tpl:210
-#: plugins/admin/systems/printerPPDDialog.tpl:5
-msgid "Model"
-msgstr "Modelo"
+#: plugins/admin/systems/info.tpl:7
+msgid "CPU"
+msgstr "CPU"
 
-#: plugins/admin/systems/workstationService.tpl:9
-#: plugins/admin/systems/terminalService.tpl:9
-msgid "Choose keyboard model"
-msgstr "Elija modelo de teclado"
+#: plugins/admin/systems/info.tpl:10
+msgid "Memory"
+msgstr "Memoria"
 
-#: plugins/admin/systems/workstationService.tpl:15
-#: plugins/admin/systems/terminalService.tpl:15
-msgid "Layout"
-msgstr "Disposición"
+#: plugins/admin/systems/info.tpl:13
+msgid "Boot MAC"
+msgstr "MAC"
 
-#: plugins/admin/systems/workstationService.tpl:17
-#: plugins/admin/systems/terminalService.tpl:17
-msgid "Choose keyboard layout"
-msgstr "Elija localización del teclado"
+#: plugins/admin/systems/info.tpl:16
+msgid "USB support"
+msgstr "Soporte USB"
 
-#: plugins/admin/systems/workstationService.tpl:23
-#: plugins/admin/systems/terminalService.tpl:23
-msgid "Variant"
-msgstr "Variante"
+#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
+msgid "System status"
+msgstr "Estado del Sistema"
 
-#: plugins/admin/systems/workstationService.tpl:25
-#: plugins/admin/systems/terminalService.tpl:25
-msgid "Choose keyboard variant"
-msgstr "Elija variante de teclado"
+#: plugins/admin/systems/info.tpl:23
+msgid "Inventory number"
+msgstr "Número de inventario"
 
-#: plugins/admin/systems/workstationService.tpl:39
-#: plugins/admin/systems/terminalService.tpl:39
-msgid "Mouse"
-msgstr "Ratón"
+#: plugins/admin/systems/info.tpl:27
+msgid "Last login"
+msgstr "Ultimo Inicio de Sesion"
 
-#: plugins/admin/systems/workstationService.tpl:44
-#: plugins/admin/systems/terminalService.tpl:44
-msgid "Choose mouse type"
-msgstr "Elija tipo de ratón"
+#: plugins/admin/systems/info.tpl:38
+msgid "Network devices"
+msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/workstationService.tpl:50
-#: plugins/admin/systems/terminalService.tpl:50
-msgid "Port"
-msgstr "Puerto"
+#: plugins/admin/systems/info.tpl:47
+msgid "IDE devices"
+msgstr "Controladora IDE"
 
-#: plugins/admin/systems/workstationService.tpl:52
-#: plugins/admin/systems/terminalService.tpl:52
-msgid "Choose mouse port"
-msgstr "Elija el puerto del ratón"
-
-#: plugins/admin/systems/workstationService.tpl:66
-#: plugins/admin/systems/terminalService.tpl:66
-#: plugins/gofon/phoneaccount/generic.tpl:24
-#: plugins/gofon/phoneaccount/paste_generic.tpl:23
-msgid "Telephone hardware"
-msgstr "Componente telefónico"
-
-#: plugins/admin/systems/workstationService.tpl:69
-#: plugins/admin/systems/terminalService.tpl:69
-#: plugins/gofon/phoneaccount/generic.tpl:26
-#: plugins/gofon/phoneaccount/generic.tpl:28
-#: plugins/gofon/phoneaccount/paste_generic.tpl:25
-msgid "Telephone"
-msgstr "Teléfono"
-
-#: plugins/admin/systems/workstationService.tpl:83
-#: plugins/admin/systems/info.tpl:73
-#: plugins/admin/systems/terminalService.tpl:83
-msgid "Graphic device"
-msgstr "Tarjeta Gráfica"
-
-#: plugins/admin/systems/workstationService.tpl:86
-#: plugins/admin/systems/terminalService.tpl:86
-#: plugins/admin/systems/printer.tpl:46
-msgid "Driver"
-msgstr "Controlador"
-
-#: plugins/admin/systems/workstationService.tpl:88
-#: plugins/admin/systems/terminalService.tpl:88
-msgid "Choose graphic driver that is needed by the installed graphic board"
-msgstr ""
-"Elija controlador gráfico que se necesita para la tarjeta gráfica instalada"
-
-#: plugins/admin/systems/workstationService.tpl:96
-#: plugins/admin/systems/terminalService.tpl:96
-msgid "Choose screen resolution used in graphic mode"
-msgstr "Elija la resolución gráfica usada en modo gráfico"
-
-#: plugins/admin/systems/workstationService.tpl:102
-#: plugins/admin/systems/terminalService.tpl:102
-msgid "Color depth"
-msgstr "Profundidad del Color"
-
-#: plugins/admin/systems/workstationService.tpl:104
-#: plugins/admin/systems/terminalService.tpl:104
-msgid "Choose colordepth used in graphic mode"
-msgstr "Elija la profundidad de color usada en modo gráfico"
-
-#: plugins/admin/systems/workstationService.tpl:117
-#: plugins/admin/systems/terminalService.tpl:117
-msgid "Display device"
-msgstr "Mostrar dispositivo"
-
-#: plugins/admin/systems/workstationService.tpl:121
-#, fuzzy
-msgid "unknown"
-msgstr "estado desconocido"
-
-#: plugins/admin/systems/workstationService.tpl:126
-msgid "Automatic modelines"
-msgstr ""
-
-#: plugins/admin/systems/workstationService.tpl:130
-#: plugins/admin/systems/terminalService.tpl:124
-msgid "HSync"
-msgstr "HSync"
-
-#: plugins/admin/systems/workstationService.tpl:132
-#: plugins/admin/systems/terminalService.tpl:126
-msgid "Horizontal refresh frequency for installed monitor"
-msgstr "Frecuencia de refresco horizontal para el monitor instalado"
-
-#: plugins/admin/systems/workstationService.tpl:135
-#: plugins/admin/systems/terminalService.tpl:129
-msgid "VSync"
-msgstr "VSync"
-
-#: plugins/admin/systems/workstationService.tpl:137
-#: plugins/admin/systems/terminalService.tpl:131
-msgid "Vertical refresh frequency for installed monitor"
-msgstr "Frecuencia de refresco vertical para el monitor instalado"
-
-#: plugins/admin/systems/workstationService.tpl:149
-#: plugins/admin/systems/terminalService.tpl:203
-msgid "Scan device"
-msgstr "Dispositivo de escaneo"
-
-#: plugins/admin/systems/workstationService.tpl:150
-#: plugins/admin/systems/terminalService.tpl:204
-msgid "Select to start SANE scan service on terminal"
-msgstr "Seleccione para iniciar el servicio de escáner 'SANE' en el terminal"
-
-#: plugins/admin/systems/workstationService.tpl:151
-#: plugins/admin/systems/terminalService.tpl:205
-msgid "Provide scan services"
-msgstr "Provee servicios de exploración"
-
-#: plugins/admin/systems/info.tpl:1
-msgid "System information"
-msgstr "Información de sistema"
-
-#: plugins/admin/systems/info.tpl:7
-msgid "CPU"
-msgstr "CPU"
-
-#: plugins/admin/systems/info.tpl:10
-msgid "Memory"
-msgstr "Memoria"
-
-#: plugins/admin/systems/info.tpl:13
-msgid "Boot MAC"
-msgstr "MAC"
-
-#: plugins/admin/systems/info.tpl:16
-msgid "USB support"
-msgstr "Soporte USB"
-
-#: plugins/admin/systems/info.tpl:19 plugins/admin/systems/info.tpl:87
-msgid "System status"
-msgstr "Estado del Sistema"
-
-#: plugins/admin/systems/info.tpl:23
-msgid "Inventory number"
-msgstr "Número de inventario"
-
-#: plugins/admin/systems/info.tpl:27
-msgid "Last login"
-msgstr "Ultimo Inicio de Sesion"
-
-#: plugins/admin/systems/info.tpl:38
-msgid "Network devices"
-msgstr "Dispositivos de Red"
-
-#: plugins/admin/systems/info.tpl:47
-msgid "IDE devices"
-msgstr "Controladora IDE"
-
-#: plugins/admin/systems/info.tpl:56
-msgid "SCSI devices"
-msgstr "Controladora SCSI"
+#: plugins/admin/systems/info.tpl:56
+msgid "SCSI devices"
+msgstr "Controladora SCSI"
 
 #: plugins/admin/systems/info.tpl:64
 msgid "Floppy device"
@@ -7462,6 +7337,12 @@ msgstr "Disquetera"
 msgid "CDROM device"
 msgstr "Unidad de CDROM"
 
+#: plugins/admin/systems/info.tpl:73
+#: plugins/admin/systems/workstationService.tpl:83
+#: plugins/admin/systems/terminalService.tpl:83
+msgid "Graphic device"
+msgstr "Tarjeta Gráfica"
+
 #: plugins/admin/systems/info.tpl:77
 msgid "Audio device"
 msgstr "Tarjeta Sonido"
@@ -7502,2856 +7383,3139 @@ msgstr "Servicio de sonido"
 msgid "GUI"
 msgstr "GUI"
 
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-#, fuzzy
-msgid "System type"
-msgstr "Sistemas"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Remove Kolab extension"
+msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/glpi.tpl:19
-#, fuzzy
-msgid "Operating system"
-msgstr "Borrar"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid ""
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
-#: plugins/admin/systems/glpi_devices.tpl:24
-#: plugins/admin/systems/glpi_devices.tpl:123
-#: plugins/admin/systems/glpi_devices.tpl:164
-#: plugins/admin/systems/glpi_devices.tpl:219
-#: plugins/admin/systems/glpi_devices.tpl:275
-#: plugins/admin/systems/glpi_devices.tpl:333
-#: plugins/admin/systems/glpi_devices.tpl:397
-#: plugins/admin/systems/glpi_devices.tpl:469
-#: plugins/admin/systems/glpi_devices.tpl:533
-#: plugins/admin/systems/glpi_devices.tpl:580
-#: plugins/admin/systems/glpi_devices.tpl:633
-#: plugins/admin/systems/glpi_devices.tpl:687
-#: plugins/admin/systems/glpi_devices.tpl:733
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
-msgid "Manufacturer"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid "Add Kolab service"
+msgstr "Añadir el servicio Kolab"
+
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid ""
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
 msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-#, fuzzy
-msgid "Contacts"
-msgstr "Contacto"
+#: plugins/admin/systems/class_servKolab.inc:146
+#, php-format
+msgid "Include data from %s days in the past when creating free/busy lists"
+msgstr ""
+"Incluye información desde hace '%s' días cuando cree listas de presencia"
 
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-#, fuzzy
-msgid "Contact person"
-msgstr "Contacto"
+#: plugins/admin/systems/class_servKolab.inc:152
+#, php-format
+msgid "Warn users when using more than %s%% of their mail quota"
+msgstr ""
+"Avisar a los usuarios de que están usando mas de %s%% de su cuota de correo"
 
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
-msgid "Technical responsible"
+#: plugins/admin/systems/class_servKolab.inc:229
+msgid "Future days in Free/Busy settings must be set."
+msgstr "Se deben poner días futuros en la configuración de presencia"
+
+#: plugins/admin/systems/class_servKolab.inc:231
+msgid "Future days in Free/Busy settings must be a positive value."
 msgstr ""
+"Días futuros en la configuración de presencia debe ser un número positivo."
 
-#: plugins/admin/systems/glpi.tpl:63
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
-#: plugins/admin/systems/glpi_devices.tpl:112
-#: plugins/admin/systems/glpi_devices.tpl:153
-#: plugins/admin/systems/glpi_devices.tpl:208
-#: plugins/admin/systems/glpi_devices.tpl:264
-#: plugins/admin/systems/glpi_devices.tpl:322
-#: plugins/admin/systems/glpi_devices.tpl:386
-#: plugins/admin/systems/glpi_devices.tpl:458
-#: plugins/admin/systems/glpi_devices.tpl:522
-#: plugins/admin/systems/glpi_devices.tpl:569
-#: plugins/admin/systems/glpi_devices.tpl:622
-#: plugins/admin/systems/glpi_devices.tpl:676
-#: plugins/admin/systems/glpi_devices.tpl:722
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
-#, fuzzy
-msgid "Comment"
-msgstr "Contacto"
+#: plugins/admin/systems/class_servKolab.inc:235
+msgid "The given Quota settings value must be a number."
+msgstr "El valor introducido como cuota debe ser un número."
 
-#: plugins/admin/systems/glpi.tpl:78
-#, fuzzy
-msgid "Installed devices"
-msgstr "Dispositivos clientes"
+#: plugins/admin/systems/class_servKolab.inc:237
+msgid "Please choose a value between 1 and 100 for Quota settings."
+msgstr ""
+"Por favor introduzca un valor entre 1 y 100 para el parámetro de cuota."
 
-#: plugins/admin/systems/glpi.tpl:90
-#, fuzzy
-msgid "Trading"
-msgstr "Ocultamiento"
+#: plugins/admin/systems/class_servKolab.inc:239
+msgid "Future days must be a value."
+msgstr "Días futuros debe ser un valor"
 
-#: plugins/admin/systems/glpi.tpl:91
+#: plugins/admin/systems/class_servKolab.inc:243
+msgid "No SMTP privileged networks set."
+msgstr "No se han indicado redes privilegiadas SMTP."
+
+#: plugins/admin/systems/class_servGeneric.inc:34
+#: plugins/admin/systems/class_workstationGeneric.inc:90
 #, fuzzy
-msgid "Software"
-msgstr "Estado"
+msgid "Activated"
+msgstr "Privado"
 
-#: plugins/admin/systems/glpi.tpl:92
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/systems/class_workstationGeneric.inc:92
 #, fuzzy
-msgid "Contracts"
-msgstr "Contacto"
+msgid "Memory test"
+msgstr "Memoria"
 
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/systems/class_workstationGeneric.inc:93
 #, fuzzy
-msgid "Attachments"
-msgstr "Argumentos"
+msgid "System analysis"
+msgstr "Registro del sistema"
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Gestión del sistema"
+#: plugins/admin/systems/class_servGeneric.inc:60
+msgid "This 'dn' has no server features."
+msgstr "Esta 'dn' no tiene características de servidor."
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
-#, fuzzy
-msgid "Printer type"
-msgstr "Nombre de la impresora"
+#: plugins/admin/systems/class_servGeneric.inc:70
+#: plugins/admin/systems/class_terminalGeneric.inc:117
+#: plugins/admin/ogroups/class_termgroup.inc:64
+msgid "No WAKECMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
-#, fuzzy
-msgid "Supported interfaces"
-msgstr "Impresora de Red"
+#: plugins/admin/systems/class_servGeneric.inc:74
+#: plugins/admin/systems/class_servGeneric.inc:86
+#: plugins/admin/systems/class_servGeneric.inc:98
+#: plugins/admin/systems/class_workstationGeneric.inc:124
+#: plugins/admin/systems/class_terminalGeneric.inc:121
+#: plugins/admin/systems/class_terminalGeneric.inc:133
+#: plugins/admin/systems/class_terminalGeneric.inc:145
+#: plugins/admin/ogroups/class_termgroup.inc:68
+#: plugins/admin/ogroups/class_termgroup.inc:80
+#: plugins/admin/ogroups/class_termgroup.inc:92
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr "¡La ejecución de '%s' ha fallado!"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
-#, fuzzy
-msgid "Serial"
-msgstr "terminales"
+#: plugins/admin/systems/class_servGeneric.inc:82
+#: plugins/admin/systems/class_terminalGeneric.inc:129
+#: plugins/admin/ogroups/class_termgroup.inc:76
+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/glpiPrinter.tpl:46
-#, fuzzy
-msgid "Parallel"
-msgstr "Variable"
+#: plugins/admin/systems/class_servGeneric.inc:94
+#: plugins/admin/systems/class_terminalGeneric.inc:141
+#: plugins/admin/ogroups/class_termgroup.inc:88
+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/glpiPrinter.tpl:54
-msgid "USB"
-msgstr ""
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Switch off"
+msgstr "Apagar"
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
-#, fuzzy
-msgid "Installed cartridges"
-msgstr "Dispositivos clientes"
+#: plugins/admin/systems/class_servGeneric.inc:148
+#: plugins/admin/systems/class_workstationGeneric.inc:189
+#: plugins/admin/systems/class_terminalGeneric.inc:212
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Reboot"
+msgstr "Reiniciar"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
+#: plugins/admin/systems/class_servGeneric.inc:149
+#: plugins/admin/systems/class_workstationGeneric.inc:190
 #, fuzzy
-msgid "Manage System-types"
-msgstr "Sistemas"
+msgid "Instant update"
+msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
-#: plugins/admin/systems/glpi_edit_os.tpl:9
-#: plugins/admin/systems/glpi_edit_os.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+#: plugins/admin/systems/class_servGeneric.inc:150
+#: plugins/admin/systems/class_servGeneric.inc:156
+#: plugins/admin/systems/class_workstationGeneric.inc:191
+#: plugins/admin/systems/class_workstationGeneric.inc:197
 #, fuzzy
-msgid "Rename"
-msgstr "Nombre del servidor"
+msgid "Scheduled update"
+msgstr "Plantilla seleccionada"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:24
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
-#: plugins/admin/systems/glpi_edit_os.tpl:24
+#: plugins/admin/systems/class_servGeneric.inc:151
+#: plugins/admin/systems/class_servGeneric.inc:155
+#: plugins/admin/systems/class_workstationGeneric.inc:192
+#: plugins/admin/systems/class_workstationGeneric.inc:196
+msgid "Reinstall"
+msgstr ""
+
+#: plugins/admin/systems/class_servGeneric.inc:152
+#: plugins/admin/systems/class_workstationGeneric.inc:193
 #, fuzzy
-msgid "Please enter a new name"
-msgstr "Por favor especifique una dirección de servidor - URI - válida."
+msgid "Rescan hardware"
+msgstr "Componente telefónico"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Seleccione objetos a añadir"
+#: plugins/admin/systems/class_servGeneric.inc:154
+#: plugins/admin/systems/class_workstationGeneric.inc:195
+#: plugins/admin/systems/class_terminalGeneric.inc:214
+#: plugins/admin/ogroups/class_termgroup.inc:104
+msgid "Wake up"
+msgstr "Despertar"
 
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-#: plugins/admin/systems/printerPPDDialog.tpl:6
+#: plugins/admin/systems/class_servGeneric.inc:207
 #, fuzzy
-msgid "Select"
-msgstr "Borrar"
-
-#: plugins/admin/systems/class_workstationService.inc:89
-#: plugins/admin/systems/class_terminalService.inc:102
-msgid "default"
-msgstr "por defecto"
+msgid "The required field 'Server name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/class_workstationService.inc:90
-#: plugins/admin/systems/class_terminalService.inc:103
-msgid "show chooser"
-msgstr "mostrar elegidos"
+#: plugins/admin/systems/class_servGeneric.inc:214
+msgid "You have no permissions to create a server on this 'Base'."
+msgstr "No tiene permisos para crear un servidor en esta 'Base'."
 
-#: plugins/admin/systems/class_workstationService.inc:91
-#: plugins/admin/systems/class_terminalService.inc:104
-msgid "direct"
-msgstr "Directo"
+#: plugins/admin/systems/class_servGeneric.inc:225
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: plugins/admin/systems/class_winGeneric.inc:174
+#: plugins/admin/systems/class_phoneGeneric.inc:318
+#: plugins/admin/systems/class_workstationGeneric.inc:293
+#: plugins/admin/systems/class_terminalGeneric.inc:338
+#: plugins/admin/systems/class_printGeneric.inc:606
+#, 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"
 
-#: plugins/admin/systems/class_workstationService.inc:94
-#: plugins/admin/systems/class_terminalService.inc:107
-msgid "load balanced"
-msgstr "balanceo de carga"
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Gestión del sistema"
 
-#: plugins/admin/systems/class_workstationService.inc:97
-#: plugins/admin/systems/class_terminalService.inc:110
-msgid "Windows RDP"
-msgstr "Windows RDP"
+#: plugins/admin/systems/servservice.tpl:37
+msgid "Time Service"
+msgstr "Servicio de Hora"
 
-#: plugins/admin/systems/class_workstationService.inc:98
-#: plugins/admin/systems/class_terminalService.inc:111
-msgid "ICA client"
-msgstr "Cliente ICA"
+#: plugins/admin/systems/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Servicio LDAP"
 
-#: plugins/admin/systems/class_workstationService.inc:201
-#: plugins/admin/systems/class_terminalService.inc:209
-msgid "Choose the phone located at the current terminal"
-msgstr "Elija el teléfono localizado en el terminal actual"
+#: plugins/admin/systems/servservice.tpl:70
+msgid "Terminal Service"
+msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-msgid "Please specify a valid VSync range."
-msgstr "Por favor especifique un rango VSync valido"
+#: plugins/admin/systems/servservice.tpl:75
+msgid "Temporary disable login"
+msgstr "Desactivación temporal del acceso"
 
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-msgid "Please specify a valid HSync range."
-msgstr "Por favor especifique un rango HSync valido"
+#: plugins/admin/systems/servservice.tpl:78
+msgid "Font path"
+msgstr "Ruta a las fuentes tipográficas"
 
-#: plugins/admin/systems/class_workstationStartup.inc:313
-msgid ""
-"There are packages in your configuration, which can't be resolved with "
-"current server/release settings."
-msgstr ""
+#: plugins/admin/systems/servservice.tpl:91
+msgid "Syslog Service"
+msgstr "Servicio de Logs"
 
-#: plugins/admin/systems/class_workstationStartup.inc:354
-#, fuzzy
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+#: plugins/admin/systems/servservice.tpl:99
+msgid "Print Service"
+msgstr "Servicio de impresión"
 
-#: plugins/admin/systems/class_workstationStartup.inc:410
+#: plugins/admin/systems/servservice.tpl:107
 #, fuzzy
-msgid ""
-"There is already a profile in your selection that contain partition table "
-"configurations."
-msgstr "Ya existe un usuario con este 'Login' en la base de datos."
+msgid "Mail server"
+msgstr "Servidor"
 
-#: plugins/admin/systems/class_workstationStartup.inc:691
-#, php-format
-msgid ""
-"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
-"Server was reset to 'auto'."
-msgstr ""
+#: plugins/admin/systems/chooser.tpl:1
+msgid "Choose the kind of system component you want to create"
+msgstr "Elija el tipo de componente del sistema que desea crear"
 
-#: plugins/admin/systems/class_workstationStartup.inc:702
-#, php-format
+#: plugins/admin/systems/chooser.tpl:4
 msgid ""
-"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
-"configurations, possibly some classes where deleted or renamed. !All classes "
-"have been removed from this account, press cancel if you don't want this to "
-"be saved."
+"Linux terminals and workstations are autocreated on bootup. For this reason "
+"you're only be able to create templates for a specific tree. Servers are "
+"normally automatically added too, but in some special cases you may need to "
+"create a faked server entry to provide GOsa with some informations. Other "
+"network components may be used for Nagios setups to create component "
+"dependencies."
 msgstr ""
+"Terminales linux y estaciones de trabajo son autocreadas en el inicio. Por "
+"esta razón solo se pueden crear plantillas para un árbol específico. "
+"Normalmente los servidores son añadidos también automáticamente, pero en "
+"algunos casos especiales, puede necesitar crear un servidor virtual para "
+"proveer de cierta información a GOsa. Otros componentes de red pueden ser "
+"usados para que la configuración de 'Nagios' creen las dependencias de "
+"componentes."
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:67
-#, php-format
-msgid "Can't open '%s', ppd settings resetted."
-msgstr ""
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Plantilla de clientes ligeros Linux"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:108
-#, php-format
-msgid ""
-"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
-"informations."
-msgstr ""
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Plantilla de estaciones de trabajo linux"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:109
-#, fuzzy
-msgid "Can't get ppd informations."
-msgstr "Información genérica del usuario"
+#: plugins/admin/systems/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Servidor Linux"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:125
-#, php-format
-msgid "Can't create folder '%s' for the uploaded ppd file."
-msgstr ""
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Estación de trabajo Windows"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:138
-#, fuzzy, php-format
-msgid "There is already a ppd file for this kind of printer."
-msgstr "Ya existe un usuario con este 'Login' en la base de datos."
+#: plugins/admin/systems/chooser.tpl:11
+msgid "Network printer"
+msgstr "Impresora de Red"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:146
-#, fuzzy, php-format
-msgid "Can't save file '%s'."
-msgstr "Borrar"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:163
-#: plugins/admin/systems/class_printerPPDDialog.inc:166
-#, fuzzy
-msgid "Please specify a valid ppd file."
-msgstr "Por favor especifique un nombre de usuario valido."
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Crear"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:190
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
 #, fuzzy
-msgid "Please select a valid ppd."
-msgstr "Por favor introduzca un número de serie válido"
+msgid "Reference"
+msgstr "Referencias"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#: plugins/admin/systems/glpi_devices.tpl:17
 #, fuzzy
-msgid "True"
-msgstr "Futuro"
+msgid "Comments"
+msgstr "Contacto"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:25
+#: plugins/admin/systems/glpi.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:112
+#: plugins/admin/systems/glpi_devices.tpl:153
+#: plugins/admin/systems/glpi_devices.tpl:208
+#: plugins/admin/systems/glpi_devices.tpl:264
+#: plugins/admin/systems/glpi_devices.tpl:322
+#: plugins/admin/systems/glpi_devices.tpl:386
+#: plugins/admin/systems/glpi_devices.tpl:458
+#: plugins/admin/systems/glpi_devices.tpl:522
+#: plugins/admin/systems/glpi_devices.tpl:569
+#: plugins/admin/systems/glpi_devices.tpl:622
+#: plugins/admin/systems/glpi_devices.tpl:676
+#: plugins/admin/systems/glpi_devices.tpl:722
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:18
 #, fuzzy
-msgid "False"
-msgstr "mujer"
+msgid "Comment"
+msgstr "Contacto"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
-#, php-format
-msgid "Unsupported ppd type '%s' used for '%s' "
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:47
+#: plugins/admin/systems/glpi.tpl:29 plugins/admin/systems/glpiPrinter.tpl:19
+#: plugins/admin/systems/glpi_devices.tpl:24
+#: plugins/admin/systems/glpi_devices.tpl:123
+#: plugins/admin/systems/glpi_devices.tpl:164
+#: plugins/admin/systems/glpi_devices.tpl:219
+#: plugins/admin/systems/glpi_devices.tpl:275
+#: plugins/admin/systems/glpi_devices.tpl:333
+#: plugins/admin/systems/glpi_devices.tpl:397
+#: plugins/admin/systems/glpi_devices.tpl:469
+#: plugins/admin/systems/glpi_devices.tpl:533
+#: plugins/admin/systems/glpi_devices.tpl:580
+#: plugins/admin/systems/glpi_devices.tpl:633
+#: plugins/admin/systems/glpi_devices.tpl:687
+#: plugins/admin/systems/glpi_devices.tpl:733
+msgid "Manufacturer"
 msgstr ""
 
-#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
-msgid "Server name"
-msgstr "Nombre del servidor"
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:57
+#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
+msgid "Technical responsible"
+msgstr ""
 
-#: plugins/admin/systems/server.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/workstation.tpl:29
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/phone.tpl:15
+#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/server.tpl:17
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:19
 #: plugins/admin/systems/printer.tpl:22
+#: plugins/admin/systems/workstation.tpl:25
 #: plugins/admin/systems/wingeneric.tpl:15
 msgid "Choose subtree to place terminal in"
 msgstr "Elija un subárbol donde colocar el terminal"
 
-#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
-#: plugins/admin/systems/workstation.tpl:79
-#: plugins/admin/systems/class_baseSelectDialog.inc:45
-#: plugins/admin/ogroups/termgroup.tpl:3
-msgid "Action"
-msgstr "Acción"
-
-#: plugins/admin/systems/server.tpl:43
-msgid "Select action to execute for this server"
-msgstr "Seleccione una acción que se ejecutara en este servidor"
-
-#: plugins/admin/systems/workstationStartup.tpl:4
-#: plugins/admin/systems/terminalStartup.tpl:1
-msgid "Boot parameters"
-msgstr "Parametros de inicio"
-
-#: plugins/admin/systems/workstationStartup.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:8
-msgid "LDAP server"
-msgstr "Servidor LDAP"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr "Eliminar servicio DHCP"
 
-#: plugins/admin/systems/workstationStartup.tpl:10
-#: plugins/admin/systems/terminalStartup.tpl:10
-msgid "Choose LDAP server to use for accounts and terminal management"
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"Elija que servidor LDAP se usara para gestión de cuentas de usuario y "
-"terminales"
-
-#: plugins/admin/systems/workstationStartup.tpl:17
-#: plugins/admin/systems/terminalStartup.tpl:17
-msgid "Boot kernel"
-msgstr "Kernel de inicio"
-
-#: plugins/admin/systems/workstationStartup.tpl:19
-#: plugins/admin/systems/terminalStartup.tpl:19
-msgid "Enter the filename of the kernel to use"
-msgstr "Introduzca el nombre del fichero del núcleo que se usara"
+"Este servidor tiene la extensión DHCP activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/workstationStartup.tpl:22
-#: plugins/admin/systems/terminalStartup.tpl:22
-msgid "Custom options"
-msgstr "Otras opciones"
+#: plugins/admin/systems/class_servDHCP.inc:39
+msgid "Add DHCP service"
+msgstr "Añadir servicio DHCP"
 
-#: plugins/admin/systems/workstationStartup.tpl:24
-#: plugins/admin/systems/terminalStartup.tpl:24
+#: plugins/admin/systems/class_servDHCP.inc:40
 msgid ""
-"Enter any parameters that should be passed to the kernel as append line "
-"during bootup"
+"This server has DHCP features disabled. You can enable them by clicking "
+"below."
 msgstr ""
-"Introducir que parametros serán pasados a la configuración de arranque del "
-"nucleo"
+"Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/workstationStartup.tpl:37
-#, fuzzy
-msgid "FAI server"
-msgstr "Servidor LDAP"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
+msgid ""
+"This dialog allows you to configure all components of this DNS zone on a "
+"single list."
+msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:54
-#, fuzzy
-msgid "Assigned FAI classes"
-msgstr "Elija tipo de ratón"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
+msgid ""
+"Be careful editing record types with this dialog. All changes will be saved "
+"immediately when using the save button."
+msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:73
-#: plugins/admin/systems/terminalStartup.tpl:53
-msgid "Kernel modules (format: name parameters)"
-msgstr "Módulos del núcleo (formato: nombre parametros)"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:8
+msgid ""
+"This dialog can't be used until the currently edited zone was saved or the "
+"zone entry exists in the ldap database."
+msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:75
-#: plugins/admin/systems/terminalStartup.tpl:55
-msgid "Add additional modules to load on startup"
-msgstr "Añadir módulos adicionales que serán cargados al arrancar"
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:11
+msgid "To add a new host entry just click here"
+msgstr ""
 
-#: plugins/admin/systems/workstationStartup.tpl:99
-#: plugins/admin/systems/terminalStartup.tpl:79
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
 #, fuzzy
-msgid "Mountpoint"
-msgstr "Monitor"
+msgid "Select entries to add"
+msgstr "Seleccione usuarios que serán añadidos"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
 #, fuzzy
-msgid "List of devices"
-msgstr "Lista de usuarios"
-
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
-msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
-msgstr ""
+msgid "Display members of department"
+msgstr "Mostrar número de Departamentos"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:35
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
 #, fuzzy
-msgid "Display devices matching"
-msgstr "Mostrar direcciones que concuerden con"
+msgid "Display members matching"
+msgstr "Mostrar números que concuerdan con"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
 #, fuzzy
-msgid "Regular expression for matching device names"
+msgid "Regular expression for matching member names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-#: plugins/admin/systems/class_glpiAccount.inc:144
-msgid "There is no server with valid glpi database service."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
-#: plugins/admin/systems/class_glpiAccount.inc:154
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
 #, fuzzy
-msgid "Can't connect to glpi database, the php-mysql extension is missing."
-msgstr ""
-"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
-"registros!"
+msgid "Add/Edit manufacturer"
+msgstr "Editar entrada"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
-#: plugins/admin/systems/class_glpiAccount.inc:164
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
 #, fuzzy
-msgid "Can't connect to glpi database, check configuration twice."
-msgstr ""
-"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
-"registros!"
+msgid "Website"
+msgstr "escribir"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
-#: plugins/admin/systems/class_glpiAccount.inc:564
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:138
+#: plugins/admin/ogroups/class_phonequeue.inc:692
+#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
+#: html/getxls.php:236
 #, fuzzy
-msgid "Remove inventory"
-msgstr "Eliminar entrada"
+msgid "Phone number"
+msgstr "Números de teléfonos"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
-#, fuzzy
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
+#: plugins/admin/systems/class_componentGeneric.inc:50
+#: plugins/admin/systems/class_winGeneric.inc:73
+msgid "This 'dn' has no network features."
+msgstr "Esta 'dn' no tiene características de red."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
-#: plugins/admin/systems/class_glpiAccount.inc:567
+#: plugins/admin/systems/class_componentGeneric.inc:138
 #, fuzzy
-msgid "Add inventory"
-msgstr "Añadir entrada"
+msgid "The required field 'Component name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
-#, fuzzy
-msgid ""
-"This server has inventory features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+#: plugins/admin/systems/class_componentGeneric.inc:145
+#: plugins/admin/systems/class_winGeneric.inc:164
+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_inventory.inc:36
+#: plugins/admin/systems/class_servDNS.inc:67
+msgid "Remove DNS service"
+msgstr "Eliminar servicio DNS"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
-#, php-format
+#: plugins/admin/systems/class_inventory.inc:37
+#: plugins/admin/systems/class_servDNS.inc:68
 msgid ""
-"Can't rename given printer type to '%s', because this type name already "
-"exists."
+"This server has DNS features enabled. You can disable them by clicking below."
 msgstr ""
+"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
-msgstr ""
+#: plugins/admin/systems/class_inventory.inc:39
+#: plugins/admin/systems/class_servDNS.inc:70
+msgid "Add DNS service"
+msgstr "Añadir servicio DNS"
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
-msgid "N/A"
+#: plugins/admin/systems/class_inventory.inc:40
+#: plugins/admin/systems/class_servDNS.inc:71
+msgid ""
+"This server has DNS features disabled. You can enable them by clicking below."
 msgstr ""
+"Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
-#, fuzzy
-msgid "since"
-msgstr "Arriba desde"
-
-#: plugins/admin/systems/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Plantilla de terminal"
-
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Nombre de terminal"
+#: plugins/admin/systems/server.tpl:6 html/getxls.php:146
+msgid "Server name"
+msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
+#: plugins/admin/systems/server.tpl:27 plugins/admin/systems/terminal.tpl:29
+#: plugins/admin/systems/workstation.tpl:35
 #: plugins/admin/systems/phonesettings.tpl:21
 msgid "Mode"
 msgstr "Modo"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
+#: plugins/admin/systems/server.tpl:29 plugins/admin/systems/terminal.tpl:31
+#: plugins/admin/systems/workstation.tpl:37
 msgid "Select terminal mode"
 msgstr "Seleccionar modo de terminal"
 
-#: plugins/admin/systems/terminal.tpl:53
-msgid "Root server"
-msgstr "Servidor Raíz"
-
-#: plugins/admin/systems/terminal.tpl:55
-msgid "Select NFS root filesystem to use"
-msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
+#: plugins/admin/systems/server.tpl:49
+msgid "Select action to execute for this server"
+msgstr "Seleccione una acción que se ejecutara en este servidor"
 
-#: plugins/admin/systems/terminal.tpl:61
-msgid "Swap server"
-msgstr "Servidor de Intercambio"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
+#, fuzzy, php-format
+msgid "You're about to delete the glpi attachment component '%s'."
+msgstr "Va ha eliminar la aplicación '%s'."
 
-#: plugins/admin/systems/terminal.tpl:63
-msgid "Choose NFS filesystem to place swap files on"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#, php-format
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
 msgstr ""
-"Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
-"intercambio"
 
-#: plugins/admin/systems/terminal.tpl:75
-#: plugins/admin/systems/workstation.tpl:55
-msgid "Syslog server"
-msgstr "Servidor de Logs"
-
-#: plugins/admin/systems/terminal.tpl:77
-#: plugins/admin/systems/workstation.tpl:57
-msgid "Choose server to use for logging"
-msgstr "Elija un servidor que será usado para registro"
-
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
-msgid "NTP server"
-msgstr "Servidor NTP"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
+#, fuzzy
+msgid "There is no valid file uploaded."
+msgstr "No se ha subido ningún archivo."
 
-#: plugins/admin/systems/terminal.tpl:85
-#: plugins/admin/systems/workstation.tpl:65
-msgid "Choose server to use for synchronizing time"
-msgstr "Elija un servidor que será usado para sincronización horaria"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+#, fuzzy
+msgid "Upload wasn't successfull."
+msgstr "Exportación completada"
 
-#: plugins/admin/systems/terminal.tpl:104
-#: plugins/admin/systems/workstation.tpl:83
-msgid "Select action to execute for this terminal"
-msgstr "Seleccione una acción que se ejecutara en este terminal"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:135
-#: plugins/admin/systems/class_servDB.inc:144
-#: plugins/admin/systems/class_servDB.inc:161
-#: plugins/admin/systems/class_servDB.inc:171
-#: plugins/admin/systems/class_servDB.inc:176
-#: plugins/admin/systems/class_servDB.inc:182
-#, php-format
-msgid "The attribute '%s' is empty or contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
+#, fuzzy
+msgid "There is already a file with the same name uploaded."
+msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
-#: plugins/admin/systems/class_servDB.inc:151
-#, php-format
-msgid "The imap connect string needs to be in the form '%s'."
-msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#, fuzzy, php-format
+msgid "Can't create file '%s'."
+msgstr "Borrar"
 
-#: plugins/admin/systems/class_servDB.inc:155
-msgid "The sieve port needs to be numeric."
-msgstr "El puerto sieve necesita ser un numero."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
+msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:166
-#, fuzzy, php-format
-msgid "The specified kerberos password is empty."
-msgstr "El archivo especificado está vacío."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
+msgstr ""
 
-#: plugins/admin/systems/class_servDB.inc:190
-#, fuzzy, php-format
-msgid "The imap name string needs to be a hostname or an IP-address."
-msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+#, fuzzy
+msgid "Currently no file uploaded."
+msgstr "No se ha subido ningún archivo."
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
-#, fuzzy, php-format
-msgid "You're about to delete the glpi cartridge type '%s'."
-msgstr "Va ha eliminar la aplicación '%s'."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+#, fuzzy
+msgid "Mime"
+msgstr "Teléfono Móvil"
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
-#, php-format
-msgid ""
-"You can't delete this cartridge type, it is still in use by this printer(s) "
-"'%s'."
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
-msgstr ""
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+#, fuzzy
+msgid "empty"
+msgstr "Plantilla"
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
 #, fuzzy
-msgid "New monitor"
-msgstr "Nueva contraseña"
+msgid "Create new attachment"
+msgstr "Nombre del departamento"
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
 #, fuzzy
-msgid "M"
-msgstr "Mb"
+msgid "New Attachment"
+msgstr "Argumentos"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
 #, fuzzy
-msgid "Activated"
-msgstr "Privado"
+msgid "Please specify a valid name for this attachment."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:72
+#: plugins/admin/systems/printerPPDDialog.tpl:1
 #, fuzzy
-msgid "Memory test"
-msgstr "Memoria"
+msgid "Printer driver"
+msgstr "Dispositivo de Impresión"
+
+#: plugins/admin/systems/printerPPDDialog.tpl:5
+#: plugins/admin/systems/workstationService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:7
+#: plugins/admin/systems/terminalService.tpl:210
+msgid "Model"
+msgstr "Modelo"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:73
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
 #, fuzzy
-msgid "System analysis"
-msgstr "Registro del sistema"
+msgid "Select"
+msgstr "Borrar"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/printerPPDDialog.tpl:9
 #, fuzzy
-msgid "No ACTIONCMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
+msgid "New driver"
+msgstr "Servidor"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:104
-#: plugins/admin/systems/class_terminalGeneric.inc:94
-#: plugins/admin/systems/class_terminalGeneric.inc:106
-#: plugins/admin/systems/class_terminalGeneric.inc:118
-#: plugins/admin/systems/class_servGeneric.inc:66
-#: plugins/admin/systems/class_servGeneric.inc:78
-#: plugins/admin/systems/class_servGeneric.inc:90
-#: plugins/admin/ogroups/class_termgroup.inc:68
-#: plugins/admin/ogroups/class_termgroup.inc:80
-#: plugins/admin/ogroups/class_termgroup.inc:92
-#, php-format
-msgid "Execution of '%s' failed!"
-msgstr "¡La ejecución de '%s' ha fallado!"
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
+#: plugins/admin/systems/glpi_edit_type.tpl:9
+#: plugins/admin/systems/glpi_edit_type.tpl:28
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:8
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:29
+#, fuzzy
+msgid "Rename"
+msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:114
-msgid "This 'dn' has no workstation features."
-msgstr "Esta 'dn' no tiene características de estación de trabajo."
+#: plugins/admin/systems/phone.tpl:6
+msgid "Phone name"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Switch off"
-msgstr "Apagar"
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Reboot"
-msgstr "Reiniciar"
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr "Nombre de terminal"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
-#, fuzzy
-msgid "Instant update"
-msgstr "Crear cuenta telefónica"
+#: plugins/admin/systems/terminal.tpl:37
+#: plugins/admin/systems/workstation.tpl:43
+msgid "Syslog server"
+msgstr "Servidor de Logs"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
-#, fuzzy
-msgid "Scheduled update"
-msgstr "Plantilla seleccionada"
+#: plugins/admin/systems/terminal.tpl:39
+#: plugins/admin/systems/workstation.tpl:45
+msgid "Choose server to use for logging"
+msgstr "Elija un servidor que será usado para registro"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
-msgid "Reinstall"
-msgstr ""
+#: plugins/admin/systems/terminal.tpl:54
+msgid "Root server"
+msgstr "Servidor Raíz"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:160
-#, fuzzy
-msgid "Rescan hardware"
-msgstr "Componente telefónico"
+#: plugins/admin/systems/terminal.tpl:56
+msgid "Select NFS root filesystem to use"
+msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:162
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Wake up"
-msgstr "Despertar"
+#: plugins/admin/systems/terminal.tpl:62
+msgid "Swap server"
+msgstr "Servidor de Intercambio"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:228
-msgid "You have no permissions to create a workstation on this 'Base'."
-msgstr "No tiene permisos para crear una estación de trabajo en esta 'Base'."
+#: plugins/admin/systems/terminal.tpl:64
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+"Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
+"intercambio"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:232
-msgid "The required field 'Workstation name' is not set."
+#: plugins/admin/systems/terminal.tpl:81
+#: plugins/admin/systems/workstation.tpl:61
+msgid "Inherit time server attributes"
 msgstr ""
-" El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_printGeneric.inc:529
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#, 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"
+#: plugins/admin/systems/terminal.tpl:85
+#: plugins/admin/systems/workstation.tpl:65
+msgid "NTP server"
+msgstr "Servidor NTP"
 
-#: plugins/admin/systems/servdns.tpl:1
-#, fuzzy
-msgid "Zones"
-msgstr "teléfonos"
+#: plugins/admin/systems/terminal.tpl:87
+#: plugins/admin/systems/workstation.tpl:67
+msgid "Choose server to use for synchronizing time"
+msgstr "Elija un servidor que será usado para sincronización horaria"
 
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Plantilla de estación de trabajo"
+#: plugins/admin/systems/terminal.tpl:114
+#: plugins/admin/systems/workstation.tpl:93
+msgid "Select action to execute for this terminal"
+msgstr "Seleccione una acción que se ejecutara en este terminal"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Nombre de la estación de trabajo"
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:6
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Seleccione objetos a añadir"
 
-#: plugins/admin/systems/class_servNfs.inc:35
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
+#: plugins/admin/systems/class_glpiAccount.inc:144
+msgid "There is no server with valid glpi database service."
 msgstr ""
 
-#: plugins/admin/systems/class_servNfs.inc:38
-#, fuzzy
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr "Borrar"
-
-#: plugins/admin/systems/class_servNfs.inc:125
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
 #, fuzzy
-msgid "Please specify a valid path for your setup."
-msgstr "Por favor especifique un usuario valido."
+msgid "Can't connect to glpi database, the php-mysql extension is missing."
+msgstr ""
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
 
-#: plugins/admin/systems/class_servNfs.inc:131
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
 #, fuzzy
-msgid "Please specify a valid name for your setup."
-msgstr "Por favor especifique un usuario valido."
+msgid "Can't connect to glpi database, check configuration twice."
+msgstr ""
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
 
-#: plugins/admin/systems/class_servNfs.inc:134
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:564
 #, fuzzy
-msgid "Please specify a name for your setup."
-msgstr "Por favor especifique un usuario valido."
+msgid "Remove inventory"
+msgstr "Eliminar entrada"
 
-#: plugins/admin/systems/class_servNfs.inc:139
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
 #, fuzzy
-msgid "Description contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+msgid ""
+"This server has inventory features enabled. You can disable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/class_servNfs.inc:143
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:567
 #, fuzzy
-msgid "Path contains invalid characters."
-msgstr "El campo 'Nombre' contiene caracteres no validos."
+msgid "Add inventory"
+msgstr "Añadir entrada"
 
-#: plugins/admin/systems/class_servNfs.inc:147
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
 #, fuzzy
-msgid "Option contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+msgid ""
+"This server has inventory features disabled. You can enable them by clicking "
+"below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/servnfs.tpl:1
-#, fuzzy
-msgid "Edit share"
-msgstr "Usuario administrador"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:226
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:264
+#, php-format
+msgid ""
+"Can't rename given printer type to '%s', because this type name already "
+"exists."
+msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
+#: plugins/admin/systems/class_glpiAccount.inc:631
+#: plugins/admin/systems/class_glpiAccount.inc:645
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+msgid "N/A"
 msgstr ""
 
-#: plugins/admin/systems/servnfs.tpl:49
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:751
 #, fuzzy
-msgid "Codepage"
-msgstr "Página Web Principal"
+msgid "since"
+msgstr "Arriba desde"
 
-#: plugins/admin/systems/servnfs.tpl:59
+#: plugins/admin/systems/class_servRepository.inc:97
 #, fuzzy
-msgid "Option"
-msgstr "Opciones"
-
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
+msgid "Remove FAI repository extension."
 msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/class_servKolab.inc:115
+#: plugins/admin/systems/class_servRepository.inc:98
+#, fuzzy
 msgid ""
-"This server has kolab features enabled. You can disable them by clicking "
-"below."
+"This server has FAI repository features enabled. You can disable them by "
+"clicking below."
 msgstr ""
 "Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
-msgstr "Añadir el servicio Kolab"
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
+msgstr ""
 
-#: plugins/admin/systems/class_servKolab.inc:118
+#: plugins/admin/systems/class_servRepository.inc:101
+#, fuzzy
 msgid ""
-"This server has kolab features disabled. You can enable them by clicking "
-"below."
+"This server has FAI repository features disabled. You can enable them by "
+"clicking below."
 msgstr ""
 "Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servKolab.inc:146
+#: plugins/admin/systems/class_servRepository.inc:144
 #, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+msgid ""
+"You can't delete this release, it is still used by these workstations [%s]. "
+"Please solve this dependencies first, to keep data base consistency."
 msgstr ""
-"Incluye información desde hace '%s' días cuando cree listas de presencia"
 
-#: plugins/admin/systems/class_servKolab.inc:152
+#: plugins/admin/systems/class_servRepository.inc:176
 #, php-format
-msgid "Warn users when using more than %s%% of their mail quota"
+msgid ""
+"Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
-"Avisar a los usuarios de que están usando mas de %s%% de su cuota de correo"
 
-#: plugins/admin/systems/class_servKolab.inc:227
-msgid "Future days in Free/Busy settings must be set."
-msgstr "Se deben poner días futuros en la configuración de presencia"
+#: plugins/admin/systems/class_servRepository.inc:249
+#: plugins/admin/systems/class_servRepository.inc:270
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+#, fuzzy
+msgid "Sections"
+msgstr "Acción"
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
-msgstr ""
-"Días futuros en la configuración de presencia debe ser un número positivo."
+#: plugins/admin/systems/printer.tpl:6
+#, fuzzy
+msgid "General"
+msgstr "Genérico"
 
-#: plugins/admin/systems/class_servKolab.inc:233
-msgid "The given Quota settings value must be a number."
-msgstr "El valor introducido como cuota debe ser un número."
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Nombre de la impresora"
 
-#: plugins/admin/systems/class_servKolab.inc:235
-msgid "Please choose a value between 1 and 100 for Quota settings."
+#: plugins/admin/systems/printer.tpl:31
+msgid "Details"
 msgstr ""
-"Por favor introduzca un valor entre 1 y 100 para el parámetro de cuota."
 
-#: plugins/admin/systems/class_servKolab.inc:237
-msgid "Future days must be a value."
-msgstr "Días futuros debe ser un valor"
+#: plugins/admin/systems/printer.tpl:34
+#, fuzzy
+msgid "Printer location"
+msgstr "Configuración telefónica"
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
-msgstr "No se han indicado redes privilegiadas SMTP."
+#: plugins/admin/systems/printer.tpl:38
+msgid "Printer URL"
+msgstr "URL de la impresora"
 
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
+#: plugins/admin/systems/printer.tpl:46
+#: plugins/admin/systems/workstationService.tpl:86
+#: plugins/admin/systems/terminalService.tpl:86
+msgid "Driver"
+msgstr "Controlador"
 
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
-msgstr "Método de conexión"
+#: plugins/admin/systems/printer.tpl:58
+#, fuzzy
+msgid "Permissions"
+msgstr "Miembro con Permisos"
 
-#: plugins/admin/systems/terminalService.tpl:147
-msgid "Choose method to connect to terminal server"
-msgstr "Elija el método de conexión con el servidor de terminal"
+#: plugins/admin/systems/printer.tpl:65
+#, fuzzy
+msgid "Users which are allowed to use this printer"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/admin/systems/terminalService.tpl:154
-msgid "Terminal server"
-msgstr "Servidor de terminal"
+#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+#, fuzzy
+msgid "Add user"
+msgstr "Usuario administrador"
 
-#: plugins/admin/systems/terminalService.tpl:156
-msgid "Select specific terminal server to use"
-msgstr "Seleccione específicamente que servidor de terminal usará"
+#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+#, fuzzy
+msgid "Add group"
+msgstr "grupos"
 
-#: plugins/admin/systems/terminalService.tpl:163
-msgid "Font server"
-msgstr "Servidor de fuentes"
+#: plugins/admin/systems/printer.tpl:81
+#, fuzzy
+msgid "Users which are allowed to administrate this printer"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/admin/systems/terminalService.tpl:165
-msgid "Select specific font server to use"
-msgstr "Seleccione específicamente que servidor de fuentes usará"
+#: plugins/admin/systems/printer.tpl:82
+#, fuzzy
+msgid "Admins"
+msgstr "DN del administrador"
+
+#: plugins/admin/systems/class_terminalStartup.inc:91
+#: plugins/admin/systems/class_workstationStartup.inc:232
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as KERNELS hook for plugin '%s' doesn't seem to "
+"exist."
+msgstr ""
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
+
+#: plugins/admin/systems/class_terminalStartup.inc:120
+#: plugins/admin/systems/class_terminalInfo.inc:68
+#: plugins/admin/systems/class_terminalService.inc:158
+#: plugins/admin/systems/class_terminalGeneric.inc:180
+#: plugins/admin/systems/class_workstationService.inc:150
+#: plugins/admin/systems/class_workstationStartup.inc:401
+msgid "This 'dn' has no terminal features."
+msgstr "Esta 'dn' no tiene características de terminal."
+
+#: plugins/admin/systems/servdns.tpl:1
+#, fuzzy
+msgid "Zones"
+msgstr "teléfonos"
+
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
+msgstr "Plantilla de estación de trabajo"
+
+#: plugins/admin/systems/workstation.tpl:10
+msgid "Workstation name"
+msgstr "Nombre de la estación de trabajo"
+
+#: plugins/admin/systems/servdb.tpl:6
+msgid "Kerberos kadmin access"
+msgstr "Acceso a Kerberos kadmin"
+
+#: plugins/admin/systems/servdb.tpl:10
+msgid "Kerberos Realm"
+msgstr "Dominio Kerberos"
 
-#: plugins/admin/systems/terminalService.tpl:181
-msgid "Print device"
-msgstr "Dispositivo de Impresión"
+#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
+msgid "Admin user"
+msgstr "Usuario administrador"
 
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
-msgstr ""
-"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
-"terminal"
+#: plugins/admin/systems/servdb.tpl:26
+msgid "FAX database"
+msgstr "Base de datos de FAX"
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
-msgstr "Proveer servicios de impresión"
+#: plugins/admin/systems/servdb.tpl:30
+msgid "FAX DB user"
+msgstr "Base de datos de usuarios de FAX"
 
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Servidor de Cola"
+#: plugins/admin/systems/servdb.tpl:42
+msgid "Asterisk management"
+msgstr "Gestión de Asterisk PBX"
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
-msgstr ""
-"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
+#: plugins/admin/systems/servdb.tpl:46
+msgid "Asterisk DB user"
+msgstr "Base de datos de usuarios Asterisk"
 
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Seleccione que controladores de escáner se usaran"
+#: plugins/admin/systems/servdb.tpl:54
+msgid "Country dial prefix"
+msgstr "Prefijo de marcado nacional"
 
-#: plugins/admin/systems/class_componentGeneric.inc:50
-#: plugins/admin/systems/class_winGeneric.inc:73
-msgid "This 'dn' has no network features."
-msgstr "Esta 'dn' no tiene características de red."
+#: plugins/admin/systems/servdb.tpl:58
+msgid "Local dial prefix"
+msgstr "Prefijo de marcado local"
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
-#, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+#: plugins/admin/systems/servdb.tpl:70
+msgid "IMAP admin access"
+msgstr "Acceso administrador imap"
 
-#: plugins/admin/systems/class_componentGeneric.inc:145
-#: plugins/admin/systems/class_winGeneric.inc:162
-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/servdb.tpl:74
+msgid "Server identifier"
+msgstr "Identificador de servidor"
 
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "Select if terminal supports graphical startup with progress bar"
-msgstr "Seleccione si el terminal soporta inicio gráfico con barra de progreso"
+#: plugins/admin/systems/servdb.tpl:78
+msgid "Connect URL"
+msgstr "Conectar a la URL"
 
-#: plugins/admin/systems/terminalStartup.tpl:36
-msgid "use graphical bootup"
-msgstr "Usar arranque gráfico"
+#: plugins/admin/systems/servdb.tpl:91
+msgid "Sieve port"
+msgstr "Puerto de Sieve"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "Select if terminal should boot in text mode"
-msgstr "Seleccione si el terminal debería arrancar en modo texto"
+#: plugins/admin/systems/servdb.tpl:100
+msgid "Logging database"
+msgstr "Base de datos de Logs"
 
-#: plugins/admin/systems/terminalStartup.tpl:39
-msgid "use standard linux textual bootup"
-msgstr "Usar arranque en modo texto"
+#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
+msgid "Logging DB user"
+msgstr "Base de datos de acceso de usuarios"
 
-#: plugins/admin/systems/terminalStartup.tpl:41
-msgid "Select to get more verbose output during startup"
-msgstr ""
-"Seleccione para obtener una información mas prolija durante el arranque"
+#: plugins/admin/systems/servdb.tpl:119
+#, fuzzy
+msgid "Glpi database"
+msgstr "Base de datos de FAX"
 
-#: plugins/admin/systems/terminalStartup.tpl:42
-msgid "use debug mode for startup"
-msgstr "Usar el modo de depuración durante el arranque"
+#: plugins/admin/systems/servdb.tpl:133
+#, fuzzy
+msgid "Database"
+msgstr "Bases de datos"
 
-#: plugins/admin/systems/class_glpiAccount.inc:178
-#: plugins/admin/systems/class_glpiAccount.inc:184
-#: plugins/admin/systems/class_glpiAccount.inc:190
-msgid "This feature is not implemented yet."
-msgstr ""
+#: plugins/admin/systems/servnfs.tpl:1
+#, fuzzy
+msgid "Edit share"
+msgstr "Usuario administrador"
 
-#: plugins/admin/systems/class_glpiAccount.inc:292
-msgid "Adding new sytem type failed, this system type name is already used."
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:312
-#, php-format
-msgid ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
+#: plugins/admin/systems/servnfs.tpl:46
+msgid "Auto-mount share on Apple systems"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAccount.inc:323
+#: plugins/admin/systems/servnfs.tpl:71
 #, fuzzy
-msgid "Rename failed, this system type name is already used."
-msgstr "El nombre especificado ya esta siendo usado"
+msgid "Codepage"
+msgstr "Página Web Principal"
 
-#: plugins/admin/systems/class_glpiAccount.inc:379
+#: plugins/admin/systems/servnfs.tpl:81
 #, fuzzy
-msgid "Adding new operating system failed, specifed name is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
-
-#: plugins/admin/systems/class_glpiAccount.inc:401
-#, php-format
-msgid ""
-"You can't delete this operating system, it is still in use by these system"
-"(s) '%s'"
-msgstr ""
+msgid "Option"
+msgstr "Opciones"
 
-#: plugins/admin/systems/class_glpiAccount.inc:413
+#: plugins/admin/systems/class_servRepositorySetup.inc:118
 #, fuzzy
-msgid "Updating operating system failed, specifed name is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+msgid "Please enter a value for 'release'."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/class_servRepositorySetup.inc:122
 #, fuzzy
-msgid ""
-"This device has inventory informations enabled. You can disable them by "
-"clicking below."
+msgid "Please specify a valid value for 'url'."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:168
+#, fuzzy, php-format
+msgid "Can't execute specified EXTERNAL_HOOK '%s' please check your gosa.conf."
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
 
-#: plugins/admin/systems/class_glpiAccount.inc:568
-#, fuzzy
+#: plugins/admin/systems/class_servRepositorySetup.inc:170
+#, php-format
 msgid ""
-"This device has inventory informations disabled. You can enable them by "
-"clicking below."
+"The specified EXTERNAL_HOOK '%s', specified in your gosa.conf, returns an "
+"empty string."
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/glpiManufacturer.tpl:1
-#, fuzzy
-msgid "Manage manufacturers"
-msgstr "Editar entrada"
+#: plugins/admin/systems/servkolab.tpl:14
+msgid "POP3 service"
+msgstr "Servicio POP3"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
-#, fuzzy
-msgid "Attachment"
-msgstr "Argumentos"
+#: plugins/admin/systems/servkolab.tpl:22
+msgid "POP3/SSL service"
+msgstr "Servicio POP3/SSL"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
-#, fuzzy
-msgid "Filename"
-msgstr "Nombre del servidor"
+#: plugins/admin/systems/servkolab.tpl:30
+msgid "IMAP service"
+msgstr "Servicio IMAP"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
-#, fuzzy
-msgid "Mime-type"
-msgstr "Tipo"
+#: plugins/admin/systems/servkolab.tpl:38
+msgid "IMAP/SSL service"
+msgstr "Servicio IMAP/SSL"
 
-#: plugins/admin/systems/class_termDNS.inc:313
-#, fuzzy
-msgid "The required field 'IP-address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+#: plugins/admin/systems/servkolab.tpl:46
+msgid "Sieve service"
+msgstr "Servicio Sieve"
 
-#: plugins/admin/systems/class_termDNS.inc:319
-msgid "Wrong IP format in field IP-address."
+#: plugins/admin/systems/servkolab.tpl:54
+msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
 msgstr ""
+"Servicio de presencia de FTP (propio, no tiene interacción con el servicio "
+"de presencia de Kolab2)"
 
-#: plugins/admin/systems/class_termDNS.inc:325
-#, fuzzy
-msgid "The required field 'MAC-address' is not set."
-msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+#: plugins/admin/systems/servkolab.tpl:62
+msgid "HTTP FreeBusy service (legacy)"
+msgstr "Servicio de presencia HTTP (propio)"
 
-#: plugins/admin/systems/class_termDNS.inc:331
-msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
-"':'."
-msgstr ""
+#: plugins/admin/systems/servkolab.tpl:70
+msgid "Amavis email scanning (virus/spam)"
+msgstr "Desinfectado de correo Amavis (virus/spam)"
 
-#: plugins/admin/systems/class_termDNS.inc:346
-#, php-format
-msgid "Found duplicate value for record type '%s'."
-msgstr ""
+#: plugins/admin/systems/servkolab.tpl:81
+msgid "Quota settings"
+msgstr "Parámetros de quotas"
 
-#: plugins/admin/systems/class_termDNS.inc:352
-#, php-format
-msgid "Found more than one entry for the uniqe record type '%s'."
-msgstr ""
+#: plugins/admin/systems/servkolab.tpl:97
+msgid "Free/Busy settings"
+msgstr "Parámetros de Presencia"
 
-#: plugins/admin/systems/class_termDNS.inc:360
-#, php-format
-msgid ""
-"The device IP '%s' is added as 'A Record', this will be done automatically, "
-"please remove the record."
+#: plugins/admin/systems/servkolab.tpl:102
+msgid "Allow unauthenticated downloading of Free/Busy information"
+msgstr "Permite descarga no autentificada de información de presencia."
+
+#: plugins/admin/systems/servkolab.tpl:117
+msgid "SMTP privileged networks"
+msgstr "Redes privilegiadas SMTP"
+
+#: plugins/admin/systems/servkolab.tpl:122
+msgid "Hosts/networks allowed to relay"
+msgstr "Equipos/Redes que son permitidos para hacer relay"
+
+#: plugins/admin/systems/servkolab.tpl:125
+msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:366
-#: plugins/admin/systems/class_servDNSeditZone.inc:386
-#, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
+#: plugins/admin/systems/servkolab.tpl:138
+msgid "SMTP smarthost/relayhost"
+msgstr "SMTP smarthost/relayhos"
+
+#: plugins/admin/systems/servkolab.tpl:144
+msgid "Enable MX lookup for relayhost"
+msgstr "Permitir búsquedas MX para los relayhost"
+
+#: plugins/admin/systems/servkolab.tpl:149
+msgid "Host used to relay mails"
+msgstr "Equipo usado para reenviar correos"
+
+#: plugins/admin/systems/servkolab.tpl:163
+msgid "Accept Internet Mail"
+msgstr "Aceptar correo desde internet"
+
+#: plugins/admin/systems/servkolab.tpl:169
+msgid "Accept mail from other domains over non-authenticated SMTP"
 msgstr ""
+"Aceptar correo desde otros dominios que usen ninguna autentificación SMTP"
 
-#: plugins/admin/systems/class_servRepository.inc:97
+#: plugins/admin/systems/phonesettings.tpl:1
 #, fuzzy
-msgid "Remove FAI repository extension."
-msgstr "Eliminar extensión Kolab"
+msgid "Advanced phone settings"
+msgstr "Configuración telefónica"
 
-#: plugins/admin/systems/class_servRepository.inc:98
+#: plugins/admin/systems/phonesettings.tpl:6
 #, fuzzy
-msgid ""
-"This server has FAI repository features enabled. You can disable them by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
-msgstr ""
+msgid "Phone type"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/class_servRepository.inc:101
+#: plugins/admin/systems/phonesettings.tpl:7
+#: plugins/admin/systems/phonesettings.tpl:25
+#: plugins/admin/systems/phonesettings.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:49
+#: plugins/admin/systems/phonesettings.tpl:78
+#: plugins/admin/systems/phonesettings.tpl:109
+#: plugins/admin/systems/phonesettings.tpl:156
 #, fuzzy
-msgid ""
-"This server has FAI repository features disabled. You can enable them by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+msgid "Choose a phone type"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/class_servRepository.inc:144
-#, php-format
-msgid ""
-"You can't delete this release, it is still used by these workstations [%s]. "
-"Please solve this dependencies first, to keep data base consistency."
+#: plugins/admin/systems/phonesettings.tpl:10
+msgid "refresh"
 msgstr ""
 
-#: plugins/admin/systems/class_servRepository.inc:176
-#, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
-msgstr ""
+#: plugins/admin/systems/phonesettings.tpl:32
+#, fuzzy
+msgid "DTMF mode"
+msgstr "Modo"
 
-#: plugins/admin/systems/class_servRepository.inc:243
-#: plugins/admin/systems/class_servRepository.inc:264
-#: plugins/admin/systems/servRepositorySetup.tpl:33
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
 #, fuzzy
-msgid "Sections"
-msgstr "Acción"
+msgid "Default IP"
+msgstr "por defecto"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
+#: plugins/admin/systems/phonesettings.tpl:75
 #, fuzzy
-msgid "The selected name is already in use."
-msgstr "El nombre especificado ya esta siendo usado"
+msgid "Modus"
+msgstr "Ratón"
 
-#: plugins/admin/systems/servRepository.tpl:6
-#, fuzzy
-msgid "List of configured repositories."
-msgstr "Lista de grupos"
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
+msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:11
+#: plugins/admin/systems/phonesettings.tpl:116
 #, fuzzy
-msgid "Add repository"
-msgstr "Reintentar"
+msgid "Secret"
+msgstr "Calle"
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:7
-#, fuzzy
-msgid "Zone name"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
+msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:13
+#: plugins/admin/systems/phonesettings.tpl:145
 #, fuzzy
-msgid "Network address"
-msgstr "Dispositivos de Red"
+msgid "Account code"
+msgstr "Cuenta"
 
-#: plugins/admin/systems/servdnseditzone.tpl:24
+#: plugins/admin/systems/phonesettings.tpl:153
 #, fuzzy
-msgid "Zone entries"
-msgstr "Configuración telefónica"
+msgid "Trunk lines"
+msgstr "Clientes Ligeros"
 
-#: plugins/admin/systems/servdnseditzone.tpl:35
+#: plugins/admin/systems/phonesettings.tpl:168
 #, fuzzy
-msgid "SOA record"
-msgstr "Directorio"
+msgid "Hosts that are allowed to connect"
+msgstr "Equipos/Redes que son permitidos para hacer relay"
 
-#: plugins/admin/systems/servdnseditzone.tpl:41
+#: plugins/admin/systems/phonesettings.tpl:183
 #, fuzzy
-msgid "Primary dns server for this zone"
-msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
+msgid "Hosts that are not allowed to connect"
+msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: plugins/admin/systems/servdnseditzone.tpl:53
-msgid "Serial number (automatically incremented)"
+#: plugins/admin/systems/phonesettings.tpl:205
+msgid "MSN"
 msgstr ""
 
-#: plugins/admin/systems/servdnseditzone.tpl:69
-#: plugins/admin/ogroups/phonequeue.tpl:54
-#: ihtml/themes/altlinux/setup_finish.tpl:31
-#: ihtml/themes/default/setup_finish.tpl:31
-#: ihtml/themes/lhs/setup_finish.tpl:31
-msgid "Retry"
-msgstr "Reintentar"
-
-#: plugins/admin/systems/servdnseditzone.tpl:75
-#, fuzzy
-msgid "Expire"
-msgstr "Exportar"
-
-#: plugins/admin/systems/servdnseditzone.tpl:96
-#, fuzzy
-msgid "MxRecords"
-msgstr "Directorio"
+#: plugins/admin/systems/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Nombre de la maquina"
 
-#: plugins/admin/systems/servdnseditzone.tpl:108
-#, fuzzy
-msgid "Zone records"
-msgstr "Directorio"
+#: plugins/admin/systems/remove.tpl:6
+msgid ""
+"This includes <b>all</b> system and setup informations. Please double check "
+"if your really want to do this since there is no way for GOsa to get your "
+"data back."
+msgstr ""
+"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
+"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
+"esto, no hay forma de que GOsa recupere la información."
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
-#, fuzzy
-msgid "use"
-msgstr "Ratón"
+#: plugins/admin/systems/headpage.tpl:6
+#: plugins/admin/systems/class_divListSystem.inc:40
+#: plugins/admin/systems/class_divListSystem.inc:41
+msgid "List of systems"
+msgstr "Lista de sistemas"
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
+#: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_divListSystem.inc:45
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
+"This menu allows you to add, remove and change the properties of specific "
+"systems. You can only add systems which have already been started once."
 msgstr ""
+"Este menú permite añadir, modificar o eliminar las propiedades de sistemas "
+"específicos. Solo puede añadir sistemas que han sido ya iniciados alguna vez."
 
-#: plugins/admin/systems/glpi_devices.tpl:2
-#, fuzzy
-msgid "Add/Edit monitor"
-msgstr "Editar entrada"
+#: plugins/admin/systems/headpage.tpl:38
+#: plugins/admin/systems/class_divListSystem.inc:59
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Mostrar servidores"
 
-#: plugins/admin/systems/glpi_devices.tpl:17
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#, fuzzy
-msgid "Comments"
-msgstr "Contacto"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
+msgid "Select to see Linux terminals"
+msgstr "Seleccione para ver los terminales Linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:33
-#, fuzzy
-msgid "Monitor size"
-msgstr "Monitor"
+#: plugins/admin/systems/headpage.tpl:39
+#: plugins/admin/systems/class_divListSystem.inc:60
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Mostrar terminales"
 
-#: plugins/admin/systems/glpi_devices.tpl:36
-#, fuzzy
-msgid "Inch"
-msgstr "Francés"
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
+msgid "Select to see Linux workstations"
+msgstr "Seleccione para ver las estaciones de trabajo Linux"
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:40
+#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/systems/glpi_devices.tpl:47
-#: plugins/admin/systems/glpi_devices.tpl:55
-#: plugins/admin/systems/glpi_devices.tpl:63
-#: plugins/admin/systems/glpi_devices.tpl:71
-#: plugins/admin/systems/glpi_devices.tpl:176
-#: plugins/admin/systems/glpi_devices.tpl:296
-#: plugins/admin/systems/glpi_devices.tpl:361
-#, fuzzy
-msgid "Yes"
-msgstr "Sistemas"
+#: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
 
-#: plugins/admin/systems/glpi_devices.tpl:48
-#: plugins/admin/systems/glpi_devices.tpl:56
-#: plugins/admin/systems/glpi_devices.tpl:64
-#: plugins/admin/systems/glpi_devices.tpl:72
-#: plugins/admin/systems/glpi_devices.tpl:177
-#: plugins/admin/systems/glpi_devices.tpl:297
-#: plugins/admin/systems/glpi_devices.tpl:362
-#, fuzzy
-msgid "No"
-msgstr "ninguno"
+#: plugins/admin/systems/headpage.tpl:41
+#: plugins/admin/systems/class_divListSystem.inc:62
+msgid "Show windows based workstations"
+msgstr "Mostrara estaciones de trabajo basadas en windows"
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
+msgid "Select to see network printers"
+msgstr "Seleccione para ver impresoras de red"
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:42
+#: plugins/admin/systems/class_divListSystem.inc:63
+msgid "Show network printers"
+msgstr "Mostrar impresoras de red"
+
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
+msgid "Select to see VOIP phones"
+msgstr "Seleccione para ver teléfonos VOIP"
+
+#: plugins/admin/systems/headpage.tpl:43
+#: plugins/admin/systems/class_divListSystem.inc:64
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Mostrar teléfonos"
+
+#: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Select to see network devices"
+msgstr "Seleccione para ver los dispositivos de red"
+
+#: plugins/admin/systems/headpage.tpl:44
+#: plugins/admin/systems/class_divListSystem.inc:65
+msgid "Show network devices"
+msgstr "Mostrar dispositivos de Red"
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
-msgstr ""
+#: plugins/admin/systems/headpage.tpl:52
+msgid "Regular expression for matching system names"
+msgstr "Expresiones regulares para encontrar nombres de sistemas"
 
-#: plugins/admin/systems/glpi_devices.tpl:76
+#: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_divListSystem.inc:69
 #, fuzzy
-msgid "Serial number"
-msgstr "Nombre de terminal"
+msgid "Display systems of user"
+msgstr "Mostrar direcciones del usuario"
 
-#: plugins/admin/systems/glpi_devices.tpl:83
-#, fuzzy
-msgid "Additional serial number"
-msgstr "Numero de serie del certificado"
+#: plugins/admin/systems/headpage.tpl:62
+msgid "User name of which terminal(s) are shown"
+msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
 
-#: plugins/admin/systems/glpi_devices.tpl:97
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
 #, fuzzy
-msgid "Add/Edit other device"
-msgstr "Tarjeta Sonido"
+msgid "use"
+msgstr "Ratón"
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
+#: plugins/admin/systems/password.tpl:2
+#, fuzzy
+msgid ""
+"To change the terminal root password use the fields below. The changes take "
+"effect during the next reboot. Please memorize the new password, because you "
+"wouldn't be able to log in."
 msgstr ""
+"Para cambiar la contraseña del usuario use los campos a continuación. Los "
+"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
+"contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/systems/glpi_devices.tpl:173
-msgid "Atx"
+#: plugins/admin/systems/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:181
-#, fuzzy
-msgid "Power"
-msgstr "Puerto"
-
-#: plugins/admin/systems/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
-msgstr ""
+#: plugins/admin/systems/password.tpl:9
+msgid "Changing the password impinges on authentification only."
+msgstr "Cambiar la contraseña afecta solamente a la autenticación."
 
-#: plugins/admin/systems/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
-msgstr ""
+#: plugins/admin/systems/class_terminalInfo.inc:54
+#: plugins/admin/systems/class_terminalInfo.inc:200
+msgid "present"
+msgstr "presente"
 
-#: plugins/admin/systems/glpi_devices.tpl:237
+#: plugins/admin/systems/class_terminalInfo.inc:75
 #, fuzzy
-msgid "Ram"
-msgstr "Nombre del servidor"
+msgid "There is no php snmp module installed, can't gather any informations."
+msgstr ""
+"Aviso: imap_getacl no ha sido implementado, no se modificara información "
+"sobre las listas de acceso."
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-#, fuzzy
-msgid "Add/Edit controller"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/class_terminalInfo.inc:81
+#: plugins/admin/systems/class_terminalInfo.inc:175
+msgid "unknown status"
+msgstr "estado desconocido"
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
+#: plugins/admin/systems/class_terminalInfo.inc:90
+msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
+"Este es un terminal virtual que no tiene propiedades que puedan ser mostradas"
 
-#: plugins/admin/systems/glpi_devices.tpl:342
-#, fuzzy
-msgid "Speed"
-msgstr "Sexo"
+#: plugins/admin/systems/class_terminalInfo.inc:108
+msgid "online"
+msgstr "en linea"
 
-#: plugins/admin/systems/glpi_devices.tpl:358
-#, fuzzy
-msgid "Writeable"
-msgstr "escribir"
+#: plugins/admin/systems/class_terminalInfo.inc:164
+msgid "running"
+msgstr "Activo"
 
-#: plugins/admin/systems/glpi_devices.tpl:371
-#, fuzzy
-msgid "Add/Edit harddisk"
-msgstr "Servidor"
+#: plugins/admin/systems/class_terminalInfo.inc:167
+msgid "not running"
+msgstr "no esta activo"
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
-msgstr ""
+#: plugins/admin/systems/class_terminalInfo.inc:192
+msgid "offline"
+msgstr "fuera de linea"
 
-#: plugins/admin/systems/glpi_devices.tpl:413
-#, fuzzy
-msgid "Cache"
-msgstr "Cancelar"
+#: plugins/admin/systems/class_servDB.inc:136
+#: plugins/admin/systems/class_servDB.inc:145
+#: plugins/admin/systems/class_servDB.inc:162
+#: plugins/admin/systems/class_servDB.inc:172
+#: plugins/admin/systems/class_servDB.inc:177
+#: plugins/admin/systems/class_servDB.inc:183
+#, php-format
+msgid "The attribute '%s' is empty or contains invalid characters."
+msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
 
-#: plugins/admin/systems/glpi_devices.tpl:443
-#, fuzzy
-msgid "Add/Edit memory"
-msgstr "Editar entrada"
+#: plugins/admin/systems/class_servDB.inc:152
+#, php-format
+msgid "The imap connect string needs to be in the form '%s'."
+msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 
-#: plugins/admin/systems/glpi_devices.tpl:478
-#, fuzzy
-msgid "Frequenz"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/class_servDB.inc:156
+msgid "The sieve port needs to be numeric."
+msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/systems/glpi_devices.tpl:507
-#, fuzzy
-msgid "Add/Edit sound card"
-msgstr "Nueva contraseña"
+#: plugins/admin/systems/class_servDB.inc:167
+#, fuzzy, php-format
+msgid "The specified kerberos password is empty."
+msgstr "El archivo especificado está vacío."
 
-#: plugins/admin/systems/glpi_devices.tpl:553
-#, fuzzy
-msgid "Add/Edit network interface"
-msgstr "Impresora de Red"
+#: plugins/admin/systems/class_servDB.inc:191
+#, fuzzy, php-format
+msgid "The imap name string needs to be a hostname or an IP-address."
+msgstr "La cadena de conexión imap necesita estar en la forma '%s'."
 
-#: plugins/admin/systems/glpi_devices.tpl:589
-#, fuzzy
-msgid "MAC address"
-msgstr "Dirección MAC"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:97
+#, fuzzy, php-format
+msgid "You're about to delete the glpi cartridge type '%s'."
+msgstr "Va ha eliminar la aplicación '%s'."
 
-#: plugins/admin/systems/glpi_devices.tpl:607
-#, fuzzy
-msgid "Add/Edit processor"
-msgstr "Nueva contraseña"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:116
+#, php-format
+msgid ""
+"You can't delete this cartridge type, it is still in use by this printer(s) "
+"'%s'."
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:642
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid "Frequence"
-msgstr "Número de teléfono"
+msgid "New monitor"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/glpi_devices.tpl:649
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid "Default frequence"
-msgstr "Valor por defecto"
+msgid "M"
+msgstr "Mb"
 
-#: plugins/admin/systems/glpi_devices.tpl:661
+#: plugins/admin/systems/glpi.tpl:9
+#: plugins/admin/systems/SelectDeviceType.tpl:20
 #, fuzzy
-msgid "Add/Edit motherboard"
-msgstr "Teclado"
+msgid "System type"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/glpi_devices.tpl:696
+#: plugins/admin/systems/glpi.tpl:19
 #, fuzzy
-msgid "Chipset"
+msgid "Operating system"
 msgstr "Borrar"
 
-#: plugins/admin/systems/glpi_devices.tpl:707
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
 #, fuzzy
-msgid "Add/Edit computer case"
-msgstr "incompleto"
+msgid "Contacts"
+msgstr "Contacto"
 
-#: plugins/admin/systems/glpi_devices.tpl:742
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
 #, fuzzy
-msgid "format"
-msgstr "Puerto"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
-#, php-format
-msgid "Internal Error can't create device of type '%s'"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
-#, fuzzy, php-format
-msgid "You're about to delete the glpi device '%s'."
-msgstr "Está a punto de borrar el grupo '%s'."
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
-msgid "Can't detect object name."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
-#, php-format
-msgid ""
-"You can't delete this device, it is still in use by these system(s) '%s'"
-msgstr ""
+msgid "Contact person"
+msgstr "Contacto"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+#: plugins/admin/systems/glpi.tpl:78
 #, fuzzy
-msgid "devices"
-msgstr "Servicios"
+msgid "Installed devices"
+msgstr "Dispositivos clientes"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+#: plugins/admin/systems/glpi.tpl:90
 #, fuzzy
-msgid "New mainbord"
-msgstr "Nueva contraseña"
+msgid "Trading"
+msgstr "Ocultamiento"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#: plugins/admin/systems/glpi.tpl:91
 #, fuzzy
-msgid "New processor"
-msgstr "Nueva contraseña"
+msgid "Software"
+msgstr "Estado"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+#: plugins/admin/systems/glpi.tpl:92
 #, fuzzy
-msgid "New case"
-msgstr "usuarios"
+msgid "Contracts"
+msgstr "Contacto"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
-msgid "C"
-msgstr ""
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+#, fuzzy
+msgid "Attachments"
+msgstr "Argumentos"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#: plugins/admin/systems/glpiPrinter.tpl:9
 #, fuzzy
-msgid "New network interface"
+msgid "Printer type"
+msgstr "Nombre de la impresora"
+
+#: plugins/admin/systems/glpiPrinter.tpl:31
+#, fuzzy
+msgid "Supported interfaces"
 msgstr "Impresora de Red"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#: plugins/admin/systems/glpiPrinter.tpl:38
 #, fuzzy
-msgid "NI"
-msgstr "UNIX"
+msgid "Serial"
+msgstr "terminales"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+#: plugins/admin/systems/glpiPrinter.tpl:46
 #, fuzzy
-msgid "New ram"
-msgstr "usuarios"
+msgid "Parallel"
+msgstr "Variable"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
-msgid "R"
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+#: plugins/admin/systems/glpiPrinter.tpl:114
 #, fuzzy
-msgid "New hard disk"
-msgstr "Servidor"
+msgid "Installed cartridges"
+msgstr "Dispositivos clientes"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
-msgid "HDD"
-msgstr ""
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_systemManagement.inc:885
+#: plugins/admin/ogroups/class_ogroupManagement.inc:597
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_systemManagement.inc:884
+#: plugins/admin/ogroups/class_ogroupManagement.inc:598
 #, fuzzy
-msgid "New drive"
-msgstr "Servidor"
+msgid "Terminal"
+msgstr "Terminales"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
+#: plugins/admin/systems/glpi_edit_type.tpl:1
 #, fuzzy
-msgid "D"
-msgstr "UID"
+msgid "Manage System-types"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+#: plugins/admin/systems/glpi_edit_type.tpl:24
+#: plugins/admin/systems/glpi_edit_os.tpl:24
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:25
 #, fuzzy
-msgid "New controller"
-msgstr "Número de teléfono"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
-msgid "CS"
-msgstr ""
+msgid "Please enter a new name"
+msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "New graphics card"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
-msgid "GC"
-msgstr ""
+#: plugins/admin/systems/servRepositorySetup.tpl:15
+#, fuzzy
+msgid "Parent server"
+msgstr "Servicio de impresión"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+#: plugins/admin/systems/class_servDNS.inc:159
 #, fuzzy
-msgid "New sound card"
-msgstr "Nueva contraseña"
+msgid "Reverse zone"
+msgstr "Referencias"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
-msgid "SC"
+#: plugins/admin/systems/class_servDNS.inc:223
+#, php-format
+msgid ""
+"Can't delete the selected zone, because it is still in use by these entry/"
+"entries '%s'"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "New power supply"
-msgstr ""
+#: plugins/admin/systems/workstationStartup.tpl:4
+#: plugins/admin/systems/terminalStartup.tpl:1
+msgid "Boot parameters"
+msgstr "Parametros de inicio"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
-msgid "PS"
-msgstr ""
+#: plugins/admin/systems/workstationStartup.tpl:8
+#: plugins/admin/systems/terminalStartup.tpl:13
+msgid "Boot kernel"
+msgstr "Kernel de inicio"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-#, fuzzy
-msgid "New misc device"
-msgstr "Dispositivos de Red"
+#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:22
+msgid "Custom options"
+msgstr "Otras opciones"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
-msgid "OC"
+#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:24
+msgid ""
+"Enter any parameters that should be passed to the kernel as append line "
+"during bootup"
 msgstr ""
+"Introducir que parametros serán pasados a la configuración de arranque del "
+"nucleo"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
-#, fuzzy
-msgid "You have to specify a valid name for this device."
-msgstr "Por favor especifique un usuario valido."
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:8
+msgid "LDAP server"
+msgstr "Servidor LDAP"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+#: plugins/admin/systems/workstationStartup.tpl:37
 #, fuzzy
-msgid "This device name is already in use."
-msgstr "El nombre especificado ya esta siendo usado"
+msgid "FAI server"
+msgstr "Servidor LDAP"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:405
+#: plugins/admin/systems/workstationStartup.tpl:54
 #, fuzzy
-msgid "Other"
-msgstr "Filtros"
+msgid "Assigned FAI classes"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
+#: plugins/admin/systems/workstationStartup.tpl:73
+#: plugins/admin/systems/terminalStartup.tpl:53
+msgid "Kernel modules (format: name parameters)"
+msgstr "Módulos del núcleo (formato: nombre parametros)"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/terminalStartup.tpl:55
+msgid "Add additional modules to load on startup"
+msgstr "Añadir módulos adicionales que serán cargados al arrancar"
+
+#: plugins/admin/systems/workstationStartup.tpl:99
+#: plugins/admin/systems/terminalStartup.tpl:79
 #, fuzzy
-msgid "Parent server"
-msgstr "Servicio de impresión"
+msgid "Mountpoint"
+msgstr "Monitor"
 
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Servicio de Hora"
+#: plugins/admin/systems/class_terminalService.inc:102
+#: plugins/admin/systems/class_workstationService.inc:88
+msgid "default"
+msgstr "por defecto"
 
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Servicio LDAP"
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_workstationService.inc:89
+msgid "show chooser"
+msgstr "mostrar elegidos"
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Servidor de terminal"
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_workstationService.inc:90
+msgid "direct"
+msgstr "Directo"
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Desactivación temporal del acceso"
+#: plugins/admin/systems/class_terminalService.inc:107
+#: plugins/admin/systems/class_workstationService.inc:93
+msgid "load balanced"
+msgstr "balanceo de carga"
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Ruta a las fuentes tipográficas"
+#: plugins/admin/systems/class_terminalService.inc:110
+#: plugins/admin/systems/class_workstationService.inc:96
+msgid "Windows RDP"
+msgstr "Windows RDP"
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Servicio de Logs"
+#: plugins/admin/systems/class_terminalService.inc:111
+#: plugins/admin/systems/class_workstationService.inc:97
+msgid "ICA client"
+msgstr "Cliente ICA"
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Servicio de impresión"
+#: plugins/admin/systems/class_terminalService.inc:209
+#: plugins/admin/systems/class_workstationService.inc:200
+msgid "Choose the phone located at the current terminal"
+msgstr "Elija el teléfono localizado en el terminal actual"
 
-#: plugins/admin/systems/servservice.tpl:109
-#, fuzzy
-msgid "Mail server"
-msgstr "Servidor"
+#: plugins/admin/systems/class_terminalService.inc:271
+#: plugins/admin/systems/class_terminalService.inc:276
+#: plugins/admin/systems/class_workstationService.inc:263
+#: plugins/admin/systems/class_workstationService.inc:268
+msgid "Please specify a valid VSync range."
+msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
-msgstr ""
+#: plugins/admin/systems/class_terminalService.inc:286
+#: plugins/admin/systems/class_terminalService.inc:291
+#: plugins/admin/systems/class_workstationService.inc:278
+#: plugins/admin/systems/class_workstationService.inc:283
+msgid "Please specify a valid HSync range."
+msgstr "Por favor especifique un rango HSync valido"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:1
+#: plugins/admin/systems/servRepository.tpl:6
 #, fuzzy
-msgid "Printer driver"
-msgstr "Dispositivo de Impresión"
+msgid "List of configured repositories."
+msgstr "Lista de grupos"
 
-#: plugins/admin/systems/printerPPDDialog.tpl:9
+#: plugins/admin/systems/servRepository.tpl:11
 #, fuzzy
-msgid "New driver"
-msgstr "Servidor"
+msgid "Add repository"
+msgstr "Reintentar"
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
+#: plugins/admin/systems/class_glpiAccount.inc:178
+#: plugins/admin/systems/class_glpiAccount.inc:184
+#: plugins/admin/systems/class_glpiAccount.inc:190
+msgid "This feature is not implemented yet."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
+#: plugins/admin/systems/class_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAccount.inc:312
+#, php-format
 msgid ""
-"This dialog allows you to create new types of cartridges, and select one or "
-"more types for your printer. Cartridge types depends on the printer type you "
-"have selected. For each selected cartridge type there will be a new "
-"cartridge created, this allows you to select the same cartridge type for "
-"more then one printer."
+"You can't delete this system type, it is still in use by these system(s) '%s'"
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+#: plugins/admin/systems/class_glpiAccount.inc:323
 #, fuzzy
-msgid "Display cartridge types matching"
-msgstr "Mostrar números que concuerdan con"
+msgid "Rename failed, this system type name is already used."
+msgstr "El nombre especificado ya esta siendo usado"
+
+#: plugins/admin/systems/class_glpiAccount.inc:379
+#, fuzzy
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+
+#: plugins/admin/systems/class_glpiAccount.inc:401
+#, php-format
+msgid ""
+"You can't delete this operating system, it is still in use by these system"
+"(s) '%s'"
+msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+#: plugins/admin/systems/class_glpiAccount.inc:413
 #, fuzzy
-msgid "Regular expression for matching cartridge types"
-msgstr "Expresiones regulares que concuerden con direcciones"
+msgid "Updating operating system failed, specifed name is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
+#: plugins/admin/systems/class_glpiAccount.inc:565
 #, fuzzy
-msgid "Reference"
-msgstr "Referencias"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
-msgstr "texto"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
-msgstr "Gráfico"
+msgid ""
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:90
-#: plugins/admin/systems/class_servGeneric.inc:62
-#: plugins/admin/ogroups/class_termgroup.inc:64
-msgid "No WAKECMD definition found in your gosa.conf"
-msgstr "No se ha encontrado ninguna definición de 'WAKECMD' en 'gosa.conf'"
+#: plugins/admin/systems/class_glpiAccount.inc:568
+#, fuzzy
+msgid ""
+"This device has inventory informations disabled. You can enable them by "
+"clicking below."
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:102
-#: plugins/admin/systems/class_servGeneric.inc:74
-#: plugins/admin/ogroups/class_termgroup.inc:76
-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_servDNSeditZoneEntries.inc:173
+#, php-format
+msgid ""
+"Can't rename '%s' to '%s' there is already an entry with the same name in "
+"our zone editing dialog."
+msgstr ""
 
-#: plugins/admin/systems/class_terminalGeneric.inc:114
-#: plugins/admin/systems/class_servGeneric.inc:86
-#: plugins/admin/ogroups/class_termgroup.inc:88
-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_servDNSeditZoneEntries.inc:200
+#, fuzzy, php-format
+msgid "Entry name '%s' contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:269
-msgid "You have no permissions to create a terminal on this 'Base'."
-msgstr "No tiene permisos para crear un terminal en esta 'Base'."
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:209
+#, fuzzy, php-format
+msgid "Can not rename '%s' to '%s',the destination name already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/systems/class_terminalGeneric.inc:273
-msgid "The required field 'Terminal name' is not set."
-msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:215
+#, fuzzy, php-format
+msgid "Can not create '%s',the destination name already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/systems/remove_glpi.tpl:10
-#, fuzzy
-msgid ""
-"Best thing to do before performing this action would be to save the current "
-"contents of your MySql database in a file. So - if you've done so - press "
-"'Delete' to continue or 'Cancel' to abort."
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:224
+#, php-format
+msgid "The name '%s' is used more than once."
 msgstr ""
-"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
-"actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
-"presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
 
-#: plugins/admin/systems/class_servGeneric.inc:52
-msgid "This 'dn' has no server features."
-msgstr "Esta 'dn' no tiene características de servidor."
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:230
+#, php-format
+msgid "The host name '%s' should be written in lowercase."
+msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:191
-#, fuzzy
-msgid "The required field 'Server name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:247
+#, php-format
+msgid "The record type '%s' is a unique type and can't be defined twice."
+msgstr ""
 
-#: plugins/admin/systems/class_servGeneric.inc:198
-msgid "You have no permissions to create a server on this 'Base'."
-msgstr "No tiene permisos para crear un servidor en esta 'Base'."
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:254
+#, fuzzy, php-format
+msgid "There is an empty '%s' for host '%s'."
+msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
-#, fuzzy
-msgid "Add/Edit manufacturer"
-msgstr "Editar entrada"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:262
+#, php-format
+msgid "There is a duplicate entry in '%s' for '%s'."
+msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
-#, fuzzy
-msgid "Website"
-msgstr "escribir"
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:353
+#, php-format
+msgid "Settings for '%s'"
+msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
-#: plugins/admin/ogroups/class_mailogroup.inc:137
-#: plugins/admin/ogroups/class_phonequeue.inc:690
-#: plugins/gofon/conference/generic.tpl:69 html/getxls.php:174
-#: html/getxls.php:236
+#: plugins/admin/systems/glpiAttachmentPool.tpl:6
 #, fuzzy
-msgid "Phone number"
-msgstr "Números de teléfonos"
-
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
-msgstr "Eliminar servicio DHCP"
+msgid "List of attachments"
+msgstr "Lista de Departamentos"
 
-#: plugins/admin/systems/class_servDHCP.inc:37
+#: plugins/admin/systems/glpiAttachmentPool.tpl:23
 msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
+"This dialog allow you to attach additional objects (like manuals, guides, "
+"etc.)  to your currently edited computer."
 msgstr ""
-"Este servidor tiene la extensión DHCP activada. Puede desactivarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_servDHCP.inc:39
-msgid "Add DHCP service"
-msgstr "Añadir servicio DHCP"
+#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+#, fuzzy
+msgid "Display attachments matching"
+msgstr "Mostrar Departamentos que concuerden con"
 
-#: plugins/admin/systems/class_servDHCP.inc:40
-msgid ""
-"This server has DHCP features disabled. You can enable them by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión DHCP desactivada. Puede activarla pulsando "
-"aquí."
+#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+#, fuzzy
+msgid "Regular expression for matching attachment names"
+msgstr "Expresiones regulares para encontrar nombres de departamentos"
 
 #: plugins/admin/systems/class_systemManagement.inc:32
 msgid "Systems"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:429
+#: plugins/admin/systems/class_systemManagement.inc:393
 msgid "You can't edit this object type yet!"
 msgstr "¡No puede editar este tipo de objeto todavía!"
 
-#: plugins/admin/systems/class_systemManagement.inc:455
+#: plugins/admin/systems/class_systemManagement.inc:419
 msgid "Passwords entered as new and repeated do not match!"
 msgstr "!Las contraseñas introducidas como 'nuevo' y 'repetir' no son iguales¡"
 
-#: plugins/admin/systems/class_systemManagement.inc:472
+#: plugins/admin/systems/class_systemManagement.inc:436
 msgid "You are not allowed to set this systems password!"
 msgstr "¡No tiene permisos para cambiar contraseñas de sistema!"
 
-#: plugins/admin/systems/class_systemManagement.inc:526
+#: plugins/admin/systems/class_systemManagement.inc:490
 #, php-format
 msgid "You're about to delete all information about the component at '%s'."
 msgstr ""
 "Esta a punto de borrar toda la información sobre el componente en '%s'."
 
-#: plugins/admin/systems/class_systemManagement.inc:761
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_divListSystem.inc:95
 #, fuzzy
 msgid "New Terminal template"
 msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:761
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_systemManagement.inc:725
+#: plugins/admin/systems/class_systemManagement.inc:890
+#: plugins/admin/systems/class_divListSystem.inc:95
 #, fuzzy
 msgid "New Terminal"
 msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_divListSystem.inc:97
 #, fuzzy
 msgid "New Workstation template"
 msgstr "Plantilla de estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:926
+#: plugins/admin/systems/class_systemManagement.inc:727
+#: plugins/admin/systems/class_systemManagement.inc:891
+#: plugins/admin/systems/class_divListSystem.inc:97
 #, fuzzy
 msgid "New Workstation"
 msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:765
+#: plugins/admin/systems/class_systemManagement.inc:728
+#: plugins/admin/systems/class_systemManagement.inc:729
+#: plugins/admin/systems/class_divListSystem.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:99
 #, fuzzy
 msgid "New Server"
 msgstr "Servidor"
 
-#: plugins/admin/systems/class_systemManagement.inc:766
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_systemManagement.inc:730
+#: plugins/admin/systems/class_systemManagement.inc:731
+#: plugins/admin/systems/class_divListSystem.inc:100
+#: plugins/admin/systems/class_divListSystem.inc:101
 #, fuzzy
 msgid "New Printer"
 msgstr "Impresora"
 
-#: plugins/admin/systems/class_systemManagement.inc:768
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_systemManagement.inc:732
+#: plugins/admin/systems/class_systemManagement.inc:733
+#: plugins/admin/systems/class_divListSystem.inc:102
+#: plugins/admin/systems/class_divListSystem.inc:103
 #, fuzzy
 msgid "New Phone"
 msgstr "Teléfono"
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_systemManagement.inc:734
+#: plugins/admin/systems/class_systemManagement.inc:735
+#: plugins/admin/systems/class_divListSystem.inc:104
+#: plugins/admin/systems/class_divListSystem.inc:105
 #, fuzzy
 msgid "New Component"
 msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_systemManagement.inc:745
+#: plugins/admin/systems/class_divListSystem.inc:135
 #, fuzzy
 msgid "Edit system"
 msgstr "Lista de sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/systems/class_systemManagement.inc:746
+#: plugins/admin/systems/class_divListSystem.inc:136
 #, fuzzy
 msgid "Delete system"
 msgstr "Borrar"
 
-#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/systems/class_systemManagement.inc:756
 #, fuzzy
 msgid "System"
 msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:830
-#, fuzzy
-msgid "Cups Server"
-msgstr "Servidor"
+#: plugins/admin/systems/class_systemManagement.inc:794
+#: plugins/admin/systems/class_divListSystem.inc:123
+#, fuzzy
+msgid "Cups Server"
+msgstr "Servidor"
+
+#: plugins/admin/systems/class_systemManagement.inc:795
+#: plugins/admin/systems/class_divListSystem.inc:124
+msgid "Log Db"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:796
+#: plugins/admin/systems/class_divListSystem.inc:125
+#, fuzzy
+msgid "Syslog Server"
+msgstr "Servidor de Logs"
+
+#: plugins/admin/systems/class_systemManagement.inc:797
+#: plugins/admin/systems/class_divListSystem.inc:126
+#, fuzzy
+msgid "Mail Server"
+msgstr "Servidor"
+
+#: plugins/admin/systems/class_systemManagement.inc:798
+#: plugins/admin/systems/class_divListSystem.inc:127
+#, fuzzy
+msgid "Imap Server"
+msgstr "Servidor de Intercambio"
+
+#: plugins/admin/systems/class_systemManagement.inc:799
+#: plugins/admin/systems/class_divListSystem.inc:128
+#, fuzzy
+msgid "Nfs Server"
+msgstr "Servidor"
+
+#: plugins/admin/systems/class_systemManagement.inc:800
+#: plugins/admin/systems/class_divListSystem.inc:129
+#, fuzzy
+msgid "Kerberos Server"
+msgstr "Kerberos"
+
+#: plugins/admin/systems/class_systemManagement.inc:801
+#: plugins/admin/systems/class_divListSystem.inc:130
+#, fuzzy
+msgid "Asterisk Server"
+msgstr "Base de datos de usuarios Asterisk"
+
+#: plugins/admin/systems/class_systemManagement.inc:802
+#: plugins/admin/systems/class_divListSystem.inc:131
+#, fuzzy
+msgid "Fax Server"
+msgstr "Servidor"
+
+#: plugins/admin/systems/class_systemManagement.inc:803
+#: plugins/admin/systems/class_divListSystem.inc:132
+#, fuzzy
+msgid "Ldap Server"
+msgstr "Servidor de Intercambio"
+
+#: plugins/admin/systems/class_systemManagement.inc:836
+#, fuzzy
+msgid "Set root password"
+msgstr "Poner Contraseña"
+
+#: plugins/admin/systems/class_systemManagement.inc:882
+#, fuzzy
+msgid "New System from incoming"
+msgstr "Información de sistema"
+
+#: plugins/admin/systems/class_systemManagement.inc:888
+#, fuzzy
+msgid "Winstation"
+msgstr "Estación de trabajo"
+
+#: plugins/admin/systems/class_systemManagement.inc:889
+#, fuzzy
+msgid "Network Device"
+msgstr "Dispositivos de Red"
+
+#: plugins/admin/systems/class_systemManagement.inc:1111
+msgid "New terminal"
+msgstr "Nuevo terminal"
+
+#: plugins/admin/systems/class_systemManagement.inc:1113
+msgid "New workstation"
+msgstr "Nueva estación de trabajo"
+
+#: plugins/admin/systems/class_systemManagement.inc:1115
+#, fuzzy
+msgid "New Device"
+msgstr "Dispositivos de Red"
+
+#: plugins/admin/systems/class_systemManagement.inc:1130
+#, fuzzy
+msgid "Terminal template for"
+msgstr "Plantilla de terminal"
+
+#: plugins/admin/systems/class_systemManagement.inc:1142
+msgid "Workstation template for"
+msgstr "Plantilla de estación de trabajo para"
+
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
+
+#: plugins/admin/systems/class_servService.inc:318
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
+
+#: plugins/admin/systems/workstationService.tpl:4
+#: plugins/admin/systems/terminalService.tpl:4
+msgid "Keyboard"
+msgstr "Teclado"
+
+#: plugins/admin/systems/workstationService.tpl:9
+#: plugins/admin/systems/terminalService.tpl:9
+msgid "Choose keyboard model"
+msgstr "Elija modelo de teclado"
+
+#: plugins/admin/systems/workstationService.tpl:15
+#: plugins/admin/systems/terminalService.tpl:15
+msgid "Layout"
+msgstr "Disposición"
+
+#: plugins/admin/systems/workstationService.tpl:17
+#: plugins/admin/systems/terminalService.tpl:17
+msgid "Choose keyboard layout"
+msgstr "Elija localización del teclado"
+
+#: plugins/admin/systems/workstationService.tpl:23
+#: plugins/admin/systems/terminalService.tpl:23
+msgid "Variant"
+msgstr "Variante"
+
+#: plugins/admin/systems/workstationService.tpl:25
+#: plugins/admin/systems/terminalService.tpl:25
+msgid "Choose keyboard variant"
+msgstr "Elija variante de teclado"
+
+#: plugins/admin/systems/workstationService.tpl:39
+#: plugins/admin/systems/terminalService.tpl:39
+msgid "Mouse"
+msgstr "Ratón"
+
+#: plugins/admin/systems/workstationService.tpl:44
+#: plugins/admin/systems/terminalService.tpl:44
+msgid "Choose mouse type"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/systems/workstationService.tpl:50
+#: plugins/admin/systems/terminalService.tpl:50
+msgid "Port"
+msgstr "Puerto"
+
+#: plugins/admin/systems/workstationService.tpl:52
+#: plugins/admin/systems/terminalService.tpl:52
+msgid "Choose mouse port"
+msgstr "Elija el puerto del ratón"
 
-#: plugins/admin/systems/class_systemManagement.inc:831
-msgid "Log Db"
-msgstr ""
+#: plugins/admin/systems/workstationService.tpl:66
+#: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/generic.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
+msgid "Telephone hardware"
+msgstr "Componente telefónico"
 
-#: plugins/admin/systems/class_systemManagement.inc:832
-#, fuzzy
-msgid "Syslog Server"
-msgstr "Servidor de Logs"
+#: plugins/admin/systems/workstationService.tpl:69
+#: plugins/admin/systems/terminalService.tpl:69
+#: plugins/gofon/phoneaccount/generic.tpl:26
+#: plugins/gofon/phoneaccount/generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:29
+msgid "Telephone"
+msgstr "Teléfono"
 
-#: plugins/admin/systems/class_systemManagement.inc:833
-#, fuzzy
-msgid "Mail Server"
-msgstr "Servidor"
+#: plugins/admin/systems/workstationService.tpl:88
+#: plugins/admin/systems/terminalService.tpl:88
+msgid "Choose graphic driver that is needed by the installed graphic board"
+msgstr ""
+"Elija controlador gráfico que se necesita para la tarjeta gráfica instalada"
 
-#: plugins/admin/systems/class_systemManagement.inc:834
-#, fuzzy
-msgid "Imap Server"
-msgstr "Servidor de Intercambio"
+#: plugins/admin/systems/workstationService.tpl:96
+#: plugins/admin/systems/terminalService.tpl:96
+msgid "Choose screen resolution used in graphic mode"
+msgstr "Elija la resolución gráfica usada en modo gráfico"
 
-#: plugins/admin/systems/class_systemManagement.inc:835
-#, fuzzy
-msgid "Nfs Server"
-msgstr "Servidor"
+#: plugins/admin/systems/workstationService.tpl:102
+#: plugins/admin/systems/terminalService.tpl:102
+msgid "Color depth"
+msgstr "Profundidad del Color"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
-#, fuzzy
-msgid "Kerberos Server"
-msgstr "Kerberos"
+#: plugins/admin/systems/workstationService.tpl:104
+#: plugins/admin/systems/terminalService.tpl:104
+msgid "Choose colordepth used in graphic mode"
+msgstr "Elija la profundidad de color usada en modo gráfico"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
-#, fuzzy
-msgid "Asterisk Server"
-msgstr "Base de datos de usuarios Asterisk"
+#: plugins/admin/systems/workstationService.tpl:117
+#: plugins/admin/systems/terminalService.tpl:117
+msgid "Display device"
+msgstr "Mostrar dispositivo"
 
-#: plugins/admin/systems/class_systemManagement.inc:838
+#: plugins/admin/systems/workstationService.tpl:121
 #, fuzzy
-msgid "Fax Server"
-msgstr "Servidor"
+msgid "unknown"
+msgstr "estado desconocido"
 
-#: plugins/admin/systems/class_systemManagement.inc:839
-#, fuzzy
-msgid "Ldap Server"
-msgstr "Servidor de Intercambio"
+#: plugins/admin/systems/workstationService.tpl:126
+msgid "Automatic modelines"
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:872
-#, fuzzy
-msgid "Set root password"
-msgstr "Poner Contraseña"
+#: plugins/admin/systems/workstationService.tpl:130
+#: plugins/admin/systems/terminalService.tpl:124
+msgid "HSync"
+msgstr "HSync"
 
-#: plugins/admin/systems/class_systemManagement.inc:917
-#, fuzzy
-msgid "New System from incoming"
-msgstr "Información de sistema"
+#: plugins/admin/systems/workstationService.tpl:132
+#: plugins/admin/systems/terminalService.tpl:126
+msgid "Horizontal refresh frequency for installed monitor"
+msgstr "Frecuencia de refresco horizontal para el monitor instalado"
 
-#: plugins/admin/systems/class_systemManagement.inc:919
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:590
-#, fuzzy
-msgid "Terminal"
-msgstr "Terminales"
+#: plugins/admin/systems/workstationService.tpl:135
+#: plugins/admin/systems/terminalService.tpl:129
+msgid "VSync"
+msgstr "VSync"
 
-#: plugins/admin/systems/class_systemManagement.inc:920
-#: plugins/admin/systems/class_SelectDeviceType.inc:34
-#: plugins/admin/ogroups/class_ogroupManagement.inc:589
-#: plugins/generic/references/class_reference.inc:48
-msgid "Workstation"
-msgstr "Estación de trabajo"
+#: plugins/admin/systems/workstationService.tpl:137
+#: plugins/admin/systems/terminalService.tpl:131
+msgid "Vertical refresh frequency for installed monitor"
+msgstr "Frecuencia de refresco vertical para el monitor instalado"
 
-#: plugins/admin/systems/class_systemManagement.inc:923
-#, fuzzy
-msgid "Winstation"
-msgstr "Estación de trabajo"
+#: plugins/admin/systems/workstationService.tpl:149
+#: plugins/admin/systems/terminalService.tpl:203
+msgid "Scan device"
+msgstr "Dispositivo de escaneo"
 
-#: plugins/admin/systems/class_systemManagement.inc:924
-#, fuzzy
-msgid "Network Device"
-msgstr "Dispositivos de Red"
+#: plugins/admin/systems/workstationService.tpl:150
+#: plugins/admin/systems/terminalService.tpl:204
+msgid "Select to start SANE scan service on terminal"
+msgstr "Seleccione para iniciar el servicio de escáner 'SANE' en el terminal"
 
-#: plugins/admin/systems/class_systemManagement.inc:1147
-msgid "New terminal"
-msgstr "Nuevo terminal"
+#: plugins/admin/systems/workstationService.tpl:151
+#: plugins/admin/systems/terminalService.tpl:205
+msgid "Provide scan services"
+msgstr "Provee servicios de exploración"
 
-#: plugins/admin/systems/class_systemManagement.inc:1149
-msgid "New workstation"
-msgstr "Nueva estación de trabajo"
+#: plugins/admin/systems/class_phoneGeneric.inc:105
+msgid "This 'dn' has no phone features."
+msgstr "Esta 'dn' no tiene características de teléfono."
 
-#: plugins/admin/systems/class_systemManagement.inc:1151
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:385
 #, fuzzy
-msgid "New Device"
-msgstr "Dispositivos de Red"
+msgid "yes"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/class_systemManagement.inc:1168
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:386
 #, fuzzy
-msgid "Terminal template for"
-msgstr "Plantilla de terminal"
+msgid "no"
+msgstr "ninguno"
 
-#: plugins/admin/systems/class_systemManagement.inc:1180
-msgid "Workstation template for"
-msgstr "Plantilla de estación de trabajo para"
+#: plugins/admin/systems/class_phoneGeneric.inc:224
+msgid "dynamic"
+msgstr ""
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
+#: plugins/admin/systems/class_phoneGeneric.inc:224
 #, fuzzy
-msgid "Please enter a value for 'release'."
-msgstr "Por favor especifique un usuario valido."
+msgid "Networksettings"
+msgstr "Configuración de red"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:121
-#, fuzzy
-msgid "Please specify a valid value for 'url'."
-msgstr "Por favor especifique un usuario valido."
+#: plugins/admin/systems/class_phoneGeneric.inc:239
+#, php-format
+msgid ""
+"Can't delete because there are user which are depending on this phone. One "
+"of them is user '%s'."
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:6
+#: plugins/admin/systems/class_phoneGeneric.inc:298
 #, fuzzy
-msgid "General"
-msgstr "Genérico"
-
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Nombre de la impresora"
+msgid "The required field 'Phone name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
+#: plugins/admin/systems/class_phoneGeneric.inc:301
+msgid "The 'Phone name' '0' is reserved and cannot be used."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:34
+#: plugins/admin/systems/class_phoneGeneric.inc:308
+msgid "You have no permissions to create a phone on this 'Base'."
+msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
+
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
 #, fuzzy
-msgid "Printer location"
-msgstr "Configuración telefónica"
+msgid "List of devices"
+msgstr "Lista de usuarios"
 
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
-msgstr "URL de la impresora"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
+msgstr ""
 
-#: plugins/admin/systems/printer.tpl:58
+#: plugins/admin/systems/glpiDeviceManagement.tpl:35
 #, fuzzy
-msgid "Permissions"
-msgstr "Miembro con Permisos"
+msgid "Display devices matching"
+msgstr "Mostrar direcciones que concuerden con"
 
-#: plugins/admin/systems/printer.tpl:65
+#: plugins/admin/systems/glpiDeviceManagement.tpl:37
 #, fuzzy
-msgid "Users which are allowed to use this printer"
-msgstr "¡No tiene permisos para eliminar esta entrada!"
+msgid "Regular expression for matching device names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/admin/systems/printer.tpl:69 plugins/admin/systems/printer.tpl:85
+#: plugins/admin/systems/glpi_devices.tpl:2
 #, fuzzy
-msgid "Add user"
-msgstr "Usuario administrador"
+msgid "Add/Edit monitor"
+msgstr "Editar entrada"
 
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
+#: plugins/admin/systems/glpi_devices.tpl:33
 #, fuzzy
-msgid "Add group"
-msgstr "grupos"
+msgid "Monitor size"
+msgstr "Monitor"
 
-#: plugins/admin/systems/printer.tpl:81
+#: plugins/admin/systems/glpi_devices.tpl:36
 #, fuzzy
-msgid "Users which are allowed to administrate this printer"
-msgstr "¡No tiene permisos para eliminar esta entrada!"
+msgid "Inch"
+msgstr "Francés"
 
-#: plugins/admin/systems/printer.tpl:82
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:47
+#: plugins/admin/systems/glpi_devices.tpl:55
+#: plugins/admin/systems/glpi_devices.tpl:63
+#: plugins/admin/systems/glpi_devices.tpl:71
+#: plugins/admin/systems/glpi_devices.tpl:176
+#: plugins/admin/systems/glpi_devices.tpl:296
+#: plugins/admin/systems/glpi_devices.tpl:361
 #, fuzzy
-msgid "Admins"
-msgstr "DN del administrador"
+msgid "Yes"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/class_servDNS.inc:181
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
-msgstr "Eliminar servicio DNS"
+#: plugins/admin/systems/glpi_devices.tpl:48
+#: plugins/admin/systems/glpi_devices.tpl:56
+#: plugins/admin/systems/glpi_devices.tpl:64
+#: plugins/admin/systems/glpi_devices.tpl:72
+#: plugins/admin/systems/glpi_devices.tpl:177
+#: plugins/admin/systems/glpi_devices.tpl:297
+#: plugins/admin/systems/glpi_devices.tpl:362
+#, fuzzy
+msgid "No"
+msgstr "ninguno"
 
-#: plugins/admin/systems/class_servDNS.inc:182
-#: plugins/admin/systems/class_inventory.inc:37
-msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+#: plugins/admin/systems/glpi_devices.tpl:52
+msgid "Integrated speakers"
 msgstr ""
-"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_servDNS.inc:184
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
-msgstr "Añadir servicio DNS"
-
-#: plugins/admin/systems/class_servDNS.inc:185
-#: plugins/admin/systems/class_inventory.inc:40
-msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+
+#: plugins/admin/systems/glpi_devices.tpl:60
+msgid "Sub-D"
 msgstr ""
-"Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_servDNS.inc:270
-#, php-format
-msgid ""
-"Can't delete the selected zone, because it is still in use by these entry/"
-"entries '%s'"
+#: plugins/admin/systems/glpi_devices.tpl:68
+msgid "BNC"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNS.inc:297
+#: plugins/admin/systems/glpi_devices.tpl:76
 #, fuzzy
-msgid "Reverse zone"
-msgstr "Referencias"
+msgid "Serial number"
+msgstr "Nombre de terminal"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:336
+#: plugins/admin/systems/glpi_devices.tpl:83
 #, fuzzy
-msgid "This zoneName is already in use"
-msgstr "El nombre especificado ya esta siendo usado"
+msgid "Additional serial number"
+msgstr "Numero de serie del certificado"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:339
+#: plugins/admin/systems/glpi_devices.tpl:97
 #, fuzzy
-msgid "This reverse zone is already in use"
-msgstr "El nombre especificado ya esta siendo usado"
+msgid "Add/Edit other device"
+msgstr "Tarjeta Sonido"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:344
-msgid "Primary dns server must end with '.' to be a valid entry."
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:348
-msgid "Your specified mail address must end with '.' to be a valid record."
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
-#: plugins/admin/systems/class_servDNSeditZone.inc:356
-msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+#: plugins/admin/systems/glpi_devices.tpl:181
+#, fuzzy
+msgid "Power"
+msgstr "Puerto"
+
+#: plugins/admin/systems/glpi_devices.tpl:193
+msgid "Add/Edit graphic card"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:360
-msgid "Only lowercase strings are allowed as zone name."
+#: plugins/admin/systems/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:364
+#: plugins/admin/systems/glpi_devices.tpl:237
 #, fuzzy
-msgid "Please specify a numeric value for serial number."
-msgstr "Por favor especifique un usuario valido."
+msgid "Ram"
+msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:368
+#: plugins/admin/systems/glpi_devices.tpl:249
 #, fuzzy
-msgid "Please specify a numeric value for refresh."
-msgstr "Por favor especifique un usuario valido."
+msgid "Add/Edit controller"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:372
-#, fuzzy
-msgid "Please specify a numeric value for ttl."
-msgstr "Por favor especifique un usuario valido."
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
+msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:376
+#: plugins/admin/systems/glpi_devices.tpl:342
 #, fuzzy
-msgid "Please specify a numeric value for expire."
-msgstr "Por favor especifique un usuario valido."
+msgid "Speed"
+msgstr "Sexo"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:380
+#: plugins/admin/systems/glpi_devices.tpl:358
 #, fuzzy
-msgid "Please specify a numeric value for retry."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/systems/servdb.tpl:6
-msgid "Kerberos kadmin access"
-msgstr "Acceso a Kerberos kadmin"
-
-#: plugins/admin/systems/servdb.tpl:10
-msgid "Kerberos Realm"
-msgstr "Dominio Kerberos"
+msgid "Writeable"
+msgstr "escribir"
 
-#: plugins/admin/systems/servdb.tpl:14 plugins/admin/systems/servdb.tpl:82
-msgid "Admin user"
-msgstr "Usuario administrador"
+#: plugins/admin/systems/glpi_devices.tpl:371
+#, fuzzy
+msgid "Add/Edit harddisk"
+msgstr "Servidor"
 
-#: plugins/admin/systems/servdb.tpl:26
-msgid "FAX database"
-msgstr "Base de datos de FAX"
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
+msgstr ""
 
-#: plugins/admin/systems/servdb.tpl:30
-msgid "FAX DB user"
-msgstr "Base de datos de usuarios de FAX"
+#: plugins/admin/systems/glpi_devices.tpl:413
+#, fuzzy
+msgid "Cache"
+msgstr "Cancelar"
 
-#: plugins/admin/systems/servdb.tpl:42
-msgid "Asterisk management"
-msgstr "Gestión de Asterisk PBX"
+#: plugins/admin/systems/glpi_devices.tpl:443
+#, fuzzy
+msgid "Add/Edit memory"
+msgstr "Editar entrada"
 
-#: plugins/admin/systems/servdb.tpl:46
-msgid "Asterisk DB user"
-msgstr "Base de datos de usuarios Asterisk"
+#: plugins/admin/systems/glpi_devices.tpl:478
+#, fuzzy
+msgid "Frequenz"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/servdb.tpl:54
-msgid "Country dial prefix"
-msgstr "Prefijo de marcado nacional"
+#: plugins/admin/systems/glpi_devices.tpl:507
+#, fuzzy
+msgid "Add/Edit sound card"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/servdb.tpl:58
-msgid "Local dial prefix"
-msgstr "Prefijo de marcado local"
+#: plugins/admin/systems/glpi_devices.tpl:553
+#, fuzzy
+msgid "Add/Edit network interface"
+msgstr "Impresora de Red"
 
-#: plugins/admin/systems/servdb.tpl:70
-msgid "IMAP admin access"
-msgstr "Acceso administrador imap"
+#: plugins/admin/systems/glpi_devices.tpl:589
+#, fuzzy
+msgid "MAC address"
+msgstr "Dirección MAC"
 
-#: plugins/admin/systems/servdb.tpl:74
-msgid "Server identifier"
-msgstr "Identificador de servidor"
+#: plugins/admin/systems/glpi_devices.tpl:607
+#, fuzzy
+msgid "Add/Edit processor"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/servdb.tpl:78
-msgid "Connect URL"
-msgstr "Conectar a la URL"
+#: plugins/admin/systems/glpi_devices.tpl:642
+#, fuzzy
+msgid "Frequence"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/servdb.tpl:91
-msgid "Sieve port"
-msgstr "Puerto de Sieve"
+#: plugins/admin/systems/glpi_devices.tpl:649
+#, fuzzy
+msgid "Default frequence"
+msgstr "Valor por defecto"
 
-#: plugins/admin/systems/servdb.tpl:100
-msgid "Logging database"
-msgstr "Base de datos de Logs"
+#: plugins/admin/systems/glpi_devices.tpl:661
+#, fuzzy
+msgid "Add/Edit motherboard"
+msgstr "Teclado"
 
-#: plugins/admin/systems/servdb.tpl:104 plugins/admin/systems/servdb.tpl:123
-msgid "Logging DB user"
-msgstr "Base de datos de acceso de usuarios"
+#: plugins/admin/systems/glpi_devices.tpl:696
+#, fuzzy
+msgid "Chipset"
+msgstr "Borrar"
 
-#: plugins/admin/systems/servdb.tpl:119
+#: plugins/admin/systems/glpi_devices.tpl:707
 #, fuzzy
-msgid "Glpi database"
-msgstr "Base de datos de FAX"
+msgid "Add/Edit computer case"
+msgstr "incompleto"
 
-#: plugins/admin/systems/servdb.tpl:133
+#: plugins/admin/systems/glpi_devices.tpl:742
 #, fuzzy
-msgid "Database"
-msgstr "Bases de datos"
+msgid "format"
+msgstr "Puerto"
 
-#: plugins/admin/systems/class_printGeneric.inc:177
-#: plugins/admin/systems/class_printGeneric.inc:184
-#: plugins/admin/systems/class_printGeneric.inc:219
-#: plugins/admin/systems/class_printGeneric.inc:240
-#: plugins/admin/systems/class_printGeneric.inc:243
-msgid "Add printer extension"
-msgstr ""
+#: plugins/admin/systems/terminalStartup.tpl:35
+msgid "Select if terminal supports graphical startup with progress bar"
+msgstr "Seleccione si el terminal soporta inicio gráfico con barra de progreso"
 
-#: plugins/admin/systems/class_printGeneric.inc:178
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "Usar arranque gráfico"
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-msgid "This is a terminal template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/terminalStartup.tpl:38
+msgid "Select if terminal should boot in text mode"
+msgstr "Seleccione si el terminal debería arrancar en modo texto"
 
-#: plugins/admin/systems/class_printGeneric.inc:220
-#, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can't enable it while "
-"'cn' is not present in entry. Possibly you are currently creating a new "
-"terminal template"
+#: plugins/admin/systems/terminalStartup.tpl:39
+msgid "use standard linux textual bootup"
+msgstr "Usar arranque en modo texto"
+
+#: plugins/admin/systems/terminalStartup.tpl:41
+msgid "Select to get more verbose output during startup"
 msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+"Seleccione para obtener una información mas prolija durante el arranque"
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:235
-#, fuzzy
-msgid "Remove printer extension"
-msgstr "Eliminar extensión Kolab"
+#: plugins/admin/systems/terminalStartup.tpl:42
+msgid "use debug mode for startup"
+msgstr "Usar el modo de depuración durante el arranque"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
-#, fuzzy
-msgid ""
-"This workstation has printer extension enabled.You can disable it by "
-"clicking below."
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:236
-#, fuzzy
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
 msgid ""
-"This terminal has printer extension enabled. You can disable it by clicking "
-"below."
+"This dialog allows you to create new types of cartridges, and select one or "
+"more types for your printer. Cartridge types depends on the printer type you "
+"have selected. For each selected cartridge type there will be a new "
+"cartridge created, this allows you to select the same cartridge type for "
+"more then one printer."
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
 #, fuzzy
-msgid ""
-"This workstation has printer extension disabled. You can enable it by "
-"clicking below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+msgid "Display cartridge types matching"
+msgstr "Mostrar números que concuerdan con"
 
-#: plugins/admin/systems/class_printGeneric.inc:244
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
 #, fuzzy
-msgid ""
-"This terminal has printer extension disabled. You can enable it by clicking "
-"below."
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
-
-#: plugins/admin/systems/class_printGeneric.inc:283
-msgid "This 'dn' has no printer features."
-msgstr "Esta 'dn' no tiene características de impresora."
+msgid "Regular expression for matching cartridge types"
+msgstr "Expresiones regulares que concuerden con direcciones"
 
-#: plugins/admin/systems/class_printGeneric.inc:419
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
 #, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
+msgid "Selected vendor '%s' does not exists in our list of ppds."
 msgstr ""
 
-#: plugins/admin/systems/class_printGeneric.inc:427
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
 #, fuzzy
-msgid "can't get ppd informations."
-msgstr "Información de sistema"
+msgid "Printer ppd selection."
+msgstr "Configuración telefónica"
 
-#: plugins/admin/systems/class_printGeneric.inc:439
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: plugins/admin/systems/class_printGeneric.inc:441
-#, php-format
-msgid "This printer belongs to workstation %s. You can't rename this printer."
-msgstr ""
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr "Método de conexión"
 
-#: plugins/admin/systems/class_printGeneric.inc:519
-msgid "You have no permissions to create a printer on this 'Base'."
-msgstr "No tiene permisos para crear una impresora en esta 'Base'."
+#: plugins/admin/systems/terminalService.tpl:147
+msgid "Choose method to connect to terminal server"
+msgstr "Elija el método de conexión con el servidor de terminal"
 
-#: plugins/admin/systems/servkolab.tpl:14
-msgid "POP3 service"
-msgstr "Servicio POP3"
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/servkolab.tpl:22
-msgid "POP3/SSL service"
-msgstr "Servicio POP3/SSL"
+#: plugins/admin/systems/terminalService.tpl:156
+msgid "Select specific terminal server to use"
+msgstr "Seleccione específicamente que servidor de terminal usará"
 
-#: plugins/admin/systems/servkolab.tpl:30
-msgid "IMAP service"
-msgstr "Servicio IMAP"
+#: plugins/admin/systems/terminalService.tpl:163
+msgid "Font server"
+msgstr "Servidor de fuentes"
 
-#: plugins/admin/systems/servkolab.tpl:38
-msgid "IMAP/SSL service"
-msgstr "Servicio IMAP/SSL"
+#: plugins/admin/systems/terminalService.tpl:165
+msgid "Select specific font server to use"
+msgstr "Seleccione específicamente que servidor de fuentes usará"
 
-#: plugins/admin/systems/servkolab.tpl:46
-msgid "Sieve service"
-msgstr "Servicio Sieve"
+#: plugins/admin/systems/terminalService.tpl:181
+msgid "Print device"
+msgstr "Dispositivo de Impresión"
 
-#: plugins/admin/systems/servkolab.tpl:54
-msgid "FTP FreeBusy service (legacy, not interoperable with Kolab2 FreeBusy)"
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
 msgstr ""
-"Servicio de presencia de FTP (propio, no tiene interacción con el servicio "
-"de presencia de Kolab2)"
+"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
+"terminal"
 
-#: plugins/admin/systems/servkolab.tpl:62
-msgid "HTTP FreeBusy service (legacy)"
-msgstr "Servicio de presencia HTTP (propio)"
+#: plugins/admin/systems/terminalService.tpl:183
+msgid "Provide print services"
+msgstr "Proveer servicios de impresión"
 
-#: plugins/admin/systems/servkolab.tpl:70
-msgid "Amavis email scanning (virus/spam)"
-msgstr "Desinfectado de correo Amavis (virus/spam)"
+#: plugins/admin/systems/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Servidor de Cola"
 
-#: plugins/admin/systems/servkolab.tpl:81
-msgid "Quota settings"
-msgstr "Parámetros de quotas"
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
+msgstr ""
+"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
 
-#: plugins/admin/systems/servkolab.tpl:97
-msgid "Free/Busy settings"
-msgstr "Parámetros de Presencia"
+#: plugins/admin/systems/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Seleccione que controladores de escáner se usaran"
 
-#: plugins/admin/systems/servkolab.tpl:102
-msgid "Allow unauthenticated downloading of Free/Busy information"
-msgstr "Permite descarga no autentificada de información de presencia."
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+#, fuzzy
+msgid "Attachment"
+msgstr "Argumentos"
 
-#: plugins/admin/systems/servkolab.tpl:117
-msgid "SMTP privileged networks"
-msgstr "Redes privilegiadas SMTP"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+#, fuzzy
+msgid "Filename"
+msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/servkolab.tpl:122
-msgid "Hosts/networks allowed to relay"
-msgstr "Equipos/Redes que son permitidos para hacer relay"
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+#, fuzzy
+msgid "Mime-type"
+msgstr "Tipo"
 
-#: plugins/admin/systems/servkolab.tpl:125
-msgid "Enter multiple values, seperated with"
+#: plugins/admin/systems/remove_glpi.tpl:10
+#, fuzzy
+msgid ""
+"Best thing to do before performing this action would be to save the current "
+"contents of your MySql database in a file. So - if you've done so - press "
+"'Delete' to continue or 'Cancel' to abort."
 msgstr ""
+"La mejor opción antes de ejecutar esta acción es haber grabado el contenido "
+"actual de su árbol LDAP en un fichero. Entonces - Y solo si lo ha hecho - "
+"presione <i>Eliminar</i> para continuar o <i>Cancelar</i> para abortar."
 
-#: plugins/admin/systems/servkolab.tpl:138
-msgid "SMTP smarthost/relayhost"
-msgstr "SMTP smarthost/relayhos"
+#: plugins/admin/systems/class_workstationGeneric.inc:120
+#, fuzzy
+msgid "No ACTIONCMD definition found in your gosa.conf"
+msgstr "No se ha encontrado ninguna definición de 'HALTCMD' en 'gosa.conf'"
 
-#: plugins/admin/systems/servkolab.tpl:144
-msgid "Enable MX lookup for relayhost"
-msgstr "Permitir búsquedas MX para los relayhost"
+#: plugins/admin/systems/class_workstationGeneric.inc:134
+msgid "This 'dn' has no workstation features."
+msgstr "Esta 'dn' no tiene características de estación de trabajo."
 
-#: plugins/admin/systems/servkolab.tpl:149
-msgid "Host used to relay mails"
-msgstr "Equipo usado para reenviar correos"
+#: plugins/admin/systems/class_workstationGeneric.inc:276
+msgid "You have no permissions to create a workstation on this 'Base'."
+msgstr "No tiene permisos para crear una estación de trabajo en esta 'Base'."
 
-#: plugins/admin/systems/servkolab.tpl:163
-msgid "Accept Internet Mail"
-msgstr "Aceptar correo desde internet"
+#: plugins/admin/systems/class_workstationGeneric.inc:280
+msgid "The required field 'Workstation name' is not set."
+msgstr ""
+" El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
 
-#: plugins/admin/systems/servkolab.tpl:169
-msgid "Accept mail from other domains over non-authenticated SMTP"
+#: plugins/admin/systems/class_workstationGeneric.inc:303
+#: plugins/admin/systems/class_terminalGeneric.inc:348
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
 msgstr ""
-"Aceptar correo desde otros dominios que usen ninguna autentificación SMTP"
 
-#: plugins/admin/systems/phonesettings.tpl:1
+#: plugins/admin/systems/class_terminalGeneric.inc:88
+msgid "text"
+msgstr "texto"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:89
+msgid "graphic"
+msgstr "Gráfico"
+
+#: plugins/admin/systems/class_terminalGeneric.inc:321
+msgid "You have no permissions to create a terminal on this 'Base'."
+msgstr "No tiene permisos para crear un terminal en esta 'Base'."
+
+#: plugins/admin/systems/class_terminalGeneric.inc:325
+msgid "The required field 'Terminal name' is not set."
+msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
+
+#: plugins/admin/systems/glpiManufacturer.tpl:1
 #, fuzzy
-msgid "Advanced phone settings"
-msgstr "Configuración telefónica"
+msgid "Manage manufacturers"
+msgstr "Editar entrada"
 
-#: plugins/admin/systems/phonesettings.tpl:6
+#: plugins/admin/systems/servdnseditzone.tpl:7
 #, fuzzy
-msgid "Phone type"
+msgid "Zone name"
 msgstr "Número de teléfono"
 
-#: plugins/admin/systems/phonesettings.tpl:7
-#: plugins/admin/systems/phonesettings.tpl:25
-#: plugins/admin/systems/phonesettings.tpl:35
-#: plugins/admin/systems/phonesettings.tpl:49
-#: plugins/admin/systems/phonesettings.tpl:78
-#: plugins/admin/systems/phonesettings.tpl:109
-#: plugins/admin/systems/phonesettings.tpl:156
+#: plugins/admin/systems/servdnseditzone.tpl:13
 #, fuzzy
-msgid "Choose a phone type"
-msgstr "Elija tipo de ratón"
+msgid "Network address"
+msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/phonesettings.tpl:10
-msgid "refresh"
+#: plugins/admin/systems/servdnseditzone.tpl:24
+#, fuzzy
+msgid "Zone entries"
+msgstr "Configuración telefónica"
+
+#: plugins/admin/systems/servdnseditzone.tpl:27
+msgid "Can't be edited because the zone wasn't saved right now."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:32
+#: plugins/admin/systems/servdnseditzone.tpl:39
 #, fuzzy
-msgid "DTMF mode"
-msgstr "Modo"
+msgid "SOA record"
+msgstr "Directorio"
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
+#: plugins/admin/systems/servdnseditzone.tpl:45
 #, fuzzy
-msgid "Default IP"
-msgstr "por defecto"
+msgid "Primary dns server for this zone"
+msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
 
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
+#: plugins/admin/systems/servdnseditzone.tpl:57
+msgid "Serial number (automatically incremented)"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:75
+#: plugins/admin/systems/servdnseditzone.tpl:73
+#: plugins/admin/ogroups/phonequeue.tpl:54
+#: ihtml/themes/altlinux/setup_finish.tpl:31
+#: ihtml/themes/default/setup_finish.tpl:31
+msgid "Retry"
+msgstr "Reintentar"
+
+#: plugins/admin/systems/servdnseditzone.tpl:79
 #, fuzzy
-msgid "Modus"
-msgstr "Ratón"
+msgid "Expire"
+msgstr "Exportar"
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
-msgstr ""
+#: plugins/admin/systems/servdnseditzone.tpl:100
+#, fuzzy
+msgid "MxRecords"
+msgstr "Directorio"
 
-#: plugins/admin/systems/phonesettings.tpl:116
+#: plugins/admin/systems/servdnseditzone.tpl:112
 #, fuzzy
-msgid "Secret"
-msgstr "Calle"
+msgid "Zone records"
+msgstr "Directorio"
 
-#: plugins/admin/systems/phonesettings.tpl:124
-msgid "GoFonInkeys"
+#: plugins/admin/systems/class_servDNSeditZone.inc:351
+#, fuzzy
+msgid "This zoneName is already in use"
+msgstr "El nombre especificado ya esta siendo usado"
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:354
+#, fuzzy
+msgid "This reverse zone is already in use"
+msgstr "El nombre especificado ya esta siendo usado"
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:359
+msgid "Primary dns server must end with '.' to be a valid entry."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:132
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/class_servDNSeditZone.inc:363
+msgid "Your specified mail address must end with '.' to be a valid record."
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
+#: plugins/admin/systems/class_servDNSeditZone.inc:367
+#: plugins/admin/systems/class_servDNSeditZone.inc:371
+msgid ""
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:375
+msgid "Only lowercase strings are allowed as zone name."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:379
 #, fuzzy
-msgid "Account code"
-msgstr "Cuenta"
+msgid "Please specify a numeric value for serial number."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/phonesettings.tpl:153
+#: plugins/admin/systems/class_servDNSeditZone.inc:383
 #, fuzzy
-msgid "Trunk lines"
-msgstr "Clientes Ligeros"
+msgid "Please specify a numeric value for refresh."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
+#, fuzzy
+msgid "Please specify a numeric value for ttl."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/phonesettings.tpl:168
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
 #, fuzzy
-msgid "Hosts that are allowed to connect"
-msgstr "Equipos/Redes que son permitidos para hacer relay"
+msgid "Please specify a numeric value for expire."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/phonesettings.tpl:183
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
 #, fuzzy
-msgid "Hosts that are not allowed to connect"
-msgstr "¡No tiene permisos para eliminar este componente!"
+msgid "Please specify a numeric value for retry."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
+#: plugins/admin/systems/class_servDNSeditZone.inc:401
+#: plugins/admin/systems/class_termDNS.inc:331
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Nombre de la maquina"
-
-#: plugins/admin/systems/remove.tpl:6
-msgid ""
-"This includes <b>all</b> system and setup informations. Please double check "
-"if your really want to do this since there is no way for GOsa to get your "
-"data back."
+#: plugins/admin/systems/class_printerPPDDialog.inc:67
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
 msgstr ""
-"Esto incluye <b>toda</b> la información de configuración y de sistema. Por "
-"favor pulse dos veces si realmente quiere hacer esto, ya que una vez hecho "
-"esto, no hay forma de que GOsa recupere la información."
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:73
-#, fuzzy, php-format
-msgid "You're about to delete the glpi attachment component '%s'."
-msgstr "Va ha eliminar la aplicación '%s'."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:112
+#: plugins/admin/systems/class_printerPPDDialog.inc:108
 #, php-format
 msgid ""
-"You can't delete this attachment, it is still in use by these system(s) '%s'"
+"The specified PPD_PATH='%s' in your gosa.conf is invalid, can't read any ppd "
+"informations."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:124
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:128
-#, fuzzy
-msgid "There is no valid file uploaded."
-msgstr "No se ha subido ningún archivo."
-
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
+#: plugins/admin/systems/class_printerPPDDialog.inc:109
 #, fuzzy
-msgid "Upload wasn't successfull."
-msgstr "Exportación completada"
+msgid "Can't get ppd informations."
+msgstr "Información genérica del usuario"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
+#: plugins/admin/systems/class_printerPPDDialog.inc:125
+#, php-format
+msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:138
-#, fuzzy
-msgid "There is already a file with the same name uploaded."
+#: plugins/admin/systems/class_printerPPDDialog.inc:138
+#, fuzzy, php-format
+msgid "There is already a ppd file for this kind of printer."
 msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
+#: plugins/admin/systems/class_printerPPDDialog.inc:146
 #, fuzzy, php-format
-msgid "Can't create file '%s'."
+msgid "Can't save file '%s'."
 msgstr "Borrar"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
-msgid "File is available."
-msgstr ""
+#: plugins/admin/systems/class_printerPPDDialog.inc:163
+#: plugins/admin/systems/class_printerPPDDialog.inc:166
+#, fuzzy
+msgid "Please specify a valid ppd file."
+msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
-msgid "File is not readable, possibly the file is missing."
-msgstr ""
+#: plugins/admin/systems/class_printerPPDDialog.inc:190
+#, fuzzy
+msgid "Please select a valid ppd."
+msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:191
+#: plugins/admin/systems/class_printerPPDDialog.inc:369
+#: plugins/admin/systems/class_printerPPDDialog.inc:372
 #, fuzzy
-msgid "Currently no file uploaded."
-msgstr "No se ha subido ningún archivo."
+msgid "True"
+msgstr "Futuro"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:202
+#: plugins/admin/systems/class_printerPPDDialog.inc:370
+#: plugins/admin/systems/class_printerPPDDialog.inc:373
 #, fuzzy
-msgid "Mime"
-msgstr "Teléfono Móvil"
+msgid "False"
+msgstr "mujer"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
-msgid "This table displays all available attachments."
+#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#, php-format
+msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
-#, fuzzy
-msgid "empty"
-msgstr "Plantilla"
+#: plugins/admin/systems/class_servNfs.inc:45
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+#: plugins/admin/systems/class_servNfs.inc:48
 #, fuzzy
-msgid "Create new attachment"
-msgstr "Nombre del departamento"
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr "Borrar"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+#: plugins/admin/systems/class_servNfs.inc:183
 #, fuzzy
-msgid "New Attachment"
-msgstr "Argumentos"
+msgid "Please specify a valid path for your setup."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:352
+#: plugins/admin/systems/class_servNfs.inc:189
 #, fuzzy
-msgid "Please specify a valid name for this attachment."
+msgid "Please specify a valid name for your setup."
 msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/headpage.tpl:6
-msgid "List of systems"
-msgstr "Lista de sistemas"
-
-#: plugins/admin/systems/headpage.tpl:24
-msgid ""
-"This menu allows you to add, remove and change the properties of specific "
-"systems. You can only add systems which have already been started once."
-msgstr ""
-"Este menú permite añadir, modificar o eliminar las propiedades de sistemas "
-"específicos. Solo puede añadir sistemas que han sido ya iniciados alguna vez."
+#: plugins/admin/systems/class_servNfs.inc:192
+#, fuzzy
+msgid "Please specify a name for your setup."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Mostrar servidores"
+#: plugins/admin/systems/class_servNfs.inc:197
+#, fuzzy
+msgid "Description contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Seleccione para ver los terminales Linux"
+#: plugins/admin/systems/class_servNfs.inc:201
+#, fuzzy
+msgid "Path contains invalid characters."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Mostrar terminales"
+#: plugins/admin/systems/class_servNfs.inc:205
+#, fuzzy
+msgid "Option contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Seleccione para ver las estaciones de trabajo Linux"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:93
+#, php-format
+msgid "Internal Error can't create device of type '%s'"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:113
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:115
+#, fuzzy, php-format
+msgid "You're about to delete the glpi device '%s'."
+msgstr "Está a punto de borrar el grupo '%s'."
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Select to see MicroSoft Windows based workstations"
-msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:117
+msgid "Can't detect object name."
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Mostrara estaciones de trabajo basadas en windows"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:138
+#, php-format
+msgid ""
+"You can't delete this device, it is still in use by these system(s) '%s'"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Seleccione para ver impresoras de red"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:187
+#, fuzzy
+msgid "devices"
+msgstr "Servicios"
 
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Mostrar impresoras de red"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:227
+#, fuzzy
+msgid "New mainbord"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Seleccione para ver teléfonos VOIP"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+#, fuzzy
+msgid "New processor"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Mostrar teléfonos"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+#, fuzzy
+msgid "New case"
+msgstr "usuarios"
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Seleccione para ver los dispositivos de red"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:231
+msgid "C"
+msgstr ""
 
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Mostrar dispositivos de Red"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#, fuzzy
+msgid "New network interface"
+msgstr "Impresora de Red"
 
-#: plugins/admin/systems/headpage.tpl:52
-msgid "Regular expression for matching system names"
-msgstr "Expresiones regulares para encontrar nombres de sistemas"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:233
+#, fuzzy
+msgid "NI"
+msgstr "UNIX"
 
-#: plugins/admin/systems/headpage.tpl:59
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
 #, fuzzy
-msgid "Display systems of user"
-msgstr "Mostrar direcciones del usuario"
+msgid "New ram"
+msgstr "usuarios"
 
-#: plugins/admin/systems/headpage.tpl:62
-msgid "User name of which terminal(s) are shown"
-msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:235
+msgid "R"
+msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:6
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
 #, fuzzy
-msgid "List of attachments"
-msgstr "Lista de Departamentos"
+msgid "New hard disk"
+msgstr "Servidor"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:23
-msgid ""
-"This dialog allow you to attach additional objects (like manuals, guides, "
-"etc.)  to your currently edited computer."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:237
+msgid "HDD"
 msgstr ""
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:35
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
 #, fuzzy
-msgid "Display attachments matching"
-msgstr "Mostrar Departamentos que concuerden con"
+msgid "New drive"
+msgstr "Servidor"
 
-#: plugins/admin/systems/glpiAttachmentPool.tpl:37
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:239
 #, fuzzy
-msgid "Regular expression for matching attachment names"
-msgstr "Expresiones regulares para encontrar nombres de departamentos"
+msgid "D"
+msgstr "UID"
 
-#: plugins/admin/systems/password.tpl:2
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
 #, fuzzy
-msgid ""
-"To change the terminal root password use the fields below. The changes take "
-"effect during the next reboot. Please memorize the new password, because you "
-"wouldn't be able to log in."
+msgid "New controller"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:241
+msgid "CS"
 msgstr ""
-"Para cambiar la contraseña del usuario use los campos a continuación. Los "
-"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
-"contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "New graphics card"
 msgstr ""
 
-#: plugins/admin/systems/password.tpl:9
-msgid "Changing the password impinges on authentification only."
-msgstr "Cambiar la contraseña afecta solamente a la autenticación."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:243
+msgid "GC"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:1
-msgid "Choose the kind of system component you want to create"
-msgstr "Elija el tipo de componente del sistema que desea crear"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+#, fuzzy
+msgid "New sound card"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/chooser.tpl:4
-msgid ""
-"Linux terminals and workstations are autocreated on bootup. For this reason "
-"you're only be able to create templates for a specific tree. Servers are "
-"normally automatically added too, but in some special cases you may need to "
-"create a faked server entry to provide GOsa with some informations. Other "
-"network components may be used for Nagios setups to create component "
-"dependencies."
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:245
+msgid "SC"
 msgstr ""
-"Terminales linux y estaciones de trabajo son autocreadas en el inicio. Por "
-"esta razón solo se pueden crear plantillas para un árbol específico. "
-"Normalmente los servidores son añadidos también automáticamente, pero en "
-"algunos casos especiales, puede necesitar crear un servidor virtual para "
-"proveer de cierta información a GOsa. Otros componentes de red pueden ser "
-"usados para que la configuración de 'Nagios' creen las dependencias de "
-"componentes."
 
-#: plugins/admin/systems/chooser.tpl:7
-msgid "Linux thin client template"
-msgstr "Plantilla de clientes ligeros Linux"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "New power supply"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Plantilla de estaciones de trabajo linux"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:247
+msgid "PS"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Servidor Linux"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+#, fuzzy
+msgid "New misc device"
+msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Estación de trabajo Windows"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:249
+msgid "OC"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
-msgstr "Impresora de Red"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:347
+#, fuzzy
+msgid "You have to specify a valid name for this device."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Otros componentes de red"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:367
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:370
+#, fuzzy
+msgid "This device name is already in use."
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Crear"
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
+#, fuzzy
+msgid "Other"
+msgstr "Filtros"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
-#, php-format
+#: plugins/admin/systems/class_workstationStartup.inc:225
+msgid "inherited"
+msgstr ""
+
+#: plugins/admin/systems/class_workstationStartup.inc:336
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
+#: plugins/admin/systems/class_workstationStartup.inc:381
 #, fuzzy
-msgid "Please specify a name."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgid "Please select a 'FAI server' or remove the 'FAI classes'."
+msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
+#: plugins/admin/systems/class_workstationStartup.inc:439
 #, fuzzy
-msgid "Specified name is already in use, please choose another one."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+msgid ""
+"There is already a profile in your selection that contain partition table "
+"configurations."
+msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:105
-msgid "This 'dn' has no phone features."
-msgstr "Esta 'dn' no tiene características de teléfono."
+#: plugins/admin/systems/class_workstationStartup.inc:758
+#, php-format
+msgid ""
+"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
+"Server was reset to 'auto'."
+msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "yes"
-msgstr "Sistemas"
+#: plugins/admin/systems/class_workstationStartup.inc:769
+#, php-format
+msgid ""
+"Can't resolve the given FAIclass(es) [%s] anyway, please check your FAI "
+"configurations, possibly some classes where deleted or renamed. !All classes "
+"have been removed from this account, press cancel if you don't want this to "
+"be saved."
+msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+#: plugins/admin/systems/class_termDNS.inc:264
 #, fuzzy
-msgid "no"
-msgstr "ninguno"
+msgid "The required field 'IP-address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "dynamic"
+#: plugins/admin/systems/class_termDNS.inc:271
+msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:223
+#: plugins/admin/systems/class_termDNS.inc:278
 #, fuzzy
-msgid "Networksettings"
-msgstr "Configuración de red"
+msgid "The required field 'MAC-address' is not set."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
+
+#: plugins/admin/systems/class_termDNS.inc:285
+msgid ""
+"The given macaddress is invalid. There must be 6 2byte segments seperated by "
+"':'."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:305
+#, php-format
+msgid "Found duplicate value for record type '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_termDNS.inc:313
+#, php-format
+msgid "Found more than one entry for the uniqe record type '%s'."
+msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:238
+#: plugins/admin/systems/class_termDNS.inc:324
 #, php-format
 msgid ""
-"Can't delete because there are user which are depending on this phone. One "
-"of them is user '%s'."
+"The device IP '%s' is added as 'A Record', this will be done automatically, "
+"please remove the record."
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:294
-#, fuzzy
-msgid "The required field 'Phone name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+#: plugins/admin/systems/class_printGeneric.inc:98
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
+msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:297
-msgid "The 'Phone name' '0' is reserved and cannot be used."
+#: plugins/admin/systems/class_printGeneric.inc:229
+#: plugins/admin/systems/class_printGeneric.inc:237
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:281
+#: plugins/admin/systems/class_printGeneric.inc:297
+#: plugins/admin/systems/class_printGeneric.inc:300
+msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/class_phoneGeneric.inc:304
-msgid "You have no permissions to create a phone on this 'Base'."
-msgstr "No tiene permisos para crear un teléfono en esta 'Base'."
+#: plugins/admin/systems/class_printGeneric.inc:230
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construcktion."
+msgstr ""
 
-#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:74
-#, fuzzy
-msgid "Printer ppd selection."
-msgstr "Configuración telefónica"
+#: plugins/admin/systems/class_printGeneric.inc:238
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-#, fuzzy
-msgid "Select entries to add"
-msgstr "Seleccione usuarios que serán añadidos"
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-#, fuzzy
-msgid "Display members of department"
-msgstr "Mostrar número de Departamentos"
+#: plugins/admin/systems/class_printGeneric.inc:274
+msgid "This 'dn' has no printer features."
+msgstr "Esta 'dn' no tiene características de impresora."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+#: plugins/admin/systems/class_printGeneric.inc:282
 #, fuzzy
-msgid "Display members matching"
-msgstr "Mostrar números que concuerdan con"
+msgid ""
+"This object has printer extension disabled. You can't enable it while 'cn' "
+"is not present in entry. Possibly you are currently creating a new terminal "
+"template"
+msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+#: plugins/admin/systems/class_printGeneric.inc:289
+#: plugins/admin/systems/class_printGeneric.inc:292
 #, fuzzy
-msgid "Regular expression for matching member names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+msgid "Remove printer extension"
+msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/SelectDeviceType.tpl:3
+#: plugins/admin/systems/class_printGeneric.inc:290
+#, fuzzy
 msgid ""
-"This is a new system which currently has no system type defined. Please "
-"choose a system type for this entry, the depending dialog will be shown if "
-"you press 'save'. If this system should be added to an objectGroup, specify "
-"the objectgroup name and this system will be added automatically."
+"This workstation has printer extension enabled.You can disable it by "
+"clicking below."
 msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
+#: plugins/admin/systems/class_printGeneric.inc:293
+#, fuzzy
+msgid ""
+"This terminal has printer extension enabled. You can disable it by clicking "
+"below."
 msgstr ""
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/SelectDeviceType.tpl:21
+#: plugins/admin/systems/class_printGeneric.inc:298
 #, fuzzy
-msgid "Choose a system type"
-msgstr "Elija tipo de ratón"
-
-#: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
+msgid ""
+"This workstation has printer extension disabled. You can enable it by "
+"clicking below."
 msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/SelectDeviceType.tpl:33
+#: plugins/admin/systems/class_printGeneric.inc:301
 #, fuzzy
-msgid "Choose a object group"
-msgstr "Grupo de objetos"
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:232
-#, php-format
-msgid "Settings for free host entry # %s"
+msgid ""
+"This terminal has printer extension disabled. You can enable it by clicking "
+"below."
 msgstr ""
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:234
+#: plugins/admin/systems/class_printGeneric.inc:473
 #, php-format
-msgid "Settings for '%s'"
+msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:401
-#, fuzzy, php-format
-msgid ""
-"The name '%s' can't be used as free hand entry, the name is already used in "
-"this ldap tree."
-msgstr "Una persona con el nombre elegido ya existe en el árbol"
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:408
-#, fuzzy, php-format
-msgid "Entry name '%s' contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+#: plugins/admin/systems/class_printGeneric.inc:481
+#, fuzzy
+msgid "can't get ppd informations."
+msgstr "Información de sistema"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:420
+#: plugins/admin/systems/class_printGeneric.inc:494
 #, php-format
-msgid "Can't rename the server '%s' to '%s', the server contains this zone."
+msgid "This printer belongs to terminal %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:432
-#, fuzzy, php-format
-msgid "Can't rename '%s' to '%s',the destination name already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:436
-#, fuzzy, php-format
-msgid ""
-"Can't rename '%s' to '%s',the destination name contains invalid characters."
-msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
-
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:450
+#: plugins/admin/systems/class_printGeneric.inc:496
 #, php-format
-msgid "The record type '%s' is a unique type and can't be defined twice."
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:461
-#, fuzzy, php-format
-msgid "There is an empty '%s' for host '%s'."
-msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
+#: plugins/admin/systems/SelectDeviceType.tpl:3
+msgid ""
+"This is a new system which currently has no system type defined. Please "
+"choose a system type for this entry and press the 'continue' button. If this "
+"system should be added to a group of system settings, specify the preferred "
+"object group below."
+msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:469
-#, php-format
-msgid "There is a duplicate entry in '%s' for '%s'."
+#: plugins/admin/systems/SelectDeviceType.tpl:9
+msgid ""
+"Please select a system type and an optional bundle of predefined settings to "
+"be inherited."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:23
+#: plugins/admin/systems/SelectDeviceType.tpl:21
 #, fuzzy
-msgid "Choose a base"
+msgid "Choose a system type"
 msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:34
-msgid ""
-"Step in the prefered tree and click save to use the current subtree as base. "
-"Or click the image at the end of each entry."
-msgstr ""
+#: plugins/admin/systems/SelectDeviceType.tpl:32
+#, fuzzy
+msgid "Inherit settings from this object group"
+msgstr "Descripción del grupo"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:51
-msgid "Filter entries with this syntax"
+#: plugins/admin/systems/SelectDeviceType.tpl:33
+#, fuzzy
+msgid "Choose an object group"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:115
-#, fuzzy, php-format
-msgid "Select this base"
-msgstr "Borrar"
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:306
+#, fuzzy
+msgid "The selected name is already in use."
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:1
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
 msgid ""
-"This dialog allows you to configure all components of this DNS zone on a "
-"single list."
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
 msgstr ""
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:2
-msgid ""
-"Be careful editing record types with this dialog. All changes will be saved "
-"immediately when using the save button."
-msgstr ""
+#: plugins/admin/systems/class_glpiManufacturer.inc:104
+#, fuzzy
+msgid "Please specify a name."
+msgstr "Por favor especifique un nombre de usuario valido."
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:113
+#: plugins/admin/systems/class_glpiManufacturer.inc:119
+#, fuzzy
+msgid "Specified name is already in use, please choose another one."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+
+#: plugins/admin/systems/class_divListSystem.inc:55
+#, fuzzy
+msgid "System / Department"
+msgstr "Departamento"
+
+#: plugins/admin/systems/class_divListSystem.inc:169
+#, fuzzy
+msgid "Set root       password"
+msgstr "Poner Contraseña"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:58
 #: plugins/admin/ogroups/tabs_ogroups.inc:150
@@ -10443,6 +10607,54 @@ msgstr ""
 msgid "Select action to execute for this   group of terminals"
 msgstr "Seleccione una acción que se ejecutara en este grupo de terminales"
 
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
+msgid "Object groups"
+msgstr "Grupos de objetos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:54
+msgid "UNIX accounts"
+msgstr "Cuentas UNIX"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
+#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
+#: html/getxls.php:245 html/getxls.php:316
+msgid "Servers"
+msgstr "Servidores"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:59
+msgid "Thin Clients"
+msgstr "Clientes Ligeros"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:60
+msgid "Workstations"
+msgstr "Estaciones de trabajo"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:287
+#, 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:293
+#: plugins/admin/ogroups/class_ogroupManagement.inc:319
+msgid "You are not allowed to delete this object group!"
+msgstr "¡No tiene permisos para eliminar este objeto grupo!"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:457
+#, fuzzy
+msgid "Create new object group"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:501
+#, fuzzy
+msgid "Name of object groups"
+msgstr "Nombre del grupo"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:550
+#: plugins/generic/references/class_reference.inc:50
+msgid "Object group"
+msgstr "Grupo de objetos"
+
 #: plugins/admin/ogroups/class_ogroup.inc:144
 msgid "This 'dn' is no object group."
 msgstr "Este 'dn' no es un objeto tipo grupo."
@@ -10492,66 +10704,19 @@ msgid "and"
 msgstr "y"
 
 #: plugins/admin/ogroups/class_ogroup.inc:508
-msgid "Non existing dn: "
+#, fuzzy
+msgid "Non existing dn:"
 msgstr "No existe 'dn':"
 
-#: plugins/admin/ogroups/class_ogroup.inc:648
+#: plugins/admin/ogroups/class_ogroup.inc:649
 #, fuzzy
 msgid "There is already an object with this cn."
 msgstr "Ya existe un usuario con este 'Login' en la base de datos."
 
-#: plugins/admin/ogroups/class_ogroup.inc:665
+#: plugins/admin/ogroups/class_ogroup.inc:666
 msgid "You can combine two different object types at maximum only!"
 msgstr "¡Solo se pueden combinar dos objetos diferentes hasta un máximo!"
 
-#: plugins/admin/ogroups/main.inc:34 plugins/admin/ogroups/main.inc:39
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
-msgid "Object groups"
-msgstr "Grupos de objetos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:54
-msgid "UNIX accounts"
-msgstr "Cuentas UNIX"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:58 html/getxls.php:149
-#: html/getxls.php:151 html/getxls.php:158 html/getxls.php:179
-#: html/getxls.php:245 html/getxls.php:316
-msgid "Servers"
-msgstr "Servidores"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:59
-msgid "Thin Clients"
-msgstr "Clientes Ligeros"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:60
-msgid "Workstations"
-msgstr "Estaciones de trabajo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:279
-#, 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:285
-#: plugins/admin/ogroups/class_ogroupManagement.inc:311
-msgid "You are not allowed to delete this object group!"
-msgstr "¡No tiene permisos para eliminar este objeto grupo!"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:449
-#, fuzzy
-msgid "Create new object group"
-msgstr "Grupo de objetos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:493
-#, fuzzy
-msgid "Name of object groups"
-msgstr "Nombre del grupo"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:542
-#: plugins/generic/references/class_reference.inc:50
-msgid "Object group"
-msgstr "Grupo de objetos"
-
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Nombre del grupo"
@@ -10629,75 +10794,75 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:199
+#: plugins/admin/ogroups/class_phonequeue.inc:201
 #, fuzzy
 msgid "Timeout must be numeric"
 msgstr "El puerto sieve necesita ser un numero."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:202
+#: plugins/admin/ogroups/class_phonequeue.inc:204
 msgid "Retry must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:205
+#: plugins/admin/ogroups/class_phonequeue.inc:207
 msgid "Max queue length must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:208
+#: plugins/admin/ogroups/class_phonequeue.inc:210
 msgid "Announce frequency must be numeric"
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:211
+#: plugins/admin/ogroups/class_phonequeue.inc:213
 msgid "There must be least one queue number defined."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:225
+#: plugins/admin/ogroups/class_phonequeue.inc:227
 msgid ""
 "There is currently no asterisk server defined. Your settings can't be saved."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:238
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:245
+#: plugins/admin/ogroups/class_phonequeue.inc:240
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:244
 #, php-format
 msgid ""
 "The MySQL server '%s' isn't reachable as user '%s', check GOsa log for mysql "
 "error."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:248
-#: plugins/admin/ogroups/class_phonequeue.inc:624
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:626
 #: plugins/gofon/macro/class_gofonMacro.inc:216
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:86
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:306
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1046
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:87
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1047
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:255
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:371
 #, fuzzy, php-format
 msgid "Can't select database %s on %s."
 msgstr "No puedo seleccionar la base de datos."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:279
-#: plugins/admin/ogroups/class_phonequeue.inc:493
-#: plugins/admin/ogroups/class_phonequeue.inc:660
+#: plugins/admin/ogroups/class_phonequeue.inc:281
+#: plugins/admin/ogroups/class_phonequeue.inc:495
+#: plugins/admin/ogroups/class_phonequeue.inc:662
 #, fuzzy, php-format
 msgid "Can't delete in Database %s, on Server %s."
 msgstr "No puedo seleccionar la base de datos."
 
-#: plugins/admin/ogroups/class_phonequeue.inc:523
 #: plugins/admin/ogroups/class_phonequeue.inc:525
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1147
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1149
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:412
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:414
+#: plugins/admin/ogroups/class_phonequeue.inc:527
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1152
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:411
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:413
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:614
+#: plugins/admin/ogroups/class_phonequeue.inc:616
 #: plugins/gofon/macro/class_gofonMacro.inc:205
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:79
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:295
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1035
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:361
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:80
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:296
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1036
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:360
 #, php-format
 msgid ""
 "The MySQL Server '%s' isn't reachable as user '%s', check GOsa log for mysql "
@@ -10885,131 +11050,55 @@ msgstr ""
 msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/gofon/fonreports/class_fonreport.inc:6
-msgid "Phone Reports"
-msgstr "Informes telefónicos"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:96
-#: plugins/gofon/fonreports/class_fonreport.inc:106
-#, fuzzy
-msgid "Can't connect to phone database, no reports can be shown!"
-msgstr ""
-"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
-"informes!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:110
-#, fuzzy
-msgid "Can't select phone database for report generation!"
-msgstr ""
-"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
-
-#: plugins/gofon/fonreports/class_fonreport.inc:212
-msgid "Query for phone database failed!"
-msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
-
-#: plugins/gofon/fonreports/contents.tpl:31
-msgid "Source"
-msgstr "Fuente"
-
-#: plugins/gofon/fonreports/contents.tpl:32
-msgid "Destination"
-msgstr "Destino"
-
-#: plugins/gofon/fonreports/contents.tpl:33
-msgid "Channel"
-msgstr "Canal"
-
-#: plugins/gofon/fonreports/contents.tpl:36
-msgid "Duration"
-msgstr "Duración"
-
-#: plugins/gofon/fonreports/main.inc:5
-msgid "Phone reports"
-msgstr "Informes telefónicos"
-
-#: plugins/gofon/macro/parameter.tpl:3
-#, fuzzy
-msgid "Argument"
-msgstr "Argumentos"
-
-#: plugins/gofon/macro/parameter.tpl:7
-#, fuzzy
-msgid "type"
-msgstr "Tipo"
-
-#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
-#, fuzzy
-msgid "Macro name"
-msgstr "Nombre de la maquina"
-
-#: plugins/gofon/macro/generic.tpl:12
-msgid "Macro name to be displayed"
-msgstr ""
-
-#: plugins/gofon/macro/generic.tpl:22
-#, fuzzy
-msgid "Choose subtree to place macro in"
-msgstr "Elija lugar del árbol para colocar la aplicación"
-
-#: plugins/gofon/macro/generic.tpl:43
-#, fuzzy
-msgid "Visible for user"
-msgstr "Lista de usuarios"
-
-#: plugins/gofon/macro/generic.tpl:52
-#, fuzzy
-msgid "Macro text"
-msgstr "Nombre de la maquina"
-
 #: plugins/gofon/macro/class_gofonMacroManagement.inc:25
 #, fuzzy
 msgid "Phone macros"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:253
 #, fuzzy, php-format
 msgid "You're about to delete the macro '%s'."
 msgstr "Está a punto de borrar el grupo '%s'."
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:259
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:284
 #, fuzzy
 msgid "You are not allowed to delete this macro!"
 msgstr "¡No le está permitido eliminar este grupo!"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:334
 #, fuzzy
 msgid "Create new phone macro"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:349
 #, fuzzy
 msgid "Visible"
 msgstr "Variable"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:353
 msgid "This table displays all phone macros, in the selected tree."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:384
 #, fuzzy
 msgid "Macro"
 msgstr "Nombre de la maquina"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:385
 #, fuzzy
 msgid "visible"
 msgstr "Visible Publicamente"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:386
 #, fuzzy
 msgid "invisible"
 msgstr "Visible Publicamente"
 
 #: plugins/gofon/macro/class_gofonMacro.inc:97
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:250
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:645
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:224
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:251
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:646
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:223
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -11055,63 +11144,56 @@ msgstr ""
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:357
+#: plugins/gofon/macro/class_gofonMacro.inc:358
 #, fuzzy, php-format
 msgid "The given cn '%s' already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:362
+#: plugins/gofon/macro/class_gofonMacro.inc:363
 msgid "You must specify the 'Display Name' in order to save this macro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:366
+#: plugins/gofon/macro/class_gofonMacro.inc:367
 msgid "The given cn is too long, to create a Makro entry, maximum 20 chars."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:371
+#: plugins/gofon/macro/class_gofonMacro.inc:372
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:377
+#: plugins/gofon/macro/class_gofonMacro.inc:378
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:382
+#: plugins/gofon/macro/class_gofonMacro.inc:383
 #, fuzzy
 msgid "Please choose a valid  base."
 msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/gofon/macro/headpage.tpl:6
+#: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 #, fuzzy
-msgid "List of macros"
-msgstr "Lista de grupos"
+msgid "Macro name"
+msgstr "Nombre de la maquina"
 
-#: plugins/gofon/macro/headpage.tpl:24
-#, fuzzy
-msgid ""
-"This menu allows you to add, edit and remove selected macros. You may want "
-"to use the range selector on top of the macro listbox, when working with a "
-"large number of macros."
-msgstr ""
-"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
-"usar el selector de rango en la parte superior de la lista de grupos, cuando "
-"trabaja con un gran número de grupos."
+#: plugins/gofon/macro/generic.tpl:12
+msgid "Macro name to be displayed"
+msgstr ""
 
-#: plugins/gofon/macro/headpage.tpl:38
+#: plugins/gofon/macro/generic.tpl:22
 #, fuzzy
-msgid "Display macros matching"
-msgstr "Mostrar grupos que concuerden con"
+msgid "Choose subtree to place macro in"
+msgstr "Elija lugar del árbol para colocar la aplicación"
 
-#: plugins/gofon/macro/headpage.tpl:38
+#: plugins/gofon/macro/generic.tpl:43
 #, fuzzy
-msgid "Display macros  matching"
-msgstr "Mostrar grupos que concuerden con"
+msgid "Visible for user"
+msgstr "Lista de usuarios"
 
-#: plugins/gofon/macro/headpage.tpl:41
+#: plugins/gofon/macro/generic.tpl:52
 #, fuzzy
-msgid "Regular expression for matching macro names"
-msgstr "Expresión regular que concuerde con nombres de grupos"
+msgid "Macro text"
+msgstr "Nombre de la maquina"
 
 #: plugins/gofon/macro/class_gofonMacroParameters.inc:245
 #, fuzzy
@@ -11131,76 +11213,112 @@ msgstr ""
 msgid "Delete unused"
 msgstr "Borrar"
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:327
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:328
 #, php-format
 msgid "Insufficient permissions, can't change attribute '%s' in goFonMacro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:335
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:915
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:336
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:916
 #, 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/macro/class_gofonMacroParameters.inc:340
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:341
 #, php-format
 msgid "The parameter %s has incorrect value for type bool."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroParameters.inc:369
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:370
 #, php-format
 msgid ""
 "Parameter count of the macro changed, you must update each user which are "
 "using this macro '%s'."
 msgstr ""
 
+#: plugins/gofon/macro/headpage.tpl:6
+#, fuzzy
+msgid "List of macros"
+msgstr "Lista de grupos"
+
+#: plugins/gofon/macro/headpage.tpl:24
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit and remove selected macros. You may want "
+"to use the range selector on top of the macro listbox, when working with a "
+"large number of macros."
+msgstr ""
+"Este menú permite añadir, editar o eliminar los grupos seleccionados. Puede "
+"usar el selector de rango en la parte superior de la lista de grupos, cuando "
+"trabaja con un gran número de grupos."
+
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros matching"
+msgstr "Mostrar grupos que concuerden con"
+
+#: plugins/gofon/macro/headpage.tpl:38
+#, fuzzy
+msgid "Display macros  matching"
+msgstr "Mostrar grupos que concuerden con"
+
+#: plugins/gofon/macro/headpage.tpl:41
+#, fuzzy
+msgid "Regular expression for matching macro names"
+msgstr "Expresión regular que concuerde con nombres de grupos"
+
 #: plugins/gofon/macro/main.inc:38 plugins/gofon/macro/main.inc:40
 #, fuzzy
 msgid "Phone macro management"
 msgstr "Gestión del sistema"
 
-#: plugins/gofon/phoneaccount/main.inc:122
-#: plugins/gofon/phoneaccount/paste_generic.tpl:1
-msgid "Phone settings"
-msgstr "Configuración telefónica"
+#: plugins/gofon/macro/parameter.tpl:3
+#, fuzzy
+msgid "Argument"
+msgstr "Argumentos"
+
+#: plugins/gofon/macro/parameter.tpl:7
+#, fuzzy
+msgid "type"
+msgstr "Tipo"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:118
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:119
 #, fuzzy
 msgid "no macro"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:135
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:136
 #, fuzzy
 msgid "undefined"
 msgstr "sin definirse"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:256
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:257
 msgid ""
 "Can't save any changes to asterisk database, there is no mysql extension "
 "available."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:560
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:561
 #, fuzzy
 msgid "Error while performing query:"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:616
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:740
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:617
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:741
 msgid "This account has no phone extensions."
 msgstr "Esta cuenta no tiene extensiones telefónicas"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:636
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:637
 msgid ""
 "The macro you selected, is no longer available for you, please choose "
 "another one."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:750
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
 msgid "Remove phone account"
 msgstr "Eliminar cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:751
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:752
 msgid ""
 "This account has phone features enabled. You can disable them by clicking "
 "below."
@@ -11208,12 +11326,12 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica activada. Puede desactivarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:754
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:757
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
 msgid "Create phone account"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:755
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:756
 #, fuzzy
 msgid ""
 "This account has phone features disabled. You can't enable them while no uid "
@@ -11222,7 +11340,7 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:758
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:759
 msgid ""
 "This account has phone features disabled. You can enable them by clicking "
 "below."
@@ -11230,19 +11348,19 @@ msgstr ""
 "Esta cuenta tiene la extensión telefónica desactivada. Puede activarla "
 "pulsando aquí."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:771
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:772
 msgid "Please enter a valid phone number!"
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:801
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:802
 msgid "Choose your private phone"
 msgstr "Indique su teléfono particular"
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:887
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:888
 msgid "Voicemail PIN must be between 1-4 characters."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:890
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:891
 #, fuzzy
 msgid ""
 "The specified Voicemail PIN contains invalid characters, only numeric values "
@@ -11251,11 +11369,11 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:895
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:896
 msgid "Phone PIN must be at least one character long."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:898
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:899
 #, fuzzy
 msgid ""
 "The specified phone PIN contains invalid characters, only aphanumeric values "
@@ -11264,27 +11382,33 @@ msgstr ""
 "El campo 'Login' contiene caracteres no validos. Solo minúsculas, números y "
 "guiones están permitidos."
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:908
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:909
 #, 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:1077
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1078
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1111
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1083
+msgid ""
+"Can't remove phone account, the mysql extension is not present in php "
+"configuration."
+msgstr ""
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1116
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
 #: plugins/gofon/phoneaccount/generic.tpl:33
-#: plugins/gofon/phoneaccount/paste_generic.tpl:28
+#: plugins/gofon/phoneaccount/paste_generic.tpl:32
 msgid "Voicemail PIN"
 msgstr ""
 
 #: plugins/gofon/phoneaccount/generic.tpl:41
-#: plugins/gofon/phoneaccount/paste_generic.tpl:36
+#: plugins/gofon/phoneaccount/paste_generic.tpl:40
 #, fuzzy
 msgid "Phone PIN"
 msgstr "Teléfono"
@@ -11295,6 +11419,50 @@ msgstr "Teléfono"
 msgid "Phone macro"
 msgstr "Informes telefónicos"
 
+#: plugins/gofon/phoneaccount/main.inc:122
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+msgid "Phone settings"
+msgstr "Configuración telefónica"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#, fuzzy
+msgid "Phone conferences"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+#, fuzzy
+msgid "Management"
+msgstr "Nombre de la maquina"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#, fuzzy
+msgid "Create new conference"
+msgstr "Crear una nueva entrada en"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
+#, fuzzy
+msgid "New conference"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:304
+msgid "This table displays all available conference rooms."
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:308
+#, fuzzy
+msgid "Name - Number"
+msgstr "Número de teléfono"
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/generic.tpl:107
+msgid "PIN"
+msgstr ""
+
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:364
+#, fuzzy
+msgid "Conference"
+msgstr "Referencias"
+
 #: plugins/gofon/conference/generic.tpl:13
 #, fuzzy
 msgid "Conference name"
@@ -11320,11 +11488,6 @@ msgstr ""
 msgid "Preset PIN"
 msgstr "presente"
 
-#: plugins/gofon/conference/generic.tpl:107
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
-msgid "PIN"
-msgstr ""
-
 #: plugins/gofon/conference/generic.tpl:113
 #, fuzzy
 msgid "Record conference"
@@ -11352,39 +11515,36 @@ msgstr ""
 msgid "Count users"
 msgstr "Pais"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
-#, fuzzy
-msgid "Phone conferences"
-msgstr "Número de teléfono"
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
-#, fuzzy
-msgid "Management"
-msgstr "Nombre de la maquina"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:189
+msgid ""
+"You have specified a conference 'without PIN' ... please leave the PIN "
+"fields empty."
+msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:193
 #, fuzzy
-msgid "Create new conference"
-msgstr "Crear una nueva entrada en"
+msgid "Please enter a PIN."
+msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:197
 #, fuzzy
-msgid "New conference"
-msgstr "Número de teléfono"
+msgid "Please enter a name for the conference."
+msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
-msgid "This table displays all available conference rooms."
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:201
+msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
-#, fuzzy
-msgid "Name - Number"
-msgstr "Número de teléfono"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:205
+msgid "Only numbers are allowed in Lifetime."
+msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
-#, fuzzy
-msgid "Conference"
-msgstr "Referencias"
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:235
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:345
+msgid ""
+"Can't save any changes to asterisk database, there is currently no mysql "
+"extension available in your php setup."
+msgstr ""
 
 #: plugins/gofon/conference/headpage.tpl:6
 #, fuzzy
@@ -11407,41 +11567,52 @@ msgstr ""
 msgid "Regular expression for        matching user names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
-msgid ""
-"You have specified a conference 'without PIN' ... please leave the PIN "
-"fields empty."
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:194
+#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
 #, fuzzy
-msgid "Please enter a PIN."
-msgstr "Por favor especifique una dirección de servidor - URI - válida."
+msgid "Conference management"
+msgstr "Mantenimiento de Departamentos"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
-#, fuzzy
-msgid "Please enter a name for the conference."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Informes telefónicos"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
-msgid "Only numeric chars are allowed in Number field."
+#: plugins/gofon/fonreports/class_fonreport.inc:96
+#: plugins/gofon/fonreports/class_fonreport.inc:106
+#, fuzzy
+msgid "Can't connect to phone database, no reports can be shown!"
 msgstr ""
+"No puedo conectar a la de base de datos de fax, ¡no se pueden mostrar los "
+"informes!"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
-msgid "Only numbers are allowed in Lifetime."
+#: plugins/gofon/fonreports/class_fonreport.inc:110
+#, fuzzy
+msgid "Can't select phone database for report generation!"
 msgstr ""
+"¡No puedo seleccionar la base de datos de fax para la generación de informes!"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
-msgid ""
-"Can't save any changes to asterisk database, there is currently no mysql "
-"extension available in your php setup."
-msgstr ""
+#: plugins/gofon/fonreports/class_fonreport.inc:212
+msgid "Query for phone database failed!"
+msgstr "¡La consulta a la base de datos de teléfonos ha fallado!"
 
-#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
-#, fuzzy
-msgid "Conference management"
-msgstr "Mantenimiento de Departamentos"
+#: plugins/gofon/fonreports/contents.tpl:31
+msgid "Source"
+msgstr "Fuente"
+
+#: plugins/gofon/fonreports/contents.tpl:32
+msgid "Destination"
+msgstr "Destino"
+
+#: plugins/gofon/fonreports/contents.tpl:33
+msgid "Channel"
+msgstr "Canal"
+
+#: plugins/gofon/fonreports/contents.tpl:36
+msgid "Duration"
+msgstr "Duración"
+
+#: plugins/gofon/fonreports/main.inc:5
+msgid "Phone reports"
+msgstr "Informes telefónicos"
 
 #: plugins/generic/references/class_reference.inc:46
 msgid "Thin Client"
@@ -11464,102 +11635,61 @@ msgstr "Este objeto no tiene ninguna relación con otros objetos."
 msgid ""
 "This is the GOsa main screen. You can select your tasks from the menu on the "
 "left, or by choosing one of the pictograms below. All changes apply directly "
-"to your companies LDAP server."
-msgstr ""
-"Esta es la pantalla principal de GOsa. Puede seleccionar las tareas del menú "
-"en la izquierda, o eligiendo entre los iconos siguientes. Todos los cambios "
-"se aplican directamente sobre los servidores LDAP de su compañía."
-
-#: plugins/generic/welcome/welcome.tpl:8
-#, fuzzy
-msgid ""
-"Use 'Sign out' on the upper left to close the connection and 'Main' to get "
-"back to the pictogram view."
-msgstr ""
-"Para cerrar la conexión use <b>Cerrar</b> en la parte superior izquierda y "
-"para volver a la vista de íconos use <b>Principal</b>"
-
-#: plugins/generic/welcome/welcome.tpl:15
-msgid "The GOsa team"
-msgstr "El equipo de GOsa"
-
-#: plugins/generic/welcome/main.inc:24
-#, php-format
-msgid "Welcome %s!"
-msgstr "¡Bienvenido %s!"
-
-#: 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:52
-msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
-msgstr ""
-"Aviso: ¡No se puede acceder al servidor IMAP! Si guarda esta cuenta, algunos "
-"de los valores de la configuración del correo no serán guardados en el "
-"servidor"
-
-#: include/class_mail-methods-cyrus.inc:115
-#, php-format
-msgid "Can't create IMAP mailbox. Server says '%s'."
+"to your companies LDAP server."
 msgstr ""
-"No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
-
-#: 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'"
+"Esta es la pantalla principal de GOsa. Puede seleccionar las tareas del menú "
+"en la izquierda, o eligiendo entre los iconos siguientes. Todos los cambios "
+"se aplican directamente sobre los servidores LDAP de su compañía."
 
-#: include/class_mail-methods-cyrus.inc:155
+#: plugins/generic/welcome/welcome.tpl:8
 #, fuzzy
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgid ""
+"Use 'Sign out' on the upper left to close the connection and 'Main' to get "
+"back to the pictogram view."
 msgstr ""
-"Aviso: imap_getacl no ha sido implementado, no se modificara información "
-"sobre las listas de acceso."
+"Para cerrar la conexión use <b>Cerrar</b> en la parte superior izquierda y "
+"para volver a la vista de íconos use <b>Principal</b>"
 
-#: 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!"
+#: plugins/generic/welcome/welcome.tpl:15
+msgid "The GOsa team"
+msgstr "El equipo de GOsa"
 
-#: include/class_mail-methods-cyrus.inc:195
+#: plugins/generic/welcome/main.inc:24
 #, 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'"
+msgid "Welcome %s!"
+msgstr "¡Bienvenido %s!"
 
-#: 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_plugin.inc:391
+#, fuzzy, php-format
+msgid ""
+"Command '%s', specified as CHECK hook for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/class_plugin.inc:537
 #, php-format
-msgid "Can't get sieve script. Server says '%s'."
-msgstr "No puedo ejecutar un 'script' SIEVE. El error del servidor es: '%s'"
+msgid ""
+"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
+"parece existir."
 
-#: include/class_mail-methods-cyrus.inc:307
+#: include/class_plugin.inc:571 include/class_password-methods.inc:181
 #, php-format
-msgid "Can't send sieve script. Server says '%s'."
-msgstr "No puedo subir un 'script' SIEVE. El error del servidor es: '%s'"
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgstr ""
+"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
+"parece existir."
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_plugin.inc:605
 #, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgid ""
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
-"No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
-"s'"
-
-#: include/class_debconfTemplate.inc:250
-#, fuzzy
-msgid "This package has no debconf options."
-msgstr "Esta cuenta no tiene extensiones telefónicas"
+"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
+"parece existir."
 
 #: include/functions_setup.inc:98
 msgid "Can't bind to LDAP. No schema check possible!"
@@ -11691,7 +11821,19 @@ msgstr ""
 msgid "Support for nagios enabled"
 msgstr "Soporte de GOFON activado"
 
+#: include/functions_setup.inc:251
+#, fuzzy
+msgid "Support for netatalk disabled, no schema seems to be installed"
+msgstr ""
+"El soporte para gofon se encuentra desactivado, no parece haber esquemas "
+"instalados"
+
 #: include/functions_setup.inc:256
+#, fuzzy
+msgid "Support for netatalk enabled"
+msgstr "Soporte de GOFON activado"
+
+#: include/functions_setup.inc:266
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -11699,31 +11841,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:263
+#: include/functions_setup.inc:273
 msgid "Support for Kolab enabled"
 msgstr "Soporte de KOLAB activado"
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:291
 msgid "OK"
 msgstr "Perfecto"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:294
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:296
 msgid "Failed"
 msgstr "Fallado"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:313
 msgid "PHP setup inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:314
 msgid "Checking for PHP version (>=4.1.0)"
 msgstr "Comprobando la versión de PHP (>=4.1.0)"
 
-#: include/functions_setup.inc:305
+#: include/functions_setup.inc:315
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -11731,13 +11873,13 @@ msgstr ""
 "Debe tener una versión de PHP 4.1.0 o superior para el correcto "
 "funcionamiento de GOsa."
 
-#: include/functions_setup.inc:308
+#: include/functions_setup.inc:318
 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:309
+#: include/functions_setup.inc:319
 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 "
@@ -11747,37 +11889,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:312
+#: include/functions_setup.inc:322
 msgid "Checking for ldap module"
 msgstr "Comprobando los módulos de ldap"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:323
 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:316
+#: include/functions_setup.inc:326
 #, fuzzy
 msgid "Checking for XML functions"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:327
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:330
 msgid "Checking for gettext support"
 msgstr "Comprobando el soporte de gettext"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:331
 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:324
+#: include/functions_setup.inc:334
 msgid "Checking for iconv support"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:335
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -11786,11 +11928,11 @@ msgstr ""
 "Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
 "tanto requerido."
 
-#: include/functions_setup.inc:328
+#: include/functions_setup.inc:338
 msgid "Checking for mhash module"
 msgstr "Comprobando por el módulo de mhash"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:339
 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."
@@ -11798,11 +11940,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:332
+#: include/functions_setup.inc:342
 msgid "Checking for imap module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:343
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -11810,11 +11952,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:336
+#: include/functions_setup.inc:346
 msgid "Checking for getacl in imap"
 msgstr "Comprobando por getacl en imap"
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:347
 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 "
@@ -11824,21 +11966,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:340
+#: include/functions_setup.inc:350
 msgid "Checking for mysql module"
 msgstr "Comprobando el módulo de mysql"
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:351
 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:344
+#: include/functions_setup.inc:354
 msgid "Checking for cups module"
 msgstr "Comprobando el módulo de cups"
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:355
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -11846,11 +11988,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:348
+#: include/functions_setup.inc:358
 msgid "Checking for kadm5 module"
 msgstr "Comprobando el módulo kadm5"
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:359
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -11858,27 +12000,27 @@ msgstr ""
 "Manejando usuarios en kerberos requiere el módulo kadm5 que esta disponible "
 "en la red PEAR."
 
-#: include/functions_setup.inc:352
+#: include/functions_setup.inc:362
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:363
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:399
 #, fuzzy
 msgid "PHP detailed function inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:403
 #, fuzzy, php-format
 msgid "Checking for function %s"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:404
 #, fuzzy, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
@@ -11888,15 +12030,15 @@ msgstr ""
 "Donde samba guarda los permisos de acceso remoto / RAS) de samba y es por lo "
 "tanto requerido."
 
-#: include/functions_setup.inc:405
+#: include/functions_setup.inc:415
 msgid "Checking for some additional programms"
 msgstr "Comprobando programas adicionales"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:424
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Comprobando por ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:425
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -11904,11 +12046,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:418
+#: include/functions_setup.inc:428
 msgid "Checking imagick module for PHP"
 msgstr "Comprobando el módulo PHP de imagick"
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:429
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
@@ -11916,11 +12058,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:426
+#: include/functions_setup.inc:436
 msgid "Checking for fping utility"
 msgstr "Comprobando la herramienta fping"
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:437
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -11928,11 +12070,11 @@ msgstr ""
 "La herramienta fping solo se usa si tiene un entorno de terminales clientes "
 "delgados (thinclient)."
 
-#: include/functions_setup.inc:442
+#: include/functions_setup.inc:452
 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:443
+#: include/functions_setup.inc:453
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -11940,11 +12082,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:456
+#: include/functions_setup.inc:466
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini comprobación -> session.auto_register"
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:467
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -11952,11 +12094,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:460
+#: include/functions_setup.inc:470
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini comprobación -> implicit_flush"
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:471
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -11964,11 +12106,11 @@ msgstr ""
 "Esta opción controla el manejador de salida. Desactive esta opción para "
 "mejorar el rendimiento."
 
-#: include/functions_setup.inc:468
+#: include/functions_setup.inc:478
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini comprobación -> max_execution_time"
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:479
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -11976,11 +12118,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:476
+#: include/functions_setup.inc:486
 msgid "php.ini check -> memory_limit"
 msgstr "pnp.ini comprobación -> memory_limit"
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:487
 #, fuzzy
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
@@ -11990,11 +12132,11 @@ msgstr ""
 "impredecibles! Una cantidad recomendada es 16Mb, para sitios con grandes "
 "cargas seria aún mayor."
 
-#: include/functions_setup.inc:481
+#: include/functions_setup.inc:491
 msgid "php.ini check -> expose_php"
 msgstr "php.ini comprobación -> expose_php"
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:492
 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."
@@ -12003,11 +12145,11 @@ msgstr ""
 "debería enviar ninguna información sobre el servidor sobre el que está "
 "funcionando en ningún caso."
 
-#: include/functions_setup.inc:486
+#: include/functions_setup.inc:496
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini comprobación -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:497
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -12015,11 +12157,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:732
+#: include/functions_setup.inc:743
 msgid "You've to specify an ldap server before continuing!"
 msgstr "Tiene que especificar un servidor ldap antes de continuar."
 
-#: include/functions_setup.inc:741 include/functions_setup.inc:824
+#: include/functions_setup.inc:752 include/functions_setup.inc:835
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -12027,8 +12169,8 @@ msgstr ""
 "No se pudo conectar al servidor LDAP especificado. Por favor, asegure que "
 "este accesible para GOsa."
 
-#: include/functions_setup.inc:755 include/functions_setup.inc:829
-#: include/functions_setup.inc:834
+#: include/functions_setup.inc:766 include/functions_setup.inc:840
+#: include/functions_setup.inc:845
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -12036,7 +12178,7 @@ msgstr ""
 "¡No se pudo autentificar con el servidor LDAP especificado!. Por favor, "
 "asegure que este accesible para GOsa."
 
-#: include/functions_setup.inc:844
+#: include/functions_setup.inc:855
 #, fuzzy
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
@@ -12045,7 +12187,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:900
+#: include/functions_setup.inc:911
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -12053,22 +12195,21 @@ msgid ""
 msgstr ""
 "Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:942
 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:940
+#: include/functions_setup.inc:951
 #, 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:1050 include/functions_setup.inc:1073
-#: include/functions_setup.inc:1082 html/index.php:181
+#: include/functions_setup.inc:1061 include/functions_setup.inc:1084
+#: include/functions_setup.inc:1093 html/index.php:186
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
-#: ihtml/themes/lhs/setup_useradmin.tpl:6
 msgid ""
 "You're missing an administrative account for GOsa, you'll not be able to "
 "administrate anything!"
@@ -12081,14 +12222,6 @@ msgid "Setting the password failed. LDAP server says '%s'."
 msgstr ""
 "Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
 
-#: include/class_password-methods.inc:181 include/class_plugin.inc:493
-#, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
-msgstr ""
-"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
-"parece existir."
-
 #: include/class_password-methods.inc:202
 msgid ""
 "Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
@@ -12129,62 +12262,72 @@ msgstr ""
 msgid "%s%% hit rate in file %s"
 msgstr ""
 
+#: include/class_password-methods-kerberos.inc:43
+msgid ""
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
+msgstr ""
+"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
+"soporte Kerberos, la contraseña no ha sido cambiada."
+
+#: include/class_password-methods-kerberos.inc:52
+msgid "Kerberos database communication failed!"
+msgstr "¡La comunicación con la base de datos Kerberos fallo!."
+
+#: include/class_password-methods-kerberos.inc:59
+msgid "Changing password in kerberos database failed!"
+msgstr ""
+"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
+
 #: include/class_ppdManager.inc:13
 #, php-format
 msgid "PPD manager : The specified path '%s' doesn't exists."
 msgstr ""
 
-#: include/class_ppdManager.inc:129 include/class_ppdManager.inc:247
+#: include/class_ppdManager.inc:138
+#, php-format
+msgid "Specified ppd file '%s' can't be opened for reading."
+msgstr ""
+
+#: include/class_ppdManager.inc:140
+#, php-format
+msgid "The required tmp file file '%s' can't be opened for writing."
+msgstr ""
+
+#: include/class_ppdManager.inc:164 include/class_ppdManager.inc:291
 #, php-format
 msgid ""
 "Parsing PPD file %s failed - line too long. Trailing characters have been "
 "ignored"
 msgstr ""
 
-#: include/class_ppdManager.inc:137
+#: include/class_ppdManager.inc:172
 #, fuzzy
 msgid "Nested groups are not supported!"
 msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
 
-#: include/class_ppdManager.inc:141
+#: include/class_ppdManager.inc:176
 #, fuzzy
 msgid "Group name not unique!"
 msgstr "Nombre del grupo"
 
-#: include/class_ppdManager.inc:147 include/class_ppdManager.inc:177
+#: include/class_ppdManager.inc:182 include/class_ppdManager.inc:212
 msgid "Symbol values are not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:171
+#: include/class_ppdManager.inc:206
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:196
+#: include/class_ppdManager.inc:231
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:268
+#: include/class_ppdManager.inc:312
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
 
-#: include/class_password-methods-kerberos.inc:43
-msgid ""
-"Warning: Can't set kerberos password. Your PHP version has no kerberos "
-"support, password has not been changed."
-msgstr ""
-"Aviso: No se puede poner la contraseña Kerberos. Su versión de PHP no tiene "
-"soporte Kerberos, la contraseña no ha sido cambiada."
-
-#: include/class_password-methods-kerberos.inc:52
-msgid "Kerberos database communication failed!"
-msgstr "¡La comunicación con la base de datos Kerberos fallo!."
-
-#: include/class_password-methods-kerberos.inc:59
-msgid "Changing password in kerberos database failed!"
-msgstr ""
-"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
-
 #: include/class_certificate.inc:35
 msgid "Can't open specified file, check accessibility and or existence"
 msgstr ""
@@ -12216,7 +12359,7 @@ msgstr ""
 "¡La generación de esta página provoca que el interprete PHP muestre algunos "
 "errores!"
 
-#: include/php_setup.inc:71 html/main.php:362
+#: include/php_setup.inc:71 html/main.php:364
 msgid "Toggle information"
 msgstr "Información de intercambio"
 
@@ -12252,25 +12395,25 @@ msgstr "Linea"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: include/functions.inc:291
+#: include/functions.inc:298
 #, php-format
 msgid "Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "Hay un error trantando de conectarse al servidor LDAP. El error del servidor "
 "es: '%s'"
 
-#: include/functions.inc:312
+#: include/functions.inc:319
 #, php-format
 msgid "User login failed. LDAP server said '%s'."
 msgstr "Autenticación del usuario fallida. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:331
+#: include/functions.inc:338
 msgid "Username / UID is not unique. Please check your LDAP database."
 msgstr ""
 "Nombre de usuario o UID no son únicos. Por favor, compruebe su base de datos "
 "LDAP."
 
-#: include/functions.inc:369
+#: include/functions.inc:376
 msgid ""
 "Error while adding a lock. Parameters are not set correctly, please check "
 "the source!"
@@ -12278,7 +12421,7 @@ msgstr ""
 "Error al tratar de agregar un bloqueo. Los parámetros no son correctos, por "
 "favor, compruebe el código fuente."
 
-#: include/functions.inc:379
+#: include/functions.inc:386
 #, php-format
 msgid ""
 "Can't set locking information in LDAP database. Please check the 'config' "
@@ -12287,17 +12430,17 @@ msgstr ""
 "No se pudo generar el bloqueo a la base de datos LDAP. Por favor, compruebe "
 "la entrada 'config' en gosa.conf. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:394
+#: include/functions.inc:401
 #, php-format
 msgid "Adding a lock failed. LDAP server says '%s'."
 msgstr "Fallo al tratar de agregar un bloqueo. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:420
+#: include/functions.inc:427
 #, php-format
 msgid "Removing a lock failed. LDAP server says '%s'."
 msgstr "Fallo al tratar de agregar un bloqueo. El servidor LDAP contesto '%s'."
 
-#: include/functions.inc:450
+#: include/functions.inc:457
 msgid ""
 "Getting the lock from LDAP failed. Parameters are not set correctly, please "
 "check the source!"
@@ -12305,7 +12448,7 @@ msgstr ""
 "Fallo al tratar de obtener un bloqueo de LDAP. Los parámetros no fueron "
 "correctamente configurados, por favor, compruebe el código fuente."
 
-#: include/functions.inc:460
+#: include/functions.inc:467
 msgid ""
 "Can't get locking information in LDAP database. Please check the 'config' "
 "entry in gosa.conf!"
@@ -12313,7 +12456,7 @@ msgstr ""
 "No puedo bloquear la información en la base de datos LDAP. Por favor, "
 "compruebe la entrada 'config' en el archivos gosa.conf."
 
-#: include/functions.inc:468
+#: include/functions.inc:475
 msgid ""
 "Found multiple locks for object to be locked. This should not be possible - "
 "cleaning up multiple references."
@@ -12321,12 +12464,12 @@ msgstr ""
 "Se encontraron varios bloqueos para el objeto a bloquear. Esto no debería "
 "ser posible, eliminando referencias múltiples."
 
-#: include/functions.inc:582
+#: include/functions.inc:557
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡Ha excedido el tamaño máximo de %d entradas!"
 
-#: include/functions.inc:584
+#: include/functions.inc:559
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -12335,16 +12478,16 @@ msgstr ""
 "Indique el nuevo tamaño limite a %s y enséñame este mensaje si el tamaño "
 "limite es todavía superado"
 
-#: include/functions.inc:601
+#: include/functions.inc:576
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1002
+#: include/functions.inc:959
 #, php-format
 msgid "Last message repeated %s times."
 msgstr ""
 
-#: include/functions.inc:1068
+#: include/functions.inc:1025
 #, php-format
 msgid ""
 "You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
@@ -12353,23 +12496,23 @@ msgstr ""
 "Va ha editar la entrada LDAP '%s' que parece estar siendo usada por '%s'. "
 "Por favor, contacte con esta persona para clarificar los procedimientos."
 
-#: include/functions.inc:1167
+#: include/functions.inc:1124
 msgid "LDAP error:"
 msgstr "Error LDAP:"
 
-#: include/functions.inc:1345
+#: include/functions.inc:1302
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1373
+#: include/functions.inc:1330
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1647
+#: include/functions.inc:1604
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1690
+#: include/functions.inc:1647
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Versión de desarrollo de GOsa (Rev %s)"
@@ -12390,7 +12533,6 @@ msgstr ""
 #: include/class_pluglist.inc:130 ihtml/themes/altlinux/framework.tpl:14
 #: ihtml/themes/altlinux/framework.tpl:24
 #: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
-#: ihtml/themes/lhs/framework.tpl:14 ihtml/themes/lhs/framework.tpl:24
 msgid ""
 "You are currently editing a database entry. Do you want to dismiss the "
 "changes?"
@@ -12398,41 +12540,48 @@ msgstr ""
 "Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
 "los cambios?"
 
-#: include/class_config.inc:69
+#: include/class_config.inc:70
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Error XML en 'gosa.conf': %s en la linea %d"
 
-#: include/class_config.inc:195 html/index.php:141
+#: include/class_config.inc:196 html/index.php:146
 msgid "Can't bind to LDAP. Please contact the system administrator."
 msgstr ""
 "NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
 "sistemas."
 
-#: include/class_config.inc:450
+#: include/class_config.inc:454
 msgid "SID and/or RIDBASE missing in your configuration!"
 msgstr "SID y/o RIDBASE no se encuentran en su configuración."
 
-#: include/class_ldap.inc:405
+#: include/class_ldap.inc:195 include/class_ldap.inc:227
+#, php-format
+msgid ""
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
+msgstr ""
+
+#: include/class_ldap.inc:446
 #, fuzzy, php-format
 msgid "Creating copy of %s"
 msgstr "Lista de usuarios"
 
-#: include/class_ldap.inc:408
+#: include/class_ldap.inc:449
 msgid "Processing"
 msgstr ""
 
-#: include/class_ldap.inc:448
+#: include/class_ldap.inc:489
 #, fuzzy
 msgid "Error while fetching source dn - aborted!"
 msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: include/class_ldap.inc:511
+#: include/class_ldap.inc:552
 #, fuzzy, php-format
 msgid "Unknown FAIstate %s"
 msgstr "estado desconocido"
 
-#: include/class_ldap.inc:632
+#: include/class_ldap.inc:677
 #, php-format
 msgid ""
 "Autocreation of type '%s' is currently not supported. Please report to the "
@@ -12441,7 +12590,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:894
+#: include/class_ldap.inc:939
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -12450,47 +12599,113 @@ msgstr ""
 "El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
 "en la linea %s"
 
-#: include/class_ldap.inc:907
+#: include/class_ldap.inc:952
 #, 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:923
+#: include/class_ldap.inc:968
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
 "el LDIF desde la linea %s en adelante!"
 
-#: include/class_plugin.inc:465
-#, php-format
+#: include/class_debconfTemplate.inc:260
+#, fuzzy
+msgid "This package has no debconf options."
+msgstr "Esta cuenta no tiene extensiones telefónicas"
+
+#: include/class_mail-methods-cyrus.inc:39
 msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+"Warning: Account has an invalid mailserver string! Please check the mail "
+"server settings in the mail tab."
 msgstr ""
-"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
-"parece existir."
 
-#: include/class_plugin.inc:521
-#, php-format
+#: include/class_mail-methods-cyrus.inc:52
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+"Warning: IMAP Server cannot be reached! If you save this account, some mail "
+"settings will not be stored on your server!"
 msgstr ""
-"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
-"parece existir."
+"Aviso: ¡No se puede acceder al servidor IMAP! Si guarda esta cuenta, algunos "
+"de los valores de la configuración del correo no serán guardados en el "
+"servidor"
+
+#: include/class_mail-methods-cyrus.inc: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: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: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: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: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: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: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: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:311
+#, php-format
+msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgstr ""
+"No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
+"s'"
 
-#: include/class_CopyPasteHandler.inc:172
+#: include/class_CopyPasteHandler.inc:152
 #, fuzzy, php-format
 msgid "You are going to copy the entry '%s'."
 msgstr "Has decidido eliminar la entrada %s"
 
-#: html/helpviewer.php:116
-#, fuzzy
-msgid "There is no helpfile specified for this class."
-msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
+#: include/functions_dns.inc:166
+#, php-format
+msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+msgstr ""
 
-#: html/helpviewer.php:226
+#: include/functions_dns.inc:171
 #, php-format
-msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgid ""
+"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
+"zone."
+msgstr ""
+
+#: include/functions_dns.inc:363
+#, php-format
+msgid ""
+"Found more than one dns zone which contains an entry named '%s'. Aborting "
+"getting dns informations for this device."
 msgstr ""
 
 #: html/getvcard.php:36
@@ -12625,57 +12840,67 @@ msgstr "Lista de usuarios"
 msgid "Computers of %s on %s"
 msgstr "incompleto"
 
-#: html/index.php:49
+#: html/index.php:54
 #, 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:71
-#, php-format
-msgid "Directory '%s' specified as compile directory is not accessable!"
+#: html/index.php:76
+#, fuzzy, php-format
+msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "El directorio '%s' especificado como directorio de compilación no es "
 "accesible."
 
-#: html/index.php:154
+#: html/index.php:159
 msgid ""
 "GOsa cannot retrieve information about the installed schema files. Please "
 "make sure, that this is possible."
 msgstr ""
 
-#: html/index.php:162
+#: html/index.php:167
 msgid ""
 "Your ldap setup contains old schema definitions. Please re-run the setup."
 msgstr ""
 
-#: html/index.php:189
+#: html/index.php:194
 msgid "Please specify a valid username!"
 msgstr "Por favor especifique un nombre de usuario valido."
 
-#: html/index.php:191
+#: html/index.php:196
 msgid "Please specify your password!"
 msgstr "Por favor especifique su contraseña."
 
-#: html/index.php:198
+#: html/index.php:203
 msgid "Please check the username/password combination."
 msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/index.php:237 html/index.php:301
+#: html/index.php:242 html/index.php:306
 msgid "Session will not be encrypted."
 msgstr "La sesion no sera encriptada."
 
-#: html/index.php:237 html/index.php:301
+#: html/index.php:242 html/index.php:306
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
-#: html/index.php:243
+#: html/index.php:248
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
 msgstr ""
 
+#: html/helpviewer.php:116
+#, fuzzy
+msgid "There is no helpfile specified for this class."
+msgstr "No hay protocolo de correo %s configurado en su 'gosa.conf'."
+
+#: html/helpviewer.php:226
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
+
 #: html/getfax.php:53
 msgid "Could not connect to database server!"
 msgstr "No puedo conectar al servidor de base de datos."
@@ -12688,16 +12913,6 @@ msgstr "No puedo seleccionar la base de datos."
 msgid "Database query failed!"
 msgstr "La consulta a la base de datos ha fallado."
 
-#: html/getkiosk.php:25
-#, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
-msgstr ""
-
-#: html/getkiosk.php:30
-#, fuzzy, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr "Borrar"
-
 #: html/main.php:151
 msgid ""
 "Register globals is on. GOsa will refuse to login unless this is fixed by an "
@@ -12711,19 +12926,29 @@ msgid "Warning: memory is getting low - please increase the memory_limit!"
 msgstr ""
 "Advertencia: Poca memoria disponible -  por favor aumente 'memory_limit'"
 
-#: html/main.php:334
+#: html/main.php:336
 #, php-format
 msgid "Can't find any plugin definitions for plugin '%s'!"
 msgstr "No se pudo encontrar ninguna definición de extensión para '%s'"
 
-#: html/main.php:362
+#: html/main.php:364
 #, 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!"
+"¡La generación de esta página provoca que el interprete PHP muestre algunos "
+"errores!"
+
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
+msgstr ""
+
+#: html/getkiosk.php:30
+#, fuzzy, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "Borrar"
 
 #: html/get_attachment.php:47
 #, fuzzy
@@ -12751,47 +12976,11 @@ msgstr ""
 msgid "Can't open file '%s'."
 msgstr "Borrar"
 
-#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
-#: ihtml/themes/lhs/sizelimit.tpl:3
-msgid ""
-"The size limit option makes LDAP operations faster and saves the LDAP server "
-"from getting too much load. The easiest way to handle big databases without "
-"long timeouts would be to limit your search to smaller values and use "
-"filters to get the entries you are looking for."
-msgstr ""
-"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
-"protege al servidor LDAP de alcanzar una mayor carga. La manera mas fácil de "
-"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
-"la busqueda a valores pequeños y usar filtros para encontrar las entradas "
-"que está buscando."
-
-#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
-#: ihtml/themes/lhs/sizelimit.tpl:6
-msgid "Please choose the way to react for this session"
-msgstr "Por favor elije la manera en que la sesión reaccione"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
-#: ihtml/themes/lhs/sizelimit.tpl:9
-msgid "ignore this error and show all entries the LDAP server returns"
-msgstr ""
-"ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
-
-#: ihtml/themes/altlinux/sizelimit.tpl:10
-#: ihtml/themes/default/sizelimit.tpl:10 ihtml/themes/lhs/sizelimit.tpl:10
-msgid ""
-"ignore this error and show all entries that fit into the defined sizelimit "
-"and let me use filters instead"
-msgstr ""
-"ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
-"limite' definido y active el uso de filtros en su lugar"
-
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
-#: ihtml/themes/lhs/conflict.tpl:2
 msgid "Session conflict detected"
 msgstr "Detectado conflicto de sesiones."
 
 #: ihtml/themes/altlinux/conflict.tpl:6 ihtml/themes/default/conflict.tpl:6
-#: ihtml/themes/lhs/conflict.tpl:6
 msgid ""
 "Probably there's another active instance of your session. Multiple window "
 "operation is technical not possible and heavily depends on the browser "
@@ -12804,7 +12993,6 @@ msgstr ""
 "decir, IE y Mozilla). Apretando el botón <b>Salir</b> cerrará está sesión."
 
 #: ihtml/themes/altlinux/conflict.tpl:10 ihtml/themes/default/conflict.tpl:10
-#: ihtml/themes/lhs/conflict.tpl:10
 msgid ""
 "Ignoring this message will change/destroy the data you're currently editing, "
 "so please close multiple windows and log in again."
@@ -12813,35 +13001,11 @@ msgstr ""
 "editando. Por favor, cierre las ventanas múltiples y vuelva a entrar."
 
 #: ihtml/themes/altlinux/conflict.tpl:14 ihtml/themes/default/conflict.tpl:14
-#: ihtml/themes/lhs/conflict.tpl:14
 msgid "Logout"
 msgstr "Salir"
 
-#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
-#: ihtml/themes/lhs/login.tpl:17
-msgid "Please use your <i>username</i> and <i>password</i> to log in"
-msgstr ""
-"Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
-
-#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
-#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
-#: ihtml/themes/lhs/login.tpl:46 ihtml/themes/lhs/login.tpl:49
-msgid "Directory"
-msgstr "Directorio"
-
-#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
-#: ihtml/themes/lhs/login.tpl:57
-msgid "Sign in"
-msgstr "Entrando"
-
-#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
-#: ihtml/themes/lhs/login.tpl:58
-msgid "Click here to log in"
-msgstr "Pulse aquí para entrar"
-
 #: ihtml/themes/altlinux/setup_introduction.tpl:1
 #: ihtml/themes/default/setup_introduction.tpl:1
-#: ihtml/themes/lhs/setup_introduction.tpl:1
 msgid "Welcome to the GOsa setup!"
 msgstr "Bienvenido a la configuración de GOsa"
 
@@ -12863,13 +13027,11 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_useradmin.tpl:3
 #: ihtml/themes/default/setup_useradmin.tpl:3
-#: ihtml/themes/lhs/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
-#: ihtml/themes/lhs/setup_useradmin.tpl:10
 msgid ""
 "To provide full administrative access to GOsa, you need to create a special "
 "group which contains the administrative user. The setup program can assist "
@@ -12881,38 +13043,100 @@ msgstr ""
 "configuración puede ayudarle en esta tarea. Introduzca el nombre y "
 "contraseñas deseadas para crear las entradas necesarias."
 
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:15
+msgid "Please use your <i>username</i> and <i>password</i> to log in"
+msgstr ""
+"Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
+
+#: ihtml/themes/altlinux/login.tpl:44 ihtml/themes/altlinux/login.tpl:47
+#: ihtml/themes/default/login.tpl:46 ihtml/themes/default/login.tpl:49
+msgid "Directory"
+msgstr "Directorio"
+
+#: ihtml/themes/altlinux/login.tpl:55 ihtml/themes/default/login.tpl:57
+msgid "Sign in"
+msgstr "Entrando"
+
+#: ihtml/themes/altlinux/login.tpl:56 ihtml/themes/default/login.tpl:58
+msgid "Click here to log in"
+msgstr "Pulse aquí para entrar"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:3 ihtml/themes/default/sizelimit.tpl:3
+msgid ""
+"The size limit option makes LDAP operations faster and saves the LDAP server "
+"from getting too much load. The easiest way to handle big databases without "
+"long timeouts would be to limit your search to smaller values and use "
+"filters to get the entries you are looking for."
+msgstr ""
+"La opción 'tamaño limite' permite unas operaciones con LDAP mas rápidas y "
+"protege al servidor LDAP de alcanzar una mayor carga. La manera mas fácil de "
+"manipular grandes bases de datos sin grandes perdidas de tiempo es limitar "
+"la busqueda a valores pequeños y usar filtros para encontrar las entradas "
+"que está buscando."
+
+#: ihtml/themes/altlinux/sizelimit.tpl:6 ihtml/themes/default/sizelimit.tpl:6
+msgid "Please choose the way to react for this session"
+msgstr "Por favor elije la manera en que la sesión reaccione"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:9 ihtml/themes/default/sizelimit.tpl:9
+msgid "ignore this error and show all entries the LDAP server returns"
+msgstr ""
+"ignore este error y enseñe todas las entradas devueltas por el servidor LDAP"
+
+#: ihtml/themes/altlinux/sizelimit.tpl:10
+#: ihtml/themes/default/sizelimit.tpl:10
+msgid ""
+"ignore this error and show all entries that fit into the defined sizelimit "
+"and let me use filters instead"
+msgstr ""
+"ignore este error y muestre todas las entradas que concuerdan con el 'tamaño "
+"limite' definido y active el uso de filtros en su lugar"
+
 #: ihtml/themes/altlinux/framework.tpl:15
-#: ihtml/themes/default/framework.tpl:15 ihtml/themes/lhs/framework.tpl:15
+#: ihtml/themes/default/framework.tpl:15
 msgid "Main"
 msgstr "Inicio"
 
 #: ihtml/themes/altlinux/framework.tpl:20
-#: ihtml/themes/default/framework.tpl:20 ihtml/themes/lhs/framework.tpl:20
+#: ihtml/themes/default/framework.tpl:20
 msgid "Help"
 msgstr "Ayuda"
 
 #: ihtml/themes/altlinux/framework.tpl:25
-#: ihtml/themes/default/framework.tpl:25 ihtml/themes/lhs/framework.tpl:25
+#: ihtml/themes/default/framework.tpl:25
 msgid "Sign out"
 msgstr "Salir"
 
 #: ihtml/themes/altlinux/framework.tpl:33
-#: ihtml/themes/default/framework.tpl:33 ihtml/themes/lhs/framework.tpl:33
+#: ihtml/themes/default/framework.tpl:33
 msgid "Signed in:"
 msgstr "Entrando"
 
+#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
+msgid "Locking conflict detected"
+msgstr "Detectado conflicto de Bloqueos"
+
+#: ihtml/themes/altlinux/islocked.tpl:9
+msgid ""
+"If this lock detection is false, the other person has obviously closed the "
+"webbrowser during the edit operation. You may delete the lockfile in this "
+"case by pressing the <i>Remove</i> button."
+msgstr ""
+"Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
+"mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
+"pulsando en el botón <i>Eliminar</i>."
+
 #: ihtml/themes/altlinux/setup_step2.tpl:1
 #: ihtml/themes/altlinux/setup_step3.tpl:1
 #: ihtml/themes/altlinux/setup_step4.tpl:1
 #: ihtml/themes/default/setup_step2.tpl:1
 #: ihtml/themes/default/setup_step3.tpl:1
-#: ihtml/themes/default/setup_step4.tpl:1 ihtml/themes/lhs/setup_step2.tpl:1
-#: ihtml/themes/lhs/setup_step3.tpl:1 ihtml/themes/lhs/setup_step4.tpl:1
+#: ihtml/themes/default/setup_step4.tpl:1
 msgid "Setup continued..."
 msgstr "La instalación continua"
 
 #: ihtml/themes/altlinux/setup_step2.tpl:4
-#: ihtml/themes/default/setup_step2.tpl:4 ihtml/themes/lhs/setup_step2.tpl:4
+#: ihtml/themes/default/setup_step2.tpl:4
 msgid ""
 "Step two looks for a set of helper programms and checks if they have the "
 "correct minimum version."
@@ -12920,23 +13144,8 @@ msgstr ""
 "El paso dos busca por una colección de programas/herramientas de soporte y "
 "comprueba si tienen al menos la mínima versión necesaria."
 
-#: ihtml/themes/altlinux/islocked.tpl:2 ihtml/themes/default/islocked.tpl:2
-#: ihtml/themes/lhs/islocked.tpl:2
-msgid "Locking conflict detected"
-msgstr "Detectado conflicto de Bloqueos"
-
-#: ihtml/themes/altlinux/islocked.tpl:9 ihtml/themes/lhs/islocked.tpl:9
-msgid ""
-"If this lock detection is false, the other person has obviously closed the "
-"webbrowser during the edit operation. You may delete the lockfile in this "
-"case by pressing the <i>Remove</i> button."
-msgstr ""
-"Si esta detección de bloqueo es falsa, la otra persona cerro su navegador "
-"mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
-"pulsando en el botón <i>Eliminar</i>."
-
 #: ihtml/themes/altlinux/setup_step3.tpl:4
-#: ihtml/themes/default/setup_step3.tpl:4 ihtml/themes/lhs/setup_step3.tpl:4
+#: ihtml/themes/default/setup_step3.tpl:4
 msgid ""
 "Now we're going include your LDAP server and create an initial "
 "configuration. After you've entered the server URI below, a quick check is "
@@ -12952,7 +13161,7 @@ msgstr ""
 "preguntados más adelante."
 
 #: ihtml/themes/altlinux/setup_step3.tpl:10
-#: ihtml/themes/default/setup_step3.tpl:10 ihtml/themes/lhs/setup_step3.tpl:10
+#: ihtml/themes/default/setup_step3.tpl:10
 msgid ""
 "Please enter the server URI to allow the setup to connect your LDAP server "
 "<i>(Example: ldap://your.server:389).</i>"
@@ -12962,7 +13171,7 @@ msgstr ""
 "servidor:389).</i>"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:2
-#: ihtml/themes/default/setup_step4.tpl:2 ihtml/themes/lhs/setup_step4.tpl:2
+#: ihtml/themes/default/setup_step4.tpl:2
 msgid ""
 "The following fields allow the basic configuration of GOsa's behaviour and "
 "affect various properties in your main configuration."
@@ -12971,17 +13180,17 @@ msgstr ""
 "afectara a varios parámetros de su configuración principal."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:7
-#: ihtml/themes/default/setup_step4.tpl:7 ihtml/themes/lhs/setup_step4.tpl:7
+#: ihtml/themes/default/setup_step4.tpl:7
 msgid "Enter a description for the location you're configuring here"
 msgstr "Ingrese una descripción para la ubicación que está configurando"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:11
-#: ihtml/themes/default/setup_step4.tpl:11 ihtml/themes/lhs/setup_step4.tpl:11
+#: ihtml/themes/default/setup_step4.tpl:11
 msgid "Location name"
 msgstr "Nombre de la localización"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:18
-#: ihtml/themes/default/setup_step4.tpl:18 ihtml/themes/lhs/setup_step4.tpl:18
+#: ihtml/themes/default/setup_step4.tpl:18
 msgid ""
 "GOsa always acts as admin and manages access rights internally. This is a "
 "workaround till OpenLDAP's in directory ACI's are fully implemented. For "
@@ -12994,17 +13203,17 @@ msgstr ""
 "correspondiente."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:23
-#: ihtml/themes/default/setup_step4.tpl:23 ihtml/themes/lhs/setup_step4.tpl:23
+#: ihtml/themes/default/setup_step4.tpl:23
 msgid "Admin DN"
 msgstr "DN del administrador"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:27
-#: ihtml/themes/default/setup_step4.tpl:27 ihtml/themes/lhs/setup_step4.tpl:27
+#: ihtml/themes/default/setup_step4.tpl:27
 msgid "Admin password"
 msgstr "Nueva contraseña"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:34
-#: ihtml/themes/default/setup_step4.tpl:34 ihtml/themes/lhs/setup_step4.tpl:34
+#: ihtml/themes/default/setup_step4.tpl:34
 msgid ""
 "Some basic LDAP parameters are tunable and affect the locations where GOsa "
 "saves people and groups, including the way accounts get created. Check the "
@@ -13016,33 +13225,33 @@ msgstr ""
 "continuación si se ajustan a sus necesidades."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:39
-#: ihtml/themes/default/setup_step4.tpl:39 ihtml/themes/lhs/setup_step4.tpl:39
+#: ihtml/themes/default/setup_step4.tpl:39
 #, fuzzy
 msgid "Base "
 msgstr "Base"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:43
-#: ihtml/themes/default/setup_step4.tpl:43 ihtml/themes/lhs/setup_step4.tpl:43
+#: ihtml/themes/default/setup_step4.tpl:43
 msgid "People storage ou"
 msgstr "Carpeta de almacenamiento - ou - para los usuarios"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:47
-#: ihtml/themes/default/setup_step4.tpl:47 ihtml/themes/lhs/setup_step4.tpl:47
+#: ihtml/themes/default/setup_step4.tpl:47
 msgid "People dn attribute"
 msgstr "Atributo 'dn' de los usuarios"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:55
-#: ihtml/themes/default/setup_step4.tpl:55 ihtml/themes/lhs/setup_step4.tpl:55
+#: ihtml/themes/default/setup_step4.tpl:55
 msgid "Group storage ou"
 msgstr "Carpeta de almacenamiento - ou - para los grupos"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:59
-#: ihtml/themes/default/setup_step4.tpl:59 ihtml/themes/lhs/setup_step4.tpl:59
+#: ihtml/themes/default/setup_step4.tpl:59
 msgid "ID base for users/groups"
 msgstr "Identificador base - ID -, para usuarios y grupos"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:67
-#: ihtml/themes/default/setup_step4.tpl:67 ihtml/themes/lhs/setup_step4.tpl:67
+#: ihtml/themes/default/setup_step4.tpl:67
 msgid ""
 "GOsa supports several encryption types for your passwords. Normally this is "
 "adjustable via user templates, but you can specify a default method to be "
@@ -13053,12 +13262,12 @@ msgstr ""
 "usted puede especificar un método para ser usado por defecto."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:72
-#: ihtml/themes/default/setup_step4.tpl:72 ihtml/themes/lhs/setup_step4.tpl:72
+#: ihtml/themes/default/setup_step4.tpl:72
 msgid "Encryption algorithm"
 msgstr "Algoritmo de encriptación"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:83
-#: ihtml/themes/default/setup_step4.tpl:83 ihtml/themes/lhs/setup_step4.tpl:83
+#: ihtml/themes/default/setup_step4.tpl:83
 msgid ""
 "GOsa has modular support for several mail methods. These methods provide "
 "interfaces to users mailboxes and general handling for quotas. You can "
@@ -13070,7 +13279,7 @@ msgstr ""
 "configuración de correo limpia."
 
 #: ihtml/themes/altlinux/setup_step4.tpl:88
-#: ihtml/themes/default/setup_step4.tpl:88 ihtml/themes/lhs/setup_step4.tpl:88
+#: ihtml/themes/default/setup_step4.tpl:88
 msgid "Mail method"
 msgstr "Método de correo"
 
@@ -13083,38 +13292,34 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_step4.tpl:103
 #: ihtml/themes/default/setup_step4.tpl:104
-#: ihtml/themes/lhs/setup_step4.tpl:104
 #, fuzzy
 msgid "Display PHP errors"
 msgstr "Error PHP:"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:106
 #: ihtml/themes/default/setup_step4.tpl:107
-#: ihtml/themes/lhs/setup_step4.tpl:107
 #, fuzzy
 msgid "true"
 msgstr "Futuro"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:107
 #: ihtml/themes/default/setup_step4.tpl:108
-#: ihtml/themes/lhs/setup_step4.tpl:108
 #, fuzzy
 msgid "false"
 msgstr "mujer"
 
 #: ihtml/themes/altlinux/setup_step4.tpl:115
 #: ihtml/themes/default/setup_step4.tpl:115
-#: ihtml/themes/lhs/setup_step4.tpl:115
 msgid "Check"
 msgstr "Comprobación"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:1
-#: ihtml/themes/default/setup_finish.tpl:1 ihtml/themes/lhs/setup_finish.tpl:1
+#: ihtml/themes/default/setup_finish.tpl:1
 msgid "Setup finished"
 msgstr "Configuración finalizada"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:3
-#: ihtml/themes/default/setup_finish.tpl:3 ihtml/themes/lhs/setup_finish.tpl:3
+#: ihtml/themes/default/setup_finish.tpl:3
 msgid ""
 "Basically the setup is finished. You can check the result of the schema "
 "check here and download the autogenerated gosa.conf below."
@@ -13123,19 +13328,17 @@ msgstr ""
 "este esquema aquí y descargar el gosa.conf generado automáticamente."
 
 #: ihtml/themes/altlinux/setup_finish.tpl:7
-#: ihtml/themes/default/setup_finish.tpl:7 ihtml/themes/lhs/setup_finish.tpl:7
+#: ihtml/themes/default/setup_finish.tpl:7
 msgid "Schema Configuration"
 msgstr "Configuración de esquemas"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:12
 #: ihtml/themes/default/setup_finish.tpl:12
-#: ihtml/themes/lhs/setup_finish.tpl:12
 msgid "Configuration File"
 msgstr "Fichero de configuración"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:14
 #: ihtml/themes/default/setup_finish.tpl:14
-#: ihtml/themes/lhs/setup_finish.tpl:14
 msgid ""
 "GOsa setup has collected all data needed to create an initial configuration "
 "file. Save the the link below as your gosa.conf and place that file in /etc/"
@@ -13147,13 +13350,11 @@ msgstr ""
 
 #: ihtml/themes/altlinux/setup_finish.tpl:17
 #: ihtml/themes/default/setup_finish.tpl:17
-#: ihtml/themes/lhs/setup_finish.tpl:17
 msgid "Download configuration"
 msgstr "Descargar configuración"
 
 #: ihtml/themes/altlinux/setup_finish.tpl:20
 #: ihtml/themes/default/setup_finish.tpl:20
-#: ihtml/themes/lhs/setup_finish.tpl:20
 msgid ""
 "After placing the file under /etc/gosa, place make sure that the webserver "
 "user is able to read gosa.conf, while other users shouldn't. You may want to "
@@ -13163,16 +13364,7 @@ msgstr ""
 "servidor web pueda leer gosa.conf y que los otros no deberían poder leerlo. "
 "Para cumplir con este requerimiento puede ejecutar estos comandos:"
 
-#: ihtml/themes/default/help.tpl:9 ihtml/themes/lhs/help.tpl:9
-msgid "GOsa help viewer"
-msgstr ""
-
-#: ihtml/themes/default/help.tpl:15 ihtml/themes/lhs/help.tpl:15
-msgid "Index"
-msgstr ""
-
 #: ihtml/themes/default/setup_introduction.tpl:4
-#: ihtml/themes/lhs/setup_introduction.tpl:4
 #, fuzzy
 msgid ""
 "It looks like you're calling GOsa for the first time - no configuration was "
@@ -13190,7 +13382,6 @@ msgstr ""
 "conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
 
 #: ihtml/themes/default/setup_introduction.tpl:17
-#: ihtml/themes/lhs/setup_introduction.tpl:17
 msgid ""
 "You can also use the new and more-advanced way of inspecting your PHP-"
 "installation. It will give you information about the exact function that "
@@ -13199,26 +13390,17 @@ msgid ""
 msgstr ""
 
 #: ihtml/themes/default/setup_introduction.tpl:19
-#: ihtml/themes/lhs/setup_introduction.tpl:19
 msgid "Toggle Show/Hide"
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:5 ihtml/themes/lhs/logout.tpl:5
-msgid "Your GOsa session has expired!"
+#: ihtml/themes/default/help.tpl:9
+msgid "GOsa help viewer"
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:7 ihtml/themes/lhs/logout.tpl:7
-msgid ""
-"The last interaction with the GOsa web interface has been some time ago in "
-"the past. For security reasons, the session has been closed. To continue "
-"with administrative tasks, please sign in again."
+#: ihtml/themes/default/help.tpl:15
+msgid "Index"
 msgstr ""
 
-#: ihtml/themes/default/logout.tpl:10 ihtml/themes/lhs/logout.tpl:10
-#, fuzzy
-msgid "Sign in again"
-msgstr "Entrando"
-
 #: ihtml/themes/default/islocked.tpl:9
 #, fuzzy
 msgid ""
@@ -13235,6 +13417,28 @@ msgstr ""
 msgid "Edit anyway"
 msgstr "Editar entrada"
 
+#: 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."
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:5
+msgid "Your GOsa session has expired!"
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:7
+msgid ""
+"The last interaction with the GOsa web interface has been some time ago in "
+"the past. For security reasons, the session has been closed. To continue "
+"with administrative tasks, please sign in again."
+msgstr ""
+
+#: ihtml/themes/default/logout.tpl:10
+#, fuzzy
+msgid "Sign in again"
+msgstr "Entrando"
+
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy &amp; paste wizard"
 msgstr ""
@@ -13246,18 +13450,157 @@ msgid ""
 "maintain the values below to fullfill the policies."
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:18
+#: ihtml/themes/default/copyPasteDialog.tpl:21
 #, fuzzy
 msgid "Operation complete"
 msgstr "incompleto"
 
-#: ihtml/themes/default/setup_step4.tpl:100
-#: ihtml/themes/lhs/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."
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
 msgstr ""
 
+#: ihtml/themes/default/accountexpired.tpl:23
+#: ihtml/themes/default/accountexpired.tpl:27
+#, fuzzy
+msgid "Old Password"
+msgstr "Contraseña"
+
+#: ihtml/themes/default/accountexpired.tpl:32
+#: ihtml/themes/default/accountexpired.tpl:36
+#, fuzzy
+msgid "New Password"
+msgstr "Nueva contraseña"
+
+#: ihtml/themes/default/accountexpired.tpl:41
+#: ihtml/themes/default/accountexpired.tpl:45
+#, fuzzy
+msgid "Verify Password"
+msgstr "Contraseña"
+
+#: ihtml/themes/default/accountexpired.tpl:51
+#, fuzzy
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: ihtml/themes/default/accountexpired.tpl:52
+#, fuzzy
+msgid "Click here to Change your password"
+msgstr "No tiene permisos para cambiar su contraseña."
+
+#, fuzzy
+#~ msgid "Choose a template to delete or edit"
+#~ msgstr "Elija un departamento para guardar la entrada"
+
+#~ msgid "You have no permissions to create a printer on this 'Base'."
+#~ msgstr "No tiene permisos para crear una impresora en esta 'Base'."
+
+#, fuzzy
+#~ msgid "save"
+#~ msgstr "Guardar"
+
+#~ msgid "Enter the filename of the kernel to use"
+#~ msgstr "Introduzca el nombre del fichero del núcleo que se usara"
+
+#~ msgid "Choose LDAP server to use for accounts and terminal management"
+#~ msgstr ""
+#~ "Elija que servidor LDAP se usara para gestión de cuentas de usuario y "
+#~ "terminales"
+
+#, fuzzy
+#~ msgid "Settings for host entry #%s"
+#~ msgstr "Localización de este subarbol"
+
+#, fuzzy
+#~ msgid ""
+#~ "The name '%s' can't be used as host entry, the name is already used in "
+#~ "this ldap tree."
+#~ msgstr "Una persona con el nombre elegido ya existe en el árbol"
+
+#, fuzzy
+#~ msgid ""
+#~ "Can't rename '%s' to '%s',the destination name contains invalid "
+#~ "characters."
+#~ msgstr "¡El atributo '%s' está vacío o contiene caracteres no validos!"
+
+#, fuzzy
+#~ msgid "DFS Shares"
+#~ msgstr "Borrar"
+
+#, fuzzy
+#~ msgid "Go up one dfsshare"
+#~ msgstr "Nombre del departamento"
+
+#, fuzzy
+#~ msgid "Create new dfsshare"
+#~ msgstr "Crear una nueva entrada en"
+
+#, fuzzy
+#~ msgid "You have no premissions to create a dfs share."
+#~ msgstr "No tiene permisos para crear un usuario en esta 'Base'."
+
+#, fuzzy
+#~ msgid "Dfs share already exists."
+#~ msgstr "Ya existe un Departamento con este 'Nombre'."
+
+#, fuzzy
+#~ msgid "Required Field \"Name of dfs Share\" is not set."
+#~ msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#, fuzzy
+#~ msgid "Required Field \"Description\" is not set."
+#~ msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+
+#, fuzzy
+#~ msgid "Required Field \"Fileserver\" is not set."
+#~ msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#, fuzzy
+#~ msgid "Required Field \"Share on fileserver\" is not set."
+#~ msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#, fuzzy
+#~ msgid "Required Field \"Location\" is not set."
+#~ msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+
+#, fuzzy
+#~ msgid ""
+#~ "This menu allows you to create, delete and edit selected dfs shares. "
+#~ "Having a large numbers of dfs shares, you might prefer the range "
+#~ "selectors on top of the dfs share list."
+#~ msgstr ""
+#~ "Este menú permite añadir, editar o eliminar los departamentos "
+#~ "seleccionados. Puede usar el selector de rango en la parte superior de la "
+#~ "lista de departamentos, cuando trabaja con un gran número de "
+#~ "departamentos."
+
+#, fuzzy
+#~ msgid "Display dfs shares matching"
+#~ msgstr "Mostrar direcciones que concuerden con"
+
+#, fuzzy
+#~ msgid "Regular expression for matching dfs share names"
+#~ msgstr "Expresiones regulares para encontrar nombres de sistemas"
+
+#, fuzzy
+#~ msgid "DFS Properties"
+#~ msgstr "Propiedades"
+
+#, fuzzy
+#~ msgid "Name of dfs Share"
+#~ msgstr "Nombre del departamento"
+
+#, fuzzy
+#~ msgid "Fileserver"
+#~ msgstr "Servidor"
+
+#, fuzzy
+#~ msgid "Share on Fileserver"
+#~ msgstr "Servicio de impresión"
+
+#, fuzzy
+#~ msgid "DFS Location"
+#~ msgstr "Localización"
+
 #, fuzzy
 #~ msgid "DFS shares"
 #~ msgstr "Borrar"
@@ -13270,10 +13613,6 @@ msgstr ""
 #~ msgid "Successfully finished"
 #~ msgstr "Configuración finalizada"
 
-#, fuzzy
-#~ msgid "Releases"
-#~ msgstr "Paquete de reglas"
-
 #~ msgid "No SMTP smarthost/relayhost set."
 #~ msgstr "No se ha indicado SMTP smarthost/relayhost"
 
@@ -13332,9 +13671,6 @@ msgstr ""
 #~ msgid "DNS-Zone"
 #~ msgstr "ninguno"
 
-#~ msgid "Network settings"
-#~ msgstr "Configuración de red"
-
 #, fuzzy
 #~ msgid "close"
 #~ msgstr "Elige"
@@ -13408,10 +13744,6 @@ msgstr ""
 #~ msgid "Can change password"
 #~ msgstr "Cambiar contraseña"
 
-#, fuzzy
-#~ msgid "Password expiry"
-#~ msgstr "La contraseña expira en"
-
 #, fuzzy
 #~ msgid "Home path"
 #~ msgstr "Teléfono particular"
@@ -13424,10 +13756,6 @@ msgstr ""
 #~ msgid "Samba domain name"
 #~ msgstr "Directorio Samba"
 
-#, fuzzy
-#~ msgid "Allow password change"
-#~ msgstr "Nueva contraseña"
-
 #, fuzzy
 #~ msgid "Lock account"
 #~ msgstr "Bloquear cuenta samba"
@@ -13494,9 +13822,6 @@ msgstr ""
 #~ msgid "st"
 #~ msgstr "Borrar"
 
-#~ msgid "Edit parameters"
-#~ msgstr "Editar parametros"
-
 #~ msgid "Edit optional application parameters"
 #~ msgstr "Editar parámetros de aplicaciones opcionales"
 
@@ -13852,10 +14177,6 @@ msgstr ""
 #~ msgid "Object type"
 #~ msgstr "Nombre de objeto"
 
-#, fuzzy
-#~ msgid "Set phone password"
-#~ msgstr "Poner Contraseña"
-
 #, fuzzy
 #~ msgid "Set voicemail password"
 #~ msgstr "Poner Contraseña"