Updated locales. Fixed small typos

[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 247e166f4e0fe44fc07d32302d3d2d9e21232b84..7bcdef53aced822ce1c22be31b57fc53b65f43a2 100644 (file)
--- a/locale/es/LC_MESSAGES/messages.po
+++ b/locale/es/LC_MESSAGES/messages.po
@@ -1,7 +1,3 @@
-# translation of messages.po to 
-# translation of messages.po to
-# translation of messages.po to
-# translation of messages.po to
 # translation of messages.po to es_ES
 # Alejandro Escanero Blanco <alex@ofmin.com>, 2003, 2005.
 msgid ""
@@ -19,204 +15,210 @@ 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:151
+#: contrib/gosa.conf:156 contrib/gosa.conf:161 contrib/gosa.conf:166
+#: contrib/gosa.conf:171 contrib/gosa.conf:176
 #: 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/paste_generic.tpl:4
 #: plugins/gofax/faxaccount/generic.tpl:6
 #: 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/faiProfile.tpl:4 plugins/admin/fai/faiProfile.tpl:32
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:2
 #: 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/fai/faiPackage.tpl:4 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/glpi.tpl:6 plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/systems/servkolab.tpl:6
 #: plugins/admin/systems/servdnseditzone.tpl:1
-#: plugins/admin/systems/glpiPrinter.tpl:6
+#: plugins/admin/ogroups/termgroup.tpl:6
 #: 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_divListGroup.inc:136
+#: plugins/admin/users/class_divListUsers.inc:164
 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_divListGroup.inc:128
+#: plugins/admin/users/class_divListUsers.inc:166
 #: plugins/admin/ogroups/tabs_ogroups.inc:72
-#: plugins/admin/ogroups/tabs_ogroups.inc:160
-#: plugins/admin/ogroups/class_ogroupManagement.inc:484
+#: plugins/admin/ogroups/tabs_ogroups.inc:171
+#: plugins/admin/ogroups/class_divListOGroup.inc:146
 #: 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_divListGroup.inc:130
+#: plugins/admin/users/class_divListUsers.inc:172
 #: 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_divListUsers.inc:174
+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
-#: plugins/personal/generic/generic.tpl:398
+#: contrib/gosa.conf:83 plugins/personal/generic/generic.tpl:271
+#: plugins/personal/generic/generic.tpl:402
+#: plugins/gofax/faxaccount/paste_generic.tpl:8
 #: plugins/gofax/faxaccount/generic.tpl:10
 #: plugins/addons/addressbook/contents.tpl:14
-#: plugins/admin/users/class_userManagement.inc:865
-#: plugins/admin/departments/generic.tpl:63
+#: plugins/admin/users/class_divListUsers.inc:170
+#: plugins/admin/departments/generic.tpl:67
 #: 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
-#: plugins/personal/generic/generic.tpl:388
+#: contrib/gosa.conf:84 plugins/personal/generic/generic.tpl:254
+#: plugins/personal/generic/generic.tpl:392
+#: plugins/addons/addressbook/address_edit.tpl:85
+#: plugins/addons/addressbook/address_edit.tpl:195
 #: plugins/addons/addressbook/contents.tpl:14
 #: plugins/addons/addressbook/address_info.tpl:37
 #: plugins/addons/addressbook/address_info.tpl:85
-#: plugins/addons/addressbook/address_edit.tpl:85
-#: plugins/addons/addressbook/address_edit.tpl:195
-#: plugins/admin/groups/class_groupManagement.inc:512
-#: plugins/admin/users/class_userManagement.inc:863
-#: plugins/admin/departments/generic.tpl:59
+#: plugins/admin/groups/class_divListGroup.inc:134
+#: plugins/admin/users/class_divListUsers.inc:168
+#: plugins/admin/departments/generic.tpl:63
 #: plugins/admin/systems/chooser.tpl:12
-#: plugins/admin/systems/class_systemManagement.inc:921
-#: plugins/admin/ogroups/class_ogroupManagement.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:588
+#: plugins/admin/systems/class_systemManagement.inc:742
+#: plugins/admin/ogroups/class_ogroupManagement.inc:368
 #: 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:147 contrib/gosa.conf:152
+#: contrib/gosa.conf:157 contrib/gosa.conf:162 contrib/gosa.conf:167
+#: contrib/gosa.conf:172 contrib/gosa.conf:177
 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:67
-#: plugins/admin/systems/printerPPDDialog.tpl:17
+#: contrib/gosa.conf:100 plugins/admin/applications/generic.tpl:73
 #: plugins/admin/systems/class_servRepository.inc:250
+#: plugins/admin/systems/printerPPDDialog.tpl:17
 #: plugins/admin/ogroups/phonequeue.tpl:31
-#: plugins/gofon/conference/generic.tpl:87
+#: plugins/gofon/conference/generic.tpl:92
 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
-#: plugins/admin/ogroups/tabs_ogroups.inc:92
+#: contrib/gosa.conf:117 contrib/gosa.conf:126 contrib/gosa.conf:142
+#: plugins/admin/ogroups/tabs_ogroups.inc:95
 msgid "Startup"
 msgstr "Inicio"
 
-#: contrib/gosa.conf:115 contrib/gosa.conf:140
-#: plugins/admin/ogroups/tabs_ogroups.inc:96
+#: contrib/gosa.conf:118 contrib/gosa.conf:143
+#: plugins/admin/ogroups/tabs_ogroups.inc:99
 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
-#: plugins/admin/ogroups/class_ogroupManagement.inc:62
-#: plugins/admin/ogroups/class_ogroupManagement.inc:591
+#: contrib/gosa.conf:119 contrib/gosa.conf:144
+#: plugins/personal/environment/environment.tpl:173
+#: plugins/admin/systems/class_systemManagement.inc:751
+#: plugins/admin/ogroups/class_ogroupManagement.inc:371
 #: plugins/generic/references/class_reference.inc:52
 msgid "Printer"
 msgstr "Impresora"
 
-#: contrib/gosa.conf:117 contrib/gosa.conf:133 contrib/gosa.conf:142
-#: plugins/gofax/blocklists/generic.tpl:70
-#: plugins/gofax/blocklists/headpage.tpl:20
+#: contrib/gosa.conf:120 contrib/gosa.conf:136 contrib/gosa.conf:145
+#: plugins/gofax/blocklists/generic.tpl:75
 #: 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/groups/headpage.tpl:21 plugins/admin/users/headpage.tpl:20
-#: plugins/admin/applications/headpage.tpl:20
+#: plugins/admin/fai/faiPackageEntry.tpl:22
 #: plugins/admin/departments/headpage.tpl:20
-#: plugins/admin/systems/headpage.tpl:20
-#: plugins/admin/systems/servRepository.tpl:24
+#: plugins/admin/systems/glpiPrinter.tpl:104
+#: plugins/admin/systems/glpiDeviceManagement.tpl:20
 #: plugins/admin/systems/glpiSelectUser.tpl:20
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:20
+#: plugins/admin/systems/servRepository.tpl:24
 #: plugins/admin/systems/glpiAttachmentPool.tpl:20
-#: plugins/admin/systems/glpiDeviceManagement.tpl:20
-#: plugins/admin/systems/glpiPrinter.tpl:104
-#: plugins/admin/ogroups/headpage.tpl:20 plugins/gofon/macro/headpage.tpl:20
+#: plugins/admin/systems/glpiPrinterCartridges.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:24
+#: ihtml/themes/default/MultiSelectWindow.tpl:61
 msgid "Information"
 msgstr "Información"
 
-#: contrib/gosa.conf:123
+#: contrib/gosa.conf:127
 msgid "Databases"
 msgstr "Bases de datos"
 
-#: contrib/gosa.conf:124 plugins/admin/systems/servkolab.tpl:7
+#: contrib/gosa.conf:128 plugins/admin/systems/servkolab.tpl:26
 msgid "Services"
 msgstr "Servicios"
 
-#: contrib/gosa.conf:130 contrib/gosa.conf:132
+#: contrib/gosa.conf:132 contrib/gosa.conf:134
 #: plugins/admin/fai/faiPackage.tpl:29
 #: plugins/admin/systems/servRepositorySetup.tpl:1
 #, fuzzy
 msgid "Repository"
 msgstr "Reintentar"
 
-#: contrib/gosa.conf:183
+#: contrib/gosa.conf:135 contrib/gosa.conf:146
+msgid "FAI summary"
+msgstr ""
+
+#: contrib/gosa.conf:187
 msgid "OGo"
 msgstr ""
 
-#: contrib/gosa.conf:195 plugins/addons/ldapmanager/contentexportxls.tpl:19
+#: contrib/gosa.conf:199 plugins/addons/ldapmanager/contentexportxls.tpl:19
 #: plugins/addons/ldapmanager/contentexportxls.tpl:32
 #: plugins/addons/ldapmanager/contentexportxls.tpl:47
 #: plugins/addons/ldapmanager/contentexport.tpl:16
@@ -225,96 +227,103 @@ msgstr ""
 msgid "Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:196
+#: contrib/gosa.conf:200
 #, fuzzy
 msgid "Excel Export"
 msgstr "Exportar"
 
-#: contrib/gosa.conf:197 plugins/personal/mail/generic.tpl:113
+#: contrib/gosa.conf:201 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:95
+#: plugins/admin/applications/generic.tpl:101
 msgid "Import"
 msgstr "Importar"
 
-#: contrib/gosa.conf:198
+#: contrib/gosa.conf:202
 msgid "CSV Import"
 msgstr "Importación desde CVS"
 
-#: contrib/gosa.conf:202
+#: contrib/gosa.conf:206
 #, fuzzy
 msgid "Partitions"
 msgstr "Destino"
 
-#: contrib/gosa.conf:206 plugins/personal/environment/logonManagement.tpl:55
+#: contrib/gosa.conf:210 plugins/personal/environment/logonManagement.tpl:55
 #: plugins/admin/fai/faiScriptEntry.tpl:50
 #: plugins/admin/fai/faiHookEntry.tpl:50
-#: plugins/admin/applications/generic.tpl:93
+#: plugins/admin/applications/generic.tpl:99
 #, 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:214 plugins/admin/fai/class_faiSummaryTab.inc:40
 msgid "Hooks"
 msgstr ""
 
-#: contrib/gosa.conf:214 plugins/admin/fai/class_faiManagement.inc:760
-#: plugins/admin/fai/class_faiManagement.inc:761
+#: contrib/gosa.conf:218 plugins/admin/fai/class_faiSummaryTab.inc:41
 #, 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:222 plugins/admin/fai/class_faiSummaryTab.inc:42
 #, fuzzy
 msgid "Templates"
 msgstr "Plantilla"
 
-#: contrib/gosa.conf:222 plugins/personal/environment/environment.tpl:7
+#: contrib/gosa.conf:226 plugins/personal/environment/environment.tpl:7
+#: plugins/admin/fai/class_faiSummaryTab.inc:45
 #, fuzzy
 msgid "Profiles"
 msgstr "Ruta del Perfil"
 
-#: contrib/gosa.conf:226
+#: contrib/gosa.conf:227
+msgid "Summary"
+msgstr ""
+
+#: contrib/gosa.conf:231
 #, fuzzy
 msgid "Packages"
 msgstr "Mostrar teléfonos"
 
-#: contrib/gosa.conf:248
+#: contrib/gosa.conf:255
 msgid "{LOCATIONNAME}"
 msgstr "{LOCATIONNAME}"
 
-#: contrib/gosa.conf:266 plugins/admin/ogroups/class_phonequeue.inc:164
+#: contrib/gosa.conf:273 plugins/admin/ogroups/class_phonequeue.inc:164
 msgid "German"
 msgstr "Alemán"
 
-#: contrib/gosa.conf:267
+#: contrib/gosa.conf:274
 msgid "Russian"
 msgstr "Ruso"
 
-#: contrib/gosa.conf:268
+#: contrib/gosa.conf:275
 msgid "Spanish"
 msgstr "Español"
 
-#: contrib/gosa.conf:269
+#: contrib/gosa.conf:276
 msgid "French"
 msgstr "Francés"
 
-#: contrib/gosa.conf:270
+#: contrib/gosa.conf:277
 msgid "Dutch"
 msgstr "Holandés"
 
-#: contrib/gosa.conf:271
+#: contrib/gosa.conf:278
 msgid "English"
 msgstr "Inglés"
 
-#: contrib/gosa.conf:272
+#: contrib/gosa.conf:279
 msgid "Italian"
 msgstr "Italiano"
 
+#: contrib/gosa.conf:280
+#, fuzzy
+msgid "Polish"
+msgstr "Inglés"
+
 #: plugins/personal/nagios/class_nagiosAccount.inc:19
 #: plugins/personal/mail/class_mailAccount.inc:23
 #: plugins/personal/password/class_password.inc:6
@@ -330,13 +339,14 @@ msgstr "Italiano"
 #: 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_opengwAccount.inc:7
 #: plugins/personal/connectivity/class_phpscheduleitAccount.inc:28
 #: plugins/personal/connectivity/class_connectivity.inc:16
-#: plugins/personal/connectivity/class_opengwAccount.inc:7
 #: 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/godfs/class_dfsManagment.inc:11
 #: plugins/addons/mailqueue/class_mailqueue.inc:7
 #: plugins/addons/ldapmanager/class_csvimport.inc:7
 #: plugins/addons/ldapmanager/class_exportxls.inc:8
@@ -345,14 +355,14 @@ msgstr "Italiano"
 #: plugins/addons/ldapmanager/class_export.inc:7
 #: plugins/addons/logview/class_logview.inc:7
 #: plugins/admin/groups/class_groupManagement.inc:26
-#: plugins/admin/users/class_userManagement.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/fonreports/class_fonreport.inc:7
 #: 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"
 
@@ -389,131 +399,157 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:165
+#: plugins/personal/nagios/class_nagiosAccount.inc:147
+#, fuzzy
+msgid "Saving nagios account failed"
+msgstr "Crear cuenta de correo"
+
+#: plugins/personal/nagios/class_nagiosAccount.inc:167
 #, fuzzy
 msgid "The required field 'NagiosAlias' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:168
+#: plugins/personal/nagios/class_nagiosAccount.inc:170
 #, fuzzy
 msgid "The required field 'NagiosMail' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/nagios/class_nagiosAccount.inc:172
-#: plugins/personal/nagios/class_nagiosAccount.inc:176
+#: plugins/personal/nagios/class_nagiosAccount.inc:174
+#: plugins/personal/nagios/class_nagiosAccount.inc:178
 #, 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/nagios/class_nagiosAccount.inc:226
+#, fuzzy
+msgid "Removing nagios account failed"
+msgstr "Borrar cuenta de correo"
+
 #: 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/main.inc:104
+#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: 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/blocklists/generic.tpl:85
 #: plugins/gofax/faxaccount/main.inc:89
-#: 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:539
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:29
+#: plugins/admin/groups/class_groupManagement.inc:326
+#: plugins/admin/users/class_userManagement.inc:623
+#: plugins/admin/applications/class_applicationManagement.inc:348
+#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:74
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
+#: plugins/admin/systems/glpi_devices.tpl:760
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
+#: plugins/admin/systems/servdnseditzone.tpl:119
+#: plugins/admin/systems/servnfs.tpl:120
+#: plugins/admin/systems/class_systemManagement.inc:476
+#: plugins/admin/ogroups/class_ogroupManagement.inc:331
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:261
 #: 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:239
+#: include/class_MultiSelectWindow.inc:66
+#: 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:67
+#: plugins/personal/posix/posix_groups.tpl:81
 #: plugins/personal/posix/trust_machines.tpl:41
-#: plugins/personal/posix/main.inc:112
+#: plugins/personal/posix/main.inc:112 plugins/personal/netatalk/main.inc:106
 #: plugins/personal/samba/samba3_workstations.tpl:41
 #: 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/environment/hotplugDialogNew.tpl:39
 #: 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/gofax/blocklists/generic.tpl:82
+#: plugins/gofax/blocklists/generic.tpl:87
 #: 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/remove.tpl:16
 #: plugins/addons/addressbook/address_edit.tpl:234
-#: plugins/admin/fai/class_faiManagement.inc:607
-#: plugins/admin/fai/class_faiManagement.inc:612
+#: plugins/addons/addressbook/remove.tpl:16
+#: plugins/addons/godfs/class_dfsManagment.inc:249
+#: plugins/admin/fai/class_faiManagement.inc:541
+#: plugins/admin/fai/class_faiManagement.inc:546
 #: plugins/admin/fai/faiProfileEntry.tpl:71
 #: plugins/admin/fai/faiPackageConfiguration.tpl:7
 #: plugins/admin/fai/faiScriptEntry.tpl:69
 #: plugins/admin/fai/faiPartitionTableEntry.tpl:30
-#: plugins/admin/fai/faiPackageNew.tpl:45
+#: plugins/admin/fai/faiPackageNew.tpl:51
+#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/faiVariableEntry.tpl:49
 #: plugins/admin/fai/faiPackageEntry.tpl:57 plugins/admin/fai/remove.tpl:17
 #: plugins/admin/fai/faiHookEntry.tpl:71
-#: plugins/admin/fai/faiTemplateEntry.tpl:131
-#: plugins/admin/fai/faiNewBranch.tpl:20
 #: plugins/admin/fai/remove_branch.tpl:16
-#: plugins/admin/groups/class_groupManagement.inc:414
+#: plugins/admin/fai/faiTemplateEntry.tpl:131
+#: plugins/admin/groups/class_groupManagement.inc:328
 #: plugins/admin/groups/remove.tpl:16
 #: plugins/admin/groups/group_objects.tpl:57
 #: plugins/admin/groups/mail_admins.tpl:39
-#: plugins/admin/groups/application_options.tpl:10
+#: plugins/admin/groups/application_options.tpl:13
 #: plugins/admin/groups/mail_locals.tpl:68 plugins/admin/users/password.tpl:23
-#: plugins/admin/users/class_userManagement.inc:722
-#: plugins/admin/users/remove.tpl:16 plugins/admin/users/template.tpl:46
+#: plugins/admin/users/class_userManagement.inc:625
+#: plugins/admin/users/template.tpl:50 plugins/admin/users/remove.tpl:16
 #: plugins/admin/applications/remove.tpl:15
-#: plugins/admin/applications/class_applicationManagement.inc:432
+#: plugins/admin/applications/class_applicationManagement.inc:350
 #: plugins/admin/departments/remove.tpl:16
-#: plugins/admin/departments/class_departmentManagement.inc:369
-#: plugins/admin/systems/chooser.tpl:18
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
-#: plugins/admin/systems/printerPPDDialog.tpl:23
-#: plugins/admin/systems/class_systemManagement.inc:722
-#: plugins/admin/systems/servnfs.tpl:76 plugins/admin/systems/remove.tpl:16
-#: plugins/admin/systems/password.tpl:30
-#: plugins/admin/systems/servRepositorySetup.tpl:43
-#: plugins/admin/systems/glpi_edit_type.tpl:29
-#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/departments/class_departmentManagement.inc:300
 #: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:75
-#: plugins/admin/systems/glpiSelectUser.tpl:51
-#: plugins/admin/systems/glpi_edit_os.tpl:29
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:52
-#: plugins/admin/systems/glpiAttachmentPool.tpl:52
-#: plugins/admin/systems/servdnseditzone.tpl:122
-#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: plugins/admin/systems/glpi_edit_type.tpl:29
 #: plugins/admin/systems/glpi_edit_printer_type.tpl:30
 #: plugins/admin/systems/glpi_devices.tpl:761
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/glpiDeviceManagement.tpl:52
+#: plugins/admin/systems/servRepositorySetup.tpl:43
 #: plugins/admin/systems/SelectDeviceType.tpl:45
+#: plugins/admin/systems/glpi_edit_os.tpl:29
 #: plugins/admin/systems/class_baseSelectDialog.inc:41
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:21
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:70
+#: plugins/admin/systems/glpiSelectUser.tpl:51
+#: plugins/admin/systems/remove.tpl:16
+#: plugins/admin/systems/glpiAttachmentPool.tpl:52
+#: plugins/admin/systems/servdnseditzone.tpl:120
+#: plugins/admin/systems/remove_glpi.tpl:16
+#: plugins/admin/systems/password.tpl:30
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:52
+#: plugins/admin/systems/chooser.tpl:18
+#: plugins/admin/systems/printerPPDDialog.tpl:23
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:61
+#: plugins/admin/systems/servnfs.tpl:121
+#: plugins/admin/systems/class_systemManagement.inc:478
 #: plugins/admin/ogroups/ogroup_objects.tpl:52
-#: plugins/admin/ogroups/class_ogroupManagement.inc:402
+#: plugins/admin/ogroups/class_ogroupManagement.inc:333
 #: plugins/admin/ogroups/remove.tpl:16
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:302
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:263
 #: 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:241
 #: 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/altlinux/islocked.tpl:15
+#: ihtml/themes/default/copyPasteDialog.tpl:15
+#: ihtml/themes/default/islocked.tpl:15
 msgid "Cancel"
 msgstr "Cancelar"
 
 #: plugins/personal/nagios/main.inc:114 plugins/personal/mail/main.inc:114
-#: plugins/personal/posix/main.inc:120 plugins/personal/samba/main.inc:114
+#: plugins/personal/posix/main.inc:120 plugins/personal/netatalk/main.inc:111
+#: plugins/personal/samba/main.inc:114
 #: plugins/personal/environment/main.inc:114
 #: plugins/personal/generic/main.inc:179
 #: plugins/personal/connectivity/main.inc:128
@@ -524,8 +560,9 @@ msgstr ""
 "Pulse en el botón - Editar - para cambiar la información de esta ventana"
 
 #: 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:139
+#: plugins/personal/posix/main.inc:122 plugins/personal/netatalk/main.inc:112
+#: plugins/personal/samba/main.inc:115
+#: plugins/personal/environment/environment.tpl:140
 #: plugins/personal/environment/main.inc:115
 #: plugins/personal/generic/main.inc:172
 #: plugins/personal/connectivity/main.inc:129
@@ -533,18 +570,17 @@ msgstr ""
 #: plugins/gofax/faxaccount/generic.tpl:92
 #: plugins/gofax/faxaccount/main.inc:97 plugins/addons/logview/contents.tpl:62
 #: plugins/admin/fai/faiPartitionTable.tpl:44
-#: plugins/admin/fai/faiVariable.tpl:45 plugins/admin/fai/faiScript.tpl:45
-#: plugins/admin/fai/faiTemplate.tpl:42 plugins/admin/fai/faiHook.tpl:45
+#: plugins/admin/fai/faiVariable.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/systems/servdns.tpl:7
 #: 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/glpiManufacturer.tpl:7
-#: plugins/admin/systems/glpi.tpl:48 plugins/admin/systems/glpi.tpl:56
-#: plugins/admin/systems/glpi.tpl:85
 #: plugins/admin/systems/servdnseditzone.tpl:31
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:191
-#: plugins/admin/systems/glpiPrinter.tpl:73
-#: plugins/admin/systems/glpiPrinter.tpl:82
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:167
+#: plugins/admin/systems/printer.tpl:52
 #: plugins/gofon/phoneaccount/main.inc:113
 msgid "Edit"
 msgstr "Editar"
@@ -591,9 +627,9 @@ msgid "Host notification options"
 msgstr "Opciones de aplicaciones"
 
 #: 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
+#: plugins/personal/generic/generic.tpl:265
+#: 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"
@@ -644,56 +680,33 @@ msgstr ""
 msgid "trigger all host commands"
 msgstr ""
 
-#: plugins/personal/mail/generic.tpl:7 plugins/personal/mail/copypaste.tpl:7
+#: 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/mail/copypaste.tpl:7 plugins/personal/mail/generic.tpl:7
 #: plugins/admin/groups/mail.tpl:10 plugins/admin/groups/paste_mail.tpl:8
 #: plugins/admin/ogroups/mail.tpl:10
 msgid "Primary address"
 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/generic/references/class_reference.inc:44
-msgid "Server"
-msgstr "Servidor"
-
-#: plugins/personal/mail/generic.tpl:14
-msgid "Specify the mail server where the user will be hosted on"
-msgstr "Especificar el servidor de correo donde el usuario estará hospedado."
-
-#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
-msgid "Quota usage"
-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
-msgid "not defined"
-msgstr "sin definirse"
-
-#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
-msgid "Quota size"
-msgstr "Tamaño de la Cola de correo"
+#: plugins/personal/mail/copypaste.tpl:13
+#: plugins/personal/mail/generic.tpl:119
+msgid "Forward messages to"
+msgstr "reenviar mensajes a"
 
-#: plugins/personal/mail/generic.tpl:49 plugins/personal/mail/copypaste.tpl:35
+#: plugins/personal/mail/copypaste.tpl:25 plugins/personal/mail/generic.tpl:49
 #: 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/admin/groups/mail.tpl:45 plugins/admin/groups/paste_mail.tpl:24
-#: plugins/admin/systems/phonesettings.tpl:170
-#: plugins/admin/systems/phonesettings.tpl:185
-msgid "List of alternative mail addresses"
-msgstr "Lista de direcciones de correo alternativas."
-
-#: plugins/personal/mail/generic.tpl:57 plugins/personal/mail/generic.tpl:128
+#: plugins/personal/mail/copypaste.tpl:43
+#: plugins/personal/mail/copypaste.tpl:61 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/posix/posix_groups.tpl:65
+#: plugins/personal/posix/posix_groups.tpl:79
+#: plugins/personal/posix/paste_generic.tpl:61
 #: plugins/personal/posix/trust_machines.tpl:39
 #: plugins/personal/posix/generic.tpl:73
 #: plugins/personal/posix/generic.tpl:102
@@ -701,113 +714,156 @@ msgstr "Lista de direcciones de correo alternativas."
 #: 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/blocklists/generic.tpl:68
 #: plugins/gofax/faxaccount/generic.tpl:76
 #: plugins/gofax/faxaccount/locals.tpl:60
 #: plugins/gofax/faxaccount/lists.tpl:13
 #: plugins/admin/fai/faiPartitionTable.tpl:43
-#: plugins/admin/fai/faiVariable.tpl:44 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/fai/faiVariable.tpl:44 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/fai/faiPackage.tpl:71
 #: 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/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/generic.tpl:108 plugins/admin/groups/paste_mail.tpl:30
 #: plugins/admin/groups/paste_mail.tpl:41
+#: plugins/admin/groups/mail_locals.tpl:66
+#: plugins/admin/groups/class_groupMail.inc:540
+#: 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_printer_type.tpl:7
+#: plugins/admin/systems/workstationStartup.tpl:103
+#: plugins/admin/systems/workstationStartup.tpl:124
+#: plugins/admin/systems/workstationStartup.tpl:143
+#: plugins/admin/systems/terminal.tpl:99
+#: plugins/admin/systems/servRepositorySetup.tpl:36
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
+#: plugins/admin/systems/servdns.tpl:6
+#: plugins/admin/systems/workstation.tpl:78
+#: plugins/admin/systems/class_servDNSeditZone.inc:486
 #: plugins/admin/systems/servservice.tpl:20
 #: plugins/admin/systems/servservice.tpl:47
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
-#: plugins/admin/systems/workstationStartup.tpl:57
-#: plugins/admin/systems/workstationStartup.tpl:77
-#: plugins/admin/systems/workstationStartup.tpl:96
-#: plugins/admin/systems/servdns.tpl:6
+#: plugins/admin/systems/glpi_edit_os.tpl:8
 #: plugins/admin/systems/phonesettings.tpl:176
 #: plugins/admin/systems/phonesettings.tpl:191
-#: plugins/admin/systems/terminalStartup.tpl:57
-#: plugins/admin/systems/terminalStartup.tpl:76
-#: plugins/admin/systems/servRepositorySetup.tpl:36
-#: plugins/admin/systems/glpi_edit_type.tpl:8
 #: plugins/admin/systems/glpiManufacturer.tpl:6
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:6
-#: plugins/admin/systems/glpi_edit_os.tpl:8
-#: plugins/admin/systems/class_termDNS.inc:416
-#: plugins/admin/systems/class_termDNS.inc:436
-#: plugins/admin/systems/glpi.tpl:100
+#: plugins/admin/systems/class_termDNS.inc:460
+#: plugins/admin/systems/class_termDNS.inc:480
 #: plugins/admin/systems/servdnseditzone.tpl:106
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:7
-#: plugins/admin/systems/glpiPrinter.tpl:93
-#: plugins/admin/systems/glpiPrinter.tpl:121
-#: plugins/admin/systems/class_servDNSeditZone.inc:476
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:387
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:389
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:60
+#: plugins/admin/systems/terminalStartup.tpl:61
+#: plugins/admin/systems/terminalStartup.tpl:80
 #: plugins/admin/ogroups/ogroup_objects.tpl:50
-#: plugins/admin/ogroups/generic.tpl:39
+#: plugins/admin/ogroups/termgroup.tpl:23 plugins/admin/ogroups/generic.tpl:43
 #: plugins/admin/ogroups/phonequeue.tpl:24
+#: plugins/gofon/phoneaccount/paste_generic.tpl:18
 #: plugins/gofon/phoneaccount/generic.tpl:13
-#: plugins/gofon/phoneaccount/paste_generic.tpl:14
 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:44
+#: plugins/personal/mail/generic.tpl:130
+#: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
+#: plugins/admin/groups/paste_mail.tpl:42
+msgid "Add local"
+msgstr "Añadir Cuenta Local"
+
 #: plugins/personal/mail/copypaste.tpl:45
+#: plugins/personal/mail/copypaste.tpl:62 plugins/personal/mail/generic.tpl:59
+#: plugins/personal/mail/generic.tpl:132
+#: plugins/personal/posix/paste_generic.tpl:62
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/generic.tpl:104
 #: 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/generic.tpl:69
 #: 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/faiPartitionTable.tpl:45
-#: plugins/admin/fai/faiVariable.tpl:46 plugins/admin/fai/faiScript.tpl:46
-#: plugins/admin/fai/faiTemplate.tpl:43 plugins/admin/fai/remove.tpl:15
-#: plugins/admin/fai/faiHook.tpl:46 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/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:110 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/glpi_edit_type.tpl:10
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
+#: plugins/admin/systems/workstationStartup.tpl:104
+#: plugins/admin/systems/workstationStartup.tpl:125
+#: plugins/admin/systems/terminal.tpl:101
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
+#: plugins/admin/systems/workstation.tpl:80
+#: plugins/admin/systems/class_servDNSeditZone.inc:292
+#: plugins/admin/systems/class_servDNSeditZone.inc:480
 #: plugins/admin/systems/servservice.tpl:22
 #: plugins/admin/systems/servservice.tpl:48
-#: plugins/admin/systems/workstationStartup.tpl:58
-#: plugins/admin/systems/workstationStartup.tpl:78
-#: plugins/admin/systems/printer.tpl:71 plugins/admin/systems/printer.tpl:87
+#: plugins/admin/systems/glpi_edit_os.tpl:10
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
 #: plugins/admin/systems/phonesettings.tpl:177
 #: plugins/admin/systems/phonesettings.tpl:192
+#: plugins/admin/systems/class_termDNS.inc:474
 #: plugins/admin/systems/remove.tpl:14
-#: plugins/admin/systems/terminalStartup.tpl:58
-#: plugins/admin/systems/glpi_edit_type.tpl:10
 #: plugins/admin/systems/remove_glpi.tpl:14
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:8
-#: plugins/admin/systems/glpi_edit_os.tpl:10
-#: plugins/admin/systems/class_termDNS.inc:430
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:9
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:192
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:168
-#: plugins/admin/systems/class_servDNSeditZone.inc:292
-#: plugins/admin/systems/class_servDNSeditZone.inc:470
-#: 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/admin/systems/terminalStartup.tpl:62
+#: plugins/admin/systems/printer.tpl:76 plugins/admin/systems/printer.tpl:92
+#: plugins/admin/ogroups/termgroup.tpl:25 plugins/admin/ogroups/generic.tpl:44
+#: plugins/admin/ogroups/remove.tpl:14 plugins/admin/ogroups/phonequeue.tpl:25
+#: plugins/gofon/macro/remove.tpl:13
+#: plugins/gofon/phoneaccount/paste_generic.tpl:19
 #: plugins/gofon/phoneaccount/generic.tpl:15
-#: plugins/gofon/phoneaccount/paste_generic.tpl:15
 #: plugins/gofon/conference/remove.tpl:14
 msgid "Delete"
 msgstr "Borrar"
 
+#: plugins/personal/mail/copypaste.tpl:55 plugins/personal/mail/generic.tpl:51
+#: 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
+msgid "List of alternative mail addresses"
+msgstr "Lista de direcciones de correo alternativas."
+
+#: plugins/personal/mail/generic.tpl:11
+#: plugins/addons/mailqueue/contents.tpl:53 plugins/admin/groups/mail.tpl:14
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_systemManagement.inc:743
+#: plugins/admin/ogroups/class_ogroupManagement.inc:367
+#: plugins/generic/references/class_reference.inc:44
+msgid "Server"
+msgstr "Servidor"
+
+#: plugins/personal/mail/generic.tpl:14
+msgid "Specify the mail server where the user will be hosted on"
+msgstr "Especificar el servidor de correo donde el usuario estará hospedado."
+
+#: plugins/personal/mail/generic.tpl:23 plugins/admin/groups/mail.tpl:25
+msgid "Quota usage"
+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:169
+#: plugins/admin/systems/class_printGeneric.inc:485
+msgid "not defined"
+msgstr "sin definirse"
+
+#: plugins/personal/mail/generic.tpl:35 plugins/admin/groups/mail.tpl:37
+msgid "Quota size"
+msgstr "Tamaño de la Cola de correo"
+
 #: plugins/personal/mail/generic.tpl:67
 msgid "Mail options"
 msgstr "Opciones de correo"
@@ -864,18 +920,6 @@ msgstr "Mb"
 msgid "Vacation message"
 msgstr "Mensaje de ausencia"
 
-#: plugins/personal/mail/generic.tpl:119
-#: plugins/personal/mail/copypaste.tpl:13
-msgid "Forward messages to"
-msgstr "reenviar mensajes a"
-
-#: plugins/personal/mail/generic.tpl:130
-#: plugins/personal/mail/copypaste.tpl:22
-#: plugins/gofax/faxaccount/generic.tpl:77 plugins/admin/groups/mail.tpl:96
-#: plugins/admin/groups/paste_mail.tpl:42
-msgid "Add local"
-msgstr "Añadir Cuenta Local"
-
 #: plugins/personal/mail/generic.tpl:140
 msgid "Advanced mail options"
 msgstr "Opciones de correo avanzadas"
@@ -909,38 +953,36 @@ 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/groups/headpage.tpl:30
+#: plugins/admin/fai/faiPackageEntry.tpl:32
 #: 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/groups/mail_locals.tpl:22
 #: plugins/admin/departments/headpage.tpl:29
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:22
+#: plugins/admin/systems/glpiDeviceManagement.tpl:27
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:18
-#: plugins/admin/systems/headpage.tpl:29
-#: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiSelectUser.tpl:27
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:27
+#: plugins/admin/systems/servRepository.tpl:36
 #: plugins/admin/systems/glpiAttachmentPool.tpl:27
-#: plugins/admin/systems/glpiDeviceManagement.tpl:27
+#: plugins/admin/systems/glpiPrinterCartridges.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/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:34
+#: ihtml/themes/default/MultiSelectWindow.tpl:70
 msgid "Filters"
 msgstr "Filtros"
 
 #: plugins/personal/mail/mail_locals.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:32
+#: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 #: plugins/personal/samba/samba3_workstations.tpl:27
 #: plugins/personal/environment/selectPrinterDialog.tpl:34
@@ -970,28 +1012,34 @@ msgstr "Mostrar direcciones del usuario"
 msgid "User name of which addresses are shown"
 msgstr "Nombre de usuario de las direcciones mostradas"
 
-#: plugins/personal/mail/class_mailAccount.inc:79
+#: plugins/personal/mail/class_mailAccount.inc:90
 #: 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
+#: plugins/personal/mail/class_mailAccount.inc:143
+#: plugins/admin/groups/class_groupMail.inc:173
+#, fuzzy, php-format
+msgid "Can't get quota information for '%s'."
+msgstr "No se puede activar una cuota IMAP. El error del servidor es: '%s'"
+
+#: plugins/personal/mail/class_mailAccount.inc:205
 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
+#: plugins/personal/mail/class_mailAccount.inc:244
 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/personal/mail/class_mailAccount.inc:253
+#: plugins/admin/groups/class_groupMail.inc:320
 #: 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
+#: plugins/personal/mail/class_mailAccount.inc:254
+#: plugins/admin/groups/class_groupMail.inc:321
 msgid ""
 "This account has mail features enabled. You can disable them by clicking "
 "below."
@@ -999,14 +1047,14 @@ msgstr ""
 "Esta cuenta tiene las características de correo activas. Puede desactivarlas "
 "apretando a continuación."
 
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:317
+#: plugins/personal/mail/class_mailAccount.inc:256
+#: plugins/admin/groups/class_groupMail.inc:323
 #: plugins/admin/ogroups/class_mailogroup.inc:43
 msgid "Create mail account"
 msgstr "Crear cuenta de correo"
 
-#: plugins/personal/mail/class_mailAccount.inc:228
-#: plugins/admin/groups/class_groupMail.inc:318
+#: plugins/personal/mail/class_mailAccount.inc:256
+#: plugins/admin/groups/class_groupMail.inc:324
 msgid ""
 "This account has mail features disabled. You can enable them by clicking "
 "below."
@@ -1014,23 +1062,23 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
-#: plugins/personal/mail/class_mailAccount.inc:276
+#: plugins/personal/mail/class_mailAccount.inc:307
 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:282
-#: plugins/admin/groups/class_groupMail.inc:377
+#: plugins/personal/mail/class_mailAccount.inc:313
+#: plugins/admin/groups/class_groupMail.inc:383
 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:317
-#: plugins/personal/mail/class_mailAccount.inc:322
-#: plugins/admin/groups/class_groupMail.inc:405
+#: plugins/personal/mail/class_mailAccount.inc:351
+#: plugins/personal/mail/class_mailAccount.inc:356
+#: plugins/admin/groups/class_groupMail.inc:411
 msgid ""
 "You're trying to add an invalid email address to the list of alternate "
 "addresses."
@@ -1038,69 +1086,85 @@ msgstr ""
 "Esta intentando añadir una dirección de correo no valida a la lista de "
 "direcciones alternativas"
 
-#: plugins/personal/mail/class_mailAccount.inc:332
-#: plugins/admin/groups/class_groupMail.inc:410
+#: plugins/personal/mail/class_mailAccount.inc:366
+#: plugins/admin/groups/class_groupMail.inc:416
 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:714
+#: plugins/personal/mail/class_mailAccount.inc:619
+#, fuzzy
+msgid "Removing mail account failed"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:723
+#, fuzzy
+msgid "Saving mail account failed"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/mail/class_mailAccount.inc:771
 msgid ""
 "There is no valid mailserver specified, please add one in the system setup."
 msgstr ""
 
-#: plugins/personal/mail/class_mailAccount.inc:719
-#: plugins/admin/groups/class_groupMail.inc:804
+#: plugins/personal/mail/class_mailAccount.inc:776
+#: plugins/admin/groups/class_groupMail.inc:803
 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:723
-#: plugins/personal/mail/class_mailAccount.inc:727
-#: plugins/addons/addressbook/class_addressbook.inc:588
-#: plugins/admin/ogroups/class_mailogroup.inc:70
+#: plugins/personal/mail/class_mailAccount.inc:780
+#: plugins/personal/mail/class_mailAccount.inc:784
+#: 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:733
-#: plugins/admin/groups/class_groupMail.inc:813
-#: plugins/admin/ogroups/class_mailogroup.inc:77
+#: plugins/personal/mail/class_mailAccount.inc:790
+#: plugins/admin/groups/class_groupMail.inc:812
+#: 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:739
-#: plugins/admin/groups/class_groupMail.inc:819
+#: plugins/personal/mail/class_mailAccount.inc:796
+#: plugins/admin/groups/class_groupMail.inc:818
 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:828
+#: plugins/personal/mail/class_mailAccount.inc:805
+#: plugins/admin/groups/class_groupMail.inc:827
 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:836
+#: plugins/personal/mail/class_mailAccount.inc:815
+#: plugins/admin/groups/class_groupMail.inc:835
 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:762
+#: plugins/personal/mail/class_mailAccount.inc:819
 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/mail/class_mailAccount.inc:964
+msgid "Waiting for kolab to remove mail properties."
+msgstr ""
+
+#: plugins/personal/mail/class_mailAccount.inc:966
+msgid ""
+"Please remove the mail account first, to allow kolab to call its remove "
+"methods."
+msgstr ""
 
 #: plugins/personal/password/class_password.inc:5
-#: plugins/admin/systems/class_systemManagement.inc:872
+#: 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_divListSystem.inc:173
 #: 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
@@ -1110,8 +1174,7 @@ msgstr "Contraseña"
 
 #: 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
+#: plugins/admin/users/class_divListUsers.inc:146
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
@@ -1176,17 +1239,17 @@ msgstr ""
 #: plugins/addons/ldapmanager/contentcsv.tpl:114
 #: plugins/addons/ldapmanager/contentexport.tpl:66
 #: plugins/admin/fai/faiNewBranch.tpl:50
-#: plugins/admin/departments/recursive_move.tpl:18 include/functions.inc:1383
+#: plugins/admin/departments/dep_iframe.tpl:19 include/functions.inc:1470
 #: ihtml/themes/altlinux/setup_useradmin.tpl:40
 #: ihtml/themes/altlinux/setup_step2.tpl:12
 #: ihtml/themes/altlinux/setup_step3.tpl:17
 #: ihtml/themes/altlinux/setup_step4.tpl:114
 #: ihtml/themes/altlinux/setup_finish.tpl:30
+#: ihtml/themes/default/setup_finish.tpl:30
 #: ihtml/themes/default/setup_useradmin.tpl:40
 #: ihtml/themes/default/setup_step2.tpl:12
 #: ihtml/themes/default/setup_step3.tpl:17
 #: ihtml/themes/default/setup_step4.tpl:114
-#: ihtml/themes/default/setup_finish.tpl:30
 msgid "Back"
 msgstr "Atras"
 
@@ -1201,7 +1264,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:219
 msgid ""
 "The passwords you've entered as 'New password' and 'Repeated new password' "
 "do not match."
@@ -1210,7 +1273,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:224
 msgid "The password you've entered as 'New password' is empty."
 msgstr "La contraseña que ingreso como 'Nueva contraseña' está vacia."
 
@@ -1230,31 +1293,54 @@ 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/posix_groups.tpl:6
-msgid "Select groups to add"
+#: plugins/personal/password/nochange.tpl:2
+#, fuzzy
+msgid "Password change not allowed"
+msgstr "Cambiar contraseña"
+
+#: plugins/personal/password/nochange.tpl:6
+#, fuzzy
+msgid "You are not allowed to change your password at this time"
+msgstr "¡No tiene permisos para cambiar su contraseña!"
+
+#: 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:32
 msgid "Display groups of department"
 msgstr "Mostrar los grupos de departamentos"
 
-#: plugins/personal/posix/posix_groups.tpl:41
-#: plugins/admin/groups/headpage.tpl:67 plugins/admin/ogroups/headpage.tpl:51
+#: plugins/personal/posix/posix_groups.tpl:46
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:54
+#: plugins/admin/groups/class_divListGroup.inc:62
+#: plugins/admin/users/class_divListUsers.inc:63
+#: plugins/admin/applications/class_divListApplication.inc:48
+#: plugins/admin/departments/class_divListDepartment.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:66
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+#: plugins/gofon/macro/class_divListMacros.inc:51
+#: plugins/gofon/conference/class_divListConferences.inc:52
+msgid "Ignore subtrees"
+msgstr ""
+
+#: plugins/personal/posix/posix_groups.tpl:53
 msgid "Display groups matching"
 msgstr "Mostrar grupos que concuerden con"
 
-#: plugins/personal/posix/posix_groups.tpl:44
-#: plugins/admin/groups/headpage.tpl:69 plugins/admin/ogroups/headpage.tpl:52
+#: plugins/personal/posix/posix_groups.tpl:57
+#: plugins/admin/groups/class_divListGroup.inc:65
+#: plugins/admin/departments/class_divListDepartment.inc:49
+#: plugins/admin/ogroups/class_divListOGroup.inc:72
 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/admin/groups/headpage.tpl:75
+#: plugins/personal/posix/posix_groups.tpl:64
 msgid "Display groups of user"
 msgstr "Mostrar grupos de usuarios"
 
-#: plugins/personal/posix/posix_groups.tpl:54
-#: plugins/admin/groups/headpage.tpl:78
+#: plugins/personal/posix/posix_groups.tpl:68
+#: plugins/admin/groups/class_divListGroup.inc:66
 msgid "User name of which groups are shown"
 msgstr "Nombres de usuarios de los grupos que se muestran"
 
@@ -1268,6 +1354,43 @@ msgstr ""
 msgid "Password expires on"
 msgstr "La contraseña expira en"
 
+#: plugins/personal/posix/paste_generic.tpl:4
+#, fuzzy
+msgid "Posix settings"
+msgstr "Parametros Unix"
+
+#: plugins/personal/posix/paste_generic.tpl:8
+#: plugins/personal/posix/generic.tpl:7 plugins/personal/samba/samba3.tpl:13
+#: plugins/personal/samba/samba3.tpl:94
+#: plugins/personal/samba/class_sambaAccount.inc:643
+msgid "Home directory"
+msgstr "Directorio Principal"
+
+#: plugins/personal/posix/paste_generic.tpl:23
+#: plugins/personal/posix/generic.tpl:39
+msgid "Force UID/GID"
+msgstr "Forzar UID/GID"
+
+#: plugins/personal/posix/paste_generic.tpl:28
+#: plugins/personal/posix/generic.tpl:43 html/getxls.php:230
+msgid "UID"
+msgstr "UID"
+
+#: plugins/personal/posix/paste_generic.tpl:37
+#: plugins/personal/posix/generic.tpl:52
+msgid "GID"
+msgstr "GID"
+
+#: plugins/personal/posix/paste_generic.tpl:47
+#: plugins/personal/posix/generic.tpl:64
+msgid "Group membership"
+msgstr "Miembros del grupo"
+
+#: plugins/personal/posix/paste_generic.tpl:54
+#: plugins/personal/posix/generic.tpl:66
+msgid "(Warning: more than 16 groups are not supported by NFS!)"
+msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
+
 #: plugins/personal/posix/trust_machines.tpl:6
 msgid "Select systems to add"
 msgstr "Seleccione sistema a añadir"
@@ -1277,17 +1400,10 @@ 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:69
 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
-msgid "Home directory"
-msgstr "Directorio Principal"
-
 #: plugins/personal/posix/generic.tpl:13
 msgid "Shell"
 msgstr "Shell"
@@ -1304,29 +1420,6 @@ msgstr "Grupo primario"
 msgid "Status"
 msgstr "Estado"
 
-#: plugins/personal/posix/generic.tpl:39
-#: plugins/personal/posix/paste_generic.tpl:21
-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
-msgid "UID"
-msgstr "UID"
-
-#: plugins/personal/posix/generic.tpl:52
-#: plugins/personal/posix/paste_generic.tpl:35
-msgid "GID"
-msgstr "GID"
-
-#: plugins/personal/posix/generic.tpl:64
-msgid "Group membership"
-msgstr "Miembros del grupo"
-
-#: plugins/personal/posix/generic.tpl:66
-msgid "(Warning: more than 16 groups are not supported by NFS!)"
-msgstr "(Aviso: ¡NFS no soporta mas de 16 grupos!)"
-
 #: plugins/personal/posix/generic.tpl:84
 msgid "Account"
 msgstr "Cuenta"
@@ -1345,33 +1438,57 @@ msgstr "Modo"
 msgid "UNIX"
 msgstr "UNIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:137
-#: plugins/personal/posix/class_posixAccount.inc:993
+#: plugins/personal/posix/class_posixAccount.inc:125
+#, fuzzy
+msgid "expired"
+msgstr "Exportar"
+
+#: plugins/personal/posix/class_posixAccount.inc:127
+msgid "grace time active"
+msgstr ""
+
+#: plugins/personal/posix/class_posixAccount.inc:130
+#, fuzzy
+msgid "active, password not changable"
+msgstr "Nueva contraseña"
+
+#: plugins/personal/posix/class_posixAccount.inc:132
+#, fuzzy
+msgid "active, password expired"
+msgstr "La contraseña expira en"
+
+#: plugins/personal/posix/class_posixAccount.inc:134
+#, fuzzy
+msgid "active"
+msgstr "Privado"
+
+#: plugins/personal/posix/class_posixAccount.inc:145
+#: plugins/personal/posix/class_posixAccount.inc:973
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: plugins/personal/posix/class_posixAccount.inc:177
+#: plugins/personal/posix/class_posixAccount.inc:185
 msgid "unconfigured"
 msgstr "Desconfigurado"
 
-#: plugins/personal/posix/class_posixAccount.inc:195
-#: plugins/admin/systems/class_terminalService.inc:141
-#: plugins/admin/systems/class_workstationService.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:657
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:211
+#: plugins/personal/posix/class_posixAccount.inc:203
+#: plugins/admin/systems/class_terminalService.inc:194
+#: plugins/admin/systems/class_workstationService.inc:182
+#: plugins/admin/systems/class_workstationStartup.inc:786
+#: 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:242
 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:262
+#: plugins/personal/posix/class_posixAccount.inc:265
 msgid "Remove posix account"
 msgstr "Eliminar cuenta Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:249
+#: plugins/personal/posix/class_posixAccount.inc:263
 #, fuzzy
 msgid ""
 "This account has unix features enabled. To disable them, you'll need to "
@@ -1380,7 +1497,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:266
 msgid ""
 "This account has posix features enabled. You can disable them by clicking "
 "below."
@@ -1388,11 +1505,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:269
 msgid "Create posix account"
 msgstr "Crear cuenta posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:256
+#: plugins/personal/posix/class_posixAccount.inc:270
 msgid ""
 "This account has posix features disabled. You can enable them by clicking "
 "below."
@@ -1400,249 +1517,235 @@ 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:443
 #, 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:445
 #, 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:447
 #, 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:449
 #, 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:473
+#: 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:473
+#: 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:473
+#: 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:473
+#: 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:474
+#: 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:474
+#: 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:474
+#: 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:474
+#: 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:474
+#: 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:475
+#: 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:475
+#: 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:475
+#: 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:557
+#: plugins/personal/samba/class_sambaAccount.inc:455
+#: plugins/admin/systems/class_terminalGeneric.inc:88
 #: ihtml/themes/altlinux/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:557
 msgid "full access"
 msgstr "Acceso completo"
 
-#: plugins/personal/posix/class_posixAccount.inc:570
+#: plugins/personal/posix/class_posixAccount.inc:558
 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:604
+#, fuzzy
+msgid "Removing UNIX account failed"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/posix/class_posixAccount.inc:737
 msgid "Failed: overriding lock"
 msgstr "Fallo: Sobrepasado bloqueo"
 
-#: plugins/personal/posix/class_posixAccount.inc:907
+#: plugins/personal/posix/class_posixAccount.inc:826
+#, fuzzy
+msgid "Saving UNIX account failed"
+msgstr "Cuentas UNIX"
+
+#: plugins/personal/posix/class_posixAccount.inc:887
 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:890
 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:898
 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:901
 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:905
+#: plugins/admin/groups/class_groupGeneric.inc:774
 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:908
+#: plugins/admin/groups/class_groupGeneric.inc:777
 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:916
 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:921
 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:926
 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:929
 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:932
 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:935
 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:940
 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:943
 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:948
 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:1075
+#: plugins/admin/groups/class_groupGeneric.inc:813
 msgid "Too many users, can't allocate a free ID!"
 msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 
@@ -1650,10 +1753,79 @@ msgstr "¡Demasiados usuarios, no hay identificadores (ID) libres!"
 msgid "Unix settings"
 msgstr "Parametros Unix"
 
-#: plugins/personal/posix/paste_generic.tpl:4
+#: plugins/personal/netatalk/class_netatalk.inc:37
 #, fuzzy
-msgid "Posix settings"
-msgstr "Parametros Unix"
+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/class_netatalk.inc:256
+#, fuzzy
+msgid "Saving Netatalk account failed"
+msgstr "Crear cuenta telefónica"
+
+#: plugins/personal/netatalk/class_netatalk.inc:316
+#, fuzzy
+msgid "Removing Netatalk account failed"
+msgstr "Borrar cuenta de correo"
+
+#: 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
+#: plugins/addons/godfs/class_dfsManagment.inc:247
+#: 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/personal/samba/samba2.tpl:13
 msgid "Samba home"
@@ -1665,7 +1837,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"
 
@@ -1714,17 +1886,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"
 
@@ -1793,15 +1965,15 @@ msgstr "Mostrar estaciones de trabajo de departamentos"
 msgid "Samba settings"
 msgstr "Parametros de samba"
 
-#: plugins/personal/samba/class_sambaAccount.inc:196
+#: 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."
@@ -1809,12 +1981,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."
@@ -1822,7 +1994,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."
@@ -1831,44 +2003,49 @@ 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:627
+#, fuzzy
+msgid "Removing Samba account failed"
+msgstr "Eliminar cuenta samba"
+
+#: 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!"
@@ -1876,7 +2053,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."
@@ -1884,7 +2061,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!"
@@ -1892,7 +2069,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!"
@@ -1900,33 +2077,12 @@ msgstr ""
 "Aviso: No puedo identificar el grupo primario de usuarios - ¡No se puede "
 "realizar una conversión a grupo de samba!"
 
-#: plugins/personal/environment/class_hotplugDialog.inc:111
-#, 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
-#, 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
-#, fuzzy
-msgid "Please specify a valid id."
-msgstr "Por favor especifique un nombre de usuario valido."
-
-#: plugins/personal/environment/class_hotplugDialog.inc:123
-#, fuzzy
-msgid "An Entry with this name already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
-
-#: plugins/personal/environment/class_hotplugDialog.inc:128
-#, fuzzy
-msgid "Please select an entry or press cancel."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+#: plugins/personal/samba/class_sambaAccount.inc:974
+msgid "Saving Samba account failed"
+msgstr ""
 
-#: plugins/personal/environment/class_selectPrinterDialog.inc:67
-#: plugins/admin/systems/class_selectUserToPrinterDialog.inc:99
+#: 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!"
@@ -1952,8 +2108,10 @@ msgid "Choose the department the search will be based    on"
 msgstr "Escoja el departamento base de la busqueda"
 
 #: plugins/personal/environment/hotplugDialog.tpl:43
+#: plugins/admin/fai/class_divListFai.inc:75
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/headpage.tpl:48
+#: plugins/admin/users/class_divListUsers.inc:66
+#: plugins/admin/applications/class_divListApplication.inc:51
 #: plugins/admin/systems/glpiSelectUser.tpl:35
 #: plugins/gofon/conference/headpage.tpl:35
 msgid "Display users matching"
@@ -1964,37 +2122,51 @@ 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_environment.inc:253
-#: plugins/personal/environment/class_environment.inc:290
+#: plugins/personal/environment/class_environment.inc:185
+#, fuzzy
+msgid "auto"
+msgstr "Relación"
+
+#: plugins/personal/environment/class_environment.inc:207
+#: plugins/admin/systems/class_terminalService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:88
+#, php-format
+msgid ""
+"You have specified an external resolution hook which can't be read, please "
+"check the permission of the file '%s'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:284
+#: plugins/personal/environment/class_environment.inc:321
 #, 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:285
+#: plugins/personal/environment/class_environment.inc:322
 #, 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:294
+#: plugins/personal/environment/class_environment.inc:299
+#: plugins/personal/environment/class_environment.inc:327
+#: plugins/personal/environment/class_environment.inc:332
 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:295
+#: plugins/personal/environment/class_environment.inc:328
 #, 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:300
+#: plugins/personal/environment/class_environment.inc:333
 #, fuzzy
 msgid ""
 "Environment extension disabled. You have to setup a posix account before you "
@@ -2003,54 +2175,71 @@ msgstr ""
 "Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/personal/environment/class_environment.inc:381
-#, 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:448
+#: plugins/personal/environment/class_environment.inc:703
+#: 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_terminalStartup.inc:134
-#: plugins/admin/systems/class_workstationStartup.inc:501
+#: plugins/personal/environment/class_environment.inc:531
+#: plugins/personal/environment/class_environment.inc:542
+#: plugins/admin/systems/class_workstationStartup.inc:610
+#: plugins/admin/systems/class_terminalStartup.inc:187
 #, 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:706
+#, php-format
+msgid ""
+"The selected kiosk profile '%s' is no longer available, setting current "
+"profile to 'none'."
+msgstr ""
+
+#: plugins/personal/environment/class_environment.inc:758
+#, fuzzy
+msgid "Removing environment information failed"
+msgstr "Eliminar extensión Kolab"
+
+#: plugins/personal/environment/class_environment.inc:811
 #, 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:818
 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:856
 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:950
 #, 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:1020
 #, 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:1089
 #, fuzzy
-msgid "Admin"
-msgstr "DN del administrador"
+msgid "Adding environment information failed"
+msgstr "Editar propiedades"
+
+#: plugins/personal/environment/class_environment.inc:1132
+#, fuzzy
+msgid "Administrator"
+msgstr "Administradores"
+
+#: plugins/personal/environment/class_environment.inc:1137
+msgid "Default printer"
+msgstr "Impresora por defecto"
 
 #: plugins/personal/environment/selectPrinterDialog.tpl:1
 #, fuzzy
@@ -2079,8 +2268,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"
@@ -2128,92 +2317,96 @@ 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/workstationStartup.tpl:129
 #: plugins/admin/systems/servservice.tpl:11
-#: plugins/admin/systems/workstationStartup.tpl:82
-#: plugins/admin/systems/terminalStartup.tpl:62
+#: plugins/admin/systems/terminalStartup.tpl:66
 #, 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
 #: plugins/personal/generic/generic_certs.tpl:57
 #: 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/fai/faiPackage.tpl:72
+#: plugins/admin/groups/class_groupMail.inc:544
 #: plugins/admin/applications/class_applicationParameters.inc:100
-#: plugins/admin/systems/workstationStartup.tpl:97
-#: plugins/admin/systems/printer.tpl:48 plugins/admin/systems/servdns.tpl:8
-#: plugins/admin/systems/terminalStartup.tpl:77
-#: plugins/admin/systems/glpiManufacturer.tpl:8
 #: plugins/admin/systems/glpiPrinter.tpl:122
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:388
-#: ihtml/themes/altlinux/islocked.tpl:13
+#: plugins/admin/systems/workstationStartup.tpl:144
+#: plugins/admin/systems/servdns.tpl:8
+#: plugins/admin/systems/glpiManufacturer.tpl:8
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:390
+#: plugins/admin/systems/terminalStartup.tpl:81
+#: plugins/admin/systems/printer.tpl:53 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/servDNSeditZoneEntries.tpl:12
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/personal/environment/environment.tpl:165
+#: plugins/admin/groups/class_divListGroup.inc:98
+#: plugins/gofon/macro/class_divListMacros.inc:83
 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"
+msgid "Toggle admin"
+msgstr "Información de intercambio"
+
+#: plugins/personal/environment/environment.tpl:185
+#, fuzzy
+msgid "Toggle default"
+msgstr "por defecto"
 
-#: plugins/personal/environment/class_logonManagementDialog.inc:96
+#: 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:100
+#: 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!"
@@ -2230,25 +2423,25 @@ msgstr "Nombre de la lista"
 
 #: plugins/personal/environment/logonManagement.tpl:17
 #: plugins/personal/environment/hotplugDialogNew.tpl:17
-#: plugins/gofax/blocklists/generic.tpl:41
+#: plugins/gofax/blocklists/generic.tpl:46 plugins/addons/godfs/generic.tpl:12
+#: plugins/addons/godfs/generic.tpl:38
 #: plugins/admin/fai/faiPartitionTable.tpl:19
 #: 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/faiScriptEntry.tpl:17 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/fai/faiPackage.tpl:19 plugins/admin/groups/generic.tpl:13
 #: plugins/admin/applications/generic.tpl:23
 #: plugins/admin/departments/generic.tpl:12
-#: plugins/admin/systems/component.tpl:25 plugins/admin/systems/server.tpl:25
-#: plugins/admin/systems/phone.tpl:25 plugins/admin/systems/printer.tpl:13
-#: plugins/admin/systems/servnfs.tpl:17
+#: plugins/admin/systems/server.tpl:10 plugins/admin/systems/phone.tpl:30
+#: plugins/admin/systems/component.tpl:30
 #: plugins/admin/systems/wingeneric.tpl:25
-#: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:36
-#: plugins/gofon/conference/generic.tpl:51
+#: plugins/admin/systems/servnfs.tpl:17 plugins/admin/systems/printer.tpl:13
+#: plugins/admin/ogroups/generic.tpl:13 plugins/gofon/macro/generic.tpl:41
+#: plugins/gofon/conference/generic.tpl:56
 #: plugins/generic/references/contents.tpl:11 html/getxls.php:123
 #: html/getxls.php:230
 msgid "Description"
@@ -2281,15 +2474,15 @@ msgstr ""
 #: plugins/admin/fai/faiProfileEntry.tpl:70
 #: plugins/admin/fai/faiPackageConfiguration.tpl:6
 #: 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/fai/faiNewBranch.tpl:19
 #: plugins/admin/groups/mail_admins.tpl:37
-#: plugins/admin/groups/application_options.tpl:8
-#: plugins/admin/systems/printerPPDDialog.tpl:22
+#: plugins/admin/groups/application_options.tpl:11
 #: plugins/admin/systems/servRepositorySetup.tpl:41
+#: plugins/admin/systems/printerPPDDialog.tpl:22
 msgid "Apply"
 msgstr "Aplicar"
 
@@ -2315,10 +2508,41 @@ msgstr ""
 msgid "Kiosk path '%s' is not accessible. Please check the permissions."
 msgstr ""
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:1
+#: plugins/personal/environment/kioskManagement.tpl:1
+#: plugins/personal/environment/kioskManagement.tpl:5
 #, fuzzy
-msgid "Create new hotplug entry"
-msgstr "Crear una nueva entrada en"
+msgid "Kiosk profile management"
+msgstr "Gestión de Asterisk PBX"
+
+#: plugins/personal/environment/kioskManagement.tpl:13
+#: plugins/addons/ldapmanager/contentimport.tpl:15
+#: plugins/addons/ldapmanager/contentcsv.tpl:14
+msgid "Browse"
+msgstr "Visualizar"
+
+#: plugins/personal/environment/kioskManagement.tpl:25
+#: plugins/admin/fai/class_faiSummaryTab.inc:222
+#: plugins/admin/systems/glpi_edit_type.tpl:15
+#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
+#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
+#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
+#: plugins/admin/systems/glpi_edit_os.tpl:15
+#: plugins/admin/systems/glpiManufacturer.tpl:13
+#: include/class_MultiSelectWindow.inc:67
+#, fuzzy
+msgid "Close"
+msgstr "Elige"
+
+#: plugins/personal/environment/main.inc:124
+#, fuzzy
+msgid "User environment settings"
+msgstr "Parametros del correo de usuarios"
+
+#: 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
@@ -2335,40 +2559,30 @@ msgstr "Nombre del dispositivo"
 msgid "Device ID"
 msgstr "Servicios"
 
-#: plugins/personal/environment/hotplugDialogNew.tpl:38
+#: plugins/personal/environment/class_hotplugDialog.inc:113
 #, fuzzy
-msgid "save"
-msgstr "Guardar"
+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/kioskManagement.tpl:1
-#: plugins/personal/environment/kioskManagement.tpl:5
+#: plugins/personal/environment/class_hotplugDialog.inc:116
 #, fuzzy
-msgid "Kiosk profile management"
-msgstr "Gestión de Asterisk PBX"
+msgid "Invalid character in description. Please specify a valid description."
+msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/personal/environment/kioskManagement.tpl:13
-#: plugins/addons/ldapmanager/contentimport.tpl:15
-#: plugins/addons/ldapmanager/contentcsv.tpl:14
-msgid "Browse"
-msgstr "Visualizar"
+#: 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/kioskManagement.tpl:25
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:46
-#: plugins/admin/systems/glpi_edit_type.tpl:15
-#: plugins/admin/systems/glpiManufacturer.tpl:13
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:13
-#: plugins/admin/systems/glpi_edit_os.tpl:15
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:81
-#: plugins/admin/systems/glpi_edit_printer_type.tpl:14
-#: include/class_MultiSelectWindow.inc:45
+#: plugins/personal/environment/class_hotplugDialog.inc:125
 #, fuzzy
-msgid "Close"
-msgstr "Elige"
+msgid "An Entry with this name already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/personal/environment/main.inc:124
+#: plugins/personal/environment/class_hotplugDialog.inc:130
 #, fuzzy
-msgid "User environment settings"
-msgstr "Parametros del correo de usuarios"
+msgid "Please select an entry or press cancel."
+msgstr "¡Por favor introduzca un número de teléfono valido!"
 
 #: plugins/personal/generic/password.tpl:2
 msgid ""
@@ -2382,9 +2596,9 @@ msgstr ""
 
 #: plugins/personal/generic/generic_picture.tpl:5
 #: plugins/personal/generic/generic_picture.tpl:15
+#: plugins/personal/generic/paste_generic.tpl:50
 #: plugins/personal/generic/generic.tpl:19
 #: plugins/personal/generic/generic.tpl:32
-#: plugins/personal/generic/paste_generic.tpl:41
 msgid "Personal picture"
 msgstr "Foto Personal"
 
@@ -2393,60 +2607,64 @@ msgstr "Foto Personal"
 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/glpiPrinterCartridgesEdit.tpl:74
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:80
-#: plugins/admin/systems/servdnseditzone.tpl:121
-#: plugins/admin/systems/glpi_devices.tpl:760
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:69
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:20
-#: include/class_MultiSelectWindow.inc:44
-#: ihtml/themes/default/copyPasteDialog.tpl:12
-msgid "Save"
-msgstr "Guardar"
-
-#: 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"
-msgstr "Cambiar foto"
+#: plugins/personal/generic/paste_generic.tpl:4
+#, fuzzy
+msgid "User settings"
+msgstr "Parametros del correo de usuarios"
 
-#: plugins/personal/generic/generic.tpl:43
 #: plugins/personal/generic/paste_generic.tpl:7
+#: plugins/personal/generic/generic.tpl:43
 #: 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"
 
-#: plugins/personal/generic/generic.tpl:48
-#, fuzzy
-msgid "Template name"
-msgstr "Plantilla"
-
-#: plugins/personal/generic/generic.tpl:55
 #: plugins/personal/generic/paste_generic.tpl:11
+#: plugins/personal/generic/generic.tpl:55
 #: 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/personal/generic/generic.tpl:59 plugins/admin/users/template.tpl:32
 msgid "Login"
 msgstr "Inicio"
 
+#: plugins/personal/generic/paste_generic.tpl:22
+#, fuzzy
+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/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"
+msgstr "Cambiar foto"
+
+#: plugins/personal/generic/generic.tpl:48
+#, fuzzy
+msgid "Template name"
+msgstr "Plantilla"
+
 #: plugins/personal/generic/generic.tpl:67
-#: plugins/addons/addressbook/address_info.tpl:22
 #: plugins/addons/addressbook/address_edit.tpl:54
+#: plugins/addons/addressbook/address_info.tpl:22
 msgid "Personal title"
 msgstr "Título Personal"
 
@@ -2475,29 +2693,31 @@ msgid "Preferred langage"
 msgstr "Lenguaje por defecto"
 
 #: plugins/personal/generic/generic.tpl:127
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:313
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:88
 #: plugins/gofax/blocklists/generic.tpl:14
-#: plugins/admin/fai/class_faiManagement.inc:678
-#: plugins/admin/groups/class_groupManagement.inc:459
+#: plugins/addons/godfs/class_dfsManagment.inc:217
+#: plugins/admin/fai/class_divListFai.inc:149
+#: plugins/admin/groups/class_divListGroup.inc:101
 #: plugins/admin/groups/generic.tpl:21
-#: plugins/admin/users/class_userManagement.inc:787
+#: plugins/admin/users/class_divListUsers.inc:107
+#: plugins/admin/applications/class_divListApplication.inc:104
 #: plugins/admin/applications/generic.tpl:32
-#: plugins/admin/applications/class_applicationManagement.inc:480
+#: plugins/admin/departments/class_divListDepartment.inc:76
 #: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_departmentManagement.inc:303
-#: plugins/admin/systems/component.tpl:13 plugins/admin/systems/server.tpl:13
-#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/terminal.tpl:18
-#: plugins/admin/systems/class_systemManagement.inc:772
-#: plugins/admin/systems/printer.tpl:20
-#: plugins/admin/systems/workstation.tpl:27
+#: plugins/admin/systems/server.tpl:14 plugins/admin/systems/terminal.tpl:17
+#: plugins/admin/systems/phone.tpl:13 plugins/admin/systems/workstation.tpl:23
+#: plugins/admin/systems/servservice.tpl:61
+#: plugins/admin/systems/component.tpl:13
+#: plugins/admin/systems/class_baseSelectDialog.inc:44
 #: plugins/admin/systems/wingeneric.tpl:13
 #: plugins/admin/systems/class_glpiSelectUser.inc:166
-#: plugins/admin/systems/class_baseSelectDialog.inc:44
-#: plugins/admin/ogroups/class_ogroupManagement.inc:452
+#: plugins/admin/systems/printer.tpl:20
+#: plugins/admin/systems/class_divListSystem.inc:107
+#: plugins/admin/ogroups/class_divListOGroup.inc:111
 #: plugins/admin/ogroups/generic.tpl:21
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:331
+#: plugins/gofon/macro/class_divListMacros.inc:85
 #: plugins/gofon/macro/generic.tpl:20
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:292
+#: plugins/gofon/conference/class_divListConferences.inc:86
 #: plugins/gofon/conference/generic.tpl:33
 msgid "Base"
 msgstr "Base"
@@ -2506,170 +2726,181 @@ msgstr "Base"
 msgid "Choose subtree to place user in"
 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/component.tpl:18 plugins/admin/systems/server.tpl:18
-#: plugins/admin/systems/phone.tpl:18 plugins/admin/systems/terminal.tpl:23
-#: plugins/admin/systems/printer.tpl:25
-#: plugins/admin/systems/workstation.tpl:32
+#: plugins/personal/generic/generic.tpl:135
+#: plugins/personal/generic/generic.tpl:137
+#: plugins/gofax/blocklists/generic.tpl:21
+#: plugins/gofax/blocklists/generic.tpl:23 plugins/admin/groups/generic.tpl:27
+#: plugins/admin/groups/generic.tpl:29
+#: plugins/admin/applications/generic.tpl:39
+#: plugins/admin/applications/generic.tpl:41
+#: plugins/admin/departments/generic.tpl:34
+#: plugins/admin/departments/generic.tpl:36
+#: plugins/admin/systems/server.tpl:21 plugins/admin/systems/server.tpl:23
+#: plugins/admin/systems/terminal.tpl:23 plugins/admin/systems/terminal.tpl:25
+#: plugins/admin/systems/phone.tpl:19 plugins/admin/systems/phone.tpl:21
+#: plugins/admin/systems/workstation.tpl:29
+#: plugins/admin/systems/workstation.tpl:31
+#: plugins/admin/systems/component.tpl:19
+#: plugins/admin/systems/component.tpl:21
 #: plugins/admin/systems/wingeneric.tpl:18
-#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/systems/printer.tpl:26 plugins/admin/systems/printer.tpl:28
+#: plugins/admin/ogroups/generic.tpl:27 plugins/admin/ogroups/generic.tpl:29
+#: plugins/gofon/macro/generic.tpl:27 plugins/gofon/macro/generic.tpl:29
+#: plugins/gofon/conference/generic.tpl:39
+#: plugins/gofon/conference/generic.tpl:41
 #, fuzzy
 msgid "Select a base"
 msgstr "Seleccione para ver los servidores"
 
-#: plugins/personal/generic/generic.tpl:147
-#: plugins/personal/generic/generic.tpl:291
-#: plugins/addons/addressbook/address_info.tpl:33
-#: plugins/addons/addressbook/address_info.tpl:82
+#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:295
 #: plugins/addons/addressbook/address_edit.tpl:72
 #: plugins/addons/addressbook/address_edit.tpl:182
-#: plugins/admin/departments/generic.tpl:55
+#: plugins/addons/addressbook/address_info.tpl:33
+#: plugins/addons/addressbook/address_info.tpl:82
+#: plugins/admin/departments/generic.tpl:59
 #: plugins/admin/systems/glpiManufacturerAdd.tpl:21 html/getxls.php:174
 msgid "Address"
 msgstr "Dirección"
 
-#: plugins/personal/generic/generic.tpl:151
+#: plugins/personal/generic/generic.tpl:155
 msgid "Private phone"
 msgstr "Numero privado"
 
-#: plugins/personal/generic/generic.tpl:155
+#: plugins/personal/generic/generic.tpl:159
 msgid "Homepage"
 msgstr "Página Web Principal"
 
-#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/generic.tpl:168
 msgid "Password storage"
 msgstr "Carpeta de almacenamiento de Contraseñas"
 
-#: plugins/personal/generic/generic.tpl:174
+#: plugins/personal/generic/generic.tpl:178
 #: plugins/personal/generic/generic_certs.tpl:3
 msgid "Certificates"
 msgstr "Certificados"
 
-#: plugins/personal/generic/generic.tpl:176
+#: plugins/personal/generic/generic.tpl:180
 msgid "Edit certificates"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/generic.tpl:180
+#: plugins/personal/generic/generic.tpl:184
 msgid "Kerberos"
 msgstr "Kerberos"
 
-#: plugins/personal/generic/generic.tpl:181
+#: plugins/personal/generic/generic.tpl:185
 msgid "Edit properties"
 msgstr "Editar propiedades"
 
-#: plugins/personal/generic/generic.tpl:197
+#: plugins/personal/generic/generic.tpl:201
 msgid "Organizational information"
 msgstr "Información organizativa"
 
-#: plugins/personal/generic/generic.tpl:209 html/getxls.php:236
+#: plugins/personal/generic/generic.tpl:213 html/getxls.php:236
 msgid "Organization"
 msgstr "Organización"
 
-#: plugins/personal/generic/generic.tpl:213
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#: plugins/addons/addressbook/address_info.tpl:64
+#: plugins/personal/generic/generic.tpl:217
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:46
 #: plugins/addons/addressbook/address_edit.tpl:138
-#: 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_info.tpl:64
+#: plugins/admin/users/class_divListUsers.inc:50
+#: plugins/admin/applications/class_divListApplication.inc:44
+#: plugins/admin/ogroups/class_ogroupManagement.inc:366
+#: plugins/gofon/macro/class_divListMacros.inc:46
 #: plugins/generic/references/class_reference.inc:38
 msgid "Department"
 msgstr "Departamento"
 
-#: plugins/personal/generic/generic.tpl:217
+#: plugins/personal/generic/generic.tpl:221
 msgid "Department No."
 msgstr "Departamento No."
 
-#: plugins/personal/generic/generic.tpl:223
+#: plugins/personal/generic/generic.tpl:227
 msgid "Employee No."
 msgstr "Empleado No."
 
-#: plugins/personal/generic/generic.tpl:229
+#: plugins/personal/generic/generic.tpl:233
 msgid "Employee type"
 msgstr "Tipo de empleado"
 
-#: plugins/personal/generic/generic.tpl:245
-#: plugins/personal/generic/generic.tpl:384
+#: plugins/personal/generic/generic.tpl:249
+#: plugins/personal/generic/generic.tpl:388
 msgid "Room No."
 msgstr "Habitación No."
 
-#: plugins/personal/generic/generic.tpl:257
+#: plugins/personal/generic/generic.tpl:261
+#: plugins/addons/addressbook/address_edit.tpl:95
 #: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:40
-#: plugins/addons/addressbook/address_edit.tpl:95 html/getxls.php:236
+#: plugins/addons/addressbook/address_info.tpl:40 html/getxls.php:236
 msgid "Mobile"
 msgstr "Teléfono Móvil"
 
-#: plugins/personal/generic/generic.tpl:283
-#: plugins/admin/departments/generic.tpl:43
-#: plugins/admin/departments/generic.tpl:51
-#: plugins/admin/systems/workstation.tpl:18 html/getxls.php:174
+#: plugins/personal/generic/generic.tpl:287
+#: plugins/addons/godfs/generic.tpl:34
+#: plugins/admin/departments/generic.tpl:47
+#: plugins/admin/departments/generic.tpl:55
+#: plugins/admin/systems/workstation.tpl:17 html/getxls.php:174
 msgid "Location"
 msgstr "Localización"
 
-#: plugins/personal/generic/generic.tpl:287
-#: plugins/admin/departments/generic.tpl:47 html/getxls.php:174
+#: plugins/personal/generic/generic.tpl:291
+#: plugins/admin/departments/generic.tpl:51 html/getxls.php:174
 #: html/getxls.php:236
 msgid "State"
 msgstr "Estado"
 
-#: plugins/personal/generic/generic.tpl:305
+#: plugins/personal/generic/generic.tpl:309
 msgid "Vocation"
 msgstr "Intereses"
 
-#: plugins/personal/generic/generic.tpl:309
+#: plugins/personal/generic/generic.tpl:313
 msgid "Unit description"
 msgstr "Descripción de la unidad"
 
-#: plugins/personal/generic/generic.tpl:317
+#: plugins/personal/generic/generic.tpl:321
 msgid "Subject area"
 msgstr "Adjunto al area"
 
-#: plugins/personal/generic/generic.tpl:325
+#: plugins/personal/generic/generic.tpl:329
 msgid "Functional title"
 msgstr "Título Funcional"
 
-#: plugins/personal/generic/generic.tpl:332
+#: plugins/personal/generic/generic.tpl:336
 msgid "Role"
 msgstr "Papel desempeñado"
 
-#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:348
 msgid "Person locality"
 msgstr "Población de la Persona"
 
-#: plugins/personal/generic/generic.tpl:352
+#: plugins/personal/generic/generic.tpl:356
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/generic.tpl:359
+#: plugins/personal/generic/generic.tpl:363
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/generic.tpl:365
-#: plugins/addons/addressbook/address_info.tpl:70
-#: plugins/addons/addressbook/address_edit.tpl:158 html/getxls.php:174
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/addons/addressbook/address_edit.tpl:158
+#: plugins/addons/addressbook/address_info.tpl:70 html/getxls.php:174
 msgid "Postal code"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/generic.tpl:371
+#: plugins/personal/generic/generic.tpl:375
 msgid "House identifier"
 msgstr "Tipo de Vía"
 
-#: plugins/personal/generic/generic.tpl:393
+#: plugins/personal/generic/generic.tpl:397
 msgid "Please use the phone tab"
 msgstr "Por favor use la casilla teléfono"
 
-#: plugins/personal/generic/generic.tpl:406
+#: plugins/personal/generic/generic.tpl:410
 msgid "Last delivery"
 msgstr "Último envío"
 
-#: plugins/personal/generic/generic.tpl:413
+#: plugins/personal/generic/generic.tpl:417
 msgid "Public visible"
 msgstr "Visible Publicamente"
 
@@ -2697,78 +2928,86 @@ msgstr "mujer"
 msgid "male"
 msgstr "hombre"
 
-#: plugins/personal/generic/class_user.inc:270
+#: plugins/personal/generic/class_user.inc:272
 msgid "This account has no valid GOsa extensions."
 msgstr "Esta cuenta no tiene extensiones GOsa validas"
 
-#: plugins/personal/generic/class_user.inc:324
+#: plugins/personal/generic/class_user.inc:326
 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
+#: plugins/personal/generic/class_user.inc:422
 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
+#: plugins/personal/generic/class_user.inc:459
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:459
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:457
+#: plugins/personal/generic/class_user.inc:459
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:461
+#: plugins/personal/generic/class_user.inc:463
 #, fuzzy
 msgid "No certificate installed"
 msgstr "Editar certificados"
 
-#: plugins/personal/generic/class_user.inc:879
+#: plugins/personal/generic/class_user.inc:546
+msgid "Removing generic user account failed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:835
+msgid "Saving generic user account failed"
+msgstr ""
+
+#: plugins/personal/generic/class_user.inc:882
 msgid "Kerberos database communication failed"
 msgstr "La comunicación con la base de datos Kerberos ha fallado"
 
-#: plugins/personal/generic/class_user.inc:896
+#: plugins/personal/generic/class_user.inc:899
 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
+#: plugins/personal/generic/class_user.inc:910
 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
+#: plugins/personal/generic/class_user.inc:954
 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
+#: plugins/personal/generic/class_user.inc:959
 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
+#: plugins/personal/generic/class_user.inc:965
+#: plugins/addons/addressbook/class_addressbook.inc:546
+#: plugins/admin/users/class_userManagement.inc:517
 msgid "The required field 'Name' is not set."
 msgstr "El campo requerido 'Nombre' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:967
+#: plugins/personal/generic/class_user.inc:974
 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
+#: plugins/personal/generic/class_user.inc:980
+#: plugins/addons/addressbook/class_addressbook.inc:550
+#: plugins/admin/users/class_userManagement.inc:520
 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
+#: plugins/personal/generic/class_user.inc:983
 msgid "The required field 'Login' is not set."
 msgstr " El campo requerido 'Login' no ha sido rellenado."
 
-#: plugins/personal/generic/class_user.inc:983
+#: plugins/personal/generic/class_user.inc:990
 msgid ""
 "There's already a person with this 'Name'/'Given name' combination in the "
 "database."
@@ -2776,7 +3015,7 @@ msgstr ""
 "Ya existe un usuario con la misma combinación 'Nombre' / 'Sobrenombre' en la "
 "base de datos."
 
-#: plugins/personal/generic/class_user.inc:990
+#: plugins/personal/generic/class_user.inc:997
 msgid ""
 "The field 'Login' contains invalid characters. Lowercase, numbers and dashes "
 "are allowed."
@@ -2784,50 +3023,50 @@ 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
+#: plugins/personal/generic/class_user.inc:1000
 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
+#: plugins/personal/generic/class_user.inc:1003
+#: plugins/personal/generic/class_user.inc:1028
+#: plugins/addons/addressbook/class_addressbook.inc:556
+#: plugins/addons/addressbook/class_addressbook.inc:584
+#: plugins/admin/departments/class_departmentGeneric.inc:244
 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
+#: plugins/personal/generic/class_user.inc:1006
+#: plugins/personal/generic/class_user.inc:1025
+#: 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:1004
-#: plugins/addons/addressbook/class_addressbook.inc:563
-#: plugins/addons/addressbook/class_addressbook.inc:566
-#: plugins/admin/departments/class_departmentGeneric.inc:214
+#: plugins/personal/generic/class_user.inc:1011
+#: plugins/addons/addressbook/class_addressbook.inc:564
+#: plugins/addons/addressbook/class_addressbook.inc:567
+#: plugins/admin/departments/class_departmentGeneric.inc:247
 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
+#: plugins/personal/generic/class_user.inc:1014
+#: plugins/addons/addressbook/class_addressbook.inc:570
+#: plugins/admin/departments/class_departmentGeneric.inc:250
 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
+#: plugins/personal/generic/class_user.inc:1017
+#: 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:1013
-#: plugins/addons/addressbook/class_addressbook.inc:575
+#: plugins/personal/generic/class_user.inc:1020
+#: 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:1140
+#: plugins/personal/generic/class_user.inc:1147
 #, fuzzy
 msgid "Could not open specified certificate!"
 msgstr "No puedo seleccionar la base de datos."
@@ -2840,16 +3079,6 @@ msgstr "¡No tiene permisos para cambiar su contraseña!"
 msgid "Generic user information"
 msgstr "Información genérica del usuario"
 
-#: plugins/personal/generic/paste_generic.tpl:4
-#, fuzzy
-msgid "User settings"
-msgstr "Parametros del correo de usuarios"
-
-#: plugins/personal/generic/paste_generic.tpl:22
-#, fuzzy
-msgid "User picture"
-msgstr "Foto Personal"
-
 #: plugins/personal/connectivity/proxy.tpl:10
 msgid "Proxy account"
 msgstr "Cuenta proxy"
@@ -2884,6 +3113,16 @@ msgstr "Crear cuenta telefónica"
 msgid "WebDAV"
 msgstr "WebDAV"
 
+#: plugins/personal/connectivity/class_webdavAccount.inc:68
+#, fuzzy
+msgid "Removing webDAV account failed"
+msgstr "Eliminar cuenta telefónica"
+
+#: plugins/personal/connectivity/class_webdavAccount.inc:111
+#, fuzzy
+msgid "Saving webDAV account failed"
+msgstr "Cuenta WebDAV"
+
 #: plugins/personal/connectivity/phpgw.tpl:3
 msgid "PHPGroupware account"
 msgstr "Cuenta PHPGroupware"
@@ -2926,8 +3165,8 @@ msgid "Future"
 msgstr "Futuro"
 
 #: plugins/personal/connectivity/kolab.tpl:40
-#: plugins/personal/connectivity/oxchange.tpl:18
-#: plugins/personal/connectivity/oxchange.tpl:22
+#: plugins/personal/connectivity/oxchange.tpl:26
+#: plugins/personal/connectivity/oxchange.tpl:30
 msgid "days"
 msgstr "días"
 
@@ -2999,30 +3238,33 @@ msgid "Open-Xchange Account"
 msgstr "Cuenta Open-Xchange"
 
 #: plugins/personal/connectivity/oxchange.tpl:2
-msgid "disabled, no Postgresql support detected"
+#, fuzzy
+msgid ""
+"disabled, no Postgresql support detected. Or the specified database can't be "
+"reached"
 msgstr "desactivado, No se ha detectado soporte Postgresql"
 
-#: plugins/personal/connectivity/oxchange.tpl:4
+#: plugins/personal/connectivity/oxchange.tpl:10
 msgid "Open-Xchange account"
 msgstr "Cuenta de Open-Xchange"
 
-#: plugins/personal/connectivity/oxchange.tpl:13
+#: plugins/personal/connectivity/oxchange.tpl:21
 msgid "Remember"
 msgstr "Recordar"
 
-#: plugins/personal/connectivity/oxchange.tpl:17
+#: plugins/personal/connectivity/oxchange.tpl:25
 msgid "Appointment Days"
 msgstr "Días de recordatorio"
 
-#: plugins/personal/connectivity/oxchange.tpl:21
+#: plugins/personal/connectivity/oxchange.tpl:29
 msgid "Task Days"
 msgstr "Días para tareas"
 
-#: plugins/personal/connectivity/oxchange.tpl:33
+#: plugins/personal/connectivity/oxchange.tpl:41
 msgid "User Information"
 msgstr "Información de Usuario"
 
-#: plugins/personal/connectivity/oxchange.tpl:37
+#: plugins/personal/connectivity/oxchange.tpl:45
 msgid "User Timezone"
 msgstr "Zona de uso horario del usuario"
 
@@ -3040,7 +3282,7 @@ msgid "GB"
 msgstr "Gb"
 
 #: plugins/personal/connectivity/class_proxyAccount.inc:80
-#: plugins/addons/mailqueue/class_mailqueue.inc:304
+#: plugins/addons/mailqueue/class_mailqueue.inc:314
 msgid "hour"
 msgstr "hora"
 
@@ -3056,27 +3298,93 @@ msgstr "semana"
 msgid "month"
 msgstr "mes"
 
-#: plugins/personal/connectivity/class_proxyAccount.inc:171
+#: plugins/personal/connectivity/class_proxyAccount.inc:156
+#, fuzzy
+msgid "Removing proxy account failed"
+msgstr "Eliminar cuenta Posix"
+
+#: 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."
 
+#: plugins/personal/connectivity/class_proxyAccount.inc:262
+#, fuzzy
+msgid "Saving proxy account failed"
+msgstr "Cuenta proxy"
+
+#: 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:93
+#: plugins/admin/systems/class_servGeneric.inc:36
+#: plugins/admin/ogroups/class_termgroup.inc:39
+msgid "Locked"
+msgstr ""
+
+#: plugins/personal/connectivity/opengw.tpl:49
+#, fuzzy
+msgid "Teams"
+msgstr "Días para tareas"
+
 #: plugins/personal/connectivity/class_pptpAccount.inc:26
 msgid "PPTP"
 msgstr ""
 
+#: plugins/personal/connectivity/class_pptpAccount.inc:84
+#, fuzzy
+msgid "Removing PPTP account failed"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/connectivity/class_pptpAccount.inc:127
+#, fuzzy
+msgid "Saving PPTP account failed"
+msgstr "Cuenta FTP"
+
 #: plugins/personal/connectivity/class_intranetAccount.inc:14
 msgid "Intranet"
 msgstr ""
 
+#: plugins/personal/connectivity/class_intranetAccount.inc:102
+#, fuzzy
+msgid "Removing intranet account failed"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/connectivity/class_intranetAccount.inc:157
+#, fuzzy
+msgid "Saving intranet account failed"
+msgstr "Crear cuenta telefónica"
+
 #: plugins/personal/connectivity/class_phpgwAccount.inc:5
 msgid "PHPGroupware"
 msgstr "PHPGroupware"
 
+#: plugins/personal/connectivity/class_phpgwAccount.inc:72
+#, fuzzy
+msgid "Removing PHPgw account failed"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/personal/connectivity/class_phpgwAccount.inc:115
+msgid "Saving PHPgw account failed"
+msgstr ""
+
 #: plugins/personal/connectivity/phpscheduleit.tpl:3
 #, fuzzy
 msgid "PHPscheduleit account"
@@ -3125,149 +3433,120 @@ 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/class_kolabAccount.inc:325
+#, fuzzy
+msgid "Saving Kolab account failed"
+msgstr "Cuenta Kolab"
+
 #: 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
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:96
+#, fuzzy
+msgid "Removing pureftpd account failed"
+msgstr "Eliminar cuenta telefónica"
+
+#: 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:140
+#: 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:143
+#: 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:146
+#: 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:149
+#: 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"
-msgstr "Open-Xchange"
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
-#, fuzzy, php-format
-msgid ""
-"This account has %s features disabled. Posix features are needed for "
-"openXchange accounts, enable them first."
+#: plugins/personal/connectivity/class_pureftpdAccount.inc:175
+msgid "Saving pureftpd account failed"
 msgstr ""
-"Esta cuenta tiene sus características samba desactivadas, las "
-"características Posix son necesarias para las cuentas samba, activelas "
-"primero."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:613
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
-#, fuzzy
-msgid "OpenXchange"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:24
+msgid "Open-Xchange"
 msgstr "Open-Xchange"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:617
-#, fuzzy, php-format
-msgid ""
-"This account has %s features disabled. Mail features are needed for "
-"openXchange accounts, enable them first."
-msgstr ""
-"Esta cuenta tiene sus características samba desactivadas, las "
-"características Posix son necesarias para las cuentas samba, activelas "
-"primero."
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:701
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:798
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:719
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:816
 #, fuzzy
 msgid "Couldn't connect to postgresql database!"
 msgstr "No puedo conectar al servidor de base de datos postgresql."
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:705
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:802
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:723
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:820
 #, fuzzy
 msgid "Needed parameters for openexchange connectivity plugin are missing!"
 msgstr ""
 "¡Los parámetros necesarios para extensión de conectividad open-xchange no "
 "son validos!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:709
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:806
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:727
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:824
 #, fuzzy
 msgid "PHP4 module for postgresql database is missing!"
 msgstr "¡El módulo de PHP4 para la base de datos Postgresql falla!"
 
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:785
-msgid ""
-"The Open-Xchange accountname is empty and thus invalid! Check to make sure "
-"that "
-msgstr ""
-
-#: plugins/personal/connectivity/class_oxchangeAccount.inc:786
-msgid "you are not using any strange characters in the loginname."
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:736
+msgid "Removing of oxchange addressbook failed"
 msgstr ""
 
-#: plugins/personal/connectivity/webdav.tpl:3
-msgid "WebDAV account"
-msgstr "Cuenta WebDAV"
-
-#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:744
 #, fuzzy
-msgid "PHPscheduleit"
-msgstr "Cuenta PHPGroupware"
-
-#: plugins/personal/connectivity/class_connectivity.inc:63
-msgid "This account has no connectivity extensions."
-msgstr "Esta cuenta no tiene extensiones de conectividad"
+msgid "Removing oxchange account failed"
+msgstr "Eliminar cuenta telefónica"
 
-#: plugins/personal/connectivity/opengw.tpl:1
-#, fuzzy
-msgid "Opengroupware"
-msgstr "Cuenta PHPGroupware"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:803
+msgid ""
+"The Open-Xchange accountname is empty and thus invalid! Check to make sure "
+"that "
+msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:8
-#, fuzzy
-msgid "Location team"
-msgstr "Nombre de la localización"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:804
+msgid "you are not using any strange characters in the loginname."
+msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:21
-#, fuzzy
-msgid "Template user"
-msgstr "Plantilla"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:837
+msgid "Saving of oxchange account failed"
+msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:34
-#: plugins/admin/systems/class_workstationGeneric.inc:71
-msgid "Locked"
+#: plugins/personal/connectivity/class_oxchangeAccount.inc:844
+msgid "Creating oxchange addressbook tree failed"
 msgstr ""
 
-#: plugins/personal/connectivity/opengw.tpl:49
-#, fuzzy
-msgid "Teams"
-msgstr "Días para tareas"
+#: plugins/personal/connectivity/webdav.tpl:3
+msgid "WebDAV account"
+msgstr "Cuenta WebDAV"
 
 #: plugins/personal/connectivity/class_opengwAccount.inc:6
 #, fuzzy
@@ -3292,307 +3571,374 @@ msgid ""
 "configuration twice."
 msgstr ""
 
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:27
+#, fuzzy
+msgid "PHPscheduleit"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:83
+#, fuzzy
+msgid "Removing PHPscheduleit account failed"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/personal/connectivity/class_phpscheduleitAccount.inc:124
+#, fuzzy
+msgid "Saving PHPscheduleit account failed"
+msgstr "Cuenta PHPGroupware"
+
+#: plugins/personal/connectivity/class_connectivity.inc:65
+msgid "This account has no connectivity extensions."
+msgstr "Esta cuenta no tiene extensiones de conectividad"
+
 #: 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:172
 #, 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:189
 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:204
 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_systemManagement.inc:753
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+msgid "send"
+msgstr "enviar"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:292
+msgid "receive"
+msgstr "recibir"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:395
+msgid "Removing blocklist object failed"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:432
+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:438
+#: plugins/admin/departments/class_departmentGeneric.inc:233
+msgid "Required field 'Name' is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:441
+msgid "Required field 'Name' contains invalid characters"
+msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:448
+msgid "Specified name is already used."
+msgstr "El nombre especificado ya esta siendo usado"
+
+#: plugins/gofax/blocklists/class_blocklistManagement.inc:455
+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/class_blocklistManagement.inc:503
+msgid "Saving blocklist object failed"
+msgstr ""
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:31
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:32
+msgid "List of blocklists"
+msgstr "Lista de listas de bloqueos"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:36
+#, fuzzy
+msgid ""
+"This menu allows you to create, delete and edit selected blocklists. Having "
+"a large size of lists, you might prefer the range selectors on top of the "
+"select box."
+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/gofax/blocklists/class_divListBlocklists.inc:46
+#, fuzzy
+msgid "Blocklist name"
+msgstr "Gestión de listas de bloqueo"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:47
+#: plugins/addons/addressbook/contents.tpl:42
+#: plugins/admin/fai/class_divListFai.inc:60
+#: plugins/admin/groups/class_divListGroup.inc:51
+#: plugins/admin/users/class_divListUsers.inc:52
+#: plugins/admin/applications/class_divListApplication.inc:45
+#: plugins/admin/departments/class_divListDepartment.inc:42
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
+#: plugins/admin/systems/class_divListSystem.inc:53
+#: plugins/admin/ogroups/class_divListOGroup.inc:54
+#: plugins/gofon/macro/class_divListMacros.inc:48
+#: plugins/gofon/conference/class_divListConferences.inc:49
+msgid "Actions"
+msgstr "Acciones"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:50
+msgid "Select to see send blocklists"
+msgstr "Seleccione para mostrar listas de bloqueo salientes"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:50
+msgid "Show send blocklists"
+msgstr "Mostrar listas de bloqueos salientes"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:51
+msgid "Select to see receive blocklists"
+msgstr "Seleccione para mostrar listas de bloqueo entrantes"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:51
+msgid "Show receive blocklists"
+msgstr "Mostrar listas de bloqueos entrantes"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:54
+#: plugins/admin/groups/class_divListGroup.inc:62
+#: plugins/admin/users/class_divListUsers.inc:63
+#: plugins/admin/applications/class_divListApplication.inc:48
+#: plugins/admin/departments/class_divListDepartment.inc:46
+#: plugins/admin/systems/class_divListSystem.inc:66
+#: plugins/admin/ogroups/class_divListOGroup.inc:69
+#: plugins/gofon/macro/class_divListMacros.inc:51
+#: plugins/gofon/conference/class_divListConferences.inc:52
+#, fuzzy
+msgid "Select to search within subtrees"
+msgstr "Buscar en el subárbol"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:57
+msgid "Regular expression for matching list names"
+msgstr "Expresiones regulares para encontrar nombres de listas"
+
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:77
+#: plugins/admin/fai/class_divListFai.inc:111
+#: plugins/admin/groups/class_divListGroup.inc:93
+#: plugins/admin/users/class_divListUsers.inc:93
+#: plugins/admin/applications/class_divListApplication.inc:92
+#: plugins/admin/departments/class_divListDepartment.inc:69
 #: 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_divListSystem.inc:88
+#: plugins/admin/ogroups/class_divListOGroup.inc:99
+#: plugins/gofon/macro/class_divListMacros.inc:74
+#: plugins/gofon/conference/class_divListConferences.inc:75
 #, fuzzy
 msgid "Go to root department"
 msgstr "Lista de Departamentos"
 
-#: 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_systemManagement.inc:753
-#: plugins/admin/systems/class_glpiSelectUser.inc:160
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:77
+#: plugins/addons/godfs/class_dfsManagment.inc:214
+#: plugins/admin/fai/class_divListFai.inc:111
+#: plugins/admin/groups/class_divListGroup.inc:93
+#: plugins/admin/users/class_divListUsers.inc:93
+#: plugins/admin/applications/class_divListApplication.inc:92
+#: plugins/admin/departments/class_divListDepartment.inc:69
 #: 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_divListSystem.inc:88
+#: plugins/admin/ogroups/class_divListOGroup.inc:99
+#: plugins/gofon/macro/class_divListMacros.inc:74
+#: plugins/gofon/conference/class_divListConferences.inc:75
 #, 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_systemManagement.inc:755
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:79
+#: plugins/admin/fai/class_divListFai.inc:114
+#: plugins/admin/groups/class_divListGroup.inc:94
+#: plugins/admin/users/class_divListUsers.inc:95
+#: plugins/admin/applications/class_divListApplication.inc:94
+#: plugins/admin/departments/class_divListDepartment.inc:70
 #: 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_divListSystem.inc:90
+#: plugins/admin/ogroups/class_divListOGroup.inc:101
+#: plugins/gofon/macro/class_divListMacros.inc:76
+#: plugins/gofon/conference/class_divListConferences.inc:77
 #, fuzzy
 msgid "Go up one department"
 msgstr "Nombre del departamento"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:308
-#: plugins/admin/fai/class_faiManagement.inc:644
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:79
+#: plugins/addons/godfs/class_dfsManagment.inc:213
 #: 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_systemManagement.inc:755
-#: plugins/admin/systems/class_glpiSelectUser.inc:162
+#: plugins/admin/fai/class_divListFai.inc:114
+#: plugins/admin/groups/class_divListGroup.inc:94
+#: plugins/admin/users/class_divListUsers.inc:95
+#: plugins/admin/applications/class_divListApplication.inc:94
+#: plugins/admin/departments/class_divListDepartment.inc:70
 #: plugins/admin/systems/class_servDNSeditZone.inc:289
 #: 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_divListSystem.inc:90
+#: plugins/admin/ogroups/class_divListOGroup.inc:101
 #: plugins/admin/ogroups/phonequeue.tpl:17
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:325
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:286
+#: plugins/gofon/macro/class_divListMacros.inc:76
+#: plugins/gofon/conference/class_divListConferences.inc:77
 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_systemManagement.inc:757
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:81
+#: plugins/admin/groups/class_divListGroup.inc:95
+#: plugins/admin/users/class_divListUsers.inc:97
+#: plugins/admin/applications/class_divListApplication.inc:96
 #: 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_divListSystem.inc:92
+#: plugins/admin/ogroups/class_divListOGroup.inc:103
+#: plugins/gofon/macro/class_divListMacros.inc:78
+#: plugins/gofon/conference/class_divListConferences.inc:79
 #, 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_systemManagement.inc:757
-#: plugins/admin/systems/class_glpiSelectUser.inc:164
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:81
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/groups/class_divListGroup.inc:95
+#: plugins/admin/users/class_divListUsers.inc:97
+#: plugins/admin/applications/class_divListApplication.inc:96
+#: plugins/admin/departments/class_divListDepartment.inc:71
 #: 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_divListSystem.inc:92
+#: plugins/admin/ogroups/class_divListOGroup.inc:103
+#: plugins/gofon/macro/class_divListMacros.inc:78
+#: plugins/gofon/conference/class_divListConferences.inc:79
 #, 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_systemManagement.inc:758
-#: plugins/admin/systems/class_glpiSelectUser.inc:165
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/admin/fai/class_divListFai.inc:119
+#: plugins/admin/groups/class_divListGroup.inc:96
+#: plugins/admin/users/class_divListUsers.inc:99
+#: plugins/admin/applications/class_divListApplication.inc:98
+#: plugins/admin/departments/class_divListDepartment.inc:72
 #: 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_divListSystem.inc:93
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/conference/class_divListConferences.inc:81
 msgid "Reload list"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:310
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: 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/admin/systems/class_systemManagement.inc:758
-#: plugins/admin/systems/class_systemManagement.inc:775
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:83
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:90
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/fai/class_divListFai.inc:120
+#: plugins/admin/fai/class_divListFai.inc:150
+#: plugins/admin/groups/class_divListGroup.inc:96
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/users/class_divListUsers.inc:99
+#: plugins/admin/users/class_divListUsers.inc:109
+#: plugins/admin/applications/class_divListApplication.inc:98
+#: plugins/admin/applications/class_divListApplication.inc:106
+#: plugins/admin/departments/class_divListDepartment.inc:72
+#: plugins/admin/departments/class_divListDepartment.inc:77
+#: 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_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/gofon/macro/class_gofonMacroManagement.inc:332
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:288
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:293
+#: plugins/admin/systems/class_divListSystem.inc:93
+#: plugins/admin/systems/class_divListSystem.inc:110
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/admin/ogroups/class_divListOGroup.inc:113
+#: plugins/gofon/macro/class_divListMacros.inc:80
+#: plugins/gofon/macro/class_divListMacros.inc:87
+#: plugins/gofon/conference/class_divListConferences.inc:81
+#: plugins/gofon/conference/class_divListConferences.inc:88
 msgid "Submit"
 msgstr ""
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:86
 #, fuzzy
 msgid "Create new blocklist"
 msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:312
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:86
 #, fuzzy
 msgid "New Blocklist"
 msgstr "Listas de bloqueo"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:314
-#: 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/admin/systems/class_systemManagement.inc:775
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:90
+#: plugins/addons/godfs/class_dfsManagment.inc:218
+#: plugins/admin/fai/class_divListFai.inc:150
+#: plugins/admin/groups/class_divListGroup.inc:102
+#: plugins/admin/users/class_divListUsers.inc:109
+#: plugins/admin/applications/class_divListApplication.inc:106
+#: plugins/admin/departments/class_divListDepartment.inc:77
 #: plugins/admin/systems/class_glpiSelectUser.inc:169
-#: 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_divListSystem.inc:110
+#: plugins/admin/ogroups/class_divListOGroup.inc:113
+#: plugins/gofon/macro/class_divListMacros.inc:87
+#: plugins/gofon/conference/class_divListConferences.inc:88
 #, 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/admin/systems/class_systemManagement.inc:781
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:104
+#: 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_faiHook.inc:252
+#: plugins/admin/fai/class_faiHook.inc:255
+#: plugins/admin/fai/class_divListFai.inc:209
+#: plugins/admin/fai/class_divListFai.inc:214
+#: plugins/admin/groups/class_divListGroup.inc:150
+#: plugins/admin/users/class_divListUsers.inc:143
+#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/departments/class_divListDepartment.inc:92
 #: 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/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_divListSystem.inc:135
+#: plugins/admin/ogroups/class_divListOGroup.inc:138
+#: plugins/gofon/macro/class_divListMacros.inc:102
+#: plugins/gofon/conference/class_divListConferences.inc:103
 #, 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_divListBlocklists.inc:104
+#: plugins/admin/users/class_divListUsers.inc:144
+#: plugins/gofon/macro/class_divListMacros.inc:103
 #, fuzzy
 msgid "Edit user"
 msgstr "Usuario administrador"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:318
+#: plugins/gofax/blocklists/class_divListBlocklists.inc:105
 #: 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/gofon/conference/class_phoneConferenceManagment.inc:298
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:300
+#: plugins/admin/fai/class_faiScript.inc:232
+#: plugins/admin/fai/class_faiTemplate.inc:202
+#: plugins/admin/fai/class_faiHook.inc:256
+#: plugins/admin/fai/class_divListFai.inc:216
+#: plugins/admin/groups/class_divListGroup.inc:152
+#: plugins/admin/users/class_divListUsers.inc:147
+#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/systems/class_divListSystem.inc:136
+#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/gofon/macro/class_divListMacros.inc:104
+#: plugins/gofon/conference/class_divListConferences.inc:105
+#: plugins/gofon/conference/class_divListConferences.inc:107
 #, 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_divListBlocklists.inc:105
+#: plugins/admin/users/class_divListUsers.inc:148
+#: plugins/gofon/macro/class_divListMacros.inc:105
 #, fuzzy
 msgid "Delete user"
 msgstr "Borrar"
 
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:324
-#, fuzzy
-msgid "Blocklist name"
-msgstr "Gestión de listas de bloqueo"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:325
-#: 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_systemManagement.inc:793
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:203
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:188
-#: plugins/admin/ogroups/class_ogroupManagement.inc:495
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:345
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:313
-msgid "Actions"
-msgstr "Acciones"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:328
-msgid "This table displays faxblocklists for the selected tree."
-msgstr ""
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
-msgid "send"
-msgstr "enviar"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:396
-msgid "receive"
-msgstr "recibir"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:543
-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
-msgid "Required field 'Name' is not set."
-msgstr "El campo requerido 'Nombre' no ha sido rellenado."
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:552
-msgid "Required field 'Name' contains invalid characters"
-msgstr "El campo requerido 'Nombre' contiene caracteres no validos"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:559
-msgid "Specified name is already used."
-msgstr "El nombre especificado ya esta siendo usado"
-
-#: plugins/gofax/blocklists/class_blocklistManagement.inc:566
-msgid "No permission to create a blocklist on this base."
-msgstr "No tiene permisos para crear una lista de bloqueos en esta base"
-
 #: plugins/gofax/blocklists/generic.tpl:8
 msgid "List name"
 msgstr "Nombre de la lista"
@@ -3605,34 +3951,35 @@ msgstr "Nombre de la lista de bloqueos"
 msgid "Select subtree to place blocklist in"
 msgstr "Seleccione un subárbol para colocar la lista de bloqueos"
 
-#: plugins/gofax/blocklists/generic.tpl:32
+#: plugins/gofax/blocklists/generic.tpl:37
+#: plugins/admin/fai/class_faiSummaryTab.inc:329
 #: 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/glpiPrinterCartridgesEdit.tpl:37
 #: plugins/admin/systems/glpi_devices.tpl:427
 #: plugins/admin/systems/glpi_devices.tpl:492
 #: plugins/admin/systems/glpi_devices.tpl:542
+#: plugins/admin/systems/workstationService.tpl:42
+#: plugins/admin/systems/workstationService.tpl:120
+#: plugins/admin/systems/terminalService.tpl:42
+#: plugins/admin/systems/terminalService.tpl:120
+#: plugins/admin/systems/servnfs.tpl:47
 #: plugins/gofon/conference/generic.tpl:22 include/php_setup.inc:130
 msgid "Type"
 msgstr "Tipo"
 
-#: plugins/gofax/blocklists/generic.tpl:34
+#: plugins/gofax/blocklists/generic.tpl:39
 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
+#: plugins/gofax/blocklists/generic.tpl:48
 msgid "Descriptive text for this blocklist"
 msgstr "Descripción de esta lista de bloqueos"
 
-#: plugins/gofax/blocklists/generic.tpl:56
+#: plugins/gofax/blocklists/generic.tpl:61
 msgid "Blocked numbers"
 msgstr "Números bloqueados"
 
-#: plugins/gofax/blocklists/generic.tpl:72
+#: plugins/gofax/blocklists/generic.tpl:77
 msgid "Numbers can also contain wild cards."
 msgstr "Los números pueden contener también comodínes"
 
@@ -3641,11 +3988,12 @@ msgstr "Los números pueden contener también comodínes"
 #: 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/admin/systems/remove_glpi.tpl:2
+#: plugins/admin/ogroups/termgroup.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
+#: html/index.php:49 html/index.php:331 html/index.php:337
 #: 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/default/islocked.tpl:6 ihtml/themes/default/conflict.tpl:6
 msgid "Warning"
 msgstr "Aviso"
 
@@ -3669,48 +4017,11 @@ msgstr ""
 "Entonces si esta seguro - presione <i>Eliminar</i> para continuar o "
 "<i>Cancelar</i> para Abortar."
 
-#: plugins/gofax/blocklists/headpage.tpl:6
-msgid "List of blocklists"
-msgstr "Lista de listas de bloqueos"
-
-#: plugins/gofax/blocklists/headpage.tpl:24
-msgid ""
-"This menu allows you to create, delete and edit selected blocklists. Having "
-"a large size of lists, you might prefer the range selectors on top of the "
-"select box."
-msgstr ""
-"Este menú le permite crear, editar o eliminar listas de bloqueo. Puede usar "
-"el selector de rango en la parte superior de la lista, cuando trabaja con un "
-"gran número de listas de bloqueo."
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Select to see send blocklists"
-msgstr "Seleccione para mostrar listas de bloqueo salientes"
-
-#: plugins/gofax/blocklists/headpage.tpl:38
-msgid "Show send blocklists"
-msgstr "Mostrar listas de bloqueos salientes"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Select to see receive blocklists"
-msgstr "Seleccione para mostrar listas de bloqueo entrantes"
-
-#: plugins/gofax/blocklists/headpage.tpl:39
-msgid "Show receive blocklists"
-msgstr "Mostrar listas de bloqueos entrantes"
-
-#: plugins/gofax/blocklists/headpage.tpl:45
-msgid "Display lists matching"
-msgstr "Mostrar listas que contengan"
-
-#: plugins/gofax/blocklists/headpage.tpl:48
-msgid "Regular expression for matching list names"
-msgstr "Expresiones regulares para encontrar nombres de listas"
-
-#: plugins/gofax/blocklists/main.inc:20 plugins/gofax/blocklists/main.inc:22
+#: plugins/gofax/blocklists/main.inc:26 plugins/gofax/blocklists/main.inc:28
 msgid "Blocklist management"
 msgstr "Gestión de listas de bloqueo"
 
+#: plugins/gofax/faxaccount/paste_generic.tpl:13
 #: plugins/gofax/faxaccount/generic.tpl:12
 msgid "Fax number for GOfax to trigger on"
 msgstr "Numero de fax que activa GOfax"
@@ -3813,8 +4124,8 @@ msgid "FAX settings"
 msgstr "Parametros del Fax"
 
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:6
-#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/addons/addressbook/address_edit.tpl:206
+#: plugins/addons/addressbook/address_info.tpl:88
 #: plugins/generic/references/class_reference.inc:30
 msgid "FAX"
 msgstr "FAX"
@@ -3854,12 +4165,17 @@ 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/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:632
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:94
 #, fuzzy
 msgid "back"
 msgstr "Atras"
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:624
+#, fuzzy
+msgid "Removing FAX account failed"
+msgstr "Borrar cuenta de correo"
+
 #: plugins/gofax/faxaccount/class_gofaxAccount.inc:639
 msgid "The required field 'Fax' is not set."
 msgstr "No ha rellenado el campo requerido 'Fax'"
@@ -3884,6 +4200,10 @@ msgid ""
 "correct your choice."
 msgstr ""
 
+#: plugins/gofax/faxaccount/class_gofaxAccount.inc:743
+msgid "Saving FAX account failed"
+msgstr ""
+
 #: plugins/gofax/faxreports/detail.tpl:5
 msgid "FAX preview - please wait"
 msgstr "Previsualización del Fax - Por favor espere"
@@ -3899,8 +4219,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:758
+#: plugins/admin/ogroups/class_ogroupManagement.inc:363
 msgid "User"
 msgstr "Usuario"
 
@@ -3941,43 +4261,39 @@ msgstr "# páginas"
 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
+#: plugins/gofax/faxreports/class_faxreport.inc:106
+#: plugins/gofax/faxreports/class_faxreport.inc:116
 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/gofax/faxreports/class_faxreport.inc:109
 #: plugins/addons/logview/class_logview.inc:66
-#: plugins/gofon/fonreports/class_fonreport.inc:99
+#: plugins/gofon/fonreports/class_fonreport.inc:160
 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
+#: plugins/gofax/faxreports/class_faxreport.inc:120
+#: plugins/gofax/faxreports/class_faxreport.inc:125
 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
+#: plugins/gofax/faxreports/class_faxreport.inc:148
+#: plugins/gofax/faxreports/class_faxreport.inc:263
 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
+#: plugins/gofax/faxreports/class_faxreport.inc:157
 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
+#: plugins/gofax/faxreports/class_faxreport.inc:177
+#: plugins/gofax/faxreports/class_faxreport.inc:271
+#: plugins/gofon/fonreports/class_fonreport.inc:202
 msgid "Y-M-D"
 msgstr "Y-M-D"
 
@@ -4046,7 +4362,7 @@ msgstr "Receptor"
 msgid "Search returned no results..."
 msgstr "La busqueda no ha encontrado resultados"
 
-#: plugins/gofax/faxreports/main.inc:5
+#: plugins/gofax/faxreports/main.inc:18
 msgid "FAX reports"
 msgstr "Reportes de FAX"
 
@@ -4062,43 +4378,87 @@ msgstr "Marcando conexión"
 msgid "Dial"
 msgstr "Llamar"
 
-#: plugins/addons/addressbook/contents.tpl:14
-#: plugins/addons/addressbook/class_addressbook.inc:513
-#: 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/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/servnfs.tpl:9
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
-#: plugins/admin/systems/glpi_devices.tpl:10
-#: plugins/admin/systems/glpi_devices.tpl:105
-#: plugins/admin/systems/glpi_devices.tpl:146
-#: plugins/admin/systems/glpi_devices.tpl:201
-#: plugins/admin/systems/glpi_devices.tpl:257
-#: plugins/admin/systems/glpi_devices.tpl:315
-#: plugins/admin/systems/glpi_devices.tpl:379
-#: plugins/admin/systems/glpi_devices.tpl:451
-#: plugins/admin/systems/glpi_devices.tpl:515
-#: plugins/admin/systems/glpi_devices.tpl:562
-#: plugins/admin/systems/glpi_devices.tpl:615
-#: plugins/admin/systems/glpi_devices.tpl:669
-#: plugins/admin/systems/glpi_devices.tpl:715
-#: 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/address_edit.tpl:7
+msgid "Choose the department to store entry in"
+msgstr "Elija un departamento para guardar la entrada"
 
-#: plugins/addons/addressbook/contents.tpl:15
-#: plugins/addons/addressbook/address_info.tpl:29
-#: plugins/addons/addressbook/address_edit.tpl:66
-msgid "Private"
-msgstr "Privado"
+#: 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:66
+#: plugins/addons/addressbook/contents.tpl:15
+#: plugins/addons/addressbook/address_info.tpl:29
+msgid "Private"
+msgstr "Privado"
+
+#: 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/contents.tpl:14
+#: plugins/addons/addressbook/class_addressbook.inc:513
+#: plugins/addons/addressbook/address_info.tpl:16
+#: plugins/admin/fai/faiPartitionTable.tpl:9
+#: plugins/admin/fai/class_faiSummaryTab.inc:324
+#: plugins/admin/fai/faiVariable.tpl:9 plugins/admin/fai/faiScriptEntry.tpl:9
+#: plugins/admin/fai/faiProfile.tpl:9
+#: plugins/admin/fai/faiPartitionTableEntry.tpl:6
+#: 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/fai/faiPackage.tpl:9
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:7
+#: plugins/admin/systems/glpi_devices.tpl:10
+#: plugins/admin/systems/glpi_devices.tpl:105
+#: plugins/admin/systems/glpi_devices.tpl:146
+#: plugins/admin/systems/glpi_devices.tpl:201
+#: plugins/admin/systems/glpi_devices.tpl:257
+#: plugins/admin/systems/glpi_devices.tpl:315
+#: plugins/admin/systems/glpi_devices.tpl:379
+#: plugins/admin/systems/glpi_devices.tpl:451
+#: plugins/admin/systems/glpi_devices.tpl:515
+#: plugins/admin/systems/glpi_devices.tpl:562
+#: plugins/admin/systems/glpi_devices.tpl:615
+#: plugins/admin/systems/glpi_devices.tpl:669
+#: plugins/admin/systems/glpi_devices.tpl:715
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:7
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:10
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:201
+#: plugins/admin/systems/servnfs.tpl:9 plugins/gofon/macro/parameter.tpl:5
+#: html/getxls.php:174 html/getxls.php:233
+msgid "Name"
+msgstr "Nombre"
 
 #: plugins/addons/addressbook/contents.tpl:15
 msgid "Contact"
@@ -4119,7 +4479,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:714
 msgid "Edit entry"
 msgstr "Editar entrada"
 
@@ -4169,7 +4529,7 @@ msgstr ""
 "entrada. Por favor pulse dos veces si realmente quiere hacer esta, ya que no "
 "hay forma de que GOsa recupere la información."
 
-#: plugins/addons/addressbook/main.inc:23
+#: plugins/addons/addressbook/main.inc:37
 msgid "Address book"
 msgstr "Libreta de direcciones"
 
@@ -4190,12 +4550,17 @@ msgstr ""
 "No tiene configurado un numero de teléfono personal. Por favor cambie esto "
 "para permitir llamadas directas."
 
-#: plugins/addons/addressbook/class_addressbook.inc:186
-#: plugins/addons/addressbook/class_addressbook.inc:287
+#: plugins/addons/addressbook/class_addressbook.inc:180
+#, fuzzy
+msgid "Removing addressbook entry failed"
+msgstr "Enseñar las entradas de la libreta de direcciones"
+
+#: plugins/addons/addressbook/class_addressbook.inc:187
+#: plugins/addons/addressbook/class_addressbook.inc:288
 msgid "You are not allowed to delete this entry!"
 msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/addons/addressbook/class_addressbook.inc:281
+#: plugins/addons/addressbook/class_addressbook.inc:282
 #, php-format
 msgid "You're about to delete the entry %s."
 msgstr "Has decidido eliminar la entrada %s"
@@ -4229,8 +4594,8 @@ 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/mailqueue/class_mailqueue.inc:296
+#: plugins/addons/mailqueue/class_mailqueue.inc:361
 #: plugins/addons/logview/class_logview.inc:94
 #: plugins/addons/logview/class_logview.inc:111
 msgid "All"
@@ -4259,64 +4624,141 @@ 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/addressbook/address_info.tpl:12
-#: plugins/addons/addressbook/address_edit.tpl:24
-msgid "Personal"
-msgstr "Personal"
+#: plugins/addons/addressbook/class_addressbook.inc:650
+#, fuzzy
+msgid "Saving addressbook entry failed"
+msgstr "Enseñar las entradas de la libreta de direcciones"
 
-#: 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/godfs/class_dfsManagment.inc:10
+#, fuzzy
+msgid "DFS Managment"
+msgstr "Nombre de la maquina"
 
-#: 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/godfs/class_dfsManagment.inc:151
+#, fuzzy
+msgid "Removing DFS share failed"
+msgstr "Eliminar servicio DNS"
 
-#: plugins/addons/addressbook/address_info.tpl:53
-#: plugins/addons/addressbook/address_edit.tpl:119
-msgid "Organizational"
-msgstr "De organización"
+#: plugins/addons/godfs/class_dfsManagment.inc:170
+msgid "No DFS entries found"
+msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:61
-#: plugins/addons/addressbook/address_edit.tpl:128
-msgid "Company"
-msgstr "Compañia"
+#: plugins/addons/godfs/class_dfsManagment.inc:213
+#, fuzzy
+msgid "Go up one dfsshare"
+msgstr "Nombre del departamento"
 
-#: 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/godfs/class_dfsManagment.inc:214
+msgid "Go to dfs root"
+msgstr ""
 
-#: plugins/addons/addressbook/address_info.tpl:73
-#: plugins/addons/addressbook/address_edit.tpl:168
-msgid "Country"
-msgstr "Pais"
+#: plugins/addons/godfs/class_dfsManagment.inc:215
+#, fuzzy
+msgid "Create new dfsshare"
+msgstr "Crear una nueva entrada en"
 
-#: 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/godfs/class_dfsgeneric.inc:102
+#: plugins/addons/godfs/class_dfsgeneric.inc:104
+#, fuzzy
+msgid "Dfs share already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:117
+#, fuzzy
+msgid "Required Field \"Name of dfs Share\" is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:120
+#, fuzzy
+msgid "Required Field \"Description\" is not set."
+msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:123
+#, fuzzy
+msgid "Required Field \"Fileserver\" is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:126
+#, fuzzy
+msgid "Required Field \"Share on fileserver\" is not set."
+msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+
+#: plugins/addons/godfs/class_dfsgeneric.inc:129
+#, fuzzy
+msgid "Required Field \"Location\" is not set."
+msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+
+#: plugins/addons/godfs/generic.tpl:4
+#, fuzzy
+msgid "DFS Properties"
+msgstr "Propiedades"
+
+#: plugins/addons/godfs/generic.tpl:8
+#, fuzzy
+msgid "Name of dfs Share"
+msgstr "Nombre del departamento"
+
+#: plugins/addons/godfs/generic.tpl:16
+#, fuzzy
+msgid "Fileserver"
+msgstr "Servidor"
+
+#: plugins/addons/godfs/generic.tpl:20
+#, fuzzy
+msgid "Share on Fileserver"
+msgstr "Servicio de impresión"
+
+#: plugins/addons/godfs/generic.tpl:30
+#, fuzzy
+msgid "DFS Location"
+msgstr "Localización"
+
+#: plugins/addons/godfs/contents.tpl:8
+#, fuzzy
+msgid "DFS Shares"
+msgstr "Borrar"
+
+#: plugins/addons/godfs/contents.tpl:26
+#, 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."
+
+#: plugins/addons/godfs/contents.tpl:40
+#, fuzzy
+msgid "Display dfs shares matching"
+msgstr "Mostrar direcciones que concuerden con"
+
+#: plugins/addons/godfs/contents.tpl:44
+#, fuzzy
+msgid "Regular expression for matching dfs share names"
+msgstr "Expresiones regulares para encontrar nombres de sistemas"
+
+#: plugins/addons/godfs/main.inc:27 plugins/addons/godfs/main.inc:33
+msgid "Distributed File System Administration"
+msgstr ""
 
 #: plugins/addons/mailqueue/class_mailqueue.inc:6
-#: plugins/addons/mailqueue/main.inc:23
+#: plugins/addons/mailqueue/main.inc:38
 #, fuzzy
 msgid "Mail queue"
 msgstr "Servidor"
@@ -4326,49 +4768,53 @@ msgid ""
 "Please check your 'gosa.conf', there is no 'MAILQUEUESCRIPTPATH' specified."
 msgstr ""
 
-#: 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
+#: plugins/addons/mailqueue/class_mailqueue.inc:86
+#: plugins/addons/mailqueue/class_mailqueue.inc:94
+#: plugins/addons/mailqueue/class_mailqueue.inc:113
+#: plugins/addons/mailqueue/class_mailqueue.inc:122
+#: plugins/addons/mailqueue/class_mailqueue.inc:177
+#: plugins/addons/mailqueue/class_mailqueue.inc:204
 #, php-format
 msgid "Please check your 'gosa.conf' the given '%s' can't be executed."
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:256
+#: plugins/addons/mailqueue/class_mailqueue.inc:216
+msgid "There are no mail server specified."
+msgstr ""
+
+#: plugins/addons/mailqueue/class_mailqueue.inc:266
 msgid "up"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:258
+#: plugins/addons/mailqueue/class_mailqueue.inc:268
 #, fuzzy
 msgid "down"
 msgstr "Dominio"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:301
+#: plugins/addons/mailqueue/class_mailqueue.inc:311
 msgid "no limit"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:306
+#: plugins/addons/mailqueue/class_mailqueue.inc:316
 #, fuzzy
 msgid "hours"
 msgstr "hora"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:352
+#: plugins/addons/mailqueue/class_mailqueue.inc:362
 msgid "Hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:353
+#: plugins/addons/mailqueue/class_mailqueue.inc:363
 msgid "Un hold"
 msgstr ""
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:354
+#: plugins/addons/mailqueue/class_mailqueue.inc:364
 #: plugins/addons/mailqueue/contents.tpl:76
 #, fuzzy
 msgid "Active"
 msgstr "Privado"
 
-#: plugins/addons/mailqueue/class_mailqueue.inc:355
+#: plugins/addons/mailqueue/class_mailqueue.inc:365
 msgid "Not active"
 msgstr ""
 
@@ -4709,7 +5155,7 @@ 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
+#: plugins/addons/ldapmanager/main.inc:40
 msgid "LDAP manager"
 msgstr "Gestor LDAP"
 
@@ -4808,18 +5254,38 @@ msgstr "Nombre de Maquina"
 msgid "Message"
 msgstr "Mensaje"
 
-#: plugins/addons/logview/main.inc:23
+#: plugins/addons/logview/main.inc:33
 msgid "System log view"
 msgstr "Ver registro del sistema"
 
-#: plugins/admin/fai/class_faiScript.inc:240
+#: 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:264
+#: plugins/admin/fai/class_faiHook.inc:265
 #: plugins/admin/fai/class_faiHookEntry.inc:84
 #, fuzzy
 msgid "Download"
 msgstr "Dominio"
 
+#: plugins/admin/fai/class_faiScript.inc:303
+msgid "Removing FAI script base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiScript.inc:354
+#, fuzzy
+msgid "Creating FAI script base failed"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/fai/class_faiScript.inc:424
+#, fuzzy
+msgid "Removing FAI script failed"
+msgstr "Parametros Unix"
+
+#: plugins/admin/fai/class_faiScript.inc:443
+#, fuzzy
+msgid "Saving FAI script failed"
+msgstr "Parametros Unix"
+
 #: 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
@@ -4828,6 +5294,21 @@ msgstr "Dominio"
 msgid "Try to move tree failed. Destination tree is subtree of source tree."
 msgstr ""
 
+#: plugins/admin/fai/class_faiTemplate.inc:325
+#, fuzzy
+msgid "Saving FAI template base failed"
+msgstr "Lista de Departamentos"
+
+#: plugins/admin/fai/class_faiTemplate.inc:386
+msgid "Removing FAI template base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiTemplate.inc:391
+#: plugins/admin/fai/class_faiTemplate.inc:404
+#, fuzzy
+msgid "Saving FAI template failed"
+msgstr "Lista de Departamentos"
+
 #: plugins/admin/fai/class_faiManagement.inc:32
 #, fuzzy
 msgid "FAI"
@@ -4838,50 +5319,52 @@ 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:153
 #, 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:159
+#: plugins/admin/fai/class_faiManagement.inc:202
+#: plugins/admin/systems/class_systemManagement.inc:313
+#: plugins/admin/systems/class_systemManagement.inc:373
 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:255
 #, 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:258
 #, 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:313
 #, 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:315
 #, fuzzy
 msgid "Specified freeze name is invalid."
 msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/fai/class_faiManagement.inc:391
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:349
+#: plugins/admin/fai/class_faiManagement.inc:322
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:351
 #: plugins/admin/systems/class_servRepository.inc:208
 #, 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:392
+#: plugins/admin/fai/class_faiManagement.inc:545
+#: plugins/admin/fai/faiPackageNew.tpl:50 plugins/admin/users/template.tpl:48
+#: plugins/admin/departments/class_departmentGeneric.inc:410
+#: plugins/admin/departments/class_departmentGeneric.inc:495
+#: 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
@@ -4893,173 +5376,71 @@ msgstr "El nombre especificado ya esta siendo usado"
 msgid "Continue"
 msgstr "Continuar"
 
-#: plugins/admin/fai/class_faiManagement.inc:647
-#: plugins/admin/departments/class_departmentManagement.inc:298
+#: plugins/admin/fai/class_faiPackageEntry.inc:35
 #, fuzzy
-msgid "Go to users home department"
-msgstr "Mostrar usuarios del departamento"
+msgid "Please enter your search string here"
+msgstr "Por favor introduzca un número de serie válido"
 
-#: plugins/admin/fai/class_faiManagement.inc:654
-#, fuzzy
-msgid "New profile"
-msgstr "Gestión de Asterisk PBX"
+#: plugins/admin/fai/class_faiPackageEntry.inc:48
+msgid ""
+"This list displays all assigned package names for this repository settings."
+msgstr ""
 
-#: plugins/admin/fai/class_faiManagement.inc:654
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
-msgid "P"
+#: 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/fai/class_faiManagement.inc:659
+#: plugins/admin/fai/branch_selector.tpl:3
+#: plugins/admin/applications/release_select.tpl:3
 #, fuzzy
-msgid "New partition table"
-msgstr "Impresora"
-
-#: plugins/admin/fai/class_faiManagement.inc:659
-msgid "PT"
-msgstr ""
+msgid "Branches"
+msgstr "Cancelar"
 
-#: plugins/admin/fai/class_faiManagement.inc:662
+#: plugins/admin/fai/branch_selector.tpl:9
+#: plugins/admin/applications/release_select.tpl:9
 #, fuzzy
-msgid "New scripts"
-msgstr "Mostrar equipos"
+msgid "Current release"
+msgstr "Contraseña actual"
 
-#: plugins/admin/fai/class_faiManagement.inc:662
-msgid "S"
-msgstr ""
+#: plugins/admin/fai/branch_selector.tpl:21
+#, fuzzy
+msgid "Create new branch"
+msgstr "Crear una nueva entrada en"
 
-#: plugins/admin/fai/class_faiManagement.inc:665
+#: plugins/admin/fai/branch_selector.tpl:25
 #, fuzzy
-msgid "New hooks"
-msgstr "Mostrar equipos"
+msgid "Create new locked branch"
+msgstr "Crear una nueva entrada en"
 
-#: plugins/admin/fai/class_faiManagement.inc:665
-msgid "H"
-msgstr ""
+#: plugins/admin/fai/branch_selector.tpl:30
+#, fuzzy
+msgid "Delete current release"
+msgstr "Borrar"
 
-#: plugins/admin/fai/class_faiManagement.inc:668
+#: plugins/admin/fai/main.inc:44 plugins/admin/fai/main.inc:46
 #, fuzzy
-msgid "New variables"
-msgstr "Mostrar terminales"
+msgid "Fully Automatic Installation"
+msgstr "Mantenimiento de aplicaciones"
 
-#: plugins/admin/fai/class_faiManagement.inc:668
-msgid "V"
-msgstr ""
+#: 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 "Objects"
+msgstr "Objeto"
 
-#: plugins/admin/fai/class_faiManagement.inc:671
+#: plugins/admin/fai/faiPartitionTable.tpl:34
 #, fuzzy
-msgid "New templates"
-msgstr "Nueva plantilla"
+msgid "Discs"
+msgstr "Servicios"
 
-#: plugins/admin/fai/class_faiManagement.inc:671
-msgid "T"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:674
-#, fuzzy
-msgid "New package list"
-msgstr "# páginas"
-
-#: plugins/admin/fai/class_faiManagement.inc:674
-msgid "PK"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:688
-#: plugins/admin/systems/class_systemManagement.inc:788
-msgid "This table displays all systems, in the selected tree."
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:692
-#, fuzzy
-msgid "Name of FAI class"
-msgstr "Nombre de la lista de bloqueos"
-
-#: plugins/admin/fai/class_faiManagement.inc:693
-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
-#, fuzzy
-msgid "Edit class"
-msgstr "clase"
-
-#: plugins/admin/fai/class_faiManagement.inc:698
-#: plugins/admin/fai/class_faiManagement.inc:805
-#, 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
-#, fuzzy
-msgid "department"
-msgstr "departamentos"
-
-#: plugins/admin/fai/class_faiManagement.inc:739
-#: plugins/admin/fai/class_faiManagement.inc:740
-#: 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
-msgid "Package list"
-msgstr ""
-
-#: plugins/admin/fai/class_faiManagement.inc:753
-#: plugins/admin/fai/class_faiManagement.inc:754
-#, fuzzy
-msgid "Scripts"
-msgstr "Ruta del Script"
-
-#: plugins/admin/fai/class_faiManagement.inc:774
-#: plugins/admin/fai/class_faiManagement.inc:775
-#, fuzzy
-msgid "Profile"
-msgstr "Ruta del Perfil"
-
-#: 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 ""
-
-#: 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/fai/main.inc:38 plugins/admin/fai/main.inc:40
-#, fuzzy
-msgid "Fully Automatic Installation"
-msgstr "Mantenimiento de aplicaciones"
-
-#: 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 "Objects"
-msgstr "Objeto"
-
-#: plugins/admin/fai/faiPartitionTable.tpl:34
-#, fuzzy
-msgid "Discs"
-msgstr "Servicios"
-
-#: plugins/admin/fai/faiPartitionTable.tpl:40
-msgid "Choose a disk to delete or edit"
+#: plugins/admin/fai/faiPartitionTable.tpl:40
+msgid "Choose a disk to delete or edit"
 msgstr ""
 
 #: plugins/admin/fai/faiProfileEntry.tpl:6
@@ -5101,7 +5482,7 @@ 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/faiPackageEntry.tpl:42
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:28
 #: plugins/admin/systems/servRepository.tpl:46
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
@@ -5109,7 +5490,7 @@ 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/faiPackageEntry.tpl:46
 #: plugins/admin/systems/printerPPDSelectionDialog.tpl:32
 #: plugins/admin/systems/servRepository.tpl:50
 #: plugins/admin/ogroups/ogroup_objects.tpl:42
@@ -5121,6 +5502,59 @@ msgstr "Expresiones regulares que concuerden con nombres de objetos"
 msgid "Package"
 msgstr "Mostrar teléfonos"
 
+#: plugins/admin/fai/class_faiSummaryTab.inc:39
+#, fuzzy
+msgid "Scripts"
+msgstr "Ruta del Script"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:43
+#: plugins/admin/fai/class_faiProfile.inc:297
+#: plugins/admin/fai/class_faiProfileEntry.inc:124
+#, fuzzy
+msgid "Partition table"
+msgstr "Variable"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:44
+msgid "Package list"
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:204
+msgid "This object has no FAI classes assigned."
+msgstr ""
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:216
+#, fuzzy
+msgid "Open"
+msgstr "Opciones"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:323
+#, fuzzy
+msgid "No."
+msgstr "ninguno"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:325
+#, fuzzy
+msgid "FS options"
+msgstr "Añadir opción"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:326
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
+#, fuzzy
+msgid "Mount options"
+msgstr "Otras opciones"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:327
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
+#, fuzzy
+msgid "Size in MB"
+msgstr "Entrando"
+
+#: plugins/admin/fai/class_faiSummaryTab.inc:328
+#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
+#, fuzzy
+msgid "Mount point"
+msgstr "Monitor"
+
 #: plugins/admin/fai/class_faiScriptEntry.inc:68
 #: plugins/admin/fai/class_faiHookEntry.inc:71
 #, fuzzy
@@ -5133,15 +5567,15 @@ 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"
@@ -5156,12 +5590,12 @@ 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_divListGroup.inc:50
+#: plugins/admin/users/class_divListUsers.inc:51
 #: 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_divListOGroup.inc:53
 #: plugins/gofon/conference/generic.tpl:4
 msgid "Properties"
 msgstr "Propiedades"
@@ -5183,58 +5617,22 @@ msgstr "Elija tipo de ratón"
 msgid "Import script"
 msgstr "Mostrar equipos"
 
-#: plugins/admin/fai/class_faiPackage.inc:340
-#, 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
-#, 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
-#, fuzzy
-msgid "package is configured"
-msgstr "Desconfigurado"
-
-#: plugins/admin/fai/class_faiPackage.inc:389
-#, php-format
-msgid "Package file '%s' does not exist."
+#: plugins/admin/fai/class_faiHook.inc:332
+msgid "Removing FAI hook base failed"
 msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:33 plugins/admin/fai/faiPackageNew.tpl:24
-#: plugins/admin/systems/workstationStartup.tpl:35
-#: plugins/admin/systems/servRepositorySetup.tpl:8
-#: plugins/admin/systems/class_servRepository.inc:248
-#, fuzzy
-msgid "Release"
-msgstr "Paquete de reglas"
-
-#: plugins/admin/fai/faiPackage.tpl:41
-#: plugins/admin/systems/class_printerPPDDialog.inc:319
-#, fuzzy
-msgid "Section"
-msgstr "Acción"
-
-#: plugins/admin/fai/faiPackage.tpl:49
-#, fuzzy
-msgid "Install method"
-msgstr "Método de correo"
-
-#: plugins/admin/fai/faiPackage.tpl:65
-#, fuzzy
-msgid "Used packages"
-msgstr "Mostrar teléfonos"
+#: plugins/admin/fai/class_faiHook.inc:383
+msgid "Saving FAI hook base failed"
+msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:67
-#, fuzzy
-msgid "Choosen packages"
-msgstr "Mostrar teléfonos"
+#: plugins/admin/fai/class_faiHook.inc:451
+msgid "Removing FAI hook failed"
+msgstr ""
 
-#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:597
-msgid "Configure"
-msgstr "Configurar"
+#: plugins/admin/fai/class_faiHook.inc:457
+#: plugins/admin/fai/class_faiHook.inc:467
+msgid "Saving FAI hook failed"
+msgstr ""
 
 #: plugins/admin/fai/class_faiProfile.inc:289
 #: plugins/admin/fai/class_faiProfileEntry.inc:152
@@ -5279,20 +5677,28 @@ msgstr ""
 msgid "Down"
 msgstr "Dominio"
 
-#: plugins/admin/fai/class_faiProfile.inc:381
+#: plugins/admin/fai/class_faiProfile.inc:359
+msgid "Removing FAI profile failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiProfile.inc:383
 msgid "Please assign at least one class to this  profile."
 msgstr ""
 
-#: plugins/admin/fai/class_faiProfile.inc:385
+#: plugins/admin/fai/class_faiProfile.inc:387
 #, 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:395
 #, 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."
 
+#: plugins/admin/fai/class_faiProfile.inc:429
+msgid "Saving FAI profile failed"
+msgstr ""
+
 #: plugins/admin/fai/faiProfile.tpl:32
 #, fuzzy
 msgid "FAI classes"
@@ -5303,21 +5709,6 @@ msgstr "Elija tipo de ratón"
 msgid "FS type"
 msgstr "Tipo"
 
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:194
-#, fuzzy
-msgid "Mount point"
-msgstr "Monitor"
-
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:195
-#, fuzzy
-msgid "Size in MB"
-msgstr "Entrando"
-
-#: plugins/admin/fai/class_faiPartitionTableEntry.inc:196
-#, fuzzy
-msgid "Mount options"
-msgstr "Otras opciones"
-
 #: plugins/admin/fai/class_faiPartitionTableEntry.inc:197
 #, fuzzy
 msgid "FS option"
@@ -5328,47 +5719,47 @@ 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."
@@ -5394,10 +5785,6 @@ msgstr "Añadir opción"
 msgid "List of scripts"
 msgstr "Lista de usuarios"
 
-#: plugins/admin/fai/faiScript.tpl:42
-msgid "Choose a script to delete or edit"
-msgstr ""
-
 #: plugins/admin/fai/faiPackageNew.tpl:1
 #, fuzzy
 msgid "Repository settings"
@@ -5428,25 +5815,81 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/fai/faiPackageNew.tpl:21
-msgid "Following releases are available"
-msgstr ""
+#: plugins/admin/fai/faiPackageNew.tpl:24 plugins/admin/fai/faiPackage.tpl:33
+#: plugins/admin/systems/workstationStartup.tpl:45
+#: plugins/admin/systems/workstationStartup.tpl:75
+#: plugins/admin/systems/servRepositorySetup.tpl:17
+#: plugins/admin/systems/class_servRepository.inc:248
+#, fuzzy
+msgid "Release"
+msgstr "Paquete de reglas"
 
-#: plugins/admin/fai/faiPackageNew.tpl:31
+#: plugins/admin/fai/faiPackageNew.tpl:26
 #, fuzzy
-msgid "Sections for this release"
-msgstr "Localización de este subarbol"
+msgid "please choose a release..."
+msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/admin/fai/faiPackageNew.tpl:35
-#: plugins/admin/systems/workstationStartup.tpl:43
+#: plugins/admin/fai/faiPackageNew.tpl:31 plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/servdnseditzone.tpl:67
+#: plugins/gofon/phoneaccount/generic.tpl:67
 #, fuzzy
-msgid "set"
-msgstr "Borrar"
+msgid "Refresh"
+msgstr "Referencias"
+
+#: plugins/admin/fai/faiPackageNew.tpl:37
+#, fuzzy
+msgid "Sections for this release"
+msgstr "Localización de este subarbol"
 
-#: 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/dep_iframe.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/dep_iframe.tpl:8
+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"
@@ -5462,11 +5905,6 @@ msgstr "Variable"
 msgid "List of template files"
 msgstr "Lista de Departamentos"
 
-#: plugins/admin/fai/faiTemplate.tpl:38
-#, fuzzy
-msgid "Choose a template to delete or edit"
-msgstr "Elija un departamento para guardar la entrada"
-
 #: plugins/admin/fai/faiPackageEntry.tpl:6
 #, fuzzy
 msgid "List of available packages"
@@ -5478,111 +5916,240 @@ msgid ""
 "currently edited package list."
 msgstr ""
 
-#: plugins/admin/fai/remove.tpl:7
+#: plugins/admin/fai/class_divListFai.inc:43
 #, 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."
+msgid "List of FAI classes"
+msgstr "Elija tipo de ratón"
+
+#: plugins/admin/fai/class_divListFai.inc:44
+msgid "This table displays all systems, in the selected tree."
 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/headpage.tpl:6
-#, fuzzy
-msgid "List of FAI classes"
-msgstr "Elija tipo de ratón"
 
-#: plugins/admin/fai/headpage.tpl:24
+#: plugins/admin/fai/class_divListFai.inc:48
 msgid "This menu allows you to create, delete and edit FAI classes."
 msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:29
-#: plugins/admin/applications/headpage.tpl:30
-#, fuzzy
-msgid "Branches"
-msgstr "Cancelar"
-
-#: plugins/admin/fai/headpage.tpl:35
-#: plugins/admin/applications/headpage.tpl:36
-#, fuzzy
-msgid "Current release"
-msgstr "Contraseña actual"
-
-#: plugins/admin/fai/headpage.tpl:47
+#: plugins/admin/fai/class_divListFai.inc:58
 #, fuzzy
-msgid "Create new branch"
-msgstr "Crear una nueva entrada en"
+msgid "Name of FAI class"
+msgstr "Nombre de la lista de bloqueos"
 
-#: plugins/admin/fai/headpage.tpl:51
-#, fuzzy
-msgid "Create new locked branch"
-msgstr "Crear una nueva entrada en"
+#: plugins/admin/fai/class_divListFai.inc:59
+msgid "Class type"
+msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:56
-#, fuzzy
-msgid "Delete current release"
-msgstr "Borrar"
+#: plugins/admin/fai/class_divListFai.inc:62
+msgid "Display FAI profile objects"
+msgstr ""
 
-#: plugins/admin/fai/headpage.tpl:71
+#: plugins/admin/fai/class_divListFai.inc:62
 #, fuzzy
 msgid "Show profiles"
 msgstr "Mostrar impresoras"
 
-#: plugins/admin/fai/headpage.tpl:72 plugins/admin/users/headpage.tpl:38
+#: plugins/admin/fai/class_divListFai.inc:63
+#, fuzzy
+msgid "Display FAI template objects"
+msgstr "Lista de Departamentos"
+
+#: plugins/admin/fai/class_divListFai.inc:63
+#: plugins/admin/users/class_divListUsers.inc:54
 msgid "Show templates"
 msgstr "Mostrar plantillas"
 
-#: plugins/admin/fai/headpage.tpl:73
+#: plugins/admin/fai/class_divListFai.inc:64
+#, fuzzy
+msgid "Display FAI scripts"
+msgstr "Lista de usuarios"
+
+#: plugins/admin/fai/class_divListFai.inc:64
 #, fuzzy
 msgid "Show scripts"
 msgstr "Mostrar equipos"
 
-#: plugins/admin/fai/headpage.tpl:74
+#: plugins/admin/fai/class_divListFai.inc:65
+#, fuzzy
+msgid "Display FAI hooks"
+msgstr "Error PHP:"
+
+#: plugins/admin/fai/class_divListFai.inc:65
 #, fuzzy
 msgid "Show hooks"
 msgstr "Mostrar equipos"
 
-#: plugins/admin/fai/headpage.tpl:75
+#: plugins/admin/fai/class_divListFai.inc:66
+#, fuzzy
+msgid "Display FAI variables"
+msgstr "Mostrar dispositivo"
+
+#: plugins/admin/fai/class_divListFai.inc:66
 #, fuzzy
 msgid "Show variables"
 msgstr "Mostrar terminales"
 
-#: plugins/admin/fai/headpage.tpl:76
+#: plugins/admin/fai/class_divListFai.inc:67
+#, fuzzy
+msgid "Display FAI packages"
+msgstr "Nombre mostrado"
+
+#: plugins/admin/fai/class_divListFai.inc:67
 #, fuzzy
 msgid "Show packages"
 msgstr "Mostrar teléfonos"
 
-#: plugins/admin/fai/headpage.tpl:77
+#: plugins/admin/fai/class_divListFai.inc:68
+#, fuzzy
+msgid "Display FAI partitions"
+msgstr "Mostrar estaciones de trabajo"
+
+#: plugins/admin/fai/class_divListFai.inc:68
 #, fuzzy
 msgid "Show partitions"
 msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/fai/class_faiPartitionTable.inc:263
+#: plugins/admin/fai/class_divListFai.inc:117
+#: plugins/admin/departments/class_divListDepartment.inc:71
+#, fuzzy
+msgid "Go to users home department"
+msgstr "Mostrar usuarios del departamento"
+
+#: plugins/admin/fai/class_divListFai.inc:125
+#, fuzzy
+msgid "New profile"
+msgstr "Gestión de Asterisk PBX"
+
+#: plugins/admin/fai/class_divListFai.inc:125
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:229
+msgid "P"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:130
+#, fuzzy
+msgid "New partition table"
+msgstr "Impresora"
+
+#: plugins/admin/fai/class_divListFai.inc:130
+msgid "PT"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:133
+#, fuzzy
+msgid "New scripts"
+msgstr "Mostrar equipos"
+
+#: plugins/admin/fai/class_divListFai.inc:133
+msgid "S"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:136
+#, fuzzy
+msgid "New hooks"
+msgstr "Mostrar equipos"
+
+#: plugins/admin/fai/class_divListFai.inc:136
+msgid "H"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:139
+#, fuzzy
+msgid "New variables"
+msgstr "Mostrar terminales"
+
+#: plugins/admin/fai/class_divListFai.inc:139
+msgid "V"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:142
+#, fuzzy
+msgid "New templates"
+msgstr "Nueva plantilla"
+
+#: plugins/admin/fai/class_divListFai.inc:142
+msgid "T"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:145
+#, fuzzy
+msgid "New package list"
+msgstr "# páginas"
+
+#: plugins/admin/fai/class_divListFai.inc:145
+msgid "PK"
+msgstr ""
+
+#: plugins/admin/fai/class_divListFai.inc:210
+#: plugins/admin/fai/class_divListFai.inc:215
+#, fuzzy
+msgid "Edit class"
+msgstr "clase"
+
+#: plugins/admin/fai/class_divListFai.inc:217
+#, fuzzy
+msgid "Delete class"
+msgstr "Borrar"
+
+#: 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_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_faiPartitionTable.inc:348
+#, fuzzy
+msgid "Saving FAI partition table base failed"
+msgstr "Entradas de fstab adicionales"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:390
+#, fuzzy
+msgid "Removing FAI partition table failed"
+msgstr "Entradas de fstab adicionales"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:398
+#: plugins/admin/fai/class_faiPartitionTable.inc:407
+#, fuzzy
+msgid "Saving FAI partition table failed"
+msgstr "Entradas de fstab adicionales"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:455
+#, fuzzy
+msgid "Removing FAI partition table entry failed"
+msgstr "Entradas de fstab adicionales"
+
+#: plugins/admin/fai/class_faiPartitionTable.inc:464
+#: plugins/admin/fai/class_faiPartitionTable.inc:472
+#, fuzzy
+msgid "Saving FAI partition table entry failed"
+msgstr "Entradas de fstab adicionales"
+
+#: 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"
@@ -5616,52 +6183,65 @@ msgstr ""
 msgid "Debconf information for package '%s'"
 msgstr ""
 
-#: plugins/admin/fai/class_askClassName.inc:77
+#: plugins/admin/fai/class_faiVariable.inc:294
+msgid "Saving FAI variable base failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiVariable.inc:356
+msgid "Removing FAI variable failed"
+msgstr ""
+
+#: plugins/admin/fai/class_faiVariable.inc:363
+#: plugins/admin/fai/class_faiVariable.inc:375
+msgid "Saving FAI variable failed"
+msgstr ""
+
+#: 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."
@@ -5695,13 +6275,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/glpiAttachmentPool.tpl:51
 #: 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/glpiDeviceManagement.tpl:51
-#: plugins/admin/systems/SelectDeviceType.tpl:44
-#: plugins/admin/systems/class_baseSelectDialog.inc:40
 #, fuzzy
 msgid "Use"
 msgstr "Usuario"
@@ -5711,46 +6290,67 @@ msgstr "Usuario"
 msgid "A new class name."
 msgstr "Aplicaciones disponibles"
 
-#: plugins/admin/fai/class_faiTemplateEntry.inc:81
+#: 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: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."
 
+#: plugins/admin/fai/faiSummary.tpl:4
+#, fuzzy
+msgid "FAI object tree"
+msgstr "Nombre de objeto"
+
+#: plugins/admin/fai/faiSummary.tpl:9
+msgid "Reload class and release configuration from parent object."
+msgstr ""
+
 #: plugins/admin/fai/faiTemplateEntry.tpl:21
 #, fuzzy
 msgid "Template attributes"
@@ -5767,9 +6367,9 @@ msgid "Save template"
 msgstr "Nueva plantilla"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:40
-#: plugins/admin/applications/generic.tpl:96
-#: plugins/admin/systems/printerPPDDialog.tpl:11
+#: plugins/admin/applications/generic.tpl:102
 #: plugins/admin/systems/glpiAttachmentEdit.tpl:33
+#: plugins/admin/systems/printerPPDDialog.tpl:11
 #, fuzzy
 msgid "Upload"
 msgstr "Carga de CPU"
@@ -5780,15 +6380,15 @@ msgid "Destination path"
 msgstr "Destino"
 
 #: plugins/admin/fai/faiTemplateEntry.tpl:62
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:311
+#: plugins/gofon/conference/class_divListConferences.inc:47
 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:753
+#: plugins/admin/systems/class_printGeneric.inc:755
+#: plugins/admin/ogroups/class_ogroupManagement.inc:364
 #: plugins/generic/references/class_reference.inc:36
 msgid "Group"
 msgstr "Grupo"
@@ -5816,9 +6416,9 @@ 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/ogroups/termgroup.tpl:13
+#: plugins/admin/systems/server.tpl:60 plugins/admin/systems/terminal.tpl:125
+#: plugins/admin/systems/workstation.tpl:103
+#: plugins/admin/ogroups/termgroup.tpl:85
 msgid "Execute"
 msgstr "Ejecute"
 
@@ -5852,65 +6452,71 @@ 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/fai/faiPackage.tpl:41
+#: plugins/admin/systems/class_printerPPDDialog.inc:413
+#, fuzzy
+msgid "Section"
+msgstr "Acción"
 
-#: 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'."
+#: plugins/admin/fai/faiPackage.tpl:49
+#, fuzzy
+msgid "Install method"
+msgstr "Método de correo"
+
+#: plugins/admin/fai/faiPackage.tpl:65
+#, fuzzy
+msgid "Used packages"
+msgstr "Mostrar teléfonos"
+
+#: plugins/admin/fai/faiPackage.tpl:67
+#, fuzzy
+msgid "Choosen packages"
+msgstr "Mostrar teléfonos"
+
+#: plugins/admin/fai/faiPackage.tpl:73 include/functions.inc:667
+msgid "Configure"
+msgstr "Configurar"
+
+#: plugins/admin/fai/faiPackage.tpl:74
+#, fuzzy
+msgid "Toggle remove flag"
+msgstr "por defecto"
+
+#: plugins/admin/fai/class_faiPackage.inc:340
+msgid "Removing FAI package base failed"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:11
+#: plugins/admin/fai/class_faiPackage.inc:369
 #, fuzzy
-msgid "Please enter a name for the branch"
+msgid "Please select a least one Package."
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/admin/fai/faiNewBranch.tpl:33
-#: plugins/admin/departments/recursive_move.tpl:1
+#: plugins/admin/fai/class_faiPackage.inc:373
 #, fuzzy
-msgid "Processing the requested operation"
-msgstr "¡Error mientras se exportaban las entradas indicadas!"
+msgid "Please choose a valid combination for your repository setup."
+msgstr "Por favor especifique un usuario valido."
 
-#: 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."
+#: plugins/admin/fai/class_faiPackage.inc:394
+#, fuzzy
+msgid "package is configured"
+msgstr "Desconfigurado"
+
+#: plugins/admin/fai/class_faiPackage.inc:400
+msgid "Package marked for removal"
 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."
+#: plugins/admin/fai/class_faiPackage.inc:425
+#, php-format
+msgid "Package file '%s' does not exist."
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
-msgid "Perform requested operation."
+#: plugins/admin/fai/class_faiPackage.inc:484
+msgid "Saving FAI package base failed"
 msgstr ""
 
-#: plugins/admin/fai/faiNewBranch.tpl:42
-#, fuzzy
-msgid "Initiate operation"
-msgstr "Crear opciones"
-
-#: 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."
+#: plugins/admin/fai/class_faiPackage.inc:529
+msgid "Saving FAI package entry failed"
 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"
@@ -5936,212 +6542,27 @@ msgstr "Miembro con Permisos"
 msgid "Forward messages to non group members"
 msgstr "Reenviar mensajes a miembros que no sean del grupo"
 
-#: plugins/admin/groups/class_groupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroupManagement.inc:55 html/getxls.php:97
+#: plugins/admin/groups/class_groupManagement.inc:25 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:244
 #, 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:250
+#: plugins/admin/groups/class_groupManagement.inc:281
 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
-#, 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
-#, fuzzy
-msgid "Can't paste"
-msgstr "Crear cuenta telefónica"
-
-#: plugins/admin/groups/class_groupManagement.inc:456
-#, 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
-#, 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
-#, 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
-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
-#, 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
-#, 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/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
-#, 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/gofon/fonreports/contents.tpl:34
-#: plugins/generic/references/class_reference.inc:42
-msgid "Application"
-msgstr "Aplicación"
-
-#: plugins/admin/groups/class_groupManagement.inc:524
-#, 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
-msgid "This table displays all groups, in the selected tree."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:122
-msgid "Can't find this groups SID in LDAP or in your configuration file!"
-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/groups/class_groupGeneric.inc:329
-msgid "Samba group"
-msgstr "Grupo de samba"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain admins"
-msgstr "Administradores del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:329
-msgid "Domain users"
-msgstr "Usuarios del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:330
-msgid "Domain guests"
-msgstr "Invitados del dominio"
-
-#: plugins/admin/groups/class_groupGeneric.inc:335
-#, php-format
-msgid "Special group (%d)"
-msgstr "Grupo especial (%d)"
-
-#: plugins/admin/groups/class_groupGeneric.inc:445
-#, php-format
-msgid ""
-"Your search method returned more than '%s' users, only '%s' users are shown."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:462
-#, fuzzy
-msgid "! unknown id"
-msgstr "estado desconocido"
-
-#: plugins/admin/groups/class_groupGeneric.inc:598
-#, php-format
-msgid "No configured SID found for '%s'."
-msgstr ""
-
-#: plugins/admin/groups/class_groupGeneric.inc:603
-#, php-format
-msgid "No configured RIDBASE found for '%s'."
-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/groups/class_groupGeneric.inc:726
-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: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/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
+#: plugins/admin/groups/class_divListGroup.inc:35
+#: plugins/admin/groups/class_divListGroup.inc:36
 msgid "List of groups"
 msgstr "Lista de grupos"
 
-#: plugins/admin/groups/headpage.tpl:25
+#: plugins/admin/groups/class_divListGroup.inc:41
 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 "
@@ -6151,98 +6572,136 @@ msgstr ""
 "usar el selector de rango en la parte superior de la lista de grupos, cuando "
 "trabaja con un gran número de grupos."
 
-#: plugins/admin/groups/headpage.tpl:41
+#: plugins/admin/groups/class_divListGroup.inc:49
+#, fuzzy
+msgid "Groupname / Department"
+msgstr "Nombre del departamento"
+
+#: plugins/admin/groups/class_divListGroup.inc:54
 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
+#: plugins/admin/groups/class_divListGroup.inc:54
 msgid "Show primary groups"
 msgstr "Mostrar grupos primarios"
 
-#: plugins/admin/groups/headpage.tpl:46
+#: plugins/admin/groups/class_divListGroup.inc:55
 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
+#: plugins/admin/groups/class_divListGroup.inc:55
 msgid "Show samba groups"
 msgstr "Mostrar los grupos samba"
 
-#: plugins/admin/groups/headpage.tpl:50
+#: plugins/admin/groups/class_divListGroup.inc:56
 msgid "Select to see groups that have applications configured"
 msgstr "Seleccione para ver que grupos tienen aplicaciones configuradas"
 
-#: plugins/admin/groups/headpage.tpl:51
+#: plugins/admin/groups/class_divListGroup.inc:56
 msgid "Show application groups"
 msgstr "Mostrar los grupos de aplicaciones"
 
-#: plugins/admin/groups/headpage.tpl:54
+#: plugins/admin/groups/class_divListGroup.inc:57
 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
+#: plugins/admin/groups/class_divListGroup.inc:57
 msgid "Show mail groups"
 msgstr "Mostrar grupos de correo"
 
-#: plugins/admin/groups/headpage.tpl:58
+#: plugins/admin/groups/class_divListGroup.inc: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
+#: plugins/admin/groups/class_divListGroup.inc:58
 msgid "Show functional groups"
 msgstr "Mostrar grupos funcionales"
 
-#: plugins/admin/groups/class_groupMail.inc:278
-msgid "read"
-msgstr "leer"
+#: plugins/admin/groups/class_divListGroup.inc:98
+#, fuzzy
+msgid "Create new group"
+msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/groups/class_groupMail.inc:279
-msgid "post"
-msgstr "post"
+#: plugins/admin/groups/class_divListGroup.inc:126
+#: plugins/admin/users/class_divListUsers.inc:162
+#, fuzzy
+msgid "Posix"
+msgstr "Proxy"
 
-#: plugins/admin/groups/class_groupMail.inc:280
-msgid "external post"
-msgstr "post externo"
+#: plugins/admin/groups/class_divListGroup.inc:132
+#: plugins/admin/applications/class_divListApplication.inc:130
+#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/gofon/fonreports/contents.tpl:34
+#: plugins/generic/references/class_reference.inc:42
+msgid "Application"
+msgstr "Aplicación"
 
-#: plugins/admin/groups/class_groupMail.inc:281
-msgid "append"
-msgstr "añadir"
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/users/class_divListUsers.inc:139
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_divListOGroup.inc:133
+#, fuzzy
+msgid "cut"
+msgstr "Ejecute"
 
-#: plugins/admin/groups/class_groupMail.inc:282
-msgid "write"
-msgstr "escribir"
+#: plugins/admin/groups/class_divListGroup.inc:145
+#: plugins/admin/users/class_divListUsers.inc:139
+#: plugins/admin/applications/class_divListApplication.inc:138
+#: plugins/admin/ogroups/class_divListOGroup.inc:133
+#, fuzzy
+msgid "Cut this entry"
+msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupMail.inc:306
-msgid "This 'dn' has no valid mail extensions."
-msgstr "Esta 'dn' no tiene extensiones validas de correo."
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:135
+msgid "copy"
+msgstr ""
 
-#: plugins/admin/groups/class_groupMail.inc:371
-msgid "You're trying to add an invalid email address "
-msgstr "Esta intentando añadir una dirección de correo no valida"
+#: plugins/admin/groups/class_divListGroup.inc:147
+#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/applications/class_divListApplication.inc:140
+#: plugins/admin/ogroups/class_divListOGroup.inc:135
+#, fuzzy
+msgid "Copy this entry"
+msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupMail.inc:372
-msgid "to the list of forwarders."
-msgstr "a la lista de remitentes."
+#: plugins/admin/groups/class_divListGroup.inc:150
+#: plugins/admin/applications/class_divListApplication.inc:143
+#: plugins/admin/departments/class_divListDepartment.inc:92
+#: plugins/admin/ogroups/class_divListOGroup.inc:138
+#: plugins/gofon/conference/class_divListConferences.inc:103
+#, fuzzy
+msgid "Edit this entry"
+msgstr "Editar entrada"
 
-#: plugins/admin/groups/class_groupMail.inc:807
-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_divListGroup.inc:152
+#: plugins/admin/applications/class_divListApplication.inc:145
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/ogroups/class_divListOGroup.inc:140
+#: plugins/gofon/conference/class_divListConferences.inc:105
+#: plugins/gofon/conference/class_divListConferences.inc:107
+#, fuzzy
+msgid "Delete this entry"
+msgstr "Borrar"
 
-#: plugins/admin/groups/class_groupMail.inc:840
+#: plugins/admin/groups/remove.tpl:6
 msgid ""
-"Please choose valid permission settings. Default permission can't be emtpy."
+"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/class_groupMail.inc:844
-#, fuzzy
-msgid "Please select a valid mail server."
-msgstr "Por favor introduzca un número de serie válido"
+#: plugins/admin/groups/main.inc:40 plugins/admin/groups/main.inc:44
+msgid "Group administration"
+msgstr "Administración de grupos"
 
 #: plugins/admin/groups/acl.tpl:4
-#: plugins/admin/departments/class_departmentGeneric.inc:314
-#: include/class_ldap.inc:412
+#: plugins/admin/departments/class_departmentGeneric.inc:476
+#: include/class_ldap.inc:454
 msgid "Object"
 msgstr "Objeto"
 
@@ -6255,16 +6714,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"
 
@@ -6273,7 +6742,7 @@ msgid "Select users to add"
 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:56
 #: plugins/admin/ogroups/ogroup_objects.tpl:31
 msgid "Select to see servers"
 msgstr "Seleccione para ver los servidores"
@@ -6288,72 +6757,84 @@ msgid "Display users of department"
 msgstr "Mostrar usuarios del departamento"
 
 #: plugins/admin/groups/group_objects.tpl:47
-#: plugins/admin/users/headpage.tpl:49
 #: plugins/admin/systems/glpiSelectUser.tpl:37
 msgid "Regular expression for matching user names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/admin/groups/class_groupAcl.inc:59
-msgid "This 'dn' is no acl container."
-msgstr "Este 'dn' no es un contenedor de listas de acceso."
-
-#: plugins/admin/groups/class_groupAcl.inc:207
-msgid "All fields are writeable"
-msgstr "Todos los campos son rellenarles."
+#: plugins/admin/groups/paste_generic.tpl:1
+#, fuzzy
+msgid "Group settings"
+msgstr "Parámetros de quotas"
 
-#: plugins/admin/groups/generic.tpl:7 plugins/admin/groups/paste_generic.tpl:5
-#: plugins/admin/ogroups/class_ogroup.inc:736
+#: plugins/admin/groups/paste_generic.tpl:5 plugins/admin/groups/generic.tpl:7
+#: plugins/admin/ogroups/class_ogroup.inc:737
 #: plugins/admin/ogroups/generic.tpl:7
 msgid "Group name"
 msgstr "Nombre del grupo"
 
-#: plugins/admin/groups/generic.tpl:9 plugins/admin/groups/paste_generic.tpl:8
+#: plugins/admin/groups/paste_generic.tpl:8 plugins/admin/groups/generic.tpl:9
 msgid "Posix name of the group"
 msgstr "Nombre 'Posix' del grupo"
 
-#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
-msgid "Descriptive text for this group"
-msgstr "Descripción del grupo"
-
-#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
-msgid "Choose subtree to place group in"
-msgstr "Elija lugar del árbol para colocar la aplicación"
-
-#: plugins/admin/groups/generic.tpl:37
 #: plugins/admin/groups/paste_generic.tpl:13
+#: plugins/admin/groups/generic.tpl:41
 msgid "Normally IDs are autogenerated, select to specify manually"
 msgstr ""
 "Normalmente los identificadores (IDs) de grupos son autogenerados, "
 "seleccione aquí para ponerlo manualmente"
 
-#: plugins/admin/groups/generic.tpl:37
 #: plugins/admin/groups/paste_generic.tpl:15
+#: plugins/admin/groups/generic.tpl:41
 msgid "Force GID"
 msgstr "Forzar GID"
 
-#: plugins/admin/groups/generic.tpl:39
 #: plugins/admin/groups/paste_generic.tpl:18
+#: plugins/admin/groups/generic.tpl:43
 msgid "Forced ID number"
 msgstr "Número de ID forzado"
 
-#: plugins/admin/groups/generic.tpl:46
+#: plugins/admin/groups/class_groupAcl.inc:59
+msgid "This 'dn' is no acl container."
+msgstr "Este 'dn' no es un contenedor de listas de acceso."
+
+#: plugins/admin/groups/class_groupAcl.inc:100
+msgid "Removing ACL information failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:196
+msgid "Saving ACL information failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupAcl.inc:206
+msgid "All fields are writeable"
+msgstr "Todos los campos son rellenarles."
+
+#: plugins/admin/groups/generic.tpl:14 plugins/admin/ogroups/generic.tpl:14
+msgid "Descriptive text for this group"
+msgstr "Descripción del grupo"
+
+#: plugins/admin/groups/generic.tpl:23 plugins/admin/ogroups/generic.tpl:23
+msgid "Choose subtree to place group in"
+msgstr "Elija lugar del árbol para colocar la aplicación"
+
+#: plugins/admin/groups/generic.tpl:50
 msgid "Select to create a samba conform group"
 msgstr "Seleccione para crear un grupo samba"
 
-#: plugins/admin/groups/generic.tpl:51
+#: plugins/admin/groups/generic.tpl:55
 msgid "in domain"
 msgstr "en dominio"
 
-#: plugins/admin/groups/generic.tpl:68
+#: plugins/admin/groups/generic.tpl:72
 msgid "Members are in a phone pickup group"
 msgstr "Miembros están en un grupo de salto telefónico"
 
-#: plugins/admin/groups/generic.tpl:81
+#: plugins/admin/groups/generic.tpl:85
 #, fuzzy
 msgid "Members are in a nagios group"
 msgstr "Miembros están en un grupo de salto telefónico"
 
-#: plugins/admin/groups/generic.tpl:97
+#: plugins/admin/groups/generic.tpl:101
 msgid "Group members"
 msgstr "Miembros del grupo"
 
@@ -6365,7 +6846,7 @@ msgstr "Administradores de Carpetas"
 msgid "Select a specific department"
 msgstr "Seleccionar un departamento especifico"
 
-#: plugins/admin/groups/application_options.tpl:1
+#: plugins/admin/groups/application_options.tpl:2
 msgid "Application options"
 msgstr "Opciones de aplicaciones"
 
@@ -6377,15 +6858,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."
@@ -6393,11 +6874,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."
@@ -6405,200 +6886,291 @@ 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:520
 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:556
 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:638
+#: plugins/admin/departments/class_divListDepartment.inc:112
+#, fuzzy
+msgid "department"
+msgstr "departamentos"
+
+#: plugins/admin/groups/class_groupApplication.inc:646
 #, 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:677
+#: plugins/admin/groups/class_groupApplication.inc:713
 #, 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:681
+#: plugins/admin/groups/class_groupApplication.inc:711
 msgid "Move up"
 msgstr ""
 
-#: plugins/admin/groups/class_groupApplication.inc:565
-#: plugins/admin/groups/class_groupApplication.inc:595
+#: plugins/admin/groups/class_groupApplication.inc:682
+#: plugins/admin/groups/class_groupApplication.inc:712
 #, fuzzy
 msgid "Move down"
 msgstr "Dominio"
 
-#: plugins/admin/groups/class_groupApplication.inc:592
+#: plugins/admin/groups/class_groupApplication.inc:709
 msgid "Insert seperator"
 msgstr ""
 
-#: plugins/admin/groups/paste_generic.tpl:1
+#: plugins/admin/groups/class_groupApplication.inc:737
 #, fuzzy
-msgid "Group settings"
-msgstr "Parámetros de quotas"
+msgid "This application is no longer available."
+msgstr "La aplicación seleccionada no tiene opciones."
 
-#: plugins/admin/users/password.tpl:2
-msgid ""
-"To change the user password use the fields below. The changes take effect "
-"immediately. Please memorize the new password, because the user wouldn't be "
-"able to login without it."
+#: plugins/admin/groups/class_groupApplication.inc:740
+#, php-format
+msgid "This application is not available in any release named %s."
 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/users/class_userManagement.inc:25
-#: 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
-msgid "You are not allowed to set this users password!"
-msgstr "No le es permitido cambiarle la contraseña a estos usuarios."
+#: plugins/admin/groups/class_groupApplication.inc:744
+#, fuzzy
+msgid "Check parameter"
+msgstr "Editar parametros"
 
-#: plugins/admin/users/class_userManagement.inc:440
+#: plugins/admin/groups/class_groupApplication.inc:746
+#, fuzzy
+msgid "This application has changed parameters."
+msgstr "La aplicación seleccionada no tiene opciones."
+
+#: plugins/admin/groups/class_groupApplication.inc:832
+#, fuzzy
+msgid "Removing application information failed"
+msgstr "Información organizativa"
+
+#: plugins/admin/groups/class_groupApplication.inc:877
+#, fuzzy
+msgid "Saving application information failed"
+msgstr "Información organizativa"
+
+#: plugins/admin/groups/class_groupApplication.inc:919
 #, php-format
-msgid "You're about to delete the user %s."
-msgstr "Esta a punto de borrar el usuario %s"
+msgid ""
+"Can't resolve the release name '%s', setting release name to '%s'. Possibly "
+"the objects base has changed."
+msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:446
-#: plugins/admin/users/class_userManagement.inc:474
-msgid "You are not allowed to delete this user!"
-msgstr "No le es permitido borrar este usuario"
+#: plugins/admin/groups/class_groupGeneric.inc:123
+msgid "Can't find this groups SID in LDAP or in your configuration file!"
+msgstr ""
+"¡No se puede encontrar el identificador samba de grupo (SID) en LDAP o en el "
+"archivo de configuración!"
 
-#: plugins/admin/users/class_userManagement.inc:575
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:392
-#: plugins/admin/systems/class_SelectDeviceType.inc:29
-#: plugins/admin/ogroups/class_ogroup.inc:277
-msgid "none"
-msgstr "ninguno"
+#: plugins/admin/groups/class_groupGeneric.inc:177
+msgid "This 'dn' is no group."
+msgstr "Este 'dn' no es un grupo."
 
-#: plugins/admin/users/class_userManagement.inc:646
-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/groups/class_groupGeneric.inc:317
+msgid "Samba group"
+msgstr "Grupo de samba"
 
-#: plugins/admin/users/class_userManagement.inc:783
-#, fuzzy
-msgid "Create new user"
-msgstr "Crear una nueva entrada en"
+#: plugins/admin/groups/class_groupGeneric.inc:317
+msgid "Domain admins"
+msgstr "Administradores del dominio"
 
-#: plugins/admin/users/class_userManagement.inc:783
-#, fuzzy
-msgid "New user"
-msgstr "usuarios"
+#: plugins/admin/groups/class_groupGeneric.inc:317
+msgid "Domain users"
+msgstr "Usuarios del dominio"
 
-#: plugins/admin/users/class_userManagement.inc:784
-#, fuzzy
-msgid "Create new template"
-msgstr "Nueva plantilla"
+#: plugins/admin/groups/class_groupGeneric.inc:318
+msgid "Domain guests"
+msgstr "Invitados del dominio"
 
-#: plugins/admin/users/class_userManagement.inc:784
-msgid "New template"
-msgstr "Nueva plantilla"
+#: plugins/admin/groups/class_groupGeneric.inc:323
+#, php-format
+msgid "Special group (%d)"
+msgstr "Grupo especial (%d)"
 
-#: plugins/admin/users/class_userManagement.inc:801
-#: plugins/admin/users/class_userManagement.inc:808
+#: plugins/admin/groups/class_groupGeneric.inc:435
 #, fuzzy
-msgid "password"
-msgstr "Contraseña"
+msgid "! unknown id"
+msgstr "estado desconocido"
 
-#: plugins/admin/users/class_userManagement.inc:819
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:343
-#: 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
-msgid "Username"
-msgstr "Nombre de Usuario"
+#: plugins/admin/groups/class_groupGeneric.inc:467
+#, php-format
+msgid ""
+"Your search method returned more than '%s' users, only '%s' users are shown."
+msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:824
-msgid "This table displays all users, in the selected tree."
+#: plugins/admin/groups/class_groupGeneric.inc:496
+msgid "Removing group failed"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:855
-msgid "GOsa"
+#: plugins/admin/groups/class_groupGeneric.inc:603
+#, php-format
+msgid "No configured SID found for '%s'."
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:856
-#, fuzzy
-msgid "Edit generic properties"
-msgstr "Editar propiedades"
+#: plugins/admin/groups/class_groupGeneric.inc:608
+#, php-format
+msgid "No configured RIDBASE found for '%s'."
+msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:858
-#, fuzzy
-msgid "Edit UNIX properties"
-msgstr "Editar propiedades"
+#: plugins/admin/groups/class_groupGeneric.inc:693
+msgid "Saving group failed"
+msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:860
-#, fuzzy
-msgid "Edit environment properties"
-msgstr "Editar propiedades"
+#: plugins/admin/groups/class_groupGeneric.inc:722
+#: 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/users/class_userManagement.inc:862
-#, fuzzy
-msgid "Edit mail properties"
-msgstr "Editar propiedades"
+#: plugins/admin/groups/class_groupGeneric.inc:732
+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/users/class_userManagement.inc:864
-#, fuzzy
-msgid "Edit phone properties"
-msgstr "Editar propiedades"
+#: plugins/admin/groups/class_groupGeneric.inc:744
+#: plugins/admin/groups/class_groupGeneric.inc:758
+#: plugins/admin/groups/class_groupGeneric.inc:765
+msgid "Value specified as 'Name' is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/users/class_userManagement.inc:866
-#, fuzzy
-msgid "Edit fax properies"
-msgstr "Editar propiedades"
+#: plugins/admin/groups/class_groupMail.inc:284
+msgid "read"
+msgstr "leer"
 
-#: plugins/admin/users/class_userManagement.inc:868
-#, fuzzy
-msgid "Edit samba properties"
-msgstr "Editar propiedades"
+#: plugins/admin/groups/class_groupMail.inc:285
+msgid "post"
+msgstr "post"
 
-#: plugins/admin/users/class_userManagement.inc:869
-#, fuzzy
-msgid "Create user from template"
-msgstr "Nueva plantilla"
+#: plugins/admin/groups/class_groupMail.inc:286
+msgid "external post"
+msgstr "post externo"
+
+#: plugins/admin/groups/class_groupMail.inc:287
+msgid "append"
+msgstr "añadir"
+
+#: plugins/admin/groups/class_groupMail.inc:288
+msgid "write"
+msgstr "escribir"
+
+#: plugins/admin/groups/class_groupMail.inc:312
+msgid "This 'dn' has no valid mail extensions."
+msgstr "Esta 'dn' no tiene extensiones validas de correo."
 
-#: plugins/admin/users/class_userManagement.inc:870
+#: plugins/admin/groups/class_groupMail.inc:377
+msgid "You're trying to add an invalid email address "
+msgstr "Esta intentando añadir una dirección de correo no valida"
+
+#: plugins/admin/groups/class_groupMail.inc:378
+msgid "to the list of forwarders."
+msgstr "a la lista de remitentes."
+
+#: plugins/admin/groups/class_groupMail.inc:613
 #, fuzzy
-msgid "Create user with this template"
-msgstr "Nueva plantilla"
+msgid "Removing group mail settings failed"
+msgstr "Parametros del correo de usuarios"
+
+#: plugins/admin/groups/class_groupMail.inc:777
+msgid "Saving group mail settings failed"
+msgstr ""
+
+#: plugins/admin/groups/class_groupMail.inc:806
+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:839
+msgid ""
+"Please choose valid permission settings. Default permission can't be emtpy."
+msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:929
+#: plugins/admin/groups/class_groupMail.inc:843
 #, fuzzy
-msgid "Online"
-msgstr "en linea"
+msgid "Please select a valid mail server."
+msgstr "Por favor introduzca un número de serie válido"
+
+#: plugins/admin/users/password.tpl:2
+msgid ""
+"To change the user password use the fields below. The changes take effect "
+"immediately. Please memorize the new password, because the user wouldn't be "
+"able to login without it."
+msgstr ""
+"Para cambiar la contraseña del usuario use los campos a continuación. Los "
+"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
+"contraseña, el usuario no podrá autenticarse sin ella."
+
+#: plugins/admin/users/class_userManagement.inc:28
+#: plugins/admin/systems/class_glpiSelectUser.inc:112
+#: plugins/admin/systems/printer.tpl:71 html/getxls.php:68 html/getxls.php:70
+#: html/getxls.php:243
+msgid "Users"
+msgstr "Usuarios"
+
+#: plugins/admin/users/class_userManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:273
+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:312
+#, 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:318
+#: plugins/admin/users/class_userManagement.inc:345
+msgid "You are not allowed to delete this user!"
+msgstr "No le es permitido borrar este usuario"
+
+#: plugins/admin/users/class_userManagement.inc:451
+#: 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:529
+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/template.tpl:2
+msgid "Creating a new user using templates"
+msgstr "Crear un nuevo usuario usando plantillas"
 
-#: plugins/admin/users/class_userManagement.inc:936
+#: plugins/admin/users/template.tpl:6
 #, fuzzy
-msgid "Offline"
-msgstr "fuera de linea"
+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/class_userManagement.inc:1181
-#: plugins/admin/users/template.tpl:11
-#: plugins/admin/systems/class_systemManagement.inc:918
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/systems/class_systemManagement.inc:736
 msgid "Template"
 msgstr "Plantilla"
 
@@ -6613,12 +7185,17 @@ msgstr ""
 "quiere realmente hacer esta, ya que no hay manera de que GOsa recupere "
 "posteriormente la información."
 
-#: plugins/admin/users/headpage.tpl:6
+#: plugins/admin/users/main.inc:41 plugins/admin/users/main.inc:47
+msgid "User administration"
+msgstr "Administración de Usuarios"
+
+#: plugins/admin/users/class_divListUsers.inc:35
+#: plugins/admin/users/class_divListUsers.inc:36
 #: plugins/admin/systems/glpiSelectUser.tpl:6
 msgid "List of users"
 msgstr "Lista de usuarios"
 
-#: plugins/admin/users/headpage.tpl:24
+#: plugins/admin/users/class_divListUsers.inc:40
 msgid ""
 "This menu allows you to create, edit and delete selected users. Having a "
 "great number of users, you may want to use the range selectors on top of the "
@@ -6628,111 +7205,231 @@ msgstr ""
 "seleccionados. Si tiene un gran numero de usuarios usted preferirá usar los "
 "selectores de rangos en la parte superior del listado."
 
-#: plugins/admin/users/headpage.tpl:38
+#: plugins/admin/users/class_divListUsers.inc:50
+#: plugins/gofon/macro/class_divListMacros.inc:46
+#: 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
+msgid "Username"
+msgstr "Nombre de Usuario"
+
+#: plugins/admin/users/class_divListUsers.inc:54
 msgid "Select to see template pseudo users"
 msgstr "Seleccione para mostrar los usuarios pseudo plantillas"
 
-#: plugins/admin/users/headpage.tpl:39
+#: plugins/admin/users/class_divListUsers.inc:55
+#, fuzzy
 msgid "Select to see users that have only a GOsa object"
 msgstr "Seleccione para ver los usuarios que solo tienen un objeto GOsa"
 
-#: plugins/admin/users/headpage.tpl:39
+#: plugins/admin/users/class_divListUsers.inc:55
 msgid "Show functional users"
 msgstr "Mostrar usuarios funcionales"
 
-#: plugins/admin/users/headpage.tpl:40
+#: plugins/admin/users/class_divListUsers.inc:56
 msgid "Select to see users that have posix settings"
 msgstr "Seleccione para ver usuario que tienen configuraciones posix"
 
-#: plugins/admin/users/headpage.tpl:40
+#: plugins/admin/users/class_divListUsers.inc:56
 msgid "Show unix users"
 msgstr "Mostrar los usuarios unix"
 
-#: plugins/admin/users/headpage.tpl:41
+#: plugins/admin/users/class_divListUsers.inc:57
 msgid "Select to see users that have mail settings"
 msgstr "Seleccione para ver los usuarios que tiene confiraciones de correo"
 
-#: plugins/admin/users/headpage.tpl:41
+#: plugins/admin/users/class_divListUsers.inc:57
 msgid "Show mail users"
 msgstr "Mostrar los usuarios de correo"
 
-#: plugins/admin/users/headpage.tpl:42
+#: plugins/admin/users/class_divListUsers.inc:58
 msgid "Select to see users that have samba settings"
 msgstr "Seleccione para ver los usuarios que tiene configuraciones samba"
 
-#: plugins/admin/users/headpage.tpl:42
+#: plugins/admin/users/class_divListUsers.inc:58
 msgid "Show samba users"
 msgstr "Mostrar usuarios samba"
 
-#: plugins/admin/users/headpage.tpl:43
+#: plugins/admin/users/class_divListUsers.inc:59
 msgid "Select to see users that have proxy settings"
 msgstr "Seleccione para ver los usuarios que tienen configuraciones de proxy"
 
-#: plugins/admin/users/headpage.tpl:43
+#: plugins/admin/users/class_divListUsers.inc:59
 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/class_divListUsers.inc:102
+#, fuzzy
+msgid "Create new user"
+msgstr "Crear una nueva entrada en"
 
-#: plugins/admin/users/template.tpl:6
+#: plugins/admin/users/class_divListUsers.inc:102
 #, 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."
+msgid "New user"
+msgstr "usuarios"
 
-#: plugins/admin/applications/class_applicationParameters.inc:52
-msgid "Remove options"
-msgstr "Eliminar opciones"
+#: plugins/admin/users/class_divListUsers.inc:104
+#, fuzzy
+msgid "Create new template"
+msgstr "Nueva plantilla"
 
-#: 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/users/class_divListUsers.inc:104
+msgid "New template"
+msgstr "Nueva plantilla"
 
-#: plugins/admin/applications/class_applicationParameters.inc:55
-msgid "Create options"
-msgstr "Crear opciones"
+#: plugins/admin/users/class_divListUsers.inc:145
+#, fuzzy
+msgid "password"
+msgstr "Contraseña"
 
-#: plugins/admin/applications/class_applicationParameters.inc:56
-msgid ""
-"This application has options disabled. You can enable them by clicking below."
+#: plugins/admin/users/class_divListUsers.inc:160
+msgid "GOsa"
 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/users/class_divListUsers.inc:161
+#, fuzzy
+msgid "Edit generic properties"
+msgstr "Editar propiedades"
+
+#: plugins/admin/users/class_divListUsers.inc:163
+#, fuzzy
+msgid "Edit UNIX properties"
+msgstr "Editar propiedades"
+
+#: plugins/admin/users/class_divListUsers.inc:165
+#, fuzzy
+msgid "Edit environment properties"
+msgstr "Editar propiedades"
+
+#: plugins/admin/users/class_divListUsers.inc:167
+#, fuzzy
+msgid "Edit mail properties"
+msgstr "Editar propiedades"
+
+#: plugins/admin/users/class_divListUsers.inc:169
+#, fuzzy
+msgid "Edit phone properties"
+msgstr "Editar propiedades"
+
+#: plugins/admin/users/class_divListUsers.inc:171
+#, fuzzy
+msgid "Edit fax properies"
+msgstr "Editar propiedades"
+
+#: plugins/admin/users/class_divListUsers.inc:173
+#, fuzzy
+msgid "Edit samba properties"
+msgstr "Editar propiedades"
+
+#: plugins/admin/users/class_divListUsers.inc:175
+#, fuzzy
+msgid "Edit netatalk properties"
+msgstr "Editar propiedades"
+
+#: plugins/admin/users/class_divListUsers.inc:176
+#, fuzzy
+msgid "Create user from template"
+msgstr "Nueva plantilla"
+
+#: plugins/admin/users/class_divListUsers.inc:177
+#, fuzzy
+msgid "Create user with this template"
+msgstr "Nueva plantilla"
+
+#: plugins/admin/users/class_divListUsers.inc:230
+#, fuzzy
+msgid "Online"
+msgstr "en linea"
+
+#: plugins/admin/users/class_divListUsers.inc:237
+#, fuzzy
+msgid "Offline"
+msgstr "fuera de linea"
+
+#: plugins/admin/applications/class_divListApplication.inc:29
+#, fuzzy
+msgid "List of Applications"
+msgstr "Lista de aplicaciones"
+
+#: plugins/admin/applications/class_divListApplication.inc:30
+#, fuzzy
+msgid "This table displays all applications in the selected tree."
+msgstr "Ya existe una aplicación con este 'Nombre'."
+
+#: plugins/admin/applications/class_divListApplication.inc:34
+msgid ""
+"This menu allows you to add, edit and remove selected applications. You may "
+"want to use the range selector on top of the application listbox, when "
+"working with a large number of applications."
+msgstr ""
+"Este menú permite añadir, editar o eliminar las aplicaciones seleccionadas. "
+"Puede usar el selector de rango en la parte superior de la lista de "
+"aplicaciones, cuando trabaja con un gran número de aplicaciones."
+
+#: plugins/admin/applications/class_divListApplication.inc:44
+#: plugins/admin/applications/generic.tpl:7
+#: plugins/admin/applications/generic.tpl:8
+#: plugins/admin/applications/class_applicationGeneric.inc:446
+msgid "Application name"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/applications/class_divListApplication.inc:100
+#: plugins/admin/ogroups/class_divListOGroup.inc:108
+#, fuzzy
+msgid "new"
+msgstr "Nuevo"
+
+#: plugins/admin/applications/class_divListApplication.inc:101
+#, fuzzy
+msgid "Create new application"
+msgstr "Crear aplicaciones"
+
+#: 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
+#: plugins/admin/applications/class_applicationParameters.inc:128
+#, fuzzy
+msgid "Removing application parameters failed"
+msgstr "Editar parámetros de aplicaciones opcionales"
+
+#: 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_applicationGeneric.inc:416
-#: plugins/admin/applications/class_applicationManagement.inc:521
-msgid "Application name"
-msgstr "Nombre de la aplicación"
+#: plugins/admin/applications/class_applicationParameters.inc:190
+#, fuzzy
+msgid "Saving applications parameters failed"
+msgstr "Editar parámetros de aplicaciones opcionales"
 
 #: plugins/admin/applications/generic.tpl:11
 #: plugins/gofon/macro/generic.tpl:10 html/getxls.php:174 html/getxls.php:236
@@ -6740,7 +7437,7 @@ msgid "Display name"
 msgstr "Nombre mostrado"
 
 #: plugins/admin/applications/generic.tpl:13
-#: plugins/admin/applications/class_applicationGeneric.inc:421
+#: plugins/admin/applications/class_applicationGeneric.inc:451
 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)."
@@ -6753,35 +7450,35 @@ 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:49
+#: plugins/admin/applications/generic.tpl:55
 msgid "Icon"
 msgstr "Icono"
 
-#: plugins/admin/applications/generic.tpl:57
+#: plugins/admin/applications/generic.tpl:63
 msgid "Update"
 msgstr "Actualizar"
 
-#: plugins/admin/applications/generic.tpl:57
+#: plugins/admin/applications/generic.tpl:63
 msgid "Reload picture from LDAP"
 msgstr "Recargar imagen desde LDAP"
 
-#: plugins/admin/applications/generic.tpl:71
+#: plugins/admin/applications/generic.tpl:77
 msgid "Only executable for members"
 msgstr "Solo ejecutables para los miembros"
 
-#: plugins/admin/applications/generic.tpl:73
+#: plugins/admin/applications/generic.tpl:79
 msgid "Replace user configuration on startup"
 msgstr "Reemplazar la configuración del usuario en el inicio"
 
-#: plugins/admin/applications/generic.tpl:77
+#: plugins/admin/applications/generic.tpl:83
 msgid "Place icon on members desktop"
 msgstr "Colocar icono en los escritorios de los miembros "
 
-#: plugins/admin/applications/generic.tpl:80
+#: plugins/admin/applications/generic.tpl:86
 msgid "Place entry in members startmenu"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
 
-#: plugins/admin/applications/generic.tpl:83
+#: plugins/admin/applications/generic.tpl:89
 #, fuzzy
 msgid "Place entry in members launch bar"
 msgstr "Colocar entrado en los menús de inicio de los miembros"
@@ -6795,30 +7492,8 @@ msgstr ""
 "realmente hacer esto, ya que no hay manera de que GOsa recupere "
 "posteriormente la información."
 
-#: plugins/admin/applications/headpage.tpl:6
-msgid "List of applications"
-msgstr "Lista de aplicaciones"
-
-#: plugins/admin/applications/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit and remove selected applications. You may "
-"want to use the range selector on top of the application listbox, when "
-"working with a large number of applications."
-msgstr ""
-"Este menú permite añadir, editar o eliminar las aplicaciones seleccionadas. "
-"Puede usar el selector de rango en la parte superior de la lista de "
-"aplicaciones, cuando trabaja con un gran número de aplicaciones."
-
-#: plugins/admin/applications/headpage.tpl:56
-msgid "Display applications matching"
-msgstr "Mostrar aplicaciones que concuerden con"
-
-#: plugins/admin/applications/headpage.tpl:59
-msgid "Regular expression for matching application names"
-msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
-
-#: plugins/admin/applications/main.inc:38
-#: plugins/admin/applications/main.inc:40
+#: plugins/admin/applications/main.inc:39
+#: plugins/admin/applications/main.inc:41
 msgid "Application management"
 msgstr "Mantenimiento de aplicaciones"
 
@@ -6831,60 +7506,103 @@ msgstr "incompleto"
 msgid "This 'dn' is no application."
 msgstr "Este 'dn' no es una aplicación"
 
-#: plugins/admin/applications/class_applicationGeneric.inc:231
+#: plugins/admin/applications/class_applicationGeneric.inc:199
+#, fuzzy
+msgid "Removing application failed"
+msgstr "Borrar aplicaciones"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:211
+#, php-format
+msgid "Removing application from objectgroup '%s' failed"
+msgstr ""
+
+#: plugins/admin/applications/class_applicationGeneric.inc:218
+#, fuzzy, php-format
+msgid "Removing application from group '%s' failed"
+msgstr "Mostrar los grupos de aplicaciones"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:260
 msgid "The specified picture has not been uploaded correctly."
 msgstr "La foto indicada no ha sido subida correctamente."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:306
+#: plugins/admin/applications/class_applicationGeneric.inc:336
 msgid "Specified execute path must start with '/'."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:320
+#: plugins/admin/applications/class_applicationGeneric.inc:350
 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:325
+#: plugins/admin/applications/class_applicationGeneric.inc:355
 msgid "Required field 'Name' is not filled."
 msgstr "El campo requerido 'Nombre' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:329
+#: plugins/admin/applications/class_applicationGeneric.inc:359
 msgid "Invalid character in application name. Only a-z 0-9 are allowed."
 msgstr ""
 
-#: plugins/admin/applications/class_applicationGeneric.inc:333
+#: plugins/admin/applications/class_applicationGeneric.inc:363
 msgid "Required field 'Execute' is not filled."
 msgstr "El campo requerido 'Ejecutar' no ha sido llenado."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:348
-#: plugins/admin/applications/class_applicationGeneric.inc:356
+#: plugins/admin/applications/class_applicationGeneric.inc:378
+#: plugins/admin/applications/class_applicationGeneric.inc:386
 msgid "There's already an application with this 'Name'."
 msgstr "Ya existe una aplicación con este 'Nombre'."
 
-#: plugins/admin/applications/class_applicationGeneric.inc:412
+#: plugins/admin/applications/class_applicationGeneric.inc:417
+#, fuzzy
+msgid "Saving application failed"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/applications/class_applicationGeneric.inc:442
 #, fuzzy
 msgid "Application settings"
 msgstr "Opciones de aplicaciones"
 
-#: plugins/admin/applications/class_applicationManagement.inc:376
+#: plugins/admin/applications/class_applicationManagement.inc:287
 #, 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
+#: plugins/admin/applications/class_applicationManagement.inc:293
+#: plugins/admin/applications/class_applicationManagement.inc:322
 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
+#: plugins/admin/departments/class_divListDepartment.inc:27
+#: plugins/admin/departments/class_divListDepartment.inc:28
+#: plugins/admin/departments/headpage.tpl:6
+msgid "List of departments"
+msgstr "Lista de Departamentos"
+
+#: plugins/admin/departments/class_divListDepartment.inc:33
 #, fuzzy
-msgid "new"
-msgstr "Nuevo"
+msgid ""
+"This menu allows you to create, delete and edit selected departments. Having "
+"a large size of departments, you might prefer the range selectors on   top "
+"of the department 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."
 
-#: plugins/admin/applications/class_applicationManagement.inc:477
+#: plugins/admin/departments/class_divListDepartment.inc:41
 #, fuzzy
-msgid "Create new application"
-msgstr "Crear aplicaciones"
+msgid "Department name"
+msgstr "Mantenimiento de Departamentos"
+
+#: plugins/admin/departments/class_divListDepartment.inc:74
+#, fuzzy
+msgid "Create new department"
+msgstr "Nombre del departamento"
+
+#: plugins/admin/departments/dep_iframe.tpl:3
+msgid ""
+"As soon as the move operation has finished, you can scroll down to end of "
+"the page and press the 'Continue' button to continue with the department "
+"management dialog."
+msgstr ""
 
 #: plugins/admin/departments/generic.tpl:8
 msgid "Name of department"
@@ -6895,7 +7613,7 @@ msgid "Name of subtree to create"
 msgstr "Nombre del subárbol para crear"
 
 #: plugins/admin/departments/generic.tpl:14
-#: plugins/gofon/conference/generic.tpl:56
+#: plugins/gofon/conference/generic.tpl:61
 msgid "Descriptive text for department"
 msgstr "Descripción del departamento"
 
@@ -6908,30 +7626,39 @@ msgid "Category for this subtree"
 msgstr "Categoría de este subarbol"
 
 #: plugins/admin/departments/generic.tpl:30
-#: plugins/gofon/conference/generic.tpl:122
+#: plugins/gofon/conference/generic.tpl:127
 msgid "Choose subtree to place department in"
 msgstr "Elija subárbol para colocar el departamento"
 
-#: plugins/admin/departments/generic.tpl:48
+#: plugins/admin/departments/generic.tpl:52
 msgid "State where this subtree is located"
 msgstr "País donde esta localizado el subarbol"
 
-#: plugins/admin/departments/generic.tpl:52
+#: plugins/admin/departments/generic.tpl:56
 msgid "Location of this subtree"
 msgstr "Localización de este subarbol"
 
-#: plugins/admin/departments/generic.tpl:56
+#: plugins/admin/departments/generic.tpl:60
 msgid "Postal address of this subtree"
 msgstr "Dirección postal de este subarbol"
 
-#: plugins/admin/departments/generic.tpl:60
+#: plugins/admin/departments/generic.tpl:64
 msgid "Base telephone number of this subtree"
 msgstr "Número base de teléfono de este subarbol"
 
-#: plugins/admin/departments/generic.tpl:64
+#: plugins/admin/departments/generic.tpl:68
 msgid "Base facsimile telephone number of this subtree"
 msgstr "Número base de fax de este subarbol"
 
+#: plugins/admin/departments/generic.tpl:81
+#, fuzzy
+msgid "Administrative settings"
+msgstr "Administradores"
+
+#: plugins/admin/departments/generic.tpl:83
+msgid "Tag department as an independent administrative unit"
+msgstr ""
+
 #: plugins/admin/departments/remove.tpl:6
 #: plugins/gofon/conference/remove.tpl:6
 #, fuzzy
@@ -6944,10 +7671,6 @@ msgstr ""
 "favor pulse dos veces si quiere realmente hacer esto, ya que no hay forma de "
 "que GOsa recupere la información posteriormente."
 
-#: plugins/admin/departments/headpage.tpl:6
-msgid "List of departments"
-msgstr "Lista de Departamentos"
-
 #: plugins/admin/departments/headpage.tpl:24
 msgid ""
 "This menu allows you to create, delete and edit selected departments. Having "
@@ -6966,128 +7689,201 @@ msgstr "Mostrar Departamentos que concuerden con"
 msgid "Regular expression for matching department names"
 msgstr "Expresiones regulares para encontrar nombres de departamentos"
 
-#: plugins/admin/departments/main.inc:38 plugins/admin/departments/main.inc:40
+#: plugins/admin/departments/main.inc:41 plugins/admin/departments/main.inc:43
 msgid "Department management"
 msgstr "Mantenimiento de Departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:185
+#: plugins/admin/departments/class_departmentGeneric.inc:170
+#, fuzzy
+msgid "Removing department failed"
+msgstr "Mostrar departamentos"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:219
 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
+#: plugins/admin/departments/class_departmentGeneric.inc:226
+#: plugins/admin/departments/class_departmentGeneric.inc:228
 msgid "Department with that 'Name' already exists."
 msgstr "Ya existe un Departamento con este 'Nombre'."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:202
+#: plugins/admin/departments/class_departmentGeneric.inc:236
 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'."
+#: plugins/admin/departments/class_departmentGeneric.inc:240
+#, fuzzy, php-format
+msgid ""
+"The field 'Name' contains the reserved word '%s'. Please choose another name."
 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:284
+msgid "Fatal error: Can't find an unused tag to mark the administrative unit!"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:326
+#, fuzzy
+msgid "Saving department failed"
+msgstr "Mostrar departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:278
+#: plugins/admin/departments/class_departmentGeneric.inc:363
 #, php-format
-msgid "Moving %s to %s"
+msgid "Tagging '%s'."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:317
+#: plugins/admin/departments/class_departmentGeneric.inc:440
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_departmentGeneric.inc:479
 #, 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_divListOGroup.inc:52
 msgid "Departments"
 msgstr "Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:186
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:182
+#: plugins/admin/departments/class_departmentManagement.inc:158
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:133
 #, 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:179
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:152
 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:334
+msgid ".."
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
 #, fuzzy
-msgid "Create new department"
-msgstr "Nombre del departamento"
+msgid "Reference"
+msgstr "Referencias"
 
-#: plugins/admin/departments/class_departmentManagement.inc:309
-msgid "This table displays all departments, in the selected tree."
-msgstr ""
+#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
+#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
+#, fuzzy
+msgid "Comments"
+msgstr "Contacto"
 
-#: plugins/admin/departments/class_departmentManagement.inc:318
+#: 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 "Department name"
-msgstr "Mantenimiento de Departamentos"
+msgid "Comment"
+msgstr "Contacto"
 
-#: plugins/admin/departments/class_departmentManagement.inc:412
-msgid ".."
+#: 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/departments/recursive_move.tpl:2
-msgid ""
-"As soon as the move operation has finished, you can scroll down to end of "
-"the page and press the 'Continue' button to continue with the department "
-"management dialog."
+#: 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/class_terminalInfo.inc:54
-#: plugins/admin/systems/class_terminalInfo.inc:200
-msgid "present"
-msgstr "presente"
+#: plugins/admin/systems/class_servDHCP.inc:36
+msgid "Remove DHCP service"
+msgstr "Eliminar servicio DHCP"
 
-#: plugins/admin/systems/class_terminalInfo.inc:68
-#: plugins/admin/systems/class_terminalService.inc:158
-#: plugins/admin/systems/class_terminalStartup.inc:99
-#: plugins/admin/systems/class_workstationService.inc:151
-#: plugins/admin/systems/class_workstationStartup.inc:369
-#: plugins/admin/systems/class_terminalGeneric.inc:153
-msgid "This 'dn' has no terminal features."
+#: plugins/admin/systems/class_servDHCP.inc:37
+msgid ""
+"This server has DHCP features enabled. You can disable them by clicking "
+"below."
+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/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/class_terminalInfo.inc:54
+#: plugins/admin/systems/class_terminalInfo.inc:199
+msgid "present"
+msgstr "presente"
+
+#: plugins/admin/systems/class_terminalInfo.inc:67
+#: plugins/admin/systems/class_terminalService.inc:252
+#: plugins/admin/systems/class_workstationService.inc:241
+#: plugins/admin/systems/class_terminalGeneric.inc:191
+#: plugins/admin/systems/class_workstationStartup.inc:478
+#: plugins/admin/systems/class_terminalStartup.inc:151
+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_terminalInfo.inc:74
 #, 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
+#: plugins/admin/systems/class_terminalInfo.inc:80
+#: plugins/admin/systems/class_terminalInfo.inc:174
 msgid "unknown status"
 msgstr "estado desconocido"
 
-#: plugins/admin/systems/class_terminalInfo.inc:90
+#: plugins/admin/systems/class_terminalInfo.inc:89
 msgid "This is a virtual terminal which has no properties to show here."
 msgstr ""
 "Este es un terminal virtual que no tiene propiedades que puedan ser mostradas"
 
-#: plugins/admin/systems/class_terminalInfo.inc:108
+#: plugins/admin/systems/class_terminalInfo.inc:107
 msgid "online"
 msgstr "en linea"
 
-#: plugins/admin/systems/class_terminalInfo.inc:164
+#: plugins/admin/systems/class_terminalInfo.inc:163
 msgid "running"
 msgstr "Activo"
 
-#: plugins/admin/systems/class_terminalInfo.inc:167
+#: plugins/admin/systems/class_terminalInfo.inc:166
 msgid "not running"
 msgstr "no esta activo"
 
-#: plugins/admin/systems/class_terminalInfo.inc:192
+#: plugins/admin/systems/class_terminalInfo.inc:191
 msgid "offline"
 msgstr "fuera de linea"
 
@@ -7104,54 +7900,30 @@ msgstr "Dirección IP"
 msgid "MAC-address"
 msgstr "Dirección MAC"
 
-#: plugins/admin/systems/network.tpl:29
-msgid "Enable DNS for this device"
+#: plugins/admin/systems/network.tpl:19
+msgid "Autodetect"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:30
-#: plugins/admin/systems/servdnseditzone.tpl:67
-#: plugins/gofon/phoneaccount/generic.tpl:67
-#, fuzzy
-msgid "Refresh"
-msgstr "Referencias"
+#: plugins/admin/systems/network.tpl:41
+msgid "Enable DNS for this device"
+msgstr ""
 
-#: plugins/admin/systems/network.tpl:34
+#: plugins/admin/systems/network.tpl:50
 #, fuzzy
 msgid "Zone"
 msgstr "teléfonos"
 
-#: plugins/admin/systems/network.tpl:42
+#: plugins/admin/systems/network.tpl:58
 #: plugins/admin/systems/class_servDNS.inc:160
 #: plugins/admin/systems/servdnseditzone.tpl:85
 msgid "TTL"
 msgstr ""
 
-#: plugins/admin/systems/network.tpl:47
+#: plugins/admin/systems/network.tpl:63
 #, fuzzy
 msgid "Dns records"
 msgstr "Directorio"
 
-#: plugins/admin/systems/class_winGeneric.inc:73
-#: plugins/admin/systems/class_componentGeneric.inc:50
-msgid "This 'dn' has no network features."
-msgstr "Esta 'dn' no tiene características de red."
-
-#: plugins/admin/systems/class_winGeneric.inc:162
-#: plugins/admin/systems/class_componentGeneric.inc:145
-msgid "You have no permissions to create a component on this 'Base'."
-msgstr "No tiene permisos para crear un componente en esta 'Base'."
-
-#: plugins/admin/systems/class_winGeneric.inc:172
-#: plugins/admin/systems/class_phoneGeneric.inc:314
-#: plugins/admin/systems/class_terminalGeneric.inc:286
-#: plugins/admin/systems/class_servGeneric.inc:209
-#: plugins/admin/systems/class_workstationGeneric.inc:245
-#: plugins/admin/systems/class_printGeneric.inc:529
-#: plugins/admin/systems/class_componentGeneric.inc:155
-#, 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/info.tpl:1
 msgid "System information"
 msgstr "Información de sistema"
@@ -7250,152 +8022,461 @@ 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/glpi.tpl:19
+#, fuzzy
+msgid "Operating system"
+msgstr "Borrar"
+
+#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
+#, fuzzy
+msgid "Contacts"
+msgstr "Contacto"
+
+#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
+#, fuzzy
+msgid "Contact person"
+msgstr "Contacto"
+
+#: plugins/admin/systems/glpi.tpl:78
+#, fuzzy
+msgid "Installed devices"
+msgstr "Dispositivos clientes"
+
+#: plugins/admin/systems/glpi.tpl:90
+#, fuzzy
+msgid "Trading"
+msgstr "Ocultamiento"
+
+#: plugins/admin/systems/glpi.tpl:91
+#, fuzzy
+msgid "Software"
+msgstr "Estado"
+
+#: plugins/admin/systems/glpi.tpl:92
+#, fuzzy
+msgid "Contracts"
+msgstr "Contacto"
+
+#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
+#, fuzzy
+msgid "Attachments"
+msgstr "Argumentos"
+
+#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
+msgid "System management"
+msgstr "Gestión del sistema"
+
+#: plugins/admin/systems/glpiPrinter.tpl:9
+#, fuzzy
+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/glpiPrinter.tpl:38
+#, fuzzy
+msgid "Serial"
+msgstr "terminales"
+
+#: plugins/admin/systems/glpiPrinter.tpl:46
+#, fuzzy
+msgid "Parallel"
+msgstr "Variable"
+
+#: plugins/admin/systems/glpiPrinter.tpl:54
+msgid "USB"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinter.tpl:114
+#, fuzzy
+msgid "Installed cartridges"
+msgstr "Dispositivos clientes"
+
+#: 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/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/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/servDNSeditZoneEntries.tpl:14
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:81
+#, fuzzy
+msgid "New entry"
+msgstr "usuarios"
+
+#: plugins/admin/systems/servDNSeditZoneEntries.tpl:14
+#, fuzzy
+msgid "Create a new DNS zone entry"
+msgstr "Crear una nueva entrada en"
+
+#: plugins/admin/systems/glpi_edit_type.tpl:1
+#, fuzzy
+msgid "Manage System-types"
+msgstr "Sistemas"
+
+#: 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_cartridge_type.tpl:7
+#: plugins/admin/systems/glpi_edit_os.tpl:9
+#: plugins/admin/systems/glpi_edit_os.tpl:28
+#, fuzzy
+msgid "Rename"
+msgstr "Nombre del servidor"
+
+#: 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
+#, fuzzy
+msgid "Please enter a new name"
+msgstr "Por favor especifique una dirección de servidor - URI - válida."
+
+#: plugins/admin/systems/class_terminalService.inc:69
+#: plugins/admin/systems/class_workstationService.inc:92
+#: plugins/admin/systems/workstationService.tpl:121
+#, fuzzy
+msgid "unknown"
+msgstr "estado desconocido"
+
+#: plugins/admin/systems/class_terminalService.inc:72
+#: plugins/admin/systems/class_terminalService.inc:100
+#: plugins/admin/systems/class_terminalService.inc:106
+#: plugins/admin/systems/class_terminalService.inc:116
+#: plugins/admin/systems/class_terminalService.inc:117
+#: plugins/admin/systems/class_terminalService.inc:119
+#: plugins/admin/systems/class_terminalService.inc:123
+#: plugins/admin/systems/class_terminalService.inc:214
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_terminalService.inc:220
+#: plugins/admin/systems/class_terminalService.inc:223
+#: plugins/admin/systems/class_terminalService.inc:226
+#: plugins/admin/systems/class_terminalService.inc:229
+#: plugins/admin/systems/class_terminalService.inc:232
+#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_workstationService.inc:204
+#: plugins/admin/systems/class_workstationService.inc:207
+#: plugins/admin/systems/class_workstationService.inc:210
+#: plugins/admin/systems/class_workstationService.inc:213
+#: plugins/admin/systems/class_workstationService.inc:216
+#: plugins/admin/systems/class_workstationService.inc:219
+#: plugins/admin/systems/class_workstationGeneric.inc:110
+#: plugins/admin/systems/class_terminalGeneric.inc:105
+#: plugins/admin/systems/class_terminalGeneric.inc:246
+#: plugins/admin/systems/class_workstationStartup.inc:263
+#: plugins/admin/systems/class_workstationStartup.inc:281
+#: plugins/admin/systems/class_workstationStartup.inc:285
+#: plugins/admin/systems/class_workstationStartup.inc:785
+#: plugins/admin/systems/class_terminalStartup.inc:39
+#: plugins/admin/systems/class_terminalStartup.inc:111
+#: plugins/admin/systems/class_terminalStartup.inc:131
+msgid "inherited"
+msgstr ""
+
+#: plugins/admin/systems/class_terminalService.inc:101
 #: plugins/admin/systems/class_terminalService.inc:102
-#: plugins/admin/systems/class_workstationService.inc:89
+#: plugins/admin/systems/class_terminalService.inc:103
+#: plugins/admin/systems/class_terminalService.inc:104
+#: plugins/admin/systems/class_workstationService.inc:95
+#: plugins/admin/systems/class_workstationService.inc:96
+#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_workstationService.inc:98
+#, fuzzy
+msgid "bit"
+msgstr "escribir"
+
+#: plugins/admin/systems/class_terminalService.inc:155
 msgid "default"
 msgstr "por defecto"
 
-#: plugins/admin/systems/class_terminalService.inc:103
-#: plugins/admin/systems/class_workstationService.inc:90
+#: plugins/admin/systems/class_terminalService.inc:156
+#: plugins/admin/systems/class_workstationService.inc:138
 msgid "show chooser"
 msgstr "mostrar elegidos"
 
-#: plugins/admin/systems/class_terminalService.inc:104
-#: plugins/admin/systems/class_workstationService.inc:91
+#: plugins/admin/systems/class_terminalService.inc:157
+#: plugins/admin/systems/class_workstationService.inc:139
 msgid "direct"
 msgstr "Directo"
 
-#: plugins/admin/systems/class_terminalService.inc:107
-#: plugins/admin/systems/class_workstationService.inc:94
+#: plugins/admin/systems/class_terminalService.inc:160
+#: plugins/admin/systems/class_workstationService.inc:142
 msgid "load balanced"
 msgstr "balanceo de carga"
 
-#: plugins/admin/systems/class_terminalService.inc:110
-#: plugins/admin/systems/class_workstationService.inc:97
+#: plugins/admin/systems/class_terminalService.inc:163
+#: plugins/admin/systems/class_workstationService.inc:145
 msgid "Windows RDP"
 msgstr "Windows RDP"
 
-#: plugins/admin/systems/class_terminalService.inc:111
-#: plugins/admin/systems/class_workstationService.inc:98
+#: plugins/admin/systems/class_terminalService.inc:164
+#: plugins/admin/systems/class_workstationService.inc:146
 msgid "ICA client"
 msgstr "Cliente ICA"
 
-#: plugins/admin/systems/class_terminalService.inc:209
-#: plugins/admin/systems/class_workstationService.inc:201
+#: plugins/admin/systems/class_terminalService.inc:217
+#: plugins/admin/systems/class_workstationService.inc:204
+#, fuzzy
+msgid "Bit"
+msgstr "escribir"
+
+#: plugins/admin/systems/class_terminalService.inc:303
+#: plugins/admin/systems/class_workstationService.inc:291
 msgid "Choose the phone located at the current terminal"
 msgstr "Elija el teléfono localizado en el terminal actual"
 
-#: plugins/admin/systems/class_terminalService.inc:270
-#: plugins/admin/systems/class_terminalService.inc:275
-#: plugins/admin/systems/class_workstationService.inc:263
-#: plugins/admin/systems/class_workstationService.inc:268
+#: plugins/admin/systems/class_terminalService.inc:365
+#: plugins/admin/systems/class_terminalService.inc:370
+#: plugins/admin/systems/class_workstationService.inc:354
+#: plugins/admin/systems/class_workstationService.inc:359
 msgid "Please specify a valid VSync range."
 msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/admin/systems/class_terminalService.inc:285
-#: plugins/admin/systems/class_terminalService.inc:290
-#: plugins/admin/systems/class_workstationService.inc:278
-#: plugins/admin/systems/class_workstationService.inc:283
+#: plugins/admin/systems/class_terminalService.inc:380
+#: plugins/admin/systems/class_terminalService.inc:385
+#: plugins/admin/systems/class_workstationService.inc:369
+#: plugins/admin/systems/class_workstationService.inc:374
 msgid "Please specify a valid HSync range."
 msgstr "Por favor especifique un rango HSync valido"
 
-#: plugins/admin/systems/main.inc:45 plugins/admin/systems/main.inc:47
-msgid "System management"
-msgstr "Gestión del sistema"
-
-#: plugins/admin/systems/class_servService.inc:272
-msgid "Terminal server, must have fontpath specified."
-msgstr ""
-
-#: plugins/admin/systems/servservice.tpl:37
-msgid "Time Service"
-msgstr "Servicio de Hora"
-
-#: plugins/admin/systems/servservice.tpl:61
-msgid "LDAP Service"
-msgstr "Servicio LDAP"
+#: plugins/admin/systems/class_terminalService.inc:416
+#, fuzzy
+msgid "Saving terminal service information failed"
+msgstr "Información organizativa"
 
-#: plugins/admin/systems/servservice.tpl:72
-msgid "Terminal Service"
-msgstr "Servidor de terminal"
+#: plugins/admin/systems/glpi_devices.tpl:2
+#, fuzzy
+msgid "Add/Edit monitor"
+msgstr "Editar entrada"
 
-#: plugins/admin/systems/servservice.tpl:77
-msgid "Temporary disable login"
-msgstr "Desactivación temporal del acceso"
+#: plugins/admin/systems/glpi_devices.tpl:33
+#, fuzzy
+msgid "Monitor size"
+msgstr "Monitor"
 
-#: plugins/admin/systems/servservice.tpl:80
-msgid "Font path"
-msgstr "Ruta a las fuentes tipográficas"
+#: plugins/admin/systems/glpi_devices.tpl:36
+#, fuzzy
+msgid "Inch"
+msgstr "Francés"
 
-#: plugins/admin/systems/servservice.tpl:93
-msgid "Syslog Service"
-msgstr "Servicio de Logs"
+#: plugins/admin/systems/glpi_devices.tpl:44
+msgid "Integrated microphone"
+msgstr ""
 
-#: plugins/admin/systems/servservice.tpl:101
-msgid "Print Service"
-msgstr "Servicio de impresión"
+#: 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/servservice.tpl:109
+#: 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 "Mail server"
-msgstr "Servidor"
+msgid "No"
+msgstr "ninguno"
 
-#: 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/glpi_devices.tpl:52
+msgid "Integrated speakers"
+msgstr ""
 
-#: 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/glpi_devices.tpl:60
+msgid "Sub-D"
 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/glpi_devices.tpl:68
+msgid "BNC"
+msgstr ""
 
-#: plugins/admin/systems/chooser.tpl:8
-msgid "Linux workstation template"
-msgstr "Plantilla de estaciones de trabajo linux"
+#: plugins/admin/systems/glpi_devices.tpl:76
+#, fuzzy
+msgid "Serial number"
+msgstr "Nombre de terminal"
 
-#: plugins/admin/systems/chooser.tpl:9
-msgid "Linux Server"
-msgstr "Servidor Linux"
+#: plugins/admin/systems/glpi_devices.tpl:83
+#, fuzzy
+msgid "Additional serial number"
+msgstr "Numero de serie del certificado"
 
-#: plugins/admin/systems/chooser.tpl:10
-msgid "Windows workstation"
-msgstr "Estación de trabajo Windows"
+#: plugins/admin/systems/glpi_devices.tpl:97
+#, fuzzy
+msgid "Add/Edit other device"
+msgstr "Tarjeta Sonido"
 
-#: plugins/admin/systems/chooser.tpl:11
-msgid "Network printer"
+#: plugins/admin/systems/glpi_devices.tpl:138
+msgid "Add/Edit power supply"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:173
+msgid "Atx"
+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/glpi_devices.tpl:228
+#: plugins/admin/systems/glpi_devices.tpl:284
+#: plugins/admin/systems/glpi_devices.tpl:349
+msgid "Interface"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:237
+#, fuzzy
+msgid "Ram"
+msgstr "Nombre del servidor"
+
+#: plugins/admin/systems/glpi_devices.tpl:249
+#, fuzzy
+msgid "Add/Edit controller"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/glpi_devices.tpl:307
+msgid "Add/Edit drive"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:342
+#, fuzzy
+msgid "Speed"
+msgstr "Sexo"
+
+#: plugins/admin/systems/glpi_devices.tpl:358
+#, fuzzy
+msgid "Writeable"
+msgstr "escribir"
+
+#: plugins/admin/systems/glpi_devices.tpl:371
+#, fuzzy
+msgid "Add/Edit harddisk"
+msgstr "Servidor"
+
+#: plugins/admin/systems/glpi_devices.tpl:406
+msgid "Rpm"
+msgstr ""
+
+#: plugins/admin/systems/glpi_devices.tpl:413
+#, fuzzy
+msgid "Cache"
+msgstr "Cancelar"
+
+#: plugins/admin/systems/glpi_devices.tpl:443
+#, fuzzy
+msgid "Add/Edit memory"
+msgstr "Editar entrada"
+
+#: plugins/admin/systems/glpi_devices.tpl:478
+#, fuzzy
+msgid "Frequenz"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/glpi_devices.tpl:507
+#, fuzzy
+msgid "Add/Edit sound card"
+msgstr "Nueva contraseña"
+
+#: plugins/admin/systems/glpi_devices.tpl:553
+#, fuzzy
+msgid "Add/Edit network interface"
 msgstr "Impresora de Red"
 
-#: plugins/admin/systems/chooser.tpl:13
-msgid "Other network component"
-msgstr "Otros componentes de red"
+#: plugins/admin/systems/glpi_devices.tpl:589
+#, fuzzy
+msgid "MAC address"
+msgstr "Dirección MAC"
 
-#: plugins/admin/systems/chooser.tpl:16
-msgid "Create"
-msgstr "Crear"
+#: plugins/admin/systems/glpi_devices.tpl:607
+#, fuzzy
+msgid "Add/Edit processor"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/component.tpl:15 plugins/admin/systems/server.tpl:15
-#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/terminal.tpl:20
-#: plugins/admin/systems/printer.tpl:22
-#: plugins/admin/systems/workstation.tpl:29
-#: 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/glpi_devices.tpl:642
+#, fuzzy
+msgid "Frequence"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/glpi_devices.tpl:649
+#, fuzzy
+msgid "Default frequence"
+msgstr "Valor por defecto"
+
+#: plugins/admin/systems/glpi_devices.tpl:661
+#, fuzzy
+msgid "Add/Edit motherboard"
+msgstr "Teclado"
+
+#: plugins/admin/systems/glpi_devices.tpl:696
+#, fuzzy
+msgid "Chipset"
+msgstr "Borrar"
+
+#: plugins/admin/systems/glpi_devices.tpl:707
+#, fuzzy
+msgid "Add/Edit computer case"
+msgstr "incompleto"
+
+#: plugins/admin/systems/glpi_devices.tpl:742
+#, fuzzy
+msgid "format"
+msgstr "Puerto"
+
+#: plugins/admin/systems/class_workstationService.inc:415
+#, fuzzy
+msgid "Saving workstation services failed"
+msgstr "Entradas de fstab adicionales"
+
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#, fuzzy
+msgid "Add/Edit manufacturer"
+msgstr "Editar entrada"
+
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+#, fuzzy
+msgid "Website"
+msgstr "escribir"
+
+#: plugins/admin/systems/glpiManufacturerAdd.tpl:32
+#: plugins/admin/ogroups/class_mailogroup.inc:138
+#: plugins/admin/ogroups/class_phonequeue.inc:691
+#: plugins/gofon/conference/generic.tpl:74 html/getxls.php:174
+#: html/getxls.php:236
+#, fuzzy
+msgid "Phone number"
+msgstr "Números de teléfonos"
 
 #: plugins/admin/systems/workstationService.tpl:4
 #: plugins/admin/systems/terminalService.tpl:4
@@ -7403,9 +8484,9 @@ msgid "Keyboard"
 msgstr "Teclado"
 
 #: plugins/admin/systems/workstationService.tpl:7
-#: plugins/admin/systems/printerPPDDialog.tpl:5
 #: plugins/admin/systems/terminalService.tpl:7
 #: plugins/admin/systems/terminalService.tpl:210
+#: plugins/admin/systems/printerPPDDialog.tpl:5
 msgid "Model"
 msgstr "Modelo"
 
@@ -7456,22 +8537,22 @@ msgstr "Elija el puerto del ratón"
 
 #: plugins/admin/systems/workstationService.tpl:66
 #: plugins/admin/systems/terminalService.tpl:66
+#: plugins/gofon/phoneaccount/paste_generic.tpl:27
 #: 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/paste_generic.tpl:29
 #: 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:86
-#: plugins/admin/systems/printer.tpl:46
 #: plugins/admin/systems/terminalService.tpl:86
+#: plugins/admin/systems/printer.tpl:51
 msgid "Driver"
 msgstr "Controlador"
 
@@ -7501,11 +8582,6 @@ msgstr "Elija la profundidad de color usada en modo gráfico"
 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 ""
@@ -7545,161 +8621,85 @@ msgstr "Seleccione para iniciar el servicio de escáner 'SANE' en el terminal"
 msgid "Provide scan services"
 msgstr "Provee servicios de exploración"
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
-#, fuzzy
-msgid "Select entries to add"
-msgstr "Seleccione usuarios que serán añadidos"
-
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
-#, fuzzy
-msgid "Display members of department"
-msgstr "Mostrar número de Departamentos"
-
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
-#, fuzzy
-msgid "Display members matching"
-msgstr "Mostrar números que concuerdan con"
+#: plugins/admin/systems/class_printerPPDDialog.inc:62
+#, php-format
+msgid "Can't open '%s', ppd settings resetted."
+msgstr ""
 
-#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+#: plugins/admin/systems/class_printerPPDDialog.inc:87
 #, fuzzy
-msgid "Regular expression for matching member names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+msgid "Can't get ppd informations."
+msgstr "Información genérica del usuario"
 
-#: plugins/admin/systems/class_workstationStartup.inc:310
+#: plugins/admin/systems/class_printerPPDDialog.inc:99
+#, php-format
 msgid ""
-"There are packages in your configuration, which can't be resolved with "
-"current server/release settings."
+"The specified path '%s' which results from PPD_PATH in your gosa.conf is "
+"invalid, can't read/write any ppd informations."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:351
+#: plugins/admin/systems/class_printerPPDDialog.inc:116
 #, fuzzy
-msgid "Please select a 'FAI server' or remove the 'FAI classes'."
-msgstr "¡Por favor introduzca un número de teléfono valido!"
+msgid "Please specify a valid ppd file."
+msgstr "Por favor especifique un nombre de usuario valido."
 
-#: plugins/admin/systems/class_workstationStartup.inc:407
-#, 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."
+#: plugins/admin/systems/class_printerPPDDialog.inc:186
+#, php-format
+msgid "Can't select PPD file '%s', the file is not readable"
+msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:725
+#: plugins/admin/systems/class_printerPPDDialog.inc:203
+#: plugins/admin/systems/class_printerPPDDialog.inc:275
 #, php-format
-msgid ""
-"Can't resolve one or more of the given FAIclass(es) [%s] in FAI server '%s'. "
-"Server was reset to 'auto'."
+msgid "Can't create folder '%s' for the uploaded ppd file."
 msgstr ""
 
-#: plugins/admin/systems/class_workstationStartup.inc:736
+#: plugins/admin/systems/class_printerPPDDialog.inc:211
+#, fuzzy, php-format
+msgid "Can't create file '%s' to store modifed ppd informations."
+msgstr "Información genérica del usuario"
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:235
 #, php-format
+msgid "Can't add new ppd file, the source file '%s' is not accessible."
+msgstr ""
+
+#: plugins/admin/systems/class_printerPPDDialog.inc:253
+#, fuzzy, 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."
+"The given ppd file '%s' seams to be invalid, can't get any modell or vendor "
+"informations."
 msgstr ""
+"Aviso: imap_getacl no ha sido implementado, no se modificara información "
+"sobre las listas de acceso."
 
-#: 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_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
-#, fuzzy
-msgid "yes"
-msgstr "Sistemas"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:202
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
-#, fuzzy
-msgid "no"
-msgstr "ninguno"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-msgid "dynamic"
-msgstr ""
-
-#: plugins/admin/systems/class_phoneGeneric.inc:223
-#, fuzzy
-msgid "Networksettings"
-msgstr "Configuración de red"
-
-#: plugins/admin/systems/class_phoneGeneric.inc:238
-#, 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/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_phoneGeneric.inc:297
-msgid "The 'Phone name' '0' is reserved and cannot be used."
-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_printerPPDDialog.inc:67
-#, php-format
-msgid "Can't open '%s', ppd settings resetted."
-msgstr ""
-
-#: 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/class_printerPPDDialog.inc:109
-#, fuzzy
-msgid "Can't get ppd informations."
-msgstr "Información genérica del usuario"
-
-#: 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_printerPPDDialog.inc:138
+#: plugins/admin/systems/class_printerPPDDialog.inc:267
 #, 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_printerPPDDialog.inc:146
+#: plugins/admin/systems/class_printerPPDDialog.inc:288
 #, fuzzy, php-format
 msgid "Can't save file '%s'."
 msgstr "Borrar"
 
-#: 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_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_printerPPDDialog.inc:292
+msgid "Uploaded ppd file is empty, can't create new ppd file."
+msgstr ""
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:369
-#: plugins/admin/systems/class_printerPPDDialog.inc:372
+#: plugins/admin/systems/class_printerPPDDialog.inc:462
+#: plugins/admin/systems/class_printerPPDDialog.inc:465
 #, fuzzy
 msgid "True"
 msgstr "Futuro"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:370
-#: plugins/admin/systems/class_printerPPDDialog.inc:373
+#: plugins/admin/systems/class_printerPPDDialog.inc:463
+#: plugins/admin/systems/class_printerPPDDialog.inc:466
 #, fuzzy
 msgid "False"
 msgstr "mujer"
 
-#: plugins/admin/systems/class_printerPPDDialog.inc:378
+#: plugins/admin/systems/class_printerPPDDialog.inc:471
 #, php-format
 msgid "Unsupported ppd type '%s' used for '%s' "
 msgstr ""
@@ -7708,103 +8708,39 @@ msgstr ""
 msgid "Server name"
 msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/server.tpl:39 plugins/admin/systems/terminal.tpl:100
-#: plugins/admin/systems/workstation.tpl:79
+#: plugins/admin/systems/server.tpl:17 plugins/admin/systems/terminal.tpl:19
+#: plugins/admin/systems/phone.tpl:15 plugins/admin/systems/workstation.tpl:25
+#: plugins/admin/systems/component.tpl:15
+#: plugins/admin/systems/wingeneric.tpl:15
+#: plugins/admin/systems/printer.tpl:22
+msgid "Choose subtree to place terminal in"
+msgstr "Elija un subárbol donde colocar el terminal"
+
+#: plugins/admin/systems/server.tpl:32 plugins/admin/systems/terminal.tpl:34
+#: plugins/admin/systems/workstation.tpl:39
+#: plugins/admin/systems/phonesettings.tpl:21
+#: plugins/admin/ogroups/termgroup.tpl:38
+msgid "Mode"
+msgstr "Modo"
+
+#: plugins/admin/systems/server.tpl:34 plugins/admin/systems/terminal.tpl:36
+#: plugins/admin/systems/workstation.tpl:41
+#: plugins/admin/ogroups/termgroup.tpl:40
+msgid "Select terminal mode"
+msgstr "Seleccionar modo de terminal"
+
+#: plugins/admin/systems/server.tpl:50 plugins/admin/systems/terminal.tpl:115
+#: plugins/admin/systems/workstation.tpl:93
 #: plugins/admin/systems/class_glpiPrinterCartridges.inc:163
 #: plugins/admin/systems/class_baseSelectDialog.inc:45
-#: plugins/admin/ogroups/termgroup.tpl:3
+#: plugins/admin/ogroups/termgroup.tpl:75
 msgid "Action"
 msgstr "Acción"
 
-#: plugins/admin/systems/server.tpl:43
+#: plugins/admin/systems/server.tpl:54
 msgid "Select action to execute for this server"
 msgstr "Seleccione una acción que se ejecutara en este servidor"
 
-#: plugins/admin/systems/class_terminalGeneric.inc:61
-msgid "text"
-msgstr "texto"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:62
-msgid "graphic"
-msgstr "Gráfico"
-
-#: 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_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/systems/class_workstationGeneric.inc:104
-#: 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/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_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_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Switch off"
-msgstr "Apagar"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:170
-#: plugins/admin/systems/class_servGeneric.inc:140
-#: plugins/admin/systems/class_workstationGeneric.inc:156
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Reboot"
-msgstr "Reiniciar"
-
-#: plugins/admin/systems/class_terminalGeneric.inc:172
-#: plugins/admin/systems/class_servGeneric.inc:142
-#: plugins/admin/systems/class_workstationGeneric.inc:162
-#: plugins/admin/ogroups/class_termgroup.inc:104
-msgid "Wake up"
-msgstr "Despertar"
-
-#: 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_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/printerPPDDialog.tpl:1
-#, fuzzy
-msgid "Printer driver"
-msgstr "Dispositivo de Impresión"
-
-#: plugins/admin/systems/printerPPDDialog.tpl:6
-#: plugins/admin/systems/printerPPDSelectionDialog.tpl:44
-#, fuzzy
-msgid "Select"
-msgstr "Borrar"
-
-#: plugins/admin/systems/printerPPDDialog.tpl:9
-#, fuzzy
-msgid "New driver"
-msgstr "Servidor"
-
 #: plugins/admin/systems/workstationStartup.tpl:4
 #: plugins/admin/systems/terminalStartup.tpl:1
 msgid "Boot parameters"
@@ -7812,26 +8748,16 @@ 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/workstationStartup.tpl:13
-#: plugins/admin/systems/terminalStartup.tpl:13
 msgid "Boot kernel"
 msgstr "Kernel de inicio"
 
-#: plugins/admin/systems/workstationStartup.tpl:15
-#: plugins/admin/systems/terminalStartup.tpl:15
-msgid "Enter the filename of the kernel to use"
-msgstr "Introduzca el nombre del fichero del núcleo que se usara"
-
-#: plugins/admin/systems/workstationStartup.tpl:18
-#: plugins/admin/systems/terminalStartup.tpl:18
+#: plugins/admin/systems/workstationStartup.tpl:17
+#: plugins/admin/systems/terminalStartup.tpl:17
 msgid "Custom options"
 msgstr "Otras opciones"
 
-#: plugins/admin/systems/workstationStartup.tpl:20
-#: plugins/admin/systems/terminalStartup.tpl:20
+#: plugins/admin/systems/workstationStartup.tpl:19
+#: plugins/admin/systems/terminalStartup.tpl:19
 msgid ""
 "Enter any parameters that should be passed to the kernel as append line "
 "during bootup"
@@ -7839,650 +8765,679 @@ msgstr ""
 "Introducir que parametros serán pasados a la configuración de arranque del "
 "nucleo"
 
-#: plugins/admin/systems/workstationStartup.tpl:33
+#: plugins/admin/systems/workstationStartup.tpl:22
+#: plugins/admin/systems/terminalStartup.tpl:22
+msgid "LDAP server"
+msgstr "Servidor LDAP"
+
+#: plugins/admin/systems/workstationStartup.tpl:41
+#: plugins/admin/systems/workstationStartup.tpl:71
 #, fuzzy
 msgid "FAI server"
 msgstr "Servidor LDAP"
 
-#: plugins/admin/systems/workstationStartup.tpl:50
+#: plugins/admin/systems/workstationStartup.tpl:63
+#: plugins/admin/systems/workstationStartup.tpl:95
 #, fuzzy
 msgid "Assigned FAI classes"
 msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/workstationStartup.tpl:69
-#: plugins/admin/systems/terminalStartup.tpl:49
+#: plugins/admin/systems/workstationStartup.tpl:85
+#, fuzzy
+msgid "set"
+msgstr "Borrar"
+
+#: plugins/admin/systems/workstationStartup.tpl:116
+#: plugins/admin/systems/terminalStartup.tpl:53
 msgid "Kernel modules (format: name parameters)"
 msgstr "Módulos del núcleo (formato: nombre parametros)"
 
-#: plugins/admin/systems/workstationStartup.tpl:71
-#: plugins/admin/systems/terminalStartup.tpl:51
+#: plugins/admin/systems/workstationStartup.tpl:118
+#: 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:95
-#: plugins/admin/systems/terminalStartup.tpl:75
+#: plugins/admin/systems/workstationStartup.tpl:142
+#: plugins/admin/systems/terminalStartup.tpl:79
 #, fuzzy
 msgid "Mountpoint"
 msgstr "Monitor"
 
-#: plugins/admin/systems/phone.tpl:6
-msgid "Phone name"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/class_servDNS.inc:67
+#: plugins/admin/systems/class_inventory.inc:36
+msgid "Remove DNS service"
+msgstr "Eliminar servicio DNS"
 
-#: 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_servDNS.inc:68
+#: plugins/admin/systems/class_inventory.inc:37
+msgid ""
+"This server has DNS features enabled. You can disable them by clicking below."
+msgstr ""
+"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/class_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_servDNS.inc:70
+#: plugins/admin/systems/class_inventory.inc:39
+msgid "Add DNS service"
+msgstr "Añadir servicio DNS"
 
-#: 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_servDNS.inc:71
+#: plugins/admin/systems/class_inventory.inc:40
+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/terminal.tpl:9
-msgid "Terminal template"
-msgstr "Plantilla de terminal"
+#: plugins/admin/systems/class_servDNS.inc:159
+#, fuzzy
+msgid "Reverse zone"
+msgstr "Referencias"
 
-#: plugins/admin/systems/terminal.tpl:11
-msgid "Terminal name"
-msgstr "Nombre de terminal"
+#: 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/terminal.tpl:37
-#: plugins/admin/systems/workstation.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:21
-msgid "Mode"
-msgstr "Modo"
+#: plugins/admin/systems/class_servDNS.inc:261
+#, fuzzy
+msgid "Removing DNS service failed"
+msgstr "Eliminar servicio DNS"
 
-#: plugins/admin/systems/terminal.tpl:39
-#: plugins/admin/systems/workstation.tpl:48
-msgid "Select terminal mode"
-msgstr "Seleccionar modo de terminal"
+#: plugins/admin/systems/class_servDNS.inc:282
+#, fuzzy
+msgid "Updating DNS service failed"
+msgstr "Eliminar servicio DNS"
 
-#: plugins/admin/systems/terminal.tpl:53
-msgid "Root server"
-msgstr "Servidor Raíz"
+#: plugins/admin/systems/class_servDNS.inc:291
+#, fuzzy
+msgid "Removing DNS entries failed"
+msgstr "Eliminar servicio DNS"
 
-#: 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/class_servDNS.inc:312
+#, fuzzy
+msgid "Saving DNS entries failed"
+msgstr "Cuentas UNIX"
 
-#: plugins/admin/systems/terminal.tpl:61
-msgid "Swap server"
-msgstr "Servidor de Intercambio"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#, fuzzy
+msgid "List of devices"
+msgstr "Lista de usuarios"
 
-#: plugins/admin/systems/terminal.tpl:63
-msgid "Choose NFS filesystem to place swap files on"
+#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+msgid ""
+"This dialog allows you to attach a device to your currently edited computer."
 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/glpiDeviceManagement.tpl:35
+#, fuzzy
+msgid "Display devices matching"
+msgstr "Mostrar direcciones que concuerden con"
 
-#: 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/glpiDeviceManagement.tpl:37
+#, fuzzy
+msgid "Regular expression for matching device names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/admin/systems/terminal.tpl:83
-#: plugins/admin/systems/workstation.tpl:63
-msgid "NTP server"
-msgstr "Servidor NTP"
+#: plugins/admin/systems/class_servService.inc:320
+msgid "Terminal server, must have fontpath specified."
+msgstr ""
 
-#: 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_servService.inc:379
+#, fuzzy
+msgid "Saving server service object failed"
+msgstr "Parametros Unix"
 
-#: 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_servService.inc:410
+#, fuzzy
+msgid "Creating mount container failed"
+msgstr "Grupo de objetos"
 
-#: plugins/admin/systems/class_servDHCP.inc:36
-msgid "Remove DHCP service"
-msgstr "Eliminar servicio DHCP"
+#: plugins/admin/systems/class_servService.inc:424
+#, fuzzy
+msgid "Removing mount container failed"
+msgstr "Borrar cuenta de correo"
 
-#: plugins/admin/systems/class_servDHCP.inc:37
-msgid ""
-"This server has DHCP features enabled. You can disable them by clicking "
-"below."
+#: plugins/admin/systems/class_servService.inc:436
+#, fuzzy
+msgid "Saving mount container failed"
+msgstr "Borrar cuenta de correo"
+
+#: 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 ""
-"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/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/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_glpiAccount.inc:144
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:156
-msgid "There is no server with valid glpi database service."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiAccount.inc:154
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:166
+#: plugins/admin/systems/class_glpiAccount.inc:154
 #, 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!"
 
-#: plugins/admin/systems/class_glpiAccount.inc:164
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:176
+#: plugins/admin/systems/class_glpiAccount.inc:164
 #, 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!"
 
-#: 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/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 ""
-"You can't delete this system type, it is still in use by these system(s) '%s'"
-msgstr ""
-
-#: plugins/admin/systems/class_glpiAccount.inc:323
-#, fuzzy
-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/class_glpiAccount.inc:413
-#, fuzzy
-msgid "Updating operating system failed, specifed name is already used."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
-
-#: plugins/admin/systems/class_glpiAccount.inc:564
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:199
+#: plugins/admin/systems/class_glpiAccount.inc:565
 #, fuzzy
 msgid "Remove inventory"
 msgstr "Eliminar entrada"
 
-#: plugins/admin/systems/class_glpiAccount.inc:565
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
 #, fuzzy
 msgid ""
-"This device has inventory informations enabled. You can disable them by "
-"clicking below."
+"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_glpiAccount.inc:567
 #: plugins/admin/systems/class_glpiPrinterAccount.inc:202
+#: plugins/admin/systems/class_glpiAccount.inc:568
 #, fuzzy
 msgid "Add inventory"
 msgstr "Añadir entrada"
 
-#: plugins/admin/systems/class_glpiAccount.inc:568
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
 #, fuzzy
 msgid ""
-"This device has inventory informations disabled. You can enable them by "
-"clicking below."
+"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_glpiAccount.inc:631
-#: plugins/admin/systems/class_glpiAccount.inc:645
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:609
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:623
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:288
+#: 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/class_glpiPrinterAccount.inc:278
+#, php-format
+msgid "Can't delete printer type, it is still in use by '%s'."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:611
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:626
+#: plugins/admin/systems/class_glpiAccount.inc:633
+#: plugins/admin/systems/class_glpiAccount.inc:648
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:290
 msgid "N/A"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:70
+#: plugins/admin/systems/class_glpiPrinterAccount.inc:754
+#, fuzzy
+msgid "since"
+msgstr "Arriba desde"
+
+#: plugins/admin/systems/terminal.tpl:8
+msgid "Terminal template"
+msgstr "Plantilla de terminal"
+
+#: plugins/admin/systems/terminal.tpl:10
+msgid "Terminal name"
+msgstr "Nombre de terminal"
+
+#: plugins/admin/systems/terminal.tpl:42
+#: plugins/admin/systems/workstation.tpl:47
+#: plugins/admin/ogroups/termgroup.tpl:47
+msgid "Syslog server"
+msgstr "Servidor de Logs"
+
+#: plugins/admin/systems/terminal.tpl:44
+#: plugins/admin/systems/workstation.tpl:49
+#: plugins/admin/ogroups/termgroup.tpl:49
+msgid "Choose server to use for logging"
+msgstr "Elija un servidor que será usado para registro"
+
+#: plugins/admin/systems/terminal.tpl:59
+msgid "Root server"
+msgstr "Servidor Raíz"
+
+#: plugins/admin/systems/terminal.tpl:61
+msgid "Select NFS root filesystem to use"
+msgstr "Seleccione sistema de archivos raíz 'NFS' que se usará"
+
+#: plugins/admin/systems/terminal.tpl:67
+msgid "Swap server"
+msgstr "Servidor de Intercambio"
+
+#: plugins/admin/systems/terminal.tpl:69
+msgid "Choose NFS filesystem to place swap files on"
+msgstr ""
+"Seleccione sistema de archivos 'NFS' donde estarán los archivos de "
+"intercambio"
+
+#: plugins/admin/systems/terminal.tpl:86
+#: plugins/admin/systems/workstation.tpl:65
+msgid "Inherit time server attributes"
+msgstr ""
+
+#: plugins/admin/systems/terminal.tpl:90
+#: plugins/admin/systems/workstation.tpl:69
+#: plugins/admin/ogroups/termgroup.tpl:14
+msgid "NTP server"
+msgstr "Servidor NTP"
+
+#: plugins/admin/systems/terminal.tpl:92
+#: plugins/admin/systems/workstation.tpl:71
+#: plugins/admin/ogroups/termgroup.tpl:16
+msgid "Choose server to use for synchronizing time"
+msgstr "Elija un servidor que será usado para sincronización horaria"
+
+#: plugins/admin/systems/terminal.tpl:119
+#: plugins/admin/systems/workstation.tpl:97
+#: plugins/admin/ogroups/termgroup.tpl:79
+msgid "Select action to execute for this terminal"
+msgstr "Seleccione una acción que se ejecutara en este terminal"
+
+#: plugins/admin/systems/servRepositorySetup.tpl:8
+#, fuzzy
+msgid "Parent server"
+msgstr "Servicio de impresión"
+
+#: plugins/admin/systems/servRepositorySetup.tpl:33
+#: plugins/admin/systems/class_servRepository.inc:249
+#: plugins/admin/systems/class_servRepository.inc:270
+#, fuzzy
+msgid "Sections"
+msgstr "Acción"
+
+#: 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/phone.tpl:6
+msgid "Phone name"
+msgstr "Número de teléfono"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:92
+#: plugins/admin/systems/class_servGeneric.inc:35
+#: plugins/admin/ogroups/class_termgroup.inc:38
 #, fuzzy
 msgid "Activated"
 msgstr "Privado"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:72
+#: plugins/admin/systems/class_workstationGeneric.inc:94
+#: plugins/admin/systems/class_servGeneric.inc:37
+#: plugins/admin/ogroups/class_termgroup.inc:40
 #, fuzzy
 msgid "Memory test"
 msgstr "Memoria"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:73
+#: plugins/admin/systems/class_workstationGeneric.inc:95
+#: plugins/admin/systems/class_servGeneric.inc:38
+#: plugins/admin/ogroups/class_termgroup.inc:41
 #, fuzzy
 msgid "System analysis"
 msgstr "Registro del sistema"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:100
+#: plugins/admin/systems/class_workstationGeneric.inc:132
+#: plugins/admin/systems/class_servGeneric.inc:69
+#: plugins/admin/ogroups/class_termgroup.inc:154
 #, 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/class_workstationGeneric.inc:114
+#: plugins/admin/systems/class_workstationGeneric.inc:136
+#: plugins/admin/systems/class_terminalGeneric.inc:132
+#: plugins/admin/systems/class_terminalGeneric.inc:144
+#: plugins/admin/systems/class_terminalGeneric.inc:156
+#: plugins/admin/systems/class_servGeneric.inc:73
+#: plugins/admin/ogroups/class_termgroup.inc:158
+#, php-format
+msgid "Execution of '%s' failed!"
+msgstr "¡La ejecución de '%s' ha fallado!"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:146
 msgid "This 'dn' has no workstation features."
 msgstr "Esta 'dn' no tiene características de estación de trabajo."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:157
+#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_terminalGeneric.inc:223
+#: plugins/admin/systems/class_servGeneric.inc:125
+#: plugins/admin/ogroups/class_termgroup.inc:204
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Switch off"
+msgstr "Apagar"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:201
+#: plugins/admin/systems/class_terminalGeneric.inc:223
+#: plugins/admin/systems/class_servGeneric.inc:125
+#: plugins/admin/ogroups/class_termgroup.inc:205
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Reboot"
+msgstr "Reiniciar"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:202
+#: plugins/admin/systems/class_servGeneric.inc:126
+#: plugins/admin/ogroups/class_termgroup.inc:206
 #, fuzzy
 msgid "Instant update"
 msgstr "Crear cuenta telefónica"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:158
-#: plugins/admin/systems/class_workstationGeneric.inc:164
+#: plugins/admin/systems/class_workstationGeneric.inc:203
+#: plugins/admin/systems/class_workstationGeneric.inc:209
+#: plugins/admin/systems/class_servGeneric.inc:127
+#: plugins/admin/systems/class_servGeneric.inc:133
+#: plugins/admin/ogroups/class_termgroup.inc:207
 #, fuzzy
 msgid "Scheduled update"
 msgstr "Plantilla seleccionada"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:159
-#: plugins/admin/systems/class_workstationGeneric.inc:163
+#: plugins/admin/systems/class_workstationGeneric.inc:204
+#: plugins/admin/systems/class_workstationGeneric.inc:208
+#: plugins/admin/systems/class_servGeneric.inc:128
+#: plugins/admin/systems/class_servGeneric.inc:132
+#: plugins/admin/ogroups/class_termgroup.inc:208
 msgid "Reinstall"
 msgstr ""
 
-#: plugins/admin/systems/class_workstationGeneric.inc:160
+#: plugins/admin/systems/class_workstationGeneric.inc:205
+#: plugins/admin/systems/class_servGeneric.inc:129
+#: plugins/admin/ogroups/class_termgroup.inc:209
 #, fuzzy
 msgid "Rescan hardware"
 msgstr "Componente telefónico"
 
-#: plugins/admin/systems/class_workstationGeneric.inc:228
+#: plugins/admin/systems/class_workstationGeneric.inc:207
+#: plugins/admin/systems/class_terminalGeneric.inc:225
+#: plugins/admin/systems/class_servGeneric.inc:131
+#: plugins/admin/ogroups/class_termgroup.inc:213
+msgid "Wake up"
+msgstr "Despertar"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:237
+#, fuzzy
+msgid "Removing workstation failed"
+msgstr "Borrar aplicaciones"
+
+#: plugins/admin/systems/class_workstationGeneric.inc:288
+#: plugins/admin/ogroups/class_termgroup.inc:106
 msgid "You have no permissions to create a workstation on this 'Base'."
 msgstr "No tiene permisos para crear una estación de trabajo en esta 'Base'."
 
-#: plugins/admin/systems/class_workstationGeneric.inc:232
+#: plugins/admin/systems/class_workstationGeneric.inc:292
 msgid "The required field 'Workstation name' is not set."
 msgstr ""
 " El campo requerido 'Nombre de la estación de trabajo' no ha sido rellenado."
 
-#: plugins/admin/systems/class_systemManagement.inc:32
-msgid "Systems"
-msgstr "Sistemas"
+#: plugins/admin/systems/class_workstationGeneric.inc:305
+#: plugins/admin/systems/class_componentGeneric.inc:165
+#: plugins/admin/systems/class_winGeneric.inc:174
+#: plugins/admin/systems/class_terminalGeneric.inc:352
+#: plugins/admin/systems/class_servGeneric.inc:202
+#: plugins/admin/systems/class_phoneGeneric.inc:312
+#: plugins/admin/systems/class_printGeneric.inc:618
+#, 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_systemManagement.inc:429
-msgid "You can't edit this object type yet!"
-msgstr "¡No puede editar este tipo de objeto todavía!"
+#: plugins/admin/systems/class_workstationGeneric.inc:315
+#: plugins/admin/systems/class_terminalGeneric.inc:362
+msgid ""
+"There must be at least one NTP server selected, or the inherit mode "
+"activated."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:455
-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_workstationGeneric.inc:382
+#: plugins/admin/systems/class_workstationGeneric.inc:400
+#: plugins/admin/ogroups/class_termgroup.inc:290
+#, fuzzy
+msgid "Saving workstation failed"
+msgstr "Nombre de la aplicación"
 
-#: plugins/admin/systems/class_systemManagement.inc:472
-msgid "You are not allowed to set this systems password!"
-msgstr "¡No tiene permisos para cambiar contraseñas de sistema!"
+#: 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/class_systemManagement.inc:526
+#: plugins/admin/systems/class_servDB.inc:152
 #, 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'."
+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_systemManagement.inc:761
-#, fuzzy
-msgid "New Terminal template"
-msgstr "Plantilla de terminal"
+#: 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/class_servDB.inc:167
+#, fuzzy, php-format
+msgid "The specified kerberos password is empty."
+msgstr "El archivo especificado está vacío."
+
+#: 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/class_systemManagement.inc:761
-#: plugins/admin/systems/class_systemManagement.inc:925
+#: plugins/admin/systems/class_servDB.inc:245
 #, fuzzy
-msgid "New Terminal"
-msgstr "Nuevo terminal"
+msgid "Saving server db settings failed"
+msgstr "Parametros del correo de usuarios"
 
-#: plugins/admin/systems/class_systemManagement.inc:763
+#: plugins/admin/systems/servdns.tpl:1
 #, fuzzy
-msgid "New Workstation template"
+msgid "Zones"
+msgstr "teléfonos"
+
+#: plugins/admin/systems/workstation.tpl:8
+msgid "Workstation template"
 msgstr "Plantilla de estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:763
-#: plugins/admin/systems/class_systemManagement.inc:926
-#, fuzzy
-msgid "New Workstation"
-msgstr "Nueva estación de trabajo"
+#: plugins/admin/systems/workstation.tpl:10
+msgid "Workstation name"
+msgstr "Nombre de la estación de trabajo"
 
-#: plugins/admin/systems/class_systemManagement.inc:764
-#: plugins/admin/systems/class_systemManagement.inc:765
-#, fuzzy
-msgid "New Server"
-msgstr "Servidor"
+#: plugins/admin/systems/class_servNfs.inc:46
+msgid ""
+"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:766
-#: plugins/admin/systems/class_systemManagement.inc:767
+#: plugins/admin/systems/class_servNfs.inc:49
 #, fuzzy
-msgid "New Printer"
-msgstr "Impresora"
+msgid "Can't read '/etc/gosa/encodings', please check permissions."
+msgstr "Borrar"
 
-#: plugins/admin/systems/class_systemManagement.inc:768
-#: plugins/admin/systems/class_systemManagement.inc:769
+#: plugins/admin/systems/class_servNfs.inc:179
 #, fuzzy
-msgid "New Phone"
-msgstr "Teléfono"
+msgid "Please specify a valid path for your setup."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_systemManagement.inc:770
-#: plugins/admin/systems/class_systemManagement.inc:771
+#: plugins/admin/systems/class_servNfs.inc:185
 #, fuzzy
-msgid "New Component"
-msgstr "Otros componentes de red"
+msgid "Please specify a valid name for your share."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_systemManagement.inc:781
+#: plugins/admin/systems/class_servNfs.inc:188
 #, fuzzy
-msgid "Edit system"
-msgstr "Lista de sistemas"
+msgid "Please specify a name for your share."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_systemManagement.inc:782
+#: plugins/admin/systems/class_servNfs.inc:193
 #, fuzzy
-msgid "Delete system"
-msgstr "Borrar"
+msgid "Description contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/admin/systems/class_systemManagement.inc:792
+#: plugins/admin/systems/class_servNfs.inc:197
 #, fuzzy
-msgid "System"
-msgstr "Sistemas"
+msgid "Volume contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/admin/systems/class_systemManagement.inc:830
+#: plugins/admin/systems/class_servNfs.inc:201
 #, fuzzy
-msgid "Cups Server"
-msgstr "Servidor"
-
-#: plugins/admin/systems/class_systemManagement.inc:831
-msgid "Log Db"
-msgstr ""
+msgid "Path contains invalid characters."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/admin/systems/class_systemManagement.inc:832
+#: plugins/admin/systems/class_servNfs.inc:205
 #, fuzzy
-msgid "Syslog Server"
-msgstr "Servidor de Logs"
-
-#: plugins/admin/systems/class_systemManagement.inc:833
-#, fuzzy
-msgid "Mail Server"
-msgstr "Servidor"
-
-#: plugins/admin/systems/class_systemManagement.inc:834
-#, fuzzy
-msgid "Imap Server"
-msgstr "Servidor de Intercambio"
-
-#: plugins/admin/systems/class_systemManagement.inc:835
-#, fuzzy
-msgid "Nfs Server"
-msgstr "Servidor"
+msgid "Option contains invalid characters."
+msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
 
-#: plugins/admin/systems/class_systemManagement.inc:836
+#: plugins/admin/systems/class_servDNSeditZone.inc:351
 #, fuzzy
-msgid "Kerberos Server"
-msgstr "Kerberos"
+msgid "This zoneName is already in use"
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/class_systemManagement.inc:837
+#: plugins/admin/systems/class_servDNSeditZone.inc:354
 #, fuzzy
-msgid "Asterisk Server"
-msgstr "Base de datos de usuarios Asterisk"
+msgid "This reverse zone is already in use"
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/class_systemManagement.inc:838
-#, fuzzy
-msgid "Fax Server"
-msgstr "Servidor"
+#: plugins/admin/systems/class_servDNSeditZone.inc:359
+#, fuzzy, php-format
+msgid "Please choose a valid zone name."
+msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/admin/systems/class_systemManagement.inc:839
-#, fuzzy
-msgid "Ldap Server"
-msgstr "Servidor de Intercambio"
+#: plugins/admin/systems/class_servDNSeditZone.inc:363
+#, fuzzy, php-format
+msgid "Please choose a valid reverse zone name."
+msgstr "Por favor especifique un rango VSync valido"
 
-#: plugins/admin/systems/class_systemManagement.inc:872
-#, fuzzy
-msgid "Set root password"
-msgstr "Poner Contraseña"
+#: plugins/admin/systems/class_servDNSeditZone.inc:367
+msgid "Primary dns server must end with '.' to be a valid entry."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:917
-#, fuzzy
-msgid "New System from incoming"
-msgstr "Información de sistema"
+#: plugins/admin/systems/class_servDNSeditZone.inc:371
+msgid "Your specified mail address must end with '.' to be a valid record."
+msgstr ""
 
-#: 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/class_servDNSeditZone.inc:375
+#: plugins/admin/systems/class_servDNSeditZone.inc:379
+msgid ""
+"Your mail address contains '@' replace this with '.' to enable GOsa to "
+"create a valid SOA record."
+msgstr ""
 
-#: 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/class_servDNSeditZone.inc:383
+msgid "Only lowercase strings are allowed as zone name."
+msgstr ""
 
-#: plugins/admin/systems/class_systemManagement.inc:923
+#: plugins/admin/systems/class_servDNSeditZone.inc:387
 #, fuzzy
-msgid "Winstation"
-msgstr "Estación de trabajo"
+msgid "Please specify a numeric value for serial number."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_systemManagement.inc:924
+#: plugins/admin/systems/class_servDNSeditZone.inc:391
 #, fuzzy
-msgid "Network Device"
-msgstr "Dispositivos de Red"
-
-#: plugins/admin/systems/class_systemManagement.inc:1147
-msgid "New terminal"
-msgstr "Nuevo terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:1149
-msgid "New workstation"
-msgstr "Nueva estación de trabajo"
+msgid "Please specify a numeric value for refresh."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_systemManagement.inc:1151
+#: plugins/admin/systems/class_servDNSeditZone.inc:395
 #, fuzzy
-msgid "New Device"
-msgstr "Dispositivos de Red"
+msgid "Please specify a numeric value for ttl."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/class_systemManagement.inc:1168
+#: plugins/admin/systems/class_servDNSeditZone.inc:399
 #, fuzzy
-msgid "Terminal template for"
-msgstr "Plantilla de terminal"
-
-#: plugins/admin/systems/class_systemManagement.inc:1180
-msgid "Workstation template for"
-msgstr "Plantilla de estación de trabajo para"
+msgid "Please specify a numeric value for expire."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/printer.tpl:6
+#: plugins/admin/systems/class_servDNSeditZone.inc:403
 #, fuzzy
-msgid "General"
-msgstr "Genérico"
-
-#: plugins/admin/systems/printer.tpl:9
-msgid "Printer name"
-msgstr "Nombre de la impresora"
+msgid "Please specify a numeric value for retry."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/printer.tpl:31
-msgid "Details"
+#: plugins/admin/systems/class_servDNSeditZone.inc:409
+#: plugins/admin/systems/class_termDNS.inc:365
+#, php-format
+msgid "Only lowercase is allowed, please check your '%ss'."
 msgstr ""
 
-#: plugins/admin/systems/printer.tpl:34
-#, fuzzy
-msgid "Printer location"
-msgstr "Configuración telefónica"
-
-#: plugins/admin/systems/printer.tpl:38
-msgid "Printer URL"
-msgstr "URL de la impresora"
-
-#: plugins/admin/systems/printer.tpl:58
-#, fuzzy
-msgid "Permissions"
-msgstr "Miembro con Permisos"
-
-#: 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/printer.tpl:69 plugins/admin/systems/printer.tpl:85
-#, fuzzy
-msgid "Add user"
-msgstr "Usuario administrador"
-
-#: plugins/admin/systems/printer.tpl:70 plugins/admin/systems/printer.tpl:86
-#, fuzzy
-msgid "Add group"
-msgstr "grupos"
-
-#: 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/class_servKolab.inc:94
+#, 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/printer.tpl:82
-#, fuzzy
-msgid "Admins"
-msgstr "DN del administrador"
+#: plugins/admin/systems/class_servKolab.inc:100
+#, 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/class_servDNS.inc:67
-#: plugins/admin/systems/class_inventory.inc:36
-msgid "Remove DNS service"
-msgstr "Eliminar servicio DNS"
+#: plugins/admin/systems/class_servKolab.inc:115
+msgid "Remove Kolab extension"
+msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/class_servDNS.inc:68
-#: plugins/admin/systems/class_inventory.inc:37
+#: plugins/admin/systems/class_servKolab.inc:115
 msgid ""
-"This server has DNS features enabled. You can disable them by clicking below."
+"This server has kolab features enabled. You can disable them by clicking "
+"below."
 msgstr ""
-"Esta servidor tiene la extensión DNS activada. Puede desactivarla pulsando "
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servDNS.inc:70
-#: plugins/admin/systems/class_inventory.inc:39
-msgid "Add DNS service"
-msgstr "Añadir servicio DNS"
+#: plugins/admin/systems/class_servKolab.inc:118
+msgid "Add Kolab service"
+msgstr "Añadir el servicio Kolab"
 
-#: plugins/admin/systems/class_servDNS.inc:71
-#: plugins/admin/systems/class_inventory.inc:40
+#: plugins/admin/systems/class_servKolab.inc:118
 msgid ""
-"This server has DNS features disabled. You can enable them by clicking below."
+"This server has kolab features disabled. You can enable them by clicking "
+"below."
 msgstr ""
-"Este servidor tiene la extensión DNS desactivada. Puede activarla pulsando "
+"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
 "aquí."
 
-#: plugins/admin/systems/class_servDNS.inc:159
+#: plugins/admin/systems/class_servKolab.inc:199
 #, fuzzy
-msgid "Reverse zone"
-msgstr "Referencias"
-
-#: 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_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_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_servDB.inc:155
-msgid "The sieve port needs to be numeric."
-msgstr "El puerto sieve necesita ser un numero."
-
-#: 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_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'."
+msgid "Removing kolab host entry failed"
+msgstr "Enseñar las entradas de la libreta de direcciones"
 
-#: plugins/admin/systems/servdns.tpl:1
+#: plugins/admin/systems/class_servKolab.inc:215
 #, fuzzy
-msgid "Zones"
-msgstr "teléfonos"
-
-#: plugins/admin/systems/workstation.tpl:9
-msgid "Workstation template"
-msgstr "Plantilla de estación de trabajo"
+msgid "Removing server from kolab object failed"
+msgstr "Eliminar cuenta telefónica"
 
-#: plugins/admin/systems/workstation.tpl:11
-msgid "Workstation name"
-msgstr "Nombre de la estación de trabajo"
+#: plugins/admin/systems/class_servKolab.inc:254
+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_servNfs.inc:35
-msgid ""
-"The file '/etc/gosa/encodings' does not exist, can't get supported charsets."
+#: plugins/admin/systems/class_servKolab.inc:256
+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/class_servNfs.inc:38
-#, fuzzy
-msgid "Can't read '/etc/gosa/encodings', please check permissions."
-msgstr "Borrar"
-
-#: plugins/admin/systems/class_servNfs.inc:125
-#, fuzzy
-msgid "Please specify a valid path for your setup."
-msgstr "Por favor especifique un usuario valido."
-
-#: plugins/admin/systems/class_servNfs.inc:131
-#, fuzzy
-msgid "Please specify a valid name for your setup."
-msgstr "Por favor especifique un usuario valido."
+#: plugins/admin/systems/class_servKolab.inc:260
+msgid "The given Quota settings value must be a number."
+msgstr "El valor introducido como cuota debe ser un número."
 
-#: plugins/admin/systems/class_servNfs.inc:134
-#, fuzzy
-msgid "Please specify a name for your setup."
-msgstr "Por favor especifique un usuario valido."
+#: plugins/admin/systems/class_servKolab.inc:262
+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/class_servNfs.inc:139
-#, fuzzy
-msgid "Description contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+#: plugins/admin/systems/class_servKolab.inc:264
+msgid "Future days must be a value."
+msgstr "Días futuros debe ser un valor"
 
-#: plugins/admin/systems/class_servNfs.inc:143
-#, fuzzy
-msgid "Path contains invalid characters."
-msgstr "El campo 'Nombre' contiene caracteres no validos."
+#: plugins/admin/systems/class_servKolab.inc:268
+msgid "No SMTP privileged networks set."
+msgstr "No se han indicado redes privilegiadas SMTP."
 
-#: plugins/admin/systems/class_servNfs.inc:147
+#: plugins/admin/systems/class_servKolab.inc:340
 #, fuzzy
-msgid "Option contains invalid characters."
-msgstr "¡El tiempo de expiración '%s' contiene caracteres no validos!"
+msgid "Saving server to kolab object failed"
+msgstr "Cuenta Kolab"
 
 #: plugins/admin/systems/servdb.tpl:6
 msgid "Kerberos kadmin access"
@@ -8554,838 +9509,680 @@ msgstr "Base de datos de FAX"
 msgid "Database"
 msgstr "Bases de datos"
 
-#: plugins/admin/systems/servnfs.tpl:1
-#, fuzzy
-msgid "Edit share"
-msgstr "Usuario administrador"
+#: plugins/admin/systems/terminalService.tpl:141
+msgid "Remote desktop"
+msgstr "Escritorio remoto"
 
-#: plugins/admin/systems/servnfs.tpl:2
-msgid "NFS setup"
-msgstr ""
+#: plugins/admin/systems/terminalService.tpl:145
+msgid "Connect method"
+msgstr "Método de conexión"
 
-#: plugins/admin/systems/servnfs.tpl:25
-msgid "Path"
-msgstr ""
+#: 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/servnfs.tpl:49
-#, fuzzy
-msgid "Codepage"
-msgstr "Página Web Principal"
-
-#: plugins/admin/systems/servnfs.tpl:59
-#, fuzzy
-msgid "Option"
-msgstr "Opciones"
+#: plugins/admin/systems/terminalService.tpl:154
+msgid "Terminal server"
+msgstr "Servidor de terminal"
 
-#: plugins/admin/systems/class_servKolab.inc:115
-msgid "Remove Kolab extension"
-msgstr "Eliminar extensión Kolab"
+#: 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/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/terminalService.tpl:163
+msgid "Font server"
+msgstr "Servidor de fuentes"
 
-#: plugins/admin/systems/class_servKolab.inc:118
-msgid "Add Kolab service"
-msgstr "Añadir el servicio Kolab"
+#: 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/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/terminalService.tpl:181
+msgid "Print device"
+msgstr "Dispositivo de Impresión"
 
-#: plugins/admin/systems/class_servKolab.inc:146
-#, php-format
-msgid "Include data from %s days in the past when creating free/busy lists"
+#: plugins/admin/systems/terminalService.tpl:182
+msgid "Select to start IPP based printing service on terminal"
 msgstr ""
-"Incluye información desde hace '%s' días cuando cree listas de presencia"
+"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
+"terminal"
 
-#: 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/terminalService.tpl:183
+msgid "Provide print services"
+msgstr "Proveer servicios de impresión"
 
-#: 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/terminalService.tpl:189
+msgid "Spool server"
+msgstr "Servidor de Cola"
 
-#: plugins/admin/systems/class_servKolab.inc:229
-msgid "Future days in Free/Busy settings must be a positive value."
+#: plugins/admin/systems/terminalService.tpl:191
+msgid "Select NFS filesystem to place spool files on"
 msgstr ""
-"Días futuros en la configuración de presencia debe ser un número positivo."
+"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
 
-#: 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/terminalService.tpl:212
+msgid "Select scanner driver to use"
+msgstr "Seleccione que controladores de escáner se usaran"
 
-#: plugins/admin/systems/class_servKolab.inc:235
-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/servservice.tpl:37
+msgid "Time Service"
+msgstr "Servicio de Hora"
 
-#: 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/servservice.tpl:61
+msgid "LDAP Service"
+msgstr "Servicio LDAP"
 
-#: plugins/admin/systems/class_servKolab.inc:241
-msgid "No SMTP privileged networks set."
-msgstr "No se han indicado redes privilegiadas SMTP."
+#: plugins/admin/systems/servservice.tpl:70
+msgid "Terminal Service"
+msgstr "Servidor de terminal"
 
-#: 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/servservice.tpl:75
+msgid "Temporary disable login"
+msgstr "Desactivación temporal del acceso"
 
-#: plugins/admin/systems/class_printGeneric.inc:178
-msgid "This is a workstation template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/servservice.tpl:78
+msgid "Font path"
+msgstr "Ruta a las fuentes tipográficas"
 
-#: plugins/admin/systems/class_printGeneric.inc:185
-msgid "This is a terminal template, printer tab is disabled."
-msgstr ""
+#: plugins/admin/systems/servservice.tpl:91
+msgid "Syslog Service"
+msgstr "Servicio de Logs"
 
-#: 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"
-msgstr ""
-"Este servidor tiene la extensión Kolab desactivada. Puede activarla pulsando "
-"aquí."
+#: plugins/admin/systems/servservice.tpl:99
+msgid "Print Service"
+msgstr "Servicio de impresión"
 
-#: plugins/admin/systems/class_printGeneric.inc:232
-#: plugins/admin/systems/class_printGeneric.inc:235
+#: plugins/admin/systems/servservice.tpl:107
 #, fuzzy
-msgid "Remove printer extension"
-msgstr "Eliminar extensión Kolab"
+msgid "Mail server"
+msgstr "Servidor"
 
-#: plugins/admin/systems/class_printGeneric.inc:233
-#, fuzzy
-msgid ""
-"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/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_printGeneric.inc:236
+#: plugins/admin/systems/class_componentGeneric.inc:101
 #, 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í."
+msgid "Removing generic component failed"
+msgstr "Mostrar departamentos"
 
-#: plugins/admin/systems/class_printGeneric.inc:241
+#: plugins/admin/systems/class_componentGeneric.inc:139
 #, 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 "The required field 'Component name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
 
-#: plugins/admin/systems/class_printGeneric.inc:244
+#: plugins/admin/systems/class_componentGeneric.inc:144
+#: plugins/admin/systems/class_phoneGeneric.inc:284
 #, 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í."
+msgid "The required field IP address is empty."
+msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/admin/systems/class_printGeneric.inc:283
-msgid "This 'dn' has no printer features."
-msgstr "Esta 'dn' no tiene características de impresora."
+#: plugins/admin/systems/class_componentGeneric.inc:147
+#: plugins/admin/systems/class_phoneGeneric.inc:287
+#, fuzzy
+msgid "The field IP address contains an invalid address."
+msgstr "El campo 'Nombre' contiene caracteres no validos."
 
-#: plugins/admin/systems/class_printGeneric.inc:419
-#, php-format
-msgid "Your currently selected PPD file '%s' doesn't exist."
-msgstr ""
+#: plugins/admin/systems/class_componentGeneric.inc:155
+#: 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_printGeneric.inc:427
+#: plugins/admin/systems/class_componentGeneric.inc:223
 #, fuzzy
-msgid "can't get ppd informations."
-msgstr "Información de sistema"
-
-#: plugins/admin/systems/class_printGeneric.inc:439
-#, php-format
-msgid "This printer belongs to terminal %s. You can't rename this printer."
-msgstr ""
+msgid "Saving generic component failed"
+msgstr "Mostrar departamentos"
 
-#: 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/servkolab.tpl:9
+#, fuzzy
+msgid "Postfix mydomain"
+msgstr "en dominio"
 
-#: 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/servkolab.tpl:16
+#, fuzzy
+msgid "Postfix mydestination"
+msgstr "Parametros Unix"
 
-#: plugins/admin/systems/servkolab.tpl:14
+#: plugins/admin/systems/servkolab.tpl:33
 msgid "POP3 service"
 msgstr "Servicio POP3"
 
-#: plugins/admin/systems/servkolab.tpl:22
+#: plugins/admin/systems/servkolab.tpl:41
 msgid "POP3/SSL service"
 msgstr "Servicio POP3/SSL"
 
-#: plugins/admin/systems/servkolab.tpl:30
+#: plugins/admin/systems/servkolab.tpl:49
 msgid "IMAP service"
 msgstr "Servicio IMAP"
 
-#: plugins/admin/systems/servkolab.tpl:38
+#: plugins/admin/systems/servkolab.tpl:57
 msgid "IMAP/SSL service"
 msgstr "Servicio IMAP/SSL"
 
-#: plugins/admin/systems/servkolab.tpl:46
+#: plugins/admin/systems/servkolab.tpl:65
 msgid "Sieve service"
 msgstr "Servicio Sieve"
 
-#: plugins/admin/systems/servkolab.tpl:54
+#: plugins/admin/systems/servkolab.tpl:73
 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/servkolab.tpl:62
+#: plugins/admin/systems/servkolab.tpl:81
 msgid "HTTP FreeBusy service (legacy)"
 msgstr "Servicio de presencia HTTP (propio)"
 
-#: plugins/admin/systems/servkolab.tpl:70
+#: plugins/admin/systems/servkolab.tpl:89
 msgid "Amavis email scanning (virus/spam)"
 msgstr "Desinfectado de correo Amavis (virus/spam)"
 
-#: plugins/admin/systems/servkolab.tpl:81
+#: plugins/admin/systems/servkolab.tpl:100
 msgid "Quota settings"
 msgstr "Parámetros de quotas"
 
-#: plugins/admin/systems/servkolab.tpl:97
+#: plugins/admin/systems/servkolab.tpl:116
 msgid "Free/Busy settings"
 msgstr "Parámetros de Presencia"
 
-#: plugins/admin/systems/servkolab.tpl:102
+#: plugins/admin/systems/servkolab.tpl:121
 msgid "Allow unauthenticated downloading of Free/Busy information"
 msgstr "Permite descarga no autentificada de información de presencia."
 
-#: plugins/admin/systems/servkolab.tpl:117
+#: plugins/admin/systems/servkolab.tpl:136
 msgid "SMTP privileged networks"
 msgstr "Redes privilegiadas SMTP"
 
-#: plugins/admin/systems/servkolab.tpl:122
+#: plugins/admin/systems/servkolab.tpl:141
 msgid "Hosts/networks allowed to relay"
 msgstr "Equipos/Redes que son permitidos para hacer relay"
 
-#: plugins/admin/systems/servkolab.tpl:125
+#: plugins/admin/systems/servkolab.tpl:144
 msgid "Enter multiple values, seperated with"
 msgstr ""
 
-#: plugins/admin/systems/servkolab.tpl:138
+#: plugins/admin/systems/servkolab.tpl:157
 msgid "SMTP smarthost/relayhost"
 msgstr "SMTP smarthost/relayhos"
 
-#: plugins/admin/systems/servkolab.tpl:144
+#: plugins/admin/systems/servkolab.tpl:163
 msgid "Enable MX lookup for relayhost"
 msgstr "Permitir búsquedas MX para los relayhost"
 
-#: plugins/admin/systems/servkolab.tpl:149
+#: plugins/admin/systems/servkolab.tpl:168
 msgid "Host used to relay mails"
 msgstr "Equipo usado para reenviar correos"
 
-#: plugins/admin/systems/servkolab.tpl:163
+#: plugins/admin/systems/servkolab.tpl:182
 msgid "Accept Internet Mail"
 msgstr "Aceptar correo desde internet"
 
-#: plugins/admin/systems/servkolab.tpl:169
+#: plugins/admin/systems/servkolab.tpl:188
 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/phonesettings.tpl:1
-#, fuzzy
-msgid "Advanced phone settings"
-msgstr "Configuración telefónica"
-
-#: plugins/admin/systems/phonesettings.tpl:6
-#, fuzzy
-msgid "Phone type"
-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
-#, fuzzy
-msgid "Choose a phone type"
-msgstr "Elija tipo de ratón"
+#: 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/phonesettings.tpl:10
-msgid "refresh"
+#: 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/phonesettings.tpl:32
+#: plugins/admin/systems/SelectDeviceType.tpl:21
 #, fuzzy
-msgid "DTMF mode"
-msgstr "Modo"
+msgid "Choose a system type"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/phonesettings.tpl:46
-#: plugins/admin/systems/phonesettings.tpl:85
+#: plugins/admin/systems/SelectDeviceType.tpl:32
 #, fuzzy
-msgid "Default IP"
-msgstr "por defecto"
-
-#: plugins/admin/systems/phonesettings.tpl:56
-#: plugins/admin/systems/phonesettings.tpl:93
-msgid "Response timeout"
-msgstr ""
+msgid "Choose an object group as template"
+msgstr "Grupo de objetos"
 
-#: plugins/admin/systems/phonesettings.tpl:75
+#: plugins/admin/systems/SelectDeviceType.tpl:33
 #, fuzzy
-msgid "Modus"
-msgstr "Ratón"
+msgid "Choose an object group"
+msgstr "Grupo de objetos"
 
-#: plugins/admin/systems/phonesettings.tpl:106
-msgid "Authtype"
+#: plugins/admin/systems/glpi_edit_os.tpl:1
+msgid "Manage OS-types"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:116
-#, fuzzy
-msgid "Secret"
-msgstr "Calle"
+#: 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/phonesettings.tpl:124
-msgid "GoFonInkeys"
+#: 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/phonesettings.tpl:132
-msgid "GoFonOutKeys"
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
+msgid "Cartridges"
 msgstr ""
 
-#: plugins/admin/systems/phonesettings.tpl:145
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid "Account code"
-msgstr "Cuenta"
+msgid "New monitor"
+msgstr "Nueva contraseña"
 
-#: plugins/admin/systems/phonesettings.tpl:153
-#, fuzzy
-msgid "Trunk lines"
-msgstr "Clientes Ligeros"
-
-#: plugins/admin/systems/phonesettings.tpl:168
+#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
 #, fuzzy
-msgid "Hosts that are allowed to connect"
-msgstr "Equipos/Redes que son permitidos para hacer relay"
+msgid "M"
+msgstr "Mb"
 
-#: plugins/admin/systems/phonesettings.tpl:183
+#: plugins/admin/systems/class_baseSelectDialog.inc:23
 #, fuzzy
-msgid "Hosts that are not allowed to connect"
-msgstr "¡No tiene permisos para eliminar este componente!"
+msgid "Choose a base"
+msgstr "Elija tipo de ratón"
 
-#: plugins/admin/systems/phonesettings.tpl:205
-msgid "MSN"
+#: 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/wingeneric.tpl:6
-msgid "Machine name"
-msgstr "Nombre de la maquina"
-
-#: plugins/admin/systems/terminalService.tpl:141
-msgid "Remote desktop"
-msgstr "Escritorio remoto"
-
-#: plugins/admin/systems/terminalService.tpl:145
-msgid "Connect method"
-msgstr "Método de conexión"
-
-#: 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/terminalService.tpl:154
-msgid "Terminal server"
-msgstr "Servidor de terminal"
-
-#: 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/terminalService.tpl:163
-msgid "Font server"
-msgstr "Servidor de fuentes"
-
-#: 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/terminalService.tpl:181
-msgid "Print device"
-msgstr "Dispositivo de Impresión"
-
-#: plugins/admin/systems/terminalService.tpl:182
-msgid "Select to start IPP based printing service on terminal"
+#: plugins/admin/systems/class_baseSelectDialog.inc:51
+msgid "Filter entries with this syntax"
 msgstr ""
-"Seleccione para iniciar el servicio de impresión basado en 'IPP' en el "
-"terminal"
 
-#: plugins/admin/systems/terminalService.tpl:183
-msgid "Provide print services"
-msgstr "Proveer servicios de impresión"
-
-#: plugins/admin/systems/terminalService.tpl:189
-msgid "Spool server"
-msgstr "Servidor de Cola"
+#: plugins/admin/systems/class_baseSelectDialog.inc:115
+#, fuzzy, php-format
+msgid "Select this base"
+msgstr "Borrar"
 
-#: plugins/admin/systems/terminalService.tpl:191
-msgid "Select NFS filesystem to place spool files on"
+#: 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 ""
-"Seleccione un sistema de archivos 'NFS' para colocar los ficheros de la cola"
-
-#: plugins/admin/systems/terminalService.tpl:212
-msgid "Select scanner driver to use"
-msgstr "Seleccione que controladores de escáner se usaran"
 
-#: 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_glpiAccount.inc:292
+msgid "Adding new sytem type failed, this system type name is already used."
 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/headpage.tpl:6
-msgid "List of systems"
-msgstr "Lista de sistemas"
-
-#: plugins/admin/systems/headpage.tpl:24
+#: plugins/admin/systems/class_glpiAccount.inc:312
+#, php-format
 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."
+"You can't delete this system type, it is still in use by these system(s) '%s'"
 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/headpage.tpl:38
-#: plugins/admin/ogroups/ogroup_objects.tpl:31
-msgid "Show servers"
-msgstr "Mostrar servidores"
-
-#: plugins/admin/systems/headpage.tpl:39
-msgid "Select to see Linux terminals"
-msgstr "Seleccione para ver los terminales Linux"
-
-#: plugins/admin/systems/headpage.tpl:39
-#: plugins/admin/ogroups/ogroup_objects.tpl:33
-msgid "Show terminals"
-msgstr "Mostrar terminales"
-
-#: plugins/admin/systems/headpage.tpl:40
-msgid "Select to see Linux workstations"
-msgstr "Seleccione para ver las estaciones de trabajo Linux"
-
-#: plugins/admin/systems/headpage.tpl:40
-#: plugins/admin/ogroups/ogroup_objects.tpl:32
-msgid "Show workstations"
-msgstr "Mostrar estaciones de trabajo"
-
-#: 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/headpage.tpl:41
-msgid "Show windows based workstations"
-msgstr "Mostrara estaciones de trabajo basadas en windows"
-
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Select to see network printers"
-msgstr "Seleccione para ver impresoras de red"
-
-#: plugins/admin/systems/headpage.tpl:42
-msgid "Show network printers"
-msgstr "Mostrar impresoras de red"
-
-#: plugins/admin/systems/headpage.tpl:43
-msgid "Select to see VOIP phones"
-msgstr "Seleccione para ver teléfonos VOIP"
-
-#: plugins/admin/systems/headpage.tpl:43
-#: plugins/admin/ogroups/ogroup_objects.tpl:35
-msgid "Show phones"
-msgstr "Mostrar teléfonos"
-
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Select to see network devices"
-msgstr "Seleccione para ver los dispositivos de red"
-
-#: plugins/admin/systems/headpage.tpl:44
-msgid "Show network devices"
-msgstr "Mostrar dispositivos 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/headpage.tpl:59
+#: plugins/admin/systems/class_glpiAccount.inc:323
 #, fuzzy
-msgid "Display systems of user"
-msgstr "Mostrar direcciones del usuario"
-
-#: 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 "
+msgid "Rename failed, this system type name is already used."
+msgstr "El nombre especificado ya esta siendo usado"
 
-#: plugins/admin/systems/class_componentGeneric.inc:138
+#: plugins/admin/systems/class_glpiAccount.inc:379
 #, fuzzy
-msgid "The required field 'Component name' is not set."
-msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
-
-#: plugins/admin/systems/terminalStartup.tpl:31
-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/terminalStartup.tpl:32
-msgid "use graphical bootup"
-msgstr "Usar arranque gráfico"
-
-#: plugins/admin/systems/terminalStartup.tpl:34
-msgid "Select if terminal should boot in text mode"
-msgstr "Seleccione si el terminal debería arrancar en modo texto"
-
-#: plugins/admin/systems/terminalStartup.tpl:35
-msgid "use standard linux textual bootup"
-msgstr "Usar arranque en modo texto"
+msgid "Adding new operating system failed, specifed name is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/systems/terminalStartup.tpl:37
-msgid "Select to get more verbose output during startup"
+#: 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 ""
-"Seleccione para obtener una información mas prolija durante el arranque"
 
-#: plugins/admin/systems/terminalStartup.tpl:38
-msgid "use debug mode for startup"
-msgstr "Usar el modo de depuración durante el arranque"
+#: plugins/admin/systems/class_glpiAccount.inc:413
+#, fuzzy
+msgid "Updating operating system failed, specifed name is already used."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/systems/password.tpl:2
+#: plugins/admin/systems/class_glpiAccount.inc:566
 #, 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."
+"This device has inventory informations enabled. You can disable them by "
+"clicking below."
 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."
+"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
+"aquí."
 
-#: plugins/admin/systems/password.tpl:5
-msgid "Leave fields blank for password inheritance from default entries."
+#: plugins/admin/systems/class_glpiAccount.inc:569
+#, 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/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_printerPPDSelectionDialog.inc:74
+#: plugins/admin/systems/class_glpiAccount.inc:667
 #, fuzzy
-msgid "Printer ppd selection."
-msgstr "Configuración telefónica"
+msgid "Can't remove glpi account, while mysql extension is missing."
+msgstr ""
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:15
+#: plugins/admin/systems/phonesettings.tpl:1
 #, fuzzy
-msgid "Parent server"
-msgstr "Servicio de impresión"
+msgid "Advanced phone settings"
+msgstr "Configuración telefónica"
 
-#: plugins/admin/systems/servRepositorySetup.tpl:33
-#: plugins/admin/systems/class_servRepository.inc:249
-#: plugins/admin/systems/class_servRepository.inc:270
+#: plugins/admin/systems/phonesettings.tpl:6
 #, fuzzy
-msgid "Sections"
-msgstr "Acción"
+msgid "Phone type"
+msgstr "Número de teléfono"
 
-#: plugins/admin/systems/class_servRepositorySetup.inc:117
+#: 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 "Please enter a value for 'release'."
-msgstr "Por favor especifique un usuario valido."
+msgid "Choose a phone type"
+msgstr "Elija tipo de ratón"
 
-#: 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/phonesettings.tpl:10
+msgid "refresh"
+msgstr ""
 
-#: plugins/admin/systems/servRepository.tpl:6
+#: plugins/admin/systems/phonesettings.tpl:32
 #, fuzzy
-msgid "List of configured repositories."
-msgstr "Lista de grupos"
+msgid "DTMF mode"
+msgstr "Modo"
 
-#: plugins/admin/systems/servRepository.tpl:11
+#: plugins/admin/systems/phonesettings.tpl:46
+#: plugins/admin/systems/phonesettings.tpl:85
 #, fuzzy
-msgid "Add repository"
-msgstr "Reintentar"
+msgid "Default IP"
+msgstr "por defecto"
 
-#: plugins/admin/systems/servRepository.tpl:29
-msgid "This menu allows you to create, delete and edit repository settings."
+#: plugins/admin/systems/phonesettings.tpl:56
+#: plugins/admin/systems/phonesettings.tpl:93
+msgid "Response timeout"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:200
+#: plugins/admin/systems/phonesettings.tpl:75
 #, fuzzy
-msgid ""
-"This server has inventory features enabled. You can disable them by clicking "
-"below."
+msgid "Modus"
+msgstr "Ratón"
+
+#: plugins/admin/systems/phonesettings.tpl:106
+msgid "Authtype"
 msgstr ""
-"Este servidor tiene la extensión Kolab activada. Puede desactivarla pulsando "
-"aquí."
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:203
+#: plugins/admin/systems/phonesettings.tpl:116
 #, 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í."
+msgid "Secret"
+msgstr "Calle"
 
-#: 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."
+#: plugins/admin/systems/phonesettings.tpl:124
+msgid "GoFonInkeys"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:278
-#, php-format
-msgid "Can't delete printer type, it is still in use by '%s'."
+#: plugins/admin/systems/phonesettings.tpl:132
+msgid "GoFonOutKeys"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiPrinterAccount.inc:750
+#: plugins/admin/systems/phonesettings.tpl:145
 #, fuzzy
-msgid "since"
-msgstr "Arriba desde"
+msgid "Account code"
+msgstr "Cuenta"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:1
+#: plugins/admin/systems/phonesettings.tpl:153
 #, fuzzy
-msgid "Manage System-types"
-msgstr "Sistemas"
+msgid "Trunk lines"
+msgstr "Clientes Ligeros"
 
-#: plugins/admin/systems/glpi_edit_type.tpl:9
-#: plugins/admin/systems/glpi_edit_type.tpl:28
-#: plugins/admin/systems/glpi_edit_cartridge_type.tpl:7
-#: 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
+#: plugins/admin/systems/phonesettings.tpl:168
 #, fuzzy
-msgid "Rename"
-msgstr "Nombre del servidor"
+msgid "Hosts that are allowed to connect"
+msgstr "Equipos/Redes que son permitidos para hacer relay"
 
-#: 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
+#: plugins/admin/systems/phonesettings.tpl:183
 #, fuzzy
-msgid "Please enter a new name"
-msgstr "Por favor especifique una dirección de servidor - URI - válida."
+msgid "Hosts that are not allowed to connect"
+msgstr "¡No tiene permisos para eliminar este componente!"
 
-#: 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/phonesettings.tpl:205
+msgid "MSN"
 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/wingeneric.tpl:6
+msgid "Machine name"
+msgstr "Nombre de la maquina"
 
 #: plugins/admin/systems/glpiManufacturer.tpl:1
 #, fuzzy
 msgid "Manage manufacturers"
 msgstr "Editar entrada"
 
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:14
-#, fuzzy
-msgid "Reference"
-msgstr "Referencias"
-
-#: plugins/admin/systems/glpiPrinterCartridgesEdit.tpl:22
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:53
-#: plugins/admin/systems/glpi_devices.tpl:17
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
 #, fuzzy
-msgid "Comments"
-msgstr "Contacto"
+msgid "Attachment"
+msgstr "Argumentos"
 
-#: 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
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
 #, fuzzy
-msgid "Comment"
-msgstr "Contacto"
-
-#: 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/glpiPrinterCartridgesEdit.tpl:57
-#: plugins/admin/systems/glpi.tpl:52 plugins/admin/systems/glpiPrinter.tpl:69
-msgid "Technical responsible"
-msgstr ""
+msgid "Filename"
+msgstr "Nombre del servidor"
 
-#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
 #, fuzzy
-msgid "use"
-msgstr "Ratón"
+msgid "Mime-type"
+msgstr "Tipo"
 
-#: plugins/admin/systems/glpiSelectUser.tpl:23
+#: plugins/admin/systems/class_termDNS.inc:132
+#, fuzzy, php-format
 msgid ""
-"This dialog allows you to select a user as technical responsible person."
-msgstr ""
-
-#: plugins/admin/systems/glpi_edit_os.tpl:1
-msgid "Manage OS-types"
+"Can't execute specified AUTO_NETWORK_HOOK '%s'. Please check your gosa.conf."
 msgstr ""
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
 
-#: plugins/admin/systems/class_termDNS.inc:258
+#: plugins/admin/systems/class_termDNS.inc:298
 #, fuzzy
 msgid "The required field 'IP-address' is not set."
 msgstr " El campo requerido 'Cuenta Principal' no ha sido rellenado."
 
-#: plugins/admin/systems/class_termDNS.inc:265
+#: plugins/admin/systems/class_termDNS.inc:305
 msgid "Wrong IP format in field IP-address."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:272
+#: plugins/admin/systems/class_termDNS.inc:312
 #, fuzzy
 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:279
+#: plugins/admin/systems/class_termDNS.inc:319
 msgid ""
-"The given macaddress is invalid. There must be 6 1byte segments seperated by "
+"The given macaddress is invalid. There must be 6 2byte segments seperated by "
 "':'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:299
+#: plugins/admin/systems/class_termDNS.inc:339
 #, php-format
 msgid "Found duplicate value for record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:307
+#: plugins/admin/systems/class_termDNS.inc:347
 #, php-format
 msgid "Found more than one entry for the uniqe record type '%s'."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:318
+#: plugins/admin/systems/class_termDNS.inc:358
 #, php-format
 msgid ""
 "The device IP '%s' is added as 'A Record', this will be done automatically, "
 "please remove the record."
 msgstr ""
 
-#: plugins/admin/systems/class_termDNS.inc:325
-#: plugins/admin/systems/class_servDNSeditZone.inc:399
+#: plugins/admin/systems/class_termDNS.inc:448
+#, fuzzy
+msgid "Saving terminal to DNS object failed"
+msgstr "Lista de Departamentos"
+
+#: plugins/admin/systems/glpiSelectUser.tpl:23
+msgid ""
+"This dialog allows you to select a user as technical responsible person."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
+msgid "Can't delete this entry, it is still in use."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:308
+#, fuzzy
+msgid "The selected name is already in use."
+msgstr "El nombre especificado ya esta siendo usado"
+
+#: 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
 #, php-format
-msgid "Only lowercase is allowed, please check your '%ss'."
+msgid ""
+"You can't delete this attachment, it is still in use by these system(s) '%s'"
+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
+#, fuzzy
+msgid "Upload wasn't successfull."
+msgstr "Exportación completada"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
+msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
 msgstr ""
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:1
+#: 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_glpiAttachmentPool.inc:142
+#, fuzzy, php-format
+msgid "Can't create file '%s'."
+msgstr "Borrar"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
+msgid "File is available."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:188
+msgid "File is not readable, possibly the file is missing."
+msgstr ""
+
+#: 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_glpiAttachmentPool.inc:202
+#, fuzzy
+msgid "Mime"
+msgstr "Teléfono Móvil"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
+msgid "This table displays all available attachments."
+msgstr ""
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:222
+#, fuzzy
+msgid "empty"
+msgstr "Plantilla"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+#, fuzzy
+msgid "Create new attachment"
+msgstr "Nombre del departamento"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+#, fuzzy
+msgid "New Attachment"
+msgstr "Argumentos"
+
+#: plugins/admin/systems/class_glpiAttachmentPool.inc:354
 #, fuzzy
-msgid "Add/Edit manufacturer"
-msgstr "Editar entrada"
+msgid "Please specify a valid name for this attachment."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/glpiManufacturerAdd.tpl:14
+#: plugins/admin/systems/class_servRepository.inc:97
 #, fuzzy
-msgid "Website"
-msgstr "escribir"
+msgid "Remove FAI repository extension."
+msgstr "Eliminar extensión Kolab"
 
-#: 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/class_servRepository.inc:98
 #, fuzzy
-msgid "Phone number"
-msgstr "Números de teléfonos"
-
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:6
-msgid "List of available cartridge type for this type of printer"
+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/glpiPrinterCartridges.tpl:23
-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."
+#: plugins/admin/systems/class_servRepository.inc:100
+msgid "Add FAI repository extension."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+#: plugins/admin/systems/class_servRepository.inc:101
 #, fuzzy
-msgid "Display cartridge types matching"
-msgstr "Mostrar números que concuerdan con"
+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í."
 
-#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
-#, fuzzy
-msgid "Regular expression for matching cartridge types"
-msgstr "Expresiones regulares que concuerden con direcciones"
+#: 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."
+msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#: plugins/admin/systems/class_servRepository.inc:176
 #, php-format
 msgid ""
-"You can't delete this manufacturer, it is still in use by these system(s) '%"
-"s'"
+"Be careful editing this release, it is still used by these workstations [%s]."
 msgstr ""
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:104
+#: 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/servRepository.tpl:6
 #, fuzzy
-msgid "Please specify a name."
-msgstr "Por favor especifique un nombre de usuario valido."
+msgid "List of configured repositories."
+msgstr "Lista de grupos"
 
-#: plugins/admin/systems/class_glpiManufacturer.inc:113
-#: plugins/admin/systems/class_glpiManufacturer.inc:119
+#: plugins/admin/systems/servRepository.tpl:11
 #, fuzzy
-msgid "Specified name is already in use, please choose another one."
-msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
+msgid "Add repository"
+msgstr "Reintentar"
+
+#: plugins/admin/systems/servRepository.tpl:29
+msgid "This menu allows you to create, delete and edit repository settings."
+msgstr ""
 
 #: plugins/admin/systems/glpiAttachmentPool.tpl:6
 #, fuzzy
@@ -9408,61 +10205,6 @@ msgstr "Mostrar Departamentos que concuerden con"
 msgid "Regular expression for matching attachment names"
 msgstr "Expresiones regulares para encontrar nombres de departamentos"
 
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:118
-msgid "Can't delete this entry, it is still in use."
-msgstr ""
-
-#: plugins/admin/systems/class_glpiPrinterCartridgesEdit.inc:305
-#, fuzzy
-msgid "The selected name is already in use."
-msgstr "El nombre especificado ya esta siendo usado"
-
-#: plugins/admin/systems/glpi.tpl:9
-#: plugins/admin/systems/SelectDeviceType.tpl:20
-#, fuzzy
-msgid "System type"
-msgstr "Sistemas"
-
-#: plugins/admin/systems/glpi.tpl:19
-#, fuzzy
-msgid "Operating system"
-msgstr "Borrar"
-
-#: plugins/admin/systems/glpi.tpl:40 plugins/admin/systems/glpiPrinter.tpl:66
-#, fuzzy
-msgid "Contacts"
-msgstr "Contacto"
-
-#: plugins/admin/systems/glpi.tpl:44 plugins/admin/systems/glpiPrinter.tpl:78
-#, fuzzy
-msgid "Contact person"
-msgstr "Contacto"
-
-#: plugins/admin/systems/glpi.tpl:78
-#, fuzzy
-msgid "Installed devices"
-msgstr "Dispositivos clientes"
-
-#: plugins/admin/systems/glpi.tpl:90
-#, fuzzy
-msgid "Trading"
-msgstr "Ocultamiento"
-
-#: plugins/admin/systems/glpi.tpl:91
-#, fuzzy
-msgid "Software"
-msgstr "Estado"
-
-#: plugins/admin/systems/glpi.tpl:92
-#, fuzzy
-msgid "Contracts"
-msgstr "Contacto"
-
-#: plugins/admin/systems/glpi.tpl:95 plugins/admin/systems/glpiPrinter.tpl:88
-#, fuzzy
-msgid "Attachments"
-msgstr "Argumentos"
-
 #: plugins/admin/systems/servdnseditzone.tpl:7
 #, fuzzy
 msgid "Zone name"
@@ -9475,8 +10217,8 @@ msgstr "Dispositivos de Red"
 
 #: plugins/admin/systems/servdnseditzone.tpl:24
 #, fuzzy
-msgid "Zone entries"
-msgstr "Configuración telefónica"
+msgid "Zone records"
+msgstr "Directorio"
 
 #: plugins/admin/systems/servdnseditzone.tpl:27
 msgid "Can't be edited because the zone wasn't saved right now."
@@ -9515,106 +10257,226 @@ msgstr "Directorio"
 
 #: plugins/admin/systems/servdnseditzone.tpl:112
 #, fuzzy
-msgid "Zone records"
+msgid "Global zone records"
 msgstr "Directorio"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:6
+#: plugins/admin/systems/class_servRepositorySetup.inc:119
 #, fuzzy
-msgid "List of devices"
-msgstr "Lista de usuarios"
+msgid "Please enter a value for 'release'."
+msgstr "Por favor especifique un usuario valido."
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:23
+#: plugins/admin/systems/class_servRepositorySetup.inc:123
+#, fuzzy
+msgid "Please specify a valid value for 'url'."
+msgstr "Por favor especifique un usuario valido."
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:170
+#, fuzzy, php-format
 msgid ""
-"This dialog allows you to attach a device to your currently edited computer."
+"Can't execute specified REPOSITORY_HOOK '%s'. Please check your gosa.conf."
+msgstr ""
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
+
+#: plugins/admin/systems/class_servRepositorySetup.inc:172
+#: plugins/admin/systems/class_workstationStartup.inc:1082
+#, php-format
+msgid ""
+"The specified REPOSITORY_HOOK '%s', specified in your gosa.conf, returns an "
+"empty string."
+msgstr ""
+
+#: plugins/admin/systems/class_winGeneric.inc:126
+#, fuzzy
+msgid "Removing Samba workstation failed"
+msgstr "Eliminar cuenta samba"
+
+#: plugins/admin/systems/class_winGeneric.inc:224
+#, fuzzy
+msgid "Saving Samba workstation failed"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_systemManagement.inc:738
+#: plugins/admin/ogroups/class_ogroupManagement.inc:369
+#: plugins/generic/references/class_reference.inc:48
+msgid "Workstation"
+msgstr "Estación de trabajo"
+
+#: plugins/admin/systems/class_SelectDeviceType.inc:34
+#: plugins/admin/systems/class_systemManagement.inc:737
+#: plugins/admin/ogroups/class_ogroupManagement.inc:370
+#, fuzzy
+msgid "Terminal"
+msgstr "Terminales"
+
+#: plugins/admin/systems/class_glpiSelectUser.inc:140
+#, fuzzy
+msgid "use"
+msgstr "Ratón"
+
+#: 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/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/password.tpl:5
+msgid "Leave fields blank for password inheritance from default entries."
+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/glpiPrinterCartridges.tpl:6
+msgid "List of available cartridge type for this type of printer"
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:23
+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."
+msgstr ""
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:35
+#, fuzzy
+msgid "Display cartridge types matching"
+msgstr "Mostrar números que concuerdan con"
+
+#: plugins/admin/systems/glpiPrinterCartridges.tpl:37
+#, fuzzy
+msgid "Regular expression for matching cartridge types"
+msgstr "Expresiones regulares que concuerden con direcciones"
+
+#: 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/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."
 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/glpiDeviceManagement.tpl:35
-#, fuzzy
-msgid "Display devices matching"
-msgstr "Mostrar direcciones que concuerden con"
+#: plugins/admin/systems/chooser.tpl:7
+msgid "Linux thin client template"
+msgstr "Plantilla de clientes ligeros Linux"
 
-#: plugins/admin/systems/glpiDeviceManagement.tpl:37
-#, fuzzy
-msgid "Regular expression for matching device names"
-msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+#: plugins/admin/systems/chooser.tpl:8
+msgid "Linux workstation template"
+msgstr "Plantilla de estaciones de trabajo linux"
 
-#: 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/chooser.tpl:9
+msgid "Linux Server"
+msgstr "Servidor Linux"
 
-#: 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 ""
+#: plugins/admin/systems/chooser.tpl:10
+msgid "Windows workstation"
+msgstr "Estación de trabajo Windows"
 
-#: 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/chooser.tpl:11
+msgid "Network printer"
+msgstr "Impresora de Red"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:131
-#, fuzzy
-msgid "Upload wasn't successfull."
-msgstr "Exportación completada"
+#: plugins/admin/systems/chooser.tpl:13
+msgid "Other network component"
+msgstr "Otros componentes de red"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:134
-msgid "Missing directory '/etc/gosa/glpi/' to store glpi uploads."
-msgstr ""
+#: plugins/admin/systems/chooser.tpl:16
+msgid "Create"
+msgstr "Crear"
 
-#: 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_terminalGeneric.inc:89
+msgid "text"
+msgstr "texto"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:142
-#, fuzzy, php-format
-msgid "Can't create file '%s'."
-msgstr "Borrar"
+#: plugins/admin/systems/class_terminalGeneric.inc:90
+msgid "graphic"
+msgstr "Gráfico"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:186
-msgid "File is available."
-msgstr ""
+#: plugins/admin/systems/class_terminalGeneric.inc:128
+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_glpiAttachmentPool.inc:188
-msgid "File is not readable, possibly the file is missing."
-msgstr ""
+#: plugins/admin/systems/class_terminalGeneric.inc:140
+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_glpiAttachmentPool.inc:191
-#, fuzzy
-msgid "Currently no file uploaded."
-msgstr "No se ha subido ningún archivo."
+#: plugins/admin/systems/class_terminalGeneric.inc:152
+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_glpiAttachmentPool.inc:202
+#: plugins/admin/systems/class_terminalGeneric.inc:280
 #, fuzzy
-msgid "Mime"
-msgstr "Teléfono Móvil"
+msgid "Removing terminal failed"
+msgstr "Mostrar departamentos"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:205
-msgid "This table displays all available attachments."
-msgstr ""
+#: plugins/admin/systems/class_terminalGeneric.inc:335
+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_glpiAttachmentPool.inc:222
+#: plugins/admin/systems/class_terminalGeneric.inc:339
+msgid "The required field 'Terminal name' is not set."
+msgstr " El campo requerido 'Nombre del terminal' no ha sido rellenado."
+
+#: plugins/admin/systems/class_terminalGeneric.inc:436
 #, fuzzy
-msgid "empty"
-msgstr "Plantilla"
+msgid "Saving terminal failed"
+msgstr "Mostrar departamentos"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:259
+#: plugins/admin/systems/class_servGeneric.inc:61
+msgid "This 'dn' has no server features."
+msgstr "Esta 'dn' no tiene características de servidor."
+
+#: plugins/admin/systems/class_servGeneric.inc:148
 #, fuzzy
-msgid "Create new attachment"
-msgstr "Nombre del departamento"
+msgid "Removing server failed"
+msgstr "Eliminar servicio DNS"
 
-#: plugins/admin/systems/class_glpiAttachmentPool.inc:260
+#: plugins/admin/systems/class_servGeneric.inc:184
 #, fuzzy
-msgid "New Attachment"
-msgstr "Argumentos"
+msgid "The required field 'Server name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/admin/systems/class_servGeneric.inc:191
+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_glpiAttachmentPool.inc:352
+#: plugins/admin/systems/class_servGeneric.inc:260
 #, fuzzy
-msgid "Please specify a valid name for this attachment."
-msgstr "Por favor especifique un usuario valido."
+msgid "Saving server failed"
+msgstr "Mostrar departamentos"
 
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:93
 #, php-format
@@ -9642,18 +10504,6 @@ msgstr ""
 msgid "devices"
 msgstr "Servicios"
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#, fuzzy
-msgid "New monitor"
-msgstr "Nueva contraseña"
-
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:225
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:210
-#, fuzzy
-msgid "M"
-msgstr "Mb"
-
 #: plugins/admin/systems/class_glpiDeviceManagement.inc:227
 #, fuzzy
 msgid "New mainbord"
@@ -9754,493 +10604,757 @@ msgstr "Dispositivos de Red"
 msgid "OC"
 msgstr ""
 
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:346
+#: 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/class_glpiDeviceManagement.inc:366
-#: plugins/admin/systems/class_glpiDeviceManagement.inc:369
+#: 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/class_glpiDeviceManagement.inc:405
+#: plugins/admin/systems/class_glpiDeviceManagement.inc:406
 #, fuzzy
 msgid "Other"
 msgstr "Filtros"
 
-#: plugins/admin/systems/glpiPrinter.tpl:9
+#: 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_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:109
 #, fuzzy
-msgid "Printer type"
-msgstr "Nombre de la impresora"
+msgid "yes"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/glpiPrinter.tpl:31
+#: plugins/admin/systems/class_phoneGeneric.inc:203
+#: plugins/gofon/macro/class_divListMacros.inc:110
 #, fuzzy
-msgid "Supported interfaces"
-msgstr "Impresora de Red"
+msgid "no"
+msgstr "ninguno"
 
-#: plugins/admin/systems/glpiPrinter.tpl:38
+#: plugins/admin/systems/class_phoneGeneric.inc:225
+msgid "dynamic"
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:225
 #, fuzzy
-msgid "Serial"
-msgstr "terminales"
+msgid "Networksettings"
+msgstr "Configuración de red"
 
-#: plugins/admin/systems/glpiPrinter.tpl:46
+#: plugins/admin/systems/class_phoneGeneric.inc:240
+#, 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/class_phoneGeneric.inc:247
+#, fuzzy
+msgid "Removing phone failed"
+msgstr "Borrar aplicaciones"
+
+#: plugins/admin/systems/class_phoneGeneric.inc:292
+#, fuzzy
+msgid "The required field 'Phone name' is not set."
+msgstr "El campo requerido 'Sobrenombre' no ha sido rellenado."
+
+#: plugins/admin/systems/class_phoneGeneric.inc:295
+msgid "The 'Phone name' '0' is reserved and cannot be used."
+msgstr ""
+
+#: plugins/admin/systems/class_phoneGeneric.inc:302
+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_phoneGeneric.inc:397
+#, fuzzy
+msgid "Saving phone failed"
+msgstr "Nombre de la aplicación"
+
+#: plugins/admin/systems/printerPPDDialog.tpl:1
+#, fuzzy
+msgid "Printer driver"
+msgstr "Dispositivo de Impresión"
+
+#: plugins/admin/systems/printerPPDDialog.tpl:6
+#, fuzzy
+msgid "Select"
+msgstr "Borrar"
+
+#: plugins/admin/systems/printerPPDDialog.tpl:9
+#, fuzzy
+msgid "New driver"
+msgstr "Servidor"
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:176
+#, 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_servDNSeditZoneEntries.inc:203
+#, 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_servDNSeditZoneEntries.inc:212
+#, 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_servDNSeditZoneEntries.inc:218
+#, fuzzy, php-format
+msgid "Can not create '%s',the destination name already exists."
+msgstr "Ya existe un Departamento con este 'Nombre'."
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:227
+#, php-format
+msgid "The name '%s' is used more than once."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:233
+#, php-format
+msgid "The host name '%s' should be written in lowercase."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:250
+#, php-format
+msgid "The record type '%s' is a unique type and can't be defined twice."
+msgstr ""
+
+#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:257
+#, 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/class_servDNSeditZoneEntries.inc:265
+#, php-format
+msgid "There is a duplicate entry in '%s' for '%s'."
+msgstr ""
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:8
+#, fuzzy
+msgid "Select entries to add"
+msgstr "Seleccione usuarios que serán añadidos"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:31
+#, fuzzy
+msgid "Display members of department"
+msgstr "Mostrar número de Departamentos"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:43
+#, fuzzy
+msgid "Display members matching"
+msgstr "Mostrar números que concuerdan con"
+
+#: plugins/admin/systems/selectUserToPrinterDialog.tpl:48
+#, fuzzy
+msgid "Regular expression for matching member names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
+
+#: plugins/admin/systems/class_glpiManufacturer.inc:58
+#, php-format
+msgid ""
+"You can't delete this manufacturer, it is still in use by these system(s) '%"
+"s'"
+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 "Parallel"
-msgstr "Variable"
+msgid "Specified name is already in use, please choose another one."
+msgstr "El valor especificado como 'Nombre' esta siendo utilizado."
 
-#: plugins/admin/systems/glpiPrinter.tpl:54
-msgid "USB"
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:71
+#, php-format
+msgid "Selected vendor '%s' does not exists in our list of ppds."
 msgstr ""
 
-#: plugins/admin/systems/glpiPrinter.tpl:114
+#: plugins/admin/systems/class_printerPPDSelectionDialog.inc:80
 #, fuzzy
-msgid "Installed cartridges"
-msgstr "Dispositivos clientes"
+msgid "Printer ppd selection."
+msgstr "Configuración telefónica"
 
-#: 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/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_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/terminalStartup.tpl:36
+msgid "use graphical bootup"
+msgstr "Usar arranque gráfico"
 
-#: plugins/admin/systems/class_glpiPrinterCartridges.inc:162
-msgid "Cartridges"
+#: 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/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 ""
+"Seleccione para obtener una información mas prolija durante el arranque"
 
-#: plugins/admin/systems/glpi_devices.tpl:2
-#, fuzzy
-msgid "Add/Edit monitor"
-msgstr "Editar entrada"
+#: 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/glpi_devices.tpl:33
+#: plugins/admin/systems/servnfs.tpl:1
 #, fuzzy
-msgid "Monitor size"
-msgstr "Monitor"
+msgid "Edit share"
+msgstr "Usuario administrador"
 
-#: plugins/admin/systems/glpi_devices.tpl:36
+#: plugins/admin/systems/servnfs.tpl:2
+msgid "NFS setup"
+msgstr ""
+
+#: plugins/admin/systems/servnfs.tpl:33
 #, fuzzy
-msgid "Inch"
-msgstr "Francés"
+msgid "Volume"
+msgstr "Nombre de Maquina"
 
-#: plugins/admin/systems/glpi_devices.tpl:44
-msgid "Integrated microphone"
+#: plugins/admin/systems/servnfs.tpl:54
+msgid "Auto-mount share on Apple systems"
 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
+#: plugins/admin/systems/servnfs.tpl:94
 #, fuzzy
-msgid "Yes"
-msgstr "Sistemas"
+msgid "Codepage"
+msgstr "Página Web Principal"
 
-#: 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
+#: plugins/admin/systems/servnfs.tpl:104
 #, fuzzy
-msgid "No"
-msgstr "ninguno"
+msgid "Option"
+msgstr "Opciones"
 
-#: plugins/admin/systems/glpi_devices.tpl:52
-msgid "Integrated speakers"
+#: plugins/admin/systems/class_printGeneric.inc:103
+#, php-format
+msgid "Can't extract a valid base out of object dn, setting base to '%s'."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:60
-msgid "Sub-D"
+#: plugins/admin/systems/class_printGeneric.inc:234
+#: plugins/admin/systems/class_printGeneric.inc:242
+#: plugins/admin/systems/class_printGeneric.inc:247
+#: plugins/admin/systems/class_printGeneric.inc:286
+#: plugins/admin/systems/class_printGeneric.inc:302
+#: plugins/admin/systems/class_printGeneric.inc:305
+msgid "Add printer extension"
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:68
-msgid "BNC"
+#: plugins/admin/systems/class_printGeneric.inc:235
+msgid ""
+"Could not intialize printer tab, parameter parent was missing while "
+"construction."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:76
-#, fuzzy
-msgid "Serial number"
-msgstr "Nombre de terminal"
+#: plugins/admin/systems/class_printGeneric.inc:243
+msgid "This is a workstation template, printer tab is disabled."
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:83
+#: plugins/admin/systems/class_printGeneric.inc:248
+msgid "This is a terminal template, printer tab is disabled."
+msgstr ""
+
+#: plugins/admin/systems/class_printGeneric.inc:279
+msgid "This 'dn' has no printer features."
+msgstr "Esta 'dn' no tiene características de impresora."
+
+#: plugins/admin/systems/class_printGeneric.inc:287
 #, fuzzy
-msgid "Additional serial number"
-msgstr "Numero de serie del certificado"
+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/glpi_devices.tpl:97
+#: plugins/admin/systems/class_printGeneric.inc:294
+#: plugins/admin/systems/class_printGeneric.inc:297
 #, fuzzy
-msgid "Add/Edit other device"
-msgstr "Tarjeta Sonido"
+msgid "Remove printer extension"
+msgstr "Eliminar extensión Kolab"
 
-#: plugins/admin/systems/glpi_devices.tpl:138
-msgid "Add/Edit power supply"
+#: plugins/admin/systems/class_printGeneric.inc:295
+#, fuzzy
+msgid ""
+"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/glpi_devices.tpl:173
-msgid "Atx"
+#: plugins/admin/systems/class_printGeneric.inc:298
+#, 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/glpi_devices.tpl:181
+#: plugins/admin/systems/class_printGeneric.inc:303
 #, fuzzy
-msgid "Power"
-msgstr "Puerto"
+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/glpi_devices.tpl:193
-msgid "Add/Edit graphic card"
+#: plugins/admin/systems/class_printGeneric.inc:306
+#, 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/glpi_devices.tpl:228
-#: plugins/admin/systems/glpi_devices.tpl:284
-#: plugins/admin/systems/glpi_devices.tpl:349
-msgid "Interface"
+#: plugins/admin/systems/class_printGeneric.inc:480
+#, php-format
+msgid "Your currently selected PPD file '%s' doesn't exist."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:237
+#: plugins/admin/systems/class_printGeneric.inc:488
 #, fuzzy
-msgid "Ram"
-msgstr "Nombre del servidor"
+msgid "can't get ppd informations."
+msgstr "Información de sistema"
 
-#: plugins/admin/systems/glpi_devices.tpl:249
-#, fuzzy
-msgid "Add/Edit controller"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/class_printGeneric.inc:501
+#, php-format
+msgid "This printer belongs to terminal %s. You can't rename this printer."
+msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:307
-msgid "Add/Edit drive"
+#: plugins/admin/systems/class_printGeneric.inc:503
+#, php-format
+msgid "This printer belongs to workstation %s. You can't rename this printer."
 msgstr ""
 
-#: plugins/admin/systems/glpi_devices.tpl:342
+#: plugins/admin/systems/class_printGeneric.inc:554
 #, fuzzy
-msgid "Speed"
-msgstr "Sexo"
+msgid "Removing printer failed"
+msgstr "Mostrar departamentos"
 
-#: plugins/admin/systems/glpi_devices.tpl:358
+#: plugins/admin/systems/class_printGeneric.inc:736
 #, fuzzy
-msgid "Writeable"
-msgstr "escribir"
+msgid "Saving printer failed"
+msgstr "Mostrar departamentos"
 
-#: plugins/admin/systems/glpi_devices.tpl:371
-#, fuzzy
-msgid "Add/Edit harddisk"
-msgstr "Servidor"
+#: plugins/admin/systems/class_systemManagement.inc:32
+msgid "Systems"
+msgstr "Sistemas"
 
-#: plugins/admin/systems/glpi_devices.tpl:406
-msgid "Rpm"
-msgstr ""
+#: plugins/admin/systems/class_systemManagement.inc:211
+msgid "You can't edit this object type yet!"
+msgstr "¡No puede editar este tipo de objeto todavía!"
 
-#: plugins/admin/systems/glpi_devices.tpl:413
-#, fuzzy
-msgid "Cache"
-msgstr "Cancelar"
+#: plugins/admin/systems/class_systemManagement.inc:236
+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/glpi_devices.tpl:443
-#, fuzzy
-msgid "Add/Edit memory"
-msgstr "Editar entrada"
+#: plugins/admin/systems/class_systemManagement.inc:253
+msgid "You are not allowed to set this systems password!"
+msgstr "¡No tiene permisos para cambiar contraseñas de sistema!"
 
-#: plugins/admin/systems/glpi_devices.tpl:478
-#, fuzzy
-msgid "Frequenz"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/class_systemManagement.inc:307
+#, 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/glpi_devices.tpl:507
-#, fuzzy
-msgid "Add/Edit sound card"
-msgstr "Nueva contraseña"
+#: plugins/admin/systems/class_systemManagement.inc:616
+msgid "New terminal"
+msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/glpi_devices.tpl:553
-#, fuzzy
-msgid "Add/Edit network interface"
-msgstr "Impresora de Red"
+#: plugins/admin/systems/class_systemManagement.inc:618
+msgid "New workstation"
+msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/glpi_devices.tpl:589
+#: plugins/admin/systems/class_systemManagement.inc:620
 #, fuzzy
-msgid "MAC address"
-msgstr "Dirección MAC"
+msgid "New Device"
+msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/glpi_devices.tpl:607
+#: plugins/admin/systems/class_systemManagement.inc:635
 #, fuzzy
-msgid "Add/Edit processor"
-msgstr "Nueva contraseña"
+msgid "Terminal template for"
+msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/glpi_devices.tpl:642
-#, fuzzy
-msgid "Frequence"
-msgstr "Número de teléfono"
+#: plugins/admin/systems/class_systemManagement.inc:647
+msgid "Workstation template for"
+msgstr "Plantilla de estación de trabajo para"
 
-#: plugins/admin/systems/glpi_devices.tpl:649
+#: plugins/admin/systems/class_systemManagement.inc:735
 #, fuzzy
-msgid "Default frequence"
-msgstr "Valor por defecto"
+msgid "New System from incoming"
+msgstr "Información de sistema"
 
-#: plugins/admin/systems/glpi_devices.tpl:661
+#: plugins/admin/systems/class_systemManagement.inc:739
 #, fuzzy
-msgid "Add/Edit motherboard"
-msgstr "Teclado"
+msgid "Workstation is installing"
+msgstr "Nombre de la estación de trabajo"
 
-#: plugins/admin/systems/glpi_devices.tpl:696
+#: plugins/admin/systems/class_systemManagement.inc:740
 #, fuzzy
-msgid "Chipset"
-msgstr "Borrar"
+msgid "Workstation is waiting for action"
+msgstr "Plantilla de estación de trabajo para"
 
-#: plugins/admin/systems/glpi_devices.tpl:707
+#: plugins/admin/systems/class_systemManagement.inc:741
 #, fuzzy
-msgid "Add/Edit computer case"
-msgstr "incompleto"
+msgid "Workstation installation failed"
+msgstr "Plantilla de estación de trabajo"
 
-#: plugins/admin/systems/glpi_devices.tpl:742
+#: plugins/admin/systems/class_systemManagement.inc:744
+msgid "Server is installing"
+msgstr ""
+
+#: plugins/admin/systems/class_systemManagement.inc:745
 #, fuzzy
-msgid "format"
-msgstr "Puerto"
+msgid "Server is waiting for action"
+msgstr "Información genérica del usuario"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:2
+#: plugins/admin/systems/class_systemManagement.inc:746
 #, fuzzy
-msgid "Attachment"
-msgstr "Argumentos"
+msgid "Server installation failed"
+msgstr "Identificador de servidor"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:46
+#: plugins/admin/systems/class_systemManagement.inc:747
 #, fuzzy
-msgid "Filename"
-msgstr "Nombre del servidor"
+msgid "Winstation"
+msgstr "Estación de trabajo"
 
-#: plugins/admin/systems/glpiAttachmentEdit.tpl:54
+#: plugins/admin/systems/class_systemManagement.inc:748
 #, fuzzy
-msgid "Mime-type"
-msgstr "Tipo"
+msgid "Network Device"
+msgstr "Dispositivos de Red"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:349
+#: plugins/admin/systems/class_systemManagement.inc:749
+#: plugins/admin/systems/class_divListSystem.inc:96
 #, fuzzy
-msgid "This zoneName is already in use"
-msgstr "El nombre especificado ya esta siendo usado"
+msgid "New Terminal"
+msgstr "Nuevo terminal"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:352
+#: plugins/admin/systems/class_systemManagement.inc:750
+#: plugins/admin/systems/class_divListSystem.inc:98
 #, fuzzy
-msgid "This reverse zone is already in use"
-msgstr "El nombre especificado ya esta siendo usado"
+msgid "New Workstation"
+msgstr "Nueva estación de trabajo"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:357
-msgid "Primary dns server must end with '.' to be a valid entry."
+#: plugins/admin/systems/class_workstationStartup.inc:306
+#: plugins/admin/systems/class_terminalStartup.inc:93
+#, 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_servDNSeditZone.inc:361
-msgid "Your specified mail address must end with '.' to be a valid record."
+#: plugins/admin/systems/class_workstationStartup.inc:413
+msgid ""
+"There are packages in your configuration, which can't be resolved with "
+"current server/release settings."
 msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:365
-#: plugins/admin/systems/class_servDNSeditZone.inc:369
+#: plugins/admin/systems/class_workstationStartup.inc:458
+#, 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/class_workstationStartup.inc:516
+#, fuzzy
 msgid ""
-"Your mail address contains '@' replace this with '.' to enable GOsa to "
-"create a valid SOA record."
+"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_workstationStartup.inc:856
+#, 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_servDNSeditZone.inc:373
-msgid "Only lowercase strings are allowed as zone name."
+#: plugins/admin/systems/class_workstationStartup.inc:867
+#, 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_servDNSeditZone.inc:377
+#: plugins/admin/systems/class_workstationStartup.inc:1030
 #, fuzzy
-msgid "Please specify a numeric value for serial number."
-msgstr "Por favor especifique un usuario valido."
+msgid "Saving workstation startup settings failed"
+msgstr "Plantilla de estación de trabajo"
+
+#: plugins/admin/systems/class_workstationStartup.inc:1080
+#, fuzzy, php-format
+msgid ""
+"Can't execute specified REPOSITORY_HOOK '%s' please check your gosa.conf."
+msgstr ""
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:381
+#: plugins/admin/systems/class_terminalStartup.inc:386
 #, fuzzy
-msgid "Please specify a numeric value for refresh."
-msgstr "Por favor especifique un usuario valido."
+msgid "Saving terminal startup settings failed"
+msgstr "Parametros del correo de usuarios"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:385
+#: plugins/admin/systems/printer.tpl:6
 #, fuzzy
-msgid "Please specify a numeric value for ttl."
-msgstr "Por favor especifique un usuario valido."
+msgid "General"
+msgstr "Genérico"
+
+#: plugins/admin/systems/printer.tpl:9
+msgid "Printer name"
+msgstr "Nombre de la impresora"
+
+#: plugins/admin/systems/printer.tpl:36
+msgid "Details"
+msgstr ""
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:389
+#: plugins/admin/systems/printer.tpl:39
 #, fuzzy
-msgid "Please specify a numeric value for expire."
-msgstr "Por favor especifique un usuario valido."
+msgid "Printer location"
+msgstr "Configuración telefónica"
+
+#: plugins/admin/systems/printer.tpl:43
+msgid "Printer URL"
+msgstr "URL de la impresora"
 
-#: plugins/admin/systems/class_servDNSeditZone.inc:393
+#: plugins/admin/systems/printer.tpl:63
 #, fuzzy
-msgid "Please specify a numeric value for retry."
-msgstr "Por favor especifique un usuario valido."
+msgid "Permissions"
+msgstr "Miembro con Permisos"
 
-#: 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, 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."
-msgstr ""
+#: plugins/admin/systems/printer.tpl:70
+#, fuzzy
+msgid "Users which are allowed to use this printer"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/admin/systems/SelectDeviceType.tpl:9
-msgid "Please select a system type and if prefered select a object group too."
-msgstr ""
+#: plugins/admin/systems/printer.tpl:74 plugins/admin/systems/printer.tpl:90
+#, fuzzy
+msgid "Add user"
+msgstr "Usuario administrador"
 
-#: plugins/admin/systems/SelectDeviceType.tpl:21
+#: plugins/admin/systems/printer.tpl:75 plugins/admin/systems/printer.tpl:91
 #, fuzzy
-msgid "Choose a system type"
-msgstr "Elija tipo de ratón"
+msgid "Add group"
+msgstr "grupos"
 
-#: plugins/admin/systems/SelectDeviceType.tpl:32
-msgid "Membership in following objectGroups"
-msgstr ""
+#: plugins/admin/systems/printer.tpl:86
+#, fuzzy
+msgid "Users which are allowed to administrate this printer"
+msgstr "¡No tiene permisos para eliminar esta entrada!"
 
-#: plugins/admin/systems/SelectDeviceType.tpl:33
+#: plugins/admin/systems/printer.tpl:87
 #, fuzzy
-msgid "Choose a object group"
-msgstr "Grupo de objetos"
+msgid "Admins"
+msgstr "DN del administrador"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:173
-#, php-format
+#: plugins/admin/systems/class_divListSystem.inc:37
+#: plugins/admin/systems/class_divListSystem.inc:38
+msgid "List of systems"
+msgstr "Lista de sistemas"
+
+#: plugins/admin/systems/class_divListSystem.inc:42
 msgid ""
-"Can't rename '%s' to '%s' there is already an entry with the same name in "
-"our zone editing dialog."
+"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_servDNSeditZoneEntries.inc:199
-#, 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_divListSystem.inc:52
+#, fuzzy
+msgid "System / Department"
+msgstr "Departamento"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:208
-#, 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_divListSystem.inc:56
+#: plugins/admin/ogroups/ogroup_objects.tpl:31
+msgid "Show servers"
+msgstr "Mostrar servidores"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:214
-#, fuzzy, php-format
-msgid "Can not create '%s',the destination name already exists."
-msgstr "Ya existe un Departamento con este 'Nombre'."
+#: plugins/admin/systems/class_divListSystem.inc:57
+msgid "Select to see Linux terminals"
+msgstr "Seleccione para ver los terminales Linux"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:223
-#, php-format
-msgid "The name '%s' is used more than once."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:57
+#: plugins/admin/ogroups/ogroup_objects.tpl:33
+msgid "Show terminals"
+msgstr "Mostrar terminales"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:229
-#, php-format
-msgid "The host name '%s' should be written in lowercase."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:58
+msgid "Select to see Linux workstations"
+msgstr "Seleccione para ver las estaciones de trabajo Linux"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:246
-#, php-format
-msgid "The record type '%s' is a unique type and can't be defined twice."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:58
+#: plugins/admin/ogroups/ogroup_objects.tpl:32
+msgid "Show workstations"
+msgstr "Mostrar estaciones de trabajo"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:253
-#, 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/class_divListSystem.inc:59
+msgid "Select to see MicroSoft Windows based workstations"
+msgstr "Seleccione para ver estaciones de trabajo basadas en Windows"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:261
-#, php-format
-msgid "There is a duplicate entry in '%s' for '%s'."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:59
+msgid "Show windows based workstations"
+msgstr "Mostrara estaciones de trabajo basadas en windows"
 
-#: plugins/admin/systems/class_servDNSeditZoneEntries.inc:352
-#, php-format
-msgid "Settings for '%s'"
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:60
+msgid "Select to see network printers"
+msgstr "Seleccione para ver impresoras de red"
 
-#: plugins/admin/systems/class_servRepository.inc:97
+#: plugins/admin/systems/class_divListSystem.inc:60
+msgid "Show network printers"
+msgstr "Mostrar impresoras de red"
+
+#: plugins/admin/systems/class_divListSystem.inc:61
+msgid "Select to see VOIP phones"
+msgstr "Seleccione para ver teléfonos VOIP"
+
+#: plugins/admin/systems/class_divListSystem.inc:61
+#: plugins/admin/ogroups/ogroup_objects.tpl:35
+msgid "Show phones"
+msgstr "Mostrar teléfonos"
+
+#: plugins/admin/systems/class_divListSystem.inc:62
+msgid "Select to see network devices"
+msgstr "Seleccione para ver los dispositivos de red"
+
+#: plugins/admin/systems/class_divListSystem.inc:62
+msgid "Show network devices"
+msgstr "Mostrar dispositivos de Red"
+
+#: plugins/admin/systems/class_divListSystem.inc:70
 #, fuzzy
-msgid "Remove FAI repository extension."
-msgstr "Eliminar extensión Kolab"
+msgid "Display systems of user"
+msgstr "Mostrar direcciones del usuario"
 
-#: plugins/admin/systems/class_servRepository.inc:98
+#: plugins/admin/systems/class_divListSystem.inc:96
 #, 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í."
+msgid "New Terminal template"
+msgstr "Plantilla de terminal"
 
-#: plugins/admin/systems/class_servRepository.inc:100
-msgid "Add FAI repository extension."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:98
+#, fuzzy
+msgid "New Workstation template"
+msgstr "Plantilla de estación de trabajo"
 
-#: plugins/admin/systems/class_servRepository.inc:101
+#: plugins/admin/systems/class_divListSystem.inc:99
+#: plugins/admin/systems/class_divListSystem.inc:100
 #, 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 "New Server"
+msgstr "Servidor"
 
-#: 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."
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:101
+#: plugins/admin/systems/class_divListSystem.inc:102
+#, fuzzy
+msgid "New Printer"
+msgstr "Impresora"
 
-#: plugins/admin/systems/class_servRepository.inc:176
-#, php-format
-msgid ""
-"Be careful editing this release, it is still used by these workstations [%s]."
+#: plugins/admin/systems/class_divListSystem.inc:103
+#: plugins/admin/systems/class_divListSystem.inc:104
+#, fuzzy
+msgid "New Phone"
+msgstr "Teléfono"
+
+#: plugins/admin/systems/class_divListSystem.inc:105
+#: plugins/admin/systems/class_divListSystem.inc:106
+#, fuzzy
+msgid "New Component"
+msgstr "Otros componentes de red"
+
+#: plugins/admin/systems/class_divListSystem.inc:123
+#, fuzzy
+msgid "Cups Server"
+msgstr "Servidor"
+
+#: plugins/admin/systems/class_divListSystem.inc:124
+msgid "Log Db"
 msgstr ""
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:23
+#: plugins/admin/systems/class_divListSystem.inc:125
+#, fuzzy
+msgid "Syslog Server"
+msgstr "Servidor de Logs"
+
+#: plugins/admin/systems/class_divListSystem.inc:126
+#, fuzzy
+msgid "Mail Server"
+msgstr "Servidor"
+
+#: plugins/admin/systems/class_divListSystem.inc:127
 #, fuzzy
-msgid "Choose a base"
-msgstr "Elija tipo de ratón"
+msgid "Imap Server"
+msgstr "Servidor de Intercambio"
 
-#: 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/class_divListSystem.inc:128
+#, fuzzy
+msgid "Nfs Server"
+msgstr "Servidor"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:51
-msgid "Filter entries with this syntax"
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:129
+#, fuzzy
+msgid "Kerberos Server"
+msgstr "Kerberos"
 
-#: plugins/admin/systems/class_baseSelectDialog.inc:115
-#, fuzzy, php-format
-msgid "Select this base"
-msgstr "Borrar"
+#: plugins/admin/systems/class_divListSystem.inc:130
+#, fuzzy
+msgid "Asterisk Server"
+msgstr "Base de datos de usuarios Asterisk"
 
-#: 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/class_divListSystem.inc:131
+#, fuzzy
+msgid "Fax Server"
+msgstr "Servidor"
 
-#: 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_divListSystem.inc:132
+#, fuzzy
+msgid "Ldap Server"
+msgstr "Servidor de Intercambio"
 
-#: 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/class_divListSystem.inc:135
+#, fuzzy
+msgid "Edit system"
+msgstr "Lista de sistemas"
 
-#: plugins/admin/systems/servDNSeditZoneEntries.tpl:11
-msgid "To add a new host entry just click here"
-msgstr ""
+#: plugins/admin/systems/class_divListSystem.inc:136
+#, fuzzy
+msgid "Delete system"
+msgstr "Borrar"
+
+#: plugins/admin/systems/class_divListSystem.inc:173
+#, fuzzy
+msgid "Set root       password"
+msgstr "Poner Contraseña"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:58
-#: plugins/admin/ogroups/tabs_ogroups.inc:150
+#: plugins/admin/ogroups/tabs_ogroups.inc:161
 #, fuzzy
 msgid "Phone queue"
 msgstr "Número de teléfono"
 
-#: plugins/admin/ogroups/tabs_ogroups.inc:83
-#: plugins/admin/ogroups/tabs_ogroups.inc:130
+#: plugins/admin/ogroups/tabs_ogroups.inc:84
+#, fuzzy
+msgid "System"
+msgstr "Sistemas"
+
+#: plugins/admin/ogroups/tabs_ogroups.inc:141
 msgid "Terminals"
 msgstr "Terminales"
 
@@ -10253,6 +11367,10 @@ msgstr ""
 msgid "Primary mail address for this distribution list"
 msgstr "Dirección de correo electrónica primaria para esta carpeta compartida"
 
+#: plugins/admin/ogroups/class_termgroup.inc:111
+msgid "There must be at least one NTP server selected."
+msgstr ""
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:27
 msgid "Select to see departments"
 msgstr "Seleccione para ver los departamentos"
@@ -10309,64 +11427,139 @@ msgstr "Seleccione para ver teléfonos"
 msgid "Display objects of department"
 msgstr "Mostrar objetos de departamentos"
 
-#: plugins/admin/ogroups/termgroup.tpl:1
+#: plugins/admin/ogroups/termgroup.tpl:2
 msgid ""
-"All actions you choose here influence <b>all</b> machines in this object "
-"group. Be aware that rebooting machines may not make people happy who are "
-"currently working at these machines."
+"Actions you choose here influence all systems in this object group. "
+"Additionally, all values editable here can be inherited by the clients "
+"assigned to this object group."
 msgstr ""
-"Todas las acciones que elija aquí influirán en <b>todas</b> la máquinas en "
-"este objeto grupo. Tenga presente que reiniciar las máquinas pueden no hacer "
-"felices a las personas que actualmente están trabajando en ellas."
-
-#: plugins/admin/ogroups/termgroup.tpl:7
-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
+#: plugins/admin/ogroups/main.inc:35 plugins/admin/ogroups/main.inc:40
 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
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
 #, 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
+#: plugins/admin/ogroups/class_ogroupManagement.inc:193
+#: plugins/admin/ogroups/class_ogroupManagement.inc:221
 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
+#: plugins/admin/ogroups/class_divListOGroup.inc:38
+#: plugins/admin/ogroups/class_divListOGroup.inc:39
 #, fuzzy
-msgid "Create new object group"
-msgstr "Grupo de objetos"
+msgid "List of object groups"
+msgstr "Nombre del grupo"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:44
+#, fuzzy
+msgid ""
+"This menu allows you to add, edit or remove selected groups. You may want to "
+"use the range selector on top of the group listbox, when working with  a "
+"large number of groups."
+msgstr ""
+"Este menú le 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/ogroups/class_ogroupManagement.inc:493
+#: plugins/admin/ogroups/class_divListOGroup.inc:52
 #, fuzzy
 msgid "Name of object groups"
 msgstr "Nombre del grupo"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:542
+#: plugins/admin/ogroups/class_divListOGroup.inc:57
+#, fuzzy
+msgid "Select to see groups containing users"
+msgstr "Mostrar grupos que tienen usuarios"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:57
+msgid "Show groups containing users"
+msgstr "Mostrar grupos que tienen usuarios"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
+#, fuzzy
+msgid "Select to see groups containing groups"
+msgstr "Mostrar grupos que contienen grupos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:58
+msgid "Show groups containing groups"
+msgstr "Mostrar grupos que contienen grupos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
+#, fuzzy
+msgid "Select to see groups containing applications"
+msgstr "Mostrar grupos que contienen aplicaciones"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
+msgid "Show groups containing applications"
+msgstr "Mostrar grupos que contienen aplicaciones"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:60
+#, fuzzy
+msgid "Select to see groups containing departments"
+msgstr "Mostrar grupos que contienen departamentos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:60
+msgid "Show groups containing departments"
+msgstr "Mostrar grupos que contienen departamentos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:61
+#, fuzzy
+msgid "Select to see groups containing servers"
+msgstr "Mostrar grupos que contienen servidores"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:61
+msgid "Show groups containing servers"
+msgstr "Mostrar grupos que contienen servidores"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:62
+#, fuzzy
+msgid "Select to see groups containing workstations"
+msgstr "Mostrar grupos que contienen estaciones de trabajo"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:62
+msgid "Show groups containing workstations"
+msgstr "Mostrar grupos que contienen estaciones de trabajo"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+#, fuzzy
+msgid "Select to see groups containing terminals"
+msgstr "Mostrar grupos que contienen terminales"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:63
+msgid "Show groups containing terminals"
+msgstr "Mostrar grupos que contienen terminales"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+#, fuzzy
+msgid "Select to see groups containing printer"
+msgstr "Mostrar grupos que contienen impresoras"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:64
+#, fuzzy
+msgid "Show groups containing printer"
+msgstr "Mostrar grupos que contienen impresoras"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+#, fuzzy
+msgid "Select to see groups containing phones"
+msgstr "Mostrar grupos que contienen impresoras"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:65
+#, fuzzy
+msgid "Show groups containing phones"
+msgstr "Mostrar grupos que contienen impresoras"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:108
+#, fuzzy
+msgid "Create new object group"
+msgstr "Grupo de objetos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:163
 #: plugins/generic/references/class_reference.inc:50
 msgid "Object group"
 msgstr "Grupo de objetos"
@@ -10420,23 +11613,34 @@ 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/class_ogroup.inc:715
+#, fuzzy
+msgid "Saving object group failed"
+msgstr "Cuenta Kolab"
+
+#: plugins/admin/ogroups/class_ogroup.inc:728
+#, fuzzy
+msgid "Removing object group failed"
+msgstr "Parametros Unix"
+
 #: plugins/admin/ogroups/generic.tpl:9
 msgid "Name of the group"
 msgstr "Nombre del grupo"
 
-#: plugins/admin/ogroups/generic.tpl:33
+#: plugins/admin/ogroups/generic.tpl:37
 msgid "Member objects"
 msgstr "Objetos miembro"
 
@@ -10456,6 +11660,16 @@ msgstr ""
 "Esta cuenta tiene las características de correo desactivadas.Puede "
 "activarlas pulsando aqui."
 
+#: plugins/admin/ogroups/class_mailogroup.inc:98
+#, fuzzy
+msgid "Saving mail objectgroup settings failed"
+msgstr "Borrar cuenta de correo"
+
+#: plugins/admin/ogroups/class_mailogroup.inc:131
+#, fuzzy
+msgid "Removing mail objectgroup settings failed"
+msgstr "Parametros del correo de usuarios"
+
 #: plugins/admin/ogroups/class_phonequeue.inc:79
 #, fuzzy
 msgid "ring all"
@@ -10509,81 +11723,91 @@ 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:270
 #, 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/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:1047
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:256
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:372
+#: plugins/admin/ogroups/class_phonequeue.inc:250
+#: plugins/admin/ogroups/class_phonequeue.inc:625
+#: plugins/gofon/macro/class_gofonMacro.inc:246
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:87
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:307
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1049
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:281
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:397
 #, 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:661
 #, 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:1152
+#: plugins/admin/ogroups/class_phonequeue.inc:527
 #: plugins/gofon/phoneaccount/class_phoneAccount.inc:1154
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:412
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:414
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1156
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:437
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:439
 #, php-format
 msgid "The specified telephonenumber '%s' is already assigned to '%s'."
 msgstr ""
 
-#: plugins/admin/ogroups/class_phonequeue.inc:614
-#: 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:1036
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:361
+#: plugins/admin/ogroups/class_phonequeue.inc:587
+#, fuzzy
+msgid "Saving phone queue failed"
+msgstr "Cuenta proxy"
+
+#: plugins/admin/ogroups/class_phonequeue.inc:615
+#: plugins/gofon/macro/class_gofonMacro.inc:235
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:80
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:296
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1038
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:386
 #, 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:684
+#, fuzzy
+msgid "Removing phone queue failed"
+msgstr "Eliminar cuenta Posix"
+
 #: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -10592,63 +11816,16 @@ msgstr ""
 "Por favor pulse dos veces si quiere hacer esto, ya que no hay forma de que "
 "GOsa pueda recuperar posteriormente esa información"
 
-#: plugins/admin/ogroups/headpage.tpl:24
-msgid ""
-"This menu allows you to add, edit or remove selected groups. You may want to "
-"use the range selector on top of the group listbox, when working with a "
-"large number of groups."
-msgstr ""
-"Este menú le 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/ogroups/headpage.tpl:39
-msgid "Show groups containing users"
-msgstr "Mostrar grupos que tienen usuarios"
-
-#: plugins/admin/ogroups/headpage.tpl:40
-msgid "Show groups containing groups"
-msgstr "Mostrar grupos que contienen grupos"
-
-#: plugins/admin/ogroups/headpage.tpl:41
-msgid "Show groups containing applications"
-msgstr "Mostrar grupos que contienen aplicaciones"
-
-#: plugins/admin/ogroups/headpage.tpl:42
-msgid "Show groups containing departments"
-msgstr "Mostrar grupos que contienen departamentos"
-
-#: plugins/admin/ogroups/headpage.tpl:43
-msgid "Show groups containing servers"
-msgstr "Mostrar grupos que contienen servidores"
-
-#: plugins/admin/ogroups/headpage.tpl:44
-msgid "Show groups containing workstations"
-msgstr "Mostrar grupos que contienen estaciones de trabajo"
-
-#: plugins/admin/ogroups/headpage.tpl:45
-msgid "Show groups containing terminals"
-msgstr "Mostrar grupos que contienen terminales"
-
-#: plugins/admin/ogroups/headpage.tpl:46
-msgid "Show groups containing printers"
-msgstr "Mostrar grupos que contienen impresoras"
-
-#: plugins/admin/ogroups/headpage.tpl:51
-#, fuzzy
-msgid "Display object groups matching"
-msgstr "Mostrar objetos que concuerden con"
-
 #: plugins/admin/ogroups/phonequeue.tpl:1
 #, fuzzy
 msgid "Queue Settings"
 msgstr "Parámetros de quotas"
 
 #: plugins/admin/ogroups/phonequeue.tpl:4
-#: plugins/gofon/phoneaccount/generic.tpl:1
-#: plugins/gofon/phoneaccount/generic.tpl:4
 #: plugins/gofon/phoneaccount/paste_generic.tpl:2
 #: plugins/gofon/phoneaccount/paste_generic.tpl:6
+#: plugins/gofon/phoneaccount/generic.tpl:1
+#: plugins/gofon/phoneaccount/generic.tpl:4
 msgid "Phone numbers"
 msgstr "Números de teléfonos"
 
@@ -10765,55 +11942,118 @@ msgstr ""
 msgid "Ring instead of playing background music"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#: plugins/gofon/fonreports/class_fonreport.inc:6
+msgid "Phone Reports"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/fonreports/class_fonreport.inc:157
+#: plugins/gofon/fonreports/class_fonreport.inc:167
 #, fuzzy
-msgid "Phone macros"
+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:171
+#, 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:189
+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:21
+msgid "Phone reports"
 msgstr "Informes telefónicos"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:248
-#, 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_divListMacros.inc:31
+#: plugins/gofon/macro/class_divListMacros.inc:32
+#: plugins/gofon/macro/headpage.tpl:6
+#, fuzzy
+msgid "List of macros"
+msgstr "Lista de grupos"
+
+#: plugins/gofon/macro/class_divListMacros.inc:36
+#: 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/class_gofonMacroManagement.inc:254
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:279
+#: plugins/gofon/macro/class_divListMacros.inc:47
 #, fuzzy
-msgid "You are not allowed to delete this macro!"
-msgstr "¡No le está permitido eliminar este grupo!"
+msgid "Visible"
+msgstr "Variable"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:329
+#: plugins/gofon/macro/class_divListMacros.inc:54
+#: plugins/gofon/macro/headpage.tpl:41
 #, fuzzy
-msgid "Create new phone macro"
-msgstr "Crear cuenta telefónica"
+msgid "Regular expression for matching macro names"
+msgstr "Expresión regular que concuerde con nombres de grupos"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:344
+#: plugins/gofon/macro/class_divListMacros.inc:83
 #, fuzzy
-msgid "Visible"
-msgstr "Variable"
-
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:348
-msgid "This table displays all phone macros, in the selected tree."
-msgstr ""
+msgid "Create new phone macro"
+msgstr "Crear cuenta telefónica"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:379
+#: plugins/gofon/macro/class_divListMacros.inc:108
 #, fuzzy
 msgid "Macro"
 msgstr "Nombre de la maquina"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:380
+#: plugins/gofon/macro/class_divListMacros.inc:109
 #, fuzzy
 msgid "visible"
 msgstr "Visible Publicamente"
 
-#: plugins/gofon/macro/class_gofonMacroManagement.inc:381
+#: plugins/gofon/macro/class_divListMacros.inc:110
 #, fuzzy
 msgid "invisible"
 msgstr "Visible Publicamente"
 
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:25
+#, fuzzy
+msgid "Phone macros"
+msgstr "Informes telefónicos"
+
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:209
+#, 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:215
+#: plugins/gofon/macro/class_gofonMacroManagement.inc:242
+#, fuzzy
+msgid "You are not allowed to delete this macro!"
+msgstr "¡No le está permitido eliminar este grupo!"
+
 #: 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:249
 msgid ""
 "There is currently no asterisk server defined. Possibly you are missing a "
 "server that handles the asterisk management (goFonServer). Your settings "
@@ -10826,66 +12066,81 @@ msgstr ""
 msgid "This 'dn' is no phone macro."
 msgstr "Esta 'dn' no tiene características de teléfono."
 
-#: plugins/gofon/macro/class_gofonMacro.inc:159
+#: plugins/gofon/macro/class_gofonMacro.inc:187
 msgid ""
 "This macro ist still in use. To delete this Macro ensure that nobody has "
 "selected this Macro."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:191
+#: plugins/gofon/macro/class_gofonMacro.inc:194
+#, fuzzy
+msgid "Removing phone macro failed"
+msgstr "Eliminar cuenta Posix"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:208
+#, fuzzy
+msgid "Removing phone macro reverences failed"
+msgstr "Eliminar cuenta Posix"
+
+#: plugins/gofon/macro/class_gofonMacro.inc:221
 msgid ""
 "There is no mysql extension available in your php setup, can't save any "
 "changes to asterisk db."
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:261
+#: plugins/gofon/macro/class_gofonMacro.inc:291
 #, php-format
 msgid "Unable to parse macro contents on line: %s"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:279
+#: plugins/gofon/macro/class_gofonMacro.inc:309
 #, php-format
 msgid "Can't perform SELECT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:288
-#: plugins/gofon/macro/class_gofonMacro.inc:296
+#: plugins/gofon/macro/class_gofonMacro.inc:318
+#: plugins/gofon/macro/class_gofonMacro.inc:326
 #, php-format
 msgid "Can't perform DELETE query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:310
+#: plugins/gofon/macro/class_gofonMacro.inc:340
 #, php-format
 msgid "Can't perform INSERT query in DB '%s'"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:357
+#: plugins/gofon/macro/class_gofonMacro.inc:388
 #, 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:393
 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:397
 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:402
 #, 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:408
 msgid "Makro length must be lower than 100 lines"
 msgstr ""
 
-#: plugins/gofon/macro/class_gofonMacro.inc:382
+#: plugins/gofon/macro/class_gofonMacro.inc:413
 #, fuzzy
 msgid "Please choose a valid  base."
 msgstr "Por favor especifique un rango VSync valido"
 
+#: plugins/gofon/macro/class_gofonMacro.inc:456
+#, fuzzy
+msgid "Saving phone macro failed"
+msgstr "Cuenta proxy"
+
 #: plugins/gofon/macro/generic.tpl:6 plugins/gofon/macro/generic.tpl:7
 #, fuzzy
 msgid "Macro name"
@@ -10900,12 +12155,12 @@ msgstr ""
 msgid "Choose subtree to place macro in"
 msgstr "Elija lugar del árbol para colocar la aplicación"
 
-#: plugins/gofon/macro/generic.tpl:43
+#: plugins/gofon/macro/generic.tpl:48
 #, fuzzy
 msgid "Visible for user"
 msgstr "Lista de usuarios"
 
-#: plugins/gofon/macro/generic.tpl:52
+#: plugins/gofon/macro/generic.tpl:57
 #, fuzzy
 msgid "Macro text"
 msgstr "Nombre de la maquina"
@@ -10928,44 +12183,33 @@ 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
+#: plugins/gofon/macro/class_gofonMacroParameters.inc:396
 #, 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."
+msgid "Saving phone macro parameters failed"
+msgstr "Editar parámetros de aplicaciones opcionales"
 
 #: plugins/gofon/macro/headpage.tpl:38
 #, fuzzy
@@ -10977,12 +12221,7 @@ msgstr "Mostrar grupos que concuerden con"
 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
+#: plugins/gofon/macro/main.inc:43 plugins/gofon/macro/main.inc:47
 #, fuzzy
 msgid "Phone macro management"
 msgstr "Gestión del sistema"
@@ -10997,43 +12236,43 @@ msgstr "Argumentos"
 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."
@@ -11041,12 +12280,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 "
@@ -11055,7 +12294,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."
@@ -11063,19 +12302,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 "
@@ -11084,11 +12323,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 "
@@ -11097,33 +12336,48 @@ 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:1078
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:964
+#, fuzzy
+msgid "Saving phone account failed"
+msgstr "Cuenta proxy"
+
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1080
 msgid "Stop"
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1083
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1085
 msgid ""
 "Can't remove phone account, the mysql extension is not present in php "
 "configuration."
 msgstr ""
 
-#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1116
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1118
 #, php-format
 msgid "Removed user '%s' from phone queue '%s'."
 msgstr ""
 
+#: plugins/gofon/phoneaccount/class_phoneAccount.inc:1125
+#, fuzzy
+msgid "Removing phone account failed"
+msgstr "Eliminar cuenta Posix"
+
+#: plugins/gofon/phoneaccount/paste_generic.tpl:1
+#: plugins/gofon/phoneaccount/main.inc:122
+msgid "Phone settings"
+msgstr "Configuración telefónica"
+
+#: plugins/gofon/phoneaccount/paste_generic.tpl:32
 #: plugins/gofon/phoneaccount/generic.tpl:33
-#: plugins/gofon/phoneaccount/paste_generic.tpl:28
 msgid "Voicemail PIN"
 msgstr ""
 
+#: plugins/gofon/phoneaccount/paste_generic.tpl:40
 #: plugins/gofon/phoneaccount/generic.tpl:41
-#: plugins/gofon/phoneaccount/paste_generic.tpl:36
 #, fuzzy
 msgid "Phone PIN"
 msgstr "Teléfono"
@@ -11134,49 +12388,64 @@ 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_divListConferences.inc:31
+#: plugins/gofon/conference/class_divListConferences.inc:32
+#: plugins/gofon/conference/headpage.tpl:6
+#, fuzzy
+msgid "List of conference rooms"
+msgstr "Lista de grupos"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
+#: plugins/gofon/conference/class_divListConferences.inc:36
+#: plugins/gofon/conference/headpage.tpl:24
 #, fuzzy
-msgid "Phone conferences"
+msgid ""
+"This menu allows you to create, delete and edit selected phone conferences. "
+"Having a large number of phone conferences, you might prefer the range "
+"selectors on top of the conferences 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."
+
+#: plugins/gofon/conference/class_divListConferences.inc:46
+#, fuzzy
+msgid "Name - Number"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
+#: plugins/gofon/conference/class_divListConferences.inc:48
+#: plugins/gofon/conference/generic.tpl:112
+msgid "PIN"
+msgstr ""
+
+#: plugins/gofon/conference/class_divListConferences.inc:55
 #, fuzzy
-msgid "Management"
-msgstr "Nombre de la maquina"
+msgid "Regular expression for matching conference names"
+msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#: plugins/gofon/conference/class_divListConferences.inc:84
 #, fuzzy
 msgid "Create new conference"
 msgstr "Crear una nueva entrada en"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:290
+#: plugins/gofon/conference/class_divListConferences.inc:84
 #, fuzzy
 msgid "New conference"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:306
-msgid "This table displays all available conference rooms."
-msgstr ""
+#: plugins/gofon/conference/class_divListConferences.inc:135
+#, fuzzy
+msgid "Conference"
+msgstr "Referencias"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:310
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:25
 #, fuzzy
-msgid "Name - Number"
+msgid "Phone conferences"
 msgstr "Número de teléfono"
 
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:312
-#: plugins/gofon/conference/generic.tpl:107
-msgid "PIN"
-msgstr ""
-
-#: plugins/gofon/conference/class_phoneConferenceManagment.inc:366
+#: plugins/gofon/conference/class_phoneConferenceManagment.inc:26
 #, fuzzy
-msgid "Conference"
-msgstr "Referencias"
+msgid "Management"
+msgstr "Nombre de la maquina"
 
 #: plugins/gofon/conference/generic.tpl:13
 #, fuzzy
@@ -11194,141 +12463,88 @@ msgstr "Nombre del subárbol para crear"
 msgid "Choose subtree to place conference in"
 msgstr "Elija el subárbol donde colocar el usuario"
 
-#: plugins/gofon/conference/generic.tpl:61
+#: plugins/gofon/conference/generic.tpl:66
 msgid "Lifetime (in days)"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:99
+#: plugins/gofon/conference/generic.tpl:104
 #, fuzzy
 msgid "Preset PIN"
 msgstr "presente"
 
-#: plugins/gofon/conference/generic.tpl:113
+#: plugins/gofon/conference/generic.tpl:118
 #, fuzzy
 msgid "Record conference"
 msgstr "Referencias"
 
-#: plugins/gofon/conference/generic.tpl:121
+#: plugins/gofon/conference/generic.tpl:126
 msgid "Sound file format"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:138
+#: plugins/gofon/conference/generic.tpl:143
 msgid "Play music on hold"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:144
+#: plugins/gofon/conference/generic.tpl:149
 #, fuzzy
 msgid "Activate session menu"
 msgstr "Activar mensaje de ausencia"
 
-#: plugins/gofon/conference/generic.tpl:150
+#: plugins/gofon/conference/generic.tpl:155
 msgid "Announce users joining or leaving the conference"
 msgstr ""
 
-#: plugins/gofon/conference/generic.tpl:156
+#: plugins/gofon/conference/generic.tpl:161
 #, fuzzy
 msgid "Count users"
 msgstr "Pais"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:190
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:215
 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/class_phoneConferenceGeneric.inc:219
 #, fuzzy
 msgid "Please enter a PIN."
 msgstr "Por favor especifique una dirección de servidor - URI - válida."
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:198
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:223
 #, fuzzy
 msgid "Please enter a name for the conference."
 msgstr "¡Por favor introduzca un número de teléfono valido!"
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:202
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:227
 msgid "Only numeric chars are allowed in Number field."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:206
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:231
 msgid "Only numbers are allowed in Lifetime."
 msgstr ""
 
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:236
-#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:346
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:261
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:371
 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
-msgid "List of conference rooms"
-msgstr "Lista de grupos"
-
-#: plugins/gofon/conference/headpage.tpl:24
+#: plugins/gofon/conference/class_phoneConferenceGeneric.inc:509
 #, fuzzy
-msgid ""
-"This menu allows you to create, delete and edit selected phone conferences. "
-"Having a large number of phone conferences, you might prefer the range "
-"selectors on top of the conferences 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."
+msgid "Saving phone conference failed"
+msgstr "Cuenta proxy"
 
 #: plugins/gofon/conference/headpage.tpl:36
 #, fuzzy
 msgid "Regular expression for        matching user names"
 msgstr "Expresiones regulares que concuerden con nombres de usuarios"
 
-#: plugins/gofon/conference/main.inc:38 plugins/gofon/conference/main.inc:40
+#: plugins/gofon/conference/main.inc:39 plugins/gofon/conference/main.inc:41
 #, fuzzy
 msgid "Conference management"
 msgstr "Mantenimiento de Departamentos"
 
-#: 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/generic/references/class_reference.inc:46
 msgid "Thin Client"
 msgstr "Cliente ligero"
@@ -11346,9 +12562,15 @@ msgstr "Contacto"
 msgid "This object has no relationship to other objects."
 msgstr "Este objeto no tiene ninguna relación con otros objetos."
 
+#: plugins/generic/welcome/main.inc:24
+#, php-format
+msgid "Welcome %s!"
+msgstr "¡Bienvenido %s!"
+
 #: plugins/generic/welcome/welcome.tpl:4
+#, fuzzy
 msgid ""
-"This is the GOsa main screen. You can select your tasks from the menu on the "
+"This is the GOsa main menu. 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 ""
@@ -11369,48 +12591,105 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "El equipo de GOsa"
 
-#: plugins/generic/welcome/main.inc:24
+#: include/class_mail-methods-cyrus.inc:39
+msgid "Warning: Account has an invalid mailserver string!"
+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:127
 #, php-format
-msgid "Welcome %s!"
-msgstr "¡Bienvenido %s!"
+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_plugin.inc:465
+#: include/class_mail-methods-cyrus.inc:146
 #, php-format
-msgid ""
-"Command '%s', specified as POSTCREATE for plugin '%s' doesn't seem to exist."
+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:172
+#, fuzzy
+msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
 msgstr ""
-"El comando '%s', especificado como 'POSTCREATE' para la extensión '%s' no "
-"parece existir."
+"Aviso: imap_getacl no ha sido implementado, no se modificara información "
+"sobre las listas de acceso."
+
+#: include/class_mail-methods-cyrus.inc:190
+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_plugin.inc:493 include/class_password-methods.inc:181
+#: include/class_mail-methods-cyrus.inc:212
 #, php-format
-msgid ""
-"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgid "Can't remove IMAP mailbox. Server says '%s'."
 msgstr ""
-"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
-"parece existir."
+"No se puede eliminar la carpeta de correo IMAP. El error del servidor es: '%"
+"s'"
+
+#: include/class_mail-methods-cyrus.inc:240
+#, 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:253
+#, 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:324
+#, 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:328
+#, 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_debconfTemplate.inc:260
+#, fuzzy
+msgid "This package has no debconf options."
+msgstr "Esta cuenta no tiene extensiones telefónicas"
+
+#: include/class_password-methods.inc:165
+#, php-format
+msgid "Setting the password failed. LDAP server says '%s'."
+msgstr ""
+"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
 
-#: include/class_plugin.inc:521
+#: include/class_password-methods.inc:181 include/class_plugin.inc:577
 #, php-format
 msgid ""
-"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
-"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
+"El comando '%s', especificado como POSTMODIFY para la extensión '%s' no "
 "parece existir."
 
-#: include/functions_setup.inc:98
-msgid "Can't bind to LDAP. No schema check possible!"
+#: include/class_password-methods.inc:202
+msgid ""
+"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
 msgstr ""
-"No se pudo establecer la conexión al servidor LDAP. ¡No se pudo comprobar el "
-"esquema.!"
+"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
+"pueden cambiar las contraseñas de SAMBA."
 
-#: include/functions_setup.inc:107 include/functions_setup.inc:116
+#: include/functions_setup.inc:84
 msgid "Can't get schema information from server. No schema check possible!"
 msgstr ""
 "No se pudo obtener la información del esquema del servidor. No se pudo "
 "comprobar el esquema."
 
-#: include/functions_setup.inc:136
+#: include/functions_setup.inc:99
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' is not present in LDAP "
@@ -11419,7 +12698,7 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no esta disponible en configuración de LDAP."
 
-#: include/functions_setup.inc:140
+#: include/functions_setup.inc:103
 #, php-format
 msgid ""
 "Optional objectclass '%s' required by plugin '%s' does not have version %s"
@@ -11427,108 +12706,120 @@ msgstr ""
 "El objeto de clase (objectclass) opcional '%s' requerido por la extensión '%"
 "s' no tiene la versión %s"
 
-#: include/functions_setup.inc:145
+#: include/functions_setup.inc:108
 #, php-format
 msgid "Support for '%s' enabled"
 msgstr "Es soporte para '%s' esta activado"
 
-#: include/functions_setup.inc:155
+#: include/functions_setup.inc:118
 #, php-format
 msgid "Required objectclass '%s' is not present in LDAP setup"
 msgstr ""
 "No se encuentra el objeto de clase (object class) requerido '%s' en la "
 "configuración del servidor LDAP."
 
-#: include/functions_setup.inc:159
+#: include/functions_setup.inc:122
 #, php-format
 msgid "Required objectclass '%s' does not have version %s"
 msgstr "El objeto de clase (objectclass) requerido '%s' no tiene la versión %s"
 
-#: include/functions_setup.inc:170
+#: include/functions_setup.inc:133
 msgid "SAMBA 3 support disabled, no schema seems to be installed"
 msgstr ""
 "El soporte de SAMBA 3 se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:175
+#: include/functions_setup.inc:138
 msgid "SAMBA 3 support enabled"
 msgstr "Soporte de SAMBA 3 activado"
 
-#: include/functions_setup.inc:180
+#: include/functions_setup.inc:143
 msgid "SAMBA 2 support disabled, no schema seems to be installed"
 msgstr ""
 "El soporte de SAMBA 2 se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:185
+#: include/functions_setup.inc:148
 msgid "SAMBA 2 support enabled"
 msgstr "Soporte de SAMBA 2 activado"
 
-#: include/functions_setup.inc:191
+#: include/functions_setup.inc:154
 msgid "Support for pureftp disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para pureftp se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:196
+#: include/functions_setup.inc:159
 msgid "Support for pureftp enabled"
 msgstr "Soporte de PUREFTP activado"
 
-#: include/functions_setup.inc:201
+#: include/functions_setup.inc:164
 msgid "Support for WebDAV disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para WebDAV se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:206
+#: include/functions_setup.inc:169
 msgid "Support for WebDAV enabled"
 msgstr "Soporte de WebDAV activado"
 
-#: include/functions_setup.inc:211
+#: include/functions_setup.inc:174
 msgid "Support for phpgroupware disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para phpgroupware se encuentra desactivado, no parece haber "
 "esquemas instalados"
 
-#: include/functions_setup.inc:216
+#: include/functions_setup.inc:179
 msgid "Support for phpgroupware enabled"
 msgstr "El soporte para phpgroupware está activado"
 
-#: include/functions_setup.inc:221
+#: include/functions_setup.inc:184
 #, fuzzy
 msgid "Support for trustAccount disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para gofon se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:226
+#: include/functions_setup.inc:189
 #, fuzzy
 msgid "Support for trustAccount enabled"
 msgstr "Soporte de GOFON activado"
 
-#: include/functions_setup.inc:231
+#: include/functions_setup.inc:194
 msgid "Support for gofon disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para gofon se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:236
+#: include/functions_setup.inc:199
 msgid "Support for gofon enabled"
 msgstr "Soporte de GOFON activado"
 
-#: include/functions_setup.inc:241
+#: include/functions_setup.inc:204
 #, fuzzy
 msgid "Support for nagios disabled, no schema seems to be installed"
 msgstr ""
 "El soporte para gofon se encuentra desactivado, no parece haber esquemas "
 "instalados"
 
-#: include/functions_setup.inc:246
+#: include/functions_setup.inc:209
 #, fuzzy
 msgid "Support for nagios enabled"
 msgstr "Soporte de GOFON activado"
 
-#: include/functions_setup.inc:256
+#: include/functions_setup.inc:214
+#, 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:219
+#, fuzzy
+msgid "Support for netatalk enabled"
+msgstr "Soporte de GOFON activado"
+
+#: include/functions_setup.inc:229
 msgid ""
 "Support for Kolab disabled, no schema seems to be installed, setting mail-"
 "method to cyrus"
@@ -11536,31 +12827,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:236
 msgid "Support for Kolab enabled"
 msgstr "Soporte de KOLAB activado"
 
-#: include/functions_setup.inc:281
+#: include/functions_setup.inc:254 include/functions.inc:1084
 msgid "OK"
 msgstr "Perfecto"
 
-#: include/functions_setup.inc:284
+#: include/functions_setup.inc:257
 msgid "Ignored"
 msgstr "Ignorado"
 
-#: include/functions_setup.inc:286
+#: include/functions_setup.inc:259
 msgid "Failed"
 msgstr "Fallado"
 
-#: include/functions_setup.inc:303
+#: include/functions_setup.inc:276
 msgid "PHP setup inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.inc:304
+#: include/functions_setup.inc:278
 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:279
 msgid ""
 "PHP must be of version 4.1.0 or above for some functions and known bugs in "
 "PHP language."
@@ -11568,13 +12859,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:282
 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:283
 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 "
@@ -11584,37 +12875,48 @@ 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:286
+msgid "PHP session.gc_maxlifetime (>= 86400 seconds)."
+msgstr ""
+
+#: include/functions_setup.inc:287
+msgid ""
+"PHP uses this value for the garbage collector to delete old sessions, "
+"setting this value to one day will prevent loosing session and cookie  "
+"before they really timeout."
+msgstr ""
+
+#: include/functions_setup.inc:290
 msgid "Checking for ldap module"
 msgstr "Comprobando los módulos de ldap"
 
-#: include/functions_setup.inc:313
+#: include/functions_setup.inc:291
 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:294
 #, fuzzy
 msgid "Checking for XML functions"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:317
+#: include/functions_setup.inc:295
 msgid "XML functions are required to parse the configuration file."
 msgstr ""
 
-#: include/functions_setup.inc:320
+#: include/functions_setup.inc:298
 msgid "Checking for gettext support"
 msgstr "Comprobando el soporte de gettext"
 
-#: include/functions_setup.inc:321
+#: include/functions_setup.inc:299
 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:302
 msgid "Checking for iconv support"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:325
+#: include/functions_setup.inc:303
 msgid ""
 "This module is used by GOsa to convert samba munged dial informations and is "
 "therefore required."
@@ -11623,11 +12925,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:306
 msgid "Checking for mhash module"
 msgstr "Comprobando por el módulo de mhash"
 
-#: include/functions_setup.inc:329
+#: include/functions_setup.inc:307
 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."
@@ -11635,11 +12937,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:310
 msgid "Checking for imap module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:333
+#: include/functions_setup.inc:311
 msgid ""
 "The IMAP module is needed to communicate with the IMAP server. It gets "
 "status informations, creates and deletes mail users."
@@ -11647,11 +12949,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:314
 msgid "Checking for getacl in imap"
 msgstr "Comprobando por getacl en imap"
 
-#: include/functions_setup.inc:337
+#: include/functions_setup.inc:315
 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 "
@@ -11661,21 +12963,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:318
 msgid "Checking for mysql module"
 msgstr "Comprobando el módulo de mysql"
 
-#: include/functions_setup.inc:341
+#: include/functions_setup.inc:319
 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:322
 msgid "Checking for cups module"
 msgstr "Comprobando el módulo de cups"
 
-#: include/functions_setup.inc:345
+#: include/functions_setup.inc:323
 msgid ""
 "In order to read available printers from IPP protocol instead of printcap "
 "files, you've to install the CUPS module."
@@ -11683,11 +12985,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:326
 msgid "Checking for kadm5 module"
 msgstr "Comprobando el módulo kadm5"
 
-#: include/functions_setup.inc:349
+#: include/functions_setup.inc:327
 msgid ""
 "Managing users in kerberos requires the kadm5 module which is downloadable "
 "via PEAR network."
@@ -11695,27 +12997,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:330
 #, fuzzy
 msgid "Checking for snmp Module"
 msgstr "Comprobando el módulo de imap"
 
-#: include/functions_setup.inc:353
+#: include/functions_setup.inc:331
 msgid ""
 "Simple Network Management Protocol (SNMP) is required for client monitoring."
 msgstr ""
 
-#: include/functions_setup.inc:389
+#: include/functions_setup.inc:367
 #, fuzzy
 msgid "PHP detailed function inspection"
 msgstr "Comprobación configuración PHP"
 
-#: include/functions_setup.inc:393
+#: include/functions_setup.inc:371
 #, fuzzy, php-format
 msgid "Checking for function %s"
 msgstr "Comprobando el soporte de iconv"
 
-#: include/functions_setup.inc:394
+#: include/functions_setup.inc:372
 #, fuzzy, php-format
 msgid ""
 "The function %s is used by GOsa. There is no information if it's optional or "
@@ -11725,15 +13027,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:383
 msgid "Checking for some additional programms"
 msgstr "Comprobando programas adicionales"
 
-#: include/functions_setup.inc:414
+#: include/functions_setup.inc:392
 msgid "Checking for ImageMagick (>=5.4.0)"
 msgstr "Comprobando por ImageMagick (>=5.4.0)"
 
-#: include/functions_setup.inc:415
+#: include/functions_setup.inc:393
 msgid ""
 "ImageMagick is used to convert user supplied images to fit the suggested "
 "size and the unified JPEG format."
@@ -11741,11 +13043,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:396
 msgid "Checking imagick module for PHP"
 msgstr "Comprobando el módulo PHP de imagick"
 
-#: include/functions_setup.inc:419
+#: include/functions_setup.inc:397
 msgid ""
 "Imagick is used to convert user supplied images to fit the suggested size "
 "and the unified JPEG format from PHP script."
@@ -11753,11 +13055,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:404
 msgid "Checking for fping utility"
 msgstr "Comprobando la herramienta fping"
 
-#: include/functions_setup.inc:427
+#: include/functions_setup.inc:405
 msgid ""
 "The fping utility is only used if you've got a thin client based terminal "
 "environment running."
@@ -11765,11 +13067,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:420
 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:421
 msgid ""
 "In order to use SAMBA 2/3, you've to install some additional packages to "
 "generate password hashes."
@@ -11777,11 +13079,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:434
 msgid "php.ini check -> session.auto_register"
 msgstr "php.ini comprobación -> session.auto_register"
 
-#: include/functions_setup.inc:457
+#: include/functions_setup.inc:435
 msgid ""
 "In Order to use GOsa without any trouble, the session.auto_register option "
 "in your php.ini must be set to 'Off'."
@@ -11789,11 +13091,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:438
 msgid "php.ini check -> implicit_flush"
 msgstr "php.ini comprobación -> implicit_flush"
 
-#: include/functions_setup.inc:461
+#: include/functions_setup.inc:439
 msgid ""
 "This option influences the Output handling. Turn this Option off, to "
 "increase performance."
@@ -11801,11 +13103,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:446
 msgid "php.ini check -> max_execution_time"
 msgstr "php.ini comprobación -> max_execution_time"
 
-#: include/functions_setup.inc:469
+#: include/functions_setup.inc:447
 msgid ""
 "The Execution time should be at least 30 seconds, because some actions may "
 "consume more time."
@@ -11813,11 +13115,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:454
 msgid "php.ini check -> memory_limit"
 msgstr "pnp.ini comprobación -> memory_limit"
 
-#: include/functions_setup.inc:477
+#: include/functions_setup.inc:455
 #, fuzzy
 msgid ""
 "GOsa needs at least 16MB of memory, less will cause unpredictable errors! "
@@ -11827,11 +13129,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:459
 msgid "php.ini check -> expose_php"
 msgstr "php.ini comprobación -> expose_php"
 
-#: include/functions_setup.inc:482
+#: include/functions_setup.inc:460
 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."
@@ -11840,11 +13142,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:464
 msgid "php.ini check -> magic_quotes_gpc"
 msgstr "php.ini comprobación -> magic_quotes_gpc"
 
-#: include/functions_setup.inc:487
+#: include/functions_setup.inc:465
 msgid ""
 "Increase your server security by setting magic_quotes_gpc to 'on'. PHP will "
 "escape all quotes in strings in this case."
@@ -11852,11 +13154,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:711
 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:720 include/functions_setup.inc:803
 msgid ""
 "Can't connect to the specified LDAP server! Please make sure that is "
 "reachable for GOsa."
@@ -11864,8 +13166,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:734 include/functions_setup.inc:808
+#: include/functions_setup.inc:813
 msgid ""
 "Can't bind to the specified LDAP server! Please make sure that it is "
 "reachable for GOsa."
@@ -11873,7 +13175,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:823
 #, fuzzy
 msgid ""
 "Bind to server successful, but the server seems to be completly empty, "
@@ -11882,7 +13184,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:879
 #, php-format
 msgid ""
 "You're missing the required attribute '%s' from this formular. Please "
@@ -11890,19 +13192,19 @@ msgid ""
 msgstr ""
 "Falta el atributo requerido '%s' de este formulario. Por favor, complételo."
 
-#: include/functions_setup.inc:931
+#: include/functions_setup.inc:910
 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:919
 #, 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:1029 include/functions_setup.inc:1052
+#: include/functions_setup.inc:1061 html/index.php:244
 #: ihtml/themes/altlinux/setup_useradmin.tpl:6
 #: ihtml/themes/default/setup_useradmin.tpl:6
 msgid ""
@@ -11911,104 +13213,101 @@ msgid ""
 msgstr ""
 "No tiene una cuenta administrativa para GOsa, no podrá administrar nada."
 
-#: include/class_password-methods.inc:165
-#, php-format
-msgid "Setting the password failed. LDAP server says '%s'."
+#: include/class_password-methods-sha.inc:50
+msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
 msgstr ""
-"Fallo al tratar de configurar la contraseña. El servidor LDAP contesto '%s'."
+"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
 
-#: include/class_password-methods.inc:202
+#: include/class_password-methods-kerberos.inc:43
 msgid ""
-"Setting for SMBHASH in gosa.conf is incorrect! Can't change Samba password."
+"Warning: Can't set kerberos password. Your PHP version has no kerberos "
+"support, password has not been changed."
 msgstr ""
-"La configuración para SMBHASH en /etc/gosa/gosa.conf es incorrecta. No se "
-"pueden cambiar las contraseñas de SAMBA."
+"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-sha.inc:50
-msgid "Can't use sha for encryption, missing function sha1 / mhash / crypt"
+#: 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 ""
-"No puedo usar sha para encriptación, falta la función sha1 / mhash / crypt"
+"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
 
 #: include/functions_helpviewer.inc:43
 #, fuzzy, php-format
 msgid "XML error in guide.xml: %s at line %d"
 msgstr "Error XML en 'gosa.conf': %s en la linea %d"
 
-#: include/functions_helpviewer.inc:86
+#: include/functions_helpviewer.inc:84
 msgid "No help available for this plugin."
 msgstr ""
 
-#: include/functions_helpviewer.inc:95
+#: include/functions_helpviewer.inc:93 html/helpviewer.php:192
 msgid "previous"
 msgstr ""
 
-#: include/functions_helpviewer.inc:99
+#: include/functions_helpviewer.inc:97 html/helpviewer.php:196
 #, fuzzy
 msgid "next"
 msgstr "texto"
 
-#: include/functions_helpviewer.inc:387
+#: include/functions_helpviewer.inc:385
 #, php-format
-msgid "%s results for your search with the keyword %s interpreted as %s"
+msgid "%s results for your search with the keyword %s"
 msgstr ""
 
-#: include/functions_helpviewer.inc:462
+#: include/functions_helpviewer.inc:459
 #, php-format
 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."
+#: include/class_ppdManager.inc:13
+#, php-format
+msgid "PPD manager : The specified path '%s' doesn't exists."
 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!"
+#: include/class_ppdManager.inc:144
+#, php-format
+msgid "Specified ppd file '%s' can't be opened for reading."
 msgstr ""
-"¡Fallo al tratar de cambiar la contraseña en la base de datos de kerberos!."
 
-#: include/class_ppdManager.inc:13
+#: include/class_ppdManager.inc:146
 #, php-format
-msgid "PPD manager : The specified path '%s' doesn't exists."
+msgid "The required tmp file file '%s' can't be opened for writing."
 msgstr ""
 
-#: include/class_ppdManager.inc:129 include/class_ppdManager.inc:247
+#: include/class_ppdManager.inc:170 include/class_ppdManager.inc:297
 #, 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:178
 #, 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:182
 #, fuzzy
 msgid "Group name not unique!"
 msgstr "Nombre del grupo"
 
-#: include/class_ppdManager.inc:147 include/class_ppdManager.inc:177
+#: include/class_ppdManager.inc:188 include/class_ppdManager.inc:218
 msgid "Symbol values are not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:171
+#: include/class_ppdManager.inc:212
 msgid "Nested options are not supported!"
 msgstr ""
 
-#: include/class_ppdManager.inc:196
+#: include/class_ppdManager.inc:237
 msgid "PickMany is not supported yet!"
 msgstr ""
 
-#: include/class_ppdManager.inc:268
+#: include/class_ppdManager.inc:318
 #, php-format
 msgid "Parsing PPD file %s failed - no information found."
 msgstr ""
@@ -12044,7 +13343,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:375
 msgid "Toggle information"
 msgstr "Información de intercambio"
 
@@ -12080,310 +13379,357 @@ msgstr "Linea"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: include/functions.inc:292
+#: include/functions_dns.inc:166
 #, php-format
-msgid "Error when connecting the LDAP. Server said '%s'."
+msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
 msgstr ""
-"Hay un error trantando de conectarse al servidor LDAP. El error del servidor "
-"es: '%s'"
 
-#: include/functions.inc:313
+#: include/functions_dns.inc:171
 #, php-format
-msgid "User login failed. LDAP server said '%s'."
-msgstr "Autenticación del usuario fallida. El servidor LDAP contesto '%s'."
-
-#: include/functions.inc:332
-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:370
 msgid ""
-"Error while adding a lock. Parameters are not set correctly, please check "
-"the source!"
+"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
+"zone."
 msgstr ""
-"Error al tratar de agregar un bloqueo. Los parámetros no son correctos, por "
-"favor, compruebe el código fuente."
 
-#: include/functions.inc:380
+#: include/functions_dns.inc:363
 #, php-format
 msgid ""
-"Can't set locking information in LDAP database. Please check the 'config' "
-"entry in gosa.conf! LDAP server says '%s'."
+"Found more than one dns zone which contains an entry named '%s'. Aborting "
+"getting dns informations for this device."
 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:395
-#, 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:421
-#, 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:451
-msgid ""
-"Getting the lock from LDAP failed. Parameters are not set correctly, please "
-"check the source!"
+#: include/class_password-methods-ssha.inc:51
+msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
 msgstr ""
-"Fallo al tratar de obtener un bloqueo de LDAP. Los parámetros no fueron "
-"correctamente configurados, por favor, compruebe el código fuente."
+"No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
 
-#: include/functions.inc:461
+#: include/class_pluglist.inc:115
 msgid ""
-"Can't get locking information in LDAP database. Please check the 'config' "
-"entry in gosa.conf!"
+"Your gosa.conf information has changed partly. Please convert it using the "
+"contributed script fix_config.sh!"
 msgstr ""
-"No puedo bloquear la información en la base de datos LDAP. Por favor, "
-"compruebe la entrada 'config' en el archivos gosa.conf."
+"El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
+"favor actualízela usando el script 'fix_config.sh'!"
+
+#: include/class_pluglist.inc:129 include/class_pluglist.inc:130
+#: include/class_pluglist.inc:229
+#, fuzzy
+msgid "Unknown"
+msgstr "estado desconocido"
 
-#: include/functions.inc:469
+#: include/class_pluglist.inc:137 ihtml/themes/altlinux/framework.tpl:14
+#: ihtml/themes/altlinux/framework.tpl:24
+#: ihtml/themes/default/framework.tpl:14 ihtml/themes/default/framework.tpl:24
 msgid ""
-"Found multiple locks for object to be locked. This should not be possible - "
-"cleaning up multiple references."
+"You are currently editing a database entry. Do you want to dismiss the "
+"changes?"
 msgstr ""
-"Se encontraron varios bloqueos para el objeto a bloquear. Esto no debería "
-"ser posible, eliminando referencias múltiples."
+"Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
+"los cambios?"
 
-#: include/functions.inc:583
-#, php-format
-msgid "The size limit of %d entries is exceed!"
-msgstr "¡Ha excedido el tamaño máximo de %d entradas!"
+#: include/class_CopyPasteHandler.inc:152
+#, fuzzy, php-format
+msgid "You are going to copy the entry '%s'."
+msgstr "Has decidido eliminar la entrada %s"
 
-#: include/functions.inc:585
-#, php-format
-msgid ""
-"Set the new size limit to %s and show me this message if the limit still "
-"exceeds"
-msgstr ""
-"Indique el nuevo tamaño limite a %s y enséñame este mensaje si el tamaño "
-"limite es todavía superado"
+#: include/class_CopyPasteHandler.inc:216
+#, fuzzy
+msgid "Paste"
+msgstr "Fecha"
 
-#: include/functions.inc:602
-msgid "incomplete"
-msgstr "incompleto"
+#: include/class_CopyPasteHandler.inc:218
+#, fuzzy
+msgid "Can't paste"
+msgstr "Crear cuenta telefónica"
 
-#: include/functions.inc:1003
+#: include/class_ldap.inc:195
 #, php-format
-msgid "Last message repeated %s times."
+msgid ""
+"The LDAP server is slow (%.2fs for the last query). This may be responsible "
+"for performance breakdowns."
 msgstr ""
 
-#: include/functions.inc:1069
+#: include/class_ldap.inc:227
 #, php-format
 msgid ""
-"You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
-"Please contact the person in order to clarify proceedings."
+"The ldapserver is answering very slow (%.2f), this may be responsible for "
+"performance breakdowns."
 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:1168
-msgid "LDAP error:"
-msgstr "Error LDAP:"
+#: include/class_ldap.inc:447
+#, fuzzy, php-format
+msgid "Creating copy of %s"
+msgstr "Lista de usuarios"
 
-#: include/functions.inc:1346
-msgid "Entries per page"
+#: include/class_ldap.inc:450
+msgid "Processing"
 msgstr ""
 
-#: include/functions.inc:1374
-msgid "Apply filter"
-msgstr ""
+#: include/class_ldap.inc:490
+#, fuzzy
+msgid "Error while fetching source dn - aborted!"
+msgstr "¡Error mientras se exportaban las entradas indicadas!"
 
-#: include/functions.inc:1648
-msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+#: include/class_ldap.inc:553
+#, fuzzy, php-format
+msgid "Unknown FAIstate %s"
+msgstr "estado desconocido"
 
-#: include/functions.inc:1691
+#: include/class_ldap.inc:701
 #, php-format
-msgid "GOsa development snapshot (Rev %s)"
-msgstr "Versión de desarrollo de GOsa (Rev %s)"
+msgid ""
+"Autocreation of type '%s' is currently not supported. Please report to the "
+"GOsa team."
+msgstr ""
+"Actualmente no esta soportada la creación automática del tipo '%s'. Por "
+"favor, informe de esto al equipo de desarrollo de GOsa."
 
-#: include/class_password-methods-ssha.inc:51
-msgid "Can't use ssha for encryption. (Missing function mhash / sha1)"
+#: include/class_ldap.inc:770
+#, php-format
+msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
-"No se puede usar sha para encriptación. (Falta la función mhash / sha1)"
 
-#: include/class_pluglist.inc:115
-msgid ""
-"Your gosa.conf information has changed partly. Please convert it using the "
-"contributed script fix_config.sh!"
+#: include/class_ldap.inc:772
+#, fuzzy, php-format
+msgid "while operating on LDAP server %s"
 msgstr ""
-"El contenido de la configuración 'gosa.conf' ha cambiado parcialmente. ¡Por "
-"favor actualízela usando el script 'fix_config.sh'!"
+"Hay un error trantando de conectarse al servidor LDAP. El error del servidor "
+"es: '%s'"
 
-#: 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
+#: include/class_ldap.inc:968
+#, php-format
 msgid ""
-"You are currently editing a database entry. Do you want to dismiss the "
-"changes?"
+"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
+"in line %s"
 msgstr ""
-"Esta actualmente editando una entrada de la base de datos. ?Quiere quitar "
-"los cambios?"
+"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
+"en la linea %s"
+
+#: include/class_ldap.inc:981
+#, 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:997
+#, 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_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:197 html/index.php:203
 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:456
 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/functions.inc:298
 #, fuzzy, php-format
-msgid "Creating copy of %s"
-msgstr "Lista de usuarios"
+msgid "FATAL: 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:315
+#, php-format
+msgid "User login failed. LDAP server said '%s'."
+msgstr "Autenticación del usuario fallida. El servidor LDAP contesto '%s'."
+
+#: include/functions.inc:336
+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:468
+msgid ""
+"Error while adding a lock. Parameters are not set correctly, please check "
+"the source!"
+msgstr ""
+"Error al tratar de agregar un bloqueo. Los parámetros no son correctos, por "
+"favor, compruebe el código fuente."
+
+#: include/functions.inc:478
+#, php-format
+msgid ""
+"Can't set locking information in LDAP database. Please check the 'config' "
+"entry in gosa.conf! LDAP server says '%s'."
+msgstr ""
+"No se pudo generar el bloqueo a la base de datos LDAP. Por favor, compruebe "
+"la entrada 'config' en gosa.conf. El servidor LDAP contesto '%s'."
+
+#: include/functions.inc:493
+#, 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:519
+#, 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/class_ldap.inc:408
-msgid "Processing"
+#: include/functions.inc:549
+msgid ""
+"Getting the lock from LDAP failed. Parameters are not set correctly, please "
+"check the source!"
 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/class_ldap.inc:448
-#, fuzzy
-msgid "Error while fetching source dn - aborted!"
-msgstr "¡Error mientras se exportaban las entradas indicadas!"
-
-#: include/class_ldap.inc:511
-#, fuzzy, php-format
-msgid "Unknown FAIstate %s"
-msgstr "estado desconocido"
-
-#: include/class_ldap.inc:632
-#, php-format
+#: include/functions.inc:559
 msgid ""
-"Autocreation of type '%s' is currently not supported. Please report to the "
-"GOsa team."
+"Can't get locking information in LDAP database. Please check the 'config' "
+"entry in gosa.conf!"
 msgstr ""
-"Actualmente no esta soportada la creación automática del tipo '%s'. Por "
-"favor, informe de esto al equipo de desarrollo de GOsa."
+"No puedo bloquear la información en la base de datos LDAP. Por favor, "
+"compruebe la entrada 'config' en el archivos gosa.conf."
 
-#: include/class_ldap.inc:894
-#, php-format
+#: include/functions.inc:567
 msgid ""
-"This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
-"in line %s"
+"Found multiple locks for object to be locked. This should not be possible - "
+"cleaning up multiple references."
 msgstr ""
-"El DN: '%s' no es válido, Un bloque importado debería comenzar por 'dn:...' "
-"en la linea %s"
+"Se encontraron varios bloqueos para el objeto a bloquear. Esto no debería "
+"ser posible, eliminando referencias múltiples."
 
-#: include/class_ldap.inc:907
+#: include/functions.inc:653
 #, 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."
+msgid "The size limit of %d entries is exceed!"
+msgstr "¡Ha excedido el tamaño máximo de %d entradas!"
 
-#: include/class_ldap.inc:923
+#: include/functions.inc:655
 #, php-format
-msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
+msgid ""
+"Set the new size limit to %s and show me this message if the limit still "
+"exceeds"
 msgstr ""
-"Ha habido un error mientras se importaba el dn: '%s', ¡pro favor compruebe "
-"el LDIF desde la linea %s en adelante!"
+"Indique el nuevo tamaño limite a %s y enséñame este mensaje si el tamaño "
+"limite es todavía superado"
 
-#: include/class_debconfTemplate.inc:250
-#, fuzzy
-msgid "This package has no debconf options."
-msgstr "Esta cuenta no tiene extensiones telefónicas"
+#: include/functions.inc:672
+msgid "incomplete"
+msgstr "incompleto"
 
-#: include/class_mail-methods-cyrus.inc:39
+#: include/functions.inc:1062 include/functions.inc:1251
+msgid "LDAP error:"
+msgstr "Error LDAP:"
+
+#: include/functions.inc:1063
 msgid ""
-"Warning: Account has an invalid mailserver string! Please check the mail "
-"server settings in the mail tab."
+"Problems with the LDAP server mean that you probably lost the last changes. "
+"Please check your LDAP setup for possible errors and try again."
 msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:52
+#: include/functions.inc:1071
 msgid ""
-"Warning: IMAP Server cannot be reached! If you save this account, some mail "
-"settings will not be stored on your server!"
+"Please check your input and fix the error. Press 'OK' to close this message "
+"box."
 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'."
+#: include/functions.inc:1080
+#, fuzzy
+msgid "An error occured while processing your request"
 msgstr ""
-"No se pueden crear carpetas de correo IMAP. El error del servidor es: '%s'"
+"Un error ha ocurrido cuando se insertaba la entrada '%s' - El proceso ha "
+"sido abortado."
 
-#: 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/functions.inc:1145
+#, fuzzy
+msgid "Continue anyway"
+msgstr "Continuar"
 
-#: include/class_mail-methods-cyrus.inc:155
+#: include/functions.inc:1147
 #, fuzzy
-msgid "Warning: imap_getacl is not implemented, can't remove acl informations."
+msgid "Edit anyway"
+msgstr "Editar entrada"
+
+#: include/functions.inc:1149
+#, php-format
+msgid ""
+"You're going to edit the LDAP entry '%s' which appears to be used by '%s'. "
+"Please contact the person in order to clarify proceedings."
 msgstr ""
-"Aviso: imap_getacl no ha sido implementado, no se modificara información "
-"sobre las listas de acceso."
+"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/class_mail-methods-cyrus.inc:173
-msgid "Warning: imap_getacl is not available, can't get imap permissions!"
+#: include/functions.inc:1433
+msgid "Entries per page"
 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'."
+#: include/functions.inc:1461
+msgid "Apply filter"
 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/functions.inc:1735
+msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/class_mail-methods-cyrus.inc:236
+#: include/functions.inc:1778
 #, 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 "GOsa development snapshot (Rev %s)"
+msgstr "Versión de desarrollo de GOsa (Rev %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_MultiSelectWindow.inc:376
+msgid ""
+"Error: The requested subtree has an inconsistent DN encoding, check your "
+"LDAP!"
+msgstr ""
 
-#: include/class_mail-methods-cyrus.inc:311
+#: include/class_tabs.inc:182
 #, php-format
-msgid "Can't activate GOsa sieve script. Server says '%s'."
+msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
-"No se puede activar el 'script GOsa para SIEVE'. El error del servidor es: '%"
-"s'"
 
-#: include/class_CopyPasteHandler.inc:172
+#: include/class_plugin.inc:397
 #, fuzzy, php-format
-msgid "You are going to copy the entry '%s'."
-msgstr "Has decidido eliminar la entrada %s"
+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/functions_dns.inc:166
+#: include/class_plugin.inc:543
 #, php-format
-msgid "Can't find reverse zone for dns zone '%s'. Aborting parsing this zone."
+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/functions_dns.inc:171
+#: include/class_plugin.inc:611
 #, php-format
 msgid ""
-"Found more than one reverse zone for dns zone '%s'. Aborting parsing this "
-"zone."
+"Command '%s', specified as POSTREMOVE for plugin '%s' doesn't seem to exist."
 msgstr ""
+"El comando '%s', especificado como POSTREMOVE para la extensión '%s' no "
+"parece existir."
 
-#: include/functions_dns.inc:363
+#: include/class_plugin.inc:917
 #, php-format
-msgid ""
-"Found more than one dns zone which contains an entry named '%s'. Aborting "
-"getting dns informations for this device."
+msgid "Object '%s' is already tagged"
+msgstr ""
+
+#: include/class_plugin.inc:924
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr ""
+
+#: include/class_plugin.inc:938 include/class_plugin.inc:967
+msgid "Handle object tagging failed"
+msgstr ""
+
+#: include/class_plugin.inc:954
+#, php-format
+msgid "Removing tag from object '%s'"
 msgstr ""
 
 #: html/getvcard.php:36
@@ -12435,6 +13781,11 @@ msgstr "incompleto"
 msgid "Common name"
 msgstr "Nombre de la localización"
 
+#: 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"
+
 #: html/getxls.php:156 html/getxls.php:314
 #, fuzzy, php-format
 msgid "Servers of %s on %s"
@@ -12518,98 +13869,79 @@ msgstr "Lista de usuarios"
 msgid "Computers of %s on %s"
 msgstr "incompleto"
 
-#: html/index.php:49
-#, 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/getfax.php:53
+msgid "Could not connect to database server!"
+msgstr "No puedo conectar al servidor de base de datos."
 
-#: html/index.php:71
-#, php-format
-msgid "Directory '%s' specified as compile directory is not accessable!"
-msgstr ""
-"El directorio '%s' especificado como directorio de compilación no es "
-"accesible."
+#: html/getfax.php:55
+msgid "Could not select database!"
+msgstr "No puedo seleccionar la base de datos."
 
-#: html/index.php:154
-msgid ""
-"GOsa cannot retrieve information about the installed schema files. Please "
-"make sure, that this is possible."
-msgstr ""
+#: html/getfax.php:60 html/getfax.php:68
+msgid "Database query failed!"
+msgstr "La consulta a la base de datos ha fallado."
 
-#: html/index.php:162
-msgid ""
-"Your ldap setup contains old schema definitions. Please re-run the setup."
+#: html/getkiosk.php:25
+#, php-format
+msgid "Can't open file '%s', possibly the file does not exist."
 msgstr ""
 
-#: html/index.php:189
-msgid "Please specify a valid username!"
-msgstr "Por favor especifique un nombre de usuario valido."
-
-#: html/index.php:191
-msgid "Please specify your password!"
-msgstr "Por favor especifique su contraseña."
-
-#: html/index.php:198
-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
-msgid "Session will not be encrypted."
-msgstr "La sesion no sera encriptada."
-
-#: html/index.php:237 html/index.php:301
-msgid "Enter SSL session"
-msgstr "Entrar en sesión SSL"
+#: html/getkiosk.php:30
+#, fuzzy, php-format
+msgid "Can't read file '%s', check permissions."
+msgstr "Borrar"
 
-#: html/index.php:243
+#: html/get_attachment.php:47
+#, fuzzy
 msgid ""
-"Your browser has cookies disabled. Please enable cookies and reload this "
-"page before logging in!"
+"Can't connect to glpi database, there is no mysl extension available in your "
+"php setup."
 msgstr ""
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
 
-#: html/helpviewer.php:116
+#: html/get_attachment.php:55
 #, 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."
+msgid ""
+"Can't connect to specified database, please check your glpi configuration."
 msgstr ""
+"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
+"registros!"
 
-#: html/getfax.php:53
-msgid "Could not connect to database server!"
-msgstr "No puedo conectar al servidor de base de datos."
-
-#: html/getfax.php:55
-msgid "Could not select database!"
-msgstr "No puedo seleccionar la base de datos."
+#: html/get_attachment.php:64
+msgid "Can't get specified attachment file, there is no entry with this id."
+msgstr ""
 
-#: html/getfax.php:60 html/getfax.php:68
-msgid "Database query failed!"
-msgstr "La consulta a la base de datos ha fallado."
+#: html/get_attachment.php:69
+#, fuzzy, php-format
+msgid "Can't open file '%s'."
+msgstr "Borrar"
 
-#: html/main.php:151
+#: html/main.php:159
+#, fuzzy
 msgid ""
-"Register globals is on. GOsa will refuse to login unless this is fixed by an "
-"administrator."
+"FATAL: Register globals is on. GOsa will refuse to login unless this is "
+"fixed by an administrator."
 msgstr ""
 "'Register globals' está activado. No se permitirá ninguna entrada hasta que "
 "esto sea solucionado por un administrador."
 
-#: html/main.php:194
+#: html/main.php:201
 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
-#, php-format
-msgid "Can't find any plugin definitions for plugin '%s'!"
+#: html/main.php:336
+#, fuzzy, php-format
+msgid "FATAL: 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:351
+#, fuzzy
+msgid "Your password is about to expire, please change your password"
+msgstr "No tiene permisos para cambiar su contraseña."
+
+#: html/main.php:375
 #, fuzzy
 msgid ""
 "Generating this page caused the W3C          conformance checker to raise "
@@ -12618,41 +13950,77 @@ msgstr ""
 "¡La generación de esta página provoca que el interprete PHP muestre algunos "
 "errores!"
 
-#: html/getkiosk.php:25
+#: html/index.php:49 html/index.php:331
+msgid "Session will not be encrypted."
+msgstr "La sesion no sera encriptada."
+
+#: html/index.php:49 html/index.php:331
+msgid "Enter SSL session"
+msgstr "Entrar en sesión SSL"
+
+#: html/index.php:113
 #, php-format
-msgid "Can't open file '%s', possibly the file does not exist."
+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:134
+#, 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:215
+msgid ""
+"GOsa cannot retrieve information about the installed schema files. Please "
+"make sure, that this is possible."
+msgstr ""
+
+#: html/index.php:224
+msgid ""
+"Your ldap setup contains old schema definitions. Please re-run the setup."
+msgstr ""
+
+#: html/index.php:252
+msgid "Please specify a valid username!"
+msgstr "Por favor especifique un nombre de usuario valido."
+
+#: html/index.php:254
+msgid "Please specify your password!"
+msgstr "Por favor especifique su contraseña."
 
-#: html/getkiosk.php:30
-#, fuzzy, php-format
-msgid "Can't read file '%s', check permissions."
-msgstr "Borrar"
+#: html/index.php:261
+msgid "Please check the username/password combination."
+msgstr "Por favor compruebe su nombre de usuario/contraseña."
 
-#: html/get_attachment.php:47
+#: html/index.php:285
 #, fuzzy
-msgid ""
-"Can't connect to glpi database, there is no mysl extension available in your "
-"php setup."
+msgid "Account locked. Please contact your system administrator."
 msgstr ""
-"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
-"registros!"
+"NO se puede conectar a LDAP. Por favor, contacte con su administrador de "
+"sistemas."
 
-#: html/get_attachment.php:55
-#, fuzzy
+#: html/index.php:337
 msgid ""
-"Can't connect to specified database, please check your glpi configuration."
+"Your browser has cookies disabled. Please enable cookies and reload this "
+"page before logging in!"
 msgstr ""
-"No puedo conectar a la base de datos de registro. ¡No se pueden mostrar "
-"registros!"
 
-#: html/get_attachment.php:64
-msgid "Can't get specified attachment file, there is no entry with this id."
+#: html/helpviewer.php:67
+msgid "Help browser"
 msgstr ""
 
-#: html/get_attachment.php:69
-#, fuzzy, php-format
-msgid "Can't open file '%s'."
-msgstr "Borrar"
+#: html/helpviewer.php:118
+#, 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:265
+#, php-format
+msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
+msgstr ""
 
 #: ihtml/themes/altlinux/conflict.tpl:2 ihtml/themes/default/conflict.tpl:2
 msgid "Session conflict detected"
@@ -12721,7 +14089,7 @@ 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
+#: ihtml/themes/altlinux/login.tpl:15 ihtml/themes/default/login.tpl:14
 msgid "Please use your <i>username</i> and <i>password</i> to log in"
 msgstr ""
 "Por favor introduzca su <i>usuario</i> y <i>contraseña</i> para entrar."
@@ -13042,34 +14410,21 @@ 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/setup_introduction.tpl:4
-#, fuzzy
-msgid ""
-"It looks like you're calling GOsa for the first time - no configuration was "
-"found. This setup like script will try to aid you in creating a working "
-"configuration by performing three major steps: first we'll check the PHP "
-"installation for required modules, than we're going to check for optional/"
-"needed programms and after you've provided basic information for your LDAP "
-"connectivity, we're going to check your LDAP setup."
+#: ihtml/themes/default/copyPasteDialog.tpl:1
+msgid "Copy &amp; paste wizard"
 msgstr ""
-"Parece que esta ejecutando GOsa por primera vez - no se encontró la "
-"configuración. Los siguientes pasos tratarán de asistirlo en crear una "
-"configuración funcional, efectuando las siguientes tareas: comprobar la "
-"instalación de PHP y de los módulos necesarios, luego comprobar los "
-"programas opcionales y, luego de ingresar la información necesaria para "
-"conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
 
-#: ihtml/themes/default/setup_introduction.tpl:17
+#: ihtml/themes/default/copyPasteDialog.tpl:4
 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 "
-"could not be found (functions that could be found are not mentioned). This "
-"is useful if you know what you're doing."
+"Some values need to be unique in the complete directory while some "
+"combinations make no sense. GOsa shows the relevant attributes. Please "
+"maintain the values below to fullfill the policies."
 msgstr ""
 
-#: ihtml/themes/default/setup_introduction.tpl:19
-msgid "Toggle Show/Hide"
-msgstr ""
+#: ihtml/themes/default/copyPasteDialog.tpl:21
+#, fuzzy
+msgid "Operation complete"
+msgstr "incompleto"
 
 #: ihtml/themes/default/help.tpl:9
 msgid "GOsa help viewer"
@@ -13090,15 +14445,33 @@ msgstr ""
 "mientras estaba editando. Puede borrar el archivo de bloqueo en ese caso, "
 "pulsando en el botón <i>Eliminar</i>."
 
-#: ihtml/themes/default/islocked.tpl:13
+#: ihtml/themes/default/setup_introduction.tpl:4
 #, fuzzy
-msgid "Edit anyway"
-msgstr "Editar entrada"
+msgid ""
+"It looks like you're calling GOsa for the first time - no configuration was "
+"found. This setup like script will try to aid you in creating a working "
+"configuration by performing three major steps: first we'll check the PHP "
+"installation for required modules, than we're going to check for optional/"
+"needed programms and after you've provided basic information for your LDAP "
+"connectivity, we're going to check your LDAP setup."
+msgstr ""
+"Parece que esta ejecutando GOsa por primera vez - no se encontró la "
+"configuración. Los siguientes pasos tratarán de asistirlo en crear una "
+"configuración funcional, efectuando las siguientes tareas: comprobar la "
+"instalación de PHP y de los módulos necesarios, luego comprobar los "
+"programas opcionales y, luego de ingresar la información necesaria para "
+"conectarse al servidor LDAP, vamos a comprobar la configuración de LDAP."
 
-#: ihtml/themes/default/setup_step4.tpl:100
+#: ihtml/themes/default/setup_introduction.tpl:17
 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."
+"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 "
+"could not be found (functions that could be found are not mentioned). This "
+"is useful if you know what you're doing."
+msgstr ""
+
+#: ihtml/themes/default/setup_introduction.tpl:19
+msgid "Toggle Show/Hide"
 msgstr ""
 
 #: ihtml/themes/default/logout.tpl:5
@@ -13117,88 +14490,163 @@ msgstr ""
 msgid "Sign in again"
 msgstr "Entrando"
 
-#: ihtml/themes/default/copyPasteDialog.tpl:1
-msgid "Copy &amp; paste wizard"
+#: ihtml/themes/default/accountexpired.tpl:15
+msgid "Your Password has expired !! Choose a new Password"
 msgstr ""
 
-#: ihtml/themes/default/copyPasteDialog.tpl:4
+#: 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."
+
+#: ihtml/themes/default/setup_step4.tpl:100
 msgid ""
-"Some values need to be unique in the complete directory while some "
-"combinations make no sense. GOsa shows the relevant attributes. Please "
-"maintain the values below to fullfill the policies."
+"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/copyPasteDialog.tpl:18
 #, fuzzy
-msgid "Operation complete"
-msgstr "incompleto"
-
-#~ msgid "Choose LDAP server to use for accounts and terminal management"
+#~ msgid ""
+#~ "Your password has expired. To change your personal password use the "
+#~ "fields below. The changes take effect immediately. Please memorize the "
+#~ "new password, because you wouldn't be able to login without it."
 #~ msgstr ""
-#~ "Elija que servidor LDAP se usara para gestión de cuentas de usuario y "
-#~ "terminales"
+#~ "Para cambiar su contraseña personal use los campos siguientes. Los "
+#~ "cambios tendrán efecto inmediato. Por favor memorice la nueva contraseña, "
+#~ "porque no podrá entrar sin ella."
 
 #, fuzzy
-#~ msgid "Settings for host entry #%s"
-#~ msgstr "Localización de este subarbol"
+#~ msgid "New Entry"
+#~ msgstr "Impresora"
 
 #, 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"
+#~ msgid "Admin"
+#~ msgstr "DN del administrador"
+
+#, fuzzy
+#~ msgid "Admin Toggle"
+#~ msgstr "Usuario administrador"
 
 #, 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!"
+#~ "This account has %s features disabled. Posix features are needed for "
+#~ "openXchange accounts, enable them first."
+#~ msgstr ""
+#~ "Esta cuenta tiene sus características samba desactivadas, las "
+#~ "características Posix son necesarias para las cuentas samba, activelas "
+#~ "primero."
 
 #, fuzzy
-#~ msgid "DFS Shares"
-#~ msgstr "Borrar"
+#~ msgid "OpenXchange"
+#~ msgstr "Open-Xchange"
 
 #, fuzzy
-#~ msgid "Go up one dfsshare"
-#~ msgstr "Nombre del departamento"
+#~ msgid ""
+#~ "This account has %s features disabled. Mail features are needed for "
+#~ "openXchange accounts, enable them first."
+#~ msgstr ""
+#~ "Esta cuenta tiene sus características samba desactivadas, las "
+#~ "características Posix son necesarias para las cuentas samba, activelas "
+#~ "primero."
+
+#~ msgid "List of applications"
+#~ msgstr "Lista de aplicaciones"
+
+#~ msgid "Display applications matching"
+#~ msgstr "Mostrar aplicaciones que concuerden con"
+
+#~ msgid "Regular expression for matching application names"
+#~ msgstr "Expresiones regulares para encontrar nombres de aplicaciones"
 
 #, fuzzy
-#~ msgid "Create new dfsshare"
-#~ msgstr "Crear una nueva entrada en"
+#~ msgid "Zone entries"
+#~ msgstr "Configuración telefónica"
+
+#~ msgid ""
+#~ "All actions you choose here influence <b>all</b> machines in this object "
+#~ "group. Be aware that rebooting machines may not make people happy who are "
+#~ "currently working at these machines."
+#~ msgstr ""
+#~ "Todas las acciones que elija aquí influirán en <b>todas</b> la máquinas "
+#~ "en este objeto grupo. Tenga presente que reiniciar las máquinas pueden no "
+#~ "hacer felices a las personas que actualmente están trabajando en ellas."
+
+#~ msgid "Select action to execute for this   group of terminals"
+#~ msgstr "Seleccione una acción que se ejecutara en este grupo de terminales"
 
 #, fuzzy
-#~ msgid "You have no premissions to create a dfs share."
-#~ msgstr "No tiene permisos para crear un usuario en esta 'Base'."
+#~ msgid " can't read/write any ppd informations."
+#~ msgstr "Información de sistema"
 
 #, fuzzy
-#~ msgid "Dfs share already exists."
-#~ msgstr "Ya existe un Departamento con este 'Nombre'."
+#~ msgid ""
+#~ "This menu allows you to create, delete and edit selected blocklists. "
+#~ msgstr ""
+#~ "Este menú le permite crear, editar o eliminar listas de bloqueo. Puede "
+#~ "usar el selector de rango en la parte superior de la lista, cuando "
+#~ "trabaja con un gran número de listas de bloqueo."
 
 #, fuzzy
-#~ msgid "Required Field \"Name of dfs Share\" is not set."
-#~ msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+#~ msgid ""
+#~ "Having a large size of lists, you might prefer the range selectors on top "
+#~ "of the select box."
+#~ msgstr ""
+#~ "Este menú le permite crear, editar o eliminar listas de bloqueo. Puede "
+#~ "usar el selector de rango en la parte superior de la lista, cuando "
+#~ "trabaja con un gran número de listas de bloqueo."
 
 #, fuzzy
-#~ msgid "Required Field \"Description\" is not set."
-#~ msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+#~ msgid "New         Blocklist"
+#~ msgstr "Listas de bloqueo"
 
 #, fuzzy
-#~ msgid "Required Field \"Fileserver\" is not set."
-#~ msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+#~ msgid ""
+#~ "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ú le 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."
 
 #, fuzzy
-#~ msgid "Required Field \"Share on fileserver\" is not set."
-#~ msgstr "El campo requerido 'Nombre' no ha sido rellenado."
+#~ msgid ""
+#~ "You may want to use the range selector on top of the application listbox, "
+#~ msgstr ""
+#~ "Este menú le 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."
 
 #, fuzzy
-#~ msgid "Required Field \"Location\" is not set."
-#~ msgstr "El campo requerido 'Descripción' no ha sido rellenado."
+#~ msgid "when working with a large number of applications."
+#~ msgstr "Ruta y nombre del binario de la aplicación"
 
 #, 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."
+#~ "Having a large size of departments, you might prefer the range selectors "
+#~ "on   top of the department 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 "
@@ -13206,32 +14654,122 @@ msgstr "incompleto"
 #~ "departamentos."
 
 #, fuzzy
-#~ msgid "Display dfs shares matching"
-#~ msgstr "Mostrar direcciones que concuerden con"
+#~ msgid ""
+#~ "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ú le 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."
+
+#, fuzzy
+#~ msgid "You may want to use the range selector on top of the macro listbox, "
+#~ msgstr ""
+#~ "Este menú le 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."
+
+#, fuzzy
+#~ msgid ""
+#~ "This menu allows you to create, delete and edit selected phone "
+#~ "conferences. "
+#~ msgstr ""
+#~ "Este menú le permite crear, editar o eliminar listas de bloqueo. Puede "
+#~ "usar el selector de rango en la parte superior de la lista, cuando "
+#~ "trabaja con un gran número de listas de bloqueo."
+
+#, fuzzy
+#~ msgid "selectors on top of the conferences list."
+#~ msgstr "¡Por favor introduzca un número de teléfono valido!"
+
+#~ msgid "Display lists matching"
+#~ msgstr "Mostrar listas que contengan"
+
+#, fuzzy
+#~ msgid "Display object groups matching"
+#~ msgstr "Mostrar objetos que concuerden con"
+
+#~ msgid "UNIX accounts"
+#~ msgstr "Cuentas UNIX"
+
+#~ msgid "Thin Clients"
+#~ msgstr "Clientes Ligeros"
+
+#~ msgid "Workstations"
+#~ msgstr "Estaciones de trabajo"
+
+#, fuzzy
+#~ msgid "Profile"
+#~ msgstr "Ruta del Perfil"
+
+#, fuzzy
+#~ msgid "Groupname"
+#~ msgstr "Nombre del grupo"
 
 #, fuzzy
-#~ msgid "Regular expression for matching dfs share names"
+#~ msgid "Set root password"
+#~ msgstr "Poner Contraseña"
+
+#~ msgid "Regular expression for matching system names"
 #~ msgstr "Expresiones regulares para encontrar nombres de sistemas"
 
+#~ msgid "User name of which terminal(s) are shown"
+#~ msgstr "Nombre del usuario cuyo(s) terminal(es) son mostrados "
+
 #, fuzzy
-#~ msgid "DFS Properties"
-#~ msgstr "Propiedades"
+#~ msgid "Please select a valid ppd."
+#~ msgstr "Por favor introduzca un número de serie válido"
 
 #, fuzzy
-#~ msgid "Name of dfs Share"
-#~ msgstr "Nombre del departamento"
+#~ msgid "Inherit settings from this object group"
+#~ msgstr "Descripción del grupo"
+
+#~ msgid " Please choose another name."
+#~ msgstr "Por favor elija otro nombre."
+
+#~ msgid "Can't bind to LDAP. No schema check possible!"
+#~ msgstr ""
+#~ "No se pudo establecer la conexión al servidor LDAP. ¡No se pudo comprobar "
+#~ "el esquema.!"
 
 #, fuzzy
-#~ msgid "Fileserver"
-#~ msgstr "Servidor"
+#~ 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 "Share on Fileserver"
-#~ msgstr "Servicio de impresión"
+#~ 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 Location"
-#~ msgstr "Localización"
+#~ msgid "You have no premissions to create a dfs share."
+#~ msgstr "No tiene permisos para crear un usuario en esta 'Base'."
 
 #, fuzzy
 #~ msgid "DFS shares"
@@ -13245,10 +14783,6 @@ msgstr "incompleto"
 #~ 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"
 
@@ -13307,9 +14841,6 @@ msgstr "incompleto"
 #~ msgid "DNS-Zone"
 #~ msgstr "ninguno"
 
-#~ msgid "Network settings"
-#~ msgstr "Configuración de red"
-
 #, fuzzy
 #~ msgid "close"
 #~ msgstr "Elige"
@@ -13383,10 +14914,6 @@ msgstr "incompleto"
 #~ 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"
@@ -13399,10 +14926,6 @@ msgstr "incompleto"
 #~ msgid "Samba domain name"
 #~ msgstr "Directorio Samba"
 
-#, fuzzy
-#~ msgid "Allow password change"
-#~ msgstr "Nueva contraseña"
-
 #, fuzzy
 #~ msgid "Lock account"
 #~ msgstr "Bloquear cuenta samba"
@@ -13469,12 +14992,6 @@ msgstr "incompleto"
 #~ msgid "st"
 #~ msgstr "Borrar"
 
-#~ msgid "Edit parameters"
-#~ msgstr "Editar parametros"
-
-#~ msgid "Edit optional application parameters"
-#~ msgstr "Editar parámetros de aplicaciones opcionales"
-
 #, fuzzy
 #~ msgid "Adress"
 #~ msgstr "Dirección"
@@ -13800,37 +15317,11 @@ msgstr "incompleto"
 #~ msgid "Obtions"
 #~ msgstr "Opciones"
 
-#, fuzzy
-#~ msgid "FAI partition table entry"
-#~ msgstr "Entradas de fstab adicionales"
-
-#, fuzzy
-#~ msgid "FAI script set"
-#~ msgstr "Parametros Unix"
-
-#, fuzzy
-#~ msgid ""
-#~ "This menu allows you to create, delete and edit selected FAI obejcts. "
-#~ "Having a large size of objects, you might prefer the range selectors on "
-#~ "top of this list."
-#~ msgstr ""
-#~ "Este menú le permite crear, editar o eliminar listas de bloqueo. Puede "
-#~ "usar el selector de rango en la parte superior de la lista, cuando "
-#~ "trabaja con un gran número de listas de bloqueo."
-
 #, fuzzy
 #~ msgid ""
 #~ "Please enter a valid description for your disk. Only a-Z 0-9 are allowed."
 #~ msgstr "Por favor especifique un nombre de usuario valido."
 
-#, fuzzy
-#~ 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"
@@ -13842,9 +15333,6 @@ msgstr "incompleto"
 #~ msgid "You need to specify a Phone PIN."
 #~ msgstr "¡Necesita introducir al menos un número de teléfono!"
 
-#~ msgid "Default printer"
-#~ msgstr "Impresora por defecto"
-
 #, fuzzy
 #~ msgid "Name of Conference"
 #~ msgstr "Nombre del departamento"