Updating spanish translation

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15291 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/locale/core/es/LC_MESSAGES/messages.po b/gosa-core/locale/core/es/LC_MESSAGES/messages.po
index 69f386694d429c7aad7b9c78f0a172cc414ab7ac..14cc33e487af65829509e49a51ed5d0d4c86727a 100644 (file)
--- a/gosa-core/locale/core/es/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/es/LC_MESSAGES/messages.po
@@ -3,19 +3,19 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 #
-# , 2008.
+# , 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 17:26+0100\n"
-"PO-Revision-Date: 2008-12-08 11:29+0100\n"
+"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"PO-Revision-Date: 2010-01-20 00:26+0100\n"
 "Last-Translator: \n"
-"Language-Team: Spanish <kde-i18n-doc@lists.kde.org>\n"
+"Language-Team: Spanish <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 0.2\n"
+"X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
@@ -37,17 +37,19 @@ msgstr "Filtros"
 #: ihtml/themes/default/remove.tpl:2 ihtml/themes/default/msg_dialog.tpl:59
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
-#: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
-#: include/class_tabs.inc:268 include/utils/class_xml.inc:37
+#: html/index.php:63 html/index.php:413 html/index.php:419
+#: include/functions.inc:759 include/functions.inc:2188
+#: include/functions.inc:2192 include/functions.inc:2198
+#: include/class_tabs.inc:266 include/utils/class_xml.inc:37
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/remove.tpl:2
-#: plugins/admin/groups/class_groupGeneric.inc:1078
-#: plugins/admin/users/remove.tpl:2 plugins/admin/departments/remove.tpl:2
+#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/users/remove.tpl:2
+#: plugins/admin/users/class_userManagement.inc:640
+#: plugins/admin/departments/remove.tpl:2
 #: plugins/admin/departments/dep_move_confirm.tpl:2
 #: plugins/admin/acl/remove.tpl:2
-#: plugins/personal/posix/class_posixAccount.inc:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:1014
 #: setup/class_setupStep_Migrate.inc:261 setup/class_setupStep_Migrate.inc:313
 #: setup/class_setupStep_Migrate.inc:446 setup/class_setupStep_Migrate.inc:523
 #: setup/class_setupStep_Migrate.inc:662 setup/class_setupStep_Migrate.inc:803
@@ -69,7 +71,6 @@ msgstr ""
 
 #: ihtml/themes/default/remove.tpl:9 plugins/admin/ogroups/remove.tpl:10
 #: plugins/admin/groups/remove.tpl:10 plugins/admin/users/remove.tpl:10
-#: plugins/admin/acl/remove.tpl:10
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 "Entonces, si esta seguro, presione <i>Eliminar</i> para continuar o "
@@ -81,14 +82,15 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:44
 #: ihtml/themes/default/snapshotdialog.tpl:89
 #: ihtml/themes/default/msg_dialog.tpl:79
+#: ihtml/themes/default/msg_dialog.tpl:136
 #: ihtml/themes/default/msg_dialog.tpl:139
-#: ihtml/themes/default/msg_dialog.tpl:144
-#: ihtml/themes/default/islocked.tpl:19 include/utils/class_msgPool.inc:308
-#: setup/setup_migrate.tpl:163 setup/setup_migrate.tpl:214
-#: setup/setup_migrate.tpl:261 setup/setup_migrate.tpl:326
-#: setup/setup_migrate.tpl:382 setup/setup_migrate.tpl:435
-#: setup/setup_migrate.tpl:480 setup/setup_migrate.tpl:523
-#: setup/setup_migrate.tpl:567 setup/setup_ldap.tpl:17
+#: ihtml/themes/default/islocked.tpl:19 include/class_baseSelectDialog.inc:62
+#: include/utils/class_msgPool.inc:308 setup/setup_migrate.tpl:163
+#: setup/setup_migrate.tpl:214 setup/setup_migrate.tpl:261
+#: setup/setup_migrate.tpl:326 setup/setup_migrate.tpl:382
+#: setup/setup_migrate.tpl:435 setup/setup_migrate.tpl:480
+#: setup/setup_migrate.tpl:523 setup/setup_migrate.tpl:567
+#: setup/setup_ldap.tpl:17
 #, php-format
 msgid "Cancel"
 msgstr "Cancelar"
@@ -111,14 +113,15 @@ msgstr ""
 
 #: ihtml/themes/default/login.tpl:42 ihtml/themes/default/login.tpl:44
 #: ihtml/themes/default/password.tpl:69 ihtml/themes/default/password.tpl:71
+#: plugins/admin/users/class_divListUsers.inc:81
 msgid "Username"
 msgstr "Nombre de Usuario"
 
 #: ihtml/themes/default/login.tpl:47 ihtml/themes/default/login.tpl:49
 #: ihtml/themes/default/password.tpl:40
 #: plugins/personal/generic/paste_generic.tpl:20
-#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
-#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:236
+#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "Contraseña"
 
@@ -137,7 +140,7 @@ msgstr "Pulse aquí para iniciar sesión"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:1
 msgid "Copy & paste wizard"
-msgstr ""
+msgstr "Asistente para copiar y pegar"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:7
 msgid ""
@@ -153,12 +156,15 @@ msgstr ""
 #: ihtml/themes/default/copyPasteDialog.tpl:9
 msgid "Remember that some properties like taken snapshots will not be copied!"
 msgstr ""
+"¡Recuerde que propiedades como gestionar instantáneas no serán copiadas!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:10
 msgid ""
 "Or if you copy or cut an entry within GOsa and delete the source object, you "
 "may get errors while pasting this object again!"
 msgstr ""
+"Si mueve o copia una entrada dentro de GOsa y elimina el objeto "
+"original,¡tendrá errores al pegar el objeto!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
 #: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
@@ -168,7 +174,7 @@ msgstr "Guardar"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:24
 msgid "Cancel all"
-msgstr ""
+msgstr "Cancelar todo"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:30
 msgid "Operation complete"
@@ -259,7 +265,7 @@ msgstr "Miembros disponibles"
 msgid "List message possible targets"
 msgstr "Mostrar mensaje de posibles destinos"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
 msgid "Members"
 msgstr "Miembros"
 
@@ -292,7 +298,7 @@ msgstr "Contraseña antigua"
 #: ihtml/themes/default/accountexpired.tpl:36
 #: ihtml/themes/default/password.tpl:82 ihtml/themes/default/password.tpl:83
 #: html/password.php:196 plugins/admin/users/password.tpl:13
-#: plugins/admin/users/class_userManagement.inc:248
+#: plugins/admin/users/class_userManagement.inc:274
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -305,7 +311,9 @@ msgid "Verify password"
 msgstr "Confirmar contraseña"
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
+#: plugins/admin/users/class_divListUsers.inc:141
+#: plugins/admin/users/class_divListUsers.inc:275
+#: plugins/admin/users/user-list.xml:107 plugins/admin/users/user-list.xml:193
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
@@ -316,13 +324,15 @@ msgstr "Pulse aquí para cambiar su contraseña"
 
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
-msgstr ""
+msgstr "¡Su sesión de GOsa se ha terminado!"
 
 #: ihtml/themes/default/logout-close.tpl:7
 msgid ""
 "Please close this browser window and clean the authentication caches to "
 "avoid an automatic re-authentication by your browser."
 msgstr ""
+"Por favor cierre la ventana del navegador y limpie la cache para evitar una "
+"reautentificación automática de su navegador."
 
 #: ihtml/themes/default/snapshotdialog.tpl:3
 msgid "Restoring object snapshots"
@@ -360,7 +370,7 @@ msgstr ""
 #: ihtml/themes/default/snapshotdialog.tpl:62 include/class_acl.inc:771
 #: include/class_acl.inc:778 include/class_acl.inc:785
 #: include/class_acl.inc:791 include/utils/class_msgPool.inc:471
-#: plugins/admin/departments/class_department.inc:574
+#: plugins/admin/departments/class_departmentGeneric.inc:574
 msgid "Object"
 msgstr "Objeto"
 
@@ -393,60 +403,60 @@ msgid ""
 "Remember that database entries, DNS configurations and possibly created "
 "zones in server extensions will not be stored in the snapshot."
 msgstr ""
+"Recuerde que las entradas de base de datos, configuración DNS y zonas "
+"creadas en extensiones de servidor no serán guardadas en la instantánea."
 
 #: ihtml/themes/default/snapshotdialog.tpl:70
 msgid "Timestamp"
-msgstr ""
+msgstr "Marca de tiempo"
 
 #: ihtml/themes/default/snapshotdialog.tpl:79
 msgid "Reason for generating this snapshot"
-msgstr ""
+msgstr "Razón para generar esta instantánea"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_department.inc:514
-#: plugins/admin/departments/class_department.inc:596
+#: plugins/admin/departments/class_departmentGeneric.inc:514
+#: plugins/admin/departments/class_departmentGeneric.inc:596
 msgid "Continue"
 msgstr "Continuar"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: html/index.php:228 include/class_management.inc:446
-#: include/class_management.inc:910
-#: include/password-methods/class_password-methods.inc:250
-#: include/functions.inc:3348 include/functions.inc:3362
-#: include/functions.inc:3392 include/functions.inc:3400
-#: include/functions.inc:3412 include/functions.inc:3416
-#: include/functions.inc:3431 include/functions.inc:3440
-#: include/functions.inc:3500 include/class_tabs.inc:56
+#: html/index.php:228 include/password-methods/class_password-methods.inc:250
+#: include/functions.inc:2843 include/functions.inc:2857
+#: include/functions.inc:2887 include/functions.inc:2895
+#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:2926 include/functions.inc:2935
+#: include/functions.inc:2994 include/class_tabs.inc:54
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1598
+#: include/class_plugin.inc:744 include/class_plugin.inc:1599
 #: include/utils/class_xml.inc:40 include/utils/class_msgPool.inc:153
 #: include/utils/class_msgPool.inc:165 include/utils/class_msgPool.inc:183
 #: include/utils/class_msgPool.inc:453 include/utils/class_msgPool.inc:474
-#: include/utils/class_msgPool.inc:493
-#: include/class_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
-#: include/class_CopyPasteHandler.inc:118
-#: include/class_CopyPasteHandler.inc:127
-#: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:176
-#: include/class_CopyPasteHandler.inc:185
-#: include/class_CopyPasteHandler.inc:193
-#: include/class_CopyPasteHandler.inc:273
-#: include/class_CopyPasteHandler.inc:375 include/class_msg_dialog.inc:99
+#: include/utils/class_msgPool.inc:493 include/class_log.inc:138
+#: include/class_log.inc:219 include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_CopyPasteHandler.inc:117
+#: include/class_CopyPasteHandler.inc:126
+#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:184
+#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:268
+#: include/class_CopyPasteHandler.inc:367 include/class_msg_dialog.inc:99
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: plugins/admin/groups/class_groupGeneric.inc:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
-#: plugins/personal/generic/class_user.inc:387
-#: plugins/personal/generic/class_user.inc:482
-#: plugins/personal/generic/class_user.inc:790
+#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:784
+#: plugins/personal/generic/class_user.inc:1144
 #: plugins/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1429
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -456,9 +466,9 @@ msgstr "Error"
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: ihtml/themes/default/msg_dialog.tpl:134
-#: ihtml/themes/default/msg_dialog.tpl:137
-#: ihtml/themes/default/msg_dialog.tpl:142 include/utils/class_msgPool.inc:314
+#: ihtml/themes/default/msg_dialog.tpl:133
+#: ihtml/themes/default/msg_dialog.tpl:135
+#: ihtml/themes/default/msg_dialog.tpl:138 include/utils/class_msgPool.inc:314
 #: setup/class_setupStep_Migrate.inc:267 setup/class_setupStep_Migrate.inc:319
 #: setup/class_setupStep_Migrate.inc:380 setup/class_setupStep_Migrate.inc:453
 #: setup/class_setupStep_Migrate.inc:530 setup/class_setupStep_Migrate.inc:605
@@ -487,7 +497,8 @@ msgid "Your password has been changed successfully."
 msgstr "Su contraseña se ha cambiado correctamente."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:276
+#: plugins/admin/users/class_userManagement.inc:325
+#: plugins/admin/users/class_userManagement.inc:388
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -586,6 +597,10 @@ msgid ""
 "you're using. Usage of different browsers at a time (i.e. IE and Mozilla) is "
 "possible. Pressing the Logout button will close this session."
 msgstr ""
+"Probablemente exista otra instancia activa de sus sesión. Operaciones en "
+"ventanas múltiples no son técnicamente posibles y dependen  del "
+"navegador utilizado. El uso de diferentes navegadores a la vez (por ejemplo: "
+"IE y Mozilla) es posible. Presione el botón 'Salir' para cerrar esta sesión."
 
 #: ihtml/themes/default/conflict.tpl:10
 msgid ""
@@ -627,11 +642,11 @@ msgstr "Entrando"
 
 #: ihtml/themes/default/framework.tpl:32
 msgid "GOsa main menu"
-msgstr ""
+msgstr "Menú inicial de GOsa"
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:337
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_department.inc:386
+#: plugins/admin/departments/class_departmentGeneric.inc:386
 msgid "Fatal error"
 msgstr "Error fatal"
 
@@ -645,17 +660,17 @@ msgstr "No se puede acceder a la configuración de GOsa %s/%s. Cancelado"
 #: include/password-methods/class_password-methods-ssha.inc:51
 #: include/password-methods/class_password-methods-sha.inc:48
 #: include/class_SnapshotHandler.inc:45 include/class_SnapshotHandler.inc:58
-#: include/class_SnapshotHandler.inc:76 include/functions.inc:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
-#: include/class_config.inc:154 include/class_config.inc:694
-#: include/class_config.inc:1144 include/class_config.inc:1157
-#: include/class_config.inc:1175 include/class_pluglist.inc:177
-#: include/class_CopyPasteHandler.inc:119
-#: include/class_CopyPasteHandler.inc:128
-#: include/class_CopyPasteHandler.inc:177
-#: include/class_CopyPasteHandler.inc:186
-#: include/class_CopyPasteHandler.inc:194
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:651
+#: include/functions.inc:2550 include/functions.inc:2574
+#: include/functions.inc:2587 include/utils/class_timezone.inc:47
+#: include/class_config.inc:123 include/class_config.inc:636
+#: include/class_config.inc:1021 include/class_config.inc:1034
+#: include/class_config.inc:1052 include/class_pluglist.inc:177
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:127
+#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:185
+#: include/class_CopyPasteHandler.inc:193
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 msgid "Configuration error"
@@ -666,7 +681,7 @@ msgstr "Error de configuración"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "¡No se puede acceder a el directorio de compilación '%s'!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:572
+#: html/password.php:159 plugins/personal/generic/class_user.inc:566
 msgid "Password method"
 msgstr "Metodo de contraseña"
 
@@ -674,7 +689,7 @@ msgstr "Metodo de contraseña"
 msgid "Error: Password method not available!"
 msgstr "Error: ¡El método de contraseñas no esta disponible!"
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -694,11 +709,10 @@ msgid "The password used as new is to short."
 msgstr "La nueva contraseña es demasiado corta."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1267
+#: plugins/personal/generic/class_user.inc:1280
+#: plugins/personal/generic/class_user.inc:1294
+#: plugins/personal/generic/class_user.inc:1296
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -716,11 +730,11 @@ 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: "
 
-#: html/password.php:280 html/index.php:414
+#: html/password.php:280 html/index.php:413
 msgid "Session will not be encrypted."
 msgstr "La sesión no será codificada."
 
-#: html/password.php:280 html/index.php:414
+#: html/password.php:280 html/index.php:413
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
@@ -756,37 +770,33 @@ msgstr ""
 "¡La información del usuario no es única dentro del árbol LDAP selecionado!"
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: include/class_SnapshotHandler.inc:124 include/class_SnapshotHandler.inc:281
-#: include/class_SnapshotHandler.inc:329 include/class_SnapshotHandler.inc:333
-#: include/class_SnapshotHandler.inc:348 include/class_SnapshotHandler.inc:383
-#: include/class_SnapshotHandler.inc:438 include/class_SnapshotHandler.inc:503
-#: include/class_SnapshotHandler.inc:518 include/class_acl.inc:1221
-#: include/class_acl.inc:1317 include/class_MultiSelectWindow.inc:553
-#: include/functions.inc:475 include/functions.inc:510
-#: include/functions.inc:518 include/functions.inc:563
-#: include/functions.inc:814 include/functions.inc:863
-#: include/functions.inc:920 include/functions.inc:973
-#: include/functions.inc:3001 include/functions.inc:3274
-#: include/class_plugin.inc:1279 include/class_plugin.inc:1328
-#: include/class_plugin.inc:1332 include/class_plugin.inc:1347
-#: include/class_plugin.inc:1384 include/class_plugin.inc:1442
-#: include/class_plugin.inc:1508 include/class_plugin.inc:1523
-#: include/class_ldap.inc:752 include/class_ldap.inc:1218
-#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:1033
+#: include/class_SnapshotHandler.inc:124 include/class_acl.inc:1219
+#: include/class_MultiSelectWindow.inc:553 include/functions.inc:365
+#: include/functions.inc:391 include/functions.inc:399
+#: include/functions.inc:434 include/functions.inc:666
+#: include/functions.inc:709 include/functions.inc:751
+#: include/functions.inc:796 include/functions.inc:2529
+#: include/functions.inc:2770 include/class_plugin.inc:1280
+#: include/class_plugin.inc:1329 include/class_plugin.inc:1333
+#: include/class_plugin.inc:1348 include/class_plugin.inc:1385
+#: include/class_plugin.inc:1443 include/class_plugin.inc:1509
+#: include/class_plugin.inc:1524 include/class_ldap.inc:725
+#: include/class_ldap.inc:1191 include/class_config.inc:270
+#: plugins/admin/ogroups/class_ogroup.inc:1033
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: plugins/admin/groups/class_groupGeneric.inc:1102
-#: plugins/admin/departments/class_department.inc:241
-#: plugins/admin/departments/class_department.inc:429
-#: plugins/admin/departments/class_department.inc:702
-#: plugins/admin/departments/class_department.inc:733
-#: plugins/admin/acl/class_aclRole.inc:635
-#: plugins/admin/acl/class_aclRole.inc:675
-#: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/admin/groups/class_groupGeneric.inc:1104
+#: plugins/admin/departments/class_departmentGeneric.inc:241
+#: plugins/admin/departments/class_departmentGeneric.inc:429
+#: plugins/admin/departments/class_departmentGeneric.inc:702
+#: plugins/admin/departments/class_departmentGeneric.inc:733
+#: plugins/admin/acl/class_aclRole.inc:633
+#: plugins/admin/acl/class_aclRole.inc:673
+#: plugins/admin/acl/class_aclRole.inc:687
+#: plugins/personal/generic/class_user.inc:687
+#: plugins/personal/generic/class_user.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:699
+#: plugins/personal/posix/class_posixAccount.inc:1031
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -828,12 +838,12 @@ msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 "¡No se puede recuperar la información de usuario para autenticación htaccess!"
 
-#: html/index.php:369
+#: html/index.php:368
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:420
+#: html/index.php:419
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -924,49 +934,6 @@ msgstr ""
 "El directorio de ayuda '%s' no está disponible, no podrá leer ningún archivo "
 "de ayuda."
 
-#: include/class_management.inc:32 include/class_management.inc:33
-#: plugins/personal/posix/class_posixAccount.inc:237
-msgid "unconfigured"
-msgstr "Sin configurar"
-
-#: include/class_management.inc:144
-#, fuzzy
-msgid "Filter error"
-msgstr "Error fatal"
-
-#: include/class_management.inc:144
-msgid "The filter is incomplete!"
-msgstr ""
-
-#: include/class_management.inc:291 include/class_management.inc:426
-#: include/class_management.inc:472 include/class_management.inc:509
-#: include/class_management.inc:523 include/class_plugin.inc:1546
-#: include/class_plugin.inc:1558 include/class_plugin.inc:1573
-#: include/class_plugin.inc:1586
-#: plugins/admin/users/class_userManagement.inc:220
-#: plugins/admin/users/class_userManagement.inc:611
-msgid "Permission"
-msgstr "Permiso"
-
-#: include/class_management.inc:352
-#: plugins/admin/users/class_userManagement.inc:570
-#: plugins/admin/users/class_userManagement.inc:574
-#: plugins/admin/acl/class_aclManagement.inc:98
-msgid "Permission error"
-msgstr "Error de Permisos"
-
-#: include/class_management.inc:426 include/class_plugin.inc:1546
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "No tiene permisos para crear una instantanea para %s."
-
-#: include/class_management.inc:472 include/class_management.inc:509
-#: include/class_management.inc:523 include/class_plugin.inc:1558
-#: include/class_plugin.inc:1573 include/class_plugin.inc:1586
-#, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "No tiene permisos para recuperar una instantanea para %s."
-
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr "El módulo mcrypt no ha sido encontrado. Por favor instale php-mcrypt."
@@ -988,7 +955,7 @@ msgstr ""
 "introducida!"
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1022 include/class_config.inc:1053
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -997,24 +964,23 @@ msgstr ""
 "La funcionalidad de instancias esta activa, pero el valor requerido '%s' no "
 "está activo."
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
-#, fuzzy, php-format
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
 msgstr ""
-"La funcionalidad de instancias esta activa, pero el valor requerido '%s' no "
-"está activo."
+"La funcionalidad de instancias esta activa, pero no se encuentra el módulo "
+"de compresión requerido. Por favor instale '%s'."
 
 #: include/class_acl.inc:26
 msgid "Access control"
 msgstr "Control de acceso"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
 msgid "Manage access control lists"
 msgstr "Gestión de las Listas de control de acceso"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
 msgid "All categories"
 msgstr "Todas las categorías"
 
@@ -1022,20 +988,20 @@ msgstr "Todas las categorías"
 msgid "Reset ACLs"
 msgstr "Eliminar ACLs"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
 msgid "One level"
 msgstr "Un nivel"
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:134
+#: plugins/admin/acl/class_aclRole.inc:133
 msgid "Current object"
 msgstr "Objeto actual"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
 msgid "Complete subtree"
 msgstr "Subárbol completo"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
 msgid "Complete subtree (permanent)"
 msgstr "Subárbol completo (permanente)"
 
@@ -1043,54 +1009,56 @@ msgstr "Subárbol completo (permanente)"
 msgid "Use ACL defined in role"
 msgstr "Utilizar las ACL definidas en el rol"
 
-#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1603
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/users/user-list.xml:15
+#: plugins/personal/generic/class_user.inc:1596
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Usuarios"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
-#: plugins/admin/groups/class_groupManagement.inc:25
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
+#: plugins/admin/groups/class_groupManagement.inc:26
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr "Grupos"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_MultiSelectWindow.inc:260
+#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:234
+#: include/class_listing.inc:914 include/class_listing.inc:916
+#: plugins/admin/acl/class_aclRole.inc:392
 msgid "Up"
 msgstr "Arriba"
 
-#: include/class_acl.inc:495 include/class_listing.inc:235
-#: plugins/admin/acl/class_aclRole.inc:396
+#: include/class_acl.inc:495 include/class_listing.inc:234
+#: plugins/admin/acl/class_aclRole.inc:394
 msgid "Down"
 msgstr "Abajo"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
+#: plugins/admin/groups/class_divListGroup.inc:139
+#: plugins/admin/users/class_divListUsers.inc:139
+#: plugins/admin/users/user-list.xml:100
+#: plugins/admin/acl/class_aclRole.inc:397
+#: plugins/admin/acl/class_aclRole.inc:446
 msgid "Edit"
 msgstr "Editar"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: include/class_acl.inc:1253 include/class_acl.inc:1254
-#: include/class_acl.inc:1259 include/class_tabs.inc:401
-#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:400
-#: plugins/admin/acl/class_aclRole.inc:404
-#: plugins/admin/acl/class_aclRole.inc:781
+#: include/class_acl.inc:1251 include/class_acl.inc:1252
+#: include/class_acl.inc:1257 include/class_tabs.inc:399
+#: plugins/admin/acl/class_aclManagement.inc:26
+#: plugins/admin/acl/class_aclManagement.inc:293
+#: plugins/admin/acl/class_divListACL.inc:179
+#: plugins/admin/acl/tabs_acl.inc:28 plugins/admin/acl/class_aclRole.inc:398
+#: plugins/admin/acl/class_aclRole.inc:402
+#: plugins/admin/acl/class_aclRole.inc:766
 msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
-#: plugins/admin/acl/class_aclRole.inc:452
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
+#: plugins/admin/acl/class_aclRole.inc:450
 #, php-format
 msgid "Delete"
 msgstr "Eliminar"
@@ -1113,7 +1081,7 @@ msgstr "Categoría ACL"
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editar ACL para '%s', el ámbito es '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
 msgid "All objects in current subtree"
 msgstr "Todos los objetos en el subárbol actual"
 
@@ -1153,13 +1121,13 @@ msgstr "Objeto completo"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: include/functions.inc:603 include/functions.inc:789
-#: include/functions.inc:907 include/functions.inc:1305
-#: include/functions.inc:2369 include/functions.inc:2403
-#: include/functions.inc:2423 include/class_ldap.inc:692
-#: include/class_ldap.inc:740 include/class_log.inc:87
-#: include/class_CopyPasteHandler.inc:160
-#: include/class_CopyPasteHandler.inc:274
+#: include/functions.inc:474 include/functions.inc:641
+#: include/functions.inc:738 include/functions.inc:1121
+#: include/functions.inc:1946 include/functions.inc:1980
+#: include/functions.inc:2000 include/class_ldap.inc:665
+#: include/class_ldap.inc:713 include/class_log.inc:88
+#: include/class_CopyPasteHandler.inc:159
+#: include/class_CopyPasteHandler.inc:269
 msgid "Internal error"
 msgstr "error interno"
 
@@ -1187,20 +1155,19 @@ msgstr "rol desconocido"
 msgid "Contains settings for these objects: %s"
 msgstr "Tiene configuraciones de los siguientes objetos: %s"
 
-#: include/class_acl.inc:1084
+#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
 msgid "inactive"
 msgstr "inactivo"
 
-#: include/class_acl.inc:1084
-#, fuzzy
+#: include/class_acl.inc:1082
 msgid "No members"
-msgstr "Miembros del grupo"
+msgstr "Sin miembros"
 
-#: include/class_acl.inc:1254
+#: include/class_acl.inc:1252
 msgid "Access control list"
 msgstr "Lista de control de acceso"
 
-#: include/class_acl.inc:1259
+#: include/class_acl.inc:1257
 msgid "ACL roles"
 msgstr "Roles ACL"
 
@@ -1209,38 +1176,48 @@ msgstr "Roles ACL"
 msgid "Close"
 msgstr "Cerrar"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250
+#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252
+#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_listing.inc:908
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258
+#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266
+#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
 msgid "Go to users department"
 msgstr "Ir al departamento de usuarios"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268
+#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_listing.inc:924
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273
+#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/dep-list.tpl:13 plugins/admin/acl/acl-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273
+#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: plugins/admin/ogroups/class_divListOGroup.inc:148
+#: plugins/admin/groups/class_divListGroup.inc:122
+#: plugins/admin/users/class_divListUsers.inc:120
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/class_divListDepartment.inc:87
+#: plugins/admin/acl/class_divListACL.inc:104
 msgid "Submit"
 msgstr "Enviar"
 
@@ -1251,25 +1228,39 @@ msgstr "Se ha detectado una codificación de DN inconsistente: '%s'"
 
 #: include/class_session.inc:76 include/class_session.inc:101
 #: include/class_session.inc:127
-#, fuzzy
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
-"El nombre de usuario / UID no es único dentro del árbol LDAP. Por favor "
-"contacte con su Administrador."
+"¡El canal requerido no existe!. Por favor  contacte con su Administrador."
 
-#: include/class_baseSelectDialog.inc:28
+#: include/class_baseSelectDialog.inc:44
 msgid "Choose a base"
 msgstr "Elija una base"
 
-#: include/class_baseSelectDialog.inc:29
-#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: include/class_baseSelectDialog.inc:55
+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 ""
+"Entrar en el árbol preferido y pulse grabar para usar el subárbol actual "
+"como base. O pulse en la imagen al final de cada entrada"
+
+#: include/class_baseSelectDialog.inc:61
+msgid "Use"
+msgstr "Usar"
+
+#: include/class_baseSelectDialog.inc:65
+#: plugins/admin/ogroups/class_divListOGroup.inc:146
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: plugins/admin/groups/class_groupGeneric.inc:1259
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
+#: plugins/admin/groups/class_divListGroup.inc:121
+#: plugins/admin/groups/class_groupGeneric.inc:1261
+#: plugins/admin/users/class_divListUsers.inc:118
+#: plugins/admin/users/user-list.tpl:13
+#: plugins/admin/departments/class_departmentGeneric.inc:621
 #: plugins/admin/departments/locality.tpl:28
 #: plugins/admin/departments/generic.tpl:39
 #: plugins/admin/departments/class_domain.inc:88
+#: plugins/admin/departments/class_divListDepartment.inc:85
 #: plugins/admin/departments/class_localityGeneric.inc:89
 #: plugins/admin/departments/class_organizationGeneric.inc:121
 #: plugins/admin/departments/class_countryGeneric.inc:89
@@ -1277,18 +1268,25 @@ msgstr "Elija una base"
 #: plugins/admin/departments/domain.tpl:28
 #: plugins/admin/departments/country.tpl:28
 #: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
 #: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/admin/acl/class_divListACL.inc:102
+#: plugins/admin/acl/class_aclRole.inc:751 plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1610
 #: plugins/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "Base"
 
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_baseSelectDialog.inc:68
+msgid "Filter entries with this syntax"
+msgstr "Filtrar entradas con esta sintaxis"
+
+#: include/class_listing.inc:281
+#: plugins/admin/ogroups/class_divListOGroup.inc:77
+#: plugins/admin/groups/class_divListGroup.inc:73
+#: plugins/admin/users/class_divListUsers.inc:75
+#: plugins/admin/departments/class_divListDepartment.inc:59
+#: plugins/admin/acl/class_divListACL.inc:67 setup/setup_migrate.tpl:93
 #: setup/setup_migrate.tpl:149 setup/setup_migrate.tpl:201
 #: setup/setup_migrate.tpl:368 setup/setup_migrate.tpl:421
 #: setup/setup_migrate.tpl:464 setup/setup_migrate.tpl:507
@@ -1296,79 +1294,63 @@ msgstr "Base"
 msgid "Select all"
 msgstr "Seleccione todos"
 
-#: include/class_listing.inc:499
-#, fuzzy
+#: include/class_listing.inc:470
 msgid "created by"
-msgstr "Crear"
-
-#: include/class_listing.inc:1091 plugins/admin/ogroups/ogroup-list.xml:62
-#: plugins/admin/groups/group-list.xml:62 plugins/admin/users/user-list.xml:78
-#: plugins/admin/departments/dep-list.xml:87 plugins/admin/acl/acl-list.xml:65
-msgid "Actions"
-msgstr "Acciones"
+msgstr "Creado por"
 
-#: include/class_listing.inc:1350 include/class_listing.inc:1400
-#: include/class_plugin.inc:2070
+#: include/class_listing.inc:1259 include/class_listing.inc:1309
+#: include/class_plugin.inc:2071
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
-#: include/class_plugin.inc:2074
+#: include/class_listing.inc:1265 include/class_listing.inc:1299
+#: include/class_plugin.inc:2075
 msgid "Cut"
 msgstr "Mover"
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
-#: include/class_plugin.inc:2081 include/class_plugin.inc:2084
-#: include/class_CopyPasteHandler.inc:514
+#: include/class_listing.inc:1273 include/class_listing.inc:1275
+#: include/class_plugin.inc:2082 include/class_plugin.inc:2085
+#: include/class_CopyPasteHandler.inc:506
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1299 include/class_plugin.inc:2029
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1309 include/class_plugin.inc:2037
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
-#, fuzzy
+#: include/class_listing.inc:1341 include/class_listing.inc:1343
 msgid "Restore snapshots"
-msgstr "Recuperar instantanea"
+msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1357
 msgid "Export list"
-msgstr ""
+msgstr "Exportar lista"
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
-#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
+#: include/class_listing.inc:1392 include/class_listing.inc:1393
+#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1402 include/class_plugin.inc:2010
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1403 include/class_plugin.inc:2011
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
-#: include/class_sortableListing.inc:132
-msgid "Edit this entry"
-msgstr "Editar esta entrada"
-
-#: include/class_sortableListing.inc:133
-msgid "Delete this entry"
-msgstr "Eliminar esta entrada"
-
-#: include/functions.inc:127
+#: include/functions.inc:121
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 "Error fatal: no se han definido un emplazamiento para las clases - por favor "
 "ejecute '%s' para solucionar esto"
 
-#: include/functions.inc:134
+#: include/functions.inc:128
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
@@ -1376,17 +1358,17 @@ msgstr ""
 "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
 "ejecutando '%s'"
 
-#: include/functions.inc:447
+#: include/functions.inc:338
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Ha habido un error conectando a LDAP. El servidor comunicó '%s'."
 
-#: include/functions.inc:518
+#: include/functions.inc:399
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "¡El nombre de usuario / UID no es único dentro del árbol LDAP!"
 
-#: include/functions.inc:603
+#: include/functions.inc:474
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -1394,13 +1376,13 @@ msgstr ""
 "El nombre de usuario / UID no es único dentro del árbol LDAP. Por favor "
 "contacte con su Administrador."
 
-#: include/functions.inc:789 include/functions.inc:907
+#: include/functions.inc:641 include/functions.inc:738
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Ha ocurrido un problema al añadir un bloqueo. ¡Contacte con los "
 "desarrolladores!"
 
-#: include/functions.inc:799
+#: include/functions.inc:651
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1409,12 +1391,12 @@ msgstr ""
 "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte "
 "con su Administrador!"
 
-#: include/functions.inc:799
+#: include/functions.inc:651
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:928
+#: include/functions.inc:759
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1422,12 +1404,12 @@ msgstr ""
 "Se han encontrado varios bloqueos para un objeto que iba a ser bloqueado. "
 "Esto no debería ocurrir - limpiando referencias multiples."
 
-#: include/functions.inc:1232
+#: include/functions.inc:1049
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "¡El límite máximo de %d entradas se ha sobrepasado!"
 
-#: include/functions.inc:1234
+#: include/functions.inc:1051
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1436,73 +1418,73 @@ msgstr ""
 "Introduzca un nuevo límite máximo a %s y se volvera a mostrar este mensaje "
 "si se supera el límite máximo"
 
-#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1251
+#: include/functions.inc:1068
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1641
+#: include/functions.inc:1361
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1643
+#: include/functions.inc:1363
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1645
+#: include/functions.inc:1365
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Has decidido editar las siguientes entradas LDAP %s"
 
-#: include/functions.inc:1885
+#: include/functions.inc:1549
 msgid "Entries per page"
 msgstr "Entradas por página"
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1577 include/class_filter.inc:302
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:1823 include/class_filter.inc:268
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2272
+#: include/functions.inc:1867
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Instantánea de desarrollo GOsa (Rev %s)"
 
-#: include/functions.inc:2369
+#: include/functions.inc:1946
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "El archivo '%s' no puede ser eliminado."
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:1980 include/functions.inc:2000
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2188 include/functions.inc:2192
+#: include/functions.inc:2198
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "No esta disponible 'baseIdHook'.¡Se usara la base predeterminada!"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2220
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2220
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "No puedo obtener información de esquemas del servidor. ¡No es posible "
 "comprobar los esquemas!"
 
-#: include/functions.inc:2701
+#: include/functions.inc:2246
 msgid "Used to store account specific informations."
 msgstr "Usado para guardar información específica de la cuenta."
 
-#: include/functions.inc:2708
+#: include/functions.inc:2253
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1510,28 +1492,28 @@ msgstr ""
 "Usado para bloquear entradas editadas actualmente y así evitar múltiples "
 "cambios simultáneos."
 
-#: include/functions.inc:2753
+#: include/functions.inc:2298
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto necesaria '%s'!"
 
-#: include/functions.inc:2756
+#: include/functions.inc:2301
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto opcional '%s'!"
 
-#: include/functions.inc:2761
+#: include/functions.inc:2306
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 "¡Las versiones de la clase de objeto necesaria no coinciden '%s' (!=%s)!"
 
-#: include/functions.inc:2764
+#: include/functions.inc:2309
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2786
+#: include/functions.inc:2331
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1539,7 +1521,7 @@ msgstr ""
 "Ha activado la opción rfc2307bis en el paso 'configuración ldap', pero su "
 "configuración de esquemas no soporta esta opción."
 
-#: include/functions.inc:2787
+#: include/functions.inc:2332
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1547,7 +1529,7 @@ msgstr ""
 "Para poder usar grupos conforme a rfc2307bis, el objectClass 'posixGroup' "
 "debe ser AUXILIARY"
 
-#: include/functions.inc:2791
+#: include/functions.inc:2336
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1555,51 +1537,51 @@ msgstr ""
 "Su esquema está configurado para soportar grupos rfc2307bis, pero ha "
 "desactivado esta opción en el paso 'configuración ldap'."
 
-#: include/functions.inc:2792
+#: include/functions.inc:2337
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "El objectClass 'posixGroup' debe ser STRUCTURAL"
 
-#: include/functions.inc:2816
+#: include/functions.inc:2361
 msgid "German"
 msgstr "Alemán"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2362
 msgid "French"
 msgstr "Francés"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2363
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2364
 msgid "Spanish"
 msgstr "Español"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2365
 msgid "English"
 msgstr "Inglés"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2366
 msgid "Dutch"
 msgstr "Holandes"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2367
 msgid "Polish"
 msgstr "Polaco"
 
-#: include/functions.inc:2824
+#: include/functions.inc:2369
 msgid "Chinese"
 msgstr "Chino"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2370
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2371
 msgid "Russian"
 msgstr "Ruso"
 
-#: include/functions.inc:3021
+#: include/functions.inc:2549
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1607,56 +1589,55 @@ msgstr ""
 "El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece "
 "existir."
 
-#: include/functions.inc:3054
+#: include/functions.inc:2574
 msgid "Cannot generate samba hash!"
 msgstr "¡No se puede generar la clave samba!"
 
-#: include/functions.inc:3067
+#: include/functions.inc:2587
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
+"¡No se puede generar la clave samba: la ejecución de '%s' ha fallado, "
+"compruebe el 'sambaHashHook'!"
 
-#: include/functions.inc:3348 include/functions.inc:3362
-#: include/functions.inc:3400 include/functions.inc:3412
-#: include/functions.inc:3416 include/functions.inc:3431
-#: include/functions.inc:3440
-#, fuzzy
+#: include/functions.inc:2843 include/functions.inc:2857
+#: include/functions.inc:2895 include/functions.inc:2907
+#: include/functions.inc:2911 include/functions.inc:2926
+#: include/functions.inc:2935
 msgid "Cannot allocate a free ID:"
-msgstr "¡No se puede asignar un identificador (ID) libre!"
+msgstr "No se puede asignar un identificador (ID) libre:"
 
-#: include/functions.inc:3348
+#: include/functions.inc:2843
 msgid "unknown idAllocation method!"
-msgstr ""
+msgstr "¡método de asignación de id desconocido!"
 
-#: include/functions.inc:3362
+#: include/functions.inc:2857
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
-msgstr ""
+msgstr "¡%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:3392
-#, fuzzy
+#: include/functions.inc:2887
 msgid "Cannot create sambaUnixIdPool entry!"
-msgstr "¡No se puede crear la carpeta '%s'!"
+msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
 
-#: include/functions.inc:3400
+#: include/functions.inc:2895
 msgid "sambaUnixIdPool is not unique!"
-msgstr ""
+msgstr "¡sambaUnixIdPool no es único!"
 
-#: include/functions.inc:3412 include/functions.inc:3416
-#, fuzzy
+#: include/functions.inc:2907 include/functions.inc:2911
 msgid "no ID available!"
-msgstr "¡No hay plantillas disponibles!"
+msgstr "¡No hay ID disponibles!"
 
-#: include/functions.inc:3440
+#: include/functions.inc:2935
 msgid "maximum tries exceeded!"
-msgstr ""
+msgstr "¡Excedido el número de intentos máximo!"
 
-#: include/functions.inc:3500
+#: include/functions.inc:2994
 msgid "Cannot allocate a free ID!"
 msgstr "¡No se puede asignar un identificador (ID) libre!"
 
-#: include/class_tabs.inc:57
+#: include/class_tabs.inc:55
 #, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
@@ -1665,37 +1646,35 @@ msgstr ""
 "No hay definiciones de extensión para iniciar '%s', por favor compruebe su "
 "archivo de configuración."
 
-#: include/class_tabs.inc:268
+#: include/class_tabs.inc:266
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "El proceso de eliminación ha sido cancelado por la extensión '%s': %s"
 
-#: include/class_tabs.inc:406
+#: include/class_tabs.inc:404
 msgid "References"
 msgstr "Referencias"
 
-#: include/class_SnapShotDialog.inc:82
+#: include/class_SnapShotDialog.inc:90
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Va a eliminar la instantanea '%s'."
 
-#: include/class_SnapShotDialog.inc:137
+#: include/class_SnapShotDialog.inc:145
 msgid "Remove snapshot"
 msgstr "Eliminar instantanea"
 
-#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
+#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapShotDialog.inc:171
+#: include/class_SnapShotDialog.inc:179
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: plugins/admin/ogroups/generic.tpl:15
-#: plugins/admin/ogroups/ogroup-list.xml:49
-#: plugins/admin/groups/generic.tpl:24
-#: plugins/admin/groups/class_groupGeneric.inc:1258
-#: plugins/admin/groups/group-list.xml:49
-#: plugins/admin/departments/dep-list.xml:79
+#: plugins/admin/ogroups/generic.tpl:15 plugins/admin/groups/generic.tpl:24
+#: plugins/admin/groups/class_groupGeneric.inc:1260
+#: plugins/admin/departments/class_departmentGeneric.inc:317
+#: plugins/admin/departments/class_departmentGeneric.inc:619
 #: plugins/admin/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1711,30 +1690,26 @@ msgstr "Y-m-d, H:i:s"
 #: plugins/admin/departments/domain.tpl:19
 #: plugins/admin/departments/country.tpl:19
 #: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
 #: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:752 plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr "Descripción"
 
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
-msgstr ""
+msgstr "CSV"
 
 #: include/exporter/class_PDF.inc:24
-#, fuzzy
 msgid "Page"
-msgstr "Buscapersonas"
+msgstr "Página"
 
 #: include/exporter/class_pdfExporter.inc:18
 msgid "No PDF export possible: there is no FPDF library installed."
-msgstr ""
+msgstr "No se puede exportar a PDF: no se ha instalado la librería FPDF."
 
 #: include/exporter/class_pdfExporter.inc:145
 msgid "PDF"
-msgstr ""
+msgstr "PDF"
 
 #: include/class_multi_plug.inc:362
 msgid "You are currently editing mutliple entries."
@@ -1823,7 +1798,7 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
@@ -1837,29 +1812,50 @@ msgstr ""
 "Este objeto ha cambiado desde que ha sido abierto en GOsa. ¡Todos los "
 "cambios realizados por otros se perderán si graba esta entrada!"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1547 include/class_plugin.inc:1559
+#: include/class_plugin.inc:1574 include/class_plugin.inc:1587
+#: plugins/admin/ogroups/class_ogroupManagement.inc:237
+#: plugins/admin/groups/class_groupManagement.inc:356
+#: plugins/admin/users/class_userManagement.inc:353
+#: plugins/admin/users/class_userManagement.inc:593
+#: plugins/admin/acl/class_aclManagement.inc:268
+msgid "Permission"
+msgstr "Permiso"
+
+#: include/class_plugin.inc:1547
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "No tiene permisos para crear una instantanea para %s."
+
+#: include/class_plugin.inc:1559 include/class_plugin.inc:1574
+#: include/class_plugin.inc:1587
+#, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "No tiene permisos para recuperar una instantanea para %s."
+
+#: include/class_plugin.inc:1799
 msgid "Changing ACL dn"
 msgstr "Modificando ACL dn"
 
-#: include/class_plugin.inc:1798
+#: include/class_plugin.inc:1799
 msgid "from"
 msgstr "desde"
 
-#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr "a"
 
-#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
+#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
 msgid "Restore"
 msgstr "Recuperar"
 
-#: include/class_plugin.inc:2028
+#: include/class_plugin.inc:2029
 msgid "cut"
 msgstr "mover"
 
-#: include/class_plugin.inc:2036
+#: include/class_plugin.inc:2037
 msgid "copy"
 msgstr "copiar"
 
@@ -1892,19 +1888,16 @@ msgstr ""
 "calcular una compensación correcta para la zona horaria."
 
 #: include/utils/class_xml.inc:48
-#, fuzzy
 msgid "in"
-msgstr "Inicio"
+msgstr "en"
 
 #: include/utils/class_xml.inc:50
-#, fuzzy
 msgid "on line"
-msgstr "Continuar"
+msgstr "En linea"
 
 #: include/utils/class_xml.inc:51
-#, fuzzy
 msgid "XML error"
-msgstr "Error MySQL"
+msgstr "Error XML"
 
 #: include/utils/class_msgPool.inc:15
 #, php-format
@@ -2105,10 +2098,9 @@ msgstr "¡No se puede ejecutar el comando '%s' (%s)!"
 msgid "Value for '%s' is too large!"
 msgstr "¡El valor especificado como '%s' es demasiado grande!"
 
-#: include/utils/class_msgPool.inc:237
-#, fuzzy, php-format
+#: include/utils/class_msgPool.inc:237, php-format
 msgid "'%s' must be smaller than %s!"
-msgstr "¡'%s' debe ser menor que %d!"
+msgstr "¡'%s' debe ser menor que %s!"
 
 #: include/utils/class_msgPool.inc:245
 #, php-format
@@ -2329,9 +2321,8 @@ msgid "Saturday"
 msgstr "Sábado"
 
 #: include/utils/class_msgPool.inc:452
-#, fuzzy
 msgid "MySQL operation failed!"
-msgstr "¡La consulta LDAP ha fallado!"
+msgstr "¡La consulta MYSQL ha fallado!"
 
 #: include/utils/class_msgPool.inc:460
 msgid "read operation"
@@ -2457,16 +2448,16 @@ msgstr ""
 "¡No se puede inicializar la clase '%s'! ¿Puede que falte la extensión "
 "correspondiente en la configuración de GOsa?"
 
-#: include/class_ldap.inc:233 include/class_ldap.inc:266
+#: include/class_ldap.inc:232 include/class_ldap.inc:265
 msgid "Performance warning"
 msgstr "Aviso e rendimiento"
 
-#: include/class_ldap.inc:233 include/class_ldap.inc:266
+#: include/class_ldap.inc:232 include/class_ldap.inc:265
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr "El rendimiento LDAP es bajo: ¡la última consulta tardó sobre %.2fs!"
 
-#: include/class_ldap.inc:692
+#: include/class_ldap.inc:665
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
@@ -2474,23 +2465,23 @@ msgstr ""
 "No se pueden crear automáticamente subárboles con RDN '%s': ¡No se ha "
 "encontrado la clase del objeto!"
 
-#: include/class_ldap.inc:740
+#: include/class_ldap.inc:713
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 "No se pueden crear automáticamente subárboles con RDN '%s': no soportado"
 
-#: include/class_ldap.inc:827
+#: include/class_ldap.inc:800
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "mientras operaba en '%s' usando el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:829
+#: include/class_ldap.inc:802
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "mientras operaba en el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1051
+#: include/class_ldap.inc:1024
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2499,65 +2490,87 @@ msgstr ""
 "No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' "
 "en la linea %s"
 
-#: include/class_ldap.inc:1080
+#: include/class_ldap.inc:1053
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Ha habido un error importando dn: '%s', ¡Por favor compruebe su LDIF desde "
 "la línea %s en adelante!"
 
-#: include/class_log.inc:87
+#: include/class_log.inc:88
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Entrada fallida: %s"
 
-#: include/class_log.inc:102
+#: include/class_log.inc:116
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr "¡Se ha indicado una opción no válida: '%s'!"
 
-#: include/class_log.inc:106
+#: include/class_log.inc:120
 msgid "Specified objectType is empty or invalid!"
 msgstr "¡Se ha indicado un objectType vacio o no válido!"
 
-#: include/class_gosaSupportDaemon.inc:112
+#: include/class_log.inc:139
+msgid "MySQL error"
+msgstr "Error MySQL"
+
+#: include/class_log.inc:139
+#, php-format
+msgid "Logging to MySQL database will be disabled for server '%s'!"
+msgstr ""
+"¡La escritura del registro en la base de datos MySQL se desactivará para el "
+"servidor '%s'!"
+
+#: include/class_log.inc:165 include/class_log.inc:174
+#: include/class_log.inc:187 include/class_log.inc:204
+#: include/class_log.inc:242
+msgid "MySQL logging"
+msgstr "Escritura del registro en MySQL"
+
+#: include/class_log.inc:219
+#, php-format
+msgid "Cannot add location to the database!"
+msgstr "¡No se puede añadir la ubicación a la base de datos!"
+
+#: include/class_gosaSupportDaemon.inc:109
 msgid "GOsa support daemon"
 msgstr "Demonio de soporte GOsa"
 
-#: include/class_gosaSupportDaemon.inc:787
+#: include/class_gosaSupportDaemon.inc:784
 msgid "Cannot not parse XML!"
 msgstr "¡No se puede analizar el XML!"
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1174
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "¡No se puede enviar el evento abortar para la entrada %s!"
 
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1194
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr "¡No se puede eliminar la entrada %s!"
 
-#: include/class_config.inc:151
+#: include/class_config.inc:120
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Error XML en gosa.conf: %s en la línea %d"
 
-#: include/class_config.inc:317
+#: include/class_config.inc:270
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "No se puede conectar a LDAP: Por favor consulte con el administrador de "
 "sistemas."
 
-#: include/class_config.inc:694
+#: include/class_config.inc:636
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "¡sambaSID y/o sambaRidBase no aparece en la configuración!"
 
-#: include/class_config.inc:1103
+#: include/class_config.inc:986
 msgid "Configuration"
 msgstr "Configuración"
 
-#: include/class_config.inc:1103
+#: include/class_config.inc:986
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2580,44 +2593,44 @@ msgstr ""
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: include/class_CopyPasteHandler.inc:118
-#: include/class_CopyPasteHandler.inc:127
-#: include/class_CopyPasteHandler.inc:159
-#: include/class_CopyPasteHandler.inc:176
-#: include/class_CopyPasteHandler.inc:185
-#: include/class_CopyPasteHandler.inc:193
-#: include/class_CopyPasteHandler.inc:273
+#: include/class_CopyPasteHandler.inc:117
+#: include/class_CopyPasteHandler.inc:126
+#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:184
+#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:268
 #, php-format
 msgid "Copy and paste failed!"
 msgstr "¡Ha fallado copiar y pegar! "
 
-#: include/class_CopyPasteHandler.inc:118
-#: include/class_CopyPasteHandler.inc:193
+#: include/class_CopyPasteHandler.inc:117
+#: include/class_CopyPasteHandler.inc:192
 #, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "No se pueden modificar los permisos para '%s'"
 
-#: include/class_CopyPasteHandler.inc:159
+#: include/class_CopyPasteHandler.inc:158
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr "'%s' no es un objeto LDAP válido"
 
-#: include/class_CopyPasteHandler.inc:176
+#: include/class_CopyPasteHandler.inc:175
 #, php-format
 msgid "No write permission in '%s'"
 msgstr "No tiene permiso de escritura en '%s'"
 
-#: include/class_CopyPasteHandler.inc:394
+#: include/class_CopyPasteHandler.inc:386
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr "Estos objetos serán modificados: %s"
 
-#: include/class_CopyPasteHandler.inc:418
+#: include/class_CopyPasteHandler.inc:410
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr "Este objeto sera modificado: %s"
 
-#: include/class_CopyPasteHandler.inc:516
+#: include/class_CopyPasteHandler.inc:508
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
@@ -2627,11 +2640,11 @@ msgstr "Por favor solucione el problema y actualize la página."
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1248
-#: plugins/admin/users/class_userManagement.inc:737
-#: plugins/admin/departments/class_department.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1250
+#: plugins/admin/users/class_userManagement.inc:1066
+#: plugins/admin/departments/class_departmentGeneric.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Genérico"
@@ -2642,26 +2655,32 @@ msgid "UNIX"
 msgstr "UNIX"
 
 #: plugins/generic/references/class_reference.inc:45
+#: plugins/admin/ogroups/class_divListOGroup.inc:204
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
-#: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/groups/class_divListGroup.inc:190
+#: plugins/admin/users/class_divListUsers.inc:88
+#: plugins/admin/users/class_divListUsers.inc:210
+#: plugins/admin/users/class_userManagement.inc:1073
 msgid "Mail"
 msgstr "Correo Electrónico"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
-#: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/admin/groups/class_divListGroup.inc:192
+#: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/users/class_divListUsers.inc:216
+#: plugins/admin/users/class_userManagement.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:320
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:1090
 msgid "FAX"
 msgstr "FAX"
 
 #: plugins/generic/references/class_reference.inc:53
+#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2670,34 +2689,34 @@ msgid "FTP"
 msgstr "FTP"
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:184
-#: plugins/admin/ogroups/ogroup-list.xml:79
-#: plugins/admin/groups/group-list.xml:15
-#: plugins/admin/groups/group-list.xml:79
+#: plugins/admin/ogroups/class_ogroupManagement.inc:532
+#: plugins/admin/groups/class_divListGroup.inc:133
 msgid "Group"
 msgstr "Grupo"
 
 #: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/admin/ogroups/class_divListOGroup.inc:83
+#: plugins/admin/ogroups/class_ogroupManagement.inc:534
+#: plugins/admin/groups/class_divListGroup.inc:79
+#: plugins/admin/users/class_divListUsers.inc:81
+#: plugins/admin/departments/class_departmentManagement.inc:616
+#: plugins/personal/generic/class_user.inc:1615
 #: plugins/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr "Departamento"
 
 #: plugins/generic/references/class_reference.inc:61
-#: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/ogroups/class_ogroupManagement.inc:536
+#: plugins/admin/groups/class_divListGroup.inc:196
+#: plugins/admin/users/class_divListUsers.inc:93
+#: plugins/admin/users/class_divListUsers.inc:212
+#: plugins/admin/users/class_userManagement.inc:1094
+#: plugins/admin/departments/class_departmentGeneric.inc:328
 #: plugins/admin/departments/generic.tpl:88
-#: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
+#: plugins/personal/generic/class_user.inc:1305
+#: plugins/personal/generic/class_user.inc:1718
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2706,13 +2725,14 @@ msgid "Phone"
 msgstr "Teléfono"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:185
+#: plugins/admin/ogroups/class_ogroupManagement.inc:533
+#: plugins/admin/groups/class_divListGroup.inc:194
 msgid "Application"
 msgstr "Aplicación"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:187
-#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
+#: plugins/admin/ogroups/class_ogroupManagement.inc:535
+#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
 msgid "Server"
 msgstr "Servidor"
 
@@ -2721,17 +2741,19 @@ msgid "Thin Client"
 msgstr "Cliente ligero"
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/admin/ogroups/class_ogroupManagement.inc:537
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/ogroup-list.xml:15
+#: plugins/admin/ogroups/class_divListOGroup.inc:83
+#: plugins/admin/ogroups/class_divListOGroup.inc:159
+#: plugins/admin/ogroups/class_divListOGroup.inc:266
 msgid "Object group"
 msgstr "Grupo de objetos"
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:192
+#: plugins/admin/ogroups/class_ogroupManagement.inc:540
 msgid "Printer"
 msgstr "Impresora"
 
@@ -2774,13 +2796,7 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "El equipo de GOsa"
 
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/dep-list.tpl:13 plugins/admin/acl/acl-list.tpl:13
-msgid "Update"
-msgstr ""
-
-#: plugins/admin/ogroups/remove.tpl:6
+#: plugins/admin/ogroups/remove.tpl:7
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -2788,37 +2804,247 @@ msgstr ""
 "Si está seguro de lo que quiere hacer pulse dos veces, ya que no hay forma "
 "de que GOsa pueda recuperar posteriormente esa información"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_divListOGroup.inc:59
+#: plugins/admin/ogroups/class_divListOGroup.inc:60
+msgid "List of object groups"
+msgstr "Lista del grupo de objetos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:84
+#: plugins/admin/groups/class_divListGroup.inc:80
+#: plugins/admin/users/class_divListUsers.inc:82
+#: plugins/admin/users/user-list.xml:57
+#: plugins/admin/departments/locality.tpl:8
+#: plugins/admin/departments/generic.tpl:7
+#: plugins/admin/departments/domain.tpl:8
+#: plugins/admin/departments/country.tpl:8
+#: plugins/admin/departments/dcObject.tpl:8
+#: plugins/admin/departments/organization.tpl:7
+msgid "Properties"
+msgstr "Propiedades"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:85
+#: plugins/admin/ogroups/class_divListOGroup.inc:152
+#: plugins/admin/groups/class_divListGroup.inc:81
+#: plugins/admin/groups/class_divListGroup.inc:126
+#: plugins/admin/users/class_divListUsers.inc:83
+#: plugins/admin/users/class_divListUsers.inc:124
+#: plugins/admin/users/user-list.xml:62
+#: plugins/admin/departments/class_divListDepartment.inc:66
+#: plugins/admin/departments/class_divListDepartment.inc:90
+#: plugins/admin/acl/class_divListACL.inc:74
+#: plugins/admin/acl/class_divListACL.inc:108
+msgid "Actions"
+msgstr "Acciones"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:88
+#: plugins/admin/ogroups/class_ogroup.inc:459
+#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:467
+#: plugins/admin/ogroups/class_ogroup.inc:471
+#: plugins/admin/ogroups/class_ogroup.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:479
+#: plugins/admin/ogroups/class_ogroup.inc:483
+#: plugins/admin/ogroups/class_ogroup.inc:487
+#: plugins/admin/ogroups/class_ogroup.inc:495
+#: plugins/admin/groups/class_divListGroup.inc:85
+#: plugins/admin/groups/class_divListGroup.inc:87
+#: plugins/admin/groups/class_divListGroup.inc:89
+#: plugins/admin/groups/class_divListGroup.inc:91
+#: plugins/admin/groups/class_divListGroup.inc:93
+#: plugins/admin/users/class_divListUsers.inc:85
+#: plugins/admin/users/class_divListUsers.inc:86
+#: plugins/admin/users/class_divListUsers.inc:87
+#: plugins/admin/users/class_divListUsers.inc:88
+#: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/users/class_divListUsers.inc:90
+#: plugins/admin/users/class_divListUsers.inc:93
+#, php-format
+msgid "Show %s"
+msgstr "Mostrar %s"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:89
+#: plugins/admin/ogroups/class_divListOGroup.inc:90
+msgid "user groups"
+msgstr "grupos de usuarios"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:91
+#: plugins/admin/ogroups/class_divListOGroup.inc:92
+msgid "nested groups"
+msgstr "grupos anidados"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:93
+#: plugins/admin/ogroups/class_divListOGroup.inc:94
+#: plugins/admin/groups/class_divListGroup.inc:89
+msgid "application groups"
+msgstr "grupos de aplicacion"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:95
+#: plugins/admin/ogroups/class_divListOGroup.inc:96
+msgid "department groups"
+msgstr "grupos de departamento"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:97
+#: plugins/admin/ogroups/class_divListOGroup.inc:98
+msgid "server groups"
+msgstr "grupos de servidor"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:99
+#: plugins/admin/ogroups/class_divListOGroup.inc:100
+msgid "workstation groups"
+msgstr "grupos de estación de trabajo"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:101
+#: plugins/admin/ogroups/class_divListOGroup.inc:102
+msgid "windows workstation groups"
+msgstr "grupos de estaciones de trabajo windows"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:103
+#: plugins/admin/ogroups/class_divListOGroup.inc:104
+msgid "terminal groups"
+msgstr "grupos de terminales"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:105
+#: plugins/admin/ogroups/class_divListOGroup.inc:106
+msgid "printer groups"
+msgstr "grupos de impresoras"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:107
+#: plugins/admin/ogroups/class_divListOGroup.inc:108
+msgid "phone groups"
+msgstr "grupos de teléfonos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:115
+#: plugins/admin/groups/class_divListGroup.inc:100
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr "Expresión regular para buscar nombres de grupos"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:148
+#: plugins/admin/groups/class_divListGroup.inc:122
+#: plugins/admin/users/class_divListUsers.inc:120
+#: plugins/admin/departments/class_divListDepartment.inc:87
+#: plugins/admin/acl/class_divListACL.inc:104
+msgid "Submit department"
+msgstr "Enviar departamento"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:157
+#: plugins/admin/groups/class_divListGroup.inc:131
+#: plugins/admin/users/class_divListUsers.inc:129
+#: plugins/admin/users/user-list.xml:72
+#: plugins/admin/departments/class_divListDepartment.inc:94
+#: plugins/admin/acl/class_divListACL.inc:112
+#: setup/class_setupStep_Migrate.inc:1035
+#: setup/class_setupStep_Migrate.inc:1051
+msgid "Create"
+msgstr "Crear"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:167
+#: plugins/admin/groups/class_divListGroup.inc:141
+#: plugins/admin/users/class_divListUsers.inc:143
+#: plugins/admin/users/user-list.xml:114
+#: plugins/admin/departments/class_divListDepartment.inc:110
+#: plugins/admin/acl/class_divListACL.inc:118
+#: plugins/personal/generic/generic_certs.tpl:21
+#: plugins/personal/generic/generic_certs.tpl:45
+#: plugins/personal/generic/generic_certs.tpl:69
+#: setup/class_setupStep_Migrate.inc:2869
+msgid "Remove"
+msgstr "Eliminar"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:228
+#: plugins/admin/groups/class_divListGroup.inc:234
+#: plugins/admin/users/class_divListUsers.inc:262
+#: plugins/admin/departments/class_divListDepartment.inc:158
+#: plugins/admin/acl/class_divListACL.inc:164
+#: plugins/admin/acl/class_divListACL.inc:184
+msgid "edit"
+msgstr "editar"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:228
+#: plugins/admin/groups/class_divListGroup.inc:234
+#: plugins/admin/departments/class_divListDepartment.inc:158
+msgid "Edit this entry"
+msgstr "Editar esta entrada"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:234
+#: plugins/admin/groups/class_divListGroup.inc:241
+#: plugins/admin/users/class_divListUsers.inc:286
+#: plugins/admin/departments/class_divListDepartment.inc:161
+#: plugins/admin/acl/class_divListACL.inc:191
+msgid "delete"
+msgstr "eliminar"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:234
+#: plugins/admin/groups/class_divListGroup.inc:241
+#: plugins/admin/departments/class_divListDepartment.inc:161
+msgid "Delete this entry"
+msgstr "Eliminar esta entrada"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:282
+msgid "Number of listed object groups"
+msgstr "Número de grupo de objetos listados"
+
+#: plugins/admin/ogroups/class_divListOGroup.inc:283
+#: plugins/admin/groups/class_divListGroup.inc:304
+#: plugins/admin/users/class_divListUsers.inc:377
+#: plugins/admin/departments/class_divListDepartment.inc:201
+msgid "Number of listed departments"
+msgstr "Número de departamentos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr "Grupos de objetos"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:27
 msgid "Manage object groups"
 msgstr "Gestionar grupos de objetos"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:115
-#: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/ogroups/class_ogroupManagement.inc:176
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:220
 msgid "Infrastructure error"
 msgstr "error de infraestructura"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:182
-#, fuzzy
+#: plugins/admin/ogroups/class_ogroupManagement.inc:255
+#: plugins/admin/ogroups/class_ogroupManagement.inc:331
+msgid "object group"
+msgstr "grupo de objetos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:285
+#: plugins/admin/ogroups/class_ogroupManagement.inc:338
+#: plugins/admin/ogroups/class_ogroupManagement.inc:365
+#: plugins/admin/groups/class_groupManagement.inc:407
+#: plugins/admin/groups/class_groupManagement.inc:461
+#: plugins/admin/groups/class_groupManagement.inc:492
+#: plugins/admin/users/class_userManagement.inc:555
+#: plugins/admin/users/class_userManagement.inc:559
+#: plugins/admin/departments/class_departmentManagement.inc:250
+#: plugins/admin/acl/class_aclManagement.inc:166
+#: plugins/admin/acl/class_aclManagement.inc:209
+#: plugins/admin/acl/class_aclManagement.inc:302
+#: plugins/admin/acl/class_aclManagement.inc:347
+msgid "Permission error"
+msgstr "Error de Permisos"
+
+#: plugins/admin/ogroups/class_ogroupManagement.inc:530
+#: plugins/admin/users/user-list.xml:24
 msgid "Templates"
-msgstr "Plantilla"
+msgstr "Plantillas"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:183
-#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
-#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+#: plugins/admin/ogroups/class_ogroupManagement.inc:531
+#: plugins/admin/users/class_divListUsers.inc:131
+#: plugins/admin/users/user-list.xml:79 setup/setup_config2.tpl:227
+#: setup/setup_config2.tpl:272
 msgid "User"
 msgstr "Usuario"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:190
+#: plugins/admin/ogroups/class_ogroupManagement.inc:538
 msgid "Windows Install"
 msgstr "Instalación Windows"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/admin/ogroups/class_ogroupManagement.inc:539
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -2834,19 +3060,6 @@ msgstr ""
 msgid "departments"
 msgstr "departamentos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:463
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#, php-format
-msgid "Show %s"
-msgstr "Mostrar %s"
-
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 msgid "people"
@@ -2898,9 +3111,7 @@ msgid "applications"
 msgstr "aplicaciones"
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/users/class_userManagement.inc:502
 msgid "none"
 msgstr "ninguno"
 
@@ -2918,20 +3129,20 @@ msgstr "Estación de trabajo Windows"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
-#: setup/setup_config2.tpl:143
+#: plugins/personal/posix/class_posixAccount.inc:639
+#: setup/setup_config2.tpl:142
 msgid "disabled"
 msgstr "desactivado"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/personal/posix/class_posixAccount.inc:639
 msgid "full access"
 msgstr "Acceso sin restricciones"
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:645
+#: plugins/personal/posix/class_posixAccount.inc:640
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
@@ -2945,21 +3156,28 @@ msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
+"Estos sistemas ya han sido configurados por otros grupos de objetos y no "
+"pueden ser añadidos:"
 
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/ogroups/ogroup-list.xml:41
-#: plugins/admin/groups/class_groupGeneric.inc:1129
-#: plugins/admin/groups/class_groupGeneric.inc:1135
+#: plugins/admin/groups/class_divListGroup.inc:79
+#: plugins/admin/groups/class_groupGeneric.inc:1131
 #: plugins/admin/groups/class_groupGeneric.inc:1137
-#: plugins/admin/groups/class_groupGeneric.inc:1149
-#: plugins/admin/groups/class_groupGeneric.inc:1163
-#: plugins/admin/groups/class_groupGeneric.inc:1170
-#: plugins/admin/groups/class_groupGeneric.inc:1257
-#: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/groups/class_groupGeneric.inc:1139
+#: plugins/admin/groups/class_groupGeneric.inc:1151
+#: plugins/admin/groups/class_groupGeneric.inc:1165
+#: plugins/admin/groups/class_groupGeneric.inc:1172
+#: plugins/admin/groups/class_groupGeneric.inc:1259
+#: plugins/admin/users/class_userManagement.inc:776
+#: plugins/admin/users/class_userManagement.inc:850
+#: plugins/admin/users/class_userManagement.inc:862
+#: plugins/admin/departments/class_departmentGeneric.inc:307
+#: plugins/admin/departments/class_departmentGeneric.inc:309
+#: plugins/admin/departments/class_departmentGeneric.inc:314
+#: plugins/admin/departments/class_departmentGeneric.inc:321
+#: plugins/admin/departments/class_departmentGeneric.inc:325
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -2987,19 +3205,13 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc:1279
-#: plugins/personal/generic/class_user.inc:1292
-#: plugins/personal/generic/class_user.inc:1334
-#: plugins/personal/generic/class_user.inc:1740 setup/setup_migrate.tpl:283
+#: plugins/admin/acl/class_aclRole.inc:750
+#: plugins/admin/acl/class_aclRole.inc:762 plugins/admin/acl/paste_role.tpl:4
+#: plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc:1272
+#: plugins/personal/generic/class_user.inc:1285
+#: plugins/personal/generic/class_user.inc:1327
+#: plugins/personal/generic/class_user.inc:1733 setup/setup_migrate.tpl:283
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Nombre"
@@ -3053,7 +3265,7 @@ msgid "Select a base"
 msgstr "Seleccione una base"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Sistema de seguridad"
@@ -3091,9 +3303,10 @@ msgid "FAI summary"
 msgstr "Sumario FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
-#: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/admin/groups/class_divListGroup.inc:198
+#: plugins/admin/users/class_divListUsers.inc:208
+#: plugins/admin/users/class_userManagement.inc:1086
+#: plugins/personal/posix/class_posixAccount.inc:320
 msgid "Environment"
 msgstr "Entorno"
 
@@ -3105,107 +3318,6 @@ msgstr "Aplicaciones"
 msgid "Please enter the new object group name"
 msgstr "Por favor introduzca un nuevo nombre del grupo de objetos"
 
-#: plugins/admin/ogroups/ogroup-filter.tpl:3
-#: plugins/admin/groups/group-filter.tpl:3
-#: plugins/admin/users/user-filter.tpl:3
-#: plugins/admin/departments/dep-filter.tpl:3
-#: plugins/admin/acl/acl-filter.tpl:3
-#, fuzzy
-msgid "Filter"
-msgstr "Filtros"
-
-#: plugins/admin/ogroups/ogroup-filter.tpl:11
-msgid "user groups"
-msgstr "grupos de usuarios"
-
-#: plugins/admin/ogroups/ogroup-filter.tpl:12
-msgid "nested groups"
-msgstr "grupos anidados"
-
-#: plugins/admin/ogroups/ogroup-filter.tpl:13
-msgid "application groups"
-msgstr "grupos de aplicacion"
-
-#: plugins/admin/ogroups/ogroup-filter.tpl:14
-msgid "department groups"
-msgstr "grupos de departamento"
-
-#: plugins/admin/ogroups/ogroup-filter.tpl:15
-msgid "server groups"
-msgstr "grupos de servidor"
-
-#: plugins/admin/ogroups/ogroup-filter.tpl:16
-msgid "workstation groups"
-msgstr "grupos de estación de trabajo"
-
-#: plugins/admin/ogroups/ogroup-filter.tpl:17
-msgid "windows workstation groups"
-msgstr "grupos de estaciones de trabajo windows"
-
-#: plugins/admin/ogroups/ogroup-filter.tpl:18
-msgid "terminal groups"
-msgstr "grupos de terminales"
-
-#: plugins/admin/ogroups/ogroup-filter.tpl:19
-msgid "printer groups"
-msgstr "grupos de impresoras"
-
-#: plugins/admin/ogroups/ogroup-filter.tpl:20
-msgid "phone groups"
-msgstr "grupos de teléfonos"
-
-#: plugins/admin/ogroups/ogroup-list.xml:11
-msgid "List of object groups"
-msgstr "Lista del grupo de objetos"
-
-#: plugins/admin/ogroups/ogroup-list.xml:57
-#: plugins/admin/groups/group-list.xml:57 plugins/admin/users/user-list.xml:73
-#: plugins/admin/departments/locality.tpl:8
-#: plugins/admin/departments/generic.tpl:7
-#: plugins/admin/departments/domain.tpl:8
-#: plugins/admin/departments/country.tpl:8
-#: plugins/admin/departments/dcObject.tpl:8
-#: plugins/admin/departments/organization.tpl:7
-msgid "Properties"
-msgstr "Propiedades"
-
-#: plugins/admin/ogroups/ogroup-list.xml:73
-#: plugins/admin/groups/group-list.xml:73 plugins/admin/users/user-list.xml:89
-#: plugins/admin/departments/dep-list.xml:98 plugins/admin/acl/acl-list.xml:76
-#: setup/class_setupStep_Migrate.inc:1035
-#: setup/class_setupStep_Migrate.inc:1051
-msgid "Create"
-msgstr "Crear"
-
-#: plugins/admin/ogroups/ogroup-list.xml:98
-#: plugins/admin/groups/group-list.xml:98
-#: plugins/admin/users/user-list.xml:121
-#: plugins/admin/departments/dep-list.xml:160
-#: plugins/admin/departments/dep-list.xml:181
-#: plugins/admin/acl/acl-list.xml:95 plugins/admin/acl/acl-list.xml:144
-#: plugins/personal/generic/generic_certs.tpl:21
-#: plugins/personal/generic/generic_certs.tpl:45
-#: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2869
-msgid "Remove"
-msgstr "Eliminar"
-
-#: plugins/admin/ogroups/ogroup-list.xml:106
-#: plugins/admin/groups/group-list.xml:106
-#: plugins/admin/users/user-list.xml:156
-msgid "Send message"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup-list.xml:142
-#, fuzzy
-msgid "Edit object group"
-msgstr "grupo de objetos"
-
-#: plugins/admin/ogroups/ogroup-list.xml:155
-#, fuzzy
-msgid "Remove object group"
-msgstr "grupos de servidor"
-
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr "Seleccione los objetos a añadir"
@@ -3280,6 +3392,7 @@ msgid "Display users of department"
 msgstr "Mostrar usuarios del departamento"
 
 #: plugins/admin/groups/group_objects.tpl:46
+#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr "Mostrar usuarios que coincidan con"
 
@@ -3343,21 +3456,68 @@ msgstr "en todos los grupos"
 msgid "Not in all groups"
 msgstr "no en todos los grupos"
 
-#: plugins/admin/groups/group-filter.tpl:11
-#, fuzzy
-msgid "Show primary groups"
+#: plugins/admin/groups/class_divListGroup.inc:55
+#: plugins/admin/groups/class_divListGroup.inc:56
+msgid "List of groups"
+msgstr "Lista de grupos"
+
+#: plugins/admin/groups/class_divListGroup.inc:84
+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/class_divListGroup.inc:85
+msgid "primary groups"
 msgstr "grupos primarios"
 
-#: plugins/admin/groups/group-filter.tpl:12
-#, fuzzy
-msgid "Show samba groups"
+#: plugins/admin/groups/class_divListGroup.inc:86
+msgid "samba groups mappings"
+msgstr "Mapeos de grupos de samba"
+
+#: plugins/admin/groups/class_divListGroup.inc:87
+msgid "samba groups"
 msgstr "grupo de samba"
 
-#: plugins/admin/groups/group-filter.tpl:13
-#, fuzzy
-msgid "Show mail groups"
+#: plugins/admin/groups/class_divListGroup.inc:88
+msgid "application settings"
+msgstr "parámetros de aplicaciones"
+
+#: plugins/admin/groups/class_divListGroup.inc:90
+msgid "mail settings"
+msgstr "parámetros de correo"
+
+#: plugins/admin/groups/class_divListGroup.inc:91
+msgid "mail groups"
 msgstr "grupos de correo"
 
+#: plugins/admin/groups/class_divListGroup.inc:92
+msgid "Select to see normal groups that have only functional aspects"
+msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
+
+#: plugins/admin/groups/class_divListGroup.inc:93
+msgid "functional groups"
+msgstr "grupos funcionales"
+
+#: plugins/admin/groups/class_divListGroup.inc:101
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr "Nombre de usuario de los grupos que se muestran"
+
+#: plugins/admin/groups/class_divListGroup.inc:188
+#: plugins/admin/users/class_divListUsers.inc:87
+#: plugins/admin/users/class_divListUsers.inc:206
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_divListGroup.inc:244
+#: plugins/admin/users/class_divListUsers.inc:278
+#: plugins/admin/users/class_divListUsers.inc:290
+msgid "Not allowed"
+msgstr "No permitido"
+
+#: plugins/admin/groups/class_divListGroup.inc:303
+msgid "Number of listed groups"
+msgstr "Número de grupos mostrados"
+
 #: plugins/admin/groups/class_groupGeneric.inc:161
 msgid "Cannot find group SID in your configuration!"
 msgstr "¡No se puede encontrar SID de grupo en el archivo de configuración!"
@@ -3387,16 +3547,17 @@ msgstr "Grupo especial (%d)"
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
+"¡Añadir UID '%s' al grupo '%s ha fallado: no podemos encontrar el objeto "
+"usuario!"
 
 #: plugins/admin/groups/class_groupGeneric.inc:624
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
-msgstr ""
+msgstr "¡Añadir UID '%s' al grupo '%s ha fallado: UID es usado mas de una vez!"
 
 #: plugins/admin/groups/class_groupGeneric.inc:702
-#, fuzzy
 msgid "! unknown UID"
-msgstr "¡id desconocido!"
+msgstr "¡UID desconocido!"
 
 #: plugins/admin/groups/class_groupGeneric.inc:745
 #, php-format
@@ -3405,52 +3566,52 @@ msgstr ""
 "La busqueda ha devuelto demasiados reultados.¡No se muestran mas de %s "
 "entradas!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:969
+#: plugins/admin/groups/class_groupGeneric.inc:971
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "¡No se puede encontrar nigún SID para '%s'!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:974
+#: plugins/admin/groups/class_groupGeneric.inc:976
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "¡No se puede encontrar un RIDBASE para '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1080
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
-msgstr ""
+msgstr "¡El gidNumber '%s' introducido ya esta siendo usado por %s!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1179
-#: plugins/admin/groups/class_groupGeneric.inc:1182
-#: plugins/admin/groups/class_groupGeneric.inc:1261
+#: plugins/admin/groups/class_groupGeneric.inc:1181
+#: plugins/admin/groups/class_groupGeneric.inc:1184
+#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/personal/posix/class_posixAccount.inc:1113
 #: plugins/personal/posix/class_posixAccount.inc:1116
-#: plugins/personal/posix/class_posixAccount.inc:1119
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1251
 msgid "Generic group settings"
 msgstr "Parámetros genéricos del grupo"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 msgid "Samba group type"
 msgstr "Tipo de grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 msgid "Samba domain name"
 msgstr "Nombre de dominio samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1268
 msgid "Phone pickup group"
 msgstr "Miembros de grupo de salto telefónico"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 msgid "Nagios group"
 msgstr "Grupo Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1271
 msgid "Group member"
 msgstr "Miembro del grupo"
 
@@ -3458,73 +3619,178 @@ msgstr "Miembro del grupo"
 msgid "Group settings"
 msgstr "Parametros de grupos"
 
-#: plugins/admin/groups/group-list.xml:11
-msgid "List of groups"
-msgstr "Lista de grupos"
+#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
+msgid "Group administration"
+msgstr "Administración de grupo"
 
-#: plugins/admin/groups/group-list.xml:138
-#, fuzzy
-msgid "Edit group"
-msgstr "grupos de impresoras"
+#: plugins/admin/groups/class_groupManagement.inc:27
+msgid "Manage POSIX groups"
+msgstr "Gestionar grupos POSIX"
 
-#: plugins/admin/groups/group-list.xml:151
-#, fuzzy
-msgid "Remove group"
-msgstr "grupos de servidor"
+#: plugins/admin/groups/class_groupManagement.inc:373
+#: plugins/admin/groups/class_groupManagement.inc:454
+msgid "group"
+msgstr "grupo"
 
-#: plugins/admin/groups/class_groupManagement.inc:26
-msgid "Group administration"
-msgstr "Administración de grupo"
+#: plugins/admin/users/remove.tpl:6
+msgid ""
+"This includes all account data, system access rules, imap settings, etc. for "
+"this user. 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. Si está seguro de lo que quiere "
+"hacer pulse dos veces, ya que no hay manera de que GOsa recupere "
+"posteriormente la información."
 
-#: plugins/admin/groups/class_groupManagement.inc:155
-msgid "Posix"
-msgstr "Posix"
+#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
+msgid "User administration"
+msgstr "Administración de Usuario"
 
-#: plugins/admin/groups/class_groupManagement.inc:156
-#, fuzzy
-msgid "Edit posix properties"
-msgstr "Editar características telefónicas"
+#: plugins/admin/users/class_divListUsers.inc:56
+#: plugins/admin/users/class_divListUsers.inc:57
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Lista de usuarios"
+
+#: plugins/admin/users/class_divListUsers.inc:85
+#: plugins/admin/users/class_divListUsers.inc:133
+#: plugins/admin/users/template.tpl:15
+#: plugins/admin/users/class_userManagement.inc:773
+#: plugins/admin/users/user-list.xml:87 plugins/admin/users/templatize.tpl:15
+msgid "Template"
+msgstr "Plantilla"
+
+#: plugins/admin/users/class_divListUsers.inc:85
+msgid "templates"
+msgstr "plantillas"
+
+#: plugins/admin/users/class_divListUsers.inc:86
+msgid "GOsa object"
+msgstr "Objeto GOsa"
 
-#: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_divListUsers.inc:86
+msgid "functional users"
+msgstr "usuarios funcionales"
+
+#: plugins/admin/users/class_divListUsers.inc:87
+msgid "POSIX users"
+msgstr "Usuarios POSIX"
+
+#: plugins/admin/users/class_divListUsers.inc:88
+msgid "mail users"
+msgstr "Usuarios del correo"
+
+#: plugins/admin/users/class_divListUsers.inc:89
+msgid "samba users"
+msgstr "Usuarios samba"
+
+#: plugins/admin/users/class_divListUsers.inc:90
+msgid "proxy users"
+msgstr "usuarios de proxy"
+
+#: plugins/admin/users/class_divListUsers.inc:93
+msgid "phone users"
+msgstr "operadores telefónicos"
+
+#: plugins/admin/users/class_divListUsers.inc:145
+#: plugins/admin/users/user-list.xml:121 plugins/admin/users/user-list.xml:163
+msgid "Apply template"
+msgstr "Aplicar plantilla"
+
+#: plugins/admin/users/class_divListUsers.inc:204
+msgid "GOsa"
+msgstr "GOsa"
+
+#: plugins/admin/users/class_divListUsers.inc:205
+#: plugins/admin/users/class_userManagement.inc:1067
+msgid "Edit generic properties"
+msgstr "Editar características generales"
+
+#: plugins/admin/users/class_divListUsers.inc:207
+msgid "Edit UNIX properties"
+msgstr "Editar características UNIX"
+
+#: plugins/admin/users/class_divListUsers.inc:209
+#: plugins/admin/users/class_userManagement.inc:1087
+msgid "Edit environment properties"
+msgstr "Editar características de entorno"
+
+#: plugins/admin/users/class_divListUsers.inc:211
+#: plugins/admin/users/class_userManagement.inc:1075
 msgid "Edit mail properties"
 msgstr "Editar características de correo electrónico"
 
-#: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
-msgid "Edit samba properties"
-msgstr "Editar características samba"
-
-#: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_divListUsers.inc:213
+#: plugins/admin/users/class_userManagement.inc:1095
 msgid "Edit phone properties"
 msgstr "Editar características telefónicas"
 
-#: plugins/admin/groups/class_groupManagement.inc:187
-#, fuzzy
-msgid "Menu"
-msgstr "Impresora"
+#: plugins/admin/users/class_divListUsers.inc:214
+#: plugins/admin/departments/class_departmentGeneric.inc:331
+#: plugins/admin/departments/class_departmentGeneric.inc:627
+#: plugins/admin/departments/generic.tpl:96
+#: plugins/admin/departments/class_organizationGeneric.inc:127
+#: plugins/admin/departments/organization.tpl:96
+#: plugins/personal/generic/class_user.inc:1308
+#: plugins/personal/generic/class_user.inc:1721
+#: plugins/personal/generic/generic.tpl:371
+#: plugins/personal/generic/generic.tpl:539
+#: plugins/personal/generic/multiple_generic.tpl:247
+#: plugins/personal/generic/multiple_generic.tpl:438
+msgid "Fax"
+msgstr "Fax"
 
-#: plugins/admin/groups/class_groupManagement.inc:188
-#, fuzzy
-msgid "Edit start menu properties"
+#: plugins/admin/users/class_divListUsers.inc:215
+msgid "Edit fax properies"
+msgstr "Editar características de Fax"
+
+#: plugins/admin/users/class_divListUsers.inc:217
+#: plugins/admin/users/class_userManagement.inc:1079
+msgid "Edit samba properties"
 msgstr "Editar características samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
-msgid "Edit environment properties"
-msgstr "Editar características de entorno"
+#: plugins/admin/users/class_divListUsers.inc:218
+#: plugins/admin/users/class_userManagement.inc:1082
+msgid "Netatalk"
+msgstr "Netatalk"
 
-#: plugins/admin/users/remove.tpl:6 plugins/admin/acl/remove.tpl:6
-msgid ""
-"This includes all account data, system access rules, imap settings, etc. for "
-"this user. 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. Si está seguro de lo que quiere "
-"hacer pulse dos veces, ya que no hay manera de que GOsa recupere "
-"posteriormente la información."
+#: plugins/admin/users/class_divListUsers.inc:219
+#: plugins/admin/users/class_userManagement.inc:1083
+msgid "Edit netatalk properties"
+msgstr "Editar características netatalk"
+
+#: plugins/admin/users/class_divListUsers.inc:220
+msgid "Create user from template"
+msgstr "Crear usuario desde plantilla"
+
+#: plugins/admin/users/class_divListUsers.inc:221
+msgid "Create user with this template"
+msgstr "Crear usuario con esta plantilla"
+
+#: plugins/admin/users/class_divListUsers.inc:255
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+msgid "active"
+msgstr "activo"
+
+#: plugins/admin/users/class_divListUsers.inc:263
+#: plugins/admin/users/class_userManagement.inc:611
+msgid "user"
+msgstr "usuario"
+
+#: plugins/admin/users/class_divListUsers.inc:274
+msgid "password"
+msgstr "contraseña"
+
+#: plugins/admin/users/class_divListUsers.inc:287
+msgid "Delete user"
+msgstr "Eliminar usuario"
+
+#: plugins/admin/users/class_divListUsers.inc:376
+msgid "Number of listed users"
+msgstr "Número de usuarios mostrados"
 
 #: plugins/admin/users/password.tpl:4
 msgid ""
@@ -3574,13 +3840,6 @@ msgstr ""
 "base de datos serán introducidos automáticamente. Elegir 'ninguno' para "
 "anular el uso de plantillas."
 
-#: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:404
-#: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
-#: plugins/admin/users/templatize.tpl:15
-msgid "Template"
-msgstr "Plantilla"
-
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
@@ -3591,139 +3850,109 @@ msgstr "Apellido"
 msgid "First name"
 msgstr "Nombre"
 
-#: plugins/admin/users/class_userManagement.inc:26
+#: plugins/admin/users/class_userManagement.inc:27
 msgid "Manage users"
 msgstr "Gestión de usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:325
+#: plugins/admin/users/class_userManagement.inc:388
 msgid "You have no permission to change this users password!"
 msgstr "¡No tiene permisos para cambiar la contraseña de este usuario!"
 
-#: plugins/admin/users/class_userManagement.inc:410
-#: plugins/admin/users/user-list.xml:57
-#: plugins/personal/generic/class_user.inc:1284
-#: plugins/personal/generic/class_user.inc:1331
-#: plugins/personal/generic/class_user.inc:1609
-#: plugins/personal/generic/class_user.inc:1737
-msgid "Given name"
-msgstr "Nombre de pila"
+#: plugins/admin/users/class_userManagement.inc:555
+#, php-format
+msgid "You have no permission to modify object '%s'!"
+msgstr "¡No tiene permisos para modificar el objeto '%s'!"
 
-#: plugins/admin/users/class_userManagement.inc:649
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:559
+msgid "You have no permission to use this template!"
+msgstr "¡No tiene permisos para usar esta plantilla!"
+
+#: plugins/admin/users/class_userManagement.inc:661
+#: plugins/admin/users/class_userManagement.inc:680
 msgid "Account locking"
-msgstr "Cuenta"
+msgstr "Bloqueo de cuenta"
+
+#: plugins/admin/users/class_userManagement.inc:662
+msgid "You have no permission to change the lock status for this user!"
+msgstr "¡No tiene permisos para cambiar el estado de bloqueo de este usuario!"
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:681
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account (%s) has not been "
-"locked!"
+"Password method '%s' does not support locking. Account has not been locked!"
 msgstr ""
+"El método de contraseña '%s' no soporta bloqueo. ¡La cuenta no ha sido "
+"bloqueada!"
 
-#: plugins/admin/users/class_userManagement.inc:723
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:779
+#: plugins/admin/users/class_userManagement.inc:853
+#: plugins/personal/generic/class_user.inc:1277
+#: plugins/personal/generic/class_user.inc:1324
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/generic/class_user.inc:1730
+msgid "Given name"
+msgstr "Nombre de pila"
+
+#: plugins/admin/users/class_userManagement.inc:1050
 msgid "Unlock account"
-msgstr "Mi cuenta"
+msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:725
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:1052
 msgid "Lock account"
-msgstr "Mi cuenta"
-
-#: plugins/admin/users/class_userManagement.inc:738
-msgid "Edit generic properties"
-msgstr "Editar características generales"
+msgstr "Bloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:741
-#: plugins/personal/posix/class_posixAccount.inc:304
-#: plugins/personal/posix/class_posixAccount.inc:324
-#: plugins/personal/posix/class_posixAccount.inc:326
-#: plugins/personal/posix/class_posixAccount.inc:329
+#: plugins/admin/users/class_userManagement.inc:1070
+#: plugins/personal/posix/class_posixAccount.inc:300
+#: plugins/personal/posix/class_posixAccount.inc:320
+#: plugins/personal/posix/class_posixAccount.inc:322
+#: plugins/personal/posix/class_posixAccount.inc:325
 msgid "POSIX"
 msgstr "POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:742
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:1071
 msgid "Edit POSIX properties"
-msgstr "Editar características UNIX"
-
-#: plugins/admin/users/class_userManagement.inc:753
-msgid "Netatalk"
-msgstr "Netatalk"
-
-#: plugins/admin/users/class_userManagement.inc:754
-msgid "Edit netatalk properties"
-msgstr "Editar características netatalk"
+msgstr "Editar características POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:762
-#, fuzzy
+#: plugins/admin/users/class_userManagement.inc:1091
 msgid "Edit FAX properties"
-msgstr "Editar características UNIX"
-
-#: plugins/admin/users/user-list.xml:11
-msgid "List of users"
-msgstr "Lista de usuarios"
+msgstr "Editar características FAX"
 
 #: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1608
-msgid "Surname"
-msgstr "Apellido"
-
-#: plugins/admin/users/user-list.xml:140
-#, fuzzy
-msgid "Lock users"
-msgstr "Lista de usuarios"
-
-#: plugins/admin/users/user-list.xml:148
-#, fuzzy
-msgid "Unlock users"
-msgstr "Usuarios del correo"
-
-#: plugins/admin/users/user-list.xml:167
-msgid "Apply template"
-msgstr "Aplicar plantilla"
-
-#: plugins/admin/users/user-list.xml:199
-#, fuzzy
-msgid "New user from template"
-msgstr "Crear usuario desde plantilla"
+msgid "Name / Department"
+msgstr "Nombre / Departamento"
 
-#: plugins/admin/users/user-list.xml:213
+#: plugins/admin/users/user-list.xml:175
 msgid "Edit user"
 msgstr "Editar usuario"
 
-#: plugins/admin/users/user-list.xml:222
+#: plugins/admin/users/user-list.xml:184
 msgid "%{filter:lockLabel(userPassword)}"
-msgstr ""
+msgstr "%{filter:lockLabel(userPassword)}"
 
-#: plugins/admin/users/user-list.xml:245
-#, fuzzy
+#: plugins/admin/users/user-list.xml:206
 msgid "Remove user"
-msgstr "Eliminar foto"
+msgstr "Eliminar usuario"
 
 #: plugins/admin/users/user-filter.tpl:11
 msgid "Show templates"
 msgstr "Mostrar plantillas"
 
 #: plugins/admin/users/user-filter.tpl:12
-#, fuzzy
 msgid "Show functional users"
-msgstr "usuarios funcionales"
+msgstr "Mostrar usuarios funcionales"
 
 #: plugins/admin/users/user-filter.tpl:13
-#, fuzzy
-msgid "Show POSIX users"
-msgstr "Usuarios POSIX"
+msgid "Show mail users"
+msgstr "Mostrar los usuarios de correo"
 
 #: plugins/admin/users/user-filter.tpl:14
-#, fuzzy
-msgid "Show Mail users"
-msgstr "Mostrar los usuarios de correo"
+msgid "Show POSIX users"
+msgstr "Mostrar usuarios POSIX"
 
 #: plugins/admin/users/user-filter.tpl:15
-#, fuzzy
-msgid "Show Samba users"
-msgstr "Mostrar los usuarios de correo"
+msgid "Show samba users"
+msgstr "Mostrar los usuarios samba"
 
 #: plugins/admin/users/templatize.tpl:2
 msgid "Applying a template"
@@ -3741,6 +3970,10 @@ msgstr ""
 msgid "No templates available!"
 msgstr "¡No hay plantillas disponibles!"
 
+#: plugins/admin/users/user-list.tpl:13
+msgid "Update"
+msgstr "Actualizar"
+
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -3751,7 +3984,7 @@ msgstr ""
 "pulse dos veces si quiere realmente hacer esto, ya que no hay forma de que "
 "GOsa recupere la información posteriormente."
 
-#: plugins/admin/departments/remove.tpl:10
+#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
 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 "
@@ -3761,50 +3994,111 @@ msgstr ""
 "actual de su árbol LDAP en un fichero. Entonces - Y solo entonces - presione "
 "'Eliminar' para continuar o 'Cancelar' para abortar."
 
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Lista de Departamentos"
+#: plugins/admin/departments/class_departmentGeneric.inc:386
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr ""
+"¡No se puede encontrar una etiqueta sin usar para identificar la unidad "
+"administrativa!"
 
-#: plugins/admin/departments/dep-list.xml:15
-#: plugins/admin/departments/dep-list.xml:103
-#: plugins/admin/departments/class_departmentManagement.inc:175
-#, fuzzy
-msgid "Domain"
-msgstr "en dominio"
+#: plugins/admin/departments/class_departmentGeneric.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr "Etiquetando '%s'."
 
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Componentes del dominio"
+#: plugins/admin/departments/class_departmentGeneric.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr "Moviendo '%s' a '%s'"
 
-#: plugins/admin/departments/dep-list.xml:31
-#: plugins/admin/departments/dep-list.xml:117
-#: plugins/admin/departments/class_departmentManagement.inc:199
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "País"
+#: plugins/admin/departments/class_departmentGeneric.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr "Ha fallado a copiar %s, operación abortada"
 
-#: plugins/admin/departments/dep-list.xml:39
-#: plugins/admin/departments/dep-list.xml:124
-#: plugins/admin/departments/class_departmentManagement.inc:211
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
-msgstr "Localidad"
+#: plugins/admin/departments/class_departmentGeneric.inc:610
+#: plugins/admin/departments/class_departmentGeneric.inc:615
+#: plugins/admin/departments/class_departmentManagement.inc:26
+msgid "Departments"
+msgstr "Departamentos"
 
-#: plugins/admin/departments/dep-list.xml:47
-#: plugins/admin/departments/dep-list.xml:131
-#: plugins/admin/departments/class_departmentManagement.inc:223
-#: plugins/admin/departments/class_organizationGeneric.inc:109
-#: plugins/admin/departments/class_organizationGeneric.inc:110
-#: plugins/personal/generic/class_user.inc:1621
-#: plugins/personal/generic/generic.tpl:287
-#: plugins/personal/generic/multiple_generic.tpl:149
-#: setup/setup_feedback.tpl:23
-msgid "Organization"
-msgstr "Organización"
+#: plugins/admin/departments/class_departmentGeneric.inc:618
+#: plugins/admin/departments/class_divListDepartment.inc:65
+msgid "Department name"
+msgstr "Nombre de departamento"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:620
+#: plugins/admin/departments/generic.tpl:27
+#: plugins/admin/departments/class_organizationGeneric.inc:120
+#: plugins/admin/departments/organization.tpl:27
+msgid "Category"
+msgstr "Categoría"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:623
+#: plugins/admin/departments/generic.tpl:65
+#: plugins/admin/departments/class_organizationGeneric.inc:123
+#: plugins/admin/departments/organization.tpl:65
+#: plugins/personal/generic/class_user.inc:1626
+#: plugins/personal/generic/generic.tpl:397
+#: plugins/personal/generic/multiple_generic.tpl:275
+msgid "State"
+msgstr "Provincia"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:624
+#: plugins/admin/departments/generic.tpl:61
+#: plugins/admin/departments/generic.tpl:73
+#: plugins/admin/departments/class_localityGeneric.inc:87
+#: plugins/admin/departments/class_organizationGeneric.inc:124
+#: plugins/admin/departments/organization.tpl:61
+#: plugins/admin/departments/organization.tpl:73
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:389
+#: plugins/personal/generic/multiple_generic.tpl:265
+msgid "Location"
+msgstr "Localización"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:625
+#: plugins/admin/departments/generic.tpl:81
+#: plugins/admin/departments/organization.tpl:81
+#: plugins/personal/generic/generic.tpl:188
+#: plugins/personal/generic/generic.tpl:405
+#: plugins/personal/generic/multiple_generic.tpl:67
+#: plugins/personal/generic/multiple_generic.tpl:285
+msgid "Address"
+msgstr "Dirección"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:626
+msgid "Telephone"
+msgstr "Teléfono"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:629
+#: plugins/admin/departments/locality.tpl:50
+#: plugins/admin/departments/generic.tpl:114
+#: plugins/admin/departments/class_domain.inc:89
+#: plugins/admin/departments/class_localityGeneric.inc:90
+#: plugins/admin/departments/class_organizationGeneric.inc:129
+#: plugins/admin/departments/class_countryGeneric.inc:90
+#: plugins/admin/departments/class_dcObject.inc:89
+#: plugins/admin/departments/domain.tpl:50
+#: plugins/admin/departments/country.tpl:50
+#: plugins/admin/departments/dcObject.tpl:50
+#: plugins/admin/departments/organization.tpl:114
+msgid "Administrative settings"
+msgstr "Parámetros administrativos"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr "El objeto '%s' está ya marcado"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr "Añadir marca (%s) al objeto '%s'"
+
+#: plugins/admin/departments/class_departmentGeneric.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr "Eliminando marca del objeto '%s'"
 
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -3833,21 +4127,6 @@ msgstr "Descripción del departamento"
 msgid "Choose subtree to place department in"
 msgstr "Elija subárbol para colocar el departamento"
 
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
-#: plugins/admin/departments/class_domain.inc:89
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_countryGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/class_department.inc:629
-#: plugins/admin/departments/organization.tpl:114
-msgid "Administrative settings"
-msgstr "Parámetros administrativos"
-
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -3866,45 +4145,14 @@ msgid "Name of subtree to create"
 msgstr "Nombre del subárbol a crear"
 
 #: plugins/admin/departments/generic.tpl:22
-#, fuzzy
 msgid "Descriptive text for   department"
 msgstr "Descripción del departamento"
 
-#: plugins/admin/departments/generic.tpl:27
-#: plugins/admin/departments/class_organizationGeneric.inc:120
-#: plugins/admin/departments/class_department.inc:620
-#: plugins/admin/departments/organization.tpl:27
-msgid "Category"
-msgstr "Categoría"
-
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr "Categoría para este subárbol"
 
-#: plugins/admin/departments/generic.tpl:61
-#: plugins/admin/departments/generic.tpl:73
-#: plugins/admin/departments/class_localityGeneric.inc:87
-#: plugins/admin/departments/class_organizationGeneric.inc:124
-#: plugins/admin/departments/class_department.inc:624
-#: plugins/admin/departments/organization.tpl:61
-#: plugins/admin/departments/organization.tpl:73
-#: plugins/personal/generic/class_user.inc:1634
-#: plugins/personal/generic/generic.tpl:389
-#: plugins/personal/generic/multiple_generic.tpl:265
-msgid "Location"
-msgstr "Localización"
-
-#: plugins/admin/departments/generic.tpl:65
-#: plugins/admin/departments/class_organizationGeneric.inc:123
-#: plugins/admin/departments/class_department.inc:623
-#: plugins/admin/departments/organization.tpl:65
-#: plugins/personal/generic/class_user.inc:1633
-#: plugins/personal/generic/generic.tpl:397
-#: plugins/personal/generic/multiple_generic.tpl:275
-msgid "State"
-msgstr "Provincia"
-
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
 msgid "State where this subtree is located"
@@ -3915,16 +4163,6 @@ msgstr "Estado donde está este subárbol localizado"
 msgid "Location of this subtree"
 msgstr "Localización de este subárbol"
 
-#: plugins/admin/departments/generic.tpl:81
-#: plugins/admin/departments/class_department.inc:625
-#: plugins/admin/departments/organization.tpl:81
-#: plugins/personal/generic/generic.tpl:188
-#: plugins/personal/generic/generic.tpl:405
-#: plugins/personal/generic/multiple_generic.tpl:67
-#: plugins/personal/generic/multiple_generic.tpl:285
-msgid "Address"
-msgstr "Dirección"
-
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -3935,20 +4173,6 @@ msgstr "Dirección postal de este subárbol"
 msgid "Base telephone number of this subtree"
 msgstr "Número base de teléfono de este subárbol"
 
-#: plugins/admin/departments/generic.tpl:96
-#: plugins/admin/departments/class_organizationGeneric.inc:127
-#: plugins/admin/departments/class_department.inc:331
-#: plugins/admin/departments/class_department.inc:627
-#: plugins/admin/departments/organization.tpl:96
-#: plugins/personal/generic/class_user.inc:1315
-#: plugins/personal/generic/class_user.inc:1728
-#: plugins/personal/generic/generic.tpl:371
-#: plugins/personal/generic/generic.tpl:539
-#: plugins/personal/generic/multiple_generic.tpl:247
-#: plugins/personal/generic/multiple_generic.tpl:438
-msgid "Fax"
-msgstr "Fax"
-
 #: plugins/admin/departments/generic.tpl:99
 #: plugins/admin/departments/organization.tpl:99
 msgid "Base facsimile telephone number of this subtree"
@@ -3956,39 +4180,77 @@ msgstr "Número base de fax de este subárbol"
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:568
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 msgid "Domain Component"
 msgstr "Componentes del dominio"
 
-#: plugins/admin/departments/class_departmentManagement.inc:25
-#: plugins/admin/departments/class_department.inc:610
-#: plugins/admin/departments/class_department.inc:615
-msgid "Departments"
-msgstr "Departamentos"
+#: plugins/admin/departments/class_divListDepartment.inc:47
+#: plugins/admin/departments/class_divListDepartment.inc:48
+msgid "List of departments"
+msgstr "Lista de Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:26
+#: plugins/admin/departments/class_divListDepartment.inc:73
+msgid "Regular expression for matching department names"
+msgstr "Expresión regular para buscar el nombre del departamento"
+
+#: plugins/admin/departments/class_departmentManagement.inc:27
 msgid "Manage Departments"
 msgstr "Gestionar Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:126
-#, fuzzy
+#: plugins/admin/departments/class_departmentManagement.inc:316
+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 ""
+"Tan pronto como la termine la operación mover, podrá bajar al final de la "
+"página y presionar el botón 'Continuar' para continuar con el asistente de "
+"administración de departamento."
+
+#: plugins/admin/departments/class_departmentManagement.inc:336
 msgid ""
 "As soon as the tag operation has finished, you can scroll down to end of the "
-"page and    press the 'Continue' button to continue with the department "
+"page and press the 'Continue' button to continue with the department "
 "management dialog."
 msgstr ""
 "Tan pronto como la operación de marcado termine, puede avanzar hasta el "
 "final de la página y presionar el botón 'Continuar' para seguir al dialogo "
 "de gestión de departamento."
 
+#: plugins/admin/departments/class_departmentManagement.inc:556
+msgid "Domain"
+msgstr "Dominio"
+
+#: plugins/admin/departments/class_departmentManagement.inc:580
+#: plugins/admin/departments/class_countryGeneric.inc:78
+#: plugins/admin/departments/class_countryGeneric.inc:79
+msgid "Country"
+msgstr "País"
+
+#: plugins/admin/departments/class_departmentManagement.inc:592
+#: plugins/admin/departments/class_localityGeneric.inc:78
+#: plugins/admin/departments/class_localityGeneric.inc:79
+msgid "Locality"
+msgstr "Localidad"
+
+#: plugins/admin/departments/class_departmentManagement.inc:604
+#: plugins/admin/departments/class_organizationGeneric.inc:109
+#: plugins/admin/departments/class_organizationGeneric.inc:110
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/generic.tpl:287
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organización"
+
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 msgid "Organization name"
 msgstr "Nombre de la Organización"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Postal address"
 msgstr "Código Postal"
 
@@ -4002,63 +4264,21 @@ msgid "Country name"
 msgstr "Nombre del País"
 
 #: plugins/admin/departments/domain.tpl:11
-#, fuzzy
 msgid "Domain name"
-msgstr "Administradores del dominio"
+msgstr "Nombre de dominio"
 
 #: plugins/admin/departments/domain.tpl:14
-#, fuzzy
 msgid "Name of domain to create"
-msgstr "Nombre de la localidad a crear"
+msgstr "Nombre del dominio a crear"
+
+#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
+msgid "Department management"
+msgstr "Administración de departamento"
 
 #: plugins/admin/departments/country.tpl:14
 msgid "Name of country to create"
 msgstr "Nombre del país a crear"
 
-#: plugins/admin/departments/class_department.inc:386
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-"¡No se puede encontrar una etiqueta sin usar para identificar la unidad "
-"administrativa!"
-
-#: plugins/admin/departments/class_department.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Etiquetando '%s'."
-
-#: plugins/admin/departments/class_department.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr "Moviendo '%s' a '%s'"
-
-#: plugins/admin/departments/class_department.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr "Ha fallado a copiar %s, operación abortada"
-
-#: plugins/admin/departments/class_department.inc:618
-msgid "Department name"
-msgstr "Nombre de departamento"
-
-#: plugins/admin/departments/class_department.inc:626
-msgid "Telephone"
-msgstr "Teléfono"
-
-#: plugins/admin/departments/class_department.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "El objeto '%s' está ya marcado"
-
-#: plugins/admin/departments/class_department.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Añadir marca (%s) al objeto '%s'"
-
-#: plugins/admin/departments/class_department.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Eliminando marca del objeto '%s'"
-
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr "Procesando la operación solicitada"
@@ -4091,35 +4311,71 @@ msgstr ""
 "Modificar un atributo 'ou' de un departamento puede corromper acls e "
 "instantaneas de todos los objetos."
 
-#: plugins/admin/departments/dep_move_confirm.tpl:8
-msgid "GOsa can NOT fix this for you, yet."
-msgstr "GOsa no puede solucionar este problema, aún."
+#: plugins/admin/departments/dep_move_confirm.tpl:8
+msgid "GOsa can NOT fix this for you, yet."
+msgstr "GOsa no puede solucionar este problema, aún."
+
+#: plugins/admin/departments/dep_move_confirm.tpl:11
+msgid ""
+"Before you confirm this action, ensure that everything will be as expected, "
+"possibly the best solution is a backup."
+msgstr ""
+"Antes de que confirme la acción, asegurese que todo sera como espera, se "
+"recomienda que realize un backup."
+
+#: plugins/admin/acl/remove.tpl:6
+msgid ""
+"This includes all 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 todos los sistemas e información de configuración. Por favor "
+"pulse dos veces si quiere realmente hacer esto, ya que no hay forma de que "
+"GOsa recupere la información posteriormente."
+
+#: plugins/admin/acl/class_aclManagement.inc:290
+msgid "ACL role"
+msgstr "Roles ACL"
+
+#: plugins/admin/acl/class_divListACL.inc:51
+#: plugins/admin/acl/class_divListACL.inc:52
+msgid "List of acls"
+msgstr "Lista de acls"
+
+#: plugins/admin/acl/class_divListACL.inc:73
+msgid "Summary"
+msgstr "Sumario"
 
-#: plugins/admin/departments/dep_move_confirm.tpl:11
-msgid ""
-"Before you confirm this action, ensure that everything will be as expected, "
-"possibly the best solution is a backup."
-msgstr ""
-"Antes de que confirme la acción, asegurese que todo sera como espera, se "
-"recomienda que realize un backup."
+#: plugins/admin/acl/class_divListACL.inc:84
+msgid "Display acls matching"
+msgstr "Mostrar las acl que coincidan con"
 
-#: plugins/admin/acl/class_aclManagement.inc:25
-#: plugins/admin/acl/acl-list.xml:15
-#, fuzzy
-msgid "Acl"
-msgstr "Acl"
+#: plugins/admin/acl/class_divListACL.inc:114
+#: plugins/admin/acl/class_divListACL.inc:152
+#: plugins/admin/acl/class_aclRole.inc:742
+#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/generic.tpl:456
+#: plugins/personal/generic/multiple_generic.tpl:345
+msgid "Role"
+msgstr "Rol"
 
-#: plugins/admin/acl/class_aclManagement.inc:154
-#, fuzzy
-msgid "ACL Assignment"
-msgstr "Administración de ACL"
+#: plugins/admin/acl/class_divListACL.inc:165
+msgid "Edit acl role"
+msgstr "Editar rol"
+
+#: plugins/admin/acl/class_divListACL.inc:185
+msgid "Edit acl"
+msgstr "Editar acl"
+
+#: plugins/admin/acl/class_divListACL.inc:192
+msgid "Delete acl"
+msgstr "Eliminar acl"
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
 msgid "ACL Templates"
 msgstr "Plantillas ACL"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:745
+#: plugins/admin/acl/class_aclRole.inc:743
 msgid "Access control roles"
 msgstr "Roles de control de acceso"
 
@@ -4127,68 +4383,50 @@ msgstr "Roles de control de acceso"
 msgid "Edit AC roles"
 msgstr "Editar roles CA"
 
-#: plugins/admin/acl/class_aclRole.inc:132
+#: plugins/admin/acl/class_aclRole.inc:131
 msgid "Reset ACL"
 msgstr "Eliminar ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:438
 msgid "No ACL settings for this category"
 msgstr "No hay ACL configuradas en esta categoría"
 
-#: plugins/admin/acl/class_aclRole.inc:442
+#: plugins/admin/acl/class_aclRole.inc:440
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACLs que tienen estos objetos: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:448
+#: plugins/admin/acl/class_aclRole.inc:446
 msgid "Edit category ACL"
 msgstr "Editar la categoría ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:452
+#: plugins/admin/acl/class_aclRole.inc:450
 msgid "Reset category ACL"
 msgstr "Eliminar la categoría ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:472
+#: plugins/admin/acl/class_aclRole.inc:470
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Editar ACL para '%s', el ámbito es '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:666
 msgid "Object in use"
 msgstr "Objeto en uso"
 
-#: plugins/admin/acl/class_aclRole.inc:668
+#: plugins/admin/acl/class_aclRole.inc:666
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 "Este Rol no puede ser eliminado por estar siendo usado por los siguientes "
 "objetos:"
 
-#: plugins/admin/acl/class_aclRole.inc:744 plugins/admin/acl/acl-list.xml:23
-#: plugins/admin/acl/acl-list.xml:82
-#: plugins/personal/generic/class_user.inc:1593
-#: plugins/personal/generic/generic.tpl:456
-#: plugins/personal/generic/multiple_generic.tpl:345
-msgid "Role"
-msgstr "Rol"
-
-#: plugins/admin/acl/class_aclRole.inc:755
+#: plugins/admin/acl/class_aclRole.inc:753
 msgid "Permissions"
 msgstr "Permisos"
 
-#: plugins/admin/acl/acl-list.xml:11
-msgid "List of acls"
-msgstr "Lista de acls"
-
-#: plugins/admin/acl/acl-filter.tpl:11
-#, fuzzy
-msgid "Show access control lists"
-msgstr "Lista de control de acceso"
-
-#: plugins/admin/acl/acl-filter.tpl:12
-#, fuzzy
-msgid "Show roles"
-msgstr "¡id desconocido!"
+#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
+msgid "ACL management"
+msgstr "Administración de ACL"
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
@@ -4206,27 +4444,27 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Editar parámetros de usuarios administrativos"
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:258
 msgid "Please add a single IP address or a network/netmask combination!"
-msgstr ""
+msgstr "¡Por favor añada una IP única o una combinación red/mascara!"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:283
 msgid "female"
 msgstr "mujer"
 
-#: plugins/personal/generic/class_user.inc:289
+#: plugins/personal/generic/class_user.inc:283
 msgid "male"
 msgstr "hombre"
 
-#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:381
 msgid "Cannot upload file!"
 msgstr "¡No se puede subir el archivo!"
 
-#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:476
 msgid "Serial number"
 msgstr "Número serie"
 
-#: plugins/personal/generic/class_user.inc:527
+#: plugins/personal/generic/class_user.inc:521
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4234,233 +4472,236 @@ msgstr ""
 "(Algunos tipos de certificados no están soportados y pueden ser mostrados "
 "como no validos.)"
 
-#: plugins/personal/generic/class_user.inc:537
+#: plugins/personal/generic/class_user.inc:531
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "El certificado es valido desde %s hasta %s y es actualmente %s."
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:534
 msgid "valid"
 msgstr "válido"
 
-#: plugins/personal/generic/class_user.inc:541
+#: plugins/personal/generic/class_user.inc:535
 msgid "invalid"
 msgstr "no válido"
 
-#: plugins/personal/generic/class_user.inc:546
+#: plugins/personal/generic/class_user.inc:540
 msgid "No certificate installed"
 msgstr "No hay certificados instalados"
 
-#: plugins/personal/generic/class_user.inc:572
+#: plugins/personal/generic/class_user.inc:566
 msgid "The selected password method is no longer available."
 msgstr "El método de contraseña seleccionado no está disponible."
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1144
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
-msgstr ""
+msgstr "No se puede construir RDN: ¡no se permite + para construir subRDN!"
 
-#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: attribute is not defined!"
-msgstr ""
+msgstr "No se puede construir RDN: ¡Atributo no definido!"
 
-#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1169
 msgid "Cannot build RDN: invalid attribute parameters!"
-msgstr ""
+msgstr "No se puede construir RDN: ¡Valor no válido del atributo!"
 
-#: plugins/personal/generic/class_user.inc:1247
+#: plugins/personal/generic/class_user.inc:1240
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 "¡El método de contraseña seleccionado necesita una configuració inicial!"
 
-#: plugins/personal/generic/class_user.inc:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1300
+#: plugins/personal/generic/class_user.inc:1632
+#: plugins/personal/generic/class_user.inc:1715
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Página Web"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1731
+#: plugins/personal/generic/class_user.inc:1311
+#: plugins/personal/generic/class_user.inc:1724
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
+#: plugins/personal/generic/class_user.inc:1314
+#: plugins/personal/generic/class_user.inc:1727
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1319
+#: plugins/personal/generic/class_user.inc:1607
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1429
 msgid "Cannot open certificate!"
 msgstr "¡No puedo abrir el certificado!"
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1575
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1576
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Tipo de Vía"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1577
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Profesión"
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1578
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Última dirección conocida"
 
-#: plugins/personal/generic/class_user.inc:1586
+#: plugins/personal/generic/class_user.inc:1579
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lugar de residencia"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1580
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Descripción de la unidad"
 
-#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/class_user.inc:1581
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Área de desarrollo"
 
-#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Función"
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Número de serie del certificado"
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visible por todos"
 
-#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Código Postal"
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1591
 msgid "Generic user settings"
 msgstr "Parámetros genéricos del usuario"
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1595
+#: plugins/personal/posix/class_posixAccount.inc:1570
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/class_user.inc:1601
+msgid "Surname"
+msgstr "Apellido"
+
+#: plugins/personal/generic/class_user.inc:1603
 msgid "User identification"
 msgstr "Identificación de Usuario"
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1604
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Título Personal"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1605
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Títulos académicos"
 
-#: plugins/personal/generic/class_user.inc:1615
-#: plugins/personal/generic/generic.tpl:138
-msgid "Sex"
+#: plugins/personal/generic/class_user.inc:1608
+msgid "Gender"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1609
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Foto del usuario"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1616
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1617
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:1625
+#: plugins/personal/generic/class_user.inc:1618
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Funciones laborales"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1620
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1622
 msgid "Pager number"
 msgstr "Número del busca"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1623
 msgid "Mobile number"
 msgstr "Teléfono móvil"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Fax number"
 msgstr "Número de Fax"
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1630
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1631
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1633
 msgid "User password method"
 msgstr "Metodo de contraseña de usuario"
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1634
 msgid "User certificates"
 msgstr "Certificados de usuario"
 
@@ -4488,6 +4729,10 @@ msgstr "Cambiar foto"
 msgid "Template name"
 msgstr "Nombre de la plantilla"
 
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
+msgstr "Sexo"
+
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
@@ -4521,11 +4766,11 @@ msgstr "Editar certificados"
 
 #: plugins/personal/generic/generic.tpl:250
 msgid "Restrict login to"
-msgstr ""
+msgstr "Restringir inicio de sesión a"
 
 #: plugins/personal/generic/generic.tpl:256
 msgid "IP or network"
-msgstr ""
+msgstr "IP o Red"
 
 #: plugins/personal/generic/generic.tpl:275
 #: plugins/personal/generic/multiple_generic.tpl:137
@@ -4612,12 +4857,6 @@ msgstr "expiró"
 msgid "grace time active"
 msgstr "Periodo de gracia activado"
 
-#: plugins/personal/posix/class_posixAccount.inc:173
-#: plugins/personal/posix/class_posixAccount.inc:175
-#: plugins/personal/posix/class_posixAccount.inc:177
-msgid "active"
-msgstr "activo"
-
 #: plugins/personal/posix/class_posixAccount.inc:173
 msgid "password not changeable"
 msgstr "no puede cambiar la contraseña"
@@ -4626,43 +4865,47 @@ msgstr "no puede cambiar la contraseña"
 msgid "password expired"
 msgstr "la contraseña expiró"
 
-#: plugins/personal/posix/class_posixAccount.inc:248
+#: plugins/personal/posix/class_posixAccount.inc:233
+msgid "unconfigured"
+msgstr "Sin configurar"
+
+#: plugins/personal/posix/class_posixAccount.inc:244
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:510
 #, 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:519
+#: plugins/personal/posix/class_posixAccount.inc:514
 #, 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:523
+#: plugins/personal/posix/class_posixAccount.inc:518
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 "Desactivar cuenta despues de %s días de inactividad una vez caducada la "
 "contraseña"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:522
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr "Avisar al usuario %s días antes de que la contraseña caduque"
 
-#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:861
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Tiempo de espera agotado esperando un bloqueo. ¡Ignorando bloqueo!"
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:919
+#: plugins/personal/posix/class_posixAccount.inc:1237
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:1014
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
@@ -4670,90 +4913,90 @@ msgstr ""
 "UN número UID duplicado ha sido introducido para este usuario. ¡Si esto no "
 "es intencionado por favor verifique todos los uidNumbers usado!"
 
+#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
+#: plugins/personal/posix/class_posixAccount.inc:1173
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1576
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Directorio de usuario"
 
+#: plugins/personal/posix/class_posixAccount.inc:1106
 #: plugins/personal/posix/class_posixAccount.inc:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1129
+#: plugins/personal/posix/class_posixAccount.inc:1182
 msgid "shadowMin"
 msgstr "shadowMin"
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1134
+#: plugins/personal/posix/class_posixAccount.inc:1187
 msgid "shadowMax"
 msgstr "shadowMax"
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1139
+#: plugins/personal/posix/class_posixAccount.inc:1192
 msgid "shadowWarning"
 msgstr "shadowWarning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1153
+#: plugins/personal/posix/class_posixAccount.inc:1206
 msgid "shadowInactive"
 msgstr "shadowInactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1566
 msgid "POSIX account"
 msgstr "Cuenta POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1579
 msgid "Group ID"
 msgstr "Identificador (ID) de Grupo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1581
 msgid "Force password change on login"
 msgstr "Forzar el cambio de contraseña al iniciar"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1582
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1583
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow warning"
 msgstr "Shadow warning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1585
 msgid "Shadow inactive"
 msgstr "Shadow inactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1586
 msgid "Shadow expire"
 msgstr "Shadow expire"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1587
 msgid "Public SSH key"
-msgstr ""
+msgstr "Clave pública SSH"
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "System trust model"
 msgstr "Sistema de confianza"
 
@@ -4786,22 +5029,20 @@ 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:100
-#, fuzzy
 msgid "Common group"
-msgstr "grupos de teléfonos"
+msgstr "Grupo común"
 
 #: plugins/personal/posix/generic.tpl:104
-#, fuzzy
 msgid "Groups differ"
-msgstr "Grupo de usuarios"
+msgstr "Grupo diferente"
 
 #: plugins/personal/posix/generic.tpl:127
 msgid "SSH keys"
-msgstr ""
+msgstr "Claves SSH"
 
 #: plugins/personal/posix/generic.tpl:128
 msgid "Edit public ssh keys..."
-msgstr ""
+msgstr "Editar claves SSH públicas..."
 
 #: plugins/personal/posix/generic.tpl:132
 msgid "Account"
@@ -4819,18 +5060,10 @@ msgstr "Mostrar grupos de departamentos"
 msgid "Display groups matching"
 msgstr "Mostrar grupos coincidentes"
 
-#: plugins/personal/posix/posix_groups.tpl:48
-msgid "Regular expression for matching group names"
-msgstr "Expresión regular para buscar nombres de grupos"
-
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "Mostrar grupos de usuarios"
 
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr "Nombre de usuario de los grupos que se muestran"
-
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Caracteristicas Posix"
@@ -5040,39 +5273,46 @@ msgid "Government mode"
 msgstr "Modo gubernamental"
 
 #: setup/setup_config2.tpl:123
-#, fuzzy
-msgid "GOsa logging"
-msgstr "GOsa"
+msgid "Logging options"
+msgstr "Opciones de registro de eventos"
+
+#: setup/setup_config2.tpl:127
+msgid "Syslog"
+msgstr "Syslog"
+
+#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
+msgid "MySQL"
+msgstr "MySQL"
 
-#: setup/setup_config2.tpl:135
+#: setup/setup_config2.tpl:134
 msgid "Mail settings"
 msgstr "Parámetros de correo"
 
-#: setup/setup_config2.tpl:139
+#: setup/setup_config2.tpl:138
 msgid "Mail method"
 msgstr "Método de correo"
 
-#: setup/setup_config2.tpl:155
+#: setup/setup_config2.tpl:154
 msgid "Account identification attribute"
 msgstr "Modificar atributos existentes"
 
-#: setup/setup_config2.tpl:169
+#: setup/setup_config2.tpl:168
 msgid "Vacation templates"
 msgstr "Plantillas de ausencia"
 
-#: setup/setup_config2.tpl:185
+#: setup/setup_config2.tpl:184
 msgid "Use Cyrus UNIX style"
 msgstr "Usa estilo Cyrus UNIX"
 
-#: setup/setup_config2.tpl:195
+#: setup/setup_config2.tpl:194
 msgid "Snapshots / Undo"
 msgstr "Instantaneas / Deshacer"
 
-#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
+#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
 msgid "Enable snapshots"
 msgstr "Activar instantaneas"
 
-#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
+#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
 msgid "Snapshot base"
 msgstr "Base de instantaneas"
 
@@ -5104,9 +5344,8 @@ msgid "Check again"
 msgstr "Comprobar de nuevo"
 
 #: setup/setup_migrate.tpl:37
-#, fuzzy
 msgid "Add required object classes to the LDAP base"
-msgstr "¡No se ha encontrado la clase de objeto necesaria '%s'!"
+msgstr "Añadir las clases de objetos necesarias a la base LDAP"
 
 #: setup/setup_migrate.tpl:39 setup/setup_migrate.tpl:244
 #: setup/setup_migrate.tpl:344 setup/setup_migrate.tpl:398
@@ -5235,15 +5474,16 @@ msgid "Move selected users into this people tree"
 msgstr "Mover usuarios seleccionados al árbol de usuarios"
 
 #: setup/setup_migrate.tpl:219
-#, fuzzy
 msgid "Migrate GOsa 2.5 administrative accounts"
-msgstr "Crear una nueva cuenta administrativa GOsa"
+msgstr "Migrar cuentas administrativas GOsa versión 2.5"
 
 #: setup/setup_migrate.tpl:221
 msgid ""
 "This dialog allows the migration of GOsa 2.5 admin accounts into GOsa 2.6 "
 "useable accounts."
 msgstr ""
+"Este dialogo le permite migrar cuentas administrativas 2.5 a cuentas "
+"utilizables en la versión 2.6"
 
 #: setup/setup_migrate.tpl:257 setup/setup_ldap.tpl:65
 msgid "Reload"
@@ -5417,10 +5657,6 @@ msgstr "mbstring"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr "GOsa necesita este módulo para manejar cadenas unicode."
 
-#: setup/class_setupStep_Checks.inc:120
-msgid "MySQL"
-msgstr "MySQL"
-
 #: setup/class_setupStep_Checks.inc:121
 msgid ""
 "GOsa requires this module to communicate with several supported databases."
@@ -5443,22 +5679,19 @@ msgstr ""
 
 #: setup/class_setupStep_Checks.inc:153
 msgid "imagick"
-msgstr ""
+msgstr "imagick"
 
 #: setup/class_setupStep_Checks.inc:154
-#, fuzzy
 msgid "GOsa requires this extension to handle images."
-msgstr "GOsa necesita este módulo para manejar cadenas unicode."
+msgstr "GOsa necesita este módulo para manejar imágenes."
 
 #: setup/class_setupStep_Checks.inc:169
-#, fuzzy
 msgid "compression module"
-msgstr "Control de acceso"
+msgstr "modulo de compresión"
 
 #: setup/class_setupStep_Checks.inc:170
-#, fuzzy
 msgid "GOsa requires this extension to handle snapshots."
-msgstr "GOsa necesita este módulo para manejar cadenas unicode."
+msgstr "GOsa necesita este módulo para manejar instantaneas."
 
 #: setup/class_setupStep_Checks.inc:181
 msgid ""
@@ -5653,14 +5886,12 @@ msgid "Enable edit locking"
 msgstr "Activar edición de bloqueo"
 
 #: setup/setup_config3.tpl:174
-#, fuzzy
 msgid "Gosa support daemon"
 msgstr "Demonio de soporte GOsa"
 
 #: setup/setup_config3.tpl:193
-#, fuzzy
 msgid "Daemon timeout"
-msgstr "Abajo"
+msgstr "Tiempo máximo de respuesta de acceso al demonio"
 
 #: setup/setup_config3.tpl:207
 msgid "Login and session"
@@ -5759,14 +5990,14 @@ msgstr "¿El procedimiento de configuración le ha ayudado?"
 #: setup/setup_feedback.tpl:62 setup/setup_feedback.tpl:80
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config3.inc:93
 #: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Config2.inc:136
+#: setup/class_setupStep_Config2.inc:137
 msgid "Yes"
 msgstr "Si"
 
 #: setup/setup_feedback.tpl:64 setup/setup_feedback.tpl:82
 #: setup/class_setupStep_Ldap.inc:74 setup/class_setupStep_Config3.inc:93
 #: setup/class_setupStep_Schema.inc:86 setup/class_setupStep_Config1.inc:88
-#: setup/class_setupStep_Config2.inc:136
+#: setup/class_setupStep_Config2.inc:137
 msgid "No"
 msgstr "No"
 
@@ -5833,6 +6064,8 @@ msgstr "Crear su fichero de configuración"
 #: setup/setup_finish.tpl:10
 msgid "Depending on the user name your webserver is running on:"
 msgstr ""
+"Dependiendo del nombre de usuario sobre el que esta corriendo el servidor "
+"web:"
 
 #: setup/setup_finish.tpl:28
 msgid "Download configuration"
@@ -5947,12 +6180,10 @@ msgid "Checking for root object"
 msgstr "Comprobando objeto raíz"
 
 #: setup/class_setupStep_Migrate.inc:141
-#, fuzzy
 msgid "Inspecting object classes in root object"
-msgstr "Comprobando objeto raíz"
+msgstr "Analizando objetos en la entrada raíz"
 
 #: setup/class_setupStep_Migrate.inc:147
-#, fuzzy
 msgid "Checking permission for LDAP database"
 msgstr "Comprobando permisos en la base de datos LDAP"
 
@@ -6099,15 +6330,13 @@ msgstr "No puede migrar el departamento '%s':"
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr "Encontrados %s departamento(s) que nos son visibles para GOsa."
 
-#: setup/class_setupStep_Migrate.inc:1028
-#, fuzzy, php-format
+#: setup/class_setupStep_Migrate.inc:1028, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
-msgstr "Crear una nueva cuenta administrativa GOsa"
+msgstr "Encontrada cuenta administrativa GOsa 2.5: %s"
 
 #: setup/class_setupStep_Migrate.inc:1033
-#, fuzzy
 msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
-msgstr "No hay cuenta de administrador GOsa en la base de datos LDAP."
+msgstr "No hay cuenta de administrador GOsa 2.6 en la base de datos LDAP."
 
 #: setup/class_setupStep_Migrate.inc:1050
 msgid "There is no GOsa administrator account inside your LDAP."
@@ -6189,15 +6418,13 @@ msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 "El objeto raíz no ha podido ser creado, tendra que crearlo usted mismo."
 
-#: setup/class_setupStep_Migrate.inc:2058
-#, fuzzy, php-format
+#: setup/class_setupStep_Migrate.inc:2058, php-format
 msgid "Missing GOsa object class '%s'!"
-msgstr "¡No se ha encontrado la clase de objeto opcional '%s'!"
+msgstr "¡No se ha encontrado la clase de objeto GOsa '%s'!"
 
 #: setup/class_setupStep_Migrate.inc:2059
-#, fuzzy
 msgid "Please check your installation."
-msgstr "Por favor compruebe la combinación nombre de usuario/contraseña"
+msgstr "Por favor compruebe su instalación"
 
 #: setup/class_setupStep_Migrate.inc:2080
 #, php-format
@@ -6205,6 +6432,8 @@ msgid ""
 "Cannot handle the structural object type of your root object. Please try to "
 "add the object class '%s' manually."
 msgstr ""
+"No se puede un tipo de objeto estructural en su entrada raíz. Por favor "
+"intente añadir la clase de objeto '%s' manualmente."
 
 #: setup/class_setupStep_Migrate.inc:2439
 #, php-format
@@ -6613,200 +6842,6 @@ msgstr "Este paso le permite seleccionar su idioma preferido"
 msgid "Automatic"
 msgstr "Automatico"
 
-#, fuzzy
-#~ msgid "Edit ogroup"
-#~ msgstr "Lista de grupos"
-
-#, fuzzy
-#~ msgid "List of ogroups"
-#~ msgstr "Lista de grupos"
-
-#~ 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 ""
-#~ "Entrar en el árbol preferido y pulse grabar para usar el subárbol actual "
-#~ "como base. O pulse en la imagen al final de cada entrada"
-
-#~ msgid "Use"
-#~ msgstr "Usar"
-
-#~ msgid "Filter entries with this syntax"
-#~ msgstr "Filtrar entradas con esta sintaxis"
-
-#~ msgid "MySQL error"
-#~ msgstr "Error MySQL"
-
-#~ msgid "Logging to MySQL database will be disabled for server '%s'!"
-#~ msgstr ""
-#~ "¡La escritura del registro en la base de datos MySQL se desactivará para "
-#~ "el servidor '%s'!"
-
-#~ msgid "MySQL logging"
-#~ msgstr "Escritura del registro en MySQL"
-
-#~ msgid "Cannot add location to the database!"
-#~ msgstr "¡No se puede añadir la ubicación a la base de datos!"
-
-#~ msgid "Submit department"
-#~ msgstr "Enviar departamento"
-
-#~ msgid "edit"
-#~ msgstr "editar"
-
-#~ msgid "delete"
-#~ msgstr "eliminar"
-
-#~ msgid "Number of listed object groups"
-#~ msgstr "Número de grupo de objetos listados"
-
-#~ msgid "Number of listed departments"
-#~ msgstr "Número de departamentos"
-
-#~ msgid "Select to see groups that are primary groups of users"
-#~ msgstr "Seleccione para ver que grupos son grupos primarios de usuarios"
-
-#~ msgid "samba groups mappings"
-#~ msgstr "Mapeos de grupos de samba"
-
-#~ msgid "application settings"
-#~ msgstr "parámetros de aplicaciones"
-
-#~ msgid "mail settings"
-#~ msgstr "parámetros de correo"
-
-#~ msgid "Select to see normal groups that have only functional aspects"
-#~ msgstr "Seleccione para ver que grupos tienen solo aspectos funcionales"
-
-#~ msgid "functional groups"
-#~ msgstr "grupos funcionales"
-
-#~ msgid "Not allowed"
-#~ msgstr "No permitido"
-
-#~ msgid "Number of listed groups"
-#~ msgstr "Número de grupos mostrados"
-
-#~ msgid "Manage POSIX groups"
-#~ msgstr "Gestionar grupos POSIX"
-
-#~ msgid "group"
-#~ msgstr "grupo"
-
-#~ msgid "User administration"
-#~ msgstr "Administración de Usuario"
-
-#~ msgid "templates"
-#~ msgstr "plantillas"
-
-#~ msgid "GOsa object"
-#~ msgstr "Objeto GOsa"
-
-#~ msgid "functional users"
-#~ msgstr "usuarios funcionales"
-
-#~ msgid "POSIX users"
-#~ msgstr "Usuarios POSIX"
-
-#~ msgid "samba users"
-#~ msgstr "Usuarios samba"
-
-#~ msgid "proxy users"
-#~ msgstr "usuarios de proxy"
-
-#, fuzzy
-#~ msgid "phone users"
-#~ msgstr "usuarios de proxy"
-
-#~ msgid "GOsa"
-#~ msgstr "GOsa"
-
-#~ msgid "Edit UNIX properties"
-#~ msgstr "Editar características UNIX"
-
-#~ msgid "Edit fax properies"
-#~ msgstr "Editar características de Fax"
-
-#~ msgid "Create user with this template"
-#~ msgstr "Crear usuario con esta plantilla"
-
-#~ msgid "user"
-#~ msgstr "usuario"
-
-#~ msgid "password"
-#~ msgstr "contraseña"
-
-#~ msgid "Delete user"
-#~ msgstr "Eliminar usuario"
-
-#~ msgid "Number of listed users"
-#~ msgstr "Número de usuarios mostrados"
-
-#~ msgid "You have no permission to modify object '%s'!"
-#~ msgstr "¡No tiene permisos para modificar el objeto '%s'!"
-
-#~ msgid "You have no permission to use this template!"
-#~ msgstr "¡No tiene permisos para usar esta plantilla!"
-
-#~ msgid "You have no permission to change the lock status for this user!"
-#~ msgstr ""
-#~ "¡No tiene permisos para cambiar el estado de bloqueo de este usuario!"
-
-#, fuzzy
-#~ msgid "Name / Department"
-#~ msgstr "Nombre del departamento"
-
-#~ msgid "Regular expression for matching department names"
-#~ msgstr "Expresión regular para buscar el nombre del departamento"
-
-#~ 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 ""
-#~ "Tan pronto como la termine la operación mover, podrá bajar al final de la "
-#~ "página y presionar el botón 'Continuar' para continuar con el asistente "
-#~ "de administración de departamento."
-
-#~ msgid "Department management"
-#~ msgstr "Administración de departamento"
-
-#~ msgid ""
-#~ "This includes all 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 todos los sistemas e información de configuración. Por favor "
-#~ "pulse dos veces si quiere realmente hacer esto, ya que no hay forma de "
-#~ "que GOsa recupere la información posteriormente."
-
-#~ msgid "ACL role"
-#~ msgstr "Roles ACL"
-
-#~ msgid "Summary"
-#~ msgstr "Sumario"
-
-#~ msgid "Display acls matching"
-#~ msgstr "Mostrar las acl que coincidan con"
-
-#~ msgid "Edit acl role"
-#~ msgstr "Editar rol"
-
-#~ msgid "Edit acl"
-#~ msgstr "Editar acl"
-
-#~ msgid "Delete acl"
-#~ msgstr "Eliminar acl"
-
-#~ msgid "Gender"
-#~ msgstr "Sexo"
-
-#~ msgid "Logging options"
-#~ msgstr "Opciones de registro de eventos"
-
-#~ msgid "Syslog"
-#~ msgstr "Syslog"
-
 #~ msgid "ACL takes effect for all users"
 #~ msgstr "La ACL tendrá efecto para todos los usuarios"
 
@@ -6818,6 +6853,10 @@ msgstr "Automatico"
 #~ msgid "Non common group"
 #~ msgstr "no en todos los grupos"
 
+#, fuzzy
+#~ msgid "All"
+#~ msgstr "Acl"
+
 #~ msgid "Enable DNS extension"
 #~ msgstr "Activar extensión DNS"
 
@@ -6905,6 +6944,10 @@ msgstr "Automatico"
 #~ msgid "Heimdal options"
 #~ msgstr "Eliminar opciones"
 
+#, fuzzy
+#~ msgid "Minute"
+#~ msgstr "Impresora"
+
 #, fuzzy
 #~ msgid "Day"
 #~ msgstr "Mayo"
@@ -6973,6 +7016,10 @@ msgstr "Automatico"
 #~ msgid "Invalid"
 #~ msgstr "no válido"
 
+#, fuzzy
+#~ msgid "Sudo role"
+#~ msgstr "¡id desconocido!"
+
 #, fuzzy
 #~ msgid "Run as user"
 #~ msgstr "Usuarios del dominio"
@@ -7670,6 +7717,10 @@ msgstr "Automatico"
 #~ msgid "Reomve"
 #~ msgstr "Eliminar"
 
+#, fuzzy
+#~ msgid "GOsa ping"
+#~ msgstr "GOsa"
+
 #, fuzzy
 #~ msgid "Say hello"
 #~ msgstr "Shell"