Code

Locales flush
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 18 Jan 2010 11:58:15 +0000 (11:58 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 18 Jan 2010 11:58:15 +0000 (11:58 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15174 594d385d-05f5-0310-b6e9-bd551577e9d8

12 files changed:
gosa-core/locale/core/de/LC_MESSAGES/messages.po
gosa-core/locale/core/es/LC_MESSAGES/messages.po
gosa-core/locale/core/fr/LC_MESSAGES/messages.po
gosa-core/locale/core/it/LC_MESSAGES/messages.po
gosa-core/locale/core/messages.po
gosa-core/locale/core/nl/LC_MESSAGES/messages.po
gosa-core/locale/core/pl/LC_MESSAGES/messages.po
gosa-core/locale/core/pt/LC_MESSAGES/messages.po
gosa-core/locale/core/ru/LC_MESSAGES/messages.po
gosa-core/locale/core/vi/LC_MESSAGES/messages.po
gosa-core/locale/core/zh/LC_MESSAGES/messages.po
gosa-core/plugins/admin/ogroups/ogroup-list.xml

index 52e22b04f114e043379c7b836e699e2829a037ea..faeb17ea8c28687b2625d41b21377f771a614dbc 100644 (file)
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: 2009-10-05 15:19+0200\n"
 "Last-Translator: Cajus Pollmeier <pollmeier@gonicus.de>\n"
 "Language-Team: de <kde-i18n-de@kde.org>\n"
@@ -42,19 +42,17 @@ msgstr "Filter"
 #: 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -76,6 +74,7 @@ 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 ""
 "Wenn Sie sicher sind, drücken Sie 'Entfernen' um fortzufahren oder "
@@ -87,15 +86,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr "Abbrechen"
@@ -118,15 +116,14 @@ 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 "Benutzername"
 
 #: 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "Passwort"
 
@@ -272,7 +269,7 @@ msgstr "Verfügbare Mitglieder"
 msgid "List message possible targets"
 msgstr "Zeige mögliche Empfänger dieser Nachricht"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 msgid "Members"
 msgstr "Mitglieder"
 
@@ -305,7 +302,7 @@ msgstr "Altes Passwort"
 #: 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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -318,9 +315,7 @@ msgid "Verify password"
 msgstr "Passwort überprüfen"
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr "Passwort ändern"
 
@@ -378,7 +373,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr "Objekt"
 
@@ -425,47 +420,49 @@ msgstr "Grund für das Erzeugen dieses Snapshots"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.inc:596
 msgid "Continue"
 msgstr "Fortsetzen"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: 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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -475,9 +472,9 @@ msgstr "Fehler"
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -506,8 +503,7 @@ msgid "Your password has been changed successfully."
 msgstr "Ihr Passwort wurde erfolgreich geändert."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -656,9 +652,9 @@ msgstr "Angemeldet:"
 msgid "GOsa main menu"
 msgstr "GOsa Hauptmenü"
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
 msgstr "Schwerer Fehler"
 
@@ -672,17 +668,17 @@ msgstr "Die GOsa-Konfigurationsdatei %s/%s ist nicht lesbar. Abgebrochen."
 #: 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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 msgid "Configuration error"
@@ -695,7 +691,7 @@ msgstr ""
 "Auf das als Compile-Verzeichnis angegegebene Verzeichnis '%s' kann nicht "
 "zugegriffen werden!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 msgid "Password method"
 msgstr "Passwort-Methode"
 
@@ -703,7 +699,7 @@ msgstr "Passwort-Methode"
 msgid "Error: Password method not available!"
 msgstr "Fehler: Passwort-Methode ist nicht verfügbar!"
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -723,10 +719,11 @@ msgstr ""
 "Das Passwort, welches Sie als 'Neues Passwort' eingegeben haben, ist zu kurz."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: 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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -744,11 +741,11 @@ msgstr "Sie haben keine Berechtigung ihr Passwort zu ändern."
 msgid "External password changer reported a problem: "
 msgstr "Das externe Passwort-Änderungsprogramm hat einen Fehler gemeldet:"
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr "Die Sitzung ist nicht verschlüsselt."
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr "SSL Sitzung"
 
@@ -785,33 +782,37 @@ msgstr ""
 "eindeutig!"
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: 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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -852,11 +853,11 @@ msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 "Konnte Benutzerinformation für htaccess-Authentisierung nicht beziehen!"
 
-#: html/index.php:368
+#: html/index.php:369
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Das Konto ist gesperrt. Bitte benachrichtigen Sie den Administrator!"
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -944,6 +945,48 @@ msgstr ""
 "Auf das Hilfeverzeichnis '%s' kann nicht zugegriffen werden - kann daher "
 "keine Hilfedateien lesen."
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr "unkonfiguriert"
+
+#: include/class_management.inc:144
+msgid "Filter error"
+msgstr "Filter Fehler"
+
+#: include/class_management.inc:144
+msgid "The filter is incomplete!"
+msgstr "Der Filter ist unvollständig!"
+
+#: 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 "Berechtigung"
+
+#: 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 "Berechtigungsfehler"
+
+#: include/class_management.inc:426 include/class_plugin.inc:1546
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
+
+#: 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 "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -966,7 +1009,7 @@ msgstr ""
 "werden!"
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -975,7 +1018,7 @@ msgstr ""
 "Die Snapshot-Funktionalität ist aktiviert, aber die erforderliche Variable '%"
 "s' ist nicht gesetzt."
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -988,11 +1031,11 @@ msgstr ""
 msgid "Access control"
 msgstr "Zugriffskontrolle"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr "Zugriffskontrolllisten verwalten"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 msgid "All categories"
 msgstr "Alle Kategorien"
 
@@ -1000,20 +1043,20 @@ msgstr "Alle Kategorien"
 msgid "Reset ACLs"
 msgstr "ACLs zurücksetzen"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 msgid "One level"
 msgstr "Diese Ebene"
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Current object"
 msgstr "Aktuelles Objekt"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 msgid "Complete subtree"
 msgstr "Vollständiger Teilbaum"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr "Vollständiger Teilbaum (permanent)"
 
@@ -1021,56 +1064,54 @@ msgstr "Vollständiger Teilbaum (permanent)"
 msgid "Use ACL defined in role"
 msgstr "Verwende ACL aus Rollendefinition"
 
-#: 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
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Benutzer"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr "Gruppen"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: 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
+#: 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
 msgid "Up"
 msgstr "Auf"
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "Ab"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr "Zugriffsregeln"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr "Entfernen"
@@ -1093,7 +1134,7 @@ msgstr "ACL Kategorie"
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "ACL für '%s' bearbeiten - Gültigkeitsbereich ist '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr "Alle Objekte im aktuellen Teilbaum"
 
@@ -1133,13 +1174,13 @@ msgstr "Vollständiges Objekt"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: 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
+#: 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
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -1167,19 +1208,19 @@ msgstr "unbekannte rolle"
 msgid "Contains settings for these objects: %s"
 msgstr "Enthält Einstellungen für diese Objekte: %s"
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 msgid "inactive"
 msgstr "inaktiv"
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 msgid "No members"
 msgstr "Keine Mitglieder"
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 msgid "Access control list"
 msgstr "Zugriffskontrollliste"
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 msgid "ACL roles"
 msgstr "ACL-Rollen"
 
@@ -1188,48 +1229,38 @@ msgstr "ACL-Rollen"
 msgid "Close"
 msgstr "Schliessen"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 msgid "Root"
 msgstr "Wurzel"
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 msgid "Home"
 msgstr "Heimat"
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr "Liste neu laden"
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr "Übertragen"
 
@@ -1245,36 +1276,19 @@ msgstr ""
 "Der angeforderte Kanal existiert nicht! Bitte benachrichtigen Sie Ihren "
 "Administrator."
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 msgid "Choose a base"
 msgstr "Wählen Sie eine Basis"
 
-#: 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 ""
-"Navigieren Sie in den gewünschten Baum und drücken Sie 'Speichern' um diesen "
-"Teilbaum aus Basis zu verwenden. Oder drücken Sie auf das Icon, das sich am "
-"Ende jedes Eintrags befindet."
-
-#: include/class_baseSelectDialog.inc:61
-msgid "Use"
-msgstr "Verwenden"
-
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1282,25 +1296,18 @@ msgstr "Verwenden"
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "Basis"
 
-#: include/class_baseSelectDialog.inc:68
-msgid "Filter entries with this syntax"
-msgstr "Filtere Einträge mit dieser Syntax"
-
-#: 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
+#: include/class_listing.inc:298 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
@@ -1308,63 +1315,77 @@ msgstr "Filtere Einträge mit dieser Syntax"
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 msgid "created by"
 msgstr "Angelegt von"
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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 "Aktionen"
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr "Kopieren"
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: 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
+#: 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
 msgid "Paste"
 msgstr "Einfügen"
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 msgid "Restore snapshots"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 msgid "Export list"
 msgstr "Liste exportieren"
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr "Snapshot erstellen"
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr "Erstelle einen neuen Snapshot dieses Objekts"
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:132
+msgid "Edit this entry"
+msgstr "Diesen Eintrag bearbeiten"
+
+#: include/class_sortableListing.inc:133
+msgid "Delete this entry"
+msgstr "Diesen Eintrag entfernen"
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 "Schwerer Fehler: keine Klassenfundorte definiert - bitte führen Sie '%s' "
 "aus, um das Problem zu beheben"
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
@@ -1372,17 +1393,17 @@ msgstr ""
 "Schwerer Fehler: Kann Klasse '%s' nicht instanziieren - bitte führen Sie '%"
 "s' aus um das Problem zu beheben"
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Fehler beim Verbinden mit dem LDAP-Server. Die Meldung lautet '%s'."
 
-#: include/functions.inc:399
+#: include/functions.inc:518
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Der Benutzername / die UID ist nicht eindeutig für den LDAP-Baum."
 
-#: include/functions.inc:474
+#: include/functions.inc:603
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -1390,12 +1411,12 @@ msgstr ""
 "Der Benutzername / die UID ist nicht eindeutig für den LDAP-Baum. Bitte "
 "kontaktieren Sie Ihren Administrator."
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1404,12 +1425,12 @@ msgstr ""
 "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie "
 "Ihren Administrator!"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Der LDAP-Server meldete: %s"
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1417,12 +1438,12 @@ msgstr ""
 "Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht "
 "passieren - räume mehrere Referenzen auf."
 
-#: include/functions.inc:1049
+#: include/functions.inc:1232
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Die Größenbeschränkung von %d Einträgen ist überschritten!"
 
-#: include/functions.inc:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1431,73 +1452,73 @@ msgstr ""
 "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
 "Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 msgid "Continue anyway"
 msgstr "Trotzdem Fortsetzen"
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Sie bearbeiten gerade den/die LDAP Eintrag/Einträge %s"
 
-#: include/functions.inc:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr "Einträge pro Seite"
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "Die Datei '%s' konnte nicht entfernt werden."
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 msgid "Cannot write to revision file!"
 msgstr "Kann nicht in Revisions-Datei schreiben!"
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' ist nicht verfügbar. Verwende die Standard-Basis!"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "LDAP warning"
 msgstr "LDAP-Warnung"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Kann die Schema-Informationen nicht vom Server beziehen. Keine Schemaprüfung "
 "möglich!"
 
-#: include/functions.inc:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr "Verwendet, um kontenbezogene Informationen zu speichern."
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1505,27 +1526,27 @@ msgstr ""
 "Verwenden, um die momentan bearbeiteten Einträge für andere zu sperren (um "
 "gleichzeitige Änderungen zu verhindern)."
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Die benötigte Objektklasse '%s' fehlt!"
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Die optionale Objektklasse '%s' fehlt!"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "Falsche·Version·der·benötigten·Objektklasse·'%s'·(!=%s)!"
 
-#: include/functions.inc:2309
+#: include/functions.inc:2764
 #, php-format
 msgid "Class(es) available"
 msgstr "Verfügbare Klasse(n)"
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1533,7 +1554,7 @@ msgstr ""
 "Sie haben die rfc2307bis-Option in der LDAP-Einrichtung aktiviert, aber Ihre "
 "Schema-Konfiguration unterstützt dies nicht."
 
-#: include/functions.inc:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1541,7 +1562,7 @@ msgstr ""
 "Um rfc2307bis-konforme Gruppen verwenden zu können, muss die Objektklasse "
 "'posixGroup' AUXILIARY sein"
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1549,51 +1570,51 @@ msgstr ""
 "Ihre Schemakonfiguration ist für rfc2307bis-Gruppen eingerichtet, aber Sie "
 "haben die Unterstützung im LDAP-Einrichtungsschritt ausgeschaltet."
 
-#: include/functions.inc:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "Die Objektklasse 'posixGroup' muss STRUCTURAL sein"
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr "Deutsch"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr "Französisch"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr "Italienisch"
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr "Englisch"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 msgid "Polish"
 msgstr "Polnisch"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr "Russisch"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1601,11 +1622,11 @@ msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr "Kann Samba-Hash nicht erzeugen!"
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
@@ -1613,43 +1634,43 @@ msgstr ""
 "Kann keinen SAMBA-Hash generieren: die Ausführung von '%s' ist "
 "fehlgeschlagen, prüfen Sie den 'sambaHashHook'!"
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr "Konnte keine freie ID allozieren:"
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr "unbekannte idAllocation-Methode!"
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "kann sambaUnixIdPool-Eintrag nicht anlegen!"
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool ist nicht eindeutig!"
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 msgid "no ID available!"
 msgstr "keine ID verfügbar!"
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr "maximale Anzahl von Versuchen abgelaufen!"
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 msgid "Cannot allocate a free ID!"
 msgstr "Konnte keine freie ID allozieren!"
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
@@ -1658,35 +1679,37 @@ msgstr ""
 "Es wurde keine Plugin-Definition gefunden um '%s' zu Initialisieren. Bitte "
 "prüfen Sie Ihre Konfigurationsdatei!"
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Der Lösch-Vorgang wurde durch das plugin '%s' beendet: %s"
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr "Referenzen"
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Sie sind dabei den Snapshot '%s' zu entfernen."
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 msgid "Remove snapshot"
 msgstr "Snapshot entfernen."
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1702,8 +1725,11 @@ 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -1810,7 +1836,7 @@ msgstr "Typ"
 msgid "Arguments"
 msgstr "Argumente"
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
@@ -1825,50 +1851,29 @@ msgstr ""
 "Sie sicher, dass niemand wichtige Änderungen vorgenommen hat, die verloren "
 "gehen, wenn Sie diesen Eintrag speichern!"
 
-#: 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 "Berechtigung"
-
-#: include/class_plugin.inc:1547
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Ihnen ist es nicht erlaubt, einen Snapshot für %s zu erstellen."
-
-#: 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 "Ihnen ist es nicht erlaubt, einen Snapshot für %s wiederherzustellen."
-
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr "Ändere ACL dn"
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "from"
 msgstr "von"
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr "an"
 
-#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 msgid "Restore"
 msgstr "Wiederherstellen"
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 msgid "cut"
 msgstr "Ausschneiden"
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr "Kopieren"
 
@@ -2463,18 +2468,18 @@ msgstr ""
 "Die Klasse '%s' kann nicht initialisiert werden! Vielleicht fehlt ein Modul "
 "in Ihren GOsa-Einstellungen?"
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Leistungswarnung"
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 "Die LDAP-Leistung ist mangelhaft: Die letzte Abfrage dauerte etwa %.2f "
 "Sekunden!"
 
-#: include/class_ldap.inc:665
+#: include/class_ldap.inc:692
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
@@ -2482,23 +2487,23 @@ msgstr ""
 "Kann Teilbäume mit RDN '%s' nicht automatisch erzeugen: keine Objektklasse "
 "gefunden!"
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:740
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 "Kann Teilbäume mit RDN '%s' nicht automatisch erzeugen: nicht unterstützt"
 
-#: include/class_ldap.inc:800
+#: include/class_ldap.inc:827
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "während der Arbeit mit '%s' auf dem LDAP-Server '%s'"
 
-#: include/class_ldap.inc:802
+#: include/class_ldap.inc:829
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "während der Arbeit auf LDAP-Server '%s'"
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2507,86 +2512,65 @@ msgstr ""
 "Dies ist keine valide DN: '%s'.  Ein Block für den Import sollte mit "
 "'dn:...' beginnen in Zeile %s"
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Fehler beim Importieren von dn: '%s', bitte überprüfen Sie die LDIF-Datei ab "
 "Zeile %s!"
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Protokollieren fehlgeschlagen: %s"
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr "Ungültige Option '%s' angegeben!"
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 msgid "Specified objectType is empty or invalid!"
 msgstr "Der angegebene Objekt-Typ ist leer oder ungültig!"
 
-#: include/class_log.inc:139
-msgid "MySQL error"
-msgstr "MySQL-Fehler"
-
-#: include/class_log.inc:139
-#, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr ""
-"Protokollierung in die MySQL-Datenbank wird für den Server '%s' abgeschaltet!"
-
-#: 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 "MySQL Protokollierung"
-
-#: include/class_log.inc:219
-#, php-format
-msgid "Cannot add location to the database!"
-msgstr "Kann Standort nicht in die Datenbank einfügen!"
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr "GOsa support daemon"
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 msgid "Cannot not parse XML!"
 msgstr "XML-Nachricht kann nicht ausgewertet werden!"
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Kann keine Abbruch-Nachricht für den Eintrag %s versenden!"
 
-#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Kann Eintrag %s nicht entfernen!"
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "XML-Fehler in der Datei gosa.conf: %s in Zeile %d"
 
-#: include/class_config.inc:270
+#: include/class_config.inc:317
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Kann nicht mit dem LDAP-Server verbinden. Bitte benachrichtigen Sie den "
 "Administrator."
 
-#: include/class_config.inc:636
+#: include/class_config.inc:694
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "sambaSID und/oder sambaRidBase fehlen in der Konfiguration!"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2609,44 +2593,44 @@ msgstr ""
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: 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: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
 #, php-format
 msgid "Copy and paste failed!"
 msgstr "Kopieren & Einfügen ist fehlgeschlagen!"
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "Kann Berechtigungen für '%s' nicht setzen"
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr "'%s' ist kein gültiges LDAP-Objekt"
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, php-format
 msgid "No write permission in '%s'"
 msgstr "Keine Schreibberechtigung in '%s'"
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr "Diese Objekte werden eingefügt: %s"
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr "Dieses Objekt wird eingefügt: %s"
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 msgid "Cannot paste"
 msgstr "Kann nicht einfügen"
 
@@ -2656,11 +2640,11 @@ msgstr "Bitte beheben Sie obigen Fehler und laden die Seite neu."
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Allgemein"
@@ -2671,32 +2655,26 @@ 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr "Mail"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr "Fax"
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2705,34 +2683,34 @@ msgid "FTP"
 msgstr "FTP"
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr "Gruppe"
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr "Abteilung"
 
 #: plugins/generic/references/class_reference.inc:61
-#: 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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2741,14 +2719,13 @@ msgid "Phone"
 msgstr "Telefon"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr "Anwendung"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Server"
 
@@ -2757,19 +2734,17 @@ msgid "Thin Client"
 msgstr "Thin Client"
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Objektgruppe"
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr "Drucker"
 
@@ -2812,7 +2787,13 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Das GOsa Team"
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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 "Aktualisieren"
+
+#: plugins/admin/ogroups/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -2820,247 +2801,36 @@ msgstr ""
 "Bitte überprüfen Sie genau was Sie tun, weil GOsa keine Möglichkeit hat, die "
 "Daten wiederherzustellen."
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "List of object groups"
-msgstr "Liste von Objektgruppen"
-
-#: 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 "Eigenschaften"
-
-#: 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 "Aktionen"
-
-#: 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 "Zeige %s"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-msgid "user groups"
-msgstr "Benutzergruppen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-msgid "nested groups"
-msgstr "verschachtelte Gruppen"
-
-#: 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 "Anwendungsgruppen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-msgid "department groups"
-msgstr "Abteilungsgruppen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-msgid "server groups"
-msgstr "Servergruppen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-msgid "workstation groups"
-msgstr "Gruppen von Arbeitsstationen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-msgid "windows workstation groups"
-msgstr "Gruppen von Windows Arbeitsstationen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-msgid "terminal groups"
-msgstr "Gruppen von Terminals"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-msgid "printer groups"
-msgstr "Druckergruppen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-msgid "phone groups"
-msgstr "Telefongruppen"
-
-#: 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 "Regulärer Ausdruck zum Erkennen von Gruppennamen"
-
-#: 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 "Aktualisieren"
-
-#: 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 "Anlegen"
-
-#: 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 "Entfernen"
-
-#: 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 "Bearbeiten"
-
-#: 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 "Diesen Eintrag bearbeiten"
-
-#: 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 "Entfernen"
-
-#: 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 "Diesen Eintrag entfernen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-msgid "Number of listed object groups"
-msgstr "Anzahl der angezeigten Objektgruppen"
-
-#: 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 "Anzahl der angezeigten Abteilungen"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroup.inc:1117
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr "Objektgruppen"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 msgid "Manage object groups"
 msgstr "Objektgruppen verwalten"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 msgid "Infrastructure error"
 msgstr "Infrastruktur Fehler"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-msgid "object group"
-msgstr "Objektgruppe"
-
-#: 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 "Berechtigungsfehler"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 msgid "Templates"
 msgstr "Vorlagen"
 
-#: 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
+#: 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
 msgid "User"
 msgstr "Benutzer"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 msgid "Windows Install"
 msgstr "Windows Installation"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -3076,6 +2846,19 @@ msgstr ""
 msgid "departments"
 msgstr "Abteilungen"
 
+#: 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 "Zeige %s"
+
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 msgid "people"
@@ -3127,7 +2910,9 @@ msgid "applications"
 msgstr "Anwendungen"
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr "keine"
 
@@ -3145,20 +2930,20 @@ msgstr "Windows-Arbeitsstationen"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "deaktiviert"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 msgid "full access"
 msgstr "Vollzugriff"
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
@@ -3178,22 +2963,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3221,13 +3001,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Name"
@@ -3282,7 +3068,7 @@ msgid "Select a base"
 msgstr "Wählen Sie eine Basis"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "System-Vertrauen"
@@ -3320,10 +3106,9 @@ msgid "FAI summary"
 msgstr "FAI-Übersicht"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr "Umgebung"
 
@@ -3335,44 +3120,142 @@ msgstr "Anwendungen"
 msgid "Please enter the new object group name"
 msgstr "Bitte geben Sie einen Namen für die neue Objektgruppe ein"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Wählen Sie die hinzuzufügenden Objekte"
+#: 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
+msgid "Filter"
+msgstr "Filter"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
-msgid "Display objects of department"
-msgstr "Zeige die Objekte der Abteilung"
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+msgid "user groups"
+msgstr "Benutzergruppen"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-#: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-msgid "Choose the department the search will be based on"
-msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+msgid "nested groups"
+msgstr "verschachtelte Gruppen"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
-msgid "Display objects matching"
-msgstr "Zeige die Objekte, auf die Folgendes passt"
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+msgid "application groups"
+msgstr "Anwendungsgruppen"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-msgid "Regular expression for matching object names"
-msgstr "Regulärer Ausdruck zum Erkennen von Objekt-Namen"
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+msgid "department groups"
+msgstr "Abteilungsgruppen"
 
-#: plugins/admin/ogroups/trust_machines.tpl:6
-#: plugins/admin/groups/trust_machines.tpl:6
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Wählen Sie die hinzuzufügenden Systeme"
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+msgid "server groups"
+msgstr "Servergruppen"
 
-#: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Zeige die Systeme der Abteilung"
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+msgid "workstation groups"
+msgstr "Gruppen von Arbeitsstationen"
 
-#: plugins/admin/ogroups/trust_machines.tpl:30
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+msgid "windows workstation groups"
+msgstr "Gruppen von Windows Arbeitsstationen"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+msgid "terminal groups"
+msgstr "Gruppen von Terminals"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+msgid "printer groups"
+msgstr "Druckergruppen"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+msgid "phone groups"
+msgstr "Telefongruppen"
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+msgid "List of object groups"
+msgstr "Liste von Objektgruppen"
+
+#: 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 "Eigenschaften"
+
+#: 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 "Anlegen"
+
+#: 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 "Entfernen"
+
+#: 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 "Nachricht senden"
+
+#: plugins/admin/ogroups/ogroup-list.xml:142
+msgid "Edit object group"
+msgstr "Objektgruppe bearbeiten"
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+msgid "Remove object group"
+msgstr "Objektgruppe löschen"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Wählen Sie die hinzuzufügenden Objekte"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr "Zeige die Objekte der Abteilung"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/trust_machines.tpl:27
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+msgid "Choose the department the search will be based on"
+msgstr "Wählen Sie die Abteilung, auf die die Suchfunktion angewandt wird"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:40
+msgid "Display objects matching"
+msgstr "Zeige die Objekte, auf die Folgendes passt"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+msgid "Regular expression for matching object names"
+msgstr "Regulärer Ausdruck zum Erkennen von Objekt-Namen"
+
+#: plugins/admin/ogroups/trust_machines.tpl:6
+#: plugins/admin/groups/trust_machines.tpl:6
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Wählen Sie die hinzuzufügenden Systeme"
+
+#: plugins/admin/ogroups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Zeige die Systeme der Abteilung"
+
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
@@ -3409,7 +3292,6 @@ msgid "Display users of department"
 msgstr "Zeige die Benutzer der Abteilung"
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr "Zeige die Benutzer, auf die Folgendes passt"
 
@@ -3472,68 +3354,17 @@ msgstr "In allen Gruppen"
 msgid "Not in all groups"
 msgstr "Nicht in allen Gruppen"
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
-msgstr "Liste der Gruppen"
-
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
-msgstr ""
-"Auswählen, um die Gruppen zu sehen, die primären Gruppen der Benutzer sind"
-
-#: plugins/admin/groups/class_divListGroup.inc:85
-msgid "primary groups"
-msgstr "primäre Gruppen"
-
-#: plugins/admin/groups/class_divListGroup.inc:86
-msgid "samba groups mappings"
-msgstr "Samba Group-Mapping"
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-msgid "samba groups"
-msgstr "Samba Gruppen"
+#: plugins/admin/groups/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Zeige primäre Gruppen"
 
-#: plugins/admin/groups/class_divListGroup.inc:88
-msgid "application settings"
-msgstr "Anwendungseinstellungen"
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-msgid "mail settings"
-msgstr "Mail-Einstellungen"
+#: plugins/admin/groups/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Zeige Samba Gruppen"
 
-#: plugins/admin/groups/class_divListGroup.inc:91
-msgid "mail groups"
-msgstr "Mail Gruppen"
-
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Auswählen, um die \"normalen\" Gruppen zu sehen"
-
-#: plugins/admin/groups/class_divListGroup.inc:93
-msgid "functional groups"
-msgstr "funktionelle Gruppen"
-
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr "Benutzername, dessen Gruppen angezeigt werden"
-
-#: 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 "Nicht erlaubt"
-
-#: plugins/admin/groups/class_divListGroup.inc:303
-msgid "Number of listed groups"
-msgstr "Anzahl der angezeigten Gruppen"
+#: plugins/admin/groups/group-filter.tpl:13
+msgid "Show mail groups"
+msgstr "Zeige Mail Gruppen"
 
 #: plugins/admin/groups/class_groupGeneric.inc:161
 msgid "Cannot find group SID in your configuration!"
@@ -3585,52 +3416,52 @@ msgstr ""
 "Die Suche ergab zu viele Treffer. Es werden nicht mehr als %s Einträge "
 "angezeigt!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Kann keine SID für '%s' finden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Kann keine RIDBASE für '%s' finden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr "Die Gruppen ID-Nummer '%s' wird bereits von %s verwendet!"
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 msgid "Generic group settings"
 msgstr "Allgemeine Gruppeneinstellungen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 msgid "Samba group type"
 msgstr "Samba-Gruppentyp"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 msgid "Samba domain name"
 msgstr "Samba Domänen-Name"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 msgid "Phone pickup group"
 msgstr "Gesprächs-Annahme Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 msgid "Nagios group"
 msgstr "Nagios-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 msgid "Group member"
 msgstr "Gruppenmitglieder"
 
@@ -3638,177 +3469,67 @@ msgstr "Gruppenmitglieder"
 msgid "Group settings"
 msgstr "Gruppen-Einstellungen"
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
-msgid "Group administration"
-msgstr "Gruppenverwaltung"
-
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr "POSIX-Gruppen verwalten"
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-msgid "group"
-msgstr "Gruppe"
-
-#: 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 ""
-"Dies umfasst alle Konto-Informationen, Zugriffsregeln, IMAP-Einstellungen, "
-"etc. dieses Benutzers. Bitte prüfen Sie genau, da es keine Möglichkeit für "
-"GOsa gibt, die Daten wiederherzustellen. "
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr "Benutzerverwaltung"
-
-#: 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 "Liste der Benutzer"
-
-#: 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 "Vorlage"
-
-#: plugins/admin/users/class_divListUsers.inc:85
-msgid "templates"
-msgstr "Vorlagen"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "GOsa object"
-msgstr "GOsa Objekt"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "functional users"
-msgstr "funktionale Benutzer"
-
-#: plugins/admin/users/class_divListUsers.inc:87
-msgid "POSIX users"
-msgstr "POSIX Benutzer"
-
-#: plugins/admin/users/class_divListUsers.inc:88
-msgid "mail users"
-msgstr "Mail Benutzer"
-
-#: plugins/admin/users/class_divListUsers.inc:89
-msgid "samba users"
-msgstr "Samba Benutzer"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Liste der Gruppen"
 
-#: plugins/admin/users/class_divListUsers.inc:90
-msgid "proxy users"
-msgstr "Proxy Benutzer"
+#: plugins/admin/groups/group-list.xml:138
+msgid "Edit group"
+msgstr "Gruppe bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:93
-msgid "phone users"
-msgstr "Telefon-Benutzer"
+#: plugins/admin/groups/group-list.xml:151
+msgid "Remove group"
+msgstr "Gruppe löschen"
 
-#: 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 "Vorlage anwenden"
-
-#: 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 "Allgemeine Einstellungen bearbeiten"
+#: plugins/admin/groups/class_groupManagement.inc:26
+msgid "Group administration"
+msgstr "Gruppenverwaltung"
 
-#: plugins/admin/users/class_divListUsers.inc:207
-msgid "Edit UNIX properties"
-msgstr "UNIX-Einstellungen bearbeiten"
+#: plugins/admin/groups/class_groupManagement.inc:155
+msgid "Posix"
+msgstr "Posix"
 
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
-msgid "Edit environment properties"
-msgstr "Umgebungs-Einstellungen bearbeiten"
+#: plugins/admin/groups/class_groupManagement.inc:156
+msgid "Edit posix properties"
+msgstr "POSIX-Eigenschaften bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1095
-msgid "Edit phone properties"
-msgstr "Telefon-Einstellungen bearbeiten"
-
-#: 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/users/class_divListUsers.inc:215
-msgid "Edit fax properies"
-msgstr "Fax-Einstellungen bearbeiten"
-
-#: plugins/admin/users/class_divListUsers.inc:217
-#: plugins/admin/users/class_userManagement.inc:1079
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:750
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr "Netatalk"
-
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/users/class_userManagement.inc:1083
-msgid "Edit netatalk properties"
-msgstr "Netatalk-Einstellungen bearbeiten"
-
-#: plugins/admin/users/class_divListUsers.inc:220
-msgid "Create user from template"
-msgstr "Neuen Benutzer aus Vorlage erstellen"
-
-#: plugins/admin/users/class_divListUsers.inc:221
-msgid "Create user with this template"
-msgstr "Neuen Benutzer aus dieser Vorlage erstellen"
-
-#: 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 "aktiv"
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
+msgid "Edit phone properties"
+msgstr "Telefon-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
-msgid "user"
-msgstr "Benutzer"
+#: plugins/admin/groups/class_groupManagement.inc:187
+msgid "Menu"
+msgstr "Menü"
 
-#: plugins/admin/users/class_divListUsers.inc:274
-msgid "password"
-msgstr "Passwort"
+#: plugins/admin/groups/class_groupManagement.inc:188
+msgid "Edit start menu properties"
+msgstr "Startmenü-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:287
-msgid "Delete user"
-msgstr "Benutzer entfernen"
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:758
+msgid "Edit environment properties"
+msgstr "Umgebungs-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_divListUsers.inc:376
-msgid "Number of listed users"
-msgstr "Anzahl der angezeigten Benutzer"
+#: 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 ""
+"Dies umfasst alle Konto-Informationen, Zugriffsregeln, IMAP-Einstellungen, "
+"etc. dieses Benutzers. Bitte prüfen Sie genau, da es keine Möglichkeit für "
+"GOsa gibt, die Daten wiederherzustellen. "
 
 #: plugins/admin/users/password.tpl:4
 msgid ""
@@ -3858,6 +3579,13 @@ msgstr ""
 "vereinfacht werden. Viele Datenbankeinträge lassen sich damit automatisch "
 "ausfüllen. Wählen sie 'keine' um den Vorlagen-Dialog zu überspringen."
 
+#: 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 "Vorlage"
+
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
@@ -3868,89 +3596,105 @@ msgstr "Nachname"
 msgid "First name"
 msgstr "Vorname"
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 msgid "Manage users"
 msgstr "Benutzer verwalten"
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 msgid "You have no permission to change this users password!"
 msgstr "Sie haben keine Berechtigung dieses Passwort zu ändern!"
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr "Sie sind nicht berechtigt das Objekt '%s' zu verändern!"
-
-#: plugins/admin/users/class_userManagement.inc:559
-msgid "You have no permission to use this template!"
-msgstr "Sie sind nicht berechtigt diese Vorlage zu nutzen!"
+#: 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 "Vorname"
 
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 msgid "Account locking"
 msgstr "Konto-Sperrung"
 
-#: plugins/admin/users/class_userManagement.inc:662
-msgid "You have no permission to change the lock status for this user!"
-msgstr ""
-"Sie haben keine Berechtigung den Bearbeitungs-Status dieses Benutzers zu "
-"ändern!"
-
-#: plugins/admin/users/class_userManagement.inc:681
-#, php-format
+#: plugins/admin/users/class_userManagement.inc:650
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
-"Die Passwort-Methode '%s' unterstützt keine Sperrungen. Das Konto wurde "
+"Die Passwort-Methode '%s' unterstützt keine Sperrungen. Das Konto %s wurde "
 "nicht gesperrt!"
 
-#: 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 "Vorname"
-
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:723
 msgid "Unlock account"
 msgstr "Konto aktivieren"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 msgid "Lock account"
 msgstr "Konto deaktivieren"
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+msgid "Edit generic properties"
+msgstr "Allgemeine Einstellungen bearbeiten"
+
+#: 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
 msgid "POSIX"
 msgstr "POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 msgid "Edit POSIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:753
+msgid "Netatalk"
+msgstr "Netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:754
+msgid "Edit netatalk properties"
+msgstr "Netatalk-Einstellungen bearbeiten"
+
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "Edit FAX properties"
 msgstr "FAX-Einstellungen bearbeiten"
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Liste der Benutzer"
+
 #: plugins/admin/users/user-list.xml:49
-msgid "Name / Department"
-msgstr "Name / Abteilung"
+#: plugins/personal/generic/class_user.inc:1608
+msgid "Surname"
+msgstr "Nachname"
+
+#: plugins/admin/users/user-list.xml:140
+msgid "Lock users"
+msgstr "Benutzer sperren"
+
+#: plugins/admin/users/user-list.xml:148
+msgid "Unlock users"
+msgstr "Benutzer entsperren"
 
-#: plugins/admin/users/user-list.xml:175
+#: plugins/admin/users/user-list.xml:167
+msgid "Apply template"
+msgstr "Vorlage anwenden"
+
+#: plugins/admin/users/user-list.xml:199
+msgid "New user from template"
+msgstr "Neuen Benutzer aus Vorlage"
+
+#: plugins/admin/users/user-list.xml:213
 msgid "Edit user"
 msgstr "Benutzer bearbeiten"
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 msgid "Remove user"
 msgstr "Benutzer entfernen"
 
@@ -3963,15 +3707,15 @@ msgid "Show functional users"
 msgstr "Zeige funktionale Benutzer"
 
 #: plugins/admin/users/user-filter.tpl:13
-msgid "Show mail users"
-msgstr "Zeige Mail Benutzer"
-
-#: plugins/admin/users/user-filter.tpl:14
 msgid "Show POSIX users"
 msgstr "Zeige POSIX Benutzer"
 
+#: plugins/admin/users/user-filter.tpl:14
+msgid "Show Mail users"
+msgstr "Zeige Mail Benutzer"
+
 #: plugins/admin/users/user-filter.tpl:15
-msgid "Show samba users"
+msgid "Show Samba users"
 msgstr "Zeige Samba Benutzer"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -3990,10 +3734,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr "Keine Vorlagen verfügbar!"
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr "Aktualisieren"
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -4004,7 +3744,7 @@ msgstr ""
 "Teilbaums. Bitte prüfen Sie genau, da es keine Möglichkeit für GOsa gibt, "
 "die Daten wiederherzustellen. "
 
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
+#: plugins/admin/departments/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 "
@@ -4014,109 +3754,48 @@ msgstr ""
 "haben, drücken Sie 'Entfernen' um Fortzufahren oder 'Abbrechen', um den "
 "Vorgang abzubrechen."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr "Kann keinen unbenutzten Tag für diese administrative Einheit finden!"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Markiere '%s'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr "Verschiebe '%s' nach '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr "Fehler beim kopieren von %s, breche ab"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:610
-#: plugins/admin/departments/class_departmentGeneric.inc:615
-#: plugins/admin/departments/class_departmentManagement.inc:26
-msgid "Departments"
-msgstr "Abteilungen"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Liste der Abteilungen"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
-msgid "Department name"
-msgstr "Name der Abteilung"
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:175
+msgid "Domain"
+msgstr "Domain"
 
-#: 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 "Kategorie"
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
+msgstr "Domänen-Komponente"
 
-#: 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"
+#: 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 "Land"
 
-#: 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 "Ort"
-
-#: 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 "Adresse"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr "Telefon"
-
-#: 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 "Administrative Einstellungen"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "Objekt '%s' ist bereits markiert"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Füge Markierung (%s) zu Objekt '%s' hinzu"
+#: 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 "Standort"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Entferne Markierung von Objekt '%s'"
+#: 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 "Organisation"
 
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -4145,6 +3824,21 @@ msgstr "Beschreibender Text zu dieser Abteilung"
 msgid "Choose subtree to place department in"
 msgstr "Wählen Sie den Teilbaum, in den die Abteilung eingepflegt werden soll"
 
+#: 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 "Administrative Einstellungen"
+
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -4166,11 +3860,41 @@ msgstr "Name des zu erzeugenden Teilbaums"
 msgid "Descriptive text for   department"
 msgstr "Beschreibender Text zu dieser Abteilung"
 
+#: 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 "Kategorie"
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr "Kategorie dieses Teilbaums"
 
+#: 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 "Ort"
+
+#: 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 "Land"
+
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
 msgid "State where this subtree is located"
@@ -4181,6 +3905,16 @@ msgstr "Land, in dem dieser Teilbaum anzusiedeln ist"
 msgid "Location of this subtree"
 msgstr "Ort dieses Teilbaums"
 
+#: 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 "Adresse"
+
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -4191,6 +3925,20 @@ msgstr "Postalische Anschrift dieses Teilbaums"
 msgid "Base telephone number of this subtree"
 msgstr "Einleitende Telefonnummer dieses Teilbaums"
 
+#: 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"
@@ -4198,77 +3946,38 @@ msgstr "Einleitende Fax-Nummer dieses Teilbaums"
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 msgid "Domain Component"
 msgstr "Domänen-Komponente"
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr "Liste der Abteilungen"
-
-#: plugins/admin/departments/class_divListDepartment.inc:73
-msgid "Regular expression for matching department names"
-msgstr "Regulärer Ausdruck zum Erkennen von Abteilungs-Namen"
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/class_department.inc:615
+msgid "Departments"
+msgstr "Abteilungen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 msgid "Manage Departments"
 msgstr "Abteilungen verwalten"
 
-#: 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 ""
-"Sobald der Verschiebe-Vorgang abgeschlossen wurde, können Sie zum Ende der "
-"Seite scrollen und auf den 'Fortfahren'-Knopf drücken, um mit der "
-"Abteilungsverwaltung fort zu fahren."
-
-#: plugins/admin/departments/class_departmentManagement.inc:336
+#: plugins/admin/departments/class_departmentManagement.inc:126
 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 ""
 "Sobald die Tag-Operation abgeschlossen wurde, können Sie zum Ende der Seite "
 "scrollen und auf den 'Fortfahren'-Knopf drücken, um mit der "
 "Abteilungsverwaltung fort zu fahren."
 
-#: plugins/admin/departments/class_departmentManagement.inc:556
-msgid "Domain"
-msgstr "Domain"
-
-#: plugins/admin/departments/class_departmentManagement.inc:580
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Land"
-
-#: plugins/admin/departments/class_departmentManagement.inc:592
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
-msgstr "Standort"
-
-#: 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 "Organisation"
-
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 msgid "Organization name"
 msgstr "Organisationsname"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Postal address"
 msgstr "Adresse"
 
@@ -4289,14 +3998,52 @@ msgstr "Domänenname"
 msgid "Name of domain to create"
 msgstr "Name der zu erzeugenden Domäne"
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr "Abteilungsverwaltung"
-
 #: plugins/admin/departments/country.tpl:14
 msgid "Name of country to create"
 msgstr "Name des anzulegenden Landes"
 
+#: plugins/admin/departments/class_department.inc:386
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr "Kann keinen unbenutzten Tag für diese administrative Einheit finden!"
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr "Markiere '%s'."
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr "Verschiebe '%s' nach '%s'"
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr "Fehler beim kopieren von %s, breche ab"
+
+#: plugins/admin/departments/class_department.inc:618
+msgid "Department name"
+msgstr "Name der Abteilung"
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr "Telefon"
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr "Objekt '%s' ist bereits markiert"
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr "Füge Markierung (%s) zu Objekt '%s' hinzu"
+
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr "Entferne Markierung von Objekt '%s'"
+
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr "Gewünschte Operation wird durchgeführt"
@@ -4344,58 +4091,21 @@ msgstr ""
 "erwartet sein wird, vielleicht ist die beste Lösung, vorher ein Backup zu "
 "erstellen."
 
-#: 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 ""
-"Dies umfasst alle System- und Setup-Informationen Bitte prüfen Sie dies "
-"genau, da es keine Möglichkeit für GOsa gibt, die Daten zu restaurieren. "
-
-#: plugins/admin/acl/class_aclManagement.inc:290
-msgid "ACL role"
-msgstr "ACL-Rolle"
-
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-msgid "List of acls"
-msgstr "Liste der ACLs"
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr "Übersicht"
-
-#: plugins/admin/acl/class_divListACL.inc:84
-msgid "Display acls matching"
-msgstr "Zeige ACLs, auf die zutrifft"
-
-#: 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 "Rolle"
-
-#: plugins/admin/acl/class_divListACL.inc:165
-msgid "Edit acl role"
-msgstr "ACL-Rolle bearbeiten"
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
+msgid "Acl"
+msgstr "ACL"
 
-#: plugins/admin/acl/class_divListACL.inc:185
-msgid "Edit acl"
-msgstr "ACL bearbeiten"
-
-#: plugins/admin/acl/class_divListACL.inc:192
-msgid "Delete acl"
-msgstr "ACL entfernen"
+#: plugins/admin/acl/class_aclManagement.inc:154
+msgid "ACL Assignment"
+msgstr "ACL-Zuordnung"
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
 msgid "ACL Templates"
 msgstr "ACL Vorlagen"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:745
 msgid "Access control roles"
 msgstr "Rollen für die Zugriffskontrolle"
 
@@ -4403,50 +4113,66 @@ msgstr "Rollen für die Zugriffskontrolle"
 msgid "Edit AC roles"
 msgstr "ACL-Rollen bearbeiten"
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 msgid "Reset ACL"
 msgstr "ACL zurücksetzen"
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 msgid "No ACL settings for this category"
 msgstr "Keine ACL-Einstellungen für diese Kategorie"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "Enthält ACL für diese Objekte: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 msgid "Edit category ACL"
 msgstr "ACL Kategorie bearbeiten"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 msgid "Reset category ACL"
 msgstr "ACL-Kategorie zurücksetzen"
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "ACL für '%s' bearbeiten, Bereich ist '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 msgid "Object in use"
 msgstr "Objekt in Verwendung"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 "Die Rolle kann nicht entfernt werden, solange sie noch von folgenden "
 "Objekten verwendet wird:"
 
-#: plugins/admin/acl/class_aclRole.inc:753
+#: 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 "Rolle"
+
+#: plugins/admin/acl/class_aclRole.inc:755
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
-msgid "ACL management"
-msgstr "ACL-Verwaltung"
+#: plugins/admin/acl/acl-list.xml:11
+msgid "List of acls"
+msgstr "Liste der ACLs"
+
+#: plugins/admin/acl/acl-filter.tpl:11
+msgid "Show access control lists"
+msgstr "Zeige Zugriffskontrolllisten"
+
+#: plugins/admin/acl/acl-filter.tpl:12
+msgid "Show roles"
+msgstr "Zeige Rollen"
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
@@ -4464,29 +4190,29 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Organisationsbezogene Benutzereinstellungen bearbeiten"
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 "Bitte eine einzelne IP-Adresse oder eine Netzwerk/Netzmasken Kombination "
 "hinzufügen!"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr "weiblich"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr "männlich"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr "Kann Datei nicht hochladen!"
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 msgid "Serial number"
 msgstr "Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4494,235 +4220,232 @@ msgstr ""
 "(Manche Zertifikate werden momentan nicht unterstützt und werden daher als "
 "'ungültig' angezeigt)."
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Zertifkat ist gültig im Zeitraum von %s bis %s (momentan: %s)."
 
-#: plugins/personal/generic/class_user.inc:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr "gültig"
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr "ungültig"
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 msgid "No certificate installed"
 msgstr "Kein Zertifikat eingerichtet"
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 msgid "The selected password method is no longer available."
 msgstr "Die gewählte Passwort-Methode ist nicht mehr verfügbar."
 
-#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr "Die RDN kann nicht erstellt werden: + ist in sub RDNs nicht erlaubt!"
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr "Kann RDN nicht erstellen: Attribut ist nicht definiert!"
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr "Kann RDN nicht erstellen: ungültige Attribut-Parameter!"
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 msgid "The selected password method requires initial configuration!"
 msgstr "Die gewählte Passwort-Methode benötigt eine initiale Konfiguration!"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 msgid "Cannot open certificate!"
 msgstr "Kann Zertifikat nicht öffnen!"
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Referat"
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Hausbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Anrede"
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Dienstort"
 
-#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Aufgabengebiet"
 
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Sachgebiet"
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Amts-/Dienstbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Zertifikat-Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Straße"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1598
 msgid "Generic user settings"
 msgstr "Allgemeine Benutzereinstellungen"
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mein Konto"
 
-#: plugins/personal/generic/class_user.inc:1601
-msgid "Surname"
-msgstr "Nachname"
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 msgid "User identification"
 msgstr "Benutzerkennung"
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Akademischer Titel"
 
-#: plugins/personal/generic/class_user.inc:1608
-msgid "Gender"
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
 msgstr "Geschlecht"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Benutzerbild"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 msgid "Department number"
 msgstr "Abteilungsnummer"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Employee number"
 msgstr "Personalnummer"
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Pager number"
 msgstr "Pagernummer"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 msgid "Mobile number"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 msgid "Fax number"
 msgstr "Faxnummer"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 msgid "User password method"
 msgstr "Benutzer Passwort-Methode"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 msgid "User certificates"
 msgstr "Benutzer-Zertifikate"
 
@@ -4750,10 +4473,6 @@ msgstr "Bild ändern"
 msgid "Template name"
 msgstr "Name der Vorlage"
 
-#: plugins/personal/generic/generic.tpl:138
-msgid "Sex"
-msgstr "Geschlecht"
-
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
@@ -4879,6 +4598,12 @@ msgstr "abgelaufen"
 msgid "grace time active"
 msgstr "Nachfrist aktiv"
 
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+msgid "active"
+msgstr "aktiv"
+
 #: plugins/personal/posix/class_posixAccount.inc:173
 msgid "password not changeable"
 msgstr "Passwort kann nicht geändert werden"
@@ -4887,45 +4612,41 @@ msgstr "Passwort kann nicht geändert werden"
 msgid "password expired"
 msgstr "Passwort abgelaufen"
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr "unkonfiguriert"
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "Passwort kann bis zu %s Tage nach der letzten Änderung nicht geändert werden"
 
-#: plugins/personal/posix/class_posixAccount.inc:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Der Benutzer muß sein Passwort nach %s Tagen ändern"
 
-#: plugins/personal/posix/class_posixAccount.inc:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr "Konto nach %s Tagen nach Ablauf ohne Aktivität deaktivieren"
 
-#: plugins/personal/posix/class_posixAccount.inc:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr "Benutzer %s Tage vor dem Ablauf des Passwortes warnen"
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Wartezeit für Sperre abgelaufen. Ignoriere Sperre!"
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr "Gruppe des Benutzers"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
@@ -4934,90 +4655,90 @@ msgstr ""
 "Wenn dies unbeabsichtigt geschah, prüfen Sie bitte alle verwendeten UID-"
 "Nummern."
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
-#: 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:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 msgid "shadowMin"
 msgstr "shadowMin"
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 msgid "shadowMax"
 msgstr "shadowMax"
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 msgid "shadowWarning"
 msgstr "shadowWarning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 msgid "shadowInactive"
 msgstr "shadowInactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 msgid "POSIX account"
 msgstr "POSIX-Konto"
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 msgid "Group ID"
 msgstr "Gruppen-ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 msgid "Force password change on login"
 msgstr "Erzwinge Änderung des Passwort bei Anmeldung"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 msgid "Shadow warning"
 msgstr "Shadow warning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 msgid "Shadow inactive"
 msgstr "Shadow inactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 msgid "Shadow expire"
 msgstr "Shadow expire"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr "Öffentlicher SSH-Schlüssel"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 msgid "System trust model"
 msgstr "Modell des System-Vertrauens"
 
@@ -5081,10 +4802,18 @@ msgstr "Zeige Gruppen der Abteilung"
 msgid "Display groups matching"
 msgstr "Zeige Gruppen, auf die zutrifft"
 
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr "Regulärer Ausdruck zum Erkennen von Gruppennamen"
+
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "Zeige Gruppen des Benutzers"
 
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr "Benutzername, dessen Gruppen angezeigt werden"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "UNIX-Einstellungen"
@@ -5296,46 +5025,38 @@ msgid "Government mode"
 msgstr "Behörden-Modus"
 
 #: setup/setup_config2.tpl:123
-msgid "Logging options"
-msgstr "Protokollierungs-Optionen"
-
-#: setup/setup_config2.tpl:127
-msgid "Syslog"
-msgstr "Syslog"
-
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-msgid "MySQL"
-msgstr "MySQL"
+msgid "GOsa logging"
+msgstr "GOsa Protokolierung"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 msgid "Mail settings"
 msgstr "Mail-Einstellungen"
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr "Zustellungs-Methode"
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr "Attribut für Kontoidentifikation"
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 msgid "Vacation templates"
 msgstr "Urlaubsvorlagen"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr "Verwende Cyrus UNIX-Stil"
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 msgid "Snapshots / Undo"
 msgstr "Snapshots / Wiederherstellung"
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 msgid "Enable snapshots"
 msgstr "Snapshots ermöglichen"
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 msgid "Snapshot base"
 msgstr "Basis für Snapshots"
 
@@ -5683,6 +5404,10 @@ msgstr "mbstring"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr "GOsa benötigt dieses Modul um Unicode-Zeichenketten zu verarbeiten."
 
+#: 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."
@@ -6036,14 +5761,14 @@ msgstr "Hat Ihnen die Setup-Prozedur weitergeholfen?"
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "Yes"
 msgstr "ja"
 
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "No"
 msgstr "nein"
 
@@ -6891,12 +6616,3 @@ msgstr "Dieser Schritt erlaubt es Ihnen, Ihre bevorzugte Sprache auszuwählen."
 #: setup/class_setupStep_Language.inc:47
 msgid "Automatic"
 msgstr "Automatisch"
-
-#~ msgid "ACL takes effect for all users"
-#~ msgstr "ACL wirkt für alle Benutzer"
-
-#~ msgid "Version mismatch for optional object class '%s' (!=%s)!"
-#~ msgstr "Falsche Version der optionalen Objektklasse '%s' (!=%s)!"
-
-#~ msgid "Non common group"
-#~ msgstr "Nicht gemeinsame Gruppe"
index 1fc3ab7973a04eefd7ff30b54d6688b116d982d1..69f386694d429c7aad7b9c78f0a172cc414ab7ac 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: admin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: 2008-12-08 11:29+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <kde-i18n-doc@lists.kde.org>\n"
@@ -37,19 +37,17 @@ 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -71,6 +69,7 @@ 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 "
@@ -82,15 +81,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr "Cancelar"
@@ -113,15 +111,14 @@ 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "Contraseña"
 
@@ -262,7 +259,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:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 msgid "Members"
 msgstr "Miembros"
 
@@ -295,7 +292,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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -308,9 +305,7 @@ msgid "Verify password"
 msgstr "Confirmar contraseña"
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
@@ -365,7 +360,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr "Objeto"
 
@@ -409,47 +404,49 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.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/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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -459,9 +456,9 @@ msgstr "Error"
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -490,8 +487,7 @@ 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:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -633,9 +629,9 @@ msgstr "Entrando"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
 msgstr "Error fatal"
 
@@ -649,17 +645,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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 msgid "Configuration error"
@@ -670,7 +666,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:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 msgid "Password method"
 msgstr "Metodo de contraseña"
 
@@ -678,7 +674,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:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -698,10 +694,11 @@ 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/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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -719,11 +716,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:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr "La sesión no será codificada."
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr "Entrar en sesión SSL"
 
@@ -759,33 +756,37 @@ 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_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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -827,12 +828,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:368
+#: html/index.php:369
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Cuenta bloqueada. ¡Por favor contacte con su administrador de sistemas!"
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -923,6 +924,49 @@ 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."
@@ -944,7 +988,7 @@ msgstr ""
 "introducida!"
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -953,7 +997,7 @@ msgstr ""
 "La funcionalidad de instancias esta activa, pero el valor requerido '%s' no "
 "está activo."
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, fuzzy, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -966,11 +1010,11 @@ msgstr ""
 msgid "Access control"
 msgstr "Control de acceso"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 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:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 msgid "All categories"
 msgstr "Todas las categorías"
 
@@ -978,20 +1022,20 @@ msgstr "Todas las categorías"
 msgid "Reset ACLs"
 msgstr "Eliminar ACLs"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 msgid "One level"
 msgstr "Un nivel"
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Current object"
 msgstr "Objeto actual"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 msgid "Complete subtree"
 msgstr "Subárbol completo"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr "Subárbol completo (permanente)"
 
@@ -999,56 +1043,54 @@ 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:26
-#: plugins/admin/users/user-list.xml:15
-#: plugins/personal/generic/class_user.inc:1596
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Usuarios"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: 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_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
+#: 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
 msgid "Up"
 msgstr "Arriba"
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "Abajo"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr "Editar"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr "Eliminar"
@@ -1071,7 +1113,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:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr "Todos los objetos en el subárbol actual"
 
@@ -1111,13 +1153,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: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
+#: 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
 msgid "Internal error"
 msgstr "error interno"
 
@@ -1145,20 +1187,20 @@ msgstr "rol desconocido"
 msgid "Contains settings for these objects: %s"
 msgstr "Tiene configuraciones de los siguientes objetos: %s"
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 msgid "inactive"
 msgstr "inactivo"
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "No members"
 msgstr "Miembros del grupo"
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 msgid "Access control list"
 msgstr "Lista de control de acceso"
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 msgid "ACL roles"
 msgstr "Roles ACL"
 
@@ -1167,48 +1209,38 @@ msgstr "Roles ACL"
 msgid "Close"
 msgstr "Cerrar"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 msgid "Go to root department"
 msgstr "Ir al departamento raíz"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 msgid "Root"
 msgstr "Raíz"
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 msgid "Go up one department"
 msgstr "Subir un departamento"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 msgid "Go to users department"
 msgstr "Ir al departamento de usuarios"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 msgid "Home"
 msgstr "Inicio"
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr "Recargar lista"
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr "Enviar"
 
@@ -1225,35 +1257,19 @@ msgstr ""
 "El nombre de usuario / UID no es único dentro del árbol LDAP. Por favor "
 "contacte con su Administrador."
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 msgid "Choose a base"
 msgstr "Elija una base"
 
-#: 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
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1261,25 +1277,18 @@ msgstr "Usar"
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "Base"
 
-#: 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
+#: include/class_listing.inc:298 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
@@ -1287,65 +1296,79 @@ msgstr "Filtrar entradas con esta sintaxis"
 msgid "Select all"
 msgstr "Seleccione todos"
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 #, fuzzy
 msgid "created by"
 msgstr "Crear"
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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"
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr "Copiar"
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr "Mover"
 
-#: 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
+#: 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
 msgid "Paste"
 msgstr "Pegar"
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Mover esta entrada"
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Copiar esta entrada"
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr "Recuperar instantanea"
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr "Crear instantánea"
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr "¡Crear una nueva instantánea de este objeto!"
 
-#: include/functions.inc:121
+#: 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
 #, 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:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
@@ -1353,17 +1376,17 @@ msgstr ""
 "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
 "ejecutando '%s'"
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, 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:399
+#: include/functions.inc:518
 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:474
+#: include/functions.inc:603
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -1371,13 +1394,13 @@ msgstr ""
 "El nombre de usuario / UID no es único dentro del árbol LDAP. Por favor "
 "contacte con su Administrador."
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 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:651
+#: include/functions.inc:799
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1386,12 +1409,12 @@ msgstr ""
 "No puedo crear información de bloqueos en el árbol LDAP. ¡Por favor contacte "
 "con su Administrador!"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1399,12 +1422,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:1049
+#: include/functions.inc:1232
 #, 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:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1413,73 +1436,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:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, 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:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr "Entradas por página"
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Instantánea de desarrollo GOsa (Rev %s)"
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "El archivo '%s' no puede ser eliminado."
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 msgid "Cannot write to revision file!"
 msgstr "¡No se puede escribir en el archivo de revisión!"
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "No esta disponible 'baseIdHook'.¡Se usara la base predeterminada!"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 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:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr "Usado para guardar información específica de la cuenta."
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1487,28 +1510,28 @@ msgstr ""
 "Usado para bloquear entradas editadas actualmente y así evitar múltiples "
 "cambios simultáneos."
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto necesaria '%s'!"
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto opcional '%s'!"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, 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:2309
+#: include/functions.inc:2764
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1516,7 +1539,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:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1524,7 +1547,7 @@ msgstr ""
 "Para poder usar grupos conforme a rfc2307bis, el objectClass 'posixGroup' "
 "debe ser AUXILIARY"
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1532,51 +1555,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:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "El objectClass 'posixGroup' debe ser STRUCTURAL"
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr "Alemán"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr "Francés"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr "Español"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr "Inglés"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr "Holandes"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 msgid "Polish"
 msgstr "Polaco"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 msgid "Chinese"
 msgstr "Chino"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr "Ruso"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1584,56 +1607,56 @@ msgstr ""
 "El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece "
 "existir."
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr "¡No se puede generar la clave samba!"
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr "¡No se puede asignar un identificador (ID) libre!"
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "¡No se puede crear la carpeta '%s'!"
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 #, fuzzy
 msgid "no ID available!"
 msgstr "¡No hay plantillas disponibles!"
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 msgid "Cannot allocate a free ID!"
 msgstr "¡No se puede asignar un identificador (ID) libre!"
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
@@ -1642,35 +1665,37 @@ msgstr ""
 "No hay definiciones de extensión para iniciar '%s', por favor compruebe su "
 "archivo de configuración."
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, 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:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr "Referencias"
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Va a eliminar la instantanea '%s'."
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 msgid "Remove snapshot"
 msgstr "Eliminar instantanea"
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1686,8 +1711,11 @@ 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr "Descripción"
 
@@ -1795,7 +1823,7 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr "Argumentos"
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
@@ -1809,50 +1837,29 @@ 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: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
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr "Modificando ACL dn"
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "from"
 msgstr "desde"
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 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:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 msgid "Restore"
 msgstr "Recuperar"
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 msgid "cut"
 msgstr "mover"
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr "copiar"
 
@@ -2450,16 +2457,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:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Aviso e rendimiento"
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, 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:665
+#: include/class_ldap.inc:692
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
@@ -2467,23 +2474,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:713
+#: include/class_ldap.inc:740
 #, 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:800
+#: include/class_ldap.inc:827
 #, 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:802
+#: include/class_ldap.inc:829
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "mientras operaba en el servidor LDAP '%s'"
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2492,87 +2499,65 @@ msgstr ""
 "No es un DN válido: '%s': El bloque para importar debe empezar por 'dn: ...' "
 "en la linea %s"
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, 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:88
+#: include/class_log.inc:87
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Entrada fallida: %s"
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr "¡Se ha indicado una opción no válida: '%s'!"
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 msgid "Specified objectType is empty or invalid!"
 msgstr "¡Se ha indicado un objectType vacio o no válido!"
 
-#: 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
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr "Demonio de soporte GOsa"
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 msgid "Cannot not parse XML!"
 msgstr "¡No se puede analizar el XML!"
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, 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:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr "¡No se puede eliminar la entrada %s!"
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, 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:270
+#: include/class_config.inc:317
 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:636
+#: include/class_config.inc:694
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "¡sambaSID y/o sambaRidBase no aparece en la configuración!"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid "Configuration"
 msgstr "Configuración"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2595,44 +2580,44 @@ msgstr ""
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: 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: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
 #, php-format
 msgid "Copy and paste failed!"
 msgstr "¡Ha fallado copiar y pegar! "
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "No se pueden modificar los permisos para '%s'"
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr "'%s' no es un objeto LDAP válido"
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, php-format
 msgid "No write permission in '%s'"
 msgstr "No tiene permiso de escritura en '%s'"
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr "Estos objetos serán modificados: %s"
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr "Este objeto sera modificado: %s"
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 msgid "Cannot paste"
 msgstr "No puedo pegar"
 
@@ -2642,11 +2627,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:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Genérico"
@@ -2657,32 +2642,26 @@ 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr "Correo Electrónico"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr "FAX"
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2691,34 +2670,34 @@ msgid "FTP"
 msgstr "FTP"
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr "Grupo"
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/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: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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2727,14 +2706,13 @@ msgid "Phone"
 msgstr "Teléfono"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr "Aplicación"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Servidor"
 
@@ -2743,19 +2721,17 @@ msgid "Thin Client"
 msgstr "Cliente ligero"
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr "Estación de trabajo"
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Grupo de objetos"
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr "Impresora"
 
@@ -2798,7 +2774,13 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "El equipo de GOsa"
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -2806,248 +2788,37 @@ 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_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_ogroupManagement.inc:25
 #: 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:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 msgid "Manage object groups"
 msgstr "Gestionar grupos de objetos"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 msgid "Infrastructure error"
 msgstr "error de infraestructura"
 
-#: 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
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 #, fuzzy
 msgid "Templates"
 msgstr "Plantilla"
 
-#: 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
+#: 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
 msgid "User"
 msgstr "Usuario"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 msgid "Windows Install"
 msgstr "Instalación Windows"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -3063,6 +2834,19 @@ 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"
@@ -3114,7 +2898,9 @@ msgid "applications"
 msgstr "aplicaciones"
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr "ninguno"
 
@@ -3132,20 +2918,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:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "desactivado"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 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:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
@@ -3163,22 +2949,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3206,13 +2987,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Nombre"
@@ -3266,7 +3053,7 @@ msgid "Select a base"
 msgstr "Seleccione una base"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Sistema de seguridad"
@@ -3304,10 +3091,9 @@ msgid "FAI summary"
 msgstr "Sumario FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr "Entorno"
 
@@ -3319,45 +3105,146 @@ 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_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Seleccione los objetos a añadir"
+#: 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_objects.tpl:36
-msgid "Display objects of department"
-msgstr "Mostrar objetos del departamento"
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+msgid "user groups"
+msgstr "grupos de usuarios"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-#: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-msgid "Choose the department the search will be based on"
-msgstr "Escoja el departamento base de la búsqueda"
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+msgid "nested groups"
+msgstr "grupos anidados"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
-msgid "Display objects matching"
-msgstr "Mostrar objetos que coincidan"
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+msgid "application groups"
+msgstr "grupos de aplicacion"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-msgid "Regular expression for matching object names"
-msgstr "Expresiones regulares para buscar nombre de objetos"
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+msgid "department groups"
+msgstr "grupos de departamento"
 
-#: plugins/admin/ogroups/trust_machines.tpl:6
-#: plugins/admin/groups/trust_machines.tpl:6
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Seleccione los sistemas a añadir"
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+msgid "server groups"
+msgstr "grupos de servidor"
 
-#: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Mostrar los sistemas del departamento"
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+msgid "workstation groups"
+msgstr "grupos de estación de trabajo"
 
-#: plugins/admin/ogroups/trust_machines.tpl:30
-#: plugins/admin/groups/trust_machines.tpl:30
+#: 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"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr "Mostrar objetos del departamento"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/trust_machines.tpl:27
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+msgid "Choose the department the search will be based on"
+msgstr "Escoja el departamento base de la búsqueda"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:40
+msgid "Display objects matching"
+msgstr "Mostrar objetos que coincidan"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+msgid "Regular expression for matching object names"
+msgstr "Expresiones regulares para buscar nombre de objetos"
+
+#: plugins/admin/ogroups/trust_machines.tpl:6
+#: plugins/admin/groups/trust_machines.tpl:6
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Seleccione los sistemas a añadir"
+
+#: plugins/admin/ogroups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Mostrar los sistemas del departamento"
+
+#: plugins/admin/ogroups/trust_machines.tpl:30
+#: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Mostrar sistemas que coincidan con"
@@ -3393,7 +3280,6 @@ 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"
 
@@ -3457,68 +3343,21 @@ msgstr "en todos los grupos"
 msgid "Not in all groups"
 msgstr "no en todos los grupos"
 
-#: 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"
+#: plugins/admin/groups/group-filter.tpl:11
+#, fuzzy
+msgid "Show primary groups"
 msgstr "grupos primarios"
 
-#: 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"
+#: plugins/admin/groups/group-filter.tpl:12
+#, fuzzy
+msgid "Show samba groups"
 msgstr "grupo de samba"
 
-#: 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"
+#: plugins/admin/groups/group-filter.tpl:13
+#, fuzzy
+msgid "Show 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!"
@@ -3566,52 +3405,52 @@ msgstr ""
 "La busqueda ha devuelto demasiados reultados.¡No se muestran mas de %s "
 "entradas!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, 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:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "¡No se puede encontrar un RIDBASE para '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 msgid "Generic group settings"
 msgstr "Parámetros genéricos del grupo"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 msgid "Samba group type"
 msgstr "Tipo de grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 msgid "Samba domain name"
 msgstr "Nombre de dominio samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 msgid "Phone pickup group"
 msgstr "Miembros de grupo de salto telefónico"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 msgid "Nagios group"
 msgstr "Grupo Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 msgid "Group member"
 msgstr "Miembro del grupo"
 
@@ -3619,179 +3458,73 @@ msgstr "Miembro del grupo"
 msgid "Group settings"
 msgstr "Parametros 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/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr "Gestionar grupos POSIX"
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-msgid "group"
-msgstr "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/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr "Administración de Usuario"
-
-#: 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/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/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista de grupos"
 
-#: plugins/admin/users/class_divListUsers.inc:93
+#: plugins/admin/groups/group-list.xml:138
 #, fuzzy
-msgid "phone users"
-msgstr "usuarios de proxy"
-
-#: 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"
+msgid "Edit group"
+msgstr "grupos de impresoras"
 
-#: plugins/admin/users/class_divListUsers.inc:204
-msgid "GOsa"
-msgstr "GOsa"
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "grupos de servidor"
 
-#: 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/groups/class_groupManagement.inc:26
+msgid "Group administration"
+msgstr "Administración de grupo"
 
-#: plugins/admin/users/class_divListUsers.inc:207
-msgid "Edit UNIX properties"
-msgstr "Editar características UNIX"
+#: plugins/admin/groups/class_groupManagement.inc:155
+msgid "Posix"
+msgstr "Posix"
 
-#: 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/groups/class_groupManagement.inc:156
+#, fuzzy
+msgid "Edit posix properties"
+msgstr "Editar características telefónicas"
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 msgid "Edit mail properties"
 msgstr "Editar características de correo electrónico"
 
-#: 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/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/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
+#: 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/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr "Netatalk"
-
-#: 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/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
+msgid "Edit phone properties"
+msgstr "Editar características telefónicas"
 
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
-msgid "user"
-msgstr "usuario"
+#: plugins/admin/groups/class_groupManagement.inc:187
+#, fuzzy
+msgid "Menu"
+msgstr "Impresora"
 
-#: plugins/admin/users/class_divListUsers.inc:274
-msgid "password"
-msgstr "contraseña"
+#: plugins/admin/groups/class_groupManagement.inc:188
+#, fuzzy
+msgid "Edit start menu properties"
+msgstr "Editar características samba"
 
-#: plugins/admin/users/class_divListUsers.inc:287
-msgid "Delete user"
-msgstr "Eliminar usuario"
+#: 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:376
-msgid "Number of listed users"
-msgstr "Número de usuarios mostrados"
+#: 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/password.tpl:4
 msgid ""
@@ -3841,6 +3574,13 @@ 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"
@@ -3851,91 +3591,112 @@ msgstr "Apellido"
 msgid "First name"
 msgstr "Nombre"
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 msgid "Manage users"
 msgstr "Gestión de usuarios"
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 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: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:559
-msgid "You have no permission to use this template!"
-msgstr "¡No tiene permisos para usar esta plantilla!"
+#: 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:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 #, fuzzy
 msgid "Account locking"
 msgstr "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:681
+#: plugins/admin/users/class_userManagement.inc:650
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:723
 #, fuzzy
 msgid "Unlock account"
 msgstr "Mi cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 #, fuzzy
 msgid "Lock account"
 msgstr "Mi cuenta"
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+msgid "Edit generic properties"
+msgstr "Editar características generales"
+
+#: 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
 msgid "POSIX"
 msgstr "POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Editar características UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: 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"
+
+#: plugins/admin/users/class_userManagement.inc:762
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Editar características UNIX"
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Lista de usuarios"
+
 #: 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 "Name / Department"
-msgstr "Nombre del departamento"
+msgid "Lock users"
+msgstr "Lista de usuarios"
 
-#: plugins/admin/users/user-list.xml:175
+#: 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"
+
+#: plugins/admin/users/user-list.xml:213
 msgid "Edit user"
 msgstr "Editar usuario"
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 #, fuzzy
 msgid "Remove user"
 msgstr "Eliminar foto"
@@ -3950,17 +3711,18 @@ msgid "Show functional users"
 msgstr "usuarios funcionales"
 
 #: plugins/admin/users/user-filter.tpl:13
-msgid "Show mail users"
-msgstr "Mostrar los usuarios de correo"
-
-#: plugins/admin/users/user-filter.tpl:14
 #, fuzzy
 msgid "Show POSIX users"
 msgstr "Usuarios POSIX"
 
+#: plugins/admin/users/user-filter.tpl:14
+#, fuzzy
+msgid "Show Mail users"
+msgstr "Mostrar los usuarios de correo"
+
 #: plugins/admin/users/user-filter.tpl:15
 #, fuzzy
-msgid "Show samba users"
+msgid "Show Samba users"
 msgstr "Mostrar los usuarios de correo"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -3979,10 +3741,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr "¡No hay plantillas disponibles!"
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -3993,7 +3751,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/acl/remove.tpl:10
+#: plugins/admin/departments/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 "
@@ -4003,111 +3761,50 @@ msgstr ""
 "actual de su árbol LDAP en un fichero. Entonces - Y solo entonces - presione "
 "'Eliminar' para continuar o 'Cancelar' para abortar."
 
-#: 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/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Etiquetando '%s'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr "Moviendo '%s' a '%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/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/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/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista de Departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr "Teléfono"
+#: 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: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/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:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "El objeto '%s' está ya marcado"
+#: 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:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Añadir marca (%s) al objeto '%s'"
+#: 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:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Eliminando marca del objeto '%s'"
+#: 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/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -4136,6 +3833,21 @@ 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
@@ -4158,11 +3870,41 @@ msgstr "Nombre del subárbol a crear"
 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"
@@ -4173,6 +3915,16 @@ 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"
@@ -4183,6 +3935,20 @@ 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"
@@ -4190,107 +3956,108 @@ 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:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: 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_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr "Lista de Departamentos"
-
-#: 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:25
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/class_department.inc:615
+msgid "Departments"
+msgstr "Departamentos"
 
-#: plugins/admin/departments/class_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 msgid "Manage Departments"
 msgstr "Gestionar Departamentos"
 
-#: 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
+#: plugins/admin/departments/class_departmentManagement.inc:126
+#, fuzzy
 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
-#, fuzzy
-msgid "Domain"
-msgstr "en 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:1628
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Postal address"
 msgstr "Código Postal"
 
-#: plugins/admin/departments/class_organizationGeneric.inc:126
-msgid "Phone number"
-msgstr "Número de teléfono"
+#: plugins/admin/departments/class_organizationGeneric.inc:126
+msgid "Phone number"
+msgstr "Número de teléfono"
+
+#: plugins/admin/departments/class_countryGeneric.inc:87
+#: plugins/admin/departments/country.tpl:11
+msgid "Country name"
+msgstr "Nombre del País"
+
+#: plugins/admin/departments/domain.tpl:11
+#, fuzzy
+msgid "Domain name"
+msgstr "Administradores del dominio"
+
+#: plugins/admin/departments/domain.tpl:14
+#, fuzzy
+msgid "Name of domain to create"
+msgstr "Nombre de la localidad a crear"
+
+#: 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_countryGeneric.inc:87
-#: plugins/admin/departments/country.tpl:11
-msgid "Country name"
-msgstr "Nombre del País"
+#: plugins/admin/departments/class_department.inc:618
+msgid "Department name"
+msgstr "Nombre de departamento"
 
-#: plugins/admin/departments/domain.tpl:11
-#, fuzzy
-msgid "Domain name"
-msgstr "Administradores del dominio"
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr "Teléfono"
 
-#: plugins/admin/departments/domain.tpl:14
-#, fuzzy
-msgid "Name of domain to create"
-msgstr "Nombre de la localidad a crear"
+#: 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/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr "Administración de departamento"
+#: 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/country.tpl:14
-msgid "Name of country to create"
-msgstr "Nombre del país a crear"
+#: 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"
@@ -4336,59 +4103,23 @@ 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/acl/class_divListACL.inc:84
-msgid "Display acls matching"
-msgstr "Mostrar las acl que coincidan con"
-
-#: 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_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_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
+#, fuzzy
+msgid "Acl"
+msgstr "Acl"
 
-#: plugins/admin/acl/class_divListACL.inc:192
-msgid "Delete acl"
-msgstr "Eliminar acl"
+#: plugins/admin/acl/class_aclManagement.inc:154
+#, fuzzy
+msgid "ACL Assignment"
+msgstr "Administración de 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:743
+#: plugins/admin/acl/class_aclRole.inc:745
 msgid "Access control roles"
 msgstr "Roles de control de acceso"
 
@@ -4396,50 +4127,68 @@ msgstr "Roles de control de acceso"
 msgid "Edit AC roles"
 msgstr "Editar roles CA"
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 msgid "Reset ACL"
 msgstr "Eliminar ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 msgid "No ACL settings for this category"
 msgstr "No hay ACL configuradas en esta categoría"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACLs que tienen estos objetos: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 msgid "Edit category ACL"
 msgstr "Editar la categoría ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 msgid "Reset category ACL"
 msgstr "Eliminar la categoría ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, 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:666
+#: plugins/admin/acl/class_aclRole.inc:668
 msgid "Object in use"
 msgstr "Objeto en uso"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, 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:753
+#: 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
 msgid "Permissions"
 msgstr "Permisos"
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
-msgid "ACL management"
-msgstr "Administración de ACL"
+#: 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/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
@@ -4457,27 +4206,27 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Editar parámetros de usuarios administrativos"
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr "mujer"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr "hombre"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr "¡No se puede subir el archivo!"
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 msgid "Serial number"
 msgstr "Número serie"
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4485,236 +4234,233 @@ msgstr ""
 "(Algunos tipos de certificados no están soportados y pueden ser mostrados "
 "como no validos.)"
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, 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:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr "válido"
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr "no válido"
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 msgid "No certificate installed"
 msgstr "No hay certificados instalados"
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 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:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 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:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: 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:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Móvil"
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Buscapersonas"
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Fecha de nacimiento"
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 msgid "Cannot open certificate!"
 msgstr "¡No puedo abrir el certificado!"
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: 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:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Profesión"
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: 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:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: 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:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: 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:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: 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:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: 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:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Número de serie del certificado"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: 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:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: 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:1591
+#: plugins/personal/generic/class_user.inc:1598
 msgid "Generic user settings"
 msgstr "Parámetros genéricos del usuario"
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: plugins/personal/generic/class_user.inc:1601
-msgid "Surname"
-msgstr "Apellido"
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 msgid "User identification"
 msgstr "Identificación de Usuario"
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Título Personal"
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: 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:1608
-msgid "Gender"
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Foto del usuario"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: 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:1620
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Pager number"
 msgstr "Número del busca"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 msgid "Mobile number"
 msgstr "Teléfono móvil"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 msgid "Fax number"
 msgstr "Número de Fax"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 msgid "User password method"
 msgstr "Metodo de contraseña de usuario"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 msgid "User certificates"
 msgstr "Certificados de usuario"
 
@@ -4742,10 +4488,6 @@ 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"
@@ -4870,6 +4612,12 @@ 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"
@@ -4878,47 +4626,43 @@ msgstr "no puede cambiar la contraseña"
 msgid "password expired"
 msgstr "la contraseña expiró"
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr "Sin configurar"
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, 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:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, 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:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, 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:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, 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:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Tiempo de espera agotado esperando un bloqueo. ¡Ignorando bloqueo!"
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
@@ -4926,90 +4670,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:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: 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:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 msgid "shadowMin"
 msgstr "shadowMin"
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 msgid "shadowMax"
 msgstr "shadowMax"
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 msgid "shadowWarning"
 msgstr "shadowWarning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 msgid "shadowInactive"
 msgstr "shadowInactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 msgid "POSIX account"
 msgstr "Cuenta POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Identificador (ID) de usuario"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 msgid "Group ID"
 msgstr "Identificador (ID) de Grupo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 msgid "Force password change on login"
 msgstr "Forzar el cambio de contraseña al iniciar"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 msgid "Shadow warning"
 msgstr "Shadow warning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 msgid "Shadow inactive"
 msgstr "Shadow inactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 msgid "Shadow expire"
 msgstr "Shadow expire"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 msgid "System trust model"
 msgstr "Sistema de confianza"
 
@@ -5075,10 +4819,18 @@ 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"
@@ -5288,46 +5040,39 @@ msgid "Government mode"
 msgstr "Modo gubernamental"
 
 #: setup/setup_config2.tpl:123
-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"
+#, fuzzy
+msgid "GOsa logging"
+msgstr "GOsa"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 msgid "Mail settings"
 msgstr "Parámetros de correo"
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr "Método de correo"
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr "Modificar atributos existentes"
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 msgid "Vacation templates"
 msgstr "Plantillas de ausencia"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr "Usa estilo Cyrus UNIX"
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 msgid "Snapshots / Undo"
 msgstr "Instantaneas / Deshacer"
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 msgid "Enable snapshots"
 msgstr "Activar instantaneas"
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 msgid "Snapshot base"
 msgstr "Base de instantaneas"
 
@@ -5672,6 +5417,10 @@ 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."
@@ -6010,14 +5759,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:137
+#: setup/class_setupStep_Config2.inc:136
 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "No"
 msgstr "No"
 
@@ -6864,6 +6613,200 @@ 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"
 
@@ -6875,10 +6818,6 @@ 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"
 
@@ -6966,10 +6905,6 @@ msgstr "Automatico"
 #~ msgid "Heimdal options"
 #~ msgstr "Eliminar opciones"
 
-#, fuzzy
-#~ msgid "Minute"
-#~ msgstr "Impresora"
-
 #, fuzzy
 #~ msgid "Day"
 #~ msgstr "Mayo"
@@ -7038,10 +6973,6 @@ msgstr "Automatico"
 #~ msgid "Invalid"
 #~ msgstr "no válido"
 
-#, fuzzy
-#~ msgid "Sudo role"
-#~ msgstr "¡id desconocido!"
-
 #, fuzzy
 #~ msgid "Run as user"
 #~ msgstr "Usuarios del dominio"
@@ -7739,10 +7670,6 @@ msgstr "Automatico"
 #~ msgid "Reomve"
 #~ msgstr "Eliminar"
 
-#, fuzzy
-#~ msgid "GOsa ping"
-#~ msgstr "GOsa"
-
 #, fuzzy
 #~ msgid "Say hello"
 #~ msgstr "Shell"
index 7704198900d1d9ca76fda3256459060ce5393116..0f28f00791263eb2e6255c523e7efaad2d749839 100644 (file)
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: 2009-10-06 12:53+0200\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -33,19 +33,17 @@ msgstr "Filtres"
 #: 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -67,6 +65,7 @@ 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 ""
 "D'accord - si vous êtes sur - cliquez sur 'Supprimer' pour continuer ou sur "
@@ -78,15 +77,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr "Annuler"
@@ -109,15 +107,14 @@ 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 "Nom d'utilisateur"
 
 #: 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "Mot de passe"
 
@@ -265,7 +262,7 @@ msgstr "Membres disponibles"
 msgid "List message possible targets"
 msgstr "Liste les destinataires possibles pour les messages"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 msgid "Members"
 msgstr "Membres"
 
@@ -298,7 +295,7 @@ msgstr "Ancien mot de passe"
 #: 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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -311,9 +308,7 @@ msgid "Verify password"
 msgstr "Vérifier votre mot de passe"
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr "Modifier le mot de passe"
 
@@ -370,7 +365,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr "Objet"
 
@@ -417,47 +412,49 @@ msgstr "Raison pour la génération de cette copie instantanée"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.inc:596
 msgid "Continue"
 msgstr "Continuer"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: 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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -467,9 +464,9 @@ msgstr "Erreur"
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -498,8 +495,7 @@ msgid "Your password has been changed successfully."
 msgstr "Votre mot de passe à été changé avec succès."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -647,9 +643,9 @@ msgstr "Connecté:"
 msgid "GOsa main menu"
 msgstr "Menu Principal de GOsa"
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
 msgstr "Erreur Fatale"
 
@@ -663,17 +659,17 @@ msgstr "Le fichier de configuration %s/%s ne peut être lu. Abandon."
 #: 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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 msgid "Configuration error"
@@ -686,7 +682,7 @@ msgstr ""
 "Le répertoire '%s' spécifié comme répertoire de compilation est "
 "inaccessible !"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 msgid "Password method"
 msgstr "Format de stockage des mots de passe"
 
@@ -694,7 +690,7 @@ msgstr "Format de stockage des mots de passe"
 msgid "Error: Password method not available!"
 msgstr "Erreur: Méthode de changement de mot de passe non disponible!"
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -713,10 +709,11 @@ msgid "The password used as new is to short."
 msgstr "Le nouveau mot de passe ne comporte pas suffisamment de caractères."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: 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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -732,13 +729,14 @@ msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe."
 
 #: html/password.php:249
 msgid "External password changer reported a problem: "
-msgstr "Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
+msgstr ""
+"Le programme externe pour changer votre mot de passe à renvoyé une erreur: "
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr "La session ne sera pas cryptée."
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr "Démarrer une session SSL"
 
@@ -775,33 +773,37 @@ msgstr ""
 "annuaires !"
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: 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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -819,7 +821,8 @@ msgstr "Erreur LDAP"
 
 #: html/index.php:265
 msgid "Cannot detect information about the installed LDAP schema!"
-msgstr "Impossible de détecter les information sur les schémas LDAP installés !"
+msgstr ""
+"Impossible de détecter les information sur les schémas LDAP installés !"
 
 #: html/index.php:278
 msgid "Your LDAP setup contains old schema definitions:"
@@ -843,11 +846,11 @@ msgstr ""
 "Impossible de trouver l'information utilisateur pour l'authentification "
 "htaccess !"
 
-#: html/index.php:368
+#: html/index.php:369
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Compte verouillé. Veuillez contacter votre administrateur système !"
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -862,7 +865,8 @@ msgstr "Smarty"
 #: html/main.php:148
 #, php-format
 msgid "Cannot locate file '%s' - please run '%s' to fix this"
-msgstr "Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
+msgstr ""
+"Je n'ai pas trouvé '%s' - veuillez exécuter '%s' pour régler ce problème"
 
 #: html/main.php:167
 msgid "PHP configuration"
@@ -886,7 +890,8 @@ msgstr "Les vérifications des ACL de l'utilisateur ont été désactivés"
 
 #: html/main.php:339
 msgid "Your password is about to expire, please change your password!"
-msgstr "Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
+msgstr ""
+"Votre mot de passe va bientôt expirer, veuillez changer votre mot de passe !"
 
 #: html/main.php:349
 msgid "Plugin"
@@ -933,6 +938,50 @@ msgstr ""
 "Le répertoire d'aide '%s' n'est pas accessible, impossible de lire les "
 "fichiers d'aide."
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr "non configuré"
+
+#: include/class_management.inc:144
+#, fuzzy
+msgid "Filter error"
+msgstr "Erreur Fatale"
+
+#: 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 "Permissions"
+
+#: 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 "Erreur de permissions"
+
+#: include/class_management.inc:426 include/class_plugin.inc:1546
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+"Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %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 "Vous n'êtes pas autorisé à restaurer un copie instantanée de %s."
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr "Le module mcrypt n'as pas été trouvé. Veuillez installer php5-mycrypt."
@@ -954,7 +1003,7 @@ msgstr ""
 "passe !"
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -963,7 +1012,7 @@ msgstr ""
 "La fonctionnalité pour les copie instantanées est activée, mais la variable "
 "requise '%s' n'est pas configurée."
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -976,11 +1025,11 @@ msgstr ""
 msgid "Access control"
 msgstr "Contrôle d'accès"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr "Gestion de listes de contrôle d'accès (ACL)"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 msgid "All categories"
 msgstr "Toutes les catégories"
 
@@ -988,20 +1037,20 @@ msgstr "Toutes les catégories"
 msgid "Reset ACLs"
 msgstr "Remise à zéro des ACL"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 msgid "One level"
 msgstr "Un niveau"
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Current object"
 msgstr "Objet actuel"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 msgid "Complete subtree"
 msgstr "Sous arbre complet"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr "Le sous arbre complet (permanent)"
 
@@ -1009,56 +1058,54 @@ msgstr "Le sous arbre complet (permanent)"
 msgid "Use ACL defined in role"
 msgstr "Utiliser l'ACL définie dans le rôle"
 
-#: 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
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr "Groupes"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: 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
+#: 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
 msgid "Up"
 msgstr "Au dessus"
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "En bas"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr "Editer"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr ""
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr "Supprimer"
@@ -1081,7 +1128,7 @@ msgstr "ACL de la catégorie"
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr "Tout les objets dans le sous arbres actuel"
 
@@ -1121,13 +1168,13 @@ msgstr "L'objet au complet"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: 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
+#: 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
 msgid "Internal error"
 msgstr "Erreur interne"
 
@@ -1155,19 +1202,19 @@ msgstr "Rôle inconnu"
 msgid "Contains settings for these objects: %s"
 msgstr "Contient les paramètres pour ces objets: %s"
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 msgid "inactive"
 msgstr "inactif"
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 msgid "No members"
 msgstr "Aucun membres"
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 msgid "Access control list"
 msgstr "Contrôle d'accès (ACL)"
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 msgid "ACL roles"
 msgstr "Rôles ACL"
 
@@ -1176,48 +1223,38 @@ msgstr "Rôles ACL"
 msgid "Close"
 msgstr "Fermer"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 msgid "Go to root department"
 msgstr "Aller au département de base"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 msgid "Root"
 msgstr "Racine"
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 msgid "Go up one department"
 msgstr "Monter d'un département"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 msgid "Go to users department"
 msgstr "Aller au département des utilisateurs"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 msgid "Home"
 msgstr "Accueil"
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr "Recharger la liste"
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -1233,35 +1270,19 @@ msgstr ""
 "Le canal demandé n'existe pas ! Veuillez contacter votre administrateur "
 "système."
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 msgid "Choose a base"
 msgstr "Sélectionnez une base"
 
-#: 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 ""
-"Allez dans votre arbre préféré et cliquez sur sauver pour utiliser le sous "
-"arbre comme base.Ou cliquez sur l'image à la fin de chaque entrée."
-
-#: include/class_baseSelectDialog.inc:61
-msgid "Use"
-msgstr "Utilisation"
-
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1269,25 +1290,18 @@ msgstr "Utilisation"
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr ""
 
-#: include/class_baseSelectDialog.inc:68
-msgid "Filter entries with this syntax"
-msgstr "Filtrer les entrées avec cette syntaxe"
-
-#: 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
+#: include/class_listing.inc:298 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
@@ -1295,81 +1309,97 @@ msgstr "Filtrer les entrées avec cette syntaxe"
 msgid "Select all"
 msgstr "Sélectionner tout"
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 msgid "created by"
 msgstr "Crée par"
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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 ""
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr "Copier"
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr "Couper"
 
-#: 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
+#: 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
 msgid "Paste"
 msgstr "Coller"
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 msgid "Restore snapshots"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 msgid "Export list"
 msgstr "Exporter la liste"
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr "Créer un snapshot"
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr "Créer un nouveau snapshot depuis cet objet"
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:132
+msgid "Edit this entry"
+msgstr "Editer cette entrée"
+
+#: include/class_sortableListing.inc:133
+msgid "Delete this entry"
+msgstr "Supprimer cette entrée"
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 "Erreur fatale : pas d'emplacement défini pour les classes  - veuillez "
 "exécuter '%s' pour régler le problème"
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
-msgid "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
+msgid ""
+"Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 "Erreur fatale : impossible d'initialiser la classe '%s' - veuillez exécuter "
 "'%s' pour essayer de régler le problème"
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAL: Erreur lors de la connexion au serveur LDAP. Le serveur à répondu '%"
 "s'."
 
-#: include/functions.inc:399
+#: include/functions.inc:518
 msgid "Username / UID is not unique inside the LDAP tree!"
-msgstr "Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP !"
+msgstr ""
+"Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP !"
 
-#: include/functions.inc:474
+#: include/functions.inc:603
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -1377,11 +1407,11 @@ msgstr ""
 "Le nom de l'utilisateur / UID n'est pas unique dans votre annuaire LDAP. "
 "Veuillez contacter votre administrateur système."
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Erreur lors de l'ajout d'un verrou. Contactez les développeurs !"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1390,12 +1420,12 @@ msgstr ""
 "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. "
 "Veuillez contacter votre administrateur !"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Le serveur LDAP à retourné: %s"
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1403,12 +1433,12 @@ msgstr ""
 "Détection de verrou multiple pour un même objet. Ceci ne devrait pas "
 "arriver. Effacement des références multiples."
 
-#: include/functions.inc:1049
+#: include/functions.inc:1232
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "La taille limite de %d entrées est dépassée !"
 
-#: include/functions.inc:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1417,73 +1447,73 @@ msgstr ""
 "Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
 "toujours dépassée"
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Configurer"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr "incomplet"
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 msgid "Continue anyway"
 msgstr "Continuer malgré tout"
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 msgid "Edit anyway"
 msgstr "Éditer malgré tout"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Vous êtes sur le point d'éditer l'entrée(s) %s"
 
-#: include/functions.inc:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr "Entrées par page"
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Appliquer le filtre"
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Version de développement de GOsa (Rev %s)"
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "Le fichier '%s' ne peut pas être éffacé."
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 msgid "Cannot write to revision file!"
 msgstr "Impossible d'écrire le fichier de revision !"
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' n'est pas disponible. Utilisation de la base par défaut !"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "LDAP warning"
 msgstr "Avertissement LDAP"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Impossible de récupérer les informations sur les schémas depuis le serveur. "
 "Vérification des schémas impossibles !"
 
-#: include/functions.inc:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr "Utilisé pour stocker les informations spécifiques des comptes."
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1491,27 +1521,27 @@ msgstr ""
 "Utilisé pour verrouiller les entrées actuellement modifiées afin d'éviter de "
 "multiples changements simultanés."
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Object class obligatoire '%s' manquante !"
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Object class facultative '%s' manquante !"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "La version requise des object class ne correspond pas '%s' (!=%s) !"
 
-#: include/functions.inc:2309
+#: include/functions.inc:2764
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(s) disponible(s)"
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1520,7 +1550,7 @@ msgstr ""
 "serveur ldap' lors de l'installation, mais la configuration de vos schéma ne "
 "supportent pas cette option."
 
-#: include/functions.inc:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1528,7 +1558,7 @@ msgstr ""
 "Pour pouvoir utiliser des groupes conformes à la norme rfc2307bis, "
 "l'objectClass 'posixGroup' doit être       AUXILIARY"
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1537,105 +1567,107 @@ msgstr ""
 "avez désactivé cette option lors de l'étape 'configuration de l'annuaire "
 "ldap' du programme d'installation."
 
-#: include/functions.inc:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "L'objectClass 'posixGroup' doit être STRUCTURAL"
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr "Allemand"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr "Français"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr "Italien"
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr "Anglais"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 msgid "Polish"
 msgstr "Polonais"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 msgid "Chinese"
 msgstr "Chinois"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr "Russe"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, php-format
-msgid "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
+msgid ""
+"Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "La commande '%s', utilisée dans le POSTMODIFY de l'extension '%s' n'existe "
 "pas."
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr "Impossible de générer un hash samba !"
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
-msgid "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
+msgid ""
+"Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 "Impossible de générer le mot de passe samba: l'exécution de '%s' à échoué, "
 "veuillez vérifier le paramètre 'sambaHashHook'!"
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr "Impossible d'assigner un ID libre :"
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr "Méthode d'allocation des id inconnue !"
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Impossible de créer l'entrée sambaUnixIdPool !"
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool n'est pas unique !"
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 msgid "no ID available!"
 msgstr "Pas d' ID disponibles !"
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr "Nombre maximum d'essais dépassés !"
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 msgid "Cannot allocate a free ID!"
 msgstr "Impossible d'assigner un ID libre !"
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
@@ -1644,35 +1676,37 @@ msgstr ""
 "Pas de définition de plugin pour l'initialisation de '%s', veuillez vérifier "
 "votre fichier de configuration."
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "L'effacement à été interrompu par l'extension '%s': %s"
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr "Références"
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Vous êtes sur le point de supprimer le snapshot '%s'."
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 msgid "Remove snapshot"
 msgstr "Supprimer le snapshot"
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1688,8 +1722,11 @@ msgstr ""
 #: 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr ""
 
@@ -1799,7 +1836,7 @@ msgstr "Type"
 msgid "Arguments"
 msgstr "Arguments"
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
@@ -1813,50 +1850,29 @@ msgstr ""
 "Cet objet à changer depuis son ouverture dans GOsa. Tout les changement "
 "éffectués par les autres seront perdus si vous sauvez cette entrée !"
 
-#: 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 "Permissions"
-
-#: include/class_plugin.inc:1547
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Vous n'êtes pas autorisé à créer une nouvelle copie instantanée pour %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 "Vous n'êtes pas autorisé à restaurer un copie instantanée de %s."
-
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr "Changement du dn de l'acl"
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "from"
 msgstr "de"
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr "vers"
 
-#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 msgid "Restore"
 msgstr "Restaurer"
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 msgid "cut"
 msgstr "couper"
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr "copier"
 
@@ -2088,7 +2104,8 @@ msgstr "Impossible d'exécuter '%s' de la commande (%s) pour l'extension %s !"
 #: include/utils/class_msgPool.inc:225
 #, php-format
 msgid "Cannot execute '%s' command for plugin %s!"
-msgstr "Impossible d'exécuter l'option '%s' de la commande pour l'extension %s !"
+msgstr ""
+"Impossible d'exécuter l'option '%s' de la commande pour l'extension %s !"
 
 #: include/utils/class_msgPool.inc:227
 #, php-format
@@ -2200,7 +2217,8 @@ msgstr "Ce compte n'a pas d'extensions %s valides !"
 
 #: include/utils/class_msgPool.inc:382
 #, php-format
-msgid "This account has %s settings enabled. You can disable them by clicking below."
+msgid ""
+"This account has %s settings enabled. You can disable them by clicking below."
 msgstr ""
 "Ce compte possède l'extension %s activée. Vous pouvez la supprimer en "
 "cliquant sur le bouton ci-dessous."
@@ -2216,7 +2234,8 @@ msgstr ""
 
 #: include/utils/class_msgPool.inc:401
 #, php-format
-msgid "This account has %s settings disabled. You can enable them by clicking below."
+msgid ""
+"This account has %s settings disabled. You can enable them by clicking below."
 msgstr ""
 "Ce compte possède %s paramètres desactivés. Vous pouvez les activer en "
 "clicquant ci dessous."
@@ -2450,42 +2469,43 @@ msgstr ""
 "Impossible d'initialiser la classe '%s' ! Peut être manque t'il une "
 "extension dans votre installation de GOsa ?"
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Avertissement de performance"
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 "La performance de votre annuaire est faible : la dernière requête à duré "
 "%.2fs !"
 
-#: include/class_ldap.inc:665
+#: include/class_ldap.inc:692
 #, php-format
-msgid "Cannot automatically create subtrees with RDN '%s': no object class found!"
+msgid ""
+"Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 "Impossible de créer automatiquement des sous arbres avec le RDN '%s': object "
 "class non trouvé !"
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:740
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 "Impossible de créer automatiquement des sous arbres avec le RDN '%s': non "
 "supporté"
 
-#: include/class_ldap.inc:800
+#: include/class_ldap.inc:827
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "lors de l'opération sur '%s' en utilisant le serveur LDAP '%s'"
 
-#: include/class_ldap.inc:802
+#: include/class_ldap.inc:829
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "lors de l'opération sur le serveur LDAP %s"
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2494,87 +2514,65 @@ msgstr ""
 "Ceci n'est pas un DN valide: '%s'. Le fichier d'importation doit commencer "
 "avec 'dn: ...' à la ligne %s"
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Erreur lors de l'importation du dn: '%s', veuillez vérifier votre fichier "
 "votre fichier LDIF à partir de la ligne %s !"
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Echec du Journal système : %s"
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr "Option %s non valide !"
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 msgid "Specified objectType is empty or invalid!"
 msgstr "Le type d'objet spécifié est vide ou invalide !"
 
-#: include/class_log.inc:139
-msgid "MySQL error"
-msgstr "Erreur MySQL"
-
-#: include/class_log.inc:139
-#, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr ""
-"Les journaux systèmes envoyés vers la base de donnée MySQL seront désactivé "
-"pour le serveur '%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 "Journaux systèmes stockés dans un base de données MySQL"
-
-#: include/class_log.inc:219
-#, php-format
-msgid "Cannot add location to the database!"
-msgstr "Impossible d'ajouter un emplacement à la base de données !"
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr "GOsa support Service"
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 msgid "Cannot not parse XML!"
 msgstr "Impossible de lire le contenu du fichier XML"
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Impossible d'envoyer l'evènement annuler pour l'entrée '%s' !"
 
-#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Impossible d'enlever l'entrée %s !"
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Erreur XML dans gosa.conf: %s à la ligne %d"
 
-#: include/class_config.inc:270
+#: include/class_config.inc:317
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Impossible de se connecter à l'annuaire LDAP. Veuillez contacter "
 "l'administrateur du système."
 
-#: include/class_config.inc:636
+#: include/class_config.inc:694
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "sambaSID et/ou sambaRidBase absents de votre configuration !"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid "Configuration"
 msgstr ""
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2597,44 +2595,44 @@ msgstr ""
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: 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: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
 #, php-format
 msgid "Copy and paste failed!"
 msgstr "Le copier/coller à échoué !"
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "Impossible d'attribuer les permissions pour '%s'"
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr "'%s' n'est pas un objet LDAP valide"
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, php-format
 msgid "No write permission in '%s'"
 msgstr "Pas de permissions d'écriture dans '%s'"
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr "Ces objets seront collés : %s"
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr "Cet objet sera collé : %s"
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 msgid "Cannot paste"
 msgstr "Impossible de coller"
 
@@ -2644,11 +2642,11 @@ msgstr "Veuillez fixer l'erreur ci dessus et recharger la page."
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Informations"
@@ -2659,32 +2657,26 @@ msgid "UNIX"
 msgstr ""
 
 #: 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr "Messagerie"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr ""
 
@@ -2693,34 +2685,34 @@ msgid "FTP"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr "Groupes"
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr "Département"
 
 #: plugins/generic/references/class_reference.inc:61
-#: 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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2729,14 +2721,13 @@ msgid "Phone"
 msgstr "Téléphone"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr "Applications"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Serveur"
 
@@ -2745,19 +2736,17 @@ msgid "Thin Client"
 msgstr "Clients légers"
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr "Stations de travail"
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Groupes d'objets"
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr "Imprimante"
 
@@ -2801,7 +2790,13 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "L'équipe de GOsa"
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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 "Mise à jour"
+
+#: plugins/admin/ogroups/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -2810,247 +2805,36 @@ msgstr ""
 "seront perdues étant donné qu'il est impossible pour GOsa de récupérer vos "
 "données."
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "List of object groups"
-msgstr "Liste des groupes d'objets"
-
-#: 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 "Propriétés"
-
-#: 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 ""
-
-#: 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 "Afficher %s"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-msgid "user groups"
-msgstr "groupes d'utilisateurs"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-msgid "nested groups"
-msgstr "groupes imbriqués"
-
-#: 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 "groupes d'applications"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-msgid "department groups"
-msgstr "groupes de départements"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-msgid "server groups"
-msgstr "groupes de serveurs"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-msgid "workstation groups"
-msgstr "groupes de stations de travail"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-msgid "windows workstation groups"
-msgstr "groupes de stations windows"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-msgid "terminal groups"
-msgstr "groupes de terminaux"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-msgid "printer groups"
-msgstr "groupes d'imprimantes"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-msgid "phone groups"
-msgstr "groupes de téléphones"
-
-#: 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 "Expression régulière correspondant à des noms de groupe"
-
-#: 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 "Soumettre le département"
-
-#: 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 "Créer"
-
-#: 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 "Supprimer"
-
-#: 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 "éditer"
-
-#: 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 "Editer cette entrée"
-
-#: 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 "supprimer"
-
-#: 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 "Supprimer cette entrée"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-msgid "Number of listed object groups"
-msgstr "Nombre de groupe d'objets affichés"
-
-#: 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 "Nombre de département listés"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroup.inc:1117
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr "Groupes d'objets"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 msgid "Manage object groups"
 msgstr "Gestion des groupe d'objets"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 msgid "Infrastructure error"
 msgstr "Erreur d'infrastructure"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-msgid "object group"
-msgstr "Groupes d'objets"
-
-#: 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 "Erreur de permissions"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 msgid "Templates"
 msgstr "Modèles"
 
-#: 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
+#: 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
 msgid "User"
 msgstr "Utilisateur"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 msgid "Windows Install"
 msgstr "Installation Windows"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 msgid "Terminal"
 msgstr ""
 
@@ -3066,6 +2850,19 @@ msgstr ""
 msgid "departments"
 msgstr "départements"
 
+#: 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 "Afficher %s"
+
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 msgid "people"
@@ -3117,7 +2914,9 @@ msgid "applications"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr "aucun"
 
@@ -3135,20 +2934,20 @@ msgstr "Stations Windows"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "désactivé"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 msgid "full access"
 msgstr "accès complet"
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr "permettre l'accès a ces hôtes"
 
@@ -3168,22 +2967,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3211,13 +3005,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Nom"
@@ -3271,7 +3071,7 @@ msgid "Select a base"
 msgstr "Sélectionnez une base"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Système de Confiance"
@@ -3309,10 +3109,9 @@ msgid "FAI summary"
 msgstr "Sommaire FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr "Environnement"
 
@@ -3324,36 +3123,137 @@ msgstr "Applications"
 msgid "Please enter the new object group name"
 msgstr "Veuillez entrer un nouveau nom pour le groupe d'objet"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Sélectionnez les objets à ajouter"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
-msgid "Display objects of department"
-msgstr "Afficher les objets du département"
+#: 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 "Filtres"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-#: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-msgid "Choose the department the search will be based on"
-msgstr "Sélectionner le département où sera effectuée la recherche"
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+msgid "user groups"
+msgstr "groupes d'utilisateurs"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
-msgid "Display objects matching"
-msgstr "Afficher les objets correspondants"
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+msgid "nested groups"
+msgstr "groupes imbriqués"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-msgid "Regular expression for matching object names"
-msgstr "Expression régulière pour trouver les objets correspondants"
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+msgid "application groups"
+msgstr "groupes d'applications"
 
-#: plugins/admin/ogroups/trust_machines.tpl:6
-#: plugins/admin/groups/trust_machines.tpl:6
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Sélectionner les hôtes à ajouter"
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+msgid "department groups"
+msgstr "groupes de départements"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+msgid "server groups"
+msgstr "groupes de serveurs"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+msgid "workstation groups"
+msgstr "groupes de stations de travail"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+msgid "windows workstation groups"
+msgstr "groupes de stations windows"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+msgid "terminal groups"
+msgstr "groupes de terminaux"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+msgid "printer groups"
+msgstr "groupes d'imprimantes"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+msgid "phone groups"
+msgstr "groupes de téléphones"
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+msgid "List of object groups"
+msgstr "Liste des groupes d'objets"
+
+#: 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 "Propriétés"
+
+#: 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 "Créer"
+
+#: 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 "Supprimer"
+
+#: 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 "Groupes d'objets"
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+#, fuzzy
+msgid "Remove object group"
+msgstr "groupes de serveurs"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Sélectionnez les objets à ajouter"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr "Afficher les objets du département"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/trust_machines.tpl:27
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+msgid "Choose the department the search will be based on"
+msgstr "Sélectionner le département où sera effectuée la recherche"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:40
+msgid "Display objects matching"
+msgstr "Afficher les objets correspondants"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+msgid "Regular expression for matching object names"
+msgstr "Expression régulière pour trouver les objets correspondants"
+
+#: plugins/admin/ogroups/trust_machines.tpl:6
+#: plugins/admin/groups/trust_machines.tpl:6
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Sélectionner les hôtes à ajouter"
 
 #: plugins/admin/ogroups/trust_machines.tpl:26
 #: plugins/admin/groups/trust_machines.tpl:26
@@ -3399,7 +3299,6 @@ msgid "Display users of department"
 msgstr "Afficher les utilisateurs du département"
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr "Afficher les utilisateurs correspondants"
 
@@ -3463,72 +3362,21 @@ msgstr "dans tout les groupes"
 msgid "Not in all groups"
 msgstr "pas dans tout les groupes"
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
-msgstr "Liste des groupes"
-
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
-msgstr ""
-"Sélectionnez afin d'afficher les groupes qui sont les groupes principaux "
-"d'utilisateurs"
-
-#: plugins/admin/groups/class_divListGroup.inc:85
-msgid "primary groups"
+#: plugins/admin/groups/group-filter.tpl:11
+#, fuzzy
+msgid "Show primary groups"
 msgstr "groupes principaux"
 
-#: plugins/admin/groups/class_divListGroup.inc:86
-msgid "samba groups mappings"
-msgstr "correspondance des groupes samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-msgid "samba groups"
+#: plugins/admin/groups/group-filter.tpl:12
+#, fuzzy
+msgid "Show samba groups"
 msgstr "groupes Samba"
 
-#: plugins/admin/groups/class_divListGroup.inc:88
-msgid "application settings"
-msgstr "paramètres des applications"
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-msgid "mail settings"
-msgstr "paramètres de messagerie"
-
-#: plugins/admin/groups/class_divListGroup.inc:91
-msgid "mail groups"
+#: plugins/admin/groups/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
 msgstr "groupes de messagerie"
 
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr ""
-"Sélectionnez afin d'afficher les groupes normaux ayant uniquement un aspect "
-"fonctionnel"
-
-#: plugins/admin/groups/class_divListGroup.inc:93
-msgid "functional groups"
-msgstr "groupes fonctionnels"
-
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr "Utilisateur dont on montre les groupes"
-
-#: plugins/admin/groups/class_divListGroup.inc:188
-#: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:206
-msgid "Posix"
-msgstr ""
-
-#: 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 "Non autorisé"
-
-#: plugins/admin/groups/class_divListGroup.inc:303
-msgid "Number of listed groups"
-msgstr "Nombre de groupes affichés"
-
 #: plugins/admin/groups/class_groupGeneric.inc:161
 msgid "Cannot find group SID in your configuration!"
 msgstr "Impossible de trouver le SID de ce groupe dans votre configuration !"
@@ -3575,54 +3423,55 @@ msgstr "! identifiant inconnu"
 #: plugins/admin/groups/class_groupGeneric.inc:745
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
-msgstr "La recherche à retourné trop de résultats. Je n'affiche que %s entr§es !"
+msgstr ""
+"La recherche à retourné trop de résultats. Je n'affiche que %s entr§es !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Impossible de trouver le SID pour '%s' !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Impossible de trouver le RIDBASe pour '%s' !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr "L'identifiant de groupe '%s' est déjà utilisé par '%s' !"
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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 ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 msgid "Generic group settings"
 msgstr "Préférences des groupes génériques"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 msgid "Samba group type"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 msgid "Samba domain name"
 msgstr "Domaine Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 msgid "Phone pickup group"
 msgstr "Groupe téléphonique"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 msgid "Nagios group"
 msgstr "Groupe Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 msgid "Group member"
 msgstr "Membre du groupe"
 
@@ -3630,178 +3479,72 @@ msgstr "Membre du groupe"
 msgid "Group settings"
 msgstr "Préférences des groupes"
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
-msgid "Group administration"
-msgstr "Administration du groupe"
-
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr "Gestion des groupes POSIX"
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-msgid "group"
-msgstr "groupe"
-
-#: 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 ""
-"Cela inclut toutes les données des comptes, les droits d'accès, la "
-"configuration imap,etc. pour cet utilisateur. Veuillez vous assurez que vous "
-"voulez effectuez cette opération étant donné qu'il est impossible pour GOsa "
-"de récupérer vos données."
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr "Administration des utilisateurs"
-
-#: 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 "Liste des utilisateurs"
-
-#: 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 "Modèle"
-
-#: plugins/admin/users/class_divListUsers.inc:85
-msgid "templates"
-msgstr "modèles"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "GOsa object"
-msgstr "Objet GOsa"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "functional users"
-msgstr "utilisateurs fonctionnels"
-
-#: plugins/admin/users/class_divListUsers.inc:87
-msgid "POSIX users"
-msgstr "Utilisateurs Posix"
-
-#: plugins/admin/users/class_divListUsers.inc:88
-msgid "mail users"
-msgstr "utilisateurs de la messagerie"
-
-#: plugins/admin/users/class_divListUsers.inc:89
-msgid "samba users"
-msgstr "utilisateurs du domaine"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Liste des groupes"
 
-#: plugins/admin/users/class_divListUsers.inc:90
-msgid "proxy users"
-msgstr "utilisateurs du proxy"
+#: plugins/admin/groups/group-list.xml:138
+#, fuzzy
+msgid "Edit group"
+msgstr "groupes d'imprimantes"
 
-#: plugins/admin/users/class_divListUsers.inc:93
-msgid "phone users"
-msgstr "utilisateurs des téléphones"
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "groupes de serveurs"
 
-#: 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 "Appliquer le modèle"
+#: plugins/admin/groups/class_groupManagement.inc:26
+msgid "Group administration"
+msgstr "Administration du groupe"
 
-#: plugins/admin/users/class_divListUsers.inc:204
-msgid "GOsa"
+#: plugins/admin/groups/class_groupManagement.inc:155
+msgid "Posix"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:205
-#: plugins/admin/users/class_userManagement.inc:1067
-msgid "Edit generic properties"
-msgstr "Modifier les propriétés de base"
-
-#: plugins/admin/users/class_divListUsers.inc:207
-msgid "Edit UNIX properties"
-msgstr "Modifier les propriétés UNIX"
-
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
-msgid "Edit environment properties"
-msgstr "Modifier les propriétés d'environnement"
+#: plugins/admin/groups/class_groupManagement.inc:156
+#, fuzzy
+msgid "Edit posix properties"
+msgstr "Modifier les propriétés téléphoniques"
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 msgid "Edit mail properties"
 msgstr "Modifier les propriétés de messagerie"
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1095
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:750
+msgid "Edit samba properties"
+msgstr "Modifier les propriétés samba"
+
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
 msgid "Edit phone properties"
 msgstr "Modifier les propriétés téléphoniques"
 
-#: 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"
+#: plugins/admin/groups/class_groupManagement.inc:187
+msgid "Menu"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:215
-msgid "Edit fax properies"
-msgstr "Modifier les propriétés fax"
-
-#: plugins/admin/users/class_divListUsers.inc:217
-#: plugins/admin/users/class_userManagement.inc:1079
-msgid "Edit samba properties"
+#: plugins/admin/groups/class_groupManagement.inc:188
+#, fuzzy
+msgid "Edit start menu properties"
 msgstr "Modifier les propriétés samba"
 
-#: plugins/admin/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/users/class_userManagement.inc:1083
-msgid "Edit netatalk properties"
-msgstr "Modifier les propriétés de Netatalk"
-
-#: plugins/admin/users/class_divListUsers.inc:220
-msgid "Create user from template"
-msgstr "Créer un nouvel utilisateur depuis un modèle"
-
-#: plugins/admin/users/class_divListUsers.inc:221
-msgid "Create user with this template"
-msgstr "Créer un nouvel utilisateur avec ce modèle"
-
-#: 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 "actif"
-
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
-msgid "user"
-msgstr "utilisateurs"
-
-#: plugins/admin/users/class_divListUsers.inc:274
-msgid "password"
-msgstr "mot de passe"
-
-#: plugins/admin/users/class_divListUsers.inc:287
-msgid "Delete user"
-msgstr "Supprimer un utilisateur"
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:758
+msgid "Edit environment properties"
+msgstr "Modifier les propriétés d'environnement"
 
-#: plugins/admin/users/class_divListUsers.inc:376
-msgid "Number of listed users"
-msgstr "Nombre d'utilisateurs listés"
+#: 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 ""
+"Cela inclut toutes les données des comptes, les droits d'accès, la "
+"configuration imap,etc. pour cet utilisateur. Veuillez vous assurez que vous "
+"voulez effectuez cette opération étant donné qu'il est impossible pour GOsa "
+"de récupérer vos données."
 
 #: plugins/admin/users/password.tpl:4
 msgid ""
@@ -3851,6 +3594,13 @@ msgstr ""
 "modèles. De nombreuses informations seront ainsi remplies automatiquement. "
 "Sélectionnez 'aucun' afin de ne pas utiliser les modèles."
 
+#: 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 "Modèle"
+
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
@@ -3861,90 +3611,111 @@ msgstr "Nom de famille"
 msgid "First name"
 msgstr "Prénom"
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 msgid "Manage users"
 msgstr "Gèrer les utilisateurs"
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 msgid "You have no permission to change this users password!"
 msgstr ""
 "Vous n'avez pas l'autorisation pour changer le mot de passe de ce(s) "
 "utilisateurs !"
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr "Vous n'avez pas l'autorisation pour modifier l'objet '%s' !"
-
-#: plugins/admin/users/class_userManagement.inc:559
-msgid "You have no permission to use this template!"
-msgstr "Vous n'avez pas l'autorisation pour utiliser ce modèle !"
+#: 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 "Prénom"
 
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 msgid "Account locking"
 msgstr "Verrouillage du compte"
 
-#: plugins/admin/users/class_userManagement.inc:662
-msgid "You have no permission to change the lock status for this user!"
-msgstr ""
-"Vous n'avez pas l'autorisation pour changer le verrouillage de cet "
-"utilisateur !"
-
-#: plugins/admin/users/class_userManagement.inc:681
-#, php-format
-msgid "Password method '%s' does not support locking. Account has not been locked!"
+#: plugins/admin/users/class_userManagement.inc:650
+#, fuzzy, php-format
+msgid ""
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 "La méthode '%s' ne permet pas le verrouillage du mot de passe. Le compte n'a "
 "pas été verrouillé !"
 
-#: 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 "Prénom"
-
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:723
 msgid "Unlock account"
 msgstr "Déverrouiller le compte"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 msgid "Lock account"
 msgstr "Verrouiller Compte"
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+msgid "Edit generic properties"
+msgstr "Modifier les propriétés de base"
+
+#: 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
 msgid "POSIX"
 msgstr "UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 msgid "Edit POSIX properties"
 msgstr "Modifier les propriétés UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:753
+msgid "Netatalk"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:754
+msgid "Edit netatalk properties"
+msgstr "Modifier les propriétés de Netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "Edit FAX properties"
 msgstr "Modifier les propriétés FAX"
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Liste des utilisateurs"
+
 #: plugins/admin/users/user-list.xml:49
-msgid "Name / Department"
-msgstr "Nom / Département"
+#: plugins/personal/generic/class_user.inc:1608
+msgid "Surname"
+msgstr "Nom de famille"
+
+#: plugins/admin/users/user-list.xml:140
+#, fuzzy
+msgid "Lock users"
+msgstr "Liste des utilisateurs"
+
+#: plugins/admin/users/user-list.xml:148
+#, fuzzy
+msgid "Unlock users"
+msgstr "utilisateurs de la messagerie"
+
+#: plugins/admin/users/user-list.xml:167
+msgid "Apply template"
+msgstr "Appliquer le modèle"
 
-#: plugins/admin/users/user-list.xml:175
+#: plugins/admin/users/user-list.xml:199
+#, fuzzy
+msgid "New user from template"
+msgstr "Créer un nouvel utilisateur depuis un modèle"
+
+#: plugins/admin/users/user-list.xml:213
 msgid "Edit user"
 msgstr "Editer cet utilisateur"
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 msgid "Remove user"
 msgstr "Suppression de l'utilisateur"
 
@@ -3957,15 +3728,17 @@ msgid "Show functional users"
 msgstr "montrer les utilisateurs fonctionnels"
 
 #: plugins/admin/users/user-filter.tpl:13
-msgid "Show mail users"
-msgstr "Montrer les utilisateurs de la messagerie"
-
-#: plugins/admin/users/user-filter.tpl:14
 msgid "Show POSIX users"
 msgstr "Montrer les utilisateurs Posix"
 
+#: plugins/admin/users/user-filter.tpl:14
+#, fuzzy
+msgid "Show Mail users"
+msgstr "Montrer les utilisateurs de la messagerie"
+
 #: plugins/admin/users/user-filter.tpl:15
-msgid "Show samba users"
+#, fuzzy
+msgid "Show Samba users"
 msgstr "Montrer les utilisateurs samba"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -3984,10 +3757,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr "Pas de modèles disponibles !"
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr "Mise à jour"
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -3998,7 +3767,7 @@ msgstr ""
 "vérifier si vous voulez réaliser cette opération étant donné qu'il est "
 "impossible pour GOsa de récupérer vos données."
 
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
+#: plugins/admin/departments/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 "
@@ -4008,111 +3777,49 @@ msgstr ""
 "fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour "
 "continuer ou 'Annuler' pour abandonner."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-"Impossible de trouver un marqueur libre pour marquer l'entité "
-"administrative !"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Marquer '%s'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr "Bouger '%s' vers '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr "Impossible de copier %s, arrêt de l'opération"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:610
-#: plugins/admin/departments/class_departmentGeneric.inc:615
-#: plugins/admin/departments/class_departmentManagement.inc:26
-msgid "Departments"
-msgstr "Départements"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Liste des départements"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
-msgid "Department name"
-msgstr "Nom du département"
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:175
+msgid "Domain"
+msgstr "Domaine"
 
-#: 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 "Catégorie"
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Objet Domaine"
 
-#: 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 "Département"
+#: 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 "Pays"
 
-#: 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"
+#: 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 "Lieu"
 
-#: 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 "Adresse"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr "Téléphone"
-
-#: 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 "Paramètres administratifs"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "L'objet '%s' est déjà marqué"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Ajouter une marque (%s) à l'objet '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Suppression de la marque de l'objet '%s'"
+#: 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 "Entreprise"
 
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -4143,6 +3850,21 @@ msgstr ""
 "Sélectionnez la branche de l'annuaire dans laquelle sera placée le "
 "département"
 
+#: 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 "Paramètres administratifs"
+
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -4165,11 +3887,41 @@ msgstr "Nom de la branche à créer"
 msgid "Descriptive text for   department"
 msgstr "Description du département"
 
+#: 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 "Catégorie"
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr "Catégorie pour cette branche de l'annuaire"
 
+#: 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 "Lieu"
+
+#: 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 "Département"
+
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
 msgid "State where this subtree is located"
@@ -4180,6 +3932,16 @@ msgstr "Lieu où est située cette branche de l'annuaire"
 msgid "Location of this subtree"
 msgstr "Lieu de cette branche"
 
+#: 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 "Adresse"
+
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -4190,6 +3952,20 @@ msgstr "Adresse postale de cette branche"
 msgid "Base telephone number of this subtree"
 msgstr "Numéro de téléphone de base pour cette sous-branche"
 
+#: 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 ""
+
 #: plugins/admin/departments/generic.tpl:99
 #: plugins/admin/departments/organization.tpl:99
 msgid "Base facsimile telephone number of this subtree"
@@ -4197,76 +3973,38 @@ msgstr "Numéro de fax de base pour cette sous-branche"
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 msgid "Domain Component"
 msgstr "Objet Domaine"
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr "Liste des départements"
-
-#: plugins/admin/departments/class_divListDepartment.inc:73
-msgid "Regular expression for matching department names"
-msgstr "Expression régulière pour faire correspondre les départements"
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/class_department.inc:615
+msgid "Departments"
+msgstr "Départements"
 
-#: plugins/admin/departments/class_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 msgid "Manage Departments"
 msgstr "Gérer les départements"
 
-#: 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 ""
-"Dès que l'opération de déplacement est finie, vous pouvez aller à la fin de "
-"la page et appuyer sur 'Continuer' pour accèder à la gestion des "
-"départements."
-
-#: 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 "
-"management dialog."
-msgstr ""
-"Dès que l'opération de marquage est finie, vous pouvez aller à la fin de la "
-"page et "
-
-#: plugins/admin/departments/class_departmentManagement.inc:556
-msgid "Domain"
-msgstr "Domaine"
-
-#: plugins/admin/departments/class_departmentManagement.inc:580
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Pays"
-
-#: plugins/admin/departments/class_departmentManagement.inc:592
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
-msgstr "Lieu"
-
-#: 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 "Entreprise"
+#: plugins/admin/departments/class_departmentManagement.inc:126
+#, fuzzy
+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 "
+"management dialog."
+msgstr ""
+"Dès que l'opération de marquage est finie, vous pouvez aller à la fin de la "
+"page et "
 
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 msgid "Organization name"
 msgstr "Nom de l'entreprise"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Postal address"
 msgstr "Adresse postale"
 
@@ -4287,14 +4025,54 @@ msgstr "Nom du domaine"
 msgid "Name of domain to create"
 msgstr "Nom du domaine à créer"
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr "Gestion des départements"
-
 #: plugins/admin/departments/country.tpl:14
 msgid "Name of country to create"
 msgstr "Nom du pays à créer"
 
+#: plugins/admin/departments/class_department.inc:386
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr ""
+"Impossible de trouver un marqueur libre pour marquer l'entité "
+"administrative !"
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr "Marquer '%s'."
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr "Bouger '%s' vers '%s'"
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr "Impossible de copier %s, arrêt de l'opération"
+
+#: plugins/admin/departments/class_department.inc:618
+msgid "Department name"
+msgstr "Nom du département"
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr "Téléphone"
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr "L'objet '%s' est déjà marqué"
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr "Ajouter une marque (%s) à l'objet '%s'"
+
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr "Suppression de la marque de l'objet '%s'"
+
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr "Opération en cours"
@@ -4339,59 +4117,22 @@ msgstr ""
 "Avant de confirmer cette action, vérifiez que tout se passera comme prévu, "
 "la meilleure solution est probablement une sauvegarde."
 
-#: 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."
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
+msgid "Acl"
 msgstr ""
-"Cela inclut tout les systèmes et les informations de configuration. Veuillez "
-"vérifier que vous voulez effectuer cette opération étant donné qu'il est "
-"impossible pour GOsa de récupérer vos données."
-
-#: plugins/admin/acl/class_aclManagement.inc:290
-msgid "ACL role"
-msgstr "Rôles ACL"
 
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-msgid "List of acls"
-msgstr "Liste des acls"
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr "Sommaire"
-
-#: plugins/admin/acl/class_divListACL.inc:84
-msgid "Display acls matching"
-msgstr "Afficher les acls correspondantes"
-
-#: 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 "Rôle"
-
-#: plugins/admin/acl/class_divListACL.inc:165
-msgid "Edit acl role"
-msgstr "Editer un rôle acl"
-
-#: plugins/admin/acl/class_divListACL.inc:185
-msgid "Edit acl"
-msgstr "Editer un acl"
-
-#: plugins/admin/acl/class_divListACL.inc:192
-msgid "Delete acl"
-msgstr "Effacer un acl"
+#: plugins/admin/acl/class_aclManagement.inc:154
+#, fuzzy
+msgid "ACL Assignment"
+msgstr "Gestion des ACL"
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
 msgid "ACL Templates"
 msgstr "Modèles des ACL"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:745
 msgid "Access control roles"
 msgstr "Contrôle d'accès (ACL)"
 
@@ -4399,48 +4140,67 @@ msgstr "Contrôle d'accès (ACL)"
 msgid "Edit AC roles"
 msgstr "Editer le rôles (ACL)"
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 msgid "Reset ACL"
 msgstr "Remise à zéro des ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 msgid "No ACL settings for this category"
 msgstr "Pas d'ACL pour cette catégorie"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACL pour ces objets: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 msgid "Edit category ACL"
 msgstr "Editer les catégories ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 msgid "Reset category ACL"
 msgstr "Remettre à zéro les catégories ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Editer l'ACL pour '%s', l'étendue est '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 msgid "Object in use"
 msgstr "Objet utilisé"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
-msgstr "Ce rôle ne peut pas être supprimé car il est encore utilisé par ces objets :"
+msgstr ""
+"Ce rôle ne peut pas être supprimé car il est encore utilisé par ces objets :"
+
+#: 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 "Rôle"
 
-#: plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/class_aclRole.inc:755
 msgid "Permissions"
 msgstr "Permissions"
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
-msgid "ACL management"
-msgstr "Gestion des ACL"
+#: plugins/admin/acl/acl-list.xml:11
+msgid "List of acls"
+msgstr "Liste des acls"
+
+#: plugins/admin/acl/acl-filter.tpl:11
+#, fuzzy
+msgid "Show access control lists"
+msgstr "Contrôle d'accès (ACL)"
+
+#: plugins/admin/acl/acl-filter.tpl:12
+#, fuzzy
+msgid "Show roles"
+msgstr "Afficher %s"
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
@@ -4458,29 +4218,29 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Editer les paramètres organisationnels de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 "Veuillez ajouter une adresse IP ou une combinaison réseau/masque de sous "
 "réseau !"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr "féminin"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr "masculin"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr "Impossible de télécharger le fichier !"
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 msgid "Serial number"
 msgstr "Numéro de série"
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4488,241 +4248,239 @@ msgstr ""
 "(Certains types de certificats ne sont pas supportés et peuvent être "
 "affichés comme 'non valides'.)"
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Le certificat est valide de %s à %s et est actuellement %s."
 
-#: plugins/personal/generic/class_user.inc:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr "valide"
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr "invalide"
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 msgid "No certificate installed"
 msgstr "Pas de certificat installé"
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 msgid "The selected password method is no longer available."
 msgstr ""
 "Le format de stockage sélectionné pour les mots de passe n'est plus "
 "disponible."
 
-#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 "Impossible de construire le RDN: pas de + autorisé dans la construction d'un "
 "sous RDN !"
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr "Impossible de construire un RDN: l'attribut n'est pas défini !"
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 "Imposible de contruire un RDN: les paramètres de l'attribut sont non "
 "valides !"
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 msgid "The selected password method requires initial configuration!"
-msgstr "Le format de stockage sélectionné nécessite une configuration de base !"
+msgstr ""
+"Le format de stockage sélectionné nécessite une configuration de base !"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Page d'accueil"
 
-#: plugins/personal/generic/class_user.inc:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Bip"
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Date de naissance"
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 msgid "Cannot open certificate!"
 msgstr "Impossible d'ouvrir le certificat !"
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unité"
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identifiant du bâtiment"
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Travail"
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Dernière distribution"
 
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lieu de résidence"
 
-#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Description de l'unité"
 
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Zone de sujet"
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Fonction"
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numéro de série du certificat"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visible par tous"
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Rue"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Code postal"
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1598
 msgid "Generic user settings"
 msgstr "Paramètres par défaut des utilisateurs"
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mon Compte"
 
-#: plugins/personal/generic/class_user.inc:1601
-msgid "Surname"
-msgstr "Nom de famille"
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 msgid "User identification"
 msgstr "Information Utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titre Personnel"
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Titre Universitaire"
 
-#: plugins/personal/generic/class_user.inc:1608
-msgid "Gender"
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
 msgstr "Sexe"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Image de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 msgid "Department number"
 msgstr "Numéro du département"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Employee number"
 msgstr "Numéro de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Type de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Room number"
 msgstr "Numéro du bureau"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Pager number"
 msgstr "Numéro de page"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 msgid "Mobile number"
 msgstr "Numéro de GSM"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 msgid "Fax number"
 msgstr "Numéro de fax"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 msgid "User password method"
 msgstr "Méthode d'encodage des mots de passe"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 msgid "User certificates"
 msgstr "Certificats utilisateurs"
 
@@ -4750,10 +4508,6 @@ msgstr "Changer la photo"
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: plugins/personal/generic/generic.tpl:138
-msgid "Sex"
-msgstr "Sexe"
-
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
@@ -4878,6 +4632,12 @@ msgstr "expire"
 msgid "grace time active"
 msgstr "temps de grâce activé"
 
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+msgid "active"
+msgstr "actif"
+
 #: plugins/personal/posix/class_posixAccount.inc:173
 msgid "password not changeable"
 msgstr "mot de passe non modifiable"
@@ -4886,48 +4646,44 @@ msgstr "mot de passe non modifiable"
 msgid "password expired"
 msgstr "mot de passe expiré"
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr "non configuré"
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr "automatique"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "Les mots de passe ne peuvent être changé qu'après %s jours à compter de la "
 "dernière modification de celui-ci"
 
-#: plugins/personal/posix/class_posixAccount.inc:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Le mot de passe doit être changé après %s jours"
 
-#: plugins/personal/posix/class_posixAccount.inc:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 "Désactiver le compte après %s jours d'inactivité après l'expiration du mot "
 "de passe"
 
-#: plugins/personal/posix/class_posixAccount.inc:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr "Avertir l'utilisateur %s jours avant l'expiration de son mot de passe"
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Le temps d'attente du verrou à été dépassé. J'ignore le verrou !"
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr "Groupe d'utilisateurs"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
@@ -4935,90 +4691,90 @@ msgstr ""
 "Un uid en double vient d'être écrit pour cet utilisateur. Si ceci n'était "
 "pas voulu, veuillez vérifier tout les uid utilisés !"
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Répertoire Home"
 
-#: 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 ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 msgid "POSIX account"
 msgstr "Compte Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "ID de l'utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 msgid "Group ID"
 msgstr "ID du Groupe"
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 msgid "Force password change on login"
 msgstr "Forcer le changement de mot de passe au la connexion"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr "Clef SSH publique"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 msgid "System trust model"
 msgstr "Système de Confiance"
 
@@ -5082,10 +4838,18 @@ msgstr "Afficher les groupes du département"
 msgid "Display groups matching"
 msgstr "Afficher les groupes correspondants"
 
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr "Expression régulière correspondant à des noms de groupe"
+
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "Afficher les groupes contenant des utilisateurs"
 
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr "Utilisateur dont on montre les groupes"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Paramètres Posix"
@@ -5096,7 +4860,8 @@ msgstr "Paramètres Posix"
 
 #: plugins/personal/posix/posix_shadow.tpl:9
 msgid "User must change password on first login"
-msgstr "L'utilisateur doit changer son mot de passe lors de sa première connexion"
+msgstr ""
+"L'utilisateur doit changer son mot de passe lors de sa première connexion"
 
 #: plugins/personal/posix/posix_shadow.tpl:34
 msgid "Password expires on"
@@ -5138,7 +4903,8 @@ msgstr "Vous devez spécifier votre mode de passe actuel pour continuer."
 
 #: plugins/personal/password/class_password.inc:85
 msgid "The password you've entered as 'New password' is empty."
-msgstr "Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
+msgstr ""
+"Le mot de passe que vous avez entré comme 'Nouveau mot de passe' est vide."
 
 #: plugins/personal/password/class_password.inc:94
 #, php-format
@@ -5169,7 +4935,8 @@ msgstr "Le changement du mot de passe n'est pas autorisé"
 
 #: plugins/personal/password/nochange.tpl:6
 msgid "You have no permission to change your password at this time"
-msgstr "Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
+msgstr ""
+"Vous n'avez pas l'autorisation pour changer votre mot de passe à ce moment"
 
 #: setup/class_setupStep_Feedback.inc:92
 msgid "UNIX accounts/groups"
@@ -5240,7 +5007,8 @@ msgid "Please specify a valid email address."
 msgstr "Veuillez indiquer une adresse de messagerie valide."
 
 #: setup/class_setupStep_Feedback.inc:184
-msgid "You have to select at least one of both options, subscribe or send feedback."
+msgid ""
+"You have to select at least one of both options, subscribe or send feedback."
 msgstr ""
 "Vous devez au moins avoir activé une option, souscrire ou envoyer votre "
 "retour d'information."
@@ -5298,46 +5066,39 @@ msgid "Government mode"
 msgstr "Mode Gouvernemental"
 
 #: setup/setup_config2.tpl:123
-msgid "Logging options"
-msgstr "Options des journaux systèmes"
-
-#: setup/setup_config2.tpl:127
-msgid "Syslog"
-msgstr "journaux systèmes"
-
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-msgid "MySQL"
-msgstr "MySQL"
+#, fuzzy
+msgid "GOsa logging"
+msgstr "Fenêtre de connexion GOsa"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 msgid "Mail settings"
 msgstr "Paramètres de messagerie"
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr "Méthode de messagerie"
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr "Attribut d'identification du compte"
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 msgid "Vacation templates"
 msgstr "Modèles de messages d'absence "
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr "Utiliser Cyrus en mode UNIX"
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 msgid "Snapshots / Undo"
 msgstr "Copie instantanée / Undo"
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 msgid "Enable snapshots"
 msgstr "Activer la copie instantanée"
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 msgid "Snapshot base"
 msgstr "Base pour les snapshots"
 
@@ -5640,7 +5401,8 @@ msgstr "Vérification de l'installation"
 
 #: setup/class_setupStep_Checks.inc:40
 msgid "Basic checks for PHP compatibility and extensions"
-msgstr "Vérification de base de la version de PHP et des extensions nécéssaires."
+msgstr ""
+"Vérification de base de la version de PHP et des extensions nécéssaires."
 
 #: setup/class_setupStep_Checks.inc:64
 msgid "Checking PHP version"
@@ -5683,10 +5445,16 @@ msgstr "mbstring"
 
 #: setup/class_setupStep_Checks.inc:113
 msgid "GOsa requires this module to handle unicode strings."
-msgstr "GOsa a besoin  de ce module pour gèrer les chaînes de caractère unicode."
+msgstr ""
+"GOsa a besoin  de ce module pour gèrer les chaînes de caractère 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."
+msgid ""
+"GOsa requires this module to communicate with several supported databases."
 msgstr ""
 "GOsa à besion de ce module pour dialoguer avec les bases de données "
 "supportées."
@@ -5702,7 +5470,8 @@ msgstr ""
 "mots de passe Samba."
 
 #: setup/class_setupStep_Checks.inc:140
-msgid "Deploy a gosa-si installation or install the perl Crypt::SmbHash modules."
+msgid ""
+"Deploy a gosa-si installation or install the perl Crypt::SmbHash modules."
 msgstr ""
 "Déployez une installation gosa-si ou installer les modules perl Crypt::"
 "Smbash."
@@ -5788,7 +5557,8 @@ msgstr ""
 "mémoire pour les installations plus complexes."
 
 #: setup/class_setupStep_Checks.inc:209
-msgid "Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
+msgid ""
+"Search for 'memory_limit' in your php.ini and set it to '32M' or higher."
 msgstr ""
 "Recherchez pour 'memory_limit' dans votre php.ini et mettez le à '32M' or "
 "plus haut."
@@ -5810,7 +5580,8 @@ msgid "The Execution time should be at least 30 seconds."
 msgstr "Le temps d'exécution doit être au moins de 30 secondes."
 
 #: setup/class_setupStep_Checks.inc:225
-msgid "Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
+msgid ""
+"Search for 'max_execution_time' in your php.ini and set it to '30' or higher."
 msgstr ""
 "Rechercher l'option 'max_execution_time' dans votre php.ini et mettez le à "
 "'30' ou plus."
@@ -5852,7 +5623,8 @@ msgstr ""
 "'off'."
 
 #: setup/class_setupStep_Checks.inc:249
-msgid "Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
+msgid ""
+"Search for 'zend.ze1_compatibility_mode' in your php.ini and set it to 'Off'."
 msgstr ""
 "Recherchez l'option 'zend.ze1_compatibility_mode' dans votre hp.ini et "
 "mettez la à 'Off'."
@@ -6028,14 +5800,14 @@ msgstr "Est ce que la procédure d'installation vous à aidé ?"
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "Yes"
 msgstr "Oui"
 
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "No"
 msgstr "Non"
 
@@ -6187,7 +5959,8 @@ msgstr "Sélectionner un utilisateur"
 
 #: setup/setup_ldap.tpl:86
 msgid "Automatically append LDAP base to admin DN"
-msgstr "Ajouter automatiquement la base de l'annuaire LDAP au DN de l'administrateur"
+msgstr ""
+"Ajouter automatiquement la base de l'annuaire LDAP au DN de l'administrateur"
 
 #: setup/setup_ldap.tpl:93
 msgid "Admin password"
@@ -6319,7 +6092,8 @@ msgstr "Echec"
 
 #: setup/class_setupStep_Migrate.inc:375
 #, php-format
-msgid "Found %s winstations outside the predefined winstation department ou '%s'."
+msgid ""
+"Found %s winstations outside the predefined winstation department ou '%s'."
 msgstr ""
 "J'ai trouvé %s winstations en dehors du département winstation prédéfini '%"
 "s'."
@@ -6340,8 +6114,10 @@ msgstr "J'ai trouvé %s utilsateur(s) en dehors de la branche configurée '%s'."
 
 #: setup/class_setupStep_Migrate.inc:586 setup/class_setupStep_Migrate.inc:599
 #, php-format
-msgid "The specified user '%s' does not have full access to your ldap database."
-msgstr "L'utilisateur spécifié '%s' n'a pas l'accès complet à votre annuaire ldap."
+msgid ""
+"The specified user '%s' does not have full access to your ldap database."
+msgstr ""
+"L'utilisateur spécifié '%s' n'a pas l'accès complet à votre annuaire ldap."
 
 #: setup/class_setupStep_Migrate.inc:663
 #, php-format
@@ -6370,7 +6146,8 @@ msgstr "Compte administratifs de GOsa 2.5 trouvés : %s"
 
 #: setup/class_setupStep_Migrate.inc:1033
 msgid "There is no valid GOsa 2.6 administrator account inside your LDAP."
-msgstr "Il n'y a pas d'administrateur GOsa 2.6 valide dans votre annuaire LDAP."
+msgstr ""
+"Il n'y a pas d'administrateur GOsa 2.6 valide dans votre annuaire LDAP."
 
 #: setup/class_setupStep_Migrate.inc:1050
 msgid "There is no GOsa administrator account inside your LDAP."
@@ -6407,7 +6184,8 @@ msgstr "Le nom d'utilisateur est incorrect !"
 #: setup/class_setupStep_Migrate.inc:1200
 #, php-format
 msgid "Adding an administrative user failed: object '%s' already exists!"
-msgstr "L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
+msgstr ""
+"L'ajout d'un utilisateur administratif à échoué : l'objet '%s' existe déja !"
 
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -6437,7 +6215,8 @@ msgid "The following references will be updated"
 msgstr "Les références suivantes seront mises à jour"
 
 #: setup/class_setupStep_Migrate.inc:1990
-msgid "The LDAP root object is missing. It is required to use your LDAP service."
+msgid ""
+"The LDAP root object is missing. It is required to use your LDAP service."
 msgstr ""
 "L'objet LDAP racine est manquant. Il est indispensable pour utiliser votre "
 "annuaire LDAP."
@@ -6657,7 +6436,8 @@ msgstr "Compresser les données envoyées au navigateur web"
 
 #: setup/setup_config1.tpl:27
 msgid "People and group storage"
-msgstr "Branches de l'arbre ldap ou sont stockes les utilisateurs et les groupes"
+msgstr ""
+"Branches de l'arbre ldap ou sont stockes les utilisateurs et les groupes"
 
 #: setup/setup_config1.tpl:30
 msgid "People DN attribute"
@@ -6870,3 +6650,196 @@ msgstr "Cette étape vous permet de sélectionner votre langue préférée."
 msgid "Automatic"
 msgstr "Automatique"
 
+#, fuzzy
+#~ msgid "Edit ogroup"
+#~ msgstr "Liste des groupes"
+
+#, fuzzy
+#~ msgid "List of ogroups"
+#~ msgstr "Liste des groupes"
+
+#~ 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 ""
+#~ "Allez dans votre arbre préféré et cliquez sur sauver pour utiliser le "
+#~ "sous arbre comme base.Ou cliquez sur l'image à la fin de chaque entrée."
+
+#~ msgid "Use"
+#~ msgstr "Utilisation"
+
+#~ msgid "Filter entries with this syntax"
+#~ msgstr "Filtrer les entrées avec cette syntaxe"
+
+#~ msgid "MySQL error"
+#~ msgstr "Erreur MySQL"
+
+#~ msgid "Logging to MySQL database will be disabled for server '%s'!"
+#~ msgstr ""
+#~ "Les journaux systèmes envoyés vers la base de donnée MySQL seront "
+#~ "désactivé pour le serveur '%s' !"
+
+#~ msgid "MySQL logging"
+#~ msgstr "Journaux systèmes stockés dans un base de données MySQL"
+
+#~ msgid "Cannot add location to the database!"
+#~ msgstr "Impossible d'ajouter un emplacement à la base de données !"
+
+#~ msgid "Submit department"
+#~ msgstr "Soumettre le département"
+
+#~ msgid "edit"
+#~ msgstr "éditer"
+
+#~ msgid "delete"
+#~ msgstr "supprimer"
+
+#~ msgid "Number of listed object groups"
+#~ msgstr "Nombre de groupe d'objets affichés"
+
+#~ msgid "Number of listed departments"
+#~ msgstr "Nombre de département listés"
+
+#~ msgid "Select to see groups that are primary groups of users"
+#~ msgstr ""
+#~ "Sélectionnez afin d'afficher les groupes qui sont les groupes principaux "
+#~ "d'utilisateurs"
+
+#~ msgid "samba groups mappings"
+#~ msgstr "correspondance des groupes samba"
+
+#~ msgid "application settings"
+#~ msgstr "paramètres des applications"
+
+#~ msgid "mail settings"
+#~ msgstr "paramètres de messagerie"
+
+#~ msgid "Select to see normal groups that have only functional aspects"
+#~ msgstr ""
+#~ "Sélectionnez afin d'afficher les groupes normaux ayant uniquement un "
+#~ "aspect fonctionnel"
+
+#~ msgid "functional groups"
+#~ msgstr "groupes fonctionnels"
+
+#~ msgid "Not allowed"
+#~ msgstr "Non autorisé"
+
+#~ msgid "Number of listed groups"
+#~ msgstr "Nombre de groupes affichés"
+
+#~ msgid "Manage POSIX groups"
+#~ msgstr "Gestion des groupes POSIX"
+
+#~ msgid "group"
+#~ msgstr "groupe"
+
+#~ msgid "User administration"
+#~ msgstr "Administration des utilisateurs"
+
+#~ msgid "templates"
+#~ msgstr "modèles"
+
+#~ msgid "GOsa object"
+#~ msgstr "Objet GOsa"
+
+#~ msgid "functional users"
+#~ msgstr "utilisateurs fonctionnels"
+
+#~ msgid "POSIX users"
+#~ msgstr "Utilisateurs Posix"
+
+#~ msgid "samba users"
+#~ msgstr "utilisateurs du domaine"
+
+#~ msgid "proxy users"
+#~ msgstr "utilisateurs du proxy"
+
+#~ msgid "phone users"
+#~ msgstr "utilisateurs des téléphones"
+
+#~ msgid "Edit UNIX properties"
+#~ msgstr "Modifier les propriétés UNIX"
+
+#~ msgid "Edit fax properies"
+#~ msgstr "Modifier les propriétés fax"
+
+#~ msgid "Create user with this template"
+#~ msgstr "Créer un nouvel utilisateur avec ce modèle"
+
+#~ msgid "user"
+#~ msgstr "utilisateurs"
+
+#~ msgid "password"
+#~ msgstr "mot de passe"
+
+#~ msgid "Delete user"
+#~ msgstr "Supprimer un utilisateur"
+
+#~ msgid "Number of listed users"
+#~ msgstr "Nombre d'utilisateurs listés"
+
+#~ msgid "You have no permission to modify object '%s'!"
+#~ msgstr "Vous n'avez pas l'autorisation pour modifier l'objet '%s' !"
+
+#~ msgid "You have no permission to use this template!"
+#~ msgstr "Vous n'avez pas l'autorisation pour utiliser ce modèle !"
+
+#~ msgid "You have no permission to change the lock status for this user!"
+#~ msgstr ""
+#~ "Vous n'avez pas l'autorisation pour changer le verrouillage de cet "
+#~ "utilisateur !"
+
+#~ msgid "Name / Department"
+#~ msgstr "Nom / Département"
+
+#~ msgid "Regular expression for matching department names"
+#~ msgstr "Expression régulière pour faire correspondre les départements"
+
+#~ 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 ""
+#~ "Dès que l'opération de déplacement est finie, vous pouvez aller à la fin "
+#~ "de la page et appuyer sur 'Continuer' pour accèder à la gestion des "
+#~ "départements."
+
+#~ msgid "Department management"
+#~ msgstr "Gestion des départements"
+
+#~ 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 ""
+#~ "Cela inclut tout les systèmes et les informations de configuration. "
+#~ "Veuillez vérifier que vous voulez effectuer cette opération étant donné "
+#~ "qu'il est impossible pour GOsa de récupérer vos données."
+
+#~ msgid "ACL role"
+#~ msgstr "Rôles ACL"
+
+#~ msgid "Summary"
+#~ msgstr "Sommaire"
+
+#~ msgid "Display acls matching"
+#~ msgstr "Afficher les acls correspondantes"
+
+#~ msgid "Edit acl role"
+#~ msgstr "Editer un rôle acl"
+
+#~ msgid "Edit acl"
+#~ msgstr "Editer un acl"
+
+#~ msgid "Delete acl"
+#~ msgstr "Effacer un acl"
+
+#~ msgid "Gender"
+#~ msgstr "Sexe"
+
+#~ msgid "Logging options"
+#~ msgstr "Options des journaux systèmes"
+
+#~ msgid "Syslog"
+#~ msgstr "journaux systèmes"
index e0fe446f5c02b5f6c56b68f76932de21243c7a32..b35c02269b3a33af6e849790106793d44f60b8cf 100644 (file)
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: 2005-11-18 15:26+0100\n"
 "Last-Translator: Alessandro Amici <a.amici@bopen.it>\n"
 "Language-Team: Italian\n"
@@ -34,19 +34,17 @@ msgstr "Filtri"
 #: 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -65,6 +63,7 @@ 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
 #, fuzzy
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
@@ -77,15 +76,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr "Annulla"
@@ -108,15 +106,14 @@ msgstr "Usa il tuo <i>nome utente</i> e <i>password</i> per connetterti"
 
 #: 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 "Nome utente"
 
 #: 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "Password"
 
@@ -251,7 +248,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 msgid "Members"
 msgstr "Membri"
 
@@ -289,7 +286,7 @@ msgstr "Password"
 #: 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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -303,9 +300,7 @@ msgid "Verify password"
 msgstr "Password"
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr "Cambia la password"
 
@@ -353,7 +348,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr "Oggetto"
 
@@ -394,47 +389,49 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.inc:596
 msgid "Continue"
 msgstr "Continua"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: 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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -444,9 +441,9 @@ msgstr ""
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -477,8 +474,7 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -613,9 +609,9 @@ msgstr "Connesso:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 #, fuzzy
 msgid "Fatal error"
 msgstr "Terminal Server"
@@ -630,17 +626,17 @@ msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
 #: 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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 #, fuzzy
@@ -652,7 +648,7 @@ msgstr "File di configurazione"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 #, fuzzy
 msgid "Password method"
 msgstr "Algorimo password"
@@ -661,7 +657,7 @@ msgstr "Algorimo password"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -679,10 +675,11 @@ msgid "The password used as new is to short."
 msgstr "La 'Nuova password' immessa è troppo corta."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: 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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -700,11 +697,11 @@ msgstr "Non hai il permesso di cambiare la tua password."
 msgid "External password changer reported a problem: "
 msgstr "Il programma esterno per cambiare la password ha avuto un problema:"
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr ""
 
@@ -737,33 +734,37 @@ msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: 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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -805,13 +806,13 @@ msgstr "Destinazione"
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:368
+#: html/index.php:369
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -894,6 +895,51 @@ msgstr ""
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr "non configurata"
+
+#: include/class_management.inc:144
+#, fuzzy
+msgid "Filter error"
+msgstr "Terminal Server"
+
+#: 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
+#, fuzzy
+msgid "Permission"
+msgstr "Permessi"
+
+#: 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
+#, fuzzy
+msgid "Permission error"
+msgstr "Permessi"
+
+#: include/class_management.inc:426 include/class_plugin.inc:1546
+#, fuzzy, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Non hai il permesso di cambiare la tua password."
+
+#: 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
+#, fuzzy, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Non hai il permesso di cambiare la tua password."
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -913,14 +959,14 @@ msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -932,12 +978,12 @@ msgstr ""
 msgid "Access control"
 msgstr "Opzioni di accesso"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 #, fuzzy
 msgid "Manage access control lists"
 msgstr "Opzioni di accesso"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 #, fuzzy
 msgid "All categories"
 msgstr "Aggiungi contatto"
@@ -946,22 +992,22 @@ msgstr "Aggiungi contatto"
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 msgid "One level"
 msgstr ""
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 #, fuzzy
 msgid "Current object"
 msgstr "Password attuale"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 #, fuzzy
 msgid "Complete subtree"
 msgstr "incompleto"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr ""
 
@@ -969,57 +1015,55 @@ msgstr ""
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: 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
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Utenti"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr "Gruppi di utenti"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: 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
+#: 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
 msgid "Up"
 msgstr ""
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 #, fuzzy
 msgid "Down"
 msgstr "Dominio"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr "Modifica"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr "Rimuovi"
@@ -1044,7 +1088,7 @@ msgstr "classe"
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr ""
 
@@ -1090,13 +1134,13 @@ msgstr "Gruppo di oggetti"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: 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
+#: 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
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal Server"
@@ -1125,22 +1169,22 @@ msgstr ""
 msgid "Contains settings for these objects: %s"
 msgstr "Nome descrittivo del gruppo"
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "inactive"
 msgstr "Privato"
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "No members"
 msgstr "Membri del gruppo"
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 #, fuzzy
 msgid "Access control list"
 msgstr "Opzioni di accesso"
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 #, fuzzy
 msgid "ACL roles"
 msgstr "ACL"
@@ -1151,48 +1195,38 @@ msgstr "ACL"
 msgid "Close"
 msgstr "Scegli"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 msgid "Go to root department"
 msgstr "Vai al dipartimento base"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 msgid "Root"
 msgstr "Root"
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 msgid "Go up one department"
 msgstr "Sali di dipartimento"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 msgid "Go to users department"
 msgstr "Vai agli utenti del dipartimento"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 msgid "Home"
 msgstr "Home"
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr ""
 
@@ -1208,35 +1242,20 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 #, fuzzy
 msgid "Choose a base"
 msgstr "Rimuovi"
 
-#: 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 ""
-
-#: include/class_baseSelectDialog.inc:61
-#, fuzzy
-msgid "Use"
-msgstr "Utenti"
-
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1244,26 +1263,18 @@ msgstr "Utenti"
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "Base"
 
-#: include/class_baseSelectDialog.inc:68
-#, fuzzy
-msgid "Filter entries with this syntax"
-msgstr "Mostra gli indirizzi che corrispondono"
-
-#: 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
+#: include/class_listing.inc:298 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
@@ -1272,88 +1283,102 @@ msgstr "Mostra gli indirizzi che corrispondono"
 msgid "Select all"
 msgstr "Rimuovi"
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 #, fuzzy
 msgid "created by"
 msgstr "Creare"
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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 "Azioni"
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 #, fuzzy
 msgid "Copy"
 msgstr "Azienda"
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 #, fuzzy
 msgid "Cut"
 msgstr "Esegui"
 
-#: 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
+#: 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
 #, fuzzy
 msgid "Paste"
 msgstr "Data"
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Modifica questo record"
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Modifica questo record"
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Crea estensioni di posta"
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 #, fuzzy
 msgid "Export list"
 msgstr "Esporta"
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Crea estensioni di posta"
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Gruppo di oggetti"
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:132
+msgid "Edit this entry"
+msgstr "Modifica questo record"
+
+#: include/class_sortableListing.inc:133
+msgid "Delete this entry"
+msgstr "Elimina questo record"
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, fuzzy, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/functions.inc:399
+#: include/functions.inc:518
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/functions.inc:474
+#: include/functions.inc:603
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
@@ -1361,11 +1386,11 @@ msgid ""
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1373,280 +1398,282 @@ msgid ""
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1049
+#: include/functions.inc:1232
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Configura"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Continua"
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Modifica contatto"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: include/functions.inc:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "versione di sviluppo di GOsa (Rev %s)"
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Rimuovi"
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Amministrazione LDAP"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Lista dei dipartimenti"
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2309
+#: include/functions.inc:2764
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr "Tedesco"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr "Francese"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr "Inglese"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr "Tedesco"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 #, fuzzy
 msgid "Polish"
 msgstr "Inglese"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 #, fuzzy
 msgid "Chinese"
 msgstr "reset"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Nome"
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr "Russo"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Vai al dipartimento base"
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, fuzzy, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
 msgstr "Impossibile connettersi al server del database!"
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr "Riferimenti"
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 #, fuzzy
 msgid "Remove snapshot"
 msgstr "Crea estensioni di posta"
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1662,8 +1689,11 @@ msgstr ""
 #: 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr "Descrizione"
 
@@ -1773,7 +1803,7 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr "Argomenti"
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
@@ -1786,55 +1816,33 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: 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
-#, fuzzy
-msgid "Permission"
-msgstr "Permessi"
-
-#: include/class_plugin.inc:1547
-#, fuzzy, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: include/class_plugin.inc:1559 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1587
-#, fuzzy, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 #, fuzzy
 msgid "from"
 msgstr "e"
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 #, fuzzy
 msgid "to"
 msgstr "Rapporto"
 
-#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 #, fuzzy
 msgid "Restore"
 msgstr "Riprova"
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 #, fuzzy
 msgid "cut"
 msgstr "Esegui"
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr ""
 
@@ -2448,125 +2456,104 @@ msgid ""
 "setup?"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:665
+#: include/class_ldap.inc:692
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:740
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:800
+#: include/class_ldap.inc:827
 #, fuzzy, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/class_ldap.inc:802
+#: include/class_ldap.inc:829
 #, fuzzy, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Errore durante la connessione al server LDAP. Il server dice: '%s'"
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, fuzzy, php-format
 msgid "Logging failed: %s"
 msgstr "Utenti di Dominio"
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, fuzzy, php-format
 msgid "Invalid option '%s' specified!"
 msgstr "L'uid contiene dei caratteri invalidi!"
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 #, fuzzy
 msgid "Specified objectType is empty or invalid!"
 msgstr "Il valore specificato per l'UID non è valido."
 
-#: include/class_log.inc:139
-#, fuzzy
-msgid "MySQL error"
-msgstr "Errore LDAP"
-
-#: include/class_log.inc:139
-#, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr ""
-
-#: 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 ""
-
-#: include/class_log.inc:219
-#, fuzzy, php-format
-msgid "Cannot add location to the database!"
-msgstr "Impossibile connettersi al server del database!"
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Rimuovi"
 
-#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:270
+#: include/class_config.inc:317
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/class_config.inc:636
+#: include/class_config.inc:694
 #, fuzzy
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "Scarica il file di  configurazione"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 #, fuzzy
 msgid "Configuration"
 msgstr "File di configurazione"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2586,44 +2573,44 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: 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: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
 #, fuzzy, php-format
 msgid "Copy and paste failed!"
 msgstr "Nome applicazione"
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, fuzzy, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "Rimuovi"
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, fuzzy, php-format
 msgid "No write permission in '%s'"
 msgstr "Rimuovi"
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 #, fuzzy
 msgid "Cannot paste"
 msgstr "Crea estensioni telefoniche"
@@ -2634,11 +2621,11 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Generale"
@@ -2649,32 +2636,26 @@ 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr "Posta"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr "FAX"
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2683,34 +2664,34 @@ msgid "FTP"
 msgstr "FTP"
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr "Gruppo"
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr "Dipartimento"
 
 #: plugins/generic/references/class_reference.inc:61
-#: 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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2719,14 +2700,13 @@ msgid "Phone"
 msgstr "Telefono"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr "Applicazione"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Server"
 
@@ -2735,19 +2715,17 @@ msgid "Thin Client"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Gruppo di oggetti"
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr "Stampante"
 
@@ -2791,271 +2769,51 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Il team di GOsa"
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-#, fuzzy
-msgid "List of object groups"
-msgstr "Nome del gruppo"
-
-#: 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 ""
-
-#: 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 "Azioni"
-
-#: 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
-#, fuzzy, php-format
-msgid "Show %s"
-msgstr "Mostra gruppi"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-#, fuzzy
-msgid "user groups"
-msgstr "gruppi"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-#, fuzzy
-msgid "nested groups"
-msgstr "Gruppi di oggetti"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:93
-#: plugins/admin/ogroups/class_divListOGroup.inc:94
-#: plugins/admin/groups/class_divListGroup.inc:89
-#, fuzzy
-msgid "application groups"
-msgstr "Mostra gruppi di applicazioni"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-#, fuzzy
-msgid "department groups"
-msgstr "dipartimenti"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-#, fuzzy
-msgid "server groups"
-msgstr "server"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-#, fuzzy
-msgid "workstation groups"
-msgstr "Mostra workstation"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-#, fuzzy
-msgid "windows workstation groups"
-msgstr "Mostra workstation"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-#, fuzzy
-msgid "terminal groups"
-msgstr "Mostra gruppi di posta"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-#, fuzzy
-msgid "printer groups"
-msgstr "Gruppo primario"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-#, fuzzy
-msgid "phone groups"
-msgstr "Mostra gruppi"
-
-#: 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 "Espressioni regolare per selezionare il nome del gruppo"
-
-#: 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 "Imposta dipartimento"
-
-#: 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 "Creare"
-
-#: 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 "Rimuovi"
-
-#: 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 "modifica"
-
-#: 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 "Modifica questo record"
-
-#: 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 "elimina"
-
-#: 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 "Elimina questo record"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-#, fuzzy
-msgid "Number of listed object groups"
-msgstr "Nome del gruppo"
-
-#: 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
-#, fuzzy
-msgid "Number of listed departments"
-msgstr "Imposta dipartimento"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroup.inc:1117
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr "Gruppi di oggetti"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #, fuzzy
 msgid "Manage object groups"
 msgstr "Nome del gruppo"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "Errore PHP"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#, fuzzy
-msgid "object group"
-msgstr "Gruppo di oggetti"
-
-#: 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
-#, fuzzy
-msgid "Permission error"
-msgstr "Permessi"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 #, fuzzy
 msgid "Templates"
 msgstr "Template"
 
-#: 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
+#: 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
 msgid "User"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminali"
@@ -3070,6 +2828,19 @@ msgstr ""
 msgid "departments"
 msgstr "dipartimenti"
 
+#: 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
+#, fuzzy, php-format
+msgid "Show %s"
+msgstr "Mostra gruppi"
+
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 #, fuzzy
@@ -3123,7 +2894,9 @@ msgid "applications"
 msgstr "applicazioni"
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr "nessuno"
 
@@ -3142,20 +2915,20 @@ msgstr "Amministrazione"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "disabilitato"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 msgid "full access"
 msgstr "accesso completo"
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr "accesso limitato ai seguenti host"
 
@@ -3173,22 +2946,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3216,13 +2984,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Cognome"
@@ -3280,7 +3054,7 @@ msgid "Select a base"
 msgstr "Rimuovi"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Accesso ai sistemi"
@@ -3320,10 +3094,9 @@ msgid "FAI summary"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr "Ambiente"
 
@@ -3336,24 +3109,137 @@ msgstr "Applicazioni"
 msgid "Please enter the new object group name"
 msgstr "Inserisci la URI del server LDAP"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr ""
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
-msgid "Display objects of department"
-msgstr ""
+#: 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 "Filtri"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-#: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-msgid "Choose the department the search will be based on"
-msgstr "Scegli il dipartimento di base per la ricerca"
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+#, fuzzy
+msgid "user groups"
+msgstr "gruppi"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+#, fuzzy
+msgid "nested groups"
+msgstr "Gruppi di oggetti"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+#, fuzzy
+msgid "application groups"
+msgstr "Mostra gruppi di applicazioni"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+#, fuzzy
+msgid "department groups"
+msgstr "dipartimenti"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+#, fuzzy
+msgid "server groups"
+msgstr "server"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+#, fuzzy
+msgid "workstation groups"
+msgstr "Mostra workstation"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+#, fuzzy
+msgid "windows workstation groups"
+msgstr "Mostra workstation"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+#, fuzzy
+msgid "terminal groups"
+msgstr "Mostra gruppi di posta"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+#, fuzzy
+msgid "printer groups"
+msgstr "Gruppo primario"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+#, fuzzy
+msgid "phone groups"
+msgstr "Mostra gruppi"
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+#, fuzzy
+msgid "List of object groups"
+msgstr "Nome del gruppo"
+
+#: 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 ""
+
+#: 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 "Creare"
+
+#: 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 "Rimuovi"
+
+#: plugins/admin/ogroups/ogroup-list.xml:106
+#: plugins/admin/groups/group-list.xml:106
+#: plugins/admin/users/user-list.xml:156
+#, fuzzy
+msgid "Send message"
+msgstr "Home Page"
+
+#: plugins/admin/ogroups/ogroup-list.xml:142
+#, fuzzy
+msgid "Edit object group"
+msgstr "Gruppo di oggetti"
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+#, fuzzy
+msgid "Remove object group"
+msgstr "server"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/trust_machines.tpl:27
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+msgid "Choose the department the search will be based on"
+msgstr "Scegli il dipartimento di base per la ricerca"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:40
 msgid "Display objects matching"
 msgstr ""
 
@@ -3408,7 +3294,6 @@ msgid "Display users of department"
 msgstr "Mostra utenti del dipartimento"
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr "Mostra utenti che corrispondono a"
 
@@ -3475,77 +3360,18 @@ msgstr "Gruppo primario"
 msgid "Not in all groups"
 msgstr "Mostra gruppi di posta"
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
-msgstr "Lista dei gruppi"
-
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
-msgstr "Selezione per mostrare i gruppi che sono gruppi primari per gli utenti"
-
-#: plugins/admin/groups/class_divListGroup.inc:85
-#, fuzzy
-msgid "primary groups"
-msgstr "Gruppo primario"
-
-#: plugins/admin/groups/class_divListGroup.inc:86
-#, fuzzy
-msgid "samba groups mappings"
-msgstr "Samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-#, fuzzy
-msgid "samba groups"
-msgstr "Gruppo Samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:88
-#, fuzzy
-msgid "application settings"
-msgstr "applicazioni"
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-#, fuzzy
-msgid "mail settings"
-msgstr "Opzioni di posta dell'identità"
-
-#: plugins/admin/groups/class_divListGroup.inc:91
-#, fuzzy
-msgid "mail groups"
-msgstr "Mostra gruppi di posta"
-
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Seleziona per mostrare i gruppi che hanno solo aspetti funzionali"
-
-#: plugins/admin/groups/class_divListGroup.inc:93
-#, fuzzy
-msgid "functional groups"
-msgstr "Mostra gruppi funzionali"
-
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr "Nome dell'utente del quale mostrare i gruppi"
-
-#: plugins/admin/groups/class_divListGroup.inc:188
-#: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:206
-#, fuzzy
-msgid "Posix"
-msgstr "Proxy"
+#: plugins/admin/groups/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Mostra gruppi principali"
 
-#: plugins/admin/groups/class_divListGroup.inc:244
-#: plugins/admin/users/class_divListUsers.inc:278
-#: plugins/admin/users/class_divListUsers.inc:290
-#, fuzzy
-msgid "Not allowed"
-msgstr "Cambia la password"
+#: plugins/admin/groups/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Mostra gruppi samba"
 
-#: plugins/admin/groups/class_divListGroup.inc:303
+#: plugins/admin/groups/group-filter.tpl:13
 #, fuzzy
-msgid "Number of listed groups"
-msgstr "Nome del gruppo"
+msgid "Show mail groups"
+msgstr "Mostra gruppi samba"
 
 #: plugins/admin/groups/class_groupGeneric.inc:161
 msgid "Cannot find group SID in your configuration!"
@@ -3591,57 +3417,57 @@ msgstr ""
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Rimuovi"
 
-#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Rimuovi"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Impostazioni generali delle code"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 #, fuzzy
 msgid "Samba group type"
 msgstr "Gruppo Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Home di Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "I membri sono in un gruppo di risposta telefonica"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 #, fuzzy
 msgid "Nagios group"
 msgstr "Contatto"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 #, fuzzy
 msgid "Group member"
 msgstr "Membri del gruppo"
@@ -3651,197 +3477,73 @@ msgstr "Membri del gruppo"
 msgid "Group settings"
 msgstr "Impostazioni FAX"
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
-msgid "Group administration"
-msgstr "Amministrazione dei gruppi di utenti"
-
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-#, fuzzy
-msgid "group"
-msgstr "gruppi"
-
-#: 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 ""
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr "Amministrazione utenti"
-
-#: 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 degli utenti"
-
-#: 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 ""
-
-#: plugins/admin/users/class_divListUsers.inc:85
-#, fuzzy
-msgid "templates"
-msgstr "Template"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-#, fuzzy
-msgid "GOsa object"
-msgstr "Oggetto"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-#, fuzzy
-msgid "functional users"
-msgstr "Mostra utenti funzionali"
-
-#: plugins/admin/users/class_divListUsers.inc:87
-#, fuzzy
-msgid "POSIX users"
-msgstr "Impostazioni Unix"
-
-#: plugins/admin/users/class_divListUsers.inc:88
-#, fuzzy
-msgid "mail users"
-msgstr "Utenti di Dominio"
-
-#: plugins/admin/users/class_divListUsers.inc:89
-#, fuzzy
-msgid "samba users"
-msgstr "Utenti di Dominio"
-
-#: plugins/admin/users/class_divListUsers.inc:90
-#, fuzzy
-msgid "proxy users"
-msgstr "Mostra utenti proxy"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista dei gruppi"
 
-#: plugins/admin/users/class_divListUsers.inc:93
+#: plugins/admin/groups/group-list.xml:138
 #, fuzzy
-msgid "phone users"
-msgstr "Mostra utenti proxy"
+msgid "Edit group"
+msgstr "Gruppo primario"
 
-#: plugins/admin/users/class_divListUsers.inc:145
-#: plugins/admin/users/user-list.xml:121 plugins/admin/users/user-list.xml:163
+#: plugins/admin/groups/group-list.xml:151
 #, fuzzy
-msgid "Apply template"
-msgstr "Template"
+msgid "Remove group"
+msgstr "server"
 
-#: plugins/admin/users/class_divListUsers.inc:204
-msgid "GOsa"
-msgstr ""
+#: plugins/admin/groups/class_groupManagement.inc:26
+msgid "Group administration"
+msgstr "Amministrazione dei gruppi di utenti"
 
-#: plugins/admin/users/class_divListUsers.inc:205
-#: plugins/admin/users/class_userManagement.inc:1067
+#: plugins/admin/groups/class_groupManagement.inc:155
 #, fuzzy
-msgid "Edit generic properties"
-msgstr "Modifica proprietà"
+msgid "Posix"
+msgstr "Proxy"
 
-#: plugins/admin/users/class_divListUsers.inc:207
+#: plugins/admin/groups/class_groupManagement.inc:156
 #, fuzzy
-msgid "Edit UNIX properties"
+msgid "Edit posix properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 #, fuzzy
-msgid "Edit environment properties"
+msgid "Edit mail properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:750
 #, fuzzy
-msgid "Edit mail properties"
+msgid "Edit samba properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1095
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Modifica proprietà"
 
-#: 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/users/class_divListUsers.inc:215
+#: plugins/admin/groups/class_groupManagement.inc:187
 #, fuzzy
-msgid "Edit fax properies"
-msgstr "Modifica proprietà"
+msgid "Menu"
+msgstr "Stampante"
 
-#: plugins/admin/users/class_divListUsers.inc:217
-#: plugins/admin/users/class_userManagement.inc:1079
+#: plugins/admin/groups/class_groupManagement.inc:188
 #, fuzzy
-msgid "Edit samba properties"
+msgid "Edit start menu properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/users/class_userManagement.inc:1083
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:758
 #, fuzzy
-msgid "Edit netatalk properties"
+msgid "Edit environment properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_divListUsers.inc:220
-#, fuzzy
-msgid "Create user from template"
-msgstr "Nuovo template"
-
-#: plugins/admin/users/class_divListUsers.inc:221
-#, fuzzy
-msgid "Create user with this template"
-msgstr "Nuovo template"
-
-#: 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
-#, fuzzy
-msgid "active"
-msgstr "Privato"
-
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
-#, fuzzy
-msgid "user"
-msgstr "utenti"
-
-#: plugins/admin/users/class_divListUsers.inc:274
-#, fuzzy
-msgid "password"
-msgstr "Password"
-
-#: plugins/admin/users/class_divListUsers.inc:287
-#, fuzzy
-msgid "Delete user"
-msgstr "Rimuovi"
-
-#: plugins/admin/users/class_divListUsers.inc:376
-msgid "Number of listed users"
+#: 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 ""
 
 #: plugins/admin/users/password.tpl:4
@@ -3887,6 +3589,13 @@ msgid ""
 "templates."
 msgstr ""
 
+#: 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 ""
+
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 #, fuzzy
@@ -3899,96 +3608,118 @@ msgstr "Scegli il tuo numero di telefono personale"
 msgid "First name"
 msgstr "Liste di blocco"
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 #, fuzzy
 msgid "Manage users"
 msgstr "Utenti di Dominio"
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "Non hai il permesso di cambiare la tua password."
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, fuzzy, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: plugins/admin/users/class_userManagement.inc:559
-#, fuzzy
-msgid "You have no permission to use this template!"
-msgstr "Non hai il permesso di cambiare la tua password."
+#: 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 "Nome"
 
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 #, fuzzy
 msgid "Account locking"
 msgstr "Sicurezza"
 
-#: plugins/admin/users/class_userManagement.inc:662
-#, fuzzy
-msgid "You have no permission to change the lock status for this user!"
-msgstr "Non hai il permesso di cambiare la tua password."
-
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:650
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 
-#: 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 "Nome"
-
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:723
 #, fuzzy
 msgid "Unlock account"
 msgstr "Identità"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 #, fuzzy
 msgid "Lock account"
 msgstr "Identità"
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+#, fuzzy
+msgid "Edit generic properties"
+msgstr "Modifica proprietà"
+
+#: 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
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:753
+msgid "Netatalk"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:754
+#, fuzzy
+msgid "Edit netatalk properties"
+msgstr "Modifica proprietà"
+
+#: plugins/admin/users/class_userManagement.inc:762
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Modifica proprietà"
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Lista degli utenti"
+
 #: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1608
+msgid "Surname"
+msgstr "Cognome"
+
+#: plugins/admin/users/user-list.xml:140
 #, fuzzy
-msgid "Name / Department"
-msgstr "Sali di dipartimento"
+msgid "Lock users"
+msgstr "Lista degli utenti"
+
+#: plugins/admin/users/user-list.xml:148
+#, fuzzy
+msgid "Unlock users"
+msgstr "Utenti di Dominio"
+
+#: plugins/admin/users/user-list.xml:167
+#, fuzzy
+msgid "Apply template"
+msgstr "Template"
 
-#: plugins/admin/users/user-list.xml:175
+#: plugins/admin/users/user-list.xml:199
+#, fuzzy
+msgid "New user from template"
+msgstr "Nuovo template"
+
+#: plugins/admin/users/user-list.xml:213
 #, fuzzy
 msgid "Edit user"
 msgstr "Modifica contatto"
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 #, fuzzy
 msgid "Remove user"
 msgstr "Elimina foto"
@@ -4003,17 +3734,18 @@ msgid "Show functional users"
 msgstr "Mostra utenti funzionali"
 
 #: plugins/admin/users/user-filter.tpl:13
-msgid "Show mail users"
-msgstr "Mostra utenti di posta"
-
-#: plugins/admin/users/user-filter.tpl:14
 #, fuzzy
 msgid "Show POSIX users"
 msgstr "Impostazioni Unix"
 
+#: plugins/admin/users/user-filter.tpl:14
+#, fuzzy
+msgid "Show Mail users"
+msgstr "Mostra utenti di posta"
+
 #: plugins/admin/users/user-filter.tpl:15
 #, fuzzy
-msgid "Show samba users"
+msgid "Show Samba users"
 msgstr "Mostra utenti di posta"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -4031,10 +3763,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr ""
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -4042,118 +3770,58 @@ msgid ""
 "your data back."
 msgstr ""
 
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
+#: plugins/admin/departments/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 "
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:610
-#: plugins/admin/departments/class_departmentGeneric.inc:615
-#: plugins/admin/departments/class_departmentManagement.inc:26
-msgid "Departments"
-msgstr "Dipartimenti"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista dei dipartimenti"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:175
 #, fuzzy
-msgid "Department name"
-msgstr "Dipartimento"
-
-#: 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 ""
-
-#: 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 "Stato"
-
-#: 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 "Località"
-
-#: 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 "Indirizzo"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr "Telefono"
+msgid "Domain"
+msgstr "nel dominio"
 
-#: 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
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
 #, fuzzy
-msgid "Administrative settings"
-msgstr "Amministrazione"
+msgid "Domain component"
+msgstr "Amministratori di Dominio"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
+#: 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 "Paese"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr ""
+#: 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
+#, fuzzy
+msgid "Locality"
+msgstr "Località"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
+#: 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 "Organizzazione"
 
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -4183,6 +3851,22 @@ msgstr ""
 msgid "Choose subtree to place department in"
 msgstr ""
 
+#: 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
+#, fuzzy
+msgid "Administrative settings"
+msgstr "Amministrazione"
+
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -4205,11 +3889,41 @@ msgstr ""
 msgid "Descriptive text for   department"
 msgstr "Nome descrittivo del gruppo"
 
+#: 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 ""
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr ""
 
+#: 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 "Località"
+
+#: 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 "Stato"
+
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
 msgid "State where this subtree is located"
@@ -4220,6 +3934,16 @@ msgstr ""
 msgid "Location of this subtree"
 msgstr ""
 
+#: 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 "Indirizzo"
+
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -4230,6 +3954,20 @@ msgstr ""
 msgid "Base telephone number of this subtree"
 msgstr ""
 
+#: 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"
@@ -4237,76 +3975,38 @@ msgstr ""
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 #, fuzzy
 msgid "Domain Component"
 msgstr "Amministratori di Dominio"
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr "Lista dei dipartimenti"
-
-#: plugins/admin/departments/class_divListDepartment.inc:73
-msgid "Regular expression for matching department names"
-msgstr ""
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/class_department.inc:615
+msgid "Departments"
+msgstr "Dipartimenti"
 
-#: plugins/admin/departments/class_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 #, fuzzy
 msgid "Manage Departments"
 msgstr "Dipartimenti"
 
-#: 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 ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:336
+#: plugins/admin/departments/class_departmentManagement.inc:126
 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 ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:556
-#, fuzzy
-msgid "Domain"
-msgstr "nel 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 "Paese"
-
-#: plugins/admin/departments/class_departmentManagement.inc:592
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "Località"
-
-#: 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 "Organizzazione"
-
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 #, fuzzy
 msgid "Organization name"
 msgstr "Organizzazione"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Postal address"
 msgstr "CAP"
 
@@ -4329,14 +4029,53 @@ msgstr "Amministratori di Dominio"
 msgid "Name of domain to create"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr ""
-
 #: plugins/admin/departments/country.tpl:14
 msgid "Name of country to create"
 msgstr ""
 
+#: plugins/admin/departments/class_department.inc:386
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:618
+#, fuzzy
+msgid "Department name"
+msgstr "Dipartimento"
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr "Telefono"
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr ""
+
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr ""
@@ -4376,55 +4115,16 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: 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 ""
-
-#: plugins/admin/acl/class_aclManagement.inc:290
-#, fuzzy
-msgid "ACL role"
-msgstr "ACL"
-
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-#, fuzzy
-msgid "List of acls"
-msgstr "Lista dei gruppi"
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:84
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
 #, fuzzy
-msgid "Display acls matching"
-msgstr "Mosra gruppi corrispondenti a"
-
-#: 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 "Ruolo"
-
-#: plugins/admin/acl/class_divListACL.inc:165
-#, fuzzy
-msgid "Edit acl role"
-msgstr "Modifica contatto"
-
-#: plugins/admin/acl/class_divListACL.inc:185
-#, fuzzy
-msgid "Edit acl"
-msgstr "classe"
+msgid "Acl"
+msgstr "Annulla"
 
-#: plugins/admin/acl/class_divListACL.inc:192
+#: plugins/admin/acl/class_aclManagement.inc:154
 #, fuzzy
-msgid "Delete acl"
-msgstr "Rimuovi"
+msgid "ACL Assignment"
+msgstr "Riferimenti"
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
 #, fuzzy
@@ -4432,7 +4132,7 @@ msgid "ACL Templates"
 msgstr "Template"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:745
 #, fuzzy
 msgid "Access control roles"
 msgstr "Opzioni di accesso"
@@ -4442,55 +4142,73 @@ msgstr "Opzioni di accesso"
 msgid "Edit AC roles"
 msgstr "ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 #, fuzzy
 msgid "Reset ACL"
 msgstr "Rimuovi"
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 #, fuzzy
 msgid "No ACL settings for this category"
 msgstr "Nome descrittivo del gruppo"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, fuzzy, php-format
 msgid "ACL for these objects: %s"
 msgstr "Nome descrittivo del gruppo"
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 #, fuzzy
 msgid "Edit category ACL"
 msgstr "classe"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 #, fuzzy
 msgid "Reset category ACL"
 msgstr "classe"
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, fuzzy
 msgid "Object in use"
 msgstr "Nome dell'oggetto"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:753
+#: 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 "Ruolo"
+
+#: plugins/admin/acl/class_aclRole.inc:755
 #, fuzzy
 msgid "Permissions"
 msgstr "Permessi"
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
+#: plugins/admin/acl/acl-list.xml:11
 #, fuzzy
-msgid "ACL management"
-msgstr "Riferimenti"
+msgid "List of acls"
+msgstr "Lista dei gruppi"
+
+#: plugins/admin/acl/acl-filter.tpl:11
+#, fuzzy
+msgid "Show access control lists"
+msgstr "Opzioni di accesso"
+
+#: plugins/admin/acl/acl-filter.tpl:12
+#, fuzzy
+msgid "Show roles"
+msgstr "Mostra telefoni"
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
@@ -4507,277 +4225,273 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Opzioni applicazione"
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr "femmina"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr "maschio"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 #, fuzzy
 msgid "Serial number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr "valido"
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr "invalido"
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 msgid "No certificate installed"
 msgstr "Non ci sono certificati installati"
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Home Page"
 
-#: plugins/personal/generic/class_user.inc:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data di nascita"
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Impossibile aprite il certificato selezionato!"
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unità"
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identificativo della casa"
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Ultimo recapito"
 
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Località personale"
 
-#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Descrizoione unità"
 
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Funzione"
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numero seriale del certificato"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Pubblico"
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Strada"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "CAP"
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1598
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Impostazioni generali delle code"
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Identità"
 
-#: plugins/personal/generic/class_user.inc:1601
-msgid "Surname"
-msgstr "Cognome"
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 #, fuzzy
 msgid "User identification"
 msgstr "Amministrazione utenti"
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titolo onorifico"
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Titolo di studio"
 
-#: plugins/personal/generic/class_user.inc:1608
-#, fuzzy
-msgid "Gender"
-msgstr "Generale"
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
+msgstr "Sesso"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 #, fuzzy
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 #, fuzzy
 msgid "User picture"
 msgstr "Foto personale"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 #, fuzzy
 msgid "Department number"
 msgstr "Dipartimento"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 #, fuzzy
 msgid "Employee number"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1627
 #, fuzzy
 msgid "Room number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 #, fuzzy
 msgid "Pager number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 #, fuzzy
 msgid "Mobile number"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 #, fuzzy
 msgid "User password method"
 msgstr "Algorimo password"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 #, fuzzy
 msgid "User certificates"
 msgstr "Certificato standard"
@@ -4807,10 +4521,6 @@ msgstr "Cambia foto"
 msgid "Template name"
 msgstr "Template"
 
-#: plugins/personal/generic/generic.tpl:138
-msgid "Sex"
-msgstr "Sesso"
-
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
@@ -4940,6 +4650,13 @@ msgstr "Esporta"
 msgid "grace time active"
 msgstr ""
 
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+#, fuzzy
+msgid "active"
+msgstr "Privato"
+
 #: plugins/personal/posix/class_posixAccount.inc:173
 #, fuzzy
 msgid "password not changeable"
@@ -4950,146 +4667,142 @@ msgstr "Nuova password"
 msgid "password expired"
 msgstr "La password spira il"
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr "non configurata"
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr "automatico"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "La password non può essere cambiata per %s giorni dall'ultimo cambiamento"
 
-#: plugins/personal/posix/class_posixAccount.inc:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "La password deve essere cambiata dopo %s giorni"
 
-#: plugins/personal/posix/class_posixAccount.inc:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, fuzzy, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 "Disabilita l'account dopo %s giorni di inattività dopo che la password è "
 "spirata"
 
-#: plugins/personal/posix/class_posixAccount.inc:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, fuzzy, php-format
 msgid "Warn user %s days before password expiry"
 msgstr "Avvisa l'utente %s giorni prima che la password spiri"
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr "Gruppo di utenti"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Home directory"
 
-#: 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:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 #, fuzzy
 msgid "shadowMin"
 msgstr "Mostra terminali"
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 #, fuzzy
 msgid "shadowWarning"
 msgstr "Mostra workstation"
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 #, fuzzy
 msgid "shadowInactive"
 msgstr "Mostra stampanti"
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 #, fuzzy
 msgid "POSIX account"
 msgstr "Estenzioni FTP"
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 #, fuzzy
 msgid "Group ID"
 msgstr "Gruppo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Cambia la password"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 #, fuzzy
 msgid "Shadow min"
 msgstr "Mostra terminali"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Mostra workstation"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Mostra stampanti"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Mostra persone"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 #, fuzzy
 msgid "System trust model"
 msgstr "Accesso ai sistemi"
@@ -5157,10 +4870,18 @@ msgstr "Mostra gruppi di dipartimenti"
 msgid "Display groups matching"
 msgstr "Mosra gruppi corrispondenti a"
 
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr "Espressioni regolare per selezionare il nome del gruppo"
+
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "Mostra gruppi di utenti"
 
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr "Nome dell'utente del quale mostrare i gruppi"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -5395,52 +5116,42 @@ msgstr "nella cartella"
 
 #: setup/setup_config2.tpl:123
 #, fuzzy
-msgid "Logging options"
-msgstr "Utenti di Dominio"
-
-#: setup/setup_config2.tpl:127
-#, fuzzy
-msgid "Syslog"
-msgstr "Log di sitema"
-
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "Errore LDAP"
+msgid "GOsa logging"
+msgstr "Opzioni di posta dell'identità"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 #, fuzzy
 msgid "Mail settings"
 msgstr "Opzioni di posta dell'identità"
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr "Metodo di amministrazione della posta"
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 #, fuzzy
 msgid "Vacation templates"
 msgstr "Messaggio di di risposta automatica"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 #, fuzzy
 msgid "Snapshots / Undo"
 msgstr "Nome applicazione"
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 #, fuzzy
 msgid "Enable snapshots"
 msgstr "Crea estensioni di posta"
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 #, fuzzy
 msgid "Snapshot base"
 msgstr "Nome applicazione"
@@ -5762,6 +5473,11 @@ msgstr "Impostazioni Samba"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "Errore LDAP"
+
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -6123,7 +5839,7 @@ msgstr ""
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 #, fuzzy
 msgid "Yes"
 msgstr "Sistemi"
@@ -6131,7 +5847,7 @@ msgstr "Sistemi"
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 #, fuzzy
 msgid "No"
 msgstr "nessuno"
@@ -7014,6 +6730,197 @@ msgstr "Lingua preferita"
 msgid "Automatic"
 msgstr "automatico"
 
+#, fuzzy
+#~ msgid "Edit ogroup"
+#~ msgstr "Lista dei gruppi"
+
+#, fuzzy
+#~ msgid "List of ogroups"
+#~ msgstr "Lista dei gruppi"
+
+#, fuzzy
+#~ msgid "Use"
+#~ msgstr "Utenti"
+
+#, fuzzy
+#~ msgid "Filter entries with this syntax"
+#~ msgstr "Mostra gli indirizzi che corrispondono"
+
+#, fuzzy
+#~ msgid "MySQL error"
+#~ msgstr "Errore LDAP"
+
+#, fuzzy
+#~ msgid "Cannot add location to the database!"
+#~ msgstr "Impossibile connettersi al server del database!"
+
+#~ msgid "Submit department"
+#~ msgstr "Imposta dipartimento"
+
+#~ msgid "edit"
+#~ msgstr "modifica"
+
+#~ msgid "delete"
+#~ msgstr "elimina"
+
+#, fuzzy
+#~ msgid "Number of listed object groups"
+#~ msgstr "Nome del gruppo"
+
+#, fuzzy
+#~ msgid "Number of listed departments"
+#~ msgstr "Imposta dipartimento"
+
+#~ msgid "Select to see groups that are primary groups of users"
+#~ msgstr ""
+#~ "Selezione per mostrare i gruppi che sono gruppi primari per gli utenti"
+
+#, fuzzy
+#~ msgid "primary groups"
+#~ msgstr "Gruppo primario"
+
+#, fuzzy
+#~ msgid "samba groups mappings"
+#~ msgstr "Samba"
+
+#, fuzzy
+#~ msgid "samba groups"
+#~ msgstr "Gruppo Samba"
+
+#, fuzzy
+#~ msgid "application settings"
+#~ msgstr "applicazioni"
+
+#, fuzzy
+#~ msgid "mail settings"
+#~ msgstr "Opzioni di posta dell'identità"
+
+#, fuzzy
+#~ msgid "mail groups"
+#~ msgstr "Mostra gruppi di posta"
+
+#~ msgid "Select to see normal groups that have only functional aspects"
+#~ msgstr "Seleziona per mostrare i gruppi che hanno solo aspetti funzionali"
+
+#, fuzzy
+#~ msgid "functional groups"
+#~ msgstr "Mostra gruppi funzionali"
+
+#, fuzzy
+#~ msgid "Not allowed"
+#~ msgstr "Cambia la password"
+
+#, fuzzy
+#~ msgid "Number of listed groups"
+#~ msgstr "Nome del gruppo"
+
+#, fuzzy
+#~ msgid "group"
+#~ msgstr "gruppi"
+
+#~ msgid "User administration"
+#~ msgstr "Amministrazione utenti"
+
+#, fuzzy
+#~ msgid "templates"
+#~ msgstr "Template"
+
+#, fuzzy
+#~ msgid "GOsa object"
+#~ msgstr "Oggetto"
+
+#, fuzzy
+#~ msgid "functional users"
+#~ msgstr "Mostra utenti funzionali"
+
+#, fuzzy
+#~ msgid "POSIX users"
+#~ msgstr "Impostazioni Unix"
+
+#, fuzzy
+#~ msgid "samba users"
+#~ msgstr "Utenti di Dominio"
+
+#, fuzzy
+#~ msgid "proxy users"
+#~ msgstr "Mostra utenti proxy"
+
+#, fuzzy
+#~ msgid "phone users"
+#~ msgstr "Mostra utenti proxy"
+
+#, fuzzy
+#~ msgid "Edit UNIX properties"
+#~ msgstr "Modifica proprietà"
+
+#, fuzzy
+#~ msgid "Edit fax properies"
+#~ msgstr "Modifica proprietà"
+
+#, fuzzy
+#~ msgid "Create user with this template"
+#~ msgstr "Nuovo template"
+
+#, fuzzy
+#~ msgid "user"
+#~ msgstr "utenti"
+
+#, fuzzy
+#~ msgid "password"
+#~ msgstr "Password"
+
+#, fuzzy
+#~ msgid "Delete user"
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "You have no permission to modify object '%s'!"
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
+#, fuzzy
+#~ msgid "You have no permission to use this template!"
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
+#, fuzzy
+#~ msgid "You have no permission to change the lock status for this user!"
+#~ msgstr "Non hai il permesso di cambiare la tua password."
+
+#, fuzzy
+#~ msgid "Name / Department"
+#~ msgstr "Sali di dipartimento"
+
+#, fuzzy
+#~ msgid "ACL role"
+#~ msgstr "ACL"
+
+#, fuzzy
+#~ msgid "Display acls matching"
+#~ msgstr "Mosra gruppi corrispondenti a"
+
+#, fuzzy
+#~ msgid "Edit acl role"
+#~ msgstr "Modifica contatto"
+
+#, fuzzy
+#~ msgid "Edit acl"
+#~ msgstr "classe"
+
+#, fuzzy
+#~ msgid "Delete acl"
+#~ msgstr "Rimuovi"
+
+#, fuzzy
+#~ msgid "Gender"
+#~ msgstr "Generale"
+
+#, fuzzy
+#~ msgid "Logging options"
+#~ msgstr "Utenti di Dominio"
+
+#, fuzzy
+#~ msgid "Syslog"
+#~ msgstr "Log di sitema"
+
 #, fuzzy
 #~ msgid "Non common group"
 #~ msgstr "Mostra gruppi di posta"
@@ -7135,10 +7042,6 @@ msgstr "automatico"
 #~ msgid "Hour"
 #~ msgstr "ora"
 
-#, fuzzy
-#~ msgid "Minute"
-#~ msgstr "Stampante"
-
 #, fuzzy
 #~ msgid "Day"
 #~ msgstr "giorno"
@@ -7602,16 +7505,10 @@ msgstr "automatico"
 #~ msgid "Select to see users that have proxy settings"
 #~ msgstr "Seleziona per vedere gli utenti proxy"
 
-#~ msgid "Show primary groups"
-#~ msgstr "Mostra gruppi principali"
-
 #~ msgid "Select to see groups that have samba groups mappings"
 #~ msgstr ""
 #~ "Seleziona per mostrare i gruppi che sono gruppi samba per gli utenti"
 
-#~ msgid "Show samba groups"
-#~ msgstr "Mostra gruppi samba"
-
 #~ msgid "Select to see groups that have applications configured"
 #~ msgstr ""
 #~ "Seleziona per mostrare i gruppi che hanno configurate delle applicazioni"
@@ -7619,10 +7516,6 @@ msgstr "automatico"
 #~ msgid "Select to see groups that have mail settings"
 #~ msgstr "Seleziona per mostrare i gruppi che hanno configurata la posta"
 
-#, fuzzy
-#~ msgid "acl"
-#~ msgstr "Annulla"
-
 #~ msgid "Show departments"
 #~ msgstr "Mostra dipartimenti"
 
@@ -7644,9 +7537,6 @@ msgstr "automatico"
 #~ msgid "Show printers"
 #~ msgstr "Mostra stampanti"
 
-#~ msgid "Show phones"
-#~ msgstr "Mostra telefoni"
-
 #, fuzzy
 #~ msgid "Cannot connect to logging server '%s'."
 #~ msgstr "Impossibile connettersi al server del database!"
@@ -7963,10 +7853,6 @@ msgstr "automatico"
 #~ msgid "Import"
 #~ msgstr "Importa"
 
-#, fuzzy
-#~ msgid "Send message"
-#~ msgstr "Home Page"
-
 #, fuzzy
 #~ msgid "Notification send!"
 #~ msgstr "Non ci sono certificati installati"
@@ -8090,10 +7976,6 @@ msgstr "automatico"
 #~ msgid "Reomve"
 #~ msgstr "Rimuovi"
 
-#, fuzzy
-#~ msgid "GOsa ping"
-#~ msgstr "Opzioni di posta dell'identità"
-
 #, fuzzy
 #~ msgid "Say hello"
 #~ msgstr "Shell"
index e97164044ac301bcba4cd0e557a42f307dc4be1f..4ce49e7f4c44c401e37505a8725b1222dee27f77 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,19 +35,17 @@ msgstr ""
 #: 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -66,6 +64,7 @@ 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 ""
 
@@ -75,15 +74,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr ""
@@ -104,15 +102,14 @@ 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 ""
 
 #: 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr ""
 
@@ -241,7 +238,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 msgid "Members"
 msgstr ""
 
@@ -274,7 +271,7 @@ msgstr ""
 #: 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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -287,9 +284,7 @@ msgid "Verify password"
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr ""
 
@@ -335,7 +330,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr ""
 
@@ -374,47 +369,49 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.inc:596
 msgid "Continue"
 msgstr ""
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: 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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -424,9 +421,9 @@ msgstr ""
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -455,8 +452,7 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -585,9 +581,9 @@ msgstr ""
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
 msgstr ""
 
@@ -601,17 +597,17 @@ msgstr ""
 #: 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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 msgid "Configuration error"
@@ -622,7 +618,7 @@ msgstr ""
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 msgid "Password method"
 msgstr ""
 
@@ -630,7 +626,7 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -647,10 +643,11 @@ msgid "The password used as new is to short."
 msgstr ""
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: 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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -668,11 +665,11 @@ msgstr ""
 msgid "External password changer reported a problem: "
 msgstr ""
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr ""
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr ""
 
@@ -703,33 +700,37 @@ msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: 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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -769,11 +770,11 @@ msgstr ""
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:368
+#: html/index.php:369
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -851,6 +852,48 @@ msgstr ""
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr ""
+
+#: include/class_management.inc:144
+msgid "Filter error"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: include/class_management.inc:426 include/class_plugin.inc:1546
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: 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 ""
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -870,14 +913,14 @@ msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -888,11 +931,11 @@ msgstr ""
 msgid "Access control"
 msgstr ""
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr ""
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 msgid "All categories"
 msgstr ""
 
@@ -900,20 +943,20 @@ msgstr ""
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 msgid "One level"
 msgstr ""
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Current object"
 msgstr ""
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 msgid "Complete subtree"
 msgstr ""
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr ""
 
@@ -921,56 +964,54 @@ msgstr ""
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: 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
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr ""
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: 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
+#: 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
 msgid "Up"
 msgstr ""
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr ""
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr ""
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr ""
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr ""
@@ -993,7 +1034,7 @@ msgstr ""
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr ""
 
@@ -1033,13 +1074,13 @@ msgstr ""
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: 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
+#: 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
 msgid "Internal error"
 msgstr ""
 
@@ -1067,19 +1108,19 @@ msgstr ""
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 msgid "No members"
 msgstr ""
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 msgid "Access control list"
 msgstr ""
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 msgid "ACL roles"
 msgstr ""
 
@@ -1088,48 +1129,38 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 msgid "Go to root department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 msgid "Root"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 msgid "Go to users department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 msgid "Home"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr ""
 
@@ -1143,33 +1174,19 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 msgid "Choose a base"
 msgstr ""
 
-#: 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 ""
-
-#: include/class_baseSelectDialog.inc:61
-msgid "Use"
-msgstr ""
-
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1177,25 +1194,18 @@ msgstr ""
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr ""
 
-#: include/class_baseSelectDialog.inc:68
-msgid "Filter entries with this syntax"
-msgstr ""
-
-#: 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
+#: include/class_listing.inc:298 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
@@ -1203,355 +1213,371 @@ msgstr ""
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 msgid "created by"
 msgstr ""
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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 ""
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:132
+msgid "Edit this entry"
+msgstr ""
+
+#: include/class_sortableListing.inc:133
+msgid "Delete this entry"
+msgstr ""
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:399
+#: include/functions.inc:518
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:474
+#: include/functions.inc:603
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1049
+#: include/functions.inc:1232
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2309
+#: include/functions.inc:2764
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 msgid "Vietnamese"
 msgstr ""
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr ""
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1567,8 +1593,11 @@ msgstr ""
 #: 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr ""
 
@@ -1672,7 +1701,7 @@ msgstr ""
 msgid "Arguments"
 msgstr ""
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
@@ -1684,50 +1713,29 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: 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 ""
-
-#: include/class_plugin.inc:1547
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: 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 ""
-
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "from"
 msgstr ""
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr ""
 
-#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 msgid "Restore"
 msgstr ""
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 msgid "cut"
 msgstr ""
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr ""
 
@@ -2305,118 +2313,98 @@ msgid ""
 "setup?"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:665
+#: include/class_ldap.inc:692
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:740
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:800
+#: include/class_ldap.inc:827
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr ""
 
-#: include/class_ldap.inc:802
+#: include/class_ldap.inc:829
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr ""
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr ""
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_log.inc:139
-msgid "MySQL error"
-msgstr ""
-
-#: include/class_log.inc:139
-#, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr ""
-
-#: 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 ""
-
-#: include/class_log.inc:219
-#, php-format
-msgid "Cannot add location to the database!"
-msgstr ""
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 msgid "Cannot not parse XML!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr ""
 
-#: include/class_config.inc:270
+#: include/class_config.inc:317
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 
-#: include/class_config.inc:636
+#: include/class_config.inc:694
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr ""
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid "Configuration"
 msgstr ""
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2435,44 +2423,44 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: 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: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
 #, php-format
 msgid "Copy and paste failed!"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, php-format
 msgid "Cannot set permission for '%s'"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, php-format
 msgid "No write permission in '%s'"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 msgid "Cannot paste"
 msgstr ""
 
@@ -2482,11 +2470,11 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr ""
@@ -2497,32 +2485,26 @@ msgid "UNIX"
 msgstr ""
 
 #: 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr ""
 
@@ -2531,34 +2513,34 @@ msgid "FTP"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:61
-#: 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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2567,14 +2549,13 @@ msgid "Phone"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr ""
 
@@ -2583,19 +2564,17 @@ msgid "Thin Client"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr ""
 
@@ -2633,253 +2612,48 @@ msgstr ""
 msgid "The GOsa team"
 msgstr ""
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "List of object groups"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-msgid "user groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-msgid "nested groups"
-msgstr ""
-
-#: 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 ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-msgid "department groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-msgid "server groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-msgid "workstation groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-msgid "windows workstation groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-msgid "terminal groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-msgid "printer groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-msgid "phone groups"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-msgid "Number of listed object groups"
-msgstr ""
-
-#: 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 ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroup.inc:1117
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 msgid "Manage object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 msgid "Infrastructure error"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-msgid "object group"
-msgstr ""
-
-#: 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 ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 msgid "Templates"
 msgstr ""
 
-#: 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
+#: 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
 msgid "User"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 msgid "Terminal"
 msgstr ""
 
@@ -2893,6 +2667,19 @@ msgstr ""
 msgid "departments"
 msgstr ""
 
+#: 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 ""
+
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 msgid "people"
@@ -2944,7 +2731,9 @@ msgid "applications"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr ""
 
@@ -2962,20 +2751,20 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 msgid "full access"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr ""
 
@@ -2993,22 +2782,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3036,13 +2820,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr ""
@@ -3096,7 +2886,7 @@ msgid "Select a base"
 msgstr ""
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr ""
@@ -3134,10 +2924,9 @@ msgid "FAI summary"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr ""
 
@@ -3149,52 +2938,150 @@ msgstr ""
 msgid "Please enter the new object group name"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
+#: 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
+msgid "Filter"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
-msgid "Display objects of department"
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+msgid "user groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-#: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-msgid "Choose the department the search will be based on"
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+msgid "nested groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
-msgid "Display objects matching"
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+msgid "application groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-msgid "Regular expression for matching object names"
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+msgid "department groups"
 msgstr ""
 
-#: plugins/admin/ogroups/trust_machines.tpl:6
-#: plugins/admin/groups/trust_machines.tpl:6
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+msgid "server groups"
 msgstr ""
 
-#: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+msgid "workstation groups"
 msgstr ""
 
-#: plugins/admin/ogroups/trust_machines.tpl:30
-#: plugins/admin/groups/trust_machines.tpl:30
-#: plugins/personal/posix/trust_machines.tpl:30
-msgid "Display systems matching"
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+msgid "windows workstation groups"
 msgstr ""
 
-#: plugins/admin/ogroups/trust_machines.tpl:31
-#: plugins/admin/groups/trust_machines.tpl:31
-#: plugins/personal/posix/trust_machines.tpl:31
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+msgid "terminal groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+msgid "printer groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+msgid "phone groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+msgid "List of object groups"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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
+msgid "Edit object group"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+msgid "Remove object group"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/trust_machines.tpl:27
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+msgid "Choose the department the search will be based on"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:40
+msgid "Display objects matching"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+msgid "Regular expression for matching object names"
+msgstr ""
+
+#: plugins/admin/ogroups/trust_machines.tpl:6
+#: plugins/admin/groups/trust_machines.tpl:6
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr ""
+
+#: plugins/admin/ogroups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr ""
+
+#: plugins/admin/ogroups/trust_machines.tpl:30
+#: plugins/admin/groups/trust_machines.tpl:30
+#: plugins/personal/posix/trust_machines.tpl:30
+msgid "Display systems matching"
+msgstr ""
+
+#: plugins/admin/ogroups/trust_machines.tpl:31
+#: plugins/admin/groups/trust_machines.tpl:31
+#: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr ""
 
@@ -3221,7 +3108,6 @@ msgid "Display users of department"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr ""
 
@@ -3283,66 +3169,16 @@ msgstr ""
 msgid "Not in all groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:85
-msgid "primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:86
-msgid "samba groups mappings"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-msgid "samba groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:88
-msgid "application settings"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-msgid "mail settings"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:91
-msgid "mail groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:93
-msgid "functional groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:188
-#: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:206
-msgid "Posix"
+#: plugins/admin/groups/group-filter.tpl:11
+msgid "Show primary groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:244
-#: plugins/admin/users/class_divListUsers.inc:278
-#: plugins/admin/users/class_divListUsers.inc:290
-msgid "Not allowed"
+#: plugins/admin/groups/group-filter.tpl:12
+msgid "Show samba groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:303
-msgid "Number of listed groups"
+#: plugins/admin/groups/group-filter.tpl:13
+msgid "Show mail groups"
 msgstr ""
 
 #: plugins/admin/groups/class_groupGeneric.inc:161
@@ -3389,52 +3225,52 @@ msgstr ""
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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 ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 msgid "Group member"
 msgstr ""
 
@@ -3442,173 +3278,63 @@ msgstr ""
 msgid "Group settings"
 msgstr ""
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
-msgid "Group administration"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-msgid "group"
-msgstr ""
-
-#: 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 ""
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: plugins/admin/users/class_divListUsers.inc:85
-msgid "templates"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "GOsa object"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "functional users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:87
-msgid "POSIX users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:88
-msgid "mail users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:89
-msgid "samba users"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:90
-msgid "proxy users"
+#: plugins/admin/groups/group-list.xml:138
+msgid "Edit group"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:93
-msgid "phone users"
+#: plugins/admin/groups/group-list.xml:151
+msgid "Remove group"
 msgstr ""
 
-#: 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 ""
-
-#: plugins/admin/users/class_divListUsers.inc:204
-msgid "GOsa"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:205
-#: plugins/admin/users/class_userManagement.inc:1067
-msgid "Edit generic properties"
+#: plugins/admin/groups/class_groupManagement.inc:26
+msgid "Group administration"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:207
-msgid "Edit UNIX properties"
+#: plugins/admin/groups/class_groupManagement.inc:155
+msgid "Posix"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
-msgid "Edit environment properties"
+#: plugins/admin/groups/class_groupManagement.inc:156
+msgid "Edit posix properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 msgid "Edit mail properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1095
-msgid "Edit phone properties"
-msgstr ""
-
-#: 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 ""
-
-#: plugins/admin/users/class_divListUsers.inc:215
-msgid "Edit fax properies"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:217
-#: plugins/admin/users/class_userManagement.inc:1079
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:750
 msgid "Edit samba properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/users/class_userManagement.inc:1083
-msgid "Edit netatalk properties"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:220
-msgid "Create user from template"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:221
-msgid "Create user with this template"
-msgstr ""
-
-#: 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"
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
+msgid "Edit phone properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
-msgid "user"
+#: plugins/admin/groups/class_groupManagement.inc:187
+msgid "Menu"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:274
-msgid "password"
+#: plugins/admin/groups/class_groupManagement.inc:188
+msgid "Edit start menu properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:287
-msgid "Delete user"
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:758
+msgid "Edit environment properties"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:376
-msgid "Number of listed users"
+#: 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 ""
 
 #: plugins/admin/users/password.tpl:4
@@ -3651,6 +3377,13 @@ msgid ""
 "templates."
 msgstr ""
 
+#: 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 ""
+
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
@@ -3661,85 +3394,104 @@ msgstr ""
 msgid "First name"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:559
-msgid "You have no permission to use this template!"
+#: 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 ""
 
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:662
-msgid "You have no permission to change the lock status for this user!"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:650
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
-msgstr ""
-
-#: 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"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:723
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 msgid "Lock account"
 msgstr ""
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+msgid "Edit generic properties"
+msgstr ""
+
+#: 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
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 msgid "Edit POSIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:753
+msgid "Netatalk"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:754
+msgid "Edit netatalk properties"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "Edit FAX properties"
 msgstr ""
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr ""
+
 #: plugins/admin/users/user-list.xml:49
-msgid "Name / Department"
+#: plugins/personal/generic/class_user.inc:1608
+msgid "Surname"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:175
+#: plugins/admin/users/user-list.xml:140
+msgid "Lock users"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:148
+msgid "Unlock users"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:167
+msgid "Apply template"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:199
+msgid "New user from template"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:213
 msgid "Edit user"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 msgid "Remove user"
 msgstr ""
 
@@ -3752,15 +3504,15 @@ msgid "Show functional users"
 msgstr ""
 
 #: plugins/admin/users/user-filter.tpl:13
-msgid "Show mail users"
+msgid "Show POSIX users"
 msgstr ""
 
 #: plugins/admin/users/user-filter.tpl:14
-msgid "Show POSIX users"
+msgid "Show Mail users"
 msgstr ""
 
 #: plugins/admin/users/user-filter.tpl:15
-msgid "Show samba users"
+msgid "Show Samba users"
 msgstr ""
 
 #: plugins/admin/users/templatize.tpl:2
@@ -3777,10 +3529,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr ""
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -3788,115 +3536,54 @@ msgid ""
 "your data back."
 msgstr ""
 
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
+#: plugins/admin/departments/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 "
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:610
-#: plugins/admin/departments/class_departmentGeneric.inc:615
-#: plugins/admin/departments/class_departmentManagement.inc:26
-msgid "Departments"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
-msgid "Department name"
-msgstr ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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 ""
-
-#: 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"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:175
+msgid "Domain"
 msgstr ""
 
-#: 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"
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
+#: 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 ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
+#: 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 ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
+#: 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 ""
 
 #: plugins/admin/departments/locality.tpl:11
@@ -3926,6 +3613,21 @@ msgstr ""
 msgid "Choose subtree to place department in"
 msgstr ""
 
+#: 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 ""
+
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -3947,11 +3649,41 @@ msgstr ""
 msgid "Descriptive text for   department"
 msgstr ""
 
+#: 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 ""
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr ""
 
+#: 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 ""
+
+#: 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 ""
+
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
 msgid "State where this subtree is located"
@@ -3962,6 +3694,16 @@ msgstr ""
 msgid "Location of this subtree"
 msgstr ""
 
+#: 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 ""
+
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -3972,6 +3714,20 @@ msgstr ""
 msgid "Base telephone number of this subtree"
 msgstr ""
 
+#: 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 ""
+
 #: plugins/admin/departments/generic.tpl:99
 #: plugins/admin/departments/organization.tpl:99
 msgid "Base facsimile telephone number of this subtree"
@@ -3979,71 +3735,35 @@ msgstr ""
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr ""
-
-#: plugins/admin/departments/class_divListDepartment.inc:73
-msgid "Regular expression for matching department names"
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/class_department.inc:615
+msgid "Departments"
 msgstr ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 msgid "Manage Departments"
 msgstr ""
 
-#: 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 ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:336
+#: plugins/admin/departments/class_departmentManagement.inc:126
 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 ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:556
-msgid "Domain"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:580
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:592
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-msgid "Locality"
-msgstr ""
-
-#: 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 ""
-
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 msgid "Organization name"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Postal address"
 msgstr ""
 
@@ -4064,14 +3784,52 @@ msgstr ""
 msgid "Name of domain to create"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr ""
-
 #: plugins/admin/departments/country.tpl:14
 msgid "Name of country to create"
 msgstr ""
 
+#: plugins/admin/departments/class_department.inc:386
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:618
+msgid "Department name"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr ""
+
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr ""
@@ -4110,48 +3868,13 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: 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 ""
-
-#: plugins/admin/acl/class_aclManagement.inc:290
-msgid "ACL role"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-msgid "List of acls"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:84
-msgid "Display acls matching"
-msgstr ""
-
-#: 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 ""
-
-#: plugins/admin/acl/class_divListACL.inc:165
-msgid "Edit acl role"
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
+msgid "Acl"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:185
-msgid "Edit acl"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:192
-msgid "Delete acl"
+#: plugins/admin/acl/class_aclManagement.inc:154
+msgid "ACL Assignment"
 msgstr ""
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
@@ -4159,7 +3882,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:745
 msgid "Access control roles"
 msgstr ""
 
@@ -4167,47 +3890,63 @@ msgstr ""
 msgid "Edit AC roles"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:753
+#: 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 ""
+
+#: plugins/admin/acl/class_aclRole.inc:755
 msgid "Permissions"
 msgstr ""
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
-msgid "ACL management"
+#: plugins/admin/acl/acl-list.xml:11
+msgid "List of acls"
+msgstr ""
+
+#: plugins/admin/acl/acl-filter.tpl:11
+msgid "Show access control lists"
+msgstr ""
+
+#: plugins/admin/acl/acl-filter.tpl:12
+msgid "Show roles"
 msgstr ""
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
@@ -4224,261 +3963,258 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 msgid "Serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 msgid "No certificate installed"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1598
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1601
-msgid "Surname"
-msgstr ""
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1608
-msgid "Gender"
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 msgid "User certificates"
 msgstr ""
 
@@ -4506,10 +4242,6 @@ msgstr ""
 msgid "Template name"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:138
-msgid "Sex"
-msgstr ""
-
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
@@ -4631,6 +4363,12 @@ msgstr ""
 msgid "grace time active"
 msgstr ""
 
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+msgid "active"
+msgstr ""
+
 #: plugins/personal/posix/class_posixAccount.inc:173
 msgid "password not changeable"
 msgstr ""
@@ -4639,133 +4377,129 @@ msgstr ""
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr ""
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr ""
 
-#: 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 ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 msgid "System trust model"
 msgstr ""
 
@@ -4829,10 +4563,18 @@ msgstr ""
 msgid "Display groups matching"
 msgstr ""
 
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr ""
+
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr ""
 
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr ""
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr ""
@@ -5033,46 +4775,38 @@ msgid "Government mode"
 msgstr ""
 
 #: setup/setup_config2.tpl:123
-msgid "Logging options"
+msgid "GOsa logging"
 msgstr ""
 
-#: setup/setup_config2.tpl:127
-msgid "Syslog"
-msgstr ""
-
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-msgid "MySQL"
-msgstr ""
-
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 msgid "Mail settings"
 msgstr ""
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr ""
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 msgid "Vacation templates"
 msgstr ""
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 msgid "Enable snapshots"
 msgstr ""
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 msgid "Snapshot base"
 msgstr ""
 
@@ -5367,6 +5101,10 @@ msgstr ""
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:120
+msgid "MySQL"
+msgstr ""
+
 #: setup/class_setupStep_Checks.inc:121
 msgid ""
 "GOsa requires this module to communicate with several supported databases."
@@ -5669,14 +5407,14 @@ msgstr ""
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "Yes"
 msgstr ""
 
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "No"
 msgstr ""
 
index 29d4baa14eef7aa6d6892a55916fb9be96220444..51c2ed575c02b5f096ded150eb9c1efd09d92592 100644 (file)
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: 2006-06-02 16:58+0100\n"
 "Last-Translator: Niels Klomp (CareWorks ICT Services) <nk@careworks.nl>\n"
 "Language-Team: CareWorks ICT Services <info@careworks.nl>\n"
@@ -38,19 +38,17 @@ msgstr "Filters"
 #: 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -72,6 +70,7 @@ 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 ""
 "Indien u zeker bent drukt u dan 'Verwijderen' om door te gaan of 'Annuleren' "
@@ -83,15 +82,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr "Annuleren"
@@ -114,15 +112,14 @@ msgstr "Voer uw <i>gebruikersnaam</i> en <i>wachtwoord</i> in"
 
 #: 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 "Gebruikersnaam"
 
 #: 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "Wachtwoord"
 
@@ -266,7 +263,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 msgid "Members"
 msgstr "Groepsleden"
 
@@ -304,7 +301,7 @@ msgstr "Oud wachtwoord"
 #: 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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -318,9 +315,7 @@ msgid "Verify password"
 msgstr "Nogmaals wachtwoord"
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr "Verander wachtwoord"
 
@@ -369,7 +364,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr "Object"
 
@@ -412,47 +407,49 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.inc:596
 msgid "Continue"
 msgstr "Doorgaan"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: 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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -462,9 +459,9 @@ msgstr "Fout"
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -495,8 +492,7 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -648,9 +644,9 @@ msgstr "Aangemeld:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 #, fuzzy
 msgid "Fatal error"
 msgstr "Terminal server"
@@ -665,17 +661,17 @@ msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
 #: 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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 #, fuzzy
@@ -688,7 +684,7 @@ msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Directory '%s' die opgegeven is als compileer directory is niet toegankelijk!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 #, fuzzy
 msgid "Password method"
 msgstr "Wachtwoord encryptie"
@@ -697,7 +693,7 @@ msgstr "Wachtwoord encryptie"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -717,10 +713,11 @@ msgid "The password used as new is to short."
 msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: 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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -738,11 +735,11 @@ msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 msgid "External password changer reported a problem: "
 msgstr "Extern wachtwoord verander mechanisme rapporteerde een probleem:"
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr "De sessie zal niet versleuteld zijn."
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr "Gebruik een SSL sessie"
 
@@ -775,33 +772,37 @@ msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: 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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -846,13 +847,13 @@ msgstr "Nagios authenticatie"
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:368
+#: html/index.php:369
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Account is geblokkeerd. Neem a.u.b. contact op met de systeembeheerder."
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -941,6 +942,51 @@ msgstr ""
 "Help directory '%s' is niet toegankelijk. Er kunnen geen helpbestanden "
 "gelezen worden."
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr "niet geconfigureerd"
+
+#: include/class_management.inc:144
+#, fuzzy
+msgid "Filter error"
+msgstr "Terminal server"
+
+#: 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
+#, fuzzy
+msgid "Permission"
+msgstr "Rechten"
+
+#: 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
+#, fuzzy
+msgid "Permission error"
+msgstr "Rechten"
+
+#: include/class_management.inc:426 include/class_plugin.inc:1546
+#, fuzzy, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
+
+#: 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
+#, fuzzy, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -960,14 +1006,14 @@ msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -979,12 +1025,12 @@ msgstr ""
 msgid "Access control"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 #, fuzzy
 msgid "Manage access control lists"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 #, fuzzy
 msgid "All categories"
 msgstr "Categorie toevoegen"
@@ -993,23 +1039,23 @@ msgstr "Categorie toevoegen"
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 #, fuzzy
 msgid "One level"
 msgstr "Log prioriteit"
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 #, fuzzy
 msgid "Current object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 #, fuzzy
 msgid "Complete subtree"
 msgstr "Subonderdelen negeren"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr ""
 
@@ -1017,56 +1063,54 @@ msgstr ""
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: 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
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Gebruikers"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr "Groepen"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: 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
+#: 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
 msgid "Up"
 msgstr "Omhoog"
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "Omlaag"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr "Bewerken"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr "Rechten"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr "Verwijderen"
@@ -1090,7 +1134,7 @@ msgstr "Categorie"
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr ""
 
@@ -1136,13 +1180,13 @@ msgstr "Nieuw FAI object aanmaken"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: 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
+#: 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
 #, fuzzy
 msgid "Internal error"
 msgstr "Terminal server"
@@ -1172,22 +1216,22 @@ msgstr "! onbekend id"
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "inactive"
 msgstr "actief"
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "No members"
 msgstr "Groepsleden"
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 #, fuzzy
 msgid "Access control list"
 msgstr "Toegangsopties"
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 #, fuzzy
 msgid "ACL roles"
 msgstr "Rechten"
@@ -1197,48 +1241,38 @@ msgstr "Rechten"
 msgid "Close"
 msgstr "Sluiten"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 msgid "Go to root department"
 msgstr "Ga naar basis afdelingen"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 msgid "Root"
 msgstr "Basis"
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 msgid "Go to users department"
 msgstr "Ga naar gebruikers afdeling"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 msgid "Home"
 msgstr "Home"
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr "Lijst herladen"
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr "Verwerk"
 
@@ -1253,35 +1287,20 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 #, fuzzy
 msgid "Choose a base"
 msgstr "Selecteer een basis"
 
-#: 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 ""
-
-#: include/class_baseSelectDialog.inc:61
-#, fuzzy
-msgid "Use"
-msgstr "Gebruiker"
-
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1289,26 +1308,18 @@ msgstr "Gebruiker"
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "Basis"
 
-#: include/class_baseSelectDialog.inc:68
-#, fuzzy
-msgid "Filter entries with this syntax"
-msgstr "Filter regels met deze syntax"
-
-#: 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
+#: include/class_listing.inc:298 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
@@ -1317,96 +1328,110 @@ msgstr "Filter regels met deze syntax"
 msgid "Select all"
 msgstr "Selecteer"
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 #, fuzzy
 msgid "created by"
 msgstr "Aanmaken"
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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 "Acties"
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 #, fuzzy
 msgid "Copy"
 msgstr "kopieer"
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 #, fuzzy
 msgid "Cut"
 msgstr "knippen"
 
-#: 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
+#: 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
 msgid "Paste"
 msgstr "Plakken"
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Nagios account aanmaken"
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 #, fuzzy
 msgid "Export list"
 msgstr "Exporteer"
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Nagios account aanmaken"
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:132
+msgid "Edit this entry"
+msgstr "Bewerk deze invoer"
+
+#: include/class_sortableListing.inc:133
+msgid "Delete this entry"
+msgstr "Verwijder deze invoer"
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "FATAAL: Fout bij het verbinden met de LDAP server. De server meldt: '%s'."
 
-#: include/functions.inc:399
+#: include/functions.inc:518
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
 
-#: include/functions.inc:474
+#: include/functions.inc:603
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1415,12 +1440,12 @@ msgstr ""
 "Kan de blokkade informatie niet ophalen uit de LDAP database. Controleer a.u."
 "b. de 'config' regel in gosa.conf!"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server"
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -1429,12 +1454,12 @@ msgstr ""
 "Er zijn meerdere blokkades voor het te blokkeren object gevonden. Dat zou "
 "niet mogelijk moeten zijn. Meervoudige verwijzingen worden opgeschoond."
 
-#: include/functions.inc:1049
+#: include/functions.inc:1232
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
 
-#: include/functions.inc:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1443,166 +1468,166 @@ msgstr ""
 "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
 "limiet nog steeds overschreden wordt."
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Instellen"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "U staat op het punt de invoer '%s' te kopieren."
 
-#: include/functions.inc:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr "Regels per pagina"
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Filter toepassen"
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa ontwikkelversie (Revisie %s)"
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 #, fuzzy
 msgid "LDAP warning"
 msgstr "LDAP beheer"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Kan de schema informatie niet ophalen van de server. Schema controle is "
 "onmogelijk!"
 
-#: include/functions.inc:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Toon FAI sjabloon objecten"
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2309
+#: include/functions.inc:2764
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "Bestand is beschikbaar"
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr "Duits"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr "Frans"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr "Italiaans"
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr "Spaans"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr "Engels"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 msgid "Polish"
 msgstr "Pools"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 #, fuzzy
 msgid "Chinese"
 msgstr "Chipset"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Naam"
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr "Russisch"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1610,59 +1635,59 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
 "bestaat niet."
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Ga naar basis afdelingen"
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 #, fuzzy
 msgid "no ID available!"
 msgstr "Bestand is beschikbaar"
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, fuzzy, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
@@ -1671,36 +1696,38 @@ msgstr ""
 "Kan niet verbinden met de opgegeven database. Controleer uw GLPI "
 "configuratie a.u.b."
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Het verwijder proces is geannuleerd door plugin '%s': %s"
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr "Referenties"
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, fuzzy, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "U staat op het punt de macro '%s' te verwijderen."
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 #, fuzzy
 msgid "Remove snapshot"
 msgstr "Nagios account aanmaken"
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1716,8 +1743,11 @@ msgstr ""
 #: 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -1830,7 +1860,7 @@ msgstr "Type"
 msgid "Arguments"
 msgstr "Argumenten"
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
@@ -1843,54 +1873,32 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: 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
-#, fuzzy
-msgid "Permission"
-msgstr "Rechten"
-
-#: include/class_plugin.inc:1547
-#, fuzzy, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
-
-#: include/class_plugin.inc:1559 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1587
-#, fuzzy, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "U heeft geen toestemming om uw wachtwoord te veranderen!"
-
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 #, fuzzy
 msgid "from"
 msgstr "willekeurig"
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 #, fuzzy
 msgid "to"
 msgstr "Stop"
 
-#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 #, fuzzy
 msgid "Restore"
 msgstr "Opnieuw proberen"
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 msgid "cut"
 msgstr "knippen"
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr "kopieer"
 
@@ -2514,37 +2522,37 @@ msgid ""
 "setup?"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:665
+#: include/class_ldap.inc:692
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:740
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:800
+#: include/class_ldap.inc:827
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "bij het bewerken van '%s' op LDAP server '%s'"
 
-#: include/class_ldap.inc:802
+#: include/class_ldap.inc:829
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "bij het bewerken van LDAP server %s"
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2553,92 +2561,71 @@ msgstr ""
 "Dit is geen geldige DN: '%s'. Een blok dat geïmporteerd wordt, dient te "
 "beginnen met 'dn: ...' op regel %s"
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Fout bij het importeren van dn: '%s', controleer uw LDIF bestand a.u.b. "
 "vanaf regel %s!"
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, fuzzy, php-format
 msgid "Logging failed: %s"
 msgstr "Log DB gebruiker"
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr ""
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 #, fuzzy
 msgid "Specified objectType is empty or invalid!"
 msgstr "De opgegeven naam is ongeldig."
 
-#: include/class_log.inc:139
-#, fuzzy
-msgid "MySQL error"
-msgstr "LDAP fout:"
-
-#: include/class_log.inc:139
-#, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr ""
-
-#: 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 ""
-
-#: include/class_log.inc:219
-#, fuzzy, php-format
-msgid "Cannot add location to the database!"
-msgstr "Kan niet verbinden met de database server!"
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Onbekende FAI status %s"
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "XML fout in gosa.conf: %s op regel %d"
 
-#: include/class_config.inc:270
+#: include/class_config.inc:317
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Kan niet verbinden met de LDAP server. Neem a.u.b. contact op met de "
 "systeembeheerder."
 
-#: include/class_config.inc:636
+#: include/class_config.inc:694
 #, fuzzy
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "SID en/of RIDBASE ontbreken in uw configuratie!"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 #, fuzzy
 msgid "Configuration"
 msgstr "Configuratie bestand"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2657,44 +2644,44 @@ msgstr ""
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: 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: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
 #, fuzzy, php-format
 msgid "Copy and paste failed!"
 msgstr "Kopieren &amp; plakken wizard"
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, fuzzy, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, fuzzy, php-format
 msgid "No write permission in '%s'"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 #, fuzzy
 msgid "Cannot paste"
 msgstr "Plakken onmogelijk"
@@ -2705,11 +2692,11 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Algemeen"
@@ -2720,32 +2707,26 @@ 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr "E-mail"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr "Fax"
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2754,34 +2735,34 @@ msgid "FTP"
 msgstr "Ftp"
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr "Groep"
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr "Afdeling"
 
 #: plugins/generic/references/class_reference.inc:61
-#: 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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2790,14 +2771,13 @@ msgid "Phone"
 msgstr "Telefoon"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr "Programma"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Server"
 
@@ -2806,19 +2786,17 @@ msgid "Thin Client"
 msgstr "Thin Client"
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr "Werkstation"
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Objectgroep"
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr "Printer"
 
@@ -2862,7 +2840,13 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Het GOsa team"
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -2870,265 +2854,40 @@ msgstr ""
 "Controleer a.u.b. of u dit daadwerkelijk wil doen, aangezien er geen "
 "mogelijkheid voor GOsa is om uw data terug te krijgen."
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "List of object groups"
-msgstr "Lijst met objectgroepen"
-
-#: 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 "Eigenschappen"
-
-#: 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 "Acties"
-
-#: 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
-#, fuzzy, php-format
-msgid "Show %s"
-msgstr "Toon groepen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-#, fuzzy
-msgid "user groups"
-msgstr "groepen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-#, fuzzy
-msgid "nested groups"
-msgstr "Objectgroepen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:93
-#: plugins/admin/ogroups/class_divListOGroup.inc:94
-#: plugins/admin/groups/class_divListGroup.inc:89
-#, fuzzy
-msgid "application groups"
-msgstr "Toon programma groepen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-#, fuzzy
-msgid "department groups"
-msgstr "afdelingen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-#, fuzzy
-msgid "server groups"
-msgstr "servers"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-#, fuzzy
-msgid "workstation groups"
-msgstr "werkstations"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-#, fuzzy
-msgid "windows workstation groups"
-msgstr "Toon werkstations"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-#, fuzzy
-msgid "terminal groups"
-msgstr "Toon E-mail groepen"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-#, fuzzy
-msgid "printer groups"
-msgstr "Primaire groep"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-#, fuzzy
-msgid "phone groups"
-msgstr "Toon groepen"
-
-#: 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 "Reguliere expressie voor overeenkomende groepnamen"
-
-#: 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 "Verwerk afdeling"
-
-#: 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 "Aanmaken"
-
-#: 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 "Verwijderen"
-
-#: 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 "Bewerk"
-
-#: 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 "Bewerk deze invoer"
-
-#: 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 "Verwijder"
-
-#: 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 "Verwijder deze invoer"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-#, fuzzy
-msgid "Number of listed object groups"
-msgstr "Naam van objectgroepen"
-
-#: 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
-#, fuzzy
-msgid "Number of listed departments"
-msgstr "Naam van de afdeling"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroup.inc:1117
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr "Objectgroepen"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #, fuzzy
 msgid "Manage object groups"
 msgstr "Naam van objectgroepen"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "PHP fout"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#, fuzzy
-msgid "object group"
-msgstr "Objectgroep"
-
-#: 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
-#, fuzzy
-msgid "Permission error"
-msgstr "Rechten"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 #, fuzzy
 msgid "Templates"
 msgstr "Sjabloon"
 
-#: 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
+#: 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
 msgid "User"
 msgstr "Gebruiker"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #, fuzzy
 msgid "Windows Install"
 msgstr "Windows werkstation"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -3142,6 +2901,19 @@ msgstr ""
 msgid "departments"
 msgstr "afdelingen"
 
+#: 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
+#, fuzzy, php-format
+msgid "Show %s"
+msgstr "Toon groepen"
+
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 #, fuzzy
@@ -3195,7 +2967,9 @@ msgid "applications"
 msgstr "programma's"
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr "geen"
 
@@ -3214,20 +2988,20 @@ msgstr "Windows werkstation"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "gedeactiveerd"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 msgid "full access"
 msgstr "volledige toegang"
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
 
@@ -3245,22 +3019,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3288,13 +3057,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Naam"
@@ -3352,7 +3127,7 @@ msgid "Select a base"
 msgstr "Selecteer een basis"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Systeem vertrouwen"
@@ -3391,10 +3166,9 @@ msgid "FAI summary"
 msgstr "FAI samenvatting"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr "Omgeving"
 
@@ -3407,24 +3181,136 @@ msgstr "Programma's"
 msgid "Please enter the new object group name"
 msgstr "Geef a.u.b. een nieuwe naam op"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Selecteer de toe te voegen objecten"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
-msgid "Display objects of department"
-msgstr "Toon objecten van afdeling"
+#: 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 "Filters"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-#: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-msgid "Choose the department the search will be based on"
-msgstr "Selecteer de afdeling waarbinnen gezocht zal worden"
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+#, fuzzy
+msgid "user groups"
+msgstr "groepen"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+#, fuzzy
+msgid "nested groups"
+msgstr "Objectgroepen"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+#, fuzzy
+msgid "application groups"
+msgstr "Toon programma groepen"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+#, fuzzy
+msgid "department groups"
+msgstr "afdelingen"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+#, fuzzy
+msgid "server groups"
+msgstr "servers"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+#, fuzzy
+msgid "workstation groups"
+msgstr "werkstations"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+#, fuzzy
+msgid "windows workstation groups"
+msgstr "Toon werkstations"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+#, fuzzy
+msgid "terminal groups"
+msgstr "Toon E-mail groepen"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+#, fuzzy
+msgid "printer groups"
+msgstr "Primaire groep"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+#, fuzzy
+msgid "phone groups"
+msgstr "Toon groepen"
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+msgid "List of object groups"
+msgstr "Lijst met objectgroepen"
+
+#: 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 "Eigenschappen"
+
+#: 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 "Aanmaken"
+
+#: 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 "Verwijderen"
+
+#: plugins/admin/ogroups/ogroup-list.xml:106
+#: plugins/admin/groups/group-list.xml:106
+#: plugins/admin/users/user-list.xml:156
+#, fuzzy
+msgid "Send message"
+msgstr "Bericht in wachtstand plaatsen"
+
+#: plugins/admin/ogroups/ogroup-list.xml:142
+#, fuzzy
+msgid "Edit object group"
+msgstr "Objectgroep"
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+#, fuzzy
+msgid "Remove object group"
+msgstr "servers"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Selecteer de toe te voegen objecten"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr "Toon objecten van afdeling"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/trust_machines.tpl:27
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+msgid "Choose the department the search will be based on"
+msgstr "Selecteer de afdeling waarbinnen gezocht zal worden"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:40
 msgid "Display objects matching"
 msgstr "Toon overeenkomende objecten"
 
@@ -3481,7 +3367,6 @@ msgid "Display users of department"
 msgstr "Toon gebruikers van afdeling"
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr "Toon overeenkomende gebruikers"
 
@@ -3547,78 +3432,18 @@ msgstr "Primaire groep"
 msgid "Not in all groups"
 msgstr "Toon E-mail groepen"
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
-msgstr "Lijst met groepen"
-
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
-msgstr ""
-"Selecteer om de groepen te zien die primaire groepen van gebruikers zijn"
-
-#: plugins/admin/groups/class_divListGroup.inc:85
-#, fuzzy
-msgid "primary groups"
-msgstr "Primaire groep"
-
-#: plugins/admin/groups/class_divListGroup.inc:86
-#, fuzzy
-msgid "samba groups mappings"
-msgstr "Samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-#, fuzzy
-msgid "samba groups"
-msgstr "Samba groep"
-
-#: plugins/admin/groups/class_divListGroup.inc:88
-#, fuzzy
-msgid "application settings"
-msgstr "programma's"
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-#, fuzzy
-msgid "mail settings"
-msgstr "E-mail instellingen"
-
-#: plugins/admin/groups/class_divListGroup.inc:91
-#, fuzzy
-msgid "mail groups"
-msgstr "Toon E-mail groepen"
-
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr ""
-"Selecteer om normale groepen die alleen functionele aspecten hebben te zien"
-
-#: plugins/admin/groups/class_divListGroup.inc:93
-#, fuzzy
-msgid "functional groups"
-msgstr "Toon functionele groepen"
-
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr "Gebruikersnaam van wie de groepen getoond worden"
-
-#: 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/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Toon primaire groepen"
 
-#: plugins/admin/groups/class_divListGroup.inc:244
-#: plugins/admin/users/class_divListUsers.inc:278
-#: plugins/admin/users/class_divListUsers.inc:290
-#, fuzzy
-msgid "Not allowed"
-msgstr "Het veranderen van het wachtwoord is niet toegestaan"
+#: plugins/admin/groups/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Toon Samba groepen"
 
-#: plugins/admin/groups/class_divListGroup.inc:303
+#: plugins/admin/groups/group-filter.tpl:13
 #, fuzzy
-msgid "Number of listed groups"
-msgstr "Naam van de groep"
+msgid "Show mail groups"
+msgstr "Toon Samba groepen"
 
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #, fuzzy
@@ -3668,57 +3493,57 @@ msgstr "! onbekend id"
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 #, fuzzy
 msgid "Samba group type"
 msgstr "Samba groep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Samba home"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "Leden zitten in een telefoon beantwoordgroep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 #, fuzzy
 msgid "Nagios group"
 msgstr "Nagios account"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 #, fuzzy
 msgid "Group member"
 msgstr "Groepsleden"
@@ -3727,189 +3552,72 @@ msgstr "Groepsleden"
 msgid "Group settings"
 msgstr "Groep instellingen"
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
-msgid "Group administration"
-msgstr "Groepen beheer"
-
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-#, fuzzy
-msgid "group"
-msgstr "groepen"
-
-#: 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 ""
-"Dit omvat alle account gegevens, systeem toegangsregels, imap instellingen "
-"etc. voor deze gebruiker. Verzeker uzelf hiervan, aangezien er geen "
-"mogelijkheid voor GOsa is om deze informatie terug te halen."
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr "Gebruikersbeheer"
-
-#: 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 "Lijst met gebruikers"
-
-#: 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 "Sjabloon"
-
-#: plugins/admin/users/class_divListUsers.inc:85
-#, fuzzy
-msgid "templates"
-msgstr "Sjablonen"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-#, fuzzy
-msgid "GOsa object"
-msgstr "Object"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-#, fuzzy
-msgid "functional users"
-msgstr "Toon functionele gebruikers"
-
-#: plugins/admin/users/class_divListUsers.inc:87
-#, fuzzy
-msgid "POSIX users"
-msgstr "Posix instellingen"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lijst met groepen"
 
-#: plugins/admin/users/class_divListUsers.inc:88
+#: plugins/admin/groups/group-list.xml:138
 #, fuzzy
-msgid "mail users"
-msgstr "Windows gebruikers"
+msgid "Edit group"
+msgstr "Primaire groep"
 
-#: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/groups/group-list.xml:151
 #, fuzzy
-msgid "samba users"
-msgstr "Windows gebruikers"
+msgid "Remove group"
+msgstr "servers"
 
-#: plugins/admin/users/class_divListUsers.inc:90
-#, fuzzy
-msgid "proxy users"
-msgstr "Toon Proxy gebruikers"
+#: plugins/admin/groups/class_groupManagement.inc:26
+msgid "Group administration"
+msgstr "Groepen beheer"
 
-#: plugins/admin/users/class_divListUsers.inc:93
-#, fuzzy
-msgid "phone users"
-msgstr "Toon Proxy gebruikers"
+#: plugins/admin/groups/class_groupManagement.inc:155
+msgid "Posix"
+msgstr "Posix"
 
-#: plugins/admin/users/class_divListUsers.inc:145
-#: plugins/admin/users/user-list.xml:121 plugins/admin/users/user-list.xml:163
+#: plugins/admin/groups/class_groupManagement.inc:156
 #, fuzzy
-msgid "Apply template"
-msgstr "Sjablonen"
-
-#: 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 "Bewerk algemene eigenschappen"
-
-#: plugins/admin/users/class_divListUsers.inc:207
-msgid "Edit UNIX properties"
-msgstr "Bewerk UNIX eigenschappen"
-
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
-msgid "Edit environment properties"
-msgstr "Bewerk omgeving eigenschappen"
+msgid "Edit posix properties"
+msgstr "Bewerk telefoon eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 msgid "Edit mail properties"
 msgstr "Bewerk E-mail eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1095
-msgid "Edit phone properties"
-msgstr "Bewerk telefoon eigenschappen"
-
-#: 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/users/class_divListUsers.inc:215
-msgid "Edit fax properies"
-msgstr "Bewerk Fax eigenschappen"
-
-#: plugins/admin/users/class_divListUsers.inc:217
-#: plugins/admin/users/class_userManagement.inc:1079
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:750
 msgid "Edit samba properties"
 msgstr "Bewerk Samba eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr "Netatalk"
-
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/users/class_userManagement.inc:1083
-msgid "Edit netatalk properties"
-msgstr "Bewerk Netatalk eigenschappen"
-
-#: plugins/admin/users/class_divListUsers.inc:220
-msgid "Create user from template"
-msgstr "Maak gebruiker aan vanuit sjabloon"
-
-#: plugins/admin/users/class_divListUsers.inc:221
-msgid "Create user with this template"
-msgstr "Maak gebruiker aan met dit sjabloon"
-
-#: 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 "actief"
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
+msgid "Edit phone properties"
+msgstr "Bewerk telefoon eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
+#: plugins/admin/groups/class_groupManagement.inc:187
 #, fuzzy
-msgid "user"
-msgstr "gebruikers"
+msgid "Menu"
+msgstr "Printer"
 
-#: plugins/admin/users/class_divListUsers.inc:274
-msgid "password"
-msgstr "wachtwoord"
+#: plugins/admin/groups/class_groupManagement.inc:188
+#, fuzzy
+msgid "Edit start menu properties"
+msgstr "Bewerk Samba eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:287
-msgid "Delete user"
-msgstr "Verwijder gebruiker"
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:758
+msgid "Edit environment properties"
+msgstr "Bewerk omgeving eigenschappen"
 
-#: plugins/admin/users/class_divListUsers.inc:376
-#, fuzzy
-msgid "Number of listed users"
-msgstr "Naam van de afdeling"
+#: 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 ""
+"Dit omvat alle account gegevens, systeem toegangsregels, imap instellingen "
+"etc. voor deze gebruiker. Verzeker uzelf hiervan, aangezien er geen "
+"mogelijkheid voor GOsa is om deze informatie terug te halen."
 
 #: plugins/admin/users/password.tpl:4
 msgid ""
@@ -3960,6 +3668,13 @@ msgstr ""
 "database records zullen dan automatisch gevuld worden. Kies 'geen' om het "
 "gebruik van sjablonen over te slaan."
 
+#: 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 "Sjabloon"
+
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
@@ -3970,95 +3685,115 @@ msgstr "Achternaam"
 msgid "First name"
 msgstr "Voornaam"
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 #, fuzzy
 msgid "Manage users"
 msgstr "Windows gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, fuzzy, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
+#: 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 "Naam"
 
-#: plugins/admin/users/class_userManagement.inc:559
-#, fuzzy
-msgid "You have no permission to use this template!"
-msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
-
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 #, fuzzy
 msgid "Account locking"
 msgstr "Account"
 
-#: plugins/admin/users/class_userManagement.inc:662
-#, fuzzy
-msgid "You have no permission to change the lock status for this user!"
-msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
-
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:650
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 
-#: 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 "Naam"
-
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:723
 #, fuzzy
 msgid "Unlock account"
 msgstr "Mijn account"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 #, fuzzy
 msgid "Lock account"
 msgstr "Mijn account"
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+msgid "Edit generic properties"
+msgstr "Bewerk algemene eigenschappen"
+
+#: 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
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Bewerk UNIX eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:753
+msgid "Netatalk"
+msgstr "Netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:754
+msgid "Edit netatalk properties"
+msgstr "Bewerk Netatalk eigenschappen"
+
+#: plugins/admin/users/class_userManagement.inc:762
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Bewerk UNIX eigenschappen"
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Lijst met gebruikers"
+
 #: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1608
+msgid "Surname"
+msgstr "Achternaam"
+
+#: plugins/admin/users/user-list.xml:140
 #, fuzzy
-msgid "Name / Department"
-msgstr "Naam van de afdeling"
+msgid "Lock users"
+msgstr "Lijst met gebruikers"
+
+#: plugins/admin/users/user-list.xml:148
+#, fuzzy
+msgid "Unlock users"
+msgstr "Windows gebruikers"
 
-#: plugins/admin/users/user-list.xml:175
+#: plugins/admin/users/user-list.xml:167
+#, fuzzy
+msgid "Apply template"
+msgstr "Sjablonen"
+
+#: plugins/admin/users/user-list.xml:199
+#, fuzzy
+msgid "New user from template"
+msgstr "Maak gebruiker aan vanuit sjabloon"
+
+#: plugins/admin/users/user-list.xml:213
 msgid "Edit user"
 msgstr "Bewerk gebruiker"
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 #, fuzzy
 msgid "Remove user"
 msgstr "Plaatje verwijderen"
@@ -4073,17 +3808,18 @@ msgid "Show functional users"
 msgstr "Toon functionele gebruikers"
 
 #: plugins/admin/users/user-filter.tpl:13
-msgid "Show mail users"
-msgstr "Toon E-mail gebruikers"
-
-#: plugins/admin/users/user-filter.tpl:14
 #, fuzzy
 msgid "Show POSIX users"
 msgstr "Posix instellingen"
 
+#: plugins/admin/users/user-filter.tpl:14
+#, fuzzy
+msgid "Show Mail users"
+msgstr "Toon E-mail gebruikers"
+
 #: plugins/admin/users/user-filter.tpl:15
 #, fuzzy
-msgid "Show samba users"
+msgid "Show Samba users"
 msgstr "Toon E-mail gebruikers"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -4102,10 +3838,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr "Bestand is beschikbaar"
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -4116,7 +3848,7 @@ msgstr ""
 "van dat dit is wat u wilt, aangezien er geen mogelijkheid voor GOsa is om "
 "deze gegevens terug te halen."
 
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
+#: plugins/admin/departments/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 "
@@ -4126,112 +3858,51 @@ msgstr ""
 "alvorens u doorgaat. Indien u dat gedaan heeft drukt u op 'Verwijderen' om "
 "door te gaan of op 'Annuleren' om te annuleren."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-#, fuzzy
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-"Fatale fout: Kon geen ongebruikte markering vinden om de administratieve "
-"eenheid te markeren!"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Markeren van '%s'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr "Verplaatsen van %s naar %s"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr "Kopieren van %s is mislukt. Bewerking afgebroken."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:610
-#: plugins/admin/departments/class_departmentGeneric.inc:615
-#: plugins/admin/departments/class_departmentManagement.inc:26
-msgid "Departments"
-msgstr "Afdelingen"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lijst met afdelingen"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
-msgid "Department name"
-msgstr "Afdelingnaam"
+#: 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 "in domein"
 
-#: 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 "Categorie"
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Windows beheerders"
 
-#: 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 "Provincie"
+#: 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 "Land"
 
-#: 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"
+#: 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
+#, fuzzy
+msgid "Locality"
 msgstr "Plaats"
 
-#: 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 "Adres"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr "Telefoon"
-
-#: 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 "Administratieve instellingen"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "Object '%s' is al gemarkeerd"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Toevoegen van markering (%s) aan object '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Verwijderen van markering van object '%s'"
+#: 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 "Organisatie"
 
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -4262,6 +3933,21 @@ msgstr "Omschrijving voor de afdeling"
 msgid "Choose subtree to place department in"
 msgstr "Selecteer de subtree waaronder deze afdeling geplaatst wordt"
 
+#: 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 "Administratieve instellingen"
+
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -4284,11 +3970,41 @@ msgstr "Naam van de aan te maken subtree"
 msgid "Descriptive text for   department"
 msgstr "Omschrijving voor de afdeling"
 
+#: 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 "Categorie"
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr "Categorie voor deze subtree"
 
+#: 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 "Plaats"
+
+#: 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 "Provincie"
+
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
 msgid "State where this subtree is located"
@@ -4299,6 +4015,16 @@ msgstr "Provincie waar deze subtree zich bevindt"
 msgid "Location of this subtree"
 msgstr "Plaats van deze subtree"
 
+#: 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 "Adres"
+
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -4309,6 +4035,20 @@ msgstr "Post adres van deze subtree"
 msgid "Base telephone number of this subtree"
 msgstr "Basis telefoonnummer van deze subtree"
 
+#: 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"
@@ -4316,76 +4056,38 @@ msgstr "Basis Fax nummer van deze subtree"
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 #, fuzzy
 msgid "Domain Component"
 msgstr "Windows beheerders"
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr "Lijst met afdelingen"
-
-#: plugins/admin/departments/class_divListDepartment.inc:73
-msgid "Regular expression for matching department names"
-msgstr "Reguliere expressie voor overeenkomende afdelingen"
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/class_department.inc:615
+msgid "Departments"
+msgstr "Afdelingen"
 
-#: plugins/admin/departments/class_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 #, fuzzy
 msgid "Manage Departments"
 msgstr "Afdelingen"
 
-#: 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 ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:336
+#: plugins/admin/departments/class_departmentManagement.inc:126
 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 ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:556
-#, fuzzy
-msgid "Domain"
-msgstr "in domein"
-
-#: plugins/admin/departments/class_departmentManagement.inc:580
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Land"
-
-#: plugins/admin/departments/class_departmentManagement.inc:592
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "Plaats"
-
-#: 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 "Organisatie"
-
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 #, fuzzy
 msgid "Organization name"
 msgstr "Organisatie"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Postal address"
 msgstr "Adres thuis"
 
@@ -4409,15 +4111,56 @@ msgstr "Windows beheerders"
 msgid "Name of domain to create"
 msgstr "Naam van de aan te maken subtree"
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr "Afdeling beheer"
-
 #: plugins/admin/departments/country.tpl:14
 #, fuzzy
 msgid "Name of country to create"
 msgstr "Naam van de aan te maken subtree"
 
+#: plugins/admin/departments/class_department.inc:386
+#, fuzzy
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr ""
+"Fatale fout: Kon geen ongebruikte markering vinden om de administratieve "
+"eenheid te markeren!"
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr "Markeren van '%s'."
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr "Verplaatsen van %s naar %s"
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr "Kopieren van %s is mislukt. Bewerking afgebroken."
+
+#: plugins/admin/departments/class_department.inc:618
+msgid "Department name"
+msgstr "Afdelingnaam"
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr "Telefoon"
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr "Object '%s' is al gemarkeerd"
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr "Toevoegen van markering (%s) aan object '%s'"
+
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr "Verwijderen van markering van object '%s'"
+
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr "Bezig met verwerken van de gevraagde opdracht"
@@ -4452,68 +4195,25 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/departments/dep_move_confirm.tpl:8
-msgid "GOsa can NOT fix this for you, yet."
-msgstr ""
-
-#: 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 ""
-
-#: plugins/admin/acl/remove.tpl:6
-#, fuzzy
-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 ""
-"Dit omvat <b>alle</b> systeem en configuratie informatie. Verzeker uzelf "
-"hiervan, aangezien er geen manier is voor GOsa om deze gegevens terug te "
-"halen."
-
-#: plugins/admin/acl/class_aclManagement.inc:290
-#, fuzzy
-msgid "ACL role"
-msgstr "Rechten"
-
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-#, fuzzy
-msgid "List of acls"
-msgstr "Lijst met macro's"
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: plugins/admin/acl/class_divListACL.inc:84
-#, fuzzy
-msgid "Display acls matching"
-msgstr "Toon overeenkomende macro's"
-
-#: 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 "Funktie"
+msgid "GOsa can NOT fix this for you, yet."
+msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:165
-#, fuzzy
-msgid "Edit acl role"
-msgstr "Bewerk share"
+#: 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 ""
 
-#: plugins/admin/acl/class_divListACL.inc:185
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
 #, fuzzy
-msgid "Edit acl"
-msgstr "Bewerk klasse"
+msgid "Acl"
+msgstr "Alle"
 
-#: plugins/admin/acl/class_divListACL.inc:192
+#: plugins/admin/acl/class_aclManagement.inc:154
 #, fuzzy
-msgid "Delete acl"
-msgstr "Verwijder klasse"
+msgid "ACL Assignment"
+msgstr "Blokkeerlijst beheer"
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
 #, fuzzy
@@ -4521,7 +4221,7 @@ msgid "ACL Templates"
 msgstr "Sjablonen"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:745
 #, fuzzy
 msgid "Access control roles"
 msgstr "Toegangsopties"
@@ -4531,54 +4231,72 @@ msgstr "Toegangsopties"
 msgid "Edit AC roles"
 msgstr "Rechten"
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 #, fuzzy
 msgid "Reset ACL"
 msgstr "Verwijderen"
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, fuzzy, php-format
 msgid "ACL for these objects: %s"
 msgstr "Nieuw FAI object aanmaken"
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 #, fuzzy
 msgid "Edit category ACL"
 msgstr "Bewerk klasse"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 #, fuzzy
 msgid "Reset category ACL"
 msgstr "Categorie"
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, fuzzy
 msgid "Object in use"
 msgstr "Objectnaam"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:753
+#: 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 "Funktie"
+
+#: plugins/admin/acl/class_aclRole.inc:755
 #, fuzzy
 msgid "Permissions"
 msgstr "Rechten"
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
+#: plugins/admin/acl/acl-list.xml:11
 #, fuzzy
-msgid "ACL management"
-msgstr "Blokkeerlijst beheer"
+msgid "List of acls"
+msgstr "Lijst met macro's"
+
+#: plugins/admin/acl/acl-filter.tpl:11
+#, fuzzy
+msgid "Show access control lists"
+msgstr "Toegangsopties"
+
+#: plugins/admin/acl/acl-filter.tpl:12
+#, fuzzy
+msgid "Show roles"
+msgstr "Toon telefoons"
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
@@ -4595,278 +4313,274 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Programma instellingen"
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr "vrouw"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr "man"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 #, fuzzy
 msgid "Serial number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Certificaat is geldig van '%s' tot '%s' en de huidige status is '%s'."
 
-#: plugins/personal/generic/class_user.inc:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr "geldig"
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr "ongeldig"
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 msgid "No certificate installed"
 msgstr "Geen certificaat geinstalleerd"
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pieper"
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Geboortedatum"
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Eenheid"
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Huis identificatie"
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Beroep"
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Laatste levering"
 
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Werkplaats"
 
-#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Eenheid omschrijving"
 
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Werkgebied"
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Functionele titel"
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Certificaat serienummer"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Straat"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Postcode"
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1598
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mijn account"
 
-#: plugins/personal/generic/class_user.inc:1601
-msgid "Surname"
-msgstr "Achternaam"
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 #, fuzzy
 msgid "User identification"
 msgstr "Gebruikersinformatie"
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Aanhef"
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Academische titel"
 
-#: plugins/personal/generic/class_user.inc:1608
-#, fuzzy
-msgid "Gender"
-msgstr "Afzender"
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
+msgstr "Geslacht"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 #, fuzzy
 msgid "Preferred language"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 #, fuzzy
 msgid "Department number"
 msgstr "Afdelingnaam"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 #, fuzzy
 msgid "Employee number"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1627
 #, fuzzy
 msgid "Room number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 #, fuzzy
 msgid "Pager number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 #, fuzzy
 msgid "Mobile number"
 msgstr "GSM nummer"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 #, fuzzy
 msgid "Home phone number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 #, fuzzy
 msgid "User password method"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 #, fuzzy
 msgid "User certificates"
 msgstr "Standaard certificaat"
@@ -4895,10 +4609,6 @@ msgstr "Verander plaatje"
 msgid "Template name"
 msgstr "Sjabloon naam"
 
-#: plugins/personal/generic/generic.tpl:138
-msgid "Sex"
-msgstr "Geslacht"
-
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
@@ -5025,6 +4735,12 @@ msgstr "verlopen"
 msgid "grace time active"
 msgstr "gratie tijd actief"
 
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+msgid "active"
+msgstr "actief"
+
 #: plugins/personal/posix/class_posixAccount.inc:173
 #, fuzzy
 msgid "password not changeable"
@@ -5035,148 +4751,144 @@ msgstr "actief, wachtwoord onveranderbaar"
 msgid "password expired"
 msgstr "actief, wachtwoord verlopen"
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr "niet geconfigureerd"
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "Het wachtwoord kan pas %s dag(en) na de laatste wijziging gewijzigd worden"
 
-#: plugins/personal/posix/class_posixAccount.inc:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Het wachtwoord moet na %s dag(en) gewijzigd worden"
 
-#: plugins/personal/posix/class_posixAccount.inc:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, fuzzy, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 "Blokkeer het account na %s dag(en) inactiviteit nadat het wachtwoord "
 "verlopen is"
 
-#: plugins/personal/posix/class_posixAccount.inc:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, fuzzy, php-format
 msgid "Warn user %s days before password expiry"
 msgstr "Waarschuw de gebruiker %s dagen voordat het wachtwoord verloopt"
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr "Gebruikersgroep"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Persoonlijke map"
 
-#: 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:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 #, fuzzy
 msgid "shadowMin"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 #, fuzzy
 msgid "shadowMax"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 #, fuzzy
 msgid "shadowWarning"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 #, fuzzy
 msgid "shadowInactive"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 #, fuzzy
 msgid "POSIX account"
 msgstr "GLPI account"
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Gebruikers ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 #, fuzzy
 msgid "Group ID"
 msgstr "Groep"
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 #, fuzzy
 msgid "Shadow min"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 #, fuzzy
 msgid "Shadow max"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Toon personen"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 #, fuzzy
 msgid "System trust model"
 msgstr "Systeem vertrouwen"
@@ -5244,10 +4956,18 @@ msgstr "Toon groepen van afdeling"
 msgid "Display groups matching"
 msgstr "Toon overeenkomende groepen"
 
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr "Reguliere expressie voor overeenkomende groepnamen"
+
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "Toon groepen van gebruiker"
 
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr "Gebruikersnaam van wie de groepen getoond worden"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Posix instellingen"
@@ -5483,51 +5203,41 @@ msgstr "naar map"
 
 #: setup/setup_config2.tpl:123
 #, fuzzy
-msgid "Logging options"
-msgstr "Onbekend"
-
-#: setup/setup_config2.tpl:127
-#, fuzzy
-msgid "Syslog"
-msgstr "Systeem logs"
-
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "LDAP fout:"
+msgid "GOsa logging"
+msgstr "GOsa"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 msgid "Mail settings"
 msgstr "E-mail instellingen"
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr "E-mail methode"
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 #, fuzzy
 msgid "Vacation templates"
 msgstr "Werkstation sjabloon"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 #, fuzzy
 msgid "Snapshots / Undo"
 msgstr "Het opslaan van de telefoon is mislukt"
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 #, fuzzy
 msgid "Enable snapshots"
 msgstr "Nagios account aanmaken"
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 #, fuzzy
 msgid "Snapshot base"
 msgstr "Het opslaan van de telefoon is mislukt"
@@ -5854,6 +5564,11 @@ msgstr "Samba Instellingen"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "LDAP fout:"
+
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -6224,14 +5939,14 @@ msgstr ""
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "Yes"
 msgstr "Ja"
 
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "No"
 msgstr "Nee"
 
@@ -7130,12 +6845,222 @@ msgid "Automatic"
 msgstr "automatisch"
 
 #, fuzzy
-#~ msgid "Non common group"
+#~ msgid "Edit ogroup"
+#~ msgstr "Lijst met groepen"
+
+#, fuzzy
+#~ msgid "List of ogroups"
+#~ msgstr "Lijst met groepen"
+
+#, fuzzy
+#~ msgid "Use"
+#~ msgstr "Gebruiker"
+
+#, fuzzy
+#~ msgid "Filter entries with this syntax"
+#~ msgstr "Filter regels met deze syntax"
+
+#, fuzzy
+#~ msgid "MySQL error"
+#~ msgstr "LDAP fout:"
+
+#, fuzzy
+#~ msgid "Cannot add location to the database!"
+#~ msgstr "Kan niet verbinden met de database server!"
+
+#~ msgid "Submit department"
+#~ msgstr "Verwerk afdeling"
+
+#~ msgid "edit"
+#~ msgstr "Bewerk"
+
+#~ msgid "delete"
+#~ msgstr "Verwijder"
+
+#, fuzzy
+#~ msgid "Number of listed object groups"
+#~ msgstr "Naam van objectgroepen"
+
+#, fuzzy
+#~ msgid "Number of listed departments"
+#~ msgstr "Naam van de afdeling"
+
+#~ msgid "Select to see groups that are primary groups of users"
+#~ msgstr ""
+#~ "Selecteer om de groepen te zien die primaire groepen van gebruikers zijn"
+
+#, fuzzy
+#~ msgid "primary groups"
+#~ msgstr "Primaire groep"
+
+#, fuzzy
+#~ msgid "samba groups mappings"
+#~ msgstr "Samba"
+
+#, fuzzy
+#~ msgid "samba groups"
+#~ msgstr "Samba groep"
+
+#, fuzzy
+#~ msgid "application settings"
+#~ msgstr "programma's"
+
+#, fuzzy
+#~ msgid "mail settings"
+#~ msgstr "E-mail instellingen"
+
+#, fuzzy
+#~ msgid "mail groups"
 #~ msgstr "Toon E-mail groepen"
 
+#~ msgid "Select to see normal groups that have only functional aspects"
+#~ msgstr ""
+#~ "Selecteer om normale groepen die alleen functionele aspecten hebben te "
+#~ "zien"
+
+#, fuzzy
+#~ msgid "functional groups"
+#~ msgstr "Toon functionele groepen"
+
+#, fuzzy
+#~ msgid "Not allowed"
+#~ msgstr "Het veranderen van het wachtwoord is niet toegestaan"
+
+#, fuzzy
+#~ msgid "Number of listed groups"
+#~ msgstr "Naam van de groep"
+
+#, fuzzy
+#~ msgid "group"
+#~ msgstr "groepen"
+
+#~ msgid "User administration"
+#~ msgstr "Gebruikersbeheer"
+
+#, fuzzy
+#~ msgid "templates"
+#~ msgstr "Sjablonen"
+
+#, fuzzy
+#~ msgid "GOsa object"
+#~ msgstr "Object"
+
+#, fuzzy
+#~ msgid "functional users"
+#~ msgstr "Toon functionele gebruikers"
+
+#, fuzzy
+#~ msgid "POSIX users"
+#~ msgstr "Posix instellingen"
+
+#, fuzzy
+#~ msgid "samba users"
+#~ msgstr "Windows gebruikers"
+
 #, fuzzy
-#~ msgid "All"
-#~ msgstr "Alle"
+#~ msgid "proxy users"
+#~ msgstr "Toon Proxy gebruikers"
+
+#, fuzzy
+#~ msgid "phone users"
+#~ msgstr "Toon Proxy gebruikers"
+
+#~ msgid "GOsa"
+#~ msgstr "GOsa"
+
+#~ msgid "Edit UNIX properties"
+#~ msgstr "Bewerk UNIX eigenschappen"
+
+#~ msgid "Edit fax properies"
+#~ msgstr "Bewerk Fax eigenschappen"
+
+#~ msgid "Create user with this template"
+#~ msgstr "Maak gebruiker aan met dit sjabloon"
+
+#, fuzzy
+#~ msgid "user"
+#~ msgstr "gebruikers"
+
+#~ msgid "password"
+#~ msgstr "wachtwoord"
+
+#~ msgid "Delete user"
+#~ msgstr "Verwijder gebruiker"
+
+#, fuzzy
+#~ msgid "Number of listed users"
+#~ msgstr "Naam van de afdeling"
+
+#, fuzzy
+#~ msgid "You have no permission to modify object '%s'!"
+#~ msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
+
+#, fuzzy
+#~ msgid "You have no permission to use this template!"
+#~ msgstr "U heeft geen toestemming om deze blokkeerlijst te verwijderen."
+
+#, fuzzy
+#~ msgid "You have no permission to change the lock status for this user!"
+#~ msgstr "U heeft geen toestemming om uw wachtwoord te veranderen."
+
+#, fuzzy
+#~ msgid "Name / Department"
+#~ msgstr "Naam van de afdeling"
+
+#~ msgid "Regular expression for matching department names"
+#~ msgstr "Reguliere expressie voor overeenkomende afdelingen"
+
+#~ msgid "Department management"
+#~ msgstr "Afdeling beheer"
+
+#, fuzzy
+#~ 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 ""
+#~ "Dit omvat <b>alle</b> systeem en configuratie informatie. Verzeker uzelf "
+#~ "hiervan, aangezien er geen manier is voor GOsa om deze gegevens terug te "
+#~ "halen."
+
+#, fuzzy
+#~ msgid "ACL role"
+#~ msgstr "Rechten"
+
+#~ msgid "Summary"
+#~ msgstr "Samenvatting"
+
+#, fuzzy
+#~ msgid "Display acls matching"
+#~ msgstr "Toon overeenkomende macro's"
+
+#, fuzzy
+#~ msgid "Edit acl role"
+#~ msgstr "Bewerk share"
+
+#, fuzzy
+#~ msgid "Edit acl"
+#~ msgstr "Bewerk klasse"
+
+#, fuzzy
+#~ msgid "Delete acl"
+#~ msgstr "Verwijder klasse"
+
+#, fuzzy
+#~ msgid "Gender"
+#~ msgstr "Afzender"
+
+#, fuzzy
+#~ msgid "Logging options"
+#~ msgstr "Onbekend"
+
+#, fuzzy
+#~ msgid "Syslog"
+#~ msgstr "Systeem logs"
+
+#, fuzzy
+#~ msgid "Non common group"
+#~ msgstr "Toon E-mail groepen"
 
 #, fuzzy
 #~ msgid "Enable DNS extension"
@@ -7260,10 +7185,6 @@ msgstr "automatisch"
 #~ msgid "Hour"
 #~ msgstr "uur"
 
-#, fuzzy
-#~ msgid "Minute"
-#~ msgstr "Printer"
-
 #, fuzzy
 #~ msgid "Day"
 #~ msgstr "dag"
@@ -7809,15 +7730,9 @@ msgstr "automatisch"
 #~ msgid "Select to see users that have proxy settings"
 #~ msgstr "Selecteer om gebruikers te zien die Proxy instellingen hebben"
 
-#~ msgid "Show primary groups"
-#~ msgstr "Toon primaire groepen"
-
 #~ msgid "Select to see groups that have samba groups mappings"
 #~ msgstr "Selecteer om groepen te zien die Samba groep verbindingen hebben"
 
-#~ msgid "Show samba groups"
-#~ msgstr "Toon Samba groepen"
-
 #~ msgid "Select to see groups that have applications configured"
 #~ msgstr "Selecteer om groepen te zien die programma's geconfigureerd hebben"
 
@@ -7873,9 +7788,6 @@ msgstr "automatisch"
 #~ msgid "Select to see phones"
 #~ msgstr "Selecteer om telefoons te zien"
 
-#~ msgid "Show phones"
-#~ msgstr "Toon telefoons"
-
 #, fuzzy
 #~ msgid "Cannot connect to logging server '%s'."
 #~ msgstr "Kan niet verbinden met de database server!"
@@ -8220,10 +8132,6 @@ msgstr "automatisch"
 #~ msgid "Import"
 #~ msgstr "Importeren"
 
-#, fuzzy
-#~ msgid "Send message"
-#~ msgstr "Bericht in wachtstand plaatsen"
-
 #, fuzzy
 #~ msgid "Notification send!"
 #~ msgstr "Geen certificaat geinstalleerd"
@@ -8473,10 +8381,6 @@ msgstr "automatisch"
 #~ msgid "Reomve"
 #~ msgstr "Verwijderen"
 
-#, fuzzy
-#~ msgid "GOsa ping"
-#~ msgstr "GOsa"
-
 #, fuzzy
 #~ msgid "Say hello"
 #~ msgstr "Shell"
index 4195ff710ad95fe4dde7462b0506c4c95cd23ee4..0df00cf02ed956542098a6894a95c134497514c8 100644 (file)
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: 2009-09-05 15:13+0100\n"
 "Last-Translator: Piort Rybicki <meritus@innervision.pl>\n"
 "Language-Team: Piotr Rybicki <meritus@innervision.pl>\n"
@@ -33,19 +33,17 @@ msgstr "Filtry"
 #: 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -66,6 +64,7 @@ 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 ""
 "Jeśli jesteś pewien - naciśnij 'Usuń' aby kontynuować lub 'Anuluj' aby "
@@ -77,15 +76,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr "Anuluj"
@@ -107,15 +105,14 @@ msgstr "Proszę użyć swojego loginu i hasła aby się zalogować"
 
 #: 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 "Nazwa użytkownika"
 
 #: 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "Hasło"
 
@@ -257,7 +254,7 @@ msgstr "Dostępni członkowie"
 msgid "List message possible targets"
 msgstr "Wyświetl możliwe cele wiadomości"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 msgid "Members"
 msgstr "Członkowie"
 
@@ -293,7 +290,7 @@ msgstr "Stare hasło"
 #: 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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -306,9 +303,7 @@ msgid "Verify password"
 msgstr "Weryfikacja hasła"
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr "Zmień hasło"
 
@@ -357,7 +352,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr "Obiekt"
 
@@ -398,47 +393,49 @@ msgstr "Przyczyna utworzenia tego snapshot'u"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.inc:596
 msgid "Continue"
 msgstr "Kontynuuj"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: 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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -448,9 +445,9 @@ msgstr "Błąd"
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -479,8 +476,7 @@ msgid "Your password has been changed successfully."
 msgstr "Twoje hasło zostało pomyślnie zmienione."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -623,9 +619,9 @@ msgstr "Zalogowano:"
 msgid "GOsa main menu"
 msgstr "Menu główne GOsa"
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
 msgstr "Błąd krytyczny"
 
@@ -639,17 +635,17 @@ msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
 #: 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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 msgid "Configuration error"
@@ -660,7 +656,7 @@ msgstr "Błąd konfiguracji"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Katalog '%s' podany jako katalog kompilacji jest niedostępny!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 #, fuzzy
 msgid "Password method"
 msgstr "Przechowywanie hasła"
@@ -669,7 +665,7 @@ msgstr "Przechowywanie hasła"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -686,10 +682,11 @@ msgid "The password used as new is to short."
 msgstr "Hasło podane jako nowe jest za krótkie."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: 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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -707,11 +704,11 @@ msgstr "Brak uprawnień do zmiany własnego hasła"
 msgid "External password changer reported a problem: "
 msgstr "Zewnętrzny program do zmiany hasła zgłosił następujący problem:"
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr "Sesja nie będzie szyfrowana."
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr "Sprowadź sesję SSL"
 
@@ -742,33 +739,37 @@ msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: 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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -811,12 +812,12 @@ msgstr "Błąd autentykacji"
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:368
+#: html/index.php:369
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr "Konto zablokowane. Proszę skontaktować się z administratorem systemu."
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -901,6 +902,50 @@ msgstr ""
 "Katalog pomocy '%s' nie jest osiągalny, nie można czytać żadnych plików "
 "pomocy."
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr "nieskonfigurowane"
+
+#: include/class_management.inc:144
+#, fuzzy
+msgid "Filter error"
+msgstr "Błąd krytyczny"
+
+#: 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 "Uprawnienie"
+
+#: 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
+#, fuzzy
+msgid "Permission error"
+msgstr "Uprawnienia"
+
+#: include/class_management.inc:426 include/class_plugin.inc:1546
+#, fuzzy, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Brak uprawnień do zmiany przekazywania poczty"
+
+#: 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
+#, fuzzy, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Brak uprawnień do zmiany przekazywania poczty"
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -920,7 +965,7 @@ msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, fuzzy, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -929,7 +974,7 @@ msgstr ""
 "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
 "skonfigurowana w gosa.conf."
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, fuzzy, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -942,12 +987,12 @@ msgstr ""
 msgid "Access control"
 msgstr "Kontrola dostępu"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 #, fuzzy
 msgid "Manage access control lists"
 msgstr "Kontrola dostępu"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 msgid "All categories"
 msgstr "Wszystkie kategorie"
 
@@ -955,20 +1000,20 @@ msgstr "Wszystkie kategorie"
 msgid "Reset ACLs"
 msgstr "Resetuj ACL'e"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 msgid "One level"
 msgstr "Jeden poziom"
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Current object"
 msgstr "Obecny obiekt"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 msgid "Complete subtree"
 msgstr "Pełne poddrzewo"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr "Pełne poddrzewo (trwałe)"
 
@@ -976,56 +1021,54 @@ msgstr "Pełne poddrzewo (trwałe)"
 msgid "Use ACL defined in role"
 msgstr "Użyj ACL zdefiniowanego w tej roli"
 
-#: 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
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr "Grupy"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: 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
+#: 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
 msgid "Up"
 msgstr "Góra"
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "W dół"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr "Edytuj"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr "Usuń"
@@ -1049,7 +1092,7 @@ msgstr "Kategoria ACL"
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Edytuj ACL dla '%s', zakres to '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr "Wszystkie obiekty w obecnym poddrzewie"
 
@@ -1092,13 +1135,13 @@ msgstr "Utwórz obiekty"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: 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
+#: 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
 msgid "Internal error"
 msgstr "Błąd wewnętrzny"
 
@@ -1127,22 +1170,22 @@ msgstr "! nieznane id"
 msgid "Contains settings for these objects: %s"
 msgstr "Zawiera ustawienia dla tych obiektów: %s"
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "inactive"
 msgstr "Aktywne"
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "No members"
 msgstr "Członkowie grupy"
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 #, fuzzy
 msgid "Access control list"
 msgstr "Kontrola dostępu"
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 #, fuzzy
 msgid "ACL roles"
 msgstr "ACLe"
@@ -1152,48 +1195,38 @@ msgstr "ACLe"
 msgid "Close"
 msgstr "Zamknij"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 msgid "Go to root department"
 msgstr "Idź do głównego departamentu"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 msgid "Root"
 msgstr "Główny"
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 msgid "Go up one department"
 msgstr "Idź jeden departament wyżej"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 msgid "Go to users department"
 msgstr "Przejdź do departamentu użytkowników"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 msgid "Home"
 msgstr "Katalog domowy"
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr "Przeładuj listę"
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr "Wyślij"
 
@@ -1208,34 +1241,20 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "Użytkownik /UID nie są unikalne. Proszę sprawdzić bazę LDAP."
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 #, fuzzy
 msgid "Choose a base"
 msgstr "Wybierz bazę"
 
-#: 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 ""
-
-#: include/class_baseSelectDialog.inc:61
-msgid "Use"
-msgstr "Użyj"
-
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1243,26 +1262,18 @@ msgstr "Użyj"
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "Kontener"
 
-#: include/class_baseSelectDialog.inc:68
-#, fuzzy
-msgid "Filter entries with this syntax"
-msgstr "Filtruj elementy z tą składnią"
-
-#: 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
+#: include/class_listing.inc:298 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
@@ -1270,90 +1281,104 @@ msgstr "Filtruj elementy z tą składnią"
 msgid "Select all"
 msgstr "Wybierz wszystko"
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 msgid "created by"
 msgstr "utworzone przez"
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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 "Akcje"
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr "Wytnij"
 
-#: 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
+#: 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
 msgid "Paste"
 msgstr "Wklej"
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Wytnij ten obiekt"
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Kopiuj ten obiekt"
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 #, fuzzy
 msgid "Export list"
 msgstr "Export"
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr "Utwórz spanshot"
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr "Utwórz nowy snapshot z tego obiektu"
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:132
+msgid "Edit this entry"
+msgstr "Edytuj ten obiekt"
+
+#: include/class_sortableListing.inc:133
+msgid "Delete this entry"
+msgstr "Usuń ten obiekt"
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "BŁĄD: Nie można połączyć się z serwerem LDAP. Odpowiedź serwera '%s'."
 
-#: include/functions.inc:399
+#: include/functions.inc:518
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Użytkownik /UID nie są unikalne. Proszę sprawdzić bazę LDAP."
 
-#: include/functions.inc:474
+#: include/functions.inc:603
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr "Użytkownik /UID nie są unikalne. Proszę sprawdzić bazę LDAP."
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1362,12 +1387,12 @@ msgstr ""
 "Nie można pobrać informacji o blokadach w bazie LDAP. Proszę sprawdzić wpis "
 "'config' w gosa.conf!"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "Serwer LDAP"
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -1376,12 +1401,12 @@ msgstr ""
 "Znaleziono wiele blokad dla obiektu do zablokowania. Taka sytuacja nie "
 "powinna się wydażyć - czyszczę wiele odwołań."
 
-#: include/functions.inc:1049
+#: include/functions.inc:1232
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit wielkości %d elementów został przekroczony!"
 
-#: include/functions.inc:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1390,219 +1415,219 @@ msgstr ""
 "Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest "
 "przekroczony"
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr "niepełne"
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 msgid "Continue anyway"
 msgstr "Kontynuuj mimo wszystko"
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 msgid "Edit anyway"
 msgstr "Edytuj mimo wszystko"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Zamierzasz skopiować wpis '%s'."
 
-#: include/functions.inc:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr "Wpisów na stronie"
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Zastosuj filtr"
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Wersja deweloperska GOsa (Rev %s)"
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "Plik '%s' nie mógł zostać usunięty."
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "LDAP warning"
 msgstr "Ostrzeżenie LDAP"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Nie można pobrać informacji o schematach z serwera. Sprawdzenie schematów "
 "niemożliwe!"
 
-#: include/functions.inc:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Wyświetl szablony FAI"
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Brak opcjonalnego obiektu klasy '%s'!"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2309
+#: include/functions.inc:2764
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "Plik jest dostępny"
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr "Niemiecki"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr "Francuski"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr "Włoski"
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr "Angielski"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 msgid "Polish"
 msgstr "Polski"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 msgid "Chinese"
 msgstr "Chińsski"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 msgid "Vietnamese"
 msgstr "Wietnamski"
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr "Polecenie '%s', podane jako POSTMODIFY dla dodatku '%s' nie istnieje."
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Utwórz nowy departament"
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 #, fuzzy
 msgid "no ID available!"
 msgstr "Brak szablonów!"
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, fuzzy, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
@@ -1611,35 +1636,37 @@ msgstr ""
 "OpenGroupware: Nie można połączyć się z bazą. Proszę sprawdzić podane "
 "parametry konfiguracji."
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Proces usuwania został anulowany przez dodatek '%s': %s"
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr "Zależności"
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Zamierzasz usunąć snapshot '%s'."
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 msgid "Remove snapshot"
 msgstr "Usuń snapshot"
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1655,8 +1682,11 @@ 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr "Opis"
 
@@ -1764,7 +1794,7 @@ msgstr "Typ"
 msgid "Arguments"
 msgstr "Argumenty"
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
@@ -1777,50 +1807,29 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: 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 "Uprawnienie"
-
-#: include/class_plugin.inc:1547
-#, fuzzy, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Brak uprawnień do zmiany przekazywania poczty"
-
-#: include/class_plugin.inc:1559 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1587
-#, fuzzy, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Brak uprawnień do zmiany przekazywania poczty"
-
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "from"
 msgstr "od"
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr "do"
 
-#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 msgid "Restore"
 msgstr "Odtwórz"
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 msgid "cut"
 msgstr "wytnij"
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr "kopiuj"
 
@@ -2432,37 +2441,37 @@ msgid ""
 "setup?"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Ostrzeżenie wydajności"
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:665
+#: include/class_ldap.inc:692
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:740
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:800
+#: include/class_ldap.inc:827
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "podczas działania na '%s' używając serwera LDAP '%s'"
 
-#: include/class_ldap.inc:802
+#: include/class_ldap.inc:829
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "podczas połączenia z serwerem LDAP '%s'"
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2471,86 +2480,66 @@ msgstr ""
 "To nie jest poprawne DN: '%s'. Blok dla importu powinien zaczynać się "
 "'dn: ...' w linii %s"
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr "Błąd podczas importu dn: '%s', proszę sprawdzić LDIF od linii %s !"
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, fuzzy, php-format
 msgid "Logging failed: %s"
 msgstr "Użytkownik bazy logowania"
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr "Podano nieprawidłową opcję '%s'!"
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 #, fuzzy
 msgid "Specified objectType is empty or invalid!"
 msgstr "Podana nazwa jest nieprawidłowa"
 
-#: include/class_log.inc:139
-msgid "MySQL error"
-msgstr "błąd MySQL"
-
-#: include/class_log.inc:139
-#, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr ""
-
-#: 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 "logowanie MySQL"
-
-#: include/class_log.inc:219
-#, fuzzy, php-format
-msgid "Cannot add location to the database!"
-msgstr "Nie można połączyć się z serwerem baz danych!"
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Nieznany wpis  '%s'!"
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Błąd XML w pliku gosa.conf: %s w linii %d"
 
-#: include/class_config.inc:270
+#: include/class_config.inc:317
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Nie można połączyć się z LDAP. Proszę skontaktować się z administratorem."
 
-#: include/class_config.inc:636
+#: include/class_config.inc:694
 #, fuzzy
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "Brak parametru SID lub/i RIDBASE w konfiguracji!"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2569,44 +2558,44 @@ msgstr ""
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: 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: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
 #, fuzzy, php-format
 msgid "Copy and paste failed!"
 msgstr "Kreator Copy &amp; paste"
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, fuzzy, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, fuzzy, php-format
 msgid "No write permission in '%s'"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 msgid "Cannot paste"
 msgstr "Nie można wkleić"
 
@@ -2616,11 +2605,11 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Ogólne"
@@ -2631,32 +2620,26 @@ 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr "Poczta"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr "FAX"
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2665,34 +2648,34 @@ msgid "FTP"
 msgstr "FTP"
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr "Grupa"
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr "Departament"
 
 #: plugins/generic/references/class_reference.inc:61
-#: 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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2701,14 +2684,13 @@ msgid "Phone"
 msgstr "Telefon"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr "Aplikacja"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Serwer"
 
@@ -2717,19 +2699,17 @@ msgid "Thin Client"
 msgstr "Cienki klient"
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr "Stacja robocza"
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Grupa obiektu"
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr "Drukarka"
 
@@ -2772,270 +2752,51 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Zespół GOsa"
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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 "Aktualizuj"
+
+#: plugins/admin/ogroups/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr "Proszę upewnić się czy kontynuować, gdyż nie ma możliwości powrotu."
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "List of object groups"
-msgstr "Lista grupy obiektów"
-
-#: 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 "Właściwości"
-
-#: 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 "Akcje"
-
-#: 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 "Pokaż %s"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-#, fuzzy
-msgid "user groups"
-msgstr "grupy"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-#, fuzzy
-msgid "nested groups"
-msgstr "Grupy obiektów"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:93
-#: plugins/admin/ogroups/class_divListOGroup.inc:94
-#: plugins/admin/groups/class_divListGroup.inc:89
-#, fuzzy
-msgid "application groups"
-msgstr "Pokaż grupy aplikacji"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-#, fuzzy
-msgid "department groups"
-msgstr "departamenty"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-#, fuzzy
-msgid "server groups"
-msgstr "serwery"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-#, fuzzy
-msgid "workstation groups"
-msgstr "stacje robocze"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-#, fuzzy
-msgid "windows workstation groups"
-msgstr "Pokaż stacje robocze"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-#, fuzzy
-msgid "terminal groups"
-msgstr "Pokaż grupy pocztowe"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-#, fuzzy
-msgid "printer groups"
-msgstr "Grupa podstawowa"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-#, fuzzy
-msgid "phone groups"
-msgstr "Pokaż grupy"
-
-#: 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 "Wyrażenie regularne dla dopasowania nazw grup"
-
-#: 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 "Zatwierdź departament"
-
-#: 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 "Utwórz"
-
-#: 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 "Usuń"
-
-#: 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 "edytuj"
-
-#: 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 "Edytuj ten obiekt"
-
-#: 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 "Usuń"
-
-#: 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 "Usuń ten obiekt"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-#, fuzzy
-msgid "Number of listed object groups"
-msgstr "Nazwa grupy obiektów"
-
-#: 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
-#, fuzzy
-msgid "Number of listed departments"
-msgstr "Nazwa departamentu"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroup.inc:1117
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr "Grupy obiektów"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #, fuzzy
 msgid "Manage object groups"
 msgstr "Nazwa grupy obiektów"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "błąd PHP:"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#, fuzzy
-msgid "object group"
-msgstr "Grupa obiektu"
-
-#: 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
-#, fuzzy
-msgid "Permission error"
-msgstr "Uprawnienia"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 msgid "Templates"
 msgstr "Szablony"
 
-#: 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
+#: 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
 msgid "User"
 msgstr "Użytkownik"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #, fuzzy
 msgid "Windows Install"
 msgstr "Stacja robocza Windows"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -3049,6 +2810,19 @@ msgstr ""
 msgid "departments"
 msgstr "departamenty"
 
+#: 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 "Pokaż %s"
+
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 msgid "people"
@@ -3100,7 +2874,9 @@ msgid "applications"
 msgstr "aplikacje"
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr "żaden"
 
@@ -3118,20 +2894,20 @@ msgstr "Stacje Windows"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "wyłączone"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 msgid "full access"
 msgstr "pełen dostęp"
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr "zezwól na dostęp do tych hostów"
 
@@ -3149,22 +2925,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3192,13 +2963,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Imię"
@@ -3254,7 +3031,7 @@ msgid "Select a base"
 msgstr "Wybierz bazę"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Zaufanie systemowe"
@@ -3292,10 +3069,9 @@ msgid "FAI summary"
 msgstr "Podsumowanie FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr "Środowisko"
 
@@ -3308,26 +3084,137 @@ msgstr "Aplikacje"
 msgid "Please enter the new object group name"
 msgstr "Proszę podać nową nazwę."
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Wybierz obiekty do dodania"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
-msgid "Display objects of department"
-msgstr "Wyświetl obiekty departamentu"
+#: 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 "Filtry"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-#: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-msgid "Choose the department the search will be based on"
-msgstr "Wybierz departament na którym wyszukiwanie będzie bazować"
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+#, fuzzy
+msgid "user groups"
+msgstr "grupy"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
-msgid "Display objects matching"
-msgstr "Wyświetl obiekty pasujące"
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+#, fuzzy
+msgid "nested groups"
+msgstr "Grupy obiektów"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+#, fuzzy
+msgid "application groups"
+msgstr "Pokaż grupy aplikacji"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+#, fuzzy
+msgid "department groups"
+msgstr "departamenty"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+#, fuzzy
+msgid "server groups"
+msgstr "serwery"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+#, fuzzy
+msgid "workstation groups"
+msgstr "stacje robocze"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+#, fuzzy
+msgid "windows workstation groups"
+msgstr "Pokaż stacje robocze"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+#, fuzzy
+msgid "terminal groups"
+msgstr "Pokaż grupy pocztowe"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+#, fuzzy
+msgid "printer groups"
+msgstr "Grupa podstawowa"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+#, fuzzy
+msgid "phone groups"
+msgstr "Pokaż grupy"
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+msgid "List of object groups"
+msgstr "Lista grupy obiektów"
+
+#: 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 "Właściwości"
+
+#: 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 "Utwórz"
+
+#: 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 "Usuń"
+
+#: 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 "Wyślij wiadomość"
+
+#: plugins/admin/ogroups/ogroup-list.xml:142
+#, fuzzy
+msgid "Edit object group"
+msgstr "Grupa obiektu"
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+#, fuzzy
+msgid "Remove object group"
+msgstr "serwery"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Wybierz obiekty do dodania"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr "Wyświetl obiekty departamentu"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/trust_machines.tpl:27
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+msgid "Choose the department the search will be based on"
+msgstr "Wybierz departament na którym wyszukiwanie będzie bazować"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:40
+msgid "Display objects matching"
+msgstr "Wyświetl obiekty pasujące"
 
 #: plugins/admin/ogroups/ogroup_objects.tpl:41
 msgid "Regular expression for matching object names"
@@ -3382,7 +3269,6 @@ msgid "Display users of department"
 msgstr "Wyświetl użytkowników departamentu"
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr "Wyświetl użytkowników pasujących"
 
@@ -3444,71 +3330,18 @@ msgstr "We wszystkich grupach"
 msgid "Not in all groups"
 msgstr "Nie we wszystkich grupach"
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
-msgstr "Lista grup"
-
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
-msgstr "Zaznacz aby zobaczyć grupy które są podstawowymi grupami użytkowników"
-
-#: plugins/admin/groups/class_divListGroup.inc:85
-msgid "primary groups"
-msgstr "Grupy podstawowe"
-
-#: plugins/admin/groups/class_divListGroup.inc:86
-#, fuzzy
-msgid "samba groups mappings"
-msgstr "Samba SID"
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-msgid "samba groups"
-msgstr "Grupy Samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:88
-msgid "application settings"
-msgstr "ustawienia aplikacji"
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-msgid "mail settings"
-msgstr "Ustawienia poczty"
-
-#: plugins/admin/groups/class_divListGroup.inc:91
-msgid "mail groups"
-msgstr "grupy pocztowe"
-
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Zaznacz aby zobaczyć grupy, które posiadają tylko aspekty funkcjonalne"
+#: plugins/admin/groups/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Pokaż podstawowe grupy"
 
-#: plugins/admin/groups/class_divListGroup.inc:93
-#, fuzzy
-msgid "functional groups"
-msgstr "Pokaż grupy funkcjonalne"
-
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr "Nazwa użytkownika którego grupy są pokazane"
-
-#: 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/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Pokaż grupy samba"
 
-#: plugins/admin/groups/class_divListGroup.inc:244
-#: plugins/admin/users/class_divListUsers.inc:278
-#: plugins/admin/users/class_divListUsers.inc:290
+#: plugins/admin/groups/group-filter.tpl:13
 #, fuzzy
-msgid "Not allowed"
-msgstr "Brak uprawnień do zmiay hasła"
-
-#: plugins/admin/groups/class_divListGroup.inc:303
-#, fuzzy
-msgid "Number of listed groups"
-msgstr "Nazwa grupy"
+msgid "Show mail groups"
+msgstr "Pokaż grupy samba"
 
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #, fuzzy
@@ -3557,53 +3390,53 @@ msgstr "! nieznane id"
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 msgid "Generic group settings"
 msgstr "Ogólne ustawienia grupy"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 msgid "Samba group type"
 msgstr "Typ grupy Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Katalog domowy Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 msgid "Phone pickup group"
 msgstr "Grupie odbioru telefonu"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 msgid "Nagios group"
 msgstr "Grupa nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 msgid "Group member"
 msgstr "Członek grupy"
 
@@ -3611,185 +3444,72 @@ msgstr "Członek grupy"
 msgid "Group settings"
 msgstr "Ustawienia grupy"
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
-msgid "Group administration"
-msgstr "Administracja Grupą"
-
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr "Zarządzaj grupami POSIX"
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-msgid "group"
-msgstr "grupa"
-
-#: 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 ""
-"Operacja odnosi się do wszystkich danych dotyczących konta, dostępu, "
-"ustawień imap, etc dla tego użytkownika. Proszę upewnić się czy na pewno "
-"kontynuować, gdyż nie ma możliwości powrotu."
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr "Administracja użytkownikami"
-
-#: 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 użytkowników"
-
-#: 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 "Szablon"
-
-#: plugins/admin/users/class_divListUsers.inc:85
-msgid "templates"
-msgstr "Szablon"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "GOsa object"
-msgstr "Obiekt GOsa"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-#, fuzzy
-msgid "functional users"
-msgstr "Pokaż użytkowników funkcjonalnych"
-
-#: plugins/admin/users/class_divListUsers.inc:87
-#, fuzzy
-msgid "POSIX users"
-msgstr "Ustawienia Posix"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista grup"
 
-#: plugins/admin/users/class_divListUsers.inc:88
+#: plugins/admin/groups/group-list.xml:138
 #, fuzzy
-msgid "mail users"
-msgstr "Użytkownicy domeny"
+msgid "Edit group"
+msgstr "Grupa podstawowa"
 
-#: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/groups/group-list.xml:151
 #, fuzzy
-msgid "samba users"
-msgstr "Użytkownicy domeny"
+msgid "Remove group"
+msgstr "serwery"
 
-#: plugins/admin/users/class_divListUsers.inc:90
-#, fuzzy
-msgid "proxy users"
-msgstr "Pokaż użytkowników proxy"
+#: plugins/admin/groups/class_groupManagement.inc:26
+msgid "Group administration"
+msgstr "Administracja Grupą"
 
-#: plugins/admin/users/class_divListUsers.inc:93
-#, fuzzy
-msgid "phone users"
-msgstr "Pokaż użytkowników proxy"
+#: plugins/admin/groups/class_groupManagement.inc:155
+msgid "Posix"
+msgstr "Posix"
 
-#: plugins/admin/users/class_divListUsers.inc:145
-#: plugins/admin/users/user-list.xml:121 plugins/admin/users/user-list.xml:163
+#: plugins/admin/groups/class_groupManagement.inc:156
 #, fuzzy
-msgid "Apply template"
-msgstr "Szablony"
-
-#: 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 "Edytuj ogólne właściwości"
-
-#: plugins/admin/users/class_divListUsers.inc:207
-msgid "Edit UNIX properties"
-msgstr "Edytuj właściwości UNIX"
-
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
-msgid "Edit environment properties"
-msgstr "Edytuj właściwości Środowiska"
+msgid "Edit posix properties"
+msgstr "Edytuj właściwości Telefonu"
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 msgid "Edit mail properties"
 msgstr "Edytuj właściwości Poczty"
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1095
-msgid "Edit phone properties"
-msgstr "Edytuj właściwości Telefonu"
-
-#: 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/users/class_divListUsers.inc:215
-msgid "Edit fax properies"
-msgstr "Edytuj właściwości Fax"
-
-#: plugins/admin/users/class_divListUsers.inc:217
-#: plugins/admin/users/class_userManagement.inc:1079
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:750
 msgid "Edit samba properties"
 msgstr "Edytuj właściwości Samba"
 
-#: plugins/admin/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr "Netatalk"
-
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/users/class_userManagement.inc:1083
-msgid "Edit netatalk properties"
-msgstr "Edytuj właściwości Netatalk"
-
-#: plugins/admin/users/class_divListUsers.inc:220
-msgid "Create user from template"
-msgstr "Utwórz użytkownika z szablonu"
-
-#: plugins/admin/users/class_divListUsers.inc:221
-msgid "Create user with this template"
-msgstr "Utwórz użytkownika z tego szablonu"
-
-#: 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 "Aktywne"
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
+msgid "Edit phone properties"
+msgstr "Edytuj właściwości Telefonu"
 
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
-msgid "user"
-msgstr "użytkownik"
+#: plugins/admin/groups/class_groupManagement.inc:187
+#, fuzzy
+msgid "Menu"
+msgstr "Drukarka"
 
-#: plugins/admin/users/class_divListUsers.inc:274
-msgid "password"
-msgstr "hasło"
+#: plugins/admin/groups/class_groupManagement.inc:188
+#, fuzzy
+msgid "Edit start menu properties"
+msgstr "Edytuj właściwości Samba"
 
-#: plugins/admin/users/class_divListUsers.inc:287
-msgid "Delete user"
-msgstr "Usuń użytkownika"
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:758
+msgid "Edit environment properties"
+msgstr "Edytuj właściwości Środowiska"
 
-#: plugins/admin/users/class_divListUsers.inc:376
-#, fuzzy
-msgid "Number of listed users"
-msgstr "Nazwa departamentu"
+#: 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 ""
+"Operacja odnosi się do wszystkich danych dotyczących konta, dostępu, "
+"ustawień imap, etc dla tego użytkownika. Proszę upewnić się czy na pewno "
+"kontynuować, gdyż nie ma możliwości powrotu."
 
 #: plugins/admin/users/password.tpl:4
 msgid ""
@@ -3839,6 +3559,13 @@ msgstr ""
 "rekordów bazy będzie automatycznie wypełnionych. Wybierz 'brak' aby pominąć "
 "użycie szablonów."
 
+#: 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 "Szablon"
+
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
@@ -3849,91 +3576,111 @@ msgstr "Nazwisko"
 msgid "First name"
 msgstr "Imię"
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 msgid "Manage users"
 msgstr "Zarządzaj użytkownikami"
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "Brak uprawnień do zmiany własnego hasła"
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, fuzzy, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr "Brak uprawnień do usunięcia grupy obiektowej."
-
-#: plugins/admin/users/class_userManagement.inc:559
-#, fuzzy
-msgid "You have no permission to use this template!"
-msgstr "Brak uprawnień do usunięcia grupy obiektowej."
+#: 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 "Imię"
 
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 msgid "Account locking"
 msgstr "Blokowanie konta"
 
-#: plugins/admin/users/class_userManagement.inc:662
-#, fuzzy
-msgid "You have no permission to change the lock status for this user!"
-msgstr "Brak uprawnień do zmiany własnego hasła"
-
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:650
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 
-#: 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 "Imię"
-
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:723
 msgid "Unlock account"
 msgstr "Odblokuj konto"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 msgid "Lock account"
 msgstr "Zablokuj konto"
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+msgid "Edit generic properties"
+msgstr "Edytuj ogólne właściwości"
+
+#: 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
 msgid "POSIX"
 msgstr "POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Edytuj właściwości UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:753
+msgid "Netatalk"
+msgstr "Netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:754
+msgid "Edit netatalk properties"
+msgstr "Edytuj właściwości Netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:762
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Edytuj właściwości UNIX"
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Lista użytkowników"
+
 #: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1608
+msgid "Surname"
+msgstr "Nazwisko"
+
+#: plugins/admin/users/user-list.xml:140
 #, fuzzy
-msgid "Name / Department"
-msgstr "Nazwa departamentu"
+msgid "Lock users"
+msgstr "Lista użytkowników"
+
+#: plugins/admin/users/user-list.xml:148
+#, fuzzy
+msgid "Unlock users"
+msgstr "Użytkownicy domeny"
 
-#: plugins/admin/users/user-list.xml:175
+#: plugins/admin/users/user-list.xml:167
+#, fuzzy
+msgid "Apply template"
+msgstr "Szablony"
+
+#: plugins/admin/users/user-list.xml:199
+#, fuzzy
+msgid "New user from template"
+msgstr "Utwórz użytkownika z szablonu"
+
+#: plugins/admin/users/user-list.xml:213
 msgid "Edit user"
 msgstr "Edytuj użytkownika"
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 #, fuzzy
 msgid "Remove user"
 msgstr "Usuń obrazek"
@@ -3948,17 +3695,18 @@ msgid "Show functional users"
 msgstr "Pokaż użytkowników funkcjonalnych"
 
 #: plugins/admin/users/user-filter.tpl:13
-msgid "Show mail users"
-msgstr "Pokaż użytkowników Poczty"
-
-#: plugins/admin/users/user-filter.tpl:14
 #, fuzzy
 msgid "Show POSIX users"
 msgstr "Ustawienia Posix"
 
+#: plugins/admin/users/user-filter.tpl:14
+#, fuzzy
+msgid "Show Mail users"
+msgstr "Pokaż użytkowników Poczty"
+
 #: plugins/admin/users/user-filter.tpl:15
 #, fuzzy
-msgid "Show samba users"
+msgid "Show Samba users"
 msgstr "Pokaż użytkowników Poczty"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -3976,10 +3724,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr "Brak szablonów!"
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr "Aktualizuj"
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -3989,7 +3733,7 @@ msgstr ""
 "Operacja odnosi sie do 'wszystkich' kont, systemów, etc w tym poddrzewie. "
 "Proszę upewnić się czy kontynuować, gdyż nie ma operacji powrotu."
 
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
+#: plugins/admin/departments/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 "
@@ -3998,112 +3742,51 @@ msgstr ""
 "Przed wykonaniem tej operacji zaleca się wykonanie kopii bezpieczeństwa "
 "drzewa LDAP. Naciśnij 'Usuń' aby kontynuować, lub 'Anuluj' aby przerwać."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-#, fuzzy
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-"Błąd krytyczny: Nie można znaleźć nieużywnego znacznika dla jednostki "
-"administracyjnej!"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Zaznaczanie '%s'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr "Przenoszenie '%s' do '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr "BŁĄD kopiowania %s, anulowanie operacji"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:610
-#: plugins/admin/departments/class_departmentGeneric.inc:615
-#: plugins/admin/departments/class_departmentManagement.inc:26
-msgid "Departments"
-msgstr "Departamenty"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista departamentów"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
-msgid "Department name"
-msgstr "Nazwa departamentu"
+#: 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 "w domenie"
 
-#: 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 "Kategoria"
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Administratorzy domeny"
 
-#: 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 "Stan"
+#: 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 "Kraj"
 
-#: 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"
+#: 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
+#, fuzzy
+msgid "Locality"
 msgstr "Lokalizacja"
 
-#: 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 "Adres"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr "Telefon"
-
-#: 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 "Ustawienia administracyjne"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "Obiekt '%s' jest już zaznaczony"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Dodawanie znacznika (%s) do obiektu '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Usuwanie znacznika z obiektu '%s'"
+#: 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 "Organizacja"
 
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -4134,6 +3817,21 @@ msgstr "Tekst opisujący departament"
 msgid "Choose subtree to place department in"
 msgstr "Wybierz poddrzewo do umieszczenia departamentu"
 
+#: 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 "Ustawienia administracyjne"
+
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -4156,11 +3854,41 @@ msgstr "Nazwa tworzonego poddrzewa"
 msgid "Descriptive text for   department"
 msgstr "Tekst opisujący departament"
 
+#: 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 "Kategoria"
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr "Kategoria dla tego poddrzewa"
 
+#: 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 "Lokalizacja"
+
+#: 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 "Stan"
+
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
 msgid "State where this subtree is located"
@@ -4171,6 +3899,16 @@ msgstr "Stan w którym jest umieszczone to poddrzewo"
 msgid "Location of this subtree"
 msgstr "Lokalizacja tego poddrzewa"
 
+#: 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 "Adres"
+
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -4181,6 +3919,20 @@ msgstr "Kod pocztowy tego poddrzewa"
 msgid "Base telephone number of this subtree"
 msgstr "Bazowy numer telefonu tego poddrzewa"
 
+#: 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"
@@ -4188,74 +3940,36 @@ msgstr "Bazowy numer faxu tego poddrzewa"
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 #, fuzzy
 msgid "Domain Component"
 msgstr "Administratorzy domeny"
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr "Lista departamentów"
-
-#: plugins/admin/departments/class_divListDepartment.inc:73
-msgid "Regular expression for matching department names"
-msgstr "Wyrażenie regularne dla dopasowania nazw departamentów"
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/class_department.inc:615
+msgid "Departments"
+msgstr "Departamenty"
 
-#: plugins/admin/departments/class_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 msgid "Manage Departments"
 msgstr "Zarządzaj Departamentami"
 
-#: 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 ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:336
+#: plugins/admin/departments/class_departmentManagement.inc:126
 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 ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:556
-#, fuzzy
-msgid "Domain"
-msgstr "w domenie"
-
-#: plugins/admin/departments/class_departmentManagement.inc:580
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Kraj"
-
-#: plugins/admin/departments/class_departmentManagement.inc:592
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "Lokalizacja"
-
-#: 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 "Organizacja"
-
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 msgid "Organization name"
 msgstr "Nazwa organizacji"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Postal address"
 msgstr "Adres pocztowy"
 
@@ -4278,14 +3992,55 @@ msgstr "Administratorzy domeny"
 msgid "Name of domain to create"
 msgstr "Nazwa tworzonego poddrzewa"
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr "Zarządzanie departamentem"
+#: plugins/admin/departments/country.tpl:14
+#, fuzzy
+msgid "Name of country to create"
+msgstr "Nazwa tworzonego poddrzewa"
+
+#: plugins/admin/departments/class_department.inc:386
+#, fuzzy
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr ""
+"Błąd krytyczny: Nie można znaleźć nieużywnego znacznika dla jednostki "
+"administracyjnej!"
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr "Zaznaczanie '%s'."
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr "Przenoszenie '%s' do '%s'"
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr "BŁĄD kopiowania %s, anulowanie operacji"
+
+#: plugins/admin/departments/class_department.inc:618
+msgid "Department name"
+msgstr "Nazwa departamentu"
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr "Telefon"
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr "Obiekt '%s' jest już zaznaczony"
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr "Dodawanie znacznika (%s) do obiektu '%s'"
 
-#: plugins/admin/departments/country.tpl:14
-#, fuzzy
-msgid "Name of country to create"
-msgstr "Nazwa tworzonego poddrzewa"
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr "Usuwanie znacznika z obiektu '%s'"
 
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
@@ -4330,61 +4085,23 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: 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 ""
-"To zawiera cały system i informacje instalacyjne. Proszę upewnić się, że "
-"faktycznie chcesz wykonać tą operację. Nie ma możliwości odwrócenia tego "
-"procesu."
-
-#: plugins/admin/acl/class_aclManagement.inc:290
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
 #, fuzzy
-msgid "ACL role"
-msgstr "ACLe"
-
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-msgid "List of acls"
-msgstr "Lista ACLi"
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr "Podsumowanie"
-
-#: plugins/admin/acl/class_divListACL.inc:84
-msgid "Display acls matching"
-msgstr "Wyświetl ACL pasujące"
-
-#: 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 "Pełniona funkcja"
+msgid "Acl"
+msgstr "ACL"
 
-#: plugins/admin/acl/class_divListACL.inc:165
+#: plugins/admin/acl/class_aclManagement.inc:154
 #, fuzzy
-msgid "Edit acl role"
-msgstr "Edytuj makro"
-
-#: plugins/admin/acl/class_divListACL.inc:185
-msgid "Edit acl"
-msgstr "Edytuj ACL"
-
-#: plugins/admin/acl/class_divListACL.inc:192
-msgid "Delete acl"
-msgstr "Usuń ACL"
+msgid "ACL Assignment"
+msgstr "Zarządzanie ACL"
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
 msgid "ACL Templates"
 msgstr "Szablony ACL"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:745
 #, fuzzy
 msgid "Access control roles"
 msgstr "Kontrola dostępu"
@@ -4394,51 +4111,69 @@ msgstr "Kontrola dostępu"
 msgid "Edit AC roles"
 msgstr "ACLe"
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 msgid "Reset ACL"
 msgstr "Resetuj ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 msgid "No ACL settings for this category"
 msgstr "Brak ustawień ACL w tej kategorii"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, fuzzy, php-format
 msgid "ACL for these objects: %s"
 msgstr "Zawiera ACL'e w tych kategoriach: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 #, fuzzy
 msgid "Edit category ACL"
 msgstr "Edytuj kategorie ACL'i"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 #, fuzzy
 msgid "Reset category ACL"
 msgstr "Kategoria"
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Edytuj ACL dla '%s', zakres to '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, fuzzy
 msgid "Object in use"
 msgstr "Nazwa obiektu"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:753
+#: 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 "Pełniona funkcja"
+
+#: plugins/admin/acl/class_aclRole.inc:755
 msgid "Permissions"
 msgstr "Uprawnienia"
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
-msgid "ACL management"
-msgstr "Zarządzanie ACL"
+#: plugins/admin/acl/acl-list.xml:11
+msgid "List of acls"
+msgstr "Lista ACLi"
+
+#: plugins/admin/acl/acl-filter.tpl:11
+#, fuzzy
+msgid "Show access control lists"
+msgstr "Kontrola dostępu"
+
+#: plugins/admin/acl/acl-filter.tpl:12
+#, fuzzy
+msgid "Show roles"
+msgstr "Pokaż telefony"
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
@@ -4455,264 +4190,261 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Ustawienia Aplikacji"
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr "kobieta"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr "mężczyzna"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr "Nie można wgrać pliku!"
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 msgid "Serial number"
 msgstr "Numer seryjny"
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Certyfikat jest ważny od %s do %s i jest obecnie %s."
 
-#: plugins/personal/generic/class_user.inc:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr "prawidłowy"
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr "nieprawidłowy"
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 msgid "No certificate installed"
 msgstr "Brak zainstalowanych certyfikatów"
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "Ta aplikacja nie jest już dostępna."
 
-#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "Ta aplikacja nie jest już dostępna."
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: plugins/personal/generic/class_user.inc:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Komórka"
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data urodzenia"
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 msgid "Cannot open certificate!"
 msgstr "Nie można otworzyć certyfikatu!"
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Jednostka"
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identyfikator budynku"
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Wywołanie"
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Ostatnia dostawa"
 
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lokalizacja osoby"
 
-#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Opis jednostki"
 
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Sektor"
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Tytuł funkcjonalny"
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Nmer seryjny certyfikatu"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Publicznie widoczne"
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Ulica"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Kod pocztowy"
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1598
 msgid "Generic user settings"
 msgstr "Ogólne ustawienia użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Moje konto "
 
-#: plugins/personal/generic/class_user.inc:1601
-msgid "Surname"
-msgstr "Nazwisko"
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 msgid "User identification"
 msgstr "Identyfikacja użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Osobisty tytuł"
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Tytuł naukowy"
 
-#: plugins/personal/generic/class_user.inc:1608
-msgid "Gender"
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
 msgstr "Płeć"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 msgid "Preferred language"
 msgstr "Preferowany język"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Zdjęcie użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 msgid "Department number"
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Employee number"
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Typ pracownika"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Room number"
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Telefon number"
 msgstr "Numer telefonu"
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Pager number"
 msgstr "Numer pagera"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 msgid "Mobile number"
 msgstr "Telefon komórkowy"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 msgid "Fax number"
 msgstr "Numer fax"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 #, fuzzy
 msgid "User password method"
 msgstr "Przechowywanie hasła"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 msgid "User certificates"
 msgstr "Certyfikaty użytkownika"
 
@@ -4740,10 +4472,6 @@ msgstr "Zmień zdjęcie"
 msgid "Template name"
 msgstr "Nazwa Szablonu"
 
-#: plugins/personal/generic/generic.tpl:138
-msgid "Sex"
-msgstr "Płeć"
-
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
@@ -4869,6 +4597,12 @@ msgstr "wygasło"
 msgid "grace time active"
 msgstr "Czas prolongaty aktywny"
 
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+msgid "active"
+msgstr "Aktywne"
+
 #: plugins/personal/posix/class_posixAccount.inc:173
 msgid "password not changeable"
 msgstr "hasło niezmienialne"
@@ -4877,134 +4611,130 @@ msgstr "hasło niezmienialne"
 msgid "password expired"
 msgstr "hasło wygasło"
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr "nieskonfigurowane"
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr "automatyczne"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr "Hasło nie może być zmienione do %s dni po ostatniej zmianie"
 
-#: plugins/personal/posix/class_posixAccount.inc:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Hasło musi zostać zmienione po %s dniach"
 
-#: plugins/personal/posix/class_posixAccount.inc:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, fuzzy, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr "Wyłącz konto po %s dniach nieaktywności po wygaśnięciu hasła"
 
-#: plugins/personal/posix/class_posixAccount.inc:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, fuzzy, php-format
 msgid "Warn user %s days before password expiry"
 msgstr "Ostrzeż użytkownika na %s dni przed wygaśnięciem hasła"
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr "Grupa użytkownika"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Katalog domowy"
 
-#: 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:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 msgid "shadowMin"
 msgstr "shadowMin"
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 msgid "shadowMax"
 msgstr "shadowMax"
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 msgid "shadowWarning"
 msgstr "shadowWarning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 #, fuzzy
 msgid "shadowInactive"
 msgstr "Shadow nieaktywne"
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 msgid "POSIX account"
 msgstr "Konto POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 msgid "Group ID"
 msgstr "ID grupy"
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 msgid "Force password change on login"
 msgstr "Wymuś zmianę hasła podczas logowania"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 msgid "Shadow warning"
 msgstr "Shadow ostrzeżenie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 msgid "Shadow inactive"
 msgstr "Shadow nieaktywne"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 msgid "Shadow expire"
 msgstr "Shadow wygasa"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr "Publiczny klucz SSH"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 msgid "System trust model"
 msgstr "Zaufanie do systemów"
 
@@ -5070,10 +4800,18 @@ msgstr "Wyświetl grupy departamentu"
 msgid "Display groups matching"
 msgstr "Wyświetl grupy pasujące"
 
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr "Wyrażenie regularne dla dopasowania nazw grup"
+
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "Wyświetl grupy użytkownika"
 
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr "Nazwa użytkownika którego grupy są pokazane"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Ustawienia Posix"
@@ -5302,49 +5040,41 @@ msgstr "do folferu"
 
 #: setup/setup_config2.tpl:123
 #, fuzzy
-msgid "Logging options"
-msgstr "Nieznane"
-
-#: setup/setup_config2.tpl:127
-msgid "Syslog"
-msgstr "Syslog"
-
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-msgid "MySQL"
-msgstr "MySQL"
+msgid "GOsa logging"
+msgstr "GOsa"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 msgid "Mail settings"
 msgstr "Ustawienia pocztowe"
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr "Typ pocztowy"
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 #, fuzzy
 msgid "Vacation templates"
 msgstr "Szablon stacji roboczej"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 #, fuzzy
 msgid "Snapshots / Undo"
 msgstr "Tworzenie snapshot'u nieudane"
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 #, fuzzy
 msgid "Enable snapshots"
 msgstr "Utwórz spanshot"
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 #, fuzzy
 msgid "Snapshot base"
 msgstr "Tworzenie snapshot'u nieudane"
@@ -5662,6 +5392,10 @@ msgstr "mbstring"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:120
+msgid "MySQL"
+msgstr "MySQL"
+
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -6025,14 +5759,14 @@ msgstr ""
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "Yes"
 msgstr "Tak"
 
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "No"
 msgstr "Nie"
 
@@ -6905,6 +6639,208 @@ msgstr "Tek krok umożliwia wybranie preferowanego języka."
 msgid "Automatic"
 msgstr "Automatycznie"
 
+#, fuzzy
+#~ msgid "Edit ogroup"
+#~ msgstr "Lista grup"
+
+#, fuzzy
+#~ msgid "List of ogroups"
+#~ msgstr "Lista grup"
+
+#~ msgid "Use"
+#~ msgstr "Użyj"
+
+#, fuzzy
+#~ msgid "Filter entries with this syntax"
+#~ msgstr "Filtruj elementy z tą składnią"
+
+#~ msgid "MySQL error"
+#~ msgstr "błąd MySQL"
+
+#~ msgid "MySQL logging"
+#~ msgstr "logowanie MySQL"
+
+#, fuzzy
+#~ msgid "Cannot add location to the database!"
+#~ msgstr "Nie można połączyć się z serwerem baz danych!"
+
+#~ msgid "Submit department"
+#~ msgstr "Zatwierdź departament"
+
+#~ msgid "edit"
+#~ msgstr "edytuj"
+
+#~ msgid "delete"
+#~ msgstr "Usuń"
+
+#, fuzzy
+#~ msgid "Number of listed object groups"
+#~ msgstr "Nazwa grupy obiektów"
+
+#, fuzzy
+#~ msgid "Number of listed departments"
+#~ msgstr "Nazwa departamentu"
+
+#~ msgid "Select to see groups that are primary groups of users"
+#~ msgstr ""
+#~ "Zaznacz aby zobaczyć grupy które są podstawowymi grupami użytkowników"
+
+#~ msgid "primary groups"
+#~ msgstr "Grupy podstawowe"
+
+#, fuzzy
+#~ msgid "samba groups mappings"
+#~ msgstr "Samba SID"
+
+#~ msgid "samba groups"
+#~ msgstr "Grupy Samba"
+
+#~ msgid "application settings"
+#~ msgstr "ustawienia aplikacji"
+
+#~ msgid "mail settings"
+#~ msgstr "Ustawienia poczty"
+
+#~ msgid "mail groups"
+#~ msgstr "grupy pocztowe"
+
+#~ msgid "Select to see normal groups that have only functional aspects"
+#~ msgstr ""
+#~ "Zaznacz aby zobaczyć grupy, które posiadają tylko aspekty funkcjonalne"
+
+#, fuzzy
+#~ msgid "functional groups"
+#~ msgstr "Pokaż grupy funkcjonalne"
+
+#, fuzzy
+#~ msgid "Not allowed"
+#~ msgstr "Brak uprawnień do zmiay hasła"
+
+#, fuzzy
+#~ msgid "Number of listed groups"
+#~ msgstr "Nazwa grupy"
+
+#~ msgid "Manage POSIX groups"
+#~ msgstr "Zarządzaj grupami POSIX"
+
+#~ msgid "group"
+#~ msgstr "grupa"
+
+#~ msgid "User administration"
+#~ msgstr "Administracja użytkownikami"
+
+#~ msgid "templates"
+#~ msgstr "Szablon"
+
+#~ msgid "GOsa object"
+#~ msgstr "Obiekt GOsa"
+
+#, fuzzy
+#~ msgid "functional users"
+#~ msgstr "Pokaż użytkowników funkcjonalnych"
+
+#, fuzzy
+#~ msgid "POSIX users"
+#~ msgstr "Ustawienia Posix"
+
+#, fuzzy
+#~ msgid "samba users"
+#~ msgstr "Użytkownicy domeny"
+
+#, fuzzy
+#~ msgid "proxy users"
+#~ msgstr "Pokaż użytkowników proxy"
+
+#, fuzzy
+#~ msgid "phone users"
+#~ msgstr "Pokaż użytkowników proxy"
+
+#~ msgid "GOsa"
+#~ msgstr "GOsa"
+
+#~ msgid "Edit UNIX properties"
+#~ msgstr "Edytuj właściwości UNIX"
+
+#~ msgid "Edit fax properies"
+#~ msgstr "Edytuj właściwości Fax"
+
+#~ msgid "Create user with this template"
+#~ msgstr "Utwórz użytkownika z tego szablonu"
+
+#~ msgid "user"
+#~ msgstr "użytkownik"
+
+#~ msgid "password"
+#~ msgstr "hasło"
+
+#~ msgid "Delete user"
+#~ msgstr "Usuń użytkownika"
+
+#, fuzzy
+#~ msgid "Number of listed users"
+#~ msgstr "Nazwa departamentu"
+
+#, fuzzy
+#~ msgid "You have no permission to modify object '%s'!"
+#~ msgstr "Brak uprawnień do usunięcia grupy obiektowej."
+
+#, fuzzy
+#~ msgid "You have no permission to use this template!"
+#~ msgstr "Brak uprawnień do usunięcia grupy obiektowej."
+
+#, fuzzy
+#~ msgid "You have no permission to change the lock status for this user!"
+#~ msgstr "Brak uprawnień do zmiany własnego hasła"
+
+#, fuzzy
+#~ msgid "Name / Department"
+#~ msgstr "Nazwa departamentu"
+
+#~ msgid "Regular expression for matching department names"
+#~ msgstr "Wyrażenie regularne dla dopasowania nazw departamentów"
+
+#~ msgid "Department management"
+#~ msgstr "Zarządzanie departamentem"
+
+#~ 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 ""
+#~ "To zawiera cały system i informacje instalacyjne. Proszę upewnić się, że "
+#~ "faktycznie chcesz wykonać tą operację. Nie ma możliwości odwrócenia tego "
+#~ "procesu."
+
+#, fuzzy
+#~ msgid "ACL role"
+#~ msgstr "ACLe"
+
+#~ msgid "Summary"
+#~ msgstr "Podsumowanie"
+
+#~ msgid "Display acls matching"
+#~ msgstr "Wyświetl ACL pasujące"
+
+#, fuzzy
+#~ msgid "Edit acl role"
+#~ msgstr "Edytuj makro"
+
+#~ msgid "Edit acl"
+#~ msgstr "Edytuj ACL"
+
+#~ msgid "Delete acl"
+#~ msgstr "Usuń ACL"
+
+#~ msgid "Gender"
+#~ msgstr "Płeć"
+
+#, fuzzy
+#~ msgid "Logging options"
+#~ msgstr "Nieznane"
+
+#~ msgid "Syslog"
+#~ msgstr "Syslog"
+
 #, fuzzy
 #~ msgid "ACL takes effect for all users"
 #~ msgstr "ACL jest prawidłowy dla wszystkich użytkowników"
@@ -6913,10 +6849,6 @@ msgstr "Automatycznie"
 #~ msgid "Non common group"
 #~ msgstr "Pokaż grupy pocztowe"
 
-#, fuzzy
-#~ msgid "All"
-#~ msgstr "ACL"
-
 #, fuzzy
 #~ msgid "Enable DNS extension"
 #~ msgstr "Rozszerzenie inwentarza"
@@ -7044,10 +6976,6 @@ msgstr "Automatycznie"
 #~ msgid "Hour"
 #~ msgstr "godzina"
 
-#, fuzzy
-#~ msgid "Minute"
-#~ msgstr "Drukarka"
-
 #, fuzzy
 #~ msgid "Day"
 #~ msgstr "dzień"
@@ -7585,15 +7513,9 @@ msgstr "Automatycznie"
 #~ msgid "Select to see users that have proxy settings"
 #~ msgstr "Zaznacz aby zobaczyć użytkowników którzy posiadają ustawienia proxy"
 
-#~ msgid "Show primary groups"
-#~ msgstr "Pokaż podstawowe grupy"
-
 #~ msgid "Select to see groups that have samba groups mappings"
 #~ msgstr "Zaznacz aby zobaczyć grupy które posiadają mapowania grup samba"
 
-#~ msgid "Show samba groups"
-#~ msgstr "Pokaż grupy samba"
-
 #~ msgid "Select to see groups that have applications configured"
 #~ msgstr "Zaznacz aby zobaczyć grupy które posiadają skonfigurowane aplikacje"
 
@@ -7649,9 +7571,6 @@ msgstr "Automatycznie"
 #~ msgid "Select to see phones"
 #~ msgstr "Wybież aby zobaczyć telefony"
 
-#~ msgid "Show phones"
-#~ msgstr "Pokaż telefony"
-
 #, fuzzy
 #~ msgid "Cannot connect to logging server '%s'."
 #~ msgstr "Nie można połączyć się z serwerem baz danych!"
@@ -7997,9 +7916,6 @@ msgstr "Automatycznie"
 #~ msgid "Import"
 #~ msgstr "Import"
 
-#~ msgid "Send message"
-#~ msgstr "Wyślij wiadomość"
-
 #~ msgid "Notification send!"
 #~ msgstr "Powiadomienie wysłane!"
 
@@ -8234,10 +8150,6 @@ msgstr "Automatycznie"
 #~ msgid "Reomve"
 #~ msgstr "Usuń"
 
-#, fuzzy
-#~ msgid "GOsa ping"
-#~ msgstr "GOsa"
-
 #, fuzzy
 #~ msgid "Say hello"
 #~ msgstr "Shell"
index 986e8245f564b914620252ff013ab228e9a1f819..4d8d58b485d887cf75a533ef94bdd49b750365b1 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages-2.6.4-pt_BR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: 2009-03-02 15:03-0300\n"
 "Last-Translator: Clever de Oliveira Jr. <clever@dri.cefetmg.br>\n"
 "Language-Team: Brazilian Portuguese <pt@li.org>\n"
@@ -35,19 +35,17 @@ 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -66,6 +64,7 @@ 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 ""
 "Então, se você tem certeza, pressione 'Deletar' para continuar ou 'Cancelar' "
@@ -77,15 +76,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr "Cancelar"
@@ -106,15 +104,14 @@ 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 "Nome do usuário"
 
 #: 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "Senha"
 
@@ -243,7 +240,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 msgid "Members"
 msgstr "Membros"
 
@@ -276,7 +273,7 @@ msgstr ""
 #: 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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -289,9 +286,7 @@ msgid "Verify password"
 msgstr ""
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr "Alterar senha"
 
@@ -337,7 +332,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr "Objeto"
 
@@ -376,47 +371,49 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.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/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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -426,9 +423,9 @@ msgstr "Erro"
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -457,8 +454,7 @@ msgid "Your password has been changed successfully."
 msgstr "Sua senha foi alterada com sucesso."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -592,9 +588,9 @@ msgstr "Logado:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
 msgstr ""
 
@@ -608,17 +604,17 @@ msgstr "A configuração GOsa %s/%s não pôde ser lida. Abortado."
 #: 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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 msgid "Configuration error"
@@ -629,7 +625,7 @@ msgstr "Erro de configuração"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 msgid "Password method"
 msgstr ""
 
@@ -637,7 +633,7 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr "Erro: Método de senha não disponível!"
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -655,10 +651,11 @@ msgid "The password used as new is to short."
 msgstr "A senha utilizada como nova é curta."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: 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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -676,11 +673,11 @@ msgstr "Você não tem permissão para alterar sua senha."
 msgid "External password changer reported a problem: "
 msgstr "O alterador externo de senhas reportou um problema:"
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr "A sessão não será criptografada."
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr "Entre com a sessão SSL"
 
@@ -711,33 +708,37 @@ msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: 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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -777,11 +778,11 @@ msgstr ""
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:368
+#: html/index.php:369
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -862,6 +863,49 @@ msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 "Helpdir '%s' não está acessível, não foi possível ler nenhum helpfiles."
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr "desconfigurado"
+
+#: include/class_management.inc:144
+#, fuzzy
+msgid "Filter error"
+msgstr "Erro interno"
+
+#: 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 ""
+
+#: 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 ""
+
+#: include/class_management.inc:426 include/class_plugin.inc:1546
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr ""
+
+#: 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 ""
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr "O módulo mcrypt não foi encontrado. Por favor, instale o php5-mcrypt."
@@ -881,14 +925,14 @@ msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -899,11 +943,11 @@ msgstr ""
 msgid "Access control"
 msgstr "Controle de acesso"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr "Gerenciar listas de controle de acesso"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 msgid "All categories"
 msgstr "Todas as categorias"
 
@@ -911,20 +955,20 @@ msgstr "Todas as categorias"
 msgid "Reset ACLs"
 msgstr "Limpar ACLs"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 msgid "One level"
 msgstr "Um nível"
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Current object"
 msgstr "Objeto atual"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 msgid "Complete subtree"
 msgstr "Subárvore completa"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr "Subárvore completa (permanente)"
 
@@ -932,56 +976,54 @@ msgstr "Subárvore completa (permanente)"
 msgid "Use ACL defined in role"
 msgstr "Use ACL definida na regra"
 
-#: 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
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Usuários"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: 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_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
+#: 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
 msgid "Up"
 msgstr "Para cima"
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "Para baixo"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr "Editar"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr "Deletar"
@@ -1004,7 +1046,7 @@ msgstr "Categoria ACL"
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Editar ACL para '%s' - o escopo é '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr "Todos os objetos na subárvore atual"
 
@@ -1044,13 +1086,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: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
+#: 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
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -1078,20 +1120,20 @@ msgstr "regra desconhecida"
 msgid "Contains settings for these objects: %s"
 msgstr "Contém configurações para estes objetos: %s"
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 msgid "inactive"
 msgstr ""
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "No members"
 msgstr "Membros do grupo"
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 msgid "Access control list"
 msgstr "Lista de controle de acesso"
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 msgid "ACL roles"
 msgstr "Regras de ACL"
 
@@ -1100,48 +1142,38 @@ msgstr "Regras de ACL"
 msgid "Close"
 msgstr "Fechar"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 msgid "Go to root department"
 msgstr "Ir para departamento raiz"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 msgid "Root"
 msgstr "Raiz"
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 msgid "Go up one department"
 msgstr "Subir um departamento"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 msgid "Go to users department"
 msgstr "Ir para departamento de usuários"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 msgid "Home"
 msgstr "Origem"
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr "Recarregar lista"
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr "Submeter"
 
@@ -1155,33 +1187,19 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 msgid "Choose a base"
 msgstr ""
 
-#: 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 ""
-
-#: include/class_baseSelectDialog.inc:61
-msgid "Use"
-msgstr ""
-
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1189,25 +1207,18 @@ msgstr ""
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "Base"
 
-#: include/class_baseSelectDialog.inc:68
-msgid "Filter entries with this syntax"
-msgstr ""
-
-#: 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
+#: include/class_listing.inc:298 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
@@ -1215,356 +1226,372 @@ msgstr ""
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 #, fuzzy
 msgid "created by"
 msgstr "Criar"
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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 "Ações"
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:132
+msgid "Edit this entry"
+msgstr "Editar esta entrada"
+
+#: include/class_sortableListing.inc:133
+msgid "Delete this entry"
+msgstr "Deletar esta entrada"
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:399
+#: include/functions.inc:518
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:474
+#: include/functions.inc:603
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1049
+#: include/functions.inc:1232
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 msgid "Edit anyway"
 msgstr "Editar mesmo assim"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2309
+#: include/functions.inc:2764
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr "Alemão"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr "Francês"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr "Inglês"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr "Holandês"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 msgid "Polish"
 msgstr "Polonês"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 msgid "Vietnamese"
 msgstr ""
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr "Russo"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr "Referências"
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 msgid "Remove snapshot"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1580,8 +1607,11 @@ msgstr ""
 #: 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr "Descrição"
 
@@ -1686,7 +1716,7 @@ msgstr "Tipo"
 msgid "Arguments"
 msgstr ""
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
@@ -1698,50 +1728,29 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: 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 ""
-
-#: include/class_plugin.inc:1547
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr ""
-
-#: 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 ""
-
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "from"
 msgstr "de"
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr ""
 
-#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 msgid "Restore"
 msgstr ""
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 msgid "cut"
 msgstr ""
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr ""
 
@@ -2324,17 +2333,17 @@ msgid ""
 "setup?"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Alerta de performance"
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 "A performance do LDAP está ruim: a última pesquisa levou cerca de %.2fs!"
 
-#: include/class_ldap.inc:665
+#: include/class_ldap.inc:692
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
@@ -2342,23 +2351,23 @@ msgstr ""
 "Não foi possível criar subárvores automaticamente com RDN '%s': classe de "
 "objeto não encontrada!"
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:740
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 "Não foi possível criar subárvores automaticamente com '%s': não suportado"
 
-#: include/class_ldap.inc:800
+#: include/class_ldap.inc:827
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "enquanto executava em '%s' usando LDAP server '%s'"
 
-#: include/class_ldap.inc:802
+#: include/class_ldap.inc:829
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "enquanto executava no LDAP server %s"
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2367,84 +2376,64 @@ msgstr ""
 "Esse não é um DN válido: '%s'. O bloco para importação deve iniciar com "
 "'dn: ...' na linha %s"
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Erro enquanto importava dn: '%s', por favor, verifique seu LDIF na linha %s!"
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, php-format
 msgid "Logging failed: %s"
 msgstr ""
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr ""
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 msgid "Specified objectType is empty or invalid!"
 msgstr ""
 
-#: include/class_log.inc:139
-msgid "MySQL error"
-msgstr ""
-
-#: include/class_log.inc:139
-#, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr ""
-
-#: 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 ""
-
-#: include/class_log.inc:219
-#, php-format
-msgid "Cannot add location to the database!"
-msgstr ""
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 msgid "Cannot not parse XML!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Erro de XML no gosa.conf: %s na linha %d"
 
-#: include/class_config.inc:270
+#: include/class_config.inc:317
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Não foi possível realizar bind para o LDAP. Por favor, contacte o "
 "administrador do sistema."
 
-#: include/class_config.inc:636
+#: include/class_config.inc:694
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "sambaSID e/ou sambaRidBase não configurado!"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid "Configuration"
 msgstr "Configuração"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2467,44 +2456,44 @@ msgstr ""
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: 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: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
 #, php-format
 msgid "Copy and paste failed!"
 msgstr "Falha em copiar e colar!"
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "Não foi possível atribuir permissão para '%s'"
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr "'%s' não é um objeto LDAP válido"
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, php-format
 msgid "No write permission in '%s'"
 msgstr "Sem permissão de escrita em '%s'"
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr "Estes objetos serão colados: %s"
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr "Esse objeto será colado: %s"
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 msgid "Cannot paste"
 msgstr "Impossível colar"
 
@@ -2514,11 +2503,11 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Geral"
@@ -2529,32 +2518,26 @@ 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr "Correio"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr "FAX"
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2563,34 +2546,34 @@ msgid "FTP"
 msgstr "FTP"
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/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: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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2599,14 +2582,13 @@ msgid "Phone"
 msgstr "Fone"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr "Aplicação"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Servidor"
 
@@ -2615,19 +2597,17 @@ msgid "Thin Client"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr "Estação de trabalho"
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr "Impressora"
 
@@ -2670,253 +2650,48 @@ msgstr ""
 msgid "The GOsa team"
 msgstr ""
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr ""
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "List of object groups"
-msgstr ""
-
-#: 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 "Propriedades"
-
-#: 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 "Ações"
-
-#: 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 ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-msgid "user groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-msgid "nested groups"
-msgstr ""
-
-#: 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 ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-msgid "department groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-msgid "server groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-msgid "workstation groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-msgid "windows workstation groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-msgid "terminal groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-msgid "printer groups"
-msgstr ""
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-msgid "phone groups"
-msgstr ""
-
-#: 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 "Expressão regular para combinação de nomes 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 "Submeter 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 "Criar"
-
-#: 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 "Remover"
-
-#: 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 "deletar"
-
-#: 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 "Deletar esta entrada"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-msgid "Number of listed object groups"
-msgstr ""
-
-#: 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 listados"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: 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 objeto"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 msgid "Manage object groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 msgid "Infrastructure error"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-msgid "object group"
-msgstr ""
-
-#: 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 ""
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 msgid "Templates"
 msgstr "Modelos"
 
-#: 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
+#: 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
 msgid "User"
 msgstr "Usuário"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 msgid "Windows Install"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 msgid "Terminal"
 msgstr ""
 
@@ -2930,6 +2705,19 @@ 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 ""
+
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 msgid "people"
@@ -2981,7 +2769,9 @@ msgid "applications"
 msgstr "Aplicações"
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr "nenhum"
 
@@ -2999,20 +2789,20 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "desabilitado"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 msgid "full access"
 msgstr "acesso completo"
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr "permitir acesso a estas máquinas"
 
@@ -3030,22 +2820,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3073,13 +2858,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Nome"
@@ -3133,7 +2924,7 @@ msgid "Select a base"
 msgstr "Selecione a base"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Sistema de confiança"
@@ -3171,10 +2962,9 @@ msgid "FAI summary"
 msgstr "Sumário FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr "Ambiente"
 
@@ -3186,42 +2976,144 @@ msgstr "Aplicações"
 msgid "Please enter the new object group name"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
+#: 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 ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
-msgid "Display objects of department"
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+msgid "nested groups"
 msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-#: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-msgid "Choose the department the search will be based on"
-msgstr "Escolha o departamento para base de procura"
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+msgid "application groups"
+msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
-msgid "Display objects matching"
-msgstr "Exibir combinação de objetos"
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+msgid "department groups"
+msgstr ""
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-msgid "Regular expression for matching object names"
-msgstr "Expressão regular para combinação de nomes de objeto"
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+msgid "server groups"
+msgstr ""
 
-#: plugins/admin/ogroups/trust_machines.tpl:6
-#: plugins/admin/groups/trust_machines.tpl:6
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Selecione sistemas para adicionar"
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+msgid "workstation groups"
+msgstr ""
 
-#: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Exibir sistemas do departamento"
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+msgid "windows workstation groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+msgid "terminal groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+msgid "printer groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+msgid "phone groups"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+#, fuzzy
+msgid "List of object groups"
+msgstr "Lista dos grupos"
+
+#: 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 "Propriedades"
+
+#: 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 "Criar"
+
+#: 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 "Remover"
+
+#: 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 "Lista dos grupos"
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+#, fuzzy
+msgid "Remove object group"
+msgstr "Remover foto"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/trust_machines.tpl:27
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+msgid "Choose the department the search will be based on"
+msgstr "Escolha o departamento para base de procura"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:40
+msgid "Display objects matching"
+msgstr "Exibir combinação de objetos"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+msgid "Regular expression for matching object names"
+msgstr "Expressão regular para combinação de nomes de objeto"
+
+#: plugins/admin/ogroups/trust_machines.tpl:6
+#: plugins/admin/groups/trust_machines.tpl:6
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Selecione sistemas para adicionar"
+
+#: plugins/admin/ogroups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Exibir sistemas do departamento"
 
 #: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
@@ -3261,7 +3153,6 @@ msgid "Display users of department"
 msgstr ""
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr "Exibir combinação de usuários"
 
@@ -3323,67 +3214,20 @@ msgstr ""
 msgid "Not in all groups"
 msgstr ""
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
-msgstr "Lista dos grupos"
-
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
-msgstr "Selecione para ver os grupos que são primários dos usuários"
-
-#: plugins/admin/groups/class_divListGroup.inc:85
-msgid "primary groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:86
-msgid "samba groups mappings"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-msgid "samba groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:88
-msgid "application settings"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-msgid "mail settings"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:91
-msgid "mail groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Selecione para ver grupos normais que tem somente aspectos funcionais"
-
-#: plugins/admin/groups/class_divListGroup.inc:93
-msgid "functional groups"
-msgstr ""
-
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr "Nome do usuário dos grupos exibidos"
-
-#: 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/group-filter.tpl:11
+#, fuzzy
+msgid "Show primary groups"
+msgstr "Grupo primário"
 
-#: 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 ""
+#: plugins/admin/groups/group-filter.tpl:12
+#, fuzzy
+msgid "Show samba groups"
+msgstr "Usuários do domínio"
 
-#: plugins/admin/groups/class_divListGroup.inc:303
-msgid "Number of listed groups"
-msgstr ""
+#: plugins/admin/groups/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
+msgstr "Usuários do domínio"
 
 #: plugins/admin/groups/class_groupGeneric.inc:161
 msgid "Cannot find group SID in your configuration!"
@@ -3430,52 +3274,52 @@ msgstr "! id desconhecido"
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 msgid "Group member"
 msgstr ""
 
@@ -3483,178 +3327,71 @@ msgstr ""
 msgid "Group settings"
 msgstr ""
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
-msgid "Group administration"
-msgstr "Administração de grupos"
-
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-msgid "group"
-msgstr ""
-
-#: 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 ""
-"Isso inclui, para este usuário, todos os dados da conta, regras de acesso, "
-"configurações imap e etc. Por favor, tenha certeza se quer realmente fazer "
-"isso, pois o GOsa não tem como recuperar seus dados anteriores."
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr "Administração de usuários"
-
-#: 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 usuários"
-
-#: 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 "Modelo"
-
-#: plugins/admin/users/class_divListUsers.inc:85
-msgid "templates"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "GOsa object"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "functional users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:87
-msgid "POSIX users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:88
-msgid "mail users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:89
-msgid "samba users"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:90
-msgid "proxy users"
-msgstr ""
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista dos grupos"
 
-#: plugins/admin/users/class_divListUsers.inc:93
+#: plugins/admin/groups/group-list.xml:138
 #, fuzzy
-msgid "phone users"
-msgstr "Telefones"
-
-#: 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 ""
+msgid "Edit group"
+msgstr "Lista dos grupos"
 
-#: plugins/admin/users/class_divListUsers.inc:204
-msgid "GOsa"
-msgstr "GOsa"
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "Remover foto"
 
-#: plugins/admin/users/class_divListUsers.inc:205
-#: plugins/admin/users/class_userManagement.inc:1067
-msgid "Edit generic properties"
-msgstr "Editar propriedades gerais"
+#: plugins/admin/groups/class_groupManagement.inc:26
+msgid "Group administration"
+msgstr "Administração de grupos"
 
-#: plugins/admin/users/class_divListUsers.inc:207
-msgid "Edit UNIX properties"
-msgstr "Editar propriedades UNIX"
+#: plugins/admin/groups/class_groupManagement.inc:155
+msgid "Posix"
+msgstr "Posix"
 
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
-msgid "Edit environment properties"
-msgstr "Editar propriedades de ambiente"
+#: plugins/admin/groups/class_groupManagement.inc:156
+#, fuzzy
+msgid "Edit posix properties"
+msgstr "Editar propriedades de telefone"
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 msgid "Edit mail properties"
 msgstr "Editar propriedades de correio"
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1095
-msgid "Edit phone properties"
-msgstr "Editar propriedades de telefone"
-
-#: 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/users/class_divListUsers.inc:215
-msgid "Edit fax properies"
-msgstr "Editar propriedades de fax"
-
-#: plugins/admin/users/class_divListUsers.inc:217
-#: plugins/admin/users/class_userManagement.inc:1079
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:750
 msgid "Edit samba properties"
 msgstr "Editar propriedades do samba"
 
-#: plugins/admin/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr "Netatalk"
-
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/users/class_userManagement.inc:1083
-msgid "Edit netatalk properties"
-msgstr "Editar propriedades do netatalk"
-
-#: plugins/admin/users/class_divListUsers.inc:220
-msgid "Create user from template"
-msgstr "Criar usuário do modelo"
-
-#: plugins/admin/users/class_divListUsers.inc:221
-msgid "Create user with this template"
-msgstr "Criar usuário com este modelo"
-
-#: 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 "ativo"
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
+msgid "Edit phone properties"
+msgstr "Editar propriedades de telefone"
 
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
-msgid "user"
+#: plugins/admin/groups/class_groupManagement.inc:187
+msgid "Menu"
 msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:274
-msgid "password"
-msgstr "senha"
+#: plugins/admin/groups/class_groupManagement.inc:188
+#, fuzzy
+msgid "Edit start menu properties"
+msgstr "Editar propriedades do samba"
 
-#: plugins/admin/users/class_divListUsers.inc:287
-msgid "Delete user"
-msgstr "Deletar usuário"
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:758
+msgid "Edit environment properties"
+msgstr "Editar propriedades de ambiente"
 
-#: plugins/admin/users/class_divListUsers.inc:376
-msgid "Number of listed users"
+#: 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 ""
+"Isso inclui, para este usuário, todos os dados da conta, regras de acesso, "
+"configurações imap e etc. Por favor, tenha certeza se quer realmente fazer "
+"isso, pois o GOsa não tem como recuperar seus dados anteriores."
 
 #: plugins/admin/users/password.tpl:4
 msgid ""
@@ -3704,6 +3441,13 @@ msgstr ""
 "podem ser preenchidos automaticamente. Escolha 'nenhum' para não utilizar "
 "modelos."
 
+#: 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 "Modelo"
+
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
@@ -3714,91 +3458,112 @@ msgstr "Último nome"
 msgid "First name"
 msgstr "Primeiro nome"
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 msgid "You have no permission to change this users password!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:559
-msgid "You have no permission to use this template!"
-msgstr ""
+#: 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 "Nome fornecido"
 
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:662
-msgid "You have no permission to change the lock status for this user!"
-msgstr ""
-
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:650
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 
-#: 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 "Nome fornecido"
-
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:723
 #, fuzzy
 msgid "Unlock account"
 msgstr "Minha conta"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 #, fuzzy
 msgid "Lock account"
 msgstr "Minha conta"
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+msgid "Edit generic properties"
+msgstr "Editar propriedades gerais"
+
+#: 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
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Editar propriedades UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:753
+msgid "Netatalk"
+msgstr "Netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:754
+msgid "Edit netatalk properties"
+msgstr "Editar propriedades do netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:762
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Editar propriedades UNIX"
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Lista de usuários"
+
 #: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1608
+msgid "Surname"
+msgstr "Sobrenome"
+
+#: plugins/admin/users/user-list.xml:140
 #, fuzzy
-msgid "Name / Department"
-msgstr "Departamento"
+msgid "Lock users"
+msgstr "Lista de usuários"
+
+#: plugins/admin/users/user-list.xml:148
+#, fuzzy
+msgid "Unlock users"
+msgstr "Minha conta"
 
-#: plugins/admin/users/user-list.xml:175
+#: plugins/admin/users/user-list.xml:167
+msgid "Apply template"
+msgstr ""
+
+#: plugins/admin/users/user-list.xml:199
+#, fuzzy
+msgid "New user from template"
+msgstr "Criar usuário do modelo"
+
+#: plugins/admin/users/user-list.xml:213
 #, fuzzy
 msgid "Edit user"
 msgstr "Editar esta entrada"
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 #, fuzzy
 msgid "Remove user"
 msgstr "Remover foto"
@@ -3813,17 +3578,17 @@ msgid "Show functional users"
 msgstr ""
 
 #: plugins/admin/users/user-filter.tpl:13
-#, fuzzy
-msgid "Show mail users"
-msgstr "Usuários do domínio"
-
-#: plugins/admin/users/user-filter.tpl:14
 msgid "Show POSIX users"
 msgstr ""
 
+#: plugins/admin/users/user-filter.tpl:14
+#, fuzzy
+msgid "Show Mail users"
+msgstr "Usuários do domínio"
+
 #: plugins/admin/users/user-filter.tpl:15
 #, fuzzy
-msgid "Show samba users"
+msgid "Show Samba users"
 msgstr "Usuários do domínio"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -3840,10 +3605,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr ""
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -3851,7 +3612,7 @@ msgid ""
 "your data back."
 msgstr ""
 
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
+#: plugins/admin/departments/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 "
@@ -3861,109 +3622,50 @@ msgstr ""
 "sua árvore LDAP em um arquivo. Então, se pronto, pressione 'Deletar' para "
 "continuar ou 'Cancelar' para abortar."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: 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/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
-msgid "Department name"
-msgstr "Nome do 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 ""
-
-#: 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 "Estado"
-
-#: 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 "Localização"
-
-#: 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 "Endereço"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista dos departamentos"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr ""
+#: 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 "no domínio"
 
-#: 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 ""
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Administradores do domínio"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
+#: 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:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
+#: 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 ""
 
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
+#: 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 "Organização"
 
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -3992,6 +3694,21 @@ msgstr ""
 msgid "Choose subtree to place department in"
 msgstr ""
 
+#: 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 ""
+
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -4014,10 +3731,40 @@ msgstr ""
 msgid "Descriptive text for   department"
 msgstr "Exibir sistemas do departamento"
 
-#: plugins/admin/departments/generic.tpl:30
-#: plugins/admin/departments/organization.tpl:30
-msgid "Category for this subtree"
-msgstr ""
+#: 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 ""
+
+#: plugins/admin/departments/generic.tpl:30
+#: plugins/admin/departments/organization.tpl:30
+msgid "Category for this subtree"
+msgstr ""
+
+#: 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 "Localização"
+
+#: 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 "Estado"
 
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
@@ -4029,6 +3776,16 @@ msgstr ""
 msgid "Location of this subtree"
 msgstr ""
 
+#: 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 "Endereço"
+
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -4039,6 +3796,20 @@ msgstr ""
 msgid "Base telephone number of this subtree"
 msgstr ""
 
+#: 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"
@@ -4046,72 +3817,35 @@ msgstr ""
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 msgid "Domain Component"
 msgstr ""
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr "Lista dos departamentos"
-
-#: plugins/admin/departments/class_divListDepartment.inc:73
-msgid "Regular expression for matching department names"
-msgstr ""
+#: 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_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 msgid "Manage Departments"
 msgstr ""
 
-#: 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 ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:336
+#: plugins/admin/departments/class_departmentManagement.inc:126
 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 ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:556
-#, fuzzy
-msgid "Domain"
-msgstr "no domínio"
-
-#: 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 ""
-
-#: 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 "Organização"
-
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 msgid "Organization name"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Postal address"
 msgstr "Caixa postal"
 
@@ -4133,14 +3867,52 @@ msgstr "Administradores do domínio"
 msgid "Name of domain to create"
 msgstr ""
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr ""
-
 #: plugins/admin/departments/country.tpl:14
 msgid "Name of country to create"
 msgstr ""
 
+#: plugins/admin/departments/class_department.inc:386
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:618
+msgid "Department name"
+msgstr "Nome do departamento"
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr ""
+
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr ""
@@ -4179,48 +3951,13 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: 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 ""
-
-#: plugins/admin/acl/class_aclManagement.inc:290
-msgid "ACL role"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-msgid "List of acls"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr "Sumário"
-
-#: plugins/admin/acl/class_divListACL.inc:84
-msgid "Display acls matching"
-msgstr ""
-
-#: 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 "Papel"
-
-#: plugins/admin/acl/class_divListACL.inc:165
-msgid "Edit acl role"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:185
-msgid "Edit acl"
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
+msgid "Acl"
 msgstr ""
 
-#: plugins/admin/acl/class_divListACL.inc:192
-msgid "Delete acl"
+#: plugins/admin/acl/class_aclManagement.inc:154
+msgid "ACL Assignment"
 msgstr ""
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
@@ -4228,7 +3965,7 @@ msgid "ACL Templates"
 msgstr ""
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:745
 msgid "Access control roles"
 msgstr ""
 
@@ -4236,49 +3973,67 @@ msgstr ""
 msgid "Edit AC roles"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 msgid "Reset ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 msgid "Edit category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 msgid "Reset category ACL"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 msgid "Object in use"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:753
+#: 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 "Papel"
+
+#: plugins/admin/acl/class_aclRole.inc:755
 msgid "Permissions"
 msgstr ""
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
-msgid "ACL management"
+#: plugins/admin/acl/acl-list.xml:11
+msgid "List of acls"
 msgstr ""
 
+#: plugins/admin/acl/acl-filter.tpl:11
+#, fuzzy
+msgid "Show access control lists"
+msgstr "Lista de controle de acesso"
+
+#: plugins/admin/acl/acl-filter.tpl:12
+#, fuzzy
+msgid "Show roles"
+msgstr "Modelos"
+
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
 msgstr ""
@@ -4293,27 +4048,27 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr "feminino"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr "masculino"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 msgid "Serial number"
 msgstr "Número serial"
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4321,235 +4076,232 @@ msgstr ""
 "(Alguns tipos de certificados não são suportados atualmente e podem ser "
 "exibidos como 'inválidos'.)"
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Certificado é válido de %s para %s e está atualmente %s."
 
-#: plugins/personal/generic/class_user.inc:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr "válido"
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr "inválido"
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 msgid "No certificate installed"
 msgstr "Nenhum certificado instalado"
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Página pessoal"
 
-#: plugins/personal/generic/class_user.inc:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data de nascimento"
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unidade"
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identificação da residência"
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Vocação"
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Última entrega"
 
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Localização da pessoa"
 
-#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Descrição da unidade"
 
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Área de assunto"
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Título funcional"
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Número serial do certificado"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visível publicamente"
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Rua"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "CEP"
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1598
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Minha conta"
 
-#: plugins/personal/generic/class_user.inc:1601
-msgid "Surname"
-msgstr "Sobrenome"
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Título pessoal"
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Título acadêmico"
 
-#: plugins/personal/generic/class_user.inc:1608
-msgid "Gender"
-msgstr ""
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
+msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Foto do usuário"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Tipo de empregado"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr "Caixa postal residencial"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 msgid "User certificates"
 msgstr ""
 
@@ -4577,10 +4329,6 @@ msgstr "Alterar foto"
 msgid "Template name"
 msgstr "Nome modelo"
 
-#: 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"
@@ -4705,6 +4453,12 @@ msgstr "expirado"
 msgid "grace time active"
 msgstr ""
 
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+msgid "active"
+msgstr "ativo"
+
 #: plugins/personal/posix/class_posixAccount.inc:173
 msgid "password not changeable"
 msgstr ""
@@ -4713,133 +4467,129 @@ msgstr ""
 msgid "password expired"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr "desconfigurado"
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr "A senha não pode ser alterada até %s dias após a última troca"
 
-#: plugins/personal/posix/class_posixAccount.inc:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "A senha deve ser alterada após %s dias"
 
-#: plugins/personal/posix/class_posixAccount.inc:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr "Grupo do usuário"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Diretório pessoal"
 
-#: 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:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "ID do usuário"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 msgid "System trust model"
 msgstr ""
 
@@ -4904,10 +4654,18 @@ msgstr "Exibir grupos do departamento"
 msgid "Display groups matching"
 msgstr "Exibir grupos combinados"
 
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr "Expressão regular para combinação de nomes de grupos"
+
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "Exibir grupos de usuários"
 
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr "Nome do usuário dos grupos exibidos"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Configurações Posix"
@@ -5113,46 +4871,38 @@ msgid "Government mode"
 msgstr ""
 
 #: setup/setup_config2.tpl:123
-msgid "Logging options"
-msgstr ""
-
-#: setup/setup_config2.tpl:127
-msgid "Syslog"
-msgstr ""
-
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-msgid "MySQL"
+msgid "GOsa logging"
 msgstr ""
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 msgid "Mail settings"
 msgstr "Configurações de Correio"
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr "Método de correio"
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 msgid "Vacation templates"
 msgstr ""
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 msgid "Enable snapshots"
 msgstr ""
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 msgid "Snapshot base"
 msgstr ""
 
@@ -5447,6 +5197,10 @@ msgstr ""
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:120
+msgid "MySQL"
+msgstr ""
+
 #: setup/class_setupStep_Checks.inc:121
 msgid ""
 "GOsa requires this module to communicate with several supported databases."
@@ -5749,14 +5503,14 @@ msgstr ""
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "Yes"
 msgstr ""
 
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "No"
 msgstr ""
 
@@ -6553,5 +6307,60 @@ msgstr ""
 msgid "Automatic"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Edit ogroup"
+#~ msgstr "Lista dos grupos"
+
+#~ msgid "Submit department"
+#~ msgstr "Submeter departamento"
+
+#~ msgid "edit"
+#~ msgstr "editar"
+
+#~ msgid "delete"
+#~ msgstr "deletar"
+
+#~ msgid "Number of listed departments"
+#~ msgstr "Número de departamentos listados"
+
+#~ msgid "Select to see groups that are primary groups of users"
+#~ msgstr "Selecione para ver os grupos que são primários dos usuários"
+
+#~ msgid "Select to see normal groups that have only functional aspects"
+#~ msgstr ""
+#~ "Selecione para ver grupos normais que tem somente aspectos funcionais"
+
+#~ msgid "User administration"
+#~ msgstr "Administração de usuários"
+
+#, fuzzy
+#~ msgid "phone users"
+#~ msgstr "Telefones"
+
+#~ msgid "GOsa"
+#~ msgstr "GOsa"
+
+#~ msgid "Edit UNIX properties"
+#~ msgstr "Editar propriedades UNIX"
+
+#~ msgid "Edit fax properies"
+#~ msgstr "Editar propriedades de fax"
+
+#~ msgid "Create user with this template"
+#~ msgstr "Criar usuário com este modelo"
+
+#~ msgid "password"
+#~ msgstr "senha"
+
+#~ msgid "Delete user"
+#~ msgstr "Deletar usuário"
+
+#, fuzzy
+#~ msgid "Name / Department"
+#~ msgstr "Departamento"
+
+#~ msgid "Summary"
+#~ msgstr "Sumário"
+
 #~ msgid "ACL takes effect for all users"
 #~ msgstr "ACL surte efeito para todos os usuários"
index aa638cc1a2e7cb1ae87c4d9146c58c4fba126680..8b8e949cb9e05d9b81a94349a873cb1e3f50ca1e 100644 (file)
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: 2005-04-18 14:35+0300\n"
 "Last-Translator: Igor Muratov <migor@altlinux.org>\n"
 "Language-Team: ALT Linux Team\n"
@@ -33,19 +33,17 @@ msgstr "Фильтры"
 #: 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -67,6 +65,7 @@ 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
 #, fuzzy
 msgid "So - if you're sure - press 'Delete' to continue or 'Cancel' to abort."
 msgstr ""
@@ -79,15 +78,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr "Отмена"
@@ -112,15 +110,14 @@ 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 "Имя пользователя"
 
 #: 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "Пароль"
 
@@ -264,7 +261,7 @@ msgstr "Доступные приложения"
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 #, fuzzy
 msgid "Members"
 msgstr "Включаемые объекты"
@@ -303,7 +300,7 @@ msgstr "Пароль"
 #: 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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -317,9 +314,7 @@ msgid "Verify password"
 msgstr "Пароль"
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr "Сменить пароль"
 
@@ -367,7 +362,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr "Объект"
 
@@ -408,47 +403,49 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.inc:596
 msgid "Continue"
 msgstr "Продолжить"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: 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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -458,9 +455,9 @@ msgstr ""
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -491,8 +488,7 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -639,9 +635,9 @@ msgstr "Пользователь:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 #, fuzzy
 msgid "Fatal error"
 msgstr "Терминал-сервер"
@@ -657,17 +653,17 @@ msgstr ""
 #: 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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 #, fuzzy
@@ -679,7 +675,7 @@ msgstr "Настроить"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "Недоступен каталог \"%s\", указанный как каталог компиляции!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 #, fuzzy
 msgid "Password method"
 msgstr "Хэширование паролей"
@@ -688,7 +684,7 @@ msgstr "Хэширование паролей"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -705,10 +701,11 @@ msgid "The password used as new is to short."
 msgstr "Новый пароль слишком короткий."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: 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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -726,11 +723,11 @@ msgstr "У вас недостаточно прав для смены своег
 msgid "External password changer reported a problem: "
 msgstr "При попытке сменить пароль извне возникла проблема: "
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr "Данные, передаваемые в течение этого сеанса, не будут зашифрованы."
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr "Использовать шифрование SSL"
 
@@ -763,33 +760,37 @@ msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: 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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -831,14 +832,14 @@ msgstr "Рабочая станция Windows"
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:368
+#: html/index.php:369
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
 "администратору."
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -926,6 +927,51 @@ msgstr "текст"
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr "Не настроено"
+
+#: include/class_management.inc:144
+#, fuzzy
+msgid "Filter error"
+msgstr "Терминал-сервер"
+
+#: 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
+#, fuzzy
+msgid "Permission"
+msgstr "Права для членов группы"
+
+#: 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
+#, fuzzy
+msgid "Permission error"
+msgstr "Права для членов группы"
+
+#: include/class_management.inc:426 include/class_plugin.inc:1546
+#, fuzzy, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Вам не разрешено менять пароль."
+
+#: 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
+#, fuzzy, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "Вам не разрешено менять пароль."
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -945,14 +991,14 @@ msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -964,12 +1010,12 @@ msgstr ""
 msgid "Access control"
 msgstr "Параметры доступа"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 #, fuzzy
 msgid "Manage access control lists"
 msgstr "Параметры доступа"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 #, fuzzy
 msgid "All categories"
 msgstr "Категория"
@@ -978,23 +1024,23 @@ msgstr "Категория"
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 #, fuzzy
 msgid "One level"
 msgstr "Уровень информативности"
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 #, fuzzy
 msgid "Current object"
 msgstr "Текущий пароль"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 #, fuzzy
 msgid "Complete subtree"
 msgstr "не полный"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr ""
 
@@ -1002,57 +1048,55 @@ msgstr ""
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: 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
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Пользователи"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr "Группы"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: 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
+#: 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
 msgid "Up"
 msgstr ""
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 #, fuzzy
 msgid "Down"
 msgstr "Домен"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr "Изменить"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr "Доступ"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr "Удалить"
@@ -1077,7 +1121,7 @@ msgstr "Категория"
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr ""
 
@@ -1123,13 +1167,13 @@ msgstr "Включаемые объекты"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: 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
+#: 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
 #, fuzzy
 msgid "Internal error"
 msgstr "Терминал-сервер"
@@ -1159,22 +1203,22 @@ msgstr "состояние неизвестно"
 msgid "Contains settings for these objects: %s"
 msgstr "Описание группы"
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "inactive"
 msgstr "Личный"
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "No members"
 msgstr "Члены группы"
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 #, fuzzy
 msgid "Access control list"
 msgstr "Параметры доступа"
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 #, fuzzy
 msgid "ACL roles"
 msgstr "Доступ"
@@ -1185,53 +1229,43 @@ msgstr "Доступ"
 msgid "Close"
 msgstr "Выбрать"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 #, fuzzy
 msgid "Go to root department"
 msgstr "Список подразделений"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 #, fuzzy
 msgid "Root"
 msgstr "Перезагрузить"
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 #, fuzzy
 msgid "Go up one department"
 msgstr "Подразделение"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 #, fuzzy
 msgid "Go to users department"
 msgstr "Выберите подразделение"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 #, fuzzy
 msgid "Home"
 msgstr "Имя системы"
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr ""
 
@@ -1247,35 +1281,20 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 #, fuzzy
 msgid "Choose a base"
 msgstr "Выберите, чтобы просмотреть серверы"
 
-#: 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 ""
-
-#: include/class_baseSelectDialog.inc:61
-#, fuzzy
-msgid "Use"
-msgstr "Пользователь"
-
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1283,26 +1302,18 @@ msgstr "Пользователь"
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "Ветка"
 
-#: include/class_baseSelectDialog.inc:68
-#, fuzzy
-msgid "Filter entries with this syntax"
-msgstr "Показать подходяшие адреса"
-
-#: 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
+#: include/class_listing.inc:298 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
@@ -1311,88 +1322,104 @@ msgstr "Показать подходяшие адреса"
 msgid "Select all"
 msgstr "Удалить"
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 #, fuzzy
 msgid "created by"
 msgstr "Создать"
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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 "Действия"
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 #, fuzzy
 msgid "Copy"
 msgstr "Компания"
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 #, fuzzy
 msgid "Cut"
 msgstr "Выполнить"
 
-#: 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
+#: 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
 #, fuzzy
 msgid "Paste"
 msgstr "Дата"
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Редактиовать объект"
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Редактиовать объект"
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Создать настройки запись эл. почты"
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 #, fuzzy
 msgid "Export list"
 msgstr "Экспорт"
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Создать настройки запись эл. почты"
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Объект группы"
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:132
+#, fuzzy
+msgid "Edit this entry"
+msgstr "Редактиовать объект"
+
+#: include/class_sortableListing.inc:133
+#, fuzzy
+msgid "Delete this entry"
+msgstr "Удалить"
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, fuzzy, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:399
+#: include/functions.inc:518
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/functions.inc:474
+#: include/functions.inc:603
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
@@ -1400,11 +1427,11 @@ msgid ""
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1413,12 +1440,12 @@ msgstr ""
 "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config"
 "\" в файле gosa.conf!"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP-сервер"
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -1427,12 +1454,12 @@ msgstr ""
 "Для блокируемого объекта обнаружено несколько блокировок. Этого быть не "
 "должно, проверьте работу LDAP."
 
-#: include/functions.inc:1049
+#: include/functions.inc:1232
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1441,259 +1468,261 @@ msgstr ""
 "Установить новое значение лимита в %s и показать мне это сообщение если "
 "лимит будет исчерпан."
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Настроить"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr "не полный"
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Продолжить"
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Редактиовать объект"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Вы собираетесь удалить объект %s."
 
-#: include/functions.inc:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Удалить"
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Экспорт в LDIF"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr "Не удается получить информацию о схемах. Проверка схем невозможна!"
 
-#: include/functions.inc:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Список подразделений"
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2309
+#: include/functions.inc:2764
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr "Немецкий"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr "Французский"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr "Испанский"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr "Английский"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr "Датский"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 #, fuzzy
 msgid "Polish"
 msgstr "Английский"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 #, fuzzy
 msgid "Chinese"
 msgstr "сброс"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Имя"
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr "Русский"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Список подразделений"
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, fuzzy, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
 msgstr "Не удается подключиться к базе журналов, отчеты показаны не будут!"
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr ""
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr "Ссылки"
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, fuzzy, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Вы собираетесь удалить группу \"%s\"."
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 #, fuzzy
 msgid "Remove snapshot"
 msgstr "Создать настройки запись эл. почты"
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1709,8 +1738,11 @@ msgstr ""
 #: 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr "Описание"
 
@@ -1830,7 +1862,7 @@ msgstr "Тип"
 msgid "Arguments"
 msgstr "подразделения"
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
@@ -1843,55 +1875,33 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: 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
-#, fuzzy
-msgid "Permission"
-msgstr "Права для членов группы"
-
-#: include/class_plugin.inc:1547
-#, fuzzy, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Вам не разрешено менять пароль."
-
-#: include/class_plugin.inc:1559 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1587
-#, fuzzy, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "Вам не разрешено менять пароль."
-
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 #, fuzzy
 msgid "from"
 msgstr "и"
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 #, fuzzy
 msgid "to"
 msgstr "Отношение"
 
-#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 #, fuzzy
 msgid "Restore"
 msgstr "Повторить"
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 #, fuzzy
 msgid "cut"
 msgstr "Выполнить"
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr ""
 
@@ -2512,126 +2522,105 @@ msgid ""
 "setup?"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:665
+#: include/class_ldap.inc:692
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:740
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:800
+#: include/class_ldap.inc:827
 #, fuzzy, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/class_ldap.inc:802
+#: include/class_ldap.inc:829
 #, fuzzy, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr ""
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, fuzzy, php-format
 msgid "Logging failed: %s"
 msgstr "Служба печати"
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, fuzzy, php-format
 msgid "Invalid option '%s' specified!"
 msgstr "Значение поля \"Имя\" содержит недопустимые символы."
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 #, fuzzy
 msgid "Specified objectType is empty or invalid!"
 msgstr "Указанное имя уже используется."
 
-#: include/class_log.inc:139
-#, fuzzy
-msgid "MySQL error"
-msgstr "Ошибка LDAP:"
-
-#: include/class_log.inc:139
-#, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr ""
-
-#: 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 ""
-
-#: include/class_log.inc:219
-#, fuzzy, php-format
-msgid "Cannot add location to the database!"
-msgstr "Невозможно подключиться к серверу базы данных!"
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Удалить"
 
-#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "состояние неизвестно"
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Ошибка XML в gosa.conf: %s в строке %d"
 
-#: include/class_config.inc:270
+#: include/class_config.inc:317
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr ""
 "Не удается начать сеанс на LDAP-сервере. Обратитесь к системному "
 "администратору."
 
-#: include/class_config.inc:636
+#: include/class_config.inc:694
 #, fuzzy
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 #, fuzzy
 msgid "Configuration"
 msgstr "Настроить"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2652,44 +2641,44 @@ msgstr ""
 msgid "Unknown"
 msgstr "состояние неизвестно"
 
-#: 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: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
 #, fuzzy, php-format
 msgid "Copy and paste failed!"
 msgstr "Ошибка при регистрации. Ответ сервера: \"%s\"."
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, fuzzy, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "Удалить"
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, fuzzy, php-format
 msgid "No write permission in '%s'"
 msgstr "Удалить"
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 #, fuzzy
 msgid "Cannot paste"
 msgstr "Создать телефонный аккаунт"
@@ -2700,11 +2689,11 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Общее"
@@ -2715,32 +2704,26 @@ 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr "Почта"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr "Факс"
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "Прокси-сервер"
 
@@ -2749,34 +2732,34 @@ msgid "FTP"
 msgstr "FTP"
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr "Группа"
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr "Подразделение"
 
 #: plugins/generic/references/class_reference.inc:61
-#: 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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2785,14 +2768,13 @@ msgid "Phone"
 msgstr "Телефон"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr "Приложение"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Сервер"
 
@@ -2801,19 +2783,17 @@ msgid "Thin Client"
 msgstr "Тонкий клиент"
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr "Рабочая станция"
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Объект группы"
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr "Принтер"
 
@@ -2859,7 +2839,13 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Команда разработчиков GOsa"
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -2867,271 +2853,40 @@ msgstr ""
 "Подумайте еще раз, действительно ли вам нужно удаление, так как GOsa не "
 "сможет восстановить эти данные."
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-#, fuzzy
-msgid "List of object groups"
-msgstr "Название группы"
-
-#: 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 "Свойства"
-
-#: 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 "Действия"
-
-#: 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
-#, fuzzy, php-format
-msgid "Show %s"
-msgstr "Показать группы"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-#, fuzzy
-msgid "user groups"
-msgstr "группы"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-#, fuzzy
-msgid "nested groups"
-msgstr "Объединения"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:93
-#: plugins/admin/ogroups/class_divListOGroup.inc:94
-#: plugins/admin/groups/class_divListGroup.inc:89
-#, fuzzy
-msgid "application groups"
-msgstr "Показать группы приложений"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-#, fuzzy
-msgid "department groups"
-msgstr "подразделения"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-#, fuzzy
-msgid "server groups"
-msgstr "серверы"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-#, fuzzy
-msgid "workstation groups"
-msgstr "рабочие станции"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-#, fuzzy
-msgid "windows workstation groups"
-msgstr "Показать рабочие станции"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-#, fuzzy
-msgid "terminal groups"
-msgstr "Показать группы с эл. почтой"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-#, fuzzy
-msgid "printer groups"
-msgstr "Основная группа"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-#, fuzzy
-msgid "phone groups"
-msgstr "Показать группы"
-
-#: 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 "Регулярное выражение, соответствующее именам групп"
-
-#: 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
-#, fuzzy
-msgid "Submit department"
-msgstr "Показать подразделения"
-
-#: 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 "Создать"
-
-#: 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 "Удалить"
-
-#: 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
-#, fuzzy
-msgid "edit"
-msgstr "Изменить"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:228
-#: plugins/admin/groups/class_divListGroup.inc:234
-#: plugins/admin/departments/class_divListDepartment.inc:158
-#, fuzzy
-msgid "Edit this entry"
-msgstr "Редактиовать объект"
-
-#: 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
-#, fuzzy
-msgid "delete"
-msgstr "Удалить"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/groups/class_divListGroup.inc:241
-#: plugins/admin/departments/class_divListDepartment.inc:161
-#, fuzzy
-msgid "Delete this entry"
-msgstr "Удалить"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-#, fuzzy
-msgid "Number of listed object groups"
-msgstr "Название группы"
-
-#: 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
-#, fuzzy
-msgid "Number of listed departments"
-msgstr "Подразделение"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroup.inc:1117
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr "Объединения"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #, fuzzy
 msgid "Manage object groups"
 msgstr "Название группы"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "Ошибка LDAP:"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#, fuzzy
-msgid "object group"
-msgstr "Объект группы"
-
-#: 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
-#, fuzzy
-msgid "Permission error"
-msgstr "Права для членов группы"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 #, fuzzy
 msgid "Templates"
 msgstr "Шаблон"
 
-#: 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
+#: 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
 msgid "User"
 msgstr "Пользователь"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #, fuzzy
 msgid "Windows Install"
 msgstr "Рабочая станция Windows"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 #, fuzzy
 msgid "Terminal"
 msgstr "Терминалы"
@@ -3146,6 +2901,19 @@ msgstr ""
 msgid "departments"
 msgstr "подразделения"
 
+#: 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
+#, fuzzy, php-format
+msgid "Show %s"
+msgstr "Показать группы"
+
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 #, fuzzy
@@ -3199,7 +2967,9 @@ msgid "applications"
 msgstr "приложения"
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr "нет"
 
@@ -3218,20 +2988,20 @@ msgstr "Рабочая станция"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "отключен"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 msgid "full access"
 msgstr "полный доступ"
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
 
@@ -3250,22 +3020,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3293,13 +3058,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Фамилия"
@@ -3359,7 +3130,7 @@ msgid "Select a base"
 msgstr "Выберите, чтобы просмотреть серверы"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Системные доверия"
@@ -3400,10 +3171,9 @@ msgid "FAI summary"
 msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr "Окружение"
 
@@ -3416,15 +3186,128 @@ msgstr "Приложения"
 msgid "Please enter the new object group name"
 msgstr "Введите адрес сервера"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Выбрать объекты для добавления"
-
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
-msgid "Display objects of department"
-msgstr "Показать объекты подразделения"
+#: 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 "Фильтры"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+#, fuzzy
+msgid "user groups"
+msgstr "группы"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+#, fuzzy
+msgid "nested groups"
+msgstr "Объединения"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+#, fuzzy
+msgid "application groups"
+msgstr "Показать группы приложений"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+#, fuzzy
+msgid "department groups"
+msgstr "подразделения"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+#, fuzzy
+msgid "server groups"
+msgstr "серверы"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+#, fuzzy
+msgid "workstation groups"
+msgstr "рабочие станции"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+#, fuzzy
+msgid "windows workstation groups"
+msgstr "Показать рабочие станции"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+#, fuzzy
+msgid "terminal groups"
+msgstr "Показать группы с эл. почтой"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+#, fuzzy
+msgid "printer groups"
+msgstr "Основная группа"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+#, fuzzy
+msgid "phone groups"
+msgstr "Показать группы"
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+#, fuzzy
+msgid "List of object groups"
+msgstr "Название группы"
+
+#: 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 "Свойства"
+
+#: 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 "Создать"
+
+#: 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 "Удалить"
+
+#: plugins/admin/ogroups/ogroup-list.xml:106
+#: plugins/admin/groups/group-list.xml:106
+#: plugins/admin/users/user-list.xml:156
+#, fuzzy
+msgid "Send message"
+msgstr "Домашняя страница"
+
+#: plugins/admin/ogroups/ogroup-list.xml:142
+#, fuzzy
+msgid "Edit object group"
+msgstr "Объект группы"
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+#, fuzzy
+msgid "Remove object group"
+msgstr "серверы"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Выбрать объекты для добавления"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr "Показать объекты подразделения"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
 #: plugins/admin/ogroups/trust_machines.tpl:27
 #: plugins/admin/groups/group_objects.tpl:40
 #: plugins/admin/groups/trust_machines.tpl:27
@@ -3492,7 +3375,6 @@ msgid "Display users of department"
 msgstr "Подразделение"
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr "Фильтр"
 
@@ -3559,77 +3441,18 @@ msgstr "Основная группа"
 msgid "Not in all groups"
 msgstr "Показать группы с эл. почтой"
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
-msgstr "Список групп"
-
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
-msgstr "Выберите, чтобы просмотреть список основных групп пользователей"
-
-#: plugins/admin/groups/class_divListGroup.inc:85
-#, fuzzy
-msgid "primary groups"
-msgstr "Основная группа"
-
-#: plugins/admin/groups/class_divListGroup.inc:86
-#, fuzzy
-msgid "samba groups mappings"
-msgstr "Samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-#, fuzzy
-msgid "samba groups"
-msgstr "Группа Samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:88
-#, fuzzy
-msgid "application settings"
-msgstr "приложения"
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-#, fuzzy
-msgid "mail settings"
-msgstr "Почтовые настройки пользователя"
-
-#: plugins/admin/groups/class_divListGroup.inc:91
-#, fuzzy
-msgid "mail groups"
-msgstr "Показать группы с эл. почтой"
-
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Выберите, чтобы просмотреть список обычных групп"
-
-#: plugins/admin/groups/class_divListGroup.inc:93
-#, fuzzy
-msgid "functional groups"
-msgstr "Показать обычные группы"
-
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr "Имя пользователя, для которого перечисляются группы"
-
-#: plugins/admin/groups/class_divListGroup.inc:188
-#: plugins/admin/users/class_divListUsers.inc:87
-#: plugins/admin/users/class_divListUsers.inc:206
-#, fuzzy
-msgid "Posix"
-msgstr "Прокси-сервер"
+#: plugins/admin/groups/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Показать основные группы"
 
-#: plugins/admin/groups/class_divListGroup.inc:244
-#: plugins/admin/users/class_divListUsers.inc:278
-#: plugins/admin/users/class_divListUsers.inc:290
-#, fuzzy
-msgid "Not allowed"
-msgstr "Сменить пароль"
+#: plugins/admin/groups/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Показать группы samba"
 
-#: plugins/admin/groups/class_divListGroup.inc:303
+#: plugins/admin/groups/group-filter.tpl:13
 #, fuzzy
-msgid "Number of listed groups"
-msgstr "Ð\9dазвание Ð³Ñ\80Ñ\83ппÑ\8b"
+msgid "Show mail groups"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ð³Ñ\80Ñ\83ппÑ\8b samba"
 
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #, fuzzy
@@ -3677,57 +3500,57 @@ msgstr "состояние неизвестно"
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Удалить"
 
-#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Удалить"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Общая информация о пользователе"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 #, fuzzy
 msgid "Samba group type"
 msgstr "Группа Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Домашний каталог Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "Члены телефонной группы"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 #, fuzzy
 msgid "Nagios group"
 msgstr "Контакт"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 #, fuzzy
 msgid "Group member"
 msgstr "Члены группы"
@@ -3737,203 +3560,78 @@ msgstr "Члены группы"
 msgid "Group settings"
 msgstr "Настройки Samba"
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
-msgid "Group administration"
-msgstr "Управление группами"
-
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-#, fuzzy
-msgid "group"
-msgstr "группы"
-
-#: 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 ""
-"Сюда входит вся информация об учетной записи этого пользователя, его права "
-"доступа в системе, настройки IMAP и т. д. Подумайте еще раз, действительно "
-"ли вам нужно удаление, так как GOsa не сможет отменить результаты этой "
-"операции."
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr "Управление пользователями"
-
-#: 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 "Список пользователей"
-
-#: 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 "Шаблон"
-
-#: plugins/admin/users/class_divListUsers.inc:85
-#, fuzzy
-msgid "templates"
-msgstr "Шаблон"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-#, fuzzy
-msgid "GOsa object"
-msgstr "Объект"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-#, fuzzy
-msgid "functional users"
-msgstr "Показать обычных пользователей"
-
-#: plugins/admin/users/class_divListUsers.inc:87
-#, fuzzy
-msgid "POSIX users"
-msgstr "Атрибуты UNIX"
-
-#: plugins/admin/users/class_divListUsers.inc:88
-#, fuzzy
-msgid "mail users"
-msgstr "Пользователи домена"
-
-#: plugins/admin/users/class_divListUsers.inc:89
-#, fuzzy
-msgid "samba users"
-msgstr "Пользователи домена"
-
-#: plugins/admin/users/class_divListUsers.inc:90
-#, fuzzy
-msgid "proxy users"
-msgstr "Показать пользователей с прокси-серверами"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Список групп"
 
-#: plugins/admin/users/class_divListUsers.inc:93
+#: plugins/admin/groups/group-list.xml:138
 #, fuzzy
-msgid "phone users"
-msgstr "Ð\9fоказаÑ\82Ñ\8c Ð¿Ð¾Ð»Ñ\8cзоваÑ\82елей Ñ\81 Ð¿Ñ\80окÑ\81и-Ñ\81еÑ\80веÑ\80ами"
+msgid "Edit group"
+msgstr "Ð\9eÑ\81новнаÑ\8f Ð³Ñ\80Ñ\83ппа"
 
-#: plugins/admin/users/class_divListUsers.inc:145
-#: plugins/admin/users/user-list.xml:121 plugins/admin/users/user-list.xml:163
+#: plugins/admin/groups/group-list.xml:151
 #, fuzzy
-msgid "Apply template"
-msgstr "Шаблон"
+msgid "Remove group"
+msgstr "серверы"
 
-#: plugins/admin/users/class_divListUsers.inc:204
-msgid "GOsa"
-msgstr ""
+#: plugins/admin/groups/class_groupManagement.inc:26
+msgid "Group administration"
+msgstr "Управление группами"
 
-#: plugins/admin/users/class_divListUsers.inc:205
-#: plugins/admin/users/class_userManagement.inc:1067
+#: plugins/admin/groups/class_groupManagement.inc:155
 #, fuzzy
-msgid "Edit generic properties"
-msgstr "Ð\98змениÑ\82Ñ\8c Ñ\81войÑ\81Ñ\82ва"
+msgid "Posix"
+msgstr "Ð\9fÑ\80окÑ\81и-Ñ\81еÑ\80веÑ\80"
 
-#: plugins/admin/users/class_divListUsers.inc:207
+#: plugins/admin/groups/class_groupManagement.inc:156
 #, fuzzy
-msgid "Edit UNIX properties"
+msgid "Edit posix properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 #, fuzzy
-msgid "Edit environment properties"
+msgid "Edit mail properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:750
 #, fuzzy
-msgid "Edit mail properties"
+msgid "Edit samba properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1095
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Изменить свойства"
 
-#: 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 "Факс"
-
-#: plugins/admin/users/class_divListUsers.inc:215
+#: plugins/admin/groups/class_groupManagement.inc:187
 #, fuzzy
-msgid "Edit fax properies"
-msgstr "Ð\98змениÑ\82Ñ\8c Ñ\81войÑ\81Ñ\82ва"
+msgid "Menu"
+msgstr "Ð\9fÑ\80инÑ\82еÑ\80"
 
-#: plugins/admin/users/class_divListUsers.inc:217
-#: plugins/admin/users/class_userManagement.inc:1079
+#: plugins/admin/groups/class_groupManagement.inc:188
 #, fuzzy
-msgid "Edit samba properties"
+msgid "Edit start menu properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr ""
-
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/users/class_userManagement.inc:1083
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:758
 #, fuzzy
-msgid "Edit netatalk properties"
+msgid "Edit environment properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_divListUsers.inc:220
-#, fuzzy
-msgid "Create user from template"
-msgstr "Создать шаблон"
-
-#: plugins/admin/users/class_divListUsers.inc:221
-#, fuzzy
-msgid "Create user with this template"
-msgstr "Создать шаблон"
-
-#: 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
-#, fuzzy
-msgid "active"
-msgstr "Личный"
-
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
-#, fuzzy
-msgid "user"
-msgstr "пользователи"
-
-#: plugins/admin/users/class_divListUsers.inc:274
-#, fuzzy
-msgid "password"
-msgstr "Пароль"
-
-#: plugins/admin/users/class_divListUsers.inc:287
-#, fuzzy
-msgid "Delete user"
-msgstr "Удалить"
-
-#: plugins/admin/users/class_divListUsers.inc:376
-#, fuzzy
-msgid "Number of listed users"
-msgstr "Подразделение"
+#: 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 ""
+"Сюда входит вся информация об учетной записи этого пользователя, его права "
+"доступа в системе, настройки IMAP и т. д. Подумайте еще раз, действительно "
+"ли вам нужно удаление, так как GOsa не сможет отменить результаты этой "
+"операции."
 
 #: plugins/admin/users/password.tpl:4
 #, fuzzy
@@ -3987,6 +3685,13 @@ msgstr ""
 "базе данных будут заполнены автоматически. Выберите <b>нет</b>, чтобы не "
 "использовать шаблоны."
 
+#: 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 "Шаблон"
+
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 #, fuzzy
@@ -3999,96 +3704,119 @@ msgstr "Список"
 msgid "First name"
 msgstr "Список"
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 #, fuzzy
 msgid "Manage users"
 msgstr "Пользователи домена"
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "У вас недостаточно прав для смены своего пароля."
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, fuzzy, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr "У вас недостаточно прав для удаления этого стоп-листа."
+#: 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 "Имя"
 
-#: plugins/admin/users/class_userManagement.inc:559
-#, fuzzy
-msgid "You have no permission to use this template!"
-msgstr "У вас недостаточно прав для удаления этого стоп-листа."
-
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 #, fuzzy
 msgid "Account locking"
 msgstr "Учетная запись"
 
-#: plugins/admin/users/class_userManagement.inc:662
-#, fuzzy
-msgid "You have no permission to change the lock status for this user!"
-msgstr "У вас недостаточно прав для смены своего пароля."
-
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:650
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 
-#: 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 "Имя"
-
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:723
 #, fuzzy
 msgid "Unlock account"
 msgstr "Моя учетная запись"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 #, fuzzy
 msgid "Lock account"
 msgstr "Моя учетная запись"
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+#, fuzzy
+msgid "Edit generic properties"
+msgstr "Изменить свойства"
+
+#: 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
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:753
+msgid "Netatalk"
+msgstr ""
+
+#: plugins/admin/users/class_userManagement.inc:754
+#, fuzzy
+msgid "Edit netatalk properties"
+msgstr "Изменить свойства"
+
+#: plugins/admin/users/class_userManagement.inc:762
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Изменить свойства"
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Список пользователей"
+
 #: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1608
 #, fuzzy
-msgid "Name / Department"
-msgstr "Подразделение"
+msgid "Surname"
+msgstr "Имя сервера"
+
+#: plugins/admin/users/user-list.xml:140
+#, fuzzy
+msgid "Lock users"
+msgstr "Список пользователей"
+
+#: plugins/admin/users/user-list.xml:148
+#, fuzzy
+msgid "Unlock users"
+msgstr "Пользователи домена"
+
+#: plugins/admin/users/user-list.xml:167
+#, fuzzy
+msgid "Apply template"
+msgstr "Шаблон"
 
-#: plugins/admin/users/user-list.xml:175
+#: plugins/admin/users/user-list.xml:199
+#, fuzzy
+msgid "New user from template"
+msgstr "Создать шаблон"
+
+#: plugins/admin/users/user-list.xml:213
 #, fuzzy
 msgid "Edit user"
 msgstr "Пользователи домена"
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 #, fuzzy
 msgid "Remove user"
 msgstr "Удалить изображение"
@@ -4103,17 +3831,18 @@ msgid "Show functional users"
 msgstr "Показать обычных пользователей"
 
 #: plugins/admin/users/user-filter.tpl:13
-msgid "Show mail users"
-msgstr "Показать пользователей с почтой"
-
-#: plugins/admin/users/user-filter.tpl:14
 #, fuzzy
 msgid "Show POSIX users"
 msgstr "Атрибуты UNIX"
 
+#: plugins/admin/users/user-filter.tpl:14
+#, fuzzy
+msgid "Show Mail users"
+msgstr "Показать пользователей с почтой"
+
 #: plugins/admin/users/user-filter.tpl:15
 #, fuzzy
-msgid "Show samba users"
+msgid "Show Samba users"
 msgstr "Показать пользователей с почтой"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -4131,10 +3860,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr ""
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:6
 #, fuzzy
 msgid ""
@@ -4146,7 +3871,7 @@ msgstr ""
 "подразделения. Подумайте еще раз, действительно ли вы хотите его удалить, "
 "так как GOsa не сможет отменить результаты этой операции."
 
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
+#: plugins/admin/departments/remove.tpl:10
 #, fuzzy
 msgid ""
 "Best thing to do before performing this action would be to save the current "
@@ -4157,111 +3882,51 @@ msgstr ""
 "файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
 "<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr ""
-
-#: plugins/admin/departments/class_departmentGeneric.inc:610
-#: plugins/admin/departments/class_departmentGeneric.inc:615
-#: plugins/admin/departments/class_departmentManagement.inc:26
-msgid "Departments"
-msgstr "Подразделения"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Список подразделений"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:175
 #, fuzzy
-msgid "Department name"
-msgstr "Управление подразделениями"
-
-#: 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 "Категория"
-
-#: 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 "Адм. единица"
-
-#: 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 "Местоположение"
-
-#: 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 "Адрес"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr "Телефон"
+msgid "Domain"
+msgstr "в домене"
 
-#: 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
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
 #, fuzzy
-msgid "Administrative settings"
-msgstr "Ð\90дминиÑ\81Ñ\82Ñ\80иÑ\80ование"
+msgid "Domain component"
+msgstr "Ð\90дминиÑ\81Ñ\82Ñ\80аÑ\82оÑ\80Ñ\8b Ð´Ð¾Ð¼ÐµÐ½Ð°"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr ""
+#: 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 "Страна"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr ""
+#: 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
+#, fuzzy
+msgid "Locality"
+msgstr "Местоположение"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr ""
+#: 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 "Организация"
 
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -4292,6 +3957,22 @@ msgstr "Описание подразделения"
 msgid "Choose subtree to place department in"
 msgstr "Выберите ветку для подразделения"
 
+#: 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
+#, fuzzy
+msgid "Administrative settings"
+msgstr "Администрирование"
+
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -4314,11 +3995,41 @@ msgstr "Имя создаваемой ветки"
 msgid "Descriptive text for   department"
 msgstr "Описание подразделения"
 
+#: 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 "Категория"
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr "Категория этой ветки"
 
+#: 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 "Местоположение"
+
+#: 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 "Адм. единица"
+
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
 msgid "State where this subtree is located"
@@ -4329,6 +4040,16 @@ msgstr "Адм. единица, в которой находится ветка"
 msgid "Location of this subtree"
 msgstr "Местоположение ветки"
 
+#: 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 "Адрес"
+
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -4339,6 +4060,20 @@ msgstr "Почтовый адрес для ветки"
 msgid "Base telephone number of this subtree"
 msgstr "Основный телефонный номер для ветки"
 
+#: 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 "Факс"
+
 #: plugins/admin/departments/generic.tpl:99
 #: plugins/admin/departments/organization.tpl:99
 msgid "Base facsimile telephone number of this subtree"
@@ -4346,76 +4081,38 @@ msgstr "Основный номер факса для ветки"
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 #, fuzzy
 msgid "Domain Component"
 msgstr "Администраторы домена"
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr "Список подразделений"
-
-#: plugins/admin/departments/class_divListDepartment.inc:73
-msgid "Regular expression for matching department names"
-msgstr "Регулярное выражение, соответствующее именам подразделений"
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/class_department.inc:615
+msgid "Departments"
+msgstr "Подразделения"
 
-#: plugins/admin/departments/class_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 #, fuzzy
 msgid "Manage Departments"
 msgstr "Подразделения"
 
-#: 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 ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:336
+#: plugins/admin/departments/class_departmentManagement.inc:126
 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 ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:556
-#, fuzzy
-msgid "Domain"
-msgstr "в домене"
-
-#: plugins/admin/departments/class_departmentManagement.inc:580
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Страна"
-
-#: plugins/admin/departments/class_departmentManagement.inc:592
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "Местоположение"
-
-#: 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 "Организация"
-
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 #, fuzzy
 msgid "Organization name"
 msgstr "Организация"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1635
 #, fuzzy
 msgid "Postal address"
 msgstr "Почтовый индекс"
@@ -4441,15 +4138,54 @@ msgstr "Администраторы домена"
 msgid "Name of domain to create"
 msgstr "Имя создаваемой ветки"
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr "Управление подразделениями"
-
 #: plugins/admin/departments/country.tpl:14
 #, fuzzy
 msgid "Name of country to create"
 msgstr "Имя создаваемой ветки"
 
+#: plugins/admin/departments/class_department.inc:386
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:618
+#, fuzzy
+msgid "Department name"
+msgstr "Управление подразделениями"
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr "Телефон"
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr ""
+
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr ""
+
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr ""
@@ -4491,59 +4227,16 @@ msgid ""
 "possibly the best solution is a backup."
 msgstr ""
 
-#: plugins/admin/acl/remove.tpl:6
-#, fuzzy
-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 ""
-"Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте еще "
-"раз, действительно ли вам нужно удаление, так как GOsa не сможет отменить "
-"результаты этой операции."
-
-#: plugins/admin/acl/class_aclManagement.inc:290
-#, fuzzy
-msgid "ACL role"
-msgstr "Доступ"
-
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-#, fuzzy
-msgid "List of acls"
-msgstr "Список групп"
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr ""
-
-#: plugins/admin/acl/class_divListACL.inc:84
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
 #, fuzzy
-msgid "Display acls matching"
-msgstr "Шаблон для групп"
-
-#: 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 "Роль"
-
-#: plugins/admin/acl/class_divListACL.inc:165
-#, fuzzy
-msgid "Edit acl role"
-msgstr "Пользователи домена"
+msgid "Acl"
+msgstr "Все"
 
-#: plugins/admin/acl/class_divListACL.inc:185
+#: plugins/admin/acl/class_aclManagement.inc:154
 #, fuzzy
-msgid "Edit acl"
-msgstr "Список систем"
-
-#: plugins/admin/acl/class_divListACL.inc:192
-#, fuzzy
-msgid "Delete acl"
-msgstr "Удалить"
+msgid "ACL Assignment"
+msgstr "Управление подразделениями"
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
 #, fuzzy
@@ -4551,7 +4244,7 @@ msgid "ACL Templates"
 msgstr "Шаблон"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:745
 #, fuzzy
 msgid "Access control roles"
 msgstr "Параметры доступа"
@@ -4561,55 +4254,73 @@ msgstr "Параметры доступа"
 msgid "Edit AC roles"
 msgstr "Доступ"
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 #, fuzzy
 msgid "Reset ACL"
 msgstr "Удалить"
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 #, fuzzy
 msgid "No ACL settings for this category"
 msgstr "Описание группы"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, fuzzy, php-format
 msgid "ACL for these objects: %s"
 msgstr "Описание группы"
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 #, fuzzy
 msgid "Edit category ACL"
 msgstr "Список систем"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 #, fuzzy
 msgid "Reset category ACL"
 msgstr "Категория"
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, fuzzy
 msgid "Object in use"
 msgstr "Имя объекта"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:753
+#: 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 "Роль"
+
+#: plugins/admin/acl/class_aclRole.inc:755
+#, fuzzy
+msgid "Permissions"
+msgstr "Права для членов группы"
+
+#: plugins/admin/acl/acl-list.xml:11
+#, fuzzy
+msgid "List of acls"
+msgstr "Список групп"
+
+#: plugins/admin/acl/acl-filter.tpl:11
 #, fuzzy
-msgid "Permissions"
-msgstr "Права для членов группы"
+msgid "Show access control lists"
+msgstr "Параметры доступа"
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
+#: plugins/admin/acl/acl-filter.tpl:12
 #, fuzzy
-msgid "ACL management"
-msgstr "УпÑ\80авление Ð¿Ð¾Ð´Ñ\80азделениÑ\8fми"
+msgid "Show roles"
+msgstr "Ð\9fоказаÑ\82Ñ\8c Ñ\82елеÑ\84онÑ\8b"
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
@@ -4626,281 +4337,276 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Дополнительные записи в fstab"
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr "женский"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr "мужской"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 #, fuzzy
 msgid "Serial number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 #, fuzzy
 msgid "No certificate installed"
 msgstr "Изменить сертификаты"
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Пейджер"
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Дата рождения"
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Подразделение"
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Номер дома"
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Специальность"
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Последняя доставка"
 
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Местоположение сотрудника"
 
-#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Описание подразделения"
 
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Область деятельности"
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Должность"
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Серийный номер сертификата"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Видимый всем"
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Улица"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Почтовый индекс"
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1598
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Общая информация о пользователе"
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: plugins/personal/generic/class_user.inc:1601
-#, fuzzy
-msgid "Surname"
-msgstr "Имя сервера"
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 #, fuzzy
 msgid "User identification"
 msgstr "Информация"
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Обращение"
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Академическое звание"
 
-#: plugins/personal/generic/class_user.inc:1608
-#, fuzzy
-msgid "Gender"
-msgstr "Ð\9eÑ\82пÑ\80авиÑ\82елÑ\8c"
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
+msgstr "Ð\9fол"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 #, fuzzy
 msgid "Preferred language"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 #, fuzzy
 msgid "User picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 #, fuzzy
 msgid "Department number"
 msgstr "Управление подразделениями"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 #, fuzzy
 msgid "Employee number"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1627
 #, fuzzy
 msgid "Room number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Telefon number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 #, fuzzy
 msgid "Pager number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 #, fuzzy
 msgid "Mobile number"
 msgstr "Домашний телефон"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 #, fuzzy
 msgid "Home phone number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 #, fuzzy
 msgid "User password method"
 msgstr "Хэширование паролей"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 #, fuzzy
 msgid "User certificates"
 msgstr "Стандартный сертификат"
@@ -4930,10 +4636,6 @@ msgstr "Сменить изображение"
 msgid "Template name"
 msgstr "Шаблон"
 
-#: plugins/personal/generic/generic.tpl:138
-msgid "Sex"
-msgstr "Пол"
-
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 #, fuzzy
@@ -5065,6 +4767,13 @@ msgstr "Экспорт"
 msgid "grace time active"
 msgstr ""
 
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+#, fuzzy
+msgid "active"
+msgstr "Личный"
+
 #: plugins/personal/posix/class_posixAccount.inc:173
 #, fuzzy
 msgid "password not changeable"
@@ -5075,149 +4784,145 @@ msgstr "Новый пароль"
 msgid "password expired"
 msgstr "Срок действия пароля истекает"
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr "Не настроено"
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr "автоматически"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr "Пароль нельзя изменить в течение %s дн. с последней смены (shadowMin)"
 
-#: plugins/personal/posix/class_posixAccount.inc:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Пароль должен быть изменен по истечении %s дн. (shadowMax)"
 
-#: plugins/personal/posix/class_posixAccount.inc:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, fuzzy, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 "Отключить учетную запись, если срок действия пароля истек и прошло %s дн. "
 "бездействия (shadowInactive)"
 
-#: plugins/personal/posix/class_posixAccount.inc:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, fuzzy, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 "Предупреждать пользователей за %s дн. до истечения срока действия пароля "
 "(shadowWarning)"
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr "Группа пользователя"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: 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:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 #, fuzzy
 msgid "shadowMin"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 #, fuzzy
 msgid "shadowMax"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 #, fuzzy
 msgid "shadowWarning"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 #, fuzzy
 msgid "shadowInactive"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 #, fuzzy
 msgid "POSIX account"
 msgstr "Аккаунт FTP"
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Оболочка"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Идентификатор пользователя"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 #, fuzzy
 msgid "Group ID"
 msgstr "Группа"
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Сменить пароль"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 #, fuzzy
 msgid "Shadow min"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 #, fuzzy
 msgid "Shadow max"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Показать людей"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 #, fuzzy
 msgid "System trust model"
 msgstr "Системные доверия"
@@ -5286,10 +4991,18 @@ msgstr "Объединения в подразделении"
 msgid "Display groups matching"
 msgstr "Шаблон для групп"
 
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr "Регулярное выражение, соответствующее именам групп"
+
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "Показать группы пользователей"
 
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr "Имя пользователя, для которого перечисляются группы"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -5526,53 +5239,43 @@ msgstr "в папку"
 
 #: setup/setup_config2.tpl:123
 #, fuzzy
-msgid "Logging options"
-msgstr "состояние неизвестно"
-
-#: setup/setup_config2.tpl:127
-#, fuzzy
-msgid "Syslog"
-msgstr "Системные журналы"
-
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "Ошибка LDAP:"
+msgid "GOsa logging"
+msgstr "Почтовые настройки пользователя"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 #, fuzzy
 msgid "Mail settings"
 msgstr "Почтовые настройки пользователя"
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 #, fuzzy
 msgid "Mail method"
 msgstr "Почтовые настройки"
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 #, fuzzy
 msgid "Vacation templates"
 msgstr "Шаблон рабочей станции"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 #, fuzzy
 msgid "Snapshots / Undo"
 msgstr "Приложение"
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 #, fuzzy
 msgid "Enable snapshots"
 msgstr "Создать настройки запись эл. почты"
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 #, fuzzy
 msgid "Snapshot base"
 msgstr "Приложение"
@@ -5899,6 +5602,11 @@ msgstr "Настройки Samba"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "Ошибка LDAP:"
+
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -6240,7 +5948,7 @@ msgstr ""
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 #, fuzzy
 msgid "Yes"
 msgstr "Системы"
@@ -6248,7 +5956,7 @@ msgstr "Системы"
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 #, fuzzy
 msgid "No"
 msgstr "нет"
@@ -7130,12 +6838,221 @@ msgid "Automatic"
 msgstr "автоматически"
 
 #, fuzzy
-#~ msgid "Non common group"
+#~ msgid "Edit ogroup"
+#~ msgstr "Список групп"
+
+#, fuzzy
+#~ msgid "List of ogroups"
+#~ msgstr "Список групп"
+
+#, fuzzy
+#~ msgid "Use"
+#~ msgstr "Пользователь"
+
+#, fuzzy
+#~ msgid "Filter entries with this syntax"
+#~ msgstr "Показать подходяшие адреса"
+
+#, fuzzy
+#~ msgid "MySQL error"
+#~ msgstr "Ошибка LDAP:"
+
+#, fuzzy
+#~ msgid "Cannot add location to the database!"
+#~ msgstr "Невозможно подключиться к серверу базы данных!"
+
+#, fuzzy
+#~ msgid "Submit department"
+#~ msgstr "Показать подразделения"
+
+#, fuzzy
+#~ msgid "edit"
+#~ msgstr "Изменить"
+
+#, fuzzy
+#~ msgid "delete"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Number of listed object groups"
+#~ msgstr "Название группы"
+
+#, fuzzy
+#~ msgid "Number of listed departments"
+#~ msgstr "Подразделение"
+
+#~ msgid "Select to see groups that are primary groups of users"
+#~ msgstr "Выберите, чтобы просмотреть список основных групп пользователей"
+
+#, fuzzy
+#~ msgid "primary groups"
+#~ msgstr "Основная группа"
+
+#, fuzzy
+#~ msgid "samba groups mappings"
+#~ msgstr "Samba"
+
+#, fuzzy
+#~ msgid "samba groups"
+#~ msgstr "Группа Samba"
+
+#, fuzzy
+#~ msgid "application settings"
+#~ msgstr "приложения"
+
+#, fuzzy
+#~ msgid "mail settings"
+#~ msgstr "Почтовые настройки пользователя"
+
+#, fuzzy
+#~ msgid "mail groups"
 #~ msgstr "Показать группы с эл. почтой"
 
+#~ msgid "Select to see normal groups that have only functional aspects"
+#~ msgstr "Выберите, чтобы просмотреть список обычных групп"
+
+#, fuzzy
+#~ msgid "functional groups"
+#~ msgstr "Показать обычные группы"
+
+#, fuzzy
+#~ msgid "Not allowed"
+#~ msgstr "Сменить пароль"
+
+#, fuzzy
+#~ msgid "Number of listed groups"
+#~ msgstr "Название группы"
+
+#, fuzzy
+#~ msgid "group"
+#~ msgstr "группы"
+
+#~ msgid "User administration"
+#~ msgstr "Управление пользователями"
+
+#, fuzzy
+#~ msgid "templates"
+#~ msgstr "Шаблон"
+
+#, fuzzy
+#~ msgid "GOsa object"
+#~ msgstr "Объект"
+
+#, fuzzy
+#~ msgid "functional users"
+#~ msgstr "Показать обычных пользователей"
+
+#, fuzzy
+#~ msgid "POSIX users"
+#~ msgstr "Атрибуты UNIX"
+
+#, fuzzy
+#~ msgid "samba users"
+#~ msgstr "Пользователи домена"
+
+#, fuzzy
+#~ msgid "proxy users"
+#~ msgstr "Показать пользователей с прокси-серверами"
+
+#, fuzzy
+#~ msgid "phone users"
+#~ msgstr "Показать пользователей с прокси-серверами"
+
+#, fuzzy
+#~ msgid "Edit UNIX properties"
+#~ msgstr "Изменить свойства"
+
+#, fuzzy
+#~ msgid "Edit fax properies"
+#~ msgstr "Изменить свойства"
+
+#, fuzzy
+#~ msgid "Create user with this template"
+#~ msgstr "Создать шаблон"
+
 #, fuzzy
-#~ msgid "All"
-#~ msgstr "Все"
+#~ msgid "user"
+#~ msgstr "пользователи"
+
+#, fuzzy
+#~ msgid "password"
+#~ msgstr "Пароль"
+
+#, fuzzy
+#~ msgid "Delete user"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Number of listed users"
+#~ msgstr "Подразделение"
+
+#, fuzzy
+#~ msgid "You have no permission to modify object '%s'!"
+#~ msgstr "У вас недостаточно прав для удаления этого стоп-листа."
+
+#, fuzzy
+#~ msgid "You have no permission to use this template!"
+#~ msgstr "У вас недостаточно прав для удаления этого стоп-листа."
+
+#, fuzzy
+#~ msgid "You have no permission to change the lock status for this user!"
+#~ msgstr "У вас недостаточно прав для смены своего пароля."
+
+#, fuzzy
+#~ msgid "Name / Department"
+#~ msgstr "Подразделение"
+
+#~ msgid "Regular expression for matching department names"
+#~ msgstr "Регулярное выражение, соответствующее именам подразделений"
+
+#~ msgid "Department management"
+#~ msgstr "Управление подразделениями"
+
+#, fuzzy
+#~ 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 ""
+#~ "Сюда входит <b>вся</b> информация о системе и ее настройках. Подумайте "
+#~ "еще раз, действительно ли вам нужно удаление, так как GOsa не сможет "
+#~ "отменить результаты этой операции."
+
+#, fuzzy
+#~ msgid "ACL role"
+#~ msgstr "Доступ"
+
+#, fuzzy
+#~ msgid "Display acls matching"
+#~ msgstr "Шаблон для групп"
+
+#, fuzzy
+#~ msgid "Edit acl role"
+#~ msgstr "Пользователи домена"
+
+#, fuzzy
+#~ msgid "Edit acl"
+#~ msgstr "Список систем"
+
+#, fuzzy
+#~ msgid "Delete acl"
+#~ msgstr "Удалить"
+
+#, fuzzy
+#~ msgid "Gender"
+#~ msgstr "Отправитель"
+
+#, fuzzy
+#~ msgid "Logging options"
+#~ msgstr "состояние неизвестно"
+
+#, fuzzy
+#~ msgid "Syslog"
+#~ msgstr "Системные журналы"
+
+#, fuzzy
+#~ msgid "Non common group"
+#~ msgstr "Показать группы с эл. почтой"
 
 #, fuzzy
 #~ msgid "Enable DNS extension"
@@ -7262,10 +7179,6 @@ msgstr "автоматически"
 #~ msgid "Hour"
 #~ msgstr "час"
 
-#, fuzzy
-#~ msgid "Minute"
-#~ msgstr "Принтер"
-
 #, fuzzy
 #~ msgid "Day"
 #~ msgstr "день"
@@ -7760,15 +7673,9 @@ msgstr "автоматически"
 #~ msgstr ""
 #~ "Выберите, чтобы просмотреть пользователей с настройками прокси-сервера"
 
-#~ msgid "Show primary groups"
-#~ msgstr "Показать основные группы"
-
 #~ msgid "Select to see groups that have samba groups mappings"
 #~ msgstr "Выберите, чтобы просмотреть группы, которые входят в samba"
 
-#~ msgid "Show samba groups"
-#~ msgstr "Показать группы samba"
-
 #~ msgid "Select to see groups that have applications configured"
 #~ msgstr ""
 #~ "Выберите, чтобы просмотреть список групп, которым доступны приложения"
@@ -7824,9 +7731,6 @@ msgstr "автоматически"
 #~ msgid "Select to see phones"
 #~ msgstr "Выберите чтобы посмотреть телефоны"
 
-#~ msgid "Show phones"
-#~ msgstr "Показать телефоны"
-
 #, fuzzy
 #~ msgid "Cannot connect to logging server '%s'."
 #~ msgstr "Невозможно подключиться к серверу базы данных!"
@@ -8183,10 +8087,6 @@ msgstr "автоматически"
 #~ msgid "Import"
 #~ msgstr "Импортировать"
 
-#, fuzzy
-#~ msgid "Send message"
-#~ msgstr "Домашняя страница"
-
 #, fuzzy
 #~ msgid "Notification send!"
 #~ msgstr "Изменить сертификаты"
@@ -8423,10 +8323,6 @@ msgstr "автоматически"
 #~ msgid "Reomve"
 #~ msgstr "Удалить"
 
-#, fuzzy
-#~ msgid "GOsa ping"
-#~ msgstr "Почтовые настройки пользователя"
-
 #, fuzzy
 #~ msgid "Say hello"
 #~ msgstr "Оболочка"
index 219ac529ceb66fa7fe3bc9d5703d7c3b0c0d9d45..83fbbeb8cc8541d79c65d24a6f37f2a66147ae5d 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VIcore2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: 2008-07-04 09:59+0200\n"
 "Last-Translator: Stefan Koehler <stefan@gonicus.de>\n"
 "Language-Team: Vietnamese\n"
@@ -37,19 +37,17 @@ msgstr "Các bộ lọc"
 #: 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -71,6 +69,7 @@ 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 ""
 "Vì thế nếu bạn chắc chắn hãy nhấn \"Xóa bỏ\" để tiếp tục hoặc'Hủy bỏ' để "
@@ -82,15 +81,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr "Hủy bỏ"
@@ -113,15 +111,14 @@ 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 "Tên người dùng"
 
 #: 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "Mật khẩu"
 
@@ -263,7 +260,7 @@ msgstr "Những thành viên đang có mặt"
 msgid "List message possible targets"
 msgstr "Liệt kê các mục tiêu có thể gửi tin nhắn"
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 msgid "Members"
 msgstr "Các thành viên"
 
@@ -296,7 +293,7 @@ msgstr "Mật khẩu cũ"
 #: 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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -309,9 +306,7 @@ msgid "Verify password"
 msgstr "Xác minh mật khẩu"
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr "Thay đổi mật mã "
 
@@ -366,7 +361,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr "đối tượng"
 
@@ -411,47 +406,49 @@ msgstr "Lý do để tạo ra snapshot này"
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.inc:596
 msgid "Continue"
 msgstr "Tiếp tục"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: 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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -461,9 +458,9 @@ msgstr "Lỗi"
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -492,8 +489,7 @@ msgid "Your password has been changed successfully."
 msgstr "Mật khẩu của bạn đã được thay đổi thành công."
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -641,9 +637,9 @@ msgstr "Đăng nhập:"
 msgid "GOsa main menu"
 msgstr "Menu chính của GOsa"
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
 msgstr "Lỗi nặng"
 
@@ -657,17 +653,17 @@ msgstr "Cấu hình GOsa %s/%s không đọc được. Bãi bỏ."
 #: 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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 msgid "Configuration error"
@@ -679,7 +675,7 @@ msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr ""
 "Không thể truy cập vào thư mục '%s' được xác định là thư mục soạn thảo!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 msgid "Password method"
 msgstr "Phương pháp lập mật khẩu"
 
@@ -687,7 +683,7 @@ msgstr "Phương pháp lập mật khẩu"
 msgid "Error: Password method not available!"
 msgstr "Lỗi: Phương pháp mật khẩu không có!"
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -706,10 +702,11 @@ msgid "The password used as new is to short."
 msgstr "Mật khẩu mới cần được cắt ngắn lại."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: 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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -727,11 +724,11 @@ msgstr "Bạn không được phép thay đổi mật mã của bạn."
 msgid "External password changer reported a problem: "
 msgstr "Bộ thay đổi mật khẩu bên ngoài báo cáo một vấn đề: "
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr "Phiên sẽ không được mã hóa."
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr "Vào phiên SSL"
 
@@ -768,33 +765,37 @@ msgstr ""
 "được cấu hình!"
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: 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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -836,12 +837,12 @@ msgstr ""
 "Không thể phục hồi thông tin của người dùng cho việc thẩm  định quyền "
 "htaccess (truy cập ht)!"
 
-#: html/index.php:368
+#: html/index.php:369
 msgid "Account locked. Please contact your system administrator!"
 msgstr ""
 "Tài khoản bị khóa. Xin hãy liên lạc với admin quản trị hệ thống của bạn!"
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -927,6 +928,49 @@ msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr ""
 "Không thể truy cập Helpdir '%s', không thể đọc được bất cứ file trợ giúp nào."
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr "không được cấu hình"
+
+#: include/class_management.inc:144
+#, fuzzy
+msgid "Filter error"
+msgstr "Lỗi nặng"
+
+#: 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 "Cho phép"
+
+#: 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 "Lỗi về cấp phép"
+
+#: include/class_management.inc:426 include/class_plugin.inc:1546
+#, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "Bạn không được phép tạo ra snapshot cho %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 "Bạn không được phép phục hồi một snapshot cho %s."
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr "Không tìm thấy Mô-đun mcrypt. Xin hãy cài đặt php5-mcrypt."
@@ -947,7 +991,7 @@ msgstr ""
 "Không thể tìm thấy một phương pháp mật khẩu phù hợp cho hàm băm hiện tại!"
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -956,7 +1000,7 @@ msgstr ""
 "Chức năng Snapshot đã được bật, nhưng biến số được yêu cầu: '%s' vẫn chưa "
 "được thiết lập."
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, fuzzy, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -969,11 +1013,11 @@ msgstr ""
 msgid "Access control"
 msgstr "Kiểm soát truy cập"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 msgid "Manage access control lists"
 msgstr "Quản lý các danh sách kiểm soát truy cập"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 msgid "All categories"
 msgstr "Tất cả các mục"
 
@@ -981,20 +1025,20 @@ msgstr "Tất cả các mục"
 msgid "Reset ACLs"
 msgstr "Xác lập lại ACLs"
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 msgid "One level"
 msgstr "Một cấp độ"
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 msgid "Current object"
 msgstr "Đối tượng hiện tại"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 msgid "Complete subtree"
 msgstr "Hoàn thành cây thư mục con"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr "Hoàn thành cây thư mục con (vĩnh viễn)"
 
@@ -1002,56 +1046,54 @@ msgstr "Hoàn thành cây thư mục con (vĩnh viễn)"
 msgid "Use ACL defined in role"
 msgstr "Sử dụng ACL được xác định trong vai trò"
 
-#: 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
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Người dùng"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr "Các nhóm"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: 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
+#: 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
 msgid "Up"
 msgstr "Lên"
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "Xuống"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr "Hiệu chỉnh"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr "Xóa"
@@ -1074,7 +1116,7 @@ msgstr "Hạng mục ACL"
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr "Hiệu chỉnh ACL cho '%s' - phạm vi là '%s'"
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr "Tất cả các đối tượng hiện trong  cây thư mục con hiện tại"
 
@@ -1115,13 +1157,13 @@ msgstr "Hoàn thành đối tượng"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: 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
+#: 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
 msgid "Internal error"
 msgstr "Lỗi nội bộ"
 
@@ -1149,20 +1191,20 @@ msgstr "Vai trò không được biết đến"
 msgid "Contains settings for these objects: %s"
 msgstr "Chứa các thiết lập cho các đối tượng: %s"
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 msgid "inactive"
 msgstr "không hoạt động"
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "No members"
 msgstr "Các thành viên nhóm"
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 msgid "Access control list"
 msgstr "Danh sách kiểm soát truy cập"
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 msgid "ACL roles"
 msgstr "Các vai trò ACL"
 
@@ -1171,48 +1213,38 @@ msgstr "Các vai trò ACL"
 msgid "Close"
 msgstr "Đóng"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 msgid "Go to root department"
 msgstr "Đi đến bộ phận gốc"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 msgid "Root"
 msgstr "Gốc"
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 msgid "Go up one department"
 msgstr "Đi lên một bộ phận"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 msgid "Go to users department"
 msgstr "Đi đến bộ phận người dùng"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 msgid "Home"
 msgstr "Nhà"
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr "Danh sách reload"
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr "Nộp"
 
@@ -1229,35 +1261,19 @@ msgstr ""
 "Tên người dùng/UID không phải là duy nhất trong cây LDAP. Xin hãy liên Lạc "
 "với Admin của bạn."
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 msgid "Choose a base"
 msgstr "Chọn một gốc"
 
-#: 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 ""
-"Vào cây ưa dùng và kích vào save để sử dụng cây con hiện tại làm cơ sở. Hoặc "
-"kích vào hình ở cuối mỗi một entry."
-
-#: include/class_baseSelectDialog.inc:61
-msgid "Use"
-msgstr "Sử dụng "
-
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1265,25 +1281,18 @@ msgstr "Sử dụng "
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "Cơ sở"
 
-#: include/class_baseSelectDialog.inc:68
-msgid "Filter entries with this syntax"
-msgstr "Lọc các entry với chỉ lệnh này"
-
-#: 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
+#: include/class_listing.inc:298 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
@@ -1291,65 +1300,79 @@ msgstr "Lọc các entry với chỉ lệnh này"
 msgid "Select all"
 msgstr "Chọn tất"
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 #, fuzzy
 msgid "created by"
 msgstr "Tạo "
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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 "Các thao tác"
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr "Copy"
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr "Cut"
 
-#: 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
+#: 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
 msgid "Paste"
 msgstr "Paste"
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Cắt entry này"
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Copy entry này"
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Phục hồi lại snapshot"
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr "Phục hồi lại snapshot"
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr "Tạo ra snapshot"
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr "Tạo ra một snapshot mới từ đối tượng này"
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:132
+msgid "Edit this entry"
+msgstr "Hiệu chỉnh entry này"
+
+#: include/class_sortableListing.inc:133
+msgid "Delete this entry"
+msgstr "Xóa bỏ entry"
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 "Lỗi nghiêm trọng: không có vị trí lớp nào được xác định - xin hãy chạy '%s' "
 "để sửa lỗi này"
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
@@ -1357,17 +1380,17 @@ msgstr ""
 "Lỗi nghiêm trọng: không thể tạo ra lớp '%s' - hãy thử chạy '%s' để sửa lỗi "
 "này"
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 "LỖI NGHIÊM TRỌNG: Lỗi khi đang kết nối với LDAP. Server thông báo '%s'."
 
-#: include/functions.inc:399
+#: include/functions.inc:518
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "Tên người dùng/ UID không phải là duy nhất trong cây LDAP!"
 
-#: include/functions.inc:474
+#: include/functions.inc:603
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -1375,11 +1398,11 @@ msgstr ""
 "Tên người dùng/UID không phải là duy nhất trong cây LDAP. Xin hãy liên Lạc "
 "với Admin của bạn."
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 msgid "Error while adding a lock. Contact the developers!"
 msgstr "Lỗi khi đang thêm một khóa vào. Hãy liên lạc với các nhà phát triển!"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1388,12 +1411,12 @@ msgstr ""
 "Không thể tạo ra việc khóa thông tin trong cây LDAP.Xin hãy liên lạc với "
 "admin của bạn!"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server trả về: %s"
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1401,12 +1424,12 @@ msgstr ""
 "Tìm thấy nhiều khóa khác nhau để khóa đối tượng. Điều này không nên xảy ra - "
 "hãy dọn sạch các tham chiếu."
 
-#: include/functions.inc:1049
+#: include/functions.inc:1232
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Đã vượt quá giới hạn kích cỡ của các entry %d!"
 
-#: include/functions.inc:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1415,73 +1438,73 @@ msgstr ""
 "Thiết lập kích cỡ mới cho %s và cho tôi thấy tin nhắn nếu giới hạn này vẫn "
 "vượt quá tiêu chuẩn"
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Cấu hình"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr "chưa hoàn thành"
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 msgid "Continue anyway"
 msgstr "Cứ tiếp tục"
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 msgid "Edit anyway"
 msgstr "Cứ hiệu chỉnh"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Bạn sẽ hiệu chỉnh entry/các entry %s của LDAP"
 
-#: include/functions.inc:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr "các entry cho mỗi trang"
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Áp dụng bộ lọc"
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "snapshot phát triển GOsa (Rev %s)"
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "File '%s' không thể bị xóa."
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 msgid "Cannot write to revision file!"
 msgstr "Không thể viết lên revision file!"
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 #, fuzzy
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'base_hook' không có. Hãy sử dụng cơ sở mặc định!"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "LDAP warning"
 msgstr "Cảnh báo LDAP"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 "Không thể dùng thông tin lược đồ từ server. Không thể kiểm tra giản đồ!"
 
-#: include/functions.inc:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr "Đã từng lưu trữ thông tin cụ thể về tài khoản."
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1489,27 +1512,27 @@ msgstr ""
 "Đã từng khóa các entry hiện đang được hiệu chỉnh nhằm tránh các thay đổi "
 "khác nhau tại cùng một thời điểm."
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Lớp đối tượng '%s' được yêu cầu mất tích!"
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Lớp đối tượng lựa chọn '%s' mất tích!"
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "Phiên bản không phù hợp với lớp đối tượng '%s' được yêu cầu (!=%s)!"
 
-#: include/functions.inc:2309
+#: include/functions.inc:2764
 #, php-format
 msgid "Class(es) available"
 msgstr "Đã có lớp"
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1517,7 +1540,7 @@ msgstr ""
 "Bạn vừa bật lựa chọn rfc2307bis lên trên bước ' cài đặt ldap', nhưng cấu "
 "hình giản đồ của bạn không hỗ trợ lựa chọn này."
 
-#: include/functions.inc:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1525,7 +1548,7 @@ msgstr ""
 "Để có thể sử dụng được nhóm conform rfc2307bis, objectClass "
 "'posixGroup' (nhóm posix) phải được hỗ trợ     "
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1533,51 +1556,51 @@ msgstr ""
 "Lược đồ của bạn được cấu hình để hỗ trợ nhóm rfc2307bis, nhưng bạn đã vừa "
 "tắt chức năng này đi trong bước 'cài đặt ldap'."
 
-#: include/functions.inc:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "ObjectClass (Lớp đối tượng) 'posixGroup' phải CÓ CẤU TRÚC"
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr "Tiếng Đức"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr "Tiếng Pháp"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr "Tiếng Ý"
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr "Tiếng Tây Ban Nha"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr "Tiếng Anh"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr "Tiếng Hà Lan"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 msgid "Polish"
 msgstr "Tiếng Phần Lan"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 msgid "Chinese"
 msgstr "Tiếng Trung Quốc"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 msgid "Vietnamese"
 msgstr "Tiếng Việt"
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr "Tiếng Nga"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1585,91 +1608,93 @@ msgstr ""
 "Lệnh '%s', được xác định là POSTMODIFY (thay đổi sau) cho chế độ plugin '%s' "
 "hình như không tồn tại."
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr "Không thể sinh ra hàm băm samba!"
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr "Không thể phân phối một ID miễn phí!"
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Không thể tạo ra folder '%s'!"
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 #, fuzzy
 msgid "no ID available!"
 msgstr "Không có mẫu nào!"
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 msgid "Cannot allocate a free ID!"
 msgstr "Không thể phân phối một ID miễn phí!"
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
 msgstr ""
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "Qúa trình xóa đã bị hủy bỏ bởi plugin '%s': %s"
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr "Các tham chiếu"
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "Bạn chuẩn bị xóa chế độ snapshot '%s'."
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 msgid "Remove snapshot"
 msgstr "Xóa snapshot"
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s (Năm-tháng-ngày)"
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1685,8 +1710,11 @@ msgstr "Y-m-d, H:i:s (Năm-tháng-ngày)"
 #: 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr "Mô tả"
 
@@ -1794,7 +1822,7 @@ msgstr "Loại"
 msgid "Arguments"
 msgstr "Tranh luận"
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 msgid "Search in subtrees"
@@ -1808,50 +1836,29 @@ msgstr ""
 "Đối tượng đã bị thay đổi từ khi được mở trong GOsa. Nếu bạn lưu entry này "
 "lại, khi các đối tượng khác lạc hướng có thể gây ra thêm tất cả các thay đổi!"
 
-#: 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 "Cho phép"
-
-#: include/class_plugin.inc:1547
-#, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "Bạn không được phép tạo ra snapshot cho %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 "Bạn không được phép phục hồi một snapshot cho %s."
-
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr "Thay đổi ACL dn"
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "from"
 msgstr "Từ"
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 msgid "to"
 msgstr "đến"
 
-#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 msgid "Restore"
 msgstr "Phục hồi"
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 msgid "cut"
 msgstr "cắt"
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr "Copy"
 
@@ -2444,17 +2451,17 @@ msgid ""
 "setup?"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr "Cảnh báo khả năng hoạt động"
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 "Khả năng hoạt động của LDAP rất thấp: truy vấn lần cuối mất khoảng %.2fs!"
 
-#: include/class_ldap.inc:665
+#: include/class_ldap.inc:692
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
@@ -2462,22 +2469,22 @@ msgstr ""
 "Không thể tự động tạo ra cây con với RDN '%s': không có lớp đối tượng nào "
 "được tìm thấy!"
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:740
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr "Không thể tự động tạo ra cây con với RDN '%s': không được hỗ trợ "
 
-#: include/class_ldap.inc:800
+#: include/class_ldap.inc:827
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "Trong khi chạy trên '%s' sử dụng LDAP server '%s'"
 
-#: include/class_ldap.inc:802
+#: include/class_ldap.inc:829
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "Trong khi chạy trên LDAP server %s"
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
@@ -2486,84 +2493,64 @@ msgstr ""
 "Đây không phải là một DN hợp lệ: '%s'. Khóa để chặn việc nạp thêm phải được "
 "bắt đầu với 'dn:...' trong dòng %s "
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr ""
 "Lỗi trong khi đang nạp thêm dn:'%s', xin hãy kiểm tra lại LDIF của bạn từ "
 "dòng %s trở đi!"
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, php-format
 msgid "Logging failed: %s"
 msgstr "Đăng nhập thất bại: %s"
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr "Lựa chọn '%s' không hợp lệ đã được chỉ định!"
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 msgid "Specified objectType is empty or invalid!"
 msgstr "ObjecType được chỉ định đang rỗng hặc không hợp lệ!"
 
-#: include/class_log.inc:139
-msgid "MySQL error"
-msgstr "Lỗi MySQL"
-
-#: include/class_log.inc:139
-#, fuzzy, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr "Bạn sẽ không truy cập vào cơ sở dữ liệu MySQL trong phiên này!"
-
-#: 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 "Đăng nhập vào MySQL"
-
-#: include/class_log.inc:219
-#, php-format
-msgid "Cannot add location to the database!"
-msgstr "Không thể thêm vị trí vào cơ sở dữ liệu!"
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr "GOsa hỗ trợ chương trình daemon"
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 msgid "Cannot not parse XML!"
 msgstr "Không thể phân tách XML!"
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Không thể  gửi thông báo trì hoãn đến entry %s!"
 
-#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Không thể xóa entry %s!"
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "Lỗi XML trong gosa.conf: %s tại dòng %d"
 
-#: include/class_config.inc:270
+#: include/class_config.inc:317
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "Không thể nối kết với LDAP. Xin hãy liên lạc với với admin hệ thống."
 
-#: include/class_config.inc:636
+#: include/class_config.inc:694
 #, fuzzy
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "SID và/hoặc RIDBASE đang bị mất trong cấu hình này!"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2584,44 +2571,44 @@ msgstr "Định dạng cấu hình đã thay đổi. Xin hãy chạy lại cài
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: 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: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
 #, php-format
 msgid "Copy and paste failed!"
 msgstr "Copy và Paste bị thất bại!"
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "Không thể thiết lập phép cho '%s'"
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr "'%s' không phải là một đối tượng LDAP hợp lệ"
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, php-format
 msgid "No write permission in '%s'"
 msgstr "Không có phép viết cho '%s'"
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr "Các đối tượng này sẽ được paste: %s"
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr "Đối tượng này sẽ được paste: %s"
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 msgid "Cannot paste"
 msgstr "Không thể paste"
 
@@ -2631,11 +2618,11 @@ msgstr "Xin hãy sửa lỗi trên và reload trang trên."
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Thông tin chung"
@@ -2646,32 +2633,26 @@ 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr "Thư"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr "Fax"
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2680,34 +2661,34 @@ msgid "FTP"
 msgstr "FTP "
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr "Nhóm "
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr "Bộ phận"
 
 #: plugins/generic/references/class_reference.inc:61
-#: 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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2716,14 +2697,13 @@ msgid "Phone"
 msgstr "Số điện thoại"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr "Ứng dụng"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Máy chủ (server)"
 
@@ -2732,19 +2712,17 @@ msgid "Thin Client"
 msgstr "Máy khách yếu"
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr "Máy trạm"
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "Nhóm đối tượng"
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr "Máy in"
 
@@ -2788,7 +2766,13 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Nhóm phát triển Gosa"
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
@@ -2796,248 +2780,37 @@ msgstr ""
 "Xin hãy kiểm tra hai lần nếu bạn thực sự muốn làm việc này bởi sẽ không có "
 "cách nào để GOsa lấy lại dữ liệu cho bạn."
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "List of object groups"
-msgstr "Danh sách các nhóm đối tượng"
-
-#: 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 "Properties"
-
-#: 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 "Các thao tác"
-
-#: 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 "Hiển thị %s"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-msgid "user groups"
-msgstr "các nhóm người dùng"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-msgid "nested groups"
-msgstr "các nhóm làm tổ"
-
-#: 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 "các nhóm ứng dụng"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-msgid "department groups"
-msgstr "các nhóm bộ phận"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-msgid "server groups"
-msgstr "các nhóm server"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-msgid "workstation groups"
-msgstr "các nhóm máy trạm"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-msgid "windows workstation groups"
-msgstr "các nhóm máy trạm windows"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-msgid "terminal groups"
-msgstr "các nhóm thiết bị cuối"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-msgid "printer groups"
-msgstr "các nhóm máy in"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-msgid "phone groups"
-msgstr "các nhóm điện thoại"
-
-#: 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 "Biểu thức thông thường cho việc khớp các tên nhóm"
-
-#: 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 "Bộ phận nộp"
-
-#: 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 "Tạo "
-
-#: 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 "Xóa bỏ"
-
-#: 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 "hiệu chỉnh"
-
-#: 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 "Hiệu chỉnh entry này"
-
-#: 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 "Xóa bỏ"
-
-#: 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 "Xóa bỏ entry"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-msgid "Number of listed object groups"
-msgstr "Tên của các nhóm đối tượng được liệt kê"
-
-#: 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 "Số các bộ phận được liệt kê"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroup.inc:1117
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr "Tất cả các nhóm đối tượng"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 msgid "Manage object groups"
 msgstr "Quản lý các nhóm đối tượng "
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 msgid "Infrastructure error"
 msgstr "Lỗi cơ sở hạ tầng"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-msgid "object group"
-msgstr "Nhóm đối tượng"
-
-#: 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 "Lỗi về cấp phép"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 #, fuzzy
 msgid "Templates"
 msgstr "Mẫu"
 
-#: 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
+#: 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
 msgid "User"
 msgstr "Người dùng"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 msgid "Windows Install"
 msgstr "Cài đặt window"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 msgid "Terminal"
 msgstr "Thiết bị cuối "
 
@@ -3053,6 +2826,19 @@ msgstr ""
 msgid "departments"
 msgstr "các bộ phận"
 
+#: 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 "Hiển thị %s"
+
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 msgid "people"
@@ -3104,7 +2890,9 @@ msgid "applications"
 msgstr "các ứng dụng"
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr "không có"
 
@@ -3122,20 +2910,20 @@ msgstr "máy trạm dùng win "
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "Đã vô hiệu"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 msgid "full access"
 msgstr "Truy cập hoàn toàn"
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr "Cho phép truy cập đến các máy chủ này"
 
@@ -3153,22 +2941,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3196,13 +2979,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Tên"
@@ -3257,7 +3046,7 @@ msgid "Select a base"
 msgstr "Chọn một cơ sở"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Ủy thác hệ thống"
@@ -3295,10 +3084,9 @@ msgid "FAI summary"
 msgstr "Tóm tắt FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr "Môi trường"
 
@@ -3310,44 +3098,145 @@ msgstr "Các ứng dụng"
 msgid "Please enter the new object group name"
 msgstr "Xin mời nhập tên nhóm đối tượng mới vào"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "Chọn nhóm đối tượng để thêm vào"
+#: 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 "Các bộ lọc"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
-msgid "Display objects of department"
-msgstr "Hiển thị nhóm đối tượng của các bộ phận"
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+msgid "user groups"
+msgstr "các nhóm người dùng"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-#: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
-msgid "Choose the department the search will be based on"
-msgstr "Chọn bộ phận mà việc tìm kiếm sẽ tiến hành trên đó "
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+msgid "nested groups"
+msgstr "các nhóm làm tổ"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:40
-msgid "Display objects matching"
-msgstr "Hiển thị việc khớp các đối tượng"
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+msgid "application groups"
+msgstr "các nhóm ứng dụng"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:41
-msgid "Regular expression for matching object names"
-msgstr "Hiển thị thông thường cho việc khớp tên các đối tượng"
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+msgid "department groups"
+msgstr "các nhóm bộ phận"
 
-#: plugins/admin/ogroups/trust_machines.tpl:6
-#: plugins/admin/groups/trust_machines.tpl:6
-#: plugins/personal/posix/trust_machines.tpl:6
-msgid "Select systems to add"
-msgstr "Chọn hệ thống để thêm vào"
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+msgid "server groups"
+msgstr "các nhóm server"
 
-#: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
-#: plugins/personal/posix/trust_machines.tpl:26
-msgid "Display systems of department"
-msgstr "Hiển thị các hệ thống của bộ phận"
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+msgid "workstation groups"
+msgstr "các nhóm máy trạm"
 
-#: plugins/admin/ogroups/trust_machines.tpl:30
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+msgid "windows workstation groups"
+msgstr "các nhóm máy trạm windows"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+msgid "terminal groups"
+msgstr "các nhóm thiết bị cuối"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+msgid "printer groups"
+msgstr "các nhóm máy in"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+msgid "phone groups"
+msgstr "các nhóm điện thoại"
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+msgid "List of object groups"
+msgstr "Danh sách các nhóm đối tượng"
+
+#: 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 "Properties"
+
+#: 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 "Tạo "
+
+#: 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 "Xóa bỏ"
+
+#: 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 "Nhóm đối tượng"
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+#, fuzzy
+msgid "Remove object group"
+msgstr "các nhóm server"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "Chọn nhóm đối tượng để thêm vào"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr "Hiển thị nhóm đối tượng của các bộ phận"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/trust_machines.tpl:27
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
+msgid "Choose the department the search will be based on"
+msgstr "Chọn bộ phận mà việc tìm kiếm sẽ tiến hành trên đó "
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:40
+msgid "Display objects matching"
+msgstr "Hiển thị việc khớp các đối tượng"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:41
+msgid "Regular expression for matching object names"
+msgstr "Hiển thị thông thường cho việc khớp tên các đối tượng"
+
+#: plugins/admin/ogroups/trust_machines.tpl:6
+#: plugins/admin/groups/trust_machines.tpl:6
+#: plugins/personal/posix/trust_machines.tpl:6
+msgid "Select systems to add"
+msgstr "Chọn hệ thống để thêm vào"
+
+#: plugins/admin/ogroups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/personal/posix/trust_machines.tpl:26
+msgid "Display systems of department"
+msgstr "Hiển thị các hệ thống của bộ phận"
+
+#: plugins/admin/ogroups/trust_machines.tpl:30
 #: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
@@ -3385,7 +3274,6 @@ msgid "Display users of department"
 msgstr "Hiển thị người dùng của bộ phận"
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr "Hiển thị việc khớp người dùng"
 
@@ -3449,68 +3337,21 @@ msgstr "Trong tất cả các nhóm"
 msgid "Not in all groups"
 msgstr "Không ở trong tất cả các nhóm"
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
-msgstr "Danh sách các nhóm"
-
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
-msgstr "Chọn để xem nhóm nào là nhóm người dùng sơ cấp"
-
-#: plugins/admin/groups/class_divListGroup.inc:85
-msgid "primary groups"
+#: plugins/admin/groups/group-filter.tpl:11
+#, fuzzy
+msgid "Show primary groups"
 msgstr "các nhóm sơ cấp"
 
-#: plugins/admin/groups/class_divListGroup.inc:86
-msgid "samba groups mappings"
-msgstr "ánh xạ các nhóm samba"
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-msgid "samba groups"
+#: plugins/admin/groups/group-filter.tpl:12
+#, fuzzy
+msgid "Show samba groups"
 msgstr "các nhóm samba"
 
-#: plugins/admin/groups/class_divListGroup.inc:88
-msgid "application settings"
-msgstr "thiết lập ứng dụng"
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-msgid "mail settings"
-msgstr "thiết lập mail"
-
-#: plugins/admin/groups/class_divListGroup.inc:91
-msgid "mail groups"
+#: plugins/admin/groups/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
 msgstr "các nhóm mail"
 
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "Chọn để xem các nhóm thông thường mà chỉ có các khía cạnh chức năng "
-
-#: plugins/admin/groups/class_divListGroup.inc:93
-msgid "functional groups"
-msgstr "các nhóm chức năng"
-
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr "Username của các nhóm được hiển thị"
-
-#: 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 "Không cho phép"
-
-#: plugins/admin/groups/class_divListGroup.inc:303
-msgid "Number of listed groups"
-msgstr "Tên các nhóm đã được lên danh sách"
-
 #: plugins/admin/groups/class_groupGeneric.inc:161
 msgid "Cannot find group SID in your configuration!"
 msgstr "Không thể tìm được nhóm SID trong cấu hình của bạn!"
@@ -3557,52 +3398,52 @@ msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 "Việc tìm kiếm có quá nhiều kết quả. Không hiển thị nhiều hơn %s mục vào!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Không thể tìm thấy một SID nào cho '%s'!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Không thể tìm thấy một RIDBASE nào cho '%s'!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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 "Số ID của nhóm"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 msgid "Generic group settings"
 msgstr "Thiết lập nhóm chung"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 msgid "Samba group type"
 msgstr "Loại nhóm Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 msgid "Samba domain name"
 msgstr "Tên miền Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 msgid "Phone pickup group"
 msgstr "Nhóm nhấc điện thoại"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 msgid "Nagios group"
 msgstr "Nhóm phần mềm Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 msgid "Group member"
 msgstr "Thành viên nhóm"
 
@@ -3610,179 +3451,72 @@ msgstr "Thành viên nhóm"
 msgid "Group settings"
 msgstr "Thiết lập nhóm"
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
-msgid "Group administration"
-msgstr "Quản trị nhóm"
-
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr "Quản trị các nhóm POSIX"
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-msgid "group"
-msgstr "Nhóm"
-
-#: 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 ""
-"Ở đây bao gồm tất cả các dữ liệu tài khoản, quy định về truy cập hệ thống, "
-"cài đặt imap, vân vân cho người dùng này. Xin hãy kiểm tra hai lần nếu bạn "
-"thực sự muốn làm điều này bởi sẽ không có cách nào để GOsa phục hồi dữ liệu "
-"cho bạn."
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr "Quản trị người dùng"
-
-#: 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 "Danh sách người dùng"
-
-#: 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 "Mẫu"
-
-#: plugins/admin/users/class_divListUsers.inc:85
-msgid "templates"
-msgstr "các mẫu"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "GOsa object"
-msgstr "Đối tượng GOsa"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-msgid "functional users"
-msgstr "Người dùng chức năng"
-
-#: plugins/admin/users/class_divListUsers.inc:87
-msgid "POSIX users"
-msgstr "Người sử dụng POSIX"
-
-#: plugins/admin/users/class_divListUsers.inc:88
-msgid "mail users"
-msgstr "Người dùng mail"
-
-#: plugins/admin/users/class_divListUsers.inc:89
-msgid "samba users"
-msgstr "Người dùng samba"
-
-#: plugins/admin/users/class_divListUsers.inc:90
-msgid "proxy users"
-msgstr "Người dùng Proxy"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "Danh sách các nhóm"
 
-#: plugins/admin/users/class_divListUsers.inc:93
+#: plugins/admin/groups/group-list.xml:138
 #, fuzzy
-msgid "phone users"
-msgstr "Người dùng Proxy"
-
-#: 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 "Áp dụng mẫu"
+msgid "Edit group"
+msgstr "các nhóm máy in"
 
-#: plugins/admin/users/class_divListUsers.inc:204
-msgid "GOsa"
-msgstr "GOsa"
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "các nhóm server"
 
-#: plugins/admin/users/class_divListUsers.inc:205
-#: plugins/admin/users/class_userManagement.inc:1067
-msgid "Edit generic properties"
-msgstr "Hiệu chỉnh các tính năng chung"
+#: plugins/admin/groups/class_groupManagement.inc:26
+msgid "Group administration"
+msgstr "Quản trị nhóm"
 
-#: plugins/admin/users/class_divListUsers.inc:207
-msgid "Edit UNIX properties"
-msgstr "Hiệu chỉnh các tính năng UNIX"
+#: plugins/admin/groups/class_groupManagement.inc:155
+msgid "Posix"
+msgstr "Posix"
 
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
-msgid "Edit environment properties"
-msgstr "Hiệu chỉnh các tính năng môi trường"
+#: plugins/admin/groups/class_groupManagement.inc:156
+#, fuzzy
+msgid "Edit posix properties"
+msgstr "Hiệu chỉnh các tính năng điện thoại"
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 msgid "Edit mail properties"
 msgstr "Hiệu chỉnh các tính năng mail"
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1095
-msgid "Edit phone properties"
-msgstr "Hiệu chỉnh các tính năng điện thoại"
-
-#: 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 "Số fax"
-
-#: plugins/admin/users/class_divListUsers.inc:215
-msgid "Edit fax properies"
-msgstr "Hiệu chỉnh các tính năng fax"
-
-#: plugins/admin/users/class_divListUsers.inc:217
-#: plugins/admin/users/class_userManagement.inc:1079
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:750
 msgid "Edit samba properties"
 msgstr "Hiệu chỉnh các tính năng samba"
 
-#: plugins/admin/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr "Netatalk"
-
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/users/class_userManagement.inc:1083
-msgid "Edit netatalk properties"
-msgstr "Hiệu chỉnh các đặc tính của netatalk"
-
-#: plugins/admin/users/class_divListUsers.inc:220
-msgid "Create user from template"
-msgstr "Tạo ra người dùng từ một mẫu"
-
-#: plugins/admin/users/class_divListUsers.inc:221
-msgid "Create user with this template"
-msgstr "Tạo ra người dùng từ mẫu này"
-
-#: 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 "hoạt động"
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
+msgid "Edit phone properties"
+msgstr "Hiệu chỉnh các tính năng điện thoại"
 
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
-msgid "user"
-msgstr "người dùng"
+#: plugins/admin/groups/class_groupManagement.inc:187
+msgid "Menu"
+msgstr ""
 
-#: plugins/admin/users/class_divListUsers.inc:274
-msgid "password"
-msgstr "mật khẩu"
+#: plugins/admin/groups/class_groupManagement.inc:188
+#, fuzzy
+msgid "Edit start menu properties"
+msgstr "Hiệu chỉnh các tính năng samba"
 
-#: plugins/admin/users/class_divListUsers.inc:287
-msgid "Delete user"
-msgstr "Xóa người dùng"
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:758
+msgid "Edit environment properties"
+msgstr "Hiệu chỉnh các tính năng môi trường"
 
-#: plugins/admin/users/class_divListUsers.inc:376
-msgid "Number of listed users"
-msgstr "Số người dùng được liệt kê"
+#: 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 ""
+"Ở đây bao gồm tất cả các dữ liệu tài khoản, quy định về truy cập hệ thống, "
+"cài đặt imap, vân vân cho người dùng này. Xin hãy kiểm tra hai lần nếu bạn "
+"thực sự muốn làm điều này bởi sẽ không có cách nào để GOsa phục hồi dữ liệu "
+"cho bạn."
 
 #: plugins/admin/users/password.tpl:4
 msgid ""
@@ -3832,6 +3566,13 @@ msgstr ""
 "cơ sở dữ liệu có thể tự động tiến hành. Chọn 'none' để bỏ qua việc sử dụng "
 "các mẫu."
 
+#: 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 "Mẫu"
+
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
@@ -3842,92 +3583,114 @@ msgstr "Họ"
 msgid "First name"
 msgstr "Tên"
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 msgid "Manage users"
 msgstr "Quản lý người dùng"
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 msgid "You have no permission to change this users password!"
 msgstr "Bạn không được phép thay đổi mật mã người dùng này!"
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr "Bạn không được phép thay đổi đối tượng '%s'!"
-
-#: plugins/admin/users/class_userManagement.inc:559
-msgid "You have no permission to use this template!"
-msgstr "Bạn không được phép sử dụng mẫu này!"
+#: 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 "Tên thật"
 
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 #, fuzzy
 msgid "Account locking"
 msgstr "Tài khoản"
 
-#: plugins/admin/users/class_userManagement.inc:662
-msgid "You have no permission to change the lock status for this user!"
-msgstr "Bạn không được phép thay đổi trạng thái khóa cho người dùng này!"
-
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:650
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 
-#: 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 "Tên thật"
-
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:723
 #, fuzzy
 msgid "Unlock account"
 msgstr "Tài khoản của tôi"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 #, fuzzy
 msgid "Lock account"
 msgstr "Tài khoản của tôi"
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+msgid "Edit generic properties"
+msgstr "Hiệu chỉnh các tính năng chung"
+
+#: 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
 msgid "POSIX"
 msgstr "POSIX (giao diện hệ điều hành lưu động)"
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Hiệu chỉnh các tính năng UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:753
+msgid "Netatalk"
+msgstr "Netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:754
+msgid "Edit netatalk properties"
+msgstr "Hiệu chỉnh các đặc tính của netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:762
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Hiệu chỉnh các tính năng UNIX"
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Danh sách người dùng"
+
 #: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1608
 #, fuzzy
-msgid "Name / Department"
-msgstr "Tên bộ phận"
+msgid "Surname"
+msgstr "Họ "
 
-#: plugins/admin/users/user-list.xml:175
+#: plugins/admin/users/user-list.xml:140
+#, fuzzy
+msgid "Lock users"
+msgstr "Danh sách người dùng"
+
+#: plugins/admin/users/user-list.xml:148
+#, fuzzy
+msgid "Unlock users"
+msgstr "Người dùng mail"
+
+#: plugins/admin/users/user-list.xml:167
+msgid "Apply template"
+msgstr "Áp dụng mẫu"
+
+#: plugins/admin/users/user-list.xml:199
+#, fuzzy
+msgid "New user from template"
+msgstr "Tạo ra người dùng từ một mẫu"
+
+#: plugins/admin/users/user-list.xml:213
 #, fuzzy
 msgid "Edit user"
 msgstr "Hiệu chỉnh entry này"
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 #, fuzzy
 msgid "Remove user"
 msgstr "Xóa ảnh "
@@ -3944,17 +3707,17 @@ msgstr "Người dùng chức năng"
 
 #: plugins/admin/users/user-filter.tpl:13
 #, fuzzy
-msgid "Show mail users"
-msgstr "Người dùng mail"
+msgid "Show POSIX users"
+msgstr "Người sử dụng POSIX"
 
 #: plugins/admin/users/user-filter.tpl:14
 #, fuzzy
-msgid "Show POSIX users"
-msgstr "Người sử dụng POSIX"
+msgid "Show Mail users"
+msgstr "Người dùng mail"
 
 #: plugins/admin/users/user-filter.tpl:15
 #, fuzzy
-msgid "Show samba users"
+msgid "Show Samba users"
 msgstr "Người dùng samba"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -3973,10 +3736,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr "Không có mẫu nào!"
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -3987,7 +3746,7 @@ msgstr ""
 "tra lại hai lần nếu bạn thực sự muốn thực hiện điều này tuy nhiên sẽ không "
 "có cách nào để Gosa phục hồi lại dữ liệu cho bạn."
 
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
+#: plugins/admin/departments/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 "
@@ -3997,109 +3756,51 @@ msgstr ""
 "tại của cây thư mục LDAP trong một file. Nếu bạn đã làm thế, hãy kích "
 "'Delete' để tiếp tục hoặc kích 'Cancel' để hủy bỏ."
 
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr "Không thể tìm được một tag chưa được dùng cho đơn vị quản trị này!"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr "Tagging '%s'."
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr "Chuyển từ '%s' đến '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr "Thất bại trong việc copy %s, bãi bỏ thao tác"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:610
-#: plugins/admin/departments/class_departmentGeneric.inc:615
-#: plugins/admin/departments/class_departmentManagement.inc:26
-msgid "Departments"
-msgstr "Các bộ phận"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Danh sách các bộ phận"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
-msgid "Department name"
-msgstr "Tên bộ phận"
+#: 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 "trong miền"
 
-#: 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 "Các danh mục"
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Admin miền"
 
-#: 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 "Bang"
+#: 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 "Quốc Gia"
 
-#: 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"
+#: 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
+#, fuzzy
+msgid "Locality"
 msgstr "Vị trí"
 
-#: 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 "Địa chỉ"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr "Số điện thoại"
-
-#: 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 "Thiết lập quản trị"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "Đối tượng '%s' đã bị tag"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Thêm tag (%s) vào đối tượng '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Bỏ tag từ đối tượng '%s'"
+#: 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 "Tổ chức"
 
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -4130,6 +3831,21 @@ msgstr "Văn bản mô tả cho bộ phận"
 msgid "Choose subtree to place department in"
 msgstr "Lựa chọn cây con để đặt bộ phận này vào  "
 
+#: 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 "Thiết lập quản trị"
+
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -4152,11 +3868,41 @@ msgstr "Tên của cây con được tạo"
 msgid "Descriptive text for   department"
 msgstr "Văn bản mô tả cho bộ phận"
 
+#: 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 "Các danh mục"
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr "Các danh mục cho cây con"
 
+#: 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 "Vị trí"
+
+#: 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 "Bang"
+
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
 msgid "State where this subtree is located"
@@ -4167,6 +3913,16 @@ msgstr "Xác định xem tập cây con này ở đâu"
 msgid "Location of this subtree"
 msgstr "Vị trí của cây con"
 
+#: 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 "Địa chỉ"
+
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -4177,6 +3933,20 @@ msgstr "Địa chỉ bưu điện của cây con này"
 msgid "Base telephone number of this subtree"
 msgstr "Đặt số điện thoại của cây con này"
 
+#: 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 "Số fax"
+
 #: plugins/admin/departments/generic.tpl:99
 #: plugins/admin/departments/organization.tpl:99
 msgid "Base facsimile telephone number of this subtree"
@@ -4184,71 +3954,32 @@ msgstr "Đặt số fax của cây con này"
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 #, fuzzy
 msgid "Domain Component"
 msgstr "Admin miền"
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr "Danh sách các bộ phận"
-
-#: plugins/admin/departments/class_divListDepartment.inc:73
-msgid "Regular expression for matching department names"
-msgstr "Những biểu thức thông thường cho việc khớp tên các bộ phận"
-
-#: plugins/admin/departments/class_departmentManagement.inc:27
-msgid "Manage Departments"
-msgstr "Quản lý  các bộ phận"
-
-#: 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 ""
-"Ngay sau khi thao tác chuyển dời kết thúc, bạn có thể kéo xuống cuối trang "
-"và kích vào phím \"Tiếp tục\" để tiếp tục với hộp thoại quản lý bộ phận."
-
-#: 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 "
-"management dialog."
-msgstr ""
-"Ngay sau khi thao tác tag kết thúc, bạn có thể kéo xuống cuối trang và kích "
-"vào phím \"Tiếp tục\" để tiếp tục với hộp thoại quản lý bộ phận."
-
-#: plugins/admin/departments/class_departmentManagement.inc:556
-#, fuzzy
-msgid "Domain"
-msgstr "trong miền"
-
-#: plugins/admin/departments/class_departmentManagement.inc:580
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "Quốc Gia"
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/class_department.inc:615
+msgid "Departments"
+msgstr "Các bộ phận"
 
-#: plugins/admin/departments/class_departmentManagement.inc:592
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "Vị trí"
+#: plugins/admin/departments/class_departmentManagement.inc:26
+msgid "Manage Departments"
+msgstr "Quản lý  các bộ phận"
 
-#: 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 "Tổ chức"
+#: plugins/admin/departments/class_departmentManagement.inc:126
+#, fuzzy
+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 "
+"management dialog."
+msgstr ""
+"Ngay sau khi thao tác tag kết thúc, bạn có thể kéo xuống cuối trang và kích "
+"vào phím \"Tiếp tục\" để tiếp tục với hộp thoại quản lý bộ phận."
 
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 #, fuzzy
@@ -4256,7 +3987,7 @@ msgid "Organization name"
 msgstr "Tổ chức"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Postal address"
 msgstr "Địa chỉ theo bưu điện"
 
@@ -4281,15 +4012,53 @@ msgstr "Admin miền"
 msgid "Name of domain to create"
 msgstr "Tên của cây con được tạo"
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr "Quản trị phòng ban "
-
 #: plugins/admin/departments/country.tpl:14
 #, fuzzy
 msgid "Name of country to create"
 msgstr "Tên của cây con được tạo"
 
+#: plugins/admin/departments/class_department.inc:386
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr "Không thể tìm được một tag chưa được dùng cho đơn vị quản trị này!"
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr "Tagging '%s'."
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr "Chuyển từ '%s' đến '%s'"
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr "Thất bại trong việc copy %s, bãi bỏ thao tác"
+
+#: plugins/admin/departments/class_department.inc:618
+msgid "Department name"
+msgstr "Tên bộ phận"
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr "Số điện thoại"
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr "Đối tượng '%s' đã bị tag"
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr "Thêm tag (%s) vào đối tượng '%s'"
+
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr "Bỏ tag từ đối tượng '%s'"
+
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr "Xử lý thao tác được yêu cầu"
@@ -4336,60 +4105,22 @@ msgstr ""
 "Trước khi bạn xác nhận hành động này, hãy đảm bảo rằng mọi thứ sẽ như mong "
 "đợi, có lẽ cách giải quyết tốt nhất là có một bản 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."
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
+msgid "Acl"
 msgstr ""
-"Ở đây bao gồm tất cả các thông tin hệ thống và cài đặt. Xin hãy kiểm tra hai "
-"lần neus bạn thực sự muốn thực hiện điều này bởi vì sẽ không có cách nào để "
-"GOsa có thể lấy lại dữ liệu cho bạn."
 
-#: plugins/admin/acl/class_aclManagement.inc:290
+#: plugins/admin/acl/class_aclManagement.inc:154
 #, fuzzy
-msgid "ACL role"
-msgstr "Các vai trò ACL"
-
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-msgid "List of acls"
-msgstr "Danh sách các ads"
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr "Bản tóm tắt"
-
-#: plugins/admin/acl/class_divListACL.inc:84
-msgid "Display acls matching"
-msgstr "Hiển thị việc khớp ads"
-
-#: 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 "Vai trò"
-
-#: plugins/admin/acl/class_divListACL.inc:165
-msgid "Edit acl role"
-msgstr "Hiệu chỉnh vai trò acl"
-
-#: plugins/admin/acl/class_divListACL.inc:185
-msgid "Edit acl"
-msgstr "Hiệu chỉnh acl"
-
-#: plugins/admin/acl/class_divListACL.inc:192
-msgid "Delete acl"
-msgstr "Xóa acl"
+msgid "ACL Assignment"
+msgstr "Quản lý ACL"
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
 msgid "ACL Templates"
 msgstr "Các mẫu ACL"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:745
 msgid "Access control roles"
 msgstr "Các vai trò kiểm soát truy cập"
 
@@ -4397,51 +4128,69 @@ msgstr "Các vai trò kiểm soát truy cập"
 msgid "Edit AC roles"
 msgstr "Hiệu chỉnh các vai trò ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 msgid "Reset ACL"
 msgstr "Xác lập lại ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 msgid "No ACL settings for this category"
 msgstr "Không có cài đặt ACL cho mục này"
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, php-format
 msgid "ACL for these objects: %s"
 msgstr "ACL cho các đối tượng sau: %s"
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 msgid "Edit category ACL"
 msgstr "Hiệu chính mục ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 msgid "Reset category ACL"
 msgstr "Xác lập mục ACL"
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr "Hiệu chỉnh ACL cho'%s', vùng là '%s'"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 msgid "Object in use"
 msgstr "Đối tượng đang được sử dụng"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr ""
 "Vai trò này không thể bị xóa bỏ trong khi nó vẫn đang được sử dụng bởi các "
 "đối tượng:"
 
-#: plugins/admin/acl/class_aclRole.inc:753
+#: 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 "Vai trò"
+
+#: plugins/admin/acl/class_aclRole.inc:755
 #, fuzzy
 msgid "Permissions"
 msgstr "Cho phép"
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
-msgid "ACL management"
-msgstr "Quản lý ACL"
+#: plugins/admin/acl/acl-list.xml:11
+msgid "List of acls"
+msgstr "Danh sách các ads"
+
+#: plugins/admin/acl/acl-filter.tpl:11
+#, fuzzy
+msgid "Show access control lists"
+msgstr "Danh sách kiểm soát truy cập"
+
+#: plugins/admin/acl/acl-filter.tpl:12
+#, fuzzy
+msgid "Show roles"
+msgstr "Hiển thị %s"
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
@@ -4459,27 +4208,27 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Hiệu chỉnh thiết lập tổ chức của người sử dụng "
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr "Nữ"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr "Nam"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr "Không thể tải file lên!"
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 msgid "Serial number"
 msgstr "Số seri"
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
@@ -4487,237 +4236,233 @@ msgstr ""
 "(Một số loại chứng nhận hiện không được hỗ trợ và có thể hiển thị 'không hợp "
 "lệ'.)"
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "Giấy chứng nhận có hiệu lực từ %s đến %s và hiện tại đang là %s."
 
-#: plugins/personal/generic/class_user.inc:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr "hợp lệ"
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr "không hợp lệ"
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 msgid "No certificate installed"
 msgstr "Không có giấy chứng nhận nào được cài đặt"
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 msgid "The selected password method is no longer available."
 msgstr "Phương pháp lập mật khẩu được chọn này không còn ở đây."
 
-#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 msgid "The selected password method requires initial configuration!"
 msgstr "Phương pháp lập mật khẩu được chọn yêu cầu cấu hình ban đầu!"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Trang chủ"
 
-#: plugins/personal/generic/class_user.inc:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Điện thoại di động"
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Ngày sinh"
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 msgid "Cannot open certificate!"
 msgstr "Không mở được giấy chứng nhận!"
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Đơn vị"
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Mô tả căn nhà"
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Nghề nghiệp"
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Lần cung cấp cuối"
 
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Địa phương của người dùng"
 
-#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Mô tả đơn vị "
 
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Lĩnh vực chuyên môn"
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Danh xưng chức năng"
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Số seri chứng nhận"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Hiển thị với tất cả mọi người"
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Phố"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Mã bưu điện"
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1598
 msgid "Generic user settings"
 msgstr "Thiết lập chung của người dùng"
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Tài khoản của tôi"
 
-#: plugins/personal/generic/class_user.inc:1601
-#, fuzzy
-msgid "Surname"
-msgstr "Họ "
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 msgid "User identification"
 msgstr "Chứng nhận người dùng"
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Chức danh cá nhân"
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Chức danh học thuật"
 
-#: plugins/personal/generic/class_user.inc:1608
-msgid "Gender"
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
 msgstr "Giới tính"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 msgid "Preferred language"
 msgstr "Ngôn ngữ muốn sử dụng"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Ảnh của người sử dụng"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 msgid "Department number"
 msgstr "Số phòng làm việc"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 msgid "Employee number"
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Loại nhân viên"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1627
 msgid "Room number"
 msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Telefon number"
 msgstr "Số điện thoại"
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Pager number"
 msgstr "Số máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 msgid "Mobile number"
 msgstr "Số di động"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 msgid "Fax number"
 msgstr "Số fax"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr "Đại chỉ nhà theo bưu điện"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 msgid "Home phone number"
 msgstr "Số điện thoại nhà"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 #, fuzzy
 msgid "User password method"
 msgstr "Phương pháp lập mật khẩu"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 msgid "User certificates"
 msgstr "Giấy phép của người dùng"
 
@@ -4745,10 +4490,6 @@ msgstr "Thay đổi hình ảnh"
 msgid "Template name"
 msgstr "Tên Mẫu"
 
-#: plugins/personal/generic/generic.tpl:138
-msgid "Sex"
-msgstr "Giới tính"
-
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
@@ -4873,6 +4614,12 @@ msgstr "hết hạn"
 msgid "grace time active"
 msgstr "Thời gian trước khi tài khoản bị khóa đang hoạt động"
 
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+msgid "active"
+msgstr "hoạt động"
+
 #: plugins/personal/posix/class_posixAccount.inc:173
 #, fuzzy
 msgid "password not changeable"
@@ -4882,46 +4629,42 @@ msgstr "Mật khẩu không thay đổi được"
 msgid "password expired"
 msgstr "mật khẩu hết hạn"
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr "không được cấu hình"
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr "tự động"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 "Mật khẩu không thể được thay đổi it nhất là %s ngày sau lần thay đổi trước"
 
-#: plugins/personal/posix/class_posixAccount.inc:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Mật khẩu phải được thay đổi sau %s ngày"
 
-#: plugins/personal/posix/class_posixAccount.inc:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, fuzzy, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 "Vô hiệu hóa tài khoản sau %s ngày không hoạt động sau khi mật khẩu hết hạn"
 
-#: plugins/personal/posix/class_posixAccount.inc:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, fuzzy, php-format
 msgid "Warn user %s days before password expiry"
 msgstr "Cảnh báo người sử dụng còn %s ngày nữa là hết hạn password"
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Thời gian chờ khóa. Bỏ qua khóa!"
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr "Nhóm người dùng"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
@@ -4929,90 +4672,90 @@ msgstr ""
 "Số UID nhân bản đã được viết cho người sử dụng này. Nếu vệc này là không cố "
 "ý, xin hãy xác minh lại tất cả các số UID!"
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Thư mục chủ"
 
-#: 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 "Số ID của người sử dụng"
 
-#: plugins/personal/posix/class_posixAccount.inc:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 msgid "shadowMin"
 msgstr "shadowMin"
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 msgid "shadowMax"
 msgstr "shadowMax"
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 msgid "shadowWarning"
 msgstr "Cảnh báo về Shadow"
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 msgid "shadowInactive"
 msgstr "Shadow  không hoạt động"
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 msgid "POSIX account"
 msgstr "tài khoản POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "ID người dùng"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 msgid "Group ID"
 msgstr "ID nhóm"
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 msgid "Force password change on login"
 msgstr "Ép buộc thay đổi mật khẩu trong khi đăng nhập"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 msgid "Shadow warning"
 msgstr "Cảnh báo Shadow"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 msgid "Shadow inactive"
 msgstr "Shadow không hoạt động"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 msgid "Shadow expire"
 msgstr "Shadow hết hạn"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 msgid "System trust model"
 msgstr "Mô hình ủy thác hệ thống"
 
@@ -5079,10 +4822,18 @@ msgstr "Hiển thị các nhóm trong bộ phận"
 msgid "Display groups matching"
 msgstr "Hiển thị sự khớp nhóm"
 
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr "Biểu thức thông thường cho việc khớp các tên nhóm"
+
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "Hiển thị các nhóm người sử dụng"
 
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr "Username của các nhóm được hiển thị"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Thiết lập Posix"
@@ -5291,46 +5042,39 @@ msgid "Government mode"
 msgstr "Chế độ nhà nước"
 
 #: setup/setup_config2.tpl:123
-msgid "Logging options"
-msgstr "Các lựa chọn đăng nhập"
-
-#: setup/setup_config2.tpl:127
-msgid "Syslog"
-msgstr "Syslog"
-
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-msgid "MySQL"
-msgstr "MySOL"
+#, fuzzy
+msgid "GOsa logging"
+msgstr "Màn hình đăng nhập GOsa"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 msgid "Mail settings"
 msgstr "Thiết lập mail"
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr "Phương pháp Mail"
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr "Thuộc tính xác minh tài khoản"
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 msgid "Vacation templates"
 msgstr "Mẫu kỳ nghỉ"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr "Sử dụng phong cách Cyrus Unix"
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 msgid "Snapshots / Undo"
 msgstr "Snapshots/Undo"
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 msgid "Enable snapshots"
 msgstr "Bật chức năng snapshots"
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 msgid "Snapshot base"
 msgstr "Gốc snapshot"
 
@@ -5674,6 +5418,10 @@ msgstr "mbstring"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr "GOsa cần môđun này để sử lý những đoạn mã unicode."
 
+#: setup/class_setupStep_Checks.inc:120
+msgid "MySQL"
+msgstr "MySOL"
+
 #: setup/class_setupStep_Checks.inc:121
 msgid ""
 "GOsa requires this module to communicate with several supported databases."
@@ -6030,14 +5778,14 @@ msgstr "Các thủ tục cài đặt có giúp bạn bắt đầu được khôn
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "Yes"
 msgstr "Có"
 
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "No"
 msgstr "Không"
 
@@ -6879,6 +6627,200 @@ msgstr "Bước này cho phép bạn lựa chọn ngôn ngữ bạn muốn dùng
 msgid "Automatic"
 msgstr "Tự động"
 
+#, fuzzy
+#~ msgid "Edit ogroup"
+#~ msgstr "Danh sách các nhóm"
+
+#, fuzzy
+#~ msgid "List of ogroups"
+#~ msgstr "Danh sách các nhóm"
+
+#~ 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 ""
+#~ "Vào cây ưa dùng và kích vào save để sử dụng cây con hiện tại làm cơ sở. "
+#~ "Hoặc kích vào hình ở cuối mỗi một entry."
+
+#~ msgid "Use"
+#~ msgstr "Sử dụng "
+
+#~ msgid "Filter entries with this syntax"
+#~ msgstr "Lọc các entry với chỉ lệnh này"
+
+#~ msgid "MySQL error"
+#~ msgstr "Lỗi MySQL"
+
+#, fuzzy
+#~ msgid "Logging to MySQL database will be disabled for server '%s'!"
+#~ msgstr "Bạn sẽ không truy cập vào cơ sở dữ liệu MySQL trong phiên này!"
+
+#~ msgid "MySQL logging"
+#~ msgstr "Đăng nhập vào MySQL"
+
+#~ msgid "Cannot add location to the database!"
+#~ msgstr "Không thể thêm vị trí vào cơ sở dữ liệu!"
+
+#~ msgid "Submit department"
+#~ msgstr "Bộ phận nộp"
+
+#~ msgid "edit"
+#~ msgstr "hiệu chỉnh"
+
+#~ msgid "delete"
+#~ msgstr "Xóa bỏ"
+
+#~ msgid "Number of listed object groups"
+#~ msgstr "Tên của các nhóm đối tượng được liệt kê"
+
+#~ msgid "Number of listed departments"
+#~ msgstr "Số các bộ phận được liệt kê"
+
+#~ msgid "Select to see groups that are primary groups of users"
+#~ msgstr "Chọn để xem nhóm nào là nhóm người dùng sơ cấp"
+
+#~ msgid "samba groups mappings"
+#~ msgstr "ánh xạ các nhóm samba"
+
+#~ msgid "application settings"
+#~ msgstr "thiết lập ứng dụng"
+
+#~ msgid "mail settings"
+#~ msgstr "thiết lập mail"
+
+#~ msgid "Select to see normal groups that have only functional aspects"
+#~ msgstr ""
+#~ "Chọn để xem các nhóm thông thường mà chỉ có các khía cạnh chức năng "
+
+#~ msgid "functional groups"
+#~ msgstr "các nhóm chức năng"
+
+#~ msgid "Not allowed"
+#~ msgstr "Không cho phép"
+
+#~ msgid "Number of listed groups"
+#~ msgstr "Tên các nhóm đã được lên danh sách"
+
+#~ msgid "Manage POSIX groups"
+#~ msgstr "Quản trị các nhóm POSIX"
+
+#~ msgid "group"
+#~ msgstr "Nhóm"
+
+#~ msgid "User administration"
+#~ msgstr "Quản trị người dùng"
+
+#~ msgid "templates"
+#~ msgstr "các mẫu"
+
+#~ msgid "GOsa object"
+#~ msgstr "Đối tượng GOsa"
+
+#~ msgid "functional users"
+#~ msgstr "Người dùng chức năng"
+
+#~ msgid "POSIX users"
+#~ msgstr "Người sử dụng POSIX"
+
+#~ msgid "samba users"
+#~ msgstr "Người dùng samba"
+
+#~ msgid "proxy users"
+#~ msgstr "Người dùng Proxy"
+
+#, fuzzy
+#~ msgid "phone users"
+#~ msgstr "Người dùng Proxy"
+
+#~ msgid "GOsa"
+#~ msgstr "GOsa"
+
+#~ msgid "Edit UNIX properties"
+#~ msgstr "Hiệu chỉnh các tính năng UNIX"
+
+#~ msgid "Edit fax properies"
+#~ msgstr "Hiệu chỉnh các tính năng fax"
+
+#~ msgid "Create user with this template"
+#~ msgstr "Tạo ra người dùng từ mẫu này"
+
+#~ msgid "user"
+#~ msgstr "người dùng"
+
+#~ msgid "password"
+#~ msgstr "mật khẩu"
+
+#~ msgid "Delete user"
+#~ msgstr "Xóa người dùng"
+
+#~ msgid "Number of listed users"
+#~ msgstr "Số người dùng được liệt kê"
+
+#~ msgid "You have no permission to modify object '%s'!"
+#~ msgstr "Bạn không được phép thay đổi đối tượng '%s'!"
+
+#~ msgid "You have no permission to use this template!"
+#~ msgstr "Bạn không được phép sử dụng mẫu này!"
+
+#~ msgid "You have no permission to change the lock status for this user!"
+#~ msgstr "Bạn không được phép thay đổi trạng thái khóa cho người dùng này!"
+
+#, fuzzy
+#~ msgid "Name / Department"
+#~ msgstr "Tên bộ phận"
+
+#~ msgid "Regular expression for matching department names"
+#~ msgstr "Những biểu thức thông thường cho việc khớp tên các bộ phận"
+
+#~ 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 ""
+#~ "Ngay sau khi thao tác chuyển dời kết thúc, bạn có thể kéo xuống cuối "
+#~ "trang và kích vào phím \"Tiếp tục\" để tiếp tục với hộp thoại quản lý bộ "
+#~ "phận."
+
+#~ msgid "Department management"
+#~ msgstr "Quản trị phòng ban "
+
+#~ 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 ""
+#~ "Ở đây bao gồm tất cả các thông tin hệ thống và cài đặt. Xin hãy kiểm tra "
+#~ "hai lần neus bạn thực sự muốn thực hiện điều này bởi vì sẽ không có cách "
+#~ "nào để GOsa có thể lấy lại dữ liệu cho bạn."
+
+#, fuzzy
+#~ msgid "ACL role"
+#~ msgstr "Các vai trò ACL"
+
+#~ msgid "Summary"
+#~ msgstr "Bản tóm tắt"
+
+#~ msgid "Display acls matching"
+#~ msgstr "Hiển thị việc khớp ads"
+
+#~ msgid "Edit acl role"
+#~ msgstr "Hiệu chỉnh vai trò acl"
+
+#~ msgid "Edit acl"
+#~ msgstr "Hiệu chỉnh acl"
+
+#~ msgid "Delete acl"
+#~ msgstr "Xóa acl"
+
+#~ msgid "Gender"
+#~ msgstr "Giới tính"
+
+#~ msgid "Logging options"
+#~ msgstr "Các lựa chọn đăng nhập"
+
+#~ msgid "Syslog"
+#~ msgstr "Syslog"
+
 #~ msgid "ACL takes effect for all users"
 #~ msgstr "ACL tác động lên tất cả người dùng"
 
index 0d7d94108394cad158cec5b56ffd11614143492c..6c95ee7c25f4b8c9e57face2beadd03bb0282c7f 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-10-05 15:23+0200\n"
+"POT-Creation-Date: 2010-01-18 17:26+0100\n"
 "PO-Revision-Date: 2007-06-03 12:27+0800\n"
 "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
 "Language-Team: Chinese Simplified <zh@li.org>\n"
@@ -35,19 +35,17 @@ msgstr "过滤器"
 #: 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: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
+#: 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
 #: plugins/admin/ogroups/remove.tpl:2 plugins/admin/groups/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/groups/class_groupGeneric.inc:1078
+#: plugins/admin/users/remove.tpl:2 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:861
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:1017
 #: 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
@@ -68,6 +66,7 @@ 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 "所以,如果您确定,请按“删除”继续,否则按“取消”退出。"
 
@@ -77,15 +76,14 @@ 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/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
+#: 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
 #, php-format
 msgid "Cancel"
 msgstr "取消"
@@ -108,15 +106,14 @@ 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 "用户名"
 
 #: 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:236
-#: setup/setup_config2.tpl:281 setup/setup_migrate.tpl:299
+#: plugins/personal/password/class_password.inc:26 setup/setup_config2.tpl:237
+#: setup/setup_config2.tpl:282 setup/setup_migrate.tpl:299
 msgid "Password"
 msgstr "口令"
 
@@ -255,7 +252,7 @@ msgstr ""
 msgid "List message possible targets"
 msgstr ""
 
-#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1076
+#: ihtml/themes/default/acl.tpl:82 include/class_acl.inc:1078
 msgid "Members"
 msgstr "成员"
 
@@ -293,7 +290,7 @@ msgstr "旧口令"
 #: 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:274
+#: plugins/admin/users/class_userManagement.inc:248
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -307,9 +304,7 @@ msgid "Verify password"
 msgstr "口令确认"
 
 #: ihtml/themes/default/accountexpired.tpl:51
-#: 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
+#: plugins/admin/users/user-list.xml:128 plugins/admin/users/user-list.xml:230
 msgid "Change password"
 msgstr "修改口令"
 
@@ -357,7 +352,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_departmentGeneric.inc:574
+#: plugins/admin/departments/class_department.inc:574
 msgid "Object"
 msgstr "对象"
 
@@ -399,47 +394,49 @@ msgstr ""
 
 #: ihtml/themes/default/snapshotdialog.tpl:87
 #: plugins/admin/users/template.tpl:48
-#: plugins/admin/departments/class_departmentGeneric.inc:514
-#: plugins/admin/departments/class_departmentGeneric.inc:596
+#: plugins/admin/departments/class_department.inc:514
+#: plugins/admin/departments/class_department.inc:596
 msgid "Continue"
 msgstr "继续"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: 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
+#: 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
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
-#: include/class_plugin.inc:744 include/class_plugin.inc:1599
+#: include/class_plugin.inc:744 include/class_plugin.inc:1598
 #: 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_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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:617
 #: plugins/admin/groups/class_groupGeneric.inc:623
-#: 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/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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1436
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -449,9 +446,9 @@ msgstr "错误"
 
 #: ihtml/themes/default/msg_dialog.tpl:76
 #: ihtml/themes/default/msg_dialog.tpl:78
-#: 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
+#: 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
 #: 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
@@ -482,8 +479,7 @@ msgid "Your password has been changed successfully."
 msgstr ""
 
 #: ihtml/themes/default/password.tpl:41 html/main.php:339
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:276
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -626,9 +622,9 @@ msgstr "登录:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:337
+#: html/password.php:58 html/main.php:147 include/functions.inc:446
 #: include/utils/class_xml.inc:43
-#: plugins/admin/departments/class_departmentGeneric.inc:386
+#: plugins/admin/departments/class_department.inc:386
 #, fuzzy
 msgid "Fatal error"
 msgstr "终端服务器"
@@ -643,17 +639,17 @@ msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
 #: 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: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
+#: 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
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #: plugins/admin/groups/class_groupGeneric.inc:745
 #, fuzzy
@@ -665,7 +661,7 @@ msgstr "配置文件"
 msgid "Directory '%s' specified as compile directory is not accessible!"
 msgstr "目录 '%s' 作为编译目录无法访问!"
 
-#: html/password.php:159 plugins/personal/generic/class_user.inc:566
+#: html/password.php:159 plugins/personal/generic/class_user.inc:572
 #, fuzzy
 msgid "Password method"
 msgstr "口令存储"
@@ -674,7 +670,7 @@ msgstr "口令存储"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:269
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -691,10 +687,11 @@ msgid "The password used as new is to short."
 msgstr "输入的新口令太短了。"
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
-#: 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/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/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -712,11 +709,11 @@ msgstr "您无权修改您的口令。"
 msgid "External password changer reported a problem: "
 msgstr "外部口令更改程序报告错误:"
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Session will not be encrypted."
 msgstr "会话不会被加密。"
 
-#: html/password.php:280 html/index.php:413
+#: html/password.php:280 html/index.php:414
 msgid "Enter SSL session"
 msgstr "进入 SSL 会话"
 
@@ -749,33 +746,37 @@ msgid "User information is not unique accross the configured LDAP trees!"
 msgstr ""
 
 #: html/index.php:254 html/index.php:265 html/index.php:278
-#: 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
+#: 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
 #: plugins/admin/ogroups/class_ogroup.inc:1047
 #: plugins/admin/groups/class_groupGeneric.inc:775
-#: 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
+#: 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
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -818,12 +819,12 @@ msgstr "Nagios 鉴权"
 msgid "Cannot retrieve user information for htaccess authentication!"
 msgstr ""
 
-#: html/index.php:368
+#: html/index.php:369
 #, fuzzy
 msgid "Account locked. Please contact your system administrator!"
 msgstr "账户锁定。请联系管理员。"
 
-#: html/index.php:419
+#: html/index.php:420
 msgid ""
 "Your browser has cookies disabled. Please enable cookies and reload this "
 "page before logging in!"
@@ -906,6 +907,51 @@ msgstr "下一个"
 msgid "Helpdir '%s' is not accessible, can't read any helpfiles."
 msgstr "帮助目录 '%s' 不能访问,无法读取任何帮助文件。"
 
+#: include/class_management.inc:32 include/class_management.inc:33
+#: plugins/personal/posix/class_posixAccount.inc:237
+msgid "unconfigured"
+msgstr "未配置"
+
+#: include/class_management.inc:144
+#, fuzzy
+msgid "Filter error"
+msgstr "终端服务器"
+
+#: 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
+#, fuzzy
+msgid "Permission"
+msgstr "允许"
+
+#: 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
+#, fuzzy
+msgid "Permission error"
+msgstr "允许"
+
+#: include/class_management.inc:426 include/class_plugin.inc:1546
+#, fuzzy, php-format
+msgid "You are not allowed to create a snapshot for %s."
+msgstr "您无权删除这个用户!"
+
+#: 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
+#, fuzzy, php-format
+msgid "You are not allowed to restore a snapshot for %s."
+msgstr "您无权删除这个用户!"
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -925,14 +971,14 @@ msgid "Cannot find a suitable password method for the current hash!"
 msgstr ""
 
 #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1022 include/class_config.inc:1053
+#: include/class_config.inc:1145 include/class_config.inc:1176
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required variable '%s' is not "
 "set."
 msgstr ""
 
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1035
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
 #, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
@@ -944,12 +990,12 @@ msgstr ""
 msgid "Access control"
 msgstr "访问选项"
 
-#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:27
+#: include/class_acl.inc:27 plugins/admin/acl/class_aclManagement.inc:26
 #, fuzzy
 msgid "Manage access control lists"
 msgstr "访问选项"
 
-#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:124
+#: include/class_acl.inc:212 plugins/admin/acl/class_aclRole.inc:125
 #, fuzzy
 msgid "All categories"
 msgstr "添加分类"
@@ -958,23 +1004,23 @@ msgstr "添加分类"
 msgid "Reset ACLs"
 msgstr ""
 
-#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:132
+#: include/class_acl.inc:221 plugins/admin/acl/class_aclRole.inc:133
 #, fuzzy
 msgid "One level"
 msgstr "日志级别"
 
 #: include/class_acl.inc:222 include/class_acl.inc:227
-#: plugins/admin/acl/class_aclRole.inc:133
+#: plugins/admin/acl/class_aclRole.inc:134
 #, fuzzy
 msgid "Current object"
 msgstr "创建新 FAI 对象"
 
-#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:134
+#: include/class_acl.inc:223 plugins/admin/acl/class_aclRole.inc:135
 #, fuzzy
 msgid "Complete subtree"
 msgstr "忽略子树"
 
-#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:135
+#: include/class_acl.inc:224 plugins/admin/acl/class_aclRole.inc:136
 msgid "Complete subtree (permanent)"
 msgstr ""
 
@@ -982,56 +1028,54 @@ msgstr ""
 msgid "Use ACL defined in role"
 msgstr ""
 
-#: 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
+#: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
+#: plugins/personal/generic/class_user.inc:1603
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "用户"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1256
-#: plugins/admin/groups/class_groupManagement.inc:26
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
 msgstr "用户组"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: 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
+#: 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
 msgid "Up"
 msgstr "上"
 
-#: include/class_acl.inc:495 include/class_listing.inc:234
-#: plugins/admin/acl/class_aclRole.inc:394
+#: include/class_acl.inc:495 include/class_listing.inc:235
+#: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "关闭"
 
 #: include/class_acl.inc:500 include/class_acl.inc:548
-#: 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
+#: 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
 msgid "Edit"
 msgstr "编辑"
 
 #: include/class_acl.inc:500 include/class_acl.inc:504
-#: 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
+#: 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
 msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:401
-#: plugins/admin/acl/class_aclRole.inc:450
+#: 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
 #, php-format
 msgid "Delete"
 msgstr "删除"
@@ -1055,7 +1099,7 @@ msgstr "分类"
 msgid "Edit ACL for '%s' - scope is '%s'"
 msgstr ""
 
-#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:480
+#: include/class_acl.inc:612 plugins/admin/acl/class_aclRole.inc:482
 msgid "All objects in current subtree"
 msgstr ""
 
@@ -1101,13 +1145,13 @@ msgstr "成员对象"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: 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
+#: 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
 #, fuzzy
 msgid "Internal error"
 msgstr "终端服务器"
@@ -1137,22 +1181,22 @@ msgstr "! 未知 id"
 msgid "Contains settings for these objects: %s"
 msgstr ""
 
-#: include/class_acl.inc:1082 plugins/admin/users/class_divListUsers.inc:252
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "inactive"
 msgstr "活动"
 
-#: include/class_acl.inc:1082
+#: include/class_acl.inc:1084
 #, fuzzy
 msgid "No members"
 msgstr "组成员"
 
-#: include/class_acl.inc:1252
+#: include/class_acl.inc:1254
 #, fuzzy
 msgid "Access control list"
 msgstr "访问选项"
 
-#: include/class_acl.inc:1257
+#: include/class_acl.inc:1259
 #, fuzzy
 msgid "ACL roles"
 msgstr "MAC 地址"
@@ -1162,48 +1206,38 @@ msgstr "MAC 地址"
 msgid "Close"
 msgstr "关闭"
 
-#: include/class_MultiSelectWindow.inc:250
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
 msgid "Go to root department"
 msgstr "转到根部门"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252
-#: include/class_baseSelectDialog.inc:47 include/class_listing.inc:906
-#: include/class_listing.inc:908
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
+#: include/class_listing.inc:980
 msgid "Root"
 msgstr "根"
 
-#: include/class_MultiSelectWindow.inc:258
-#: include/class_baseSelectDialog.inc:49 include/class_listing.inc:914
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
 msgid "Go up one department"
 msgstr "向上跳转一个部门"
 
-#: include/class_MultiSelectWindow.inc:266
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
 msgid "Go to users department"
 msgstr "转到用户部门"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268
-#: include/class_baseSelectDialog.inc:51 include/class_listing.inc:922
-#: include/class_listing.inc:924
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
+#: include/class_listing.inc:996
 msgid "Home"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273
-#: include/class_baseSelectDialog.inc:52 include/class_listing.inc:929
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
 msgid "Reload list"
 msgstr "重新加载列表"
 
-#: 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
+#: 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
 msgid "Submit"
 msgstr "提交"
 
@@ -1218,35 +1252,20 @@ msgstr ""
 msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
 
-#: include/class_baseSelectDialog.inc:44
+#: include/class_baseSelectDialog.inc:28
 #, fuzzy
 msgid "Choose a base"
 msgstr "选择一个位置"
 
-#: 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 ""
-
-#: include/class_baseSelectDialog.inc:61
-#, fuzzy
-msgid "Use"
-msgstr "用户"
-
-#: include/class_baseSelectDialog.inc:65
-#: plugins/admin/ogroups/class_divListOGroup.inc:146
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
 #: plugins/admin/ogroups/class_ogroup.inc:1121
 #: plugins/admin/ogroups/generic.tpl:26 plugins/admin/groups/generic.tpl:39
-#: 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/groups/class_groupGeneric.inc:1259
+#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
 #: 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
@@ -1254,26 +1273,18 @@ msgstr "用户"
 #: 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/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/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/personal/generic/generic.tpl:164
 #: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
 msgid "Base"
 msgstr "位置"
 
-#: include/class_baseSelectDialog.inc:68
-#, fuzzy
-msgid "Filter entries with this syntax"
-msgstr "用这个语法过滤条目"
-
-#: 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
+#: include/class_listing.inc:298 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
@@ -1282,375 +1293,391 @@ msgstr "用这个语法过滤条目"
 msgid "Select all"
 msgstr "选择"
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:499
 #, fuzzy
 msgid "created by"
 msgstr "创建"
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: 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 "动作"
+
+#: include/class_listing.inc:1350 include/class_listing.inc:1400
+#: include/class_plugin.inc:2070
 #, fuzzy
 msgid "Copy"
 msgstr "复制"
 
-#: include/class_listing.inc:1265 include/class_listing.inc:1299
-#: include/class_plugin.inc:2075
+#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_plugin.inc:2074
 #, fuzzy
 msgid "Cut"
 msgstr "剪切"
 
-#: 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
+#: 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
 msgid "Paste"
 msgstr "粘贴"
 
-#: include/class_listing.inc:1299 include/class_plugin.inc:2029
+#: include/class_listing.inc:1390 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "剪切条目"
 
-#: include/class_listing.inc:1309 include/class_plugin.inc:2037
+#: include/class_listing.inc:1400 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "拷贝条目"
 
-#: include/class_listing.inc:1341 include/class_listing.inc:1343
+#: include/class_listing.inc:1432 include/class_listing.inc:1434
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "删除记录"
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1448
 #, fuzzy
 msgid "Export list"
 msgstr "导出"
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1402 include/class_plugin.inc:2010
+#: include/class_listing.inc:1493 include/class_plugin.inc:2009
 #, fuzzy
 msgid "Create snapshot"
 msgstr "创建 nagios 账户"
 
-#: include/class_listing.inc:1403 include/class_plugin.inc:2011
+#: include/class_listing.inc:1494 include/class_plugin.inc:2010
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "创建新 FAI 对象"
 
-#: include/functions.inc:121
+#: include/class_sortableListing.inc:132
+msgid "Edit this entry"
+msgstr "编辑这条记录"
+
+#: include/class_sortableListing.inc:133
+msgid "Delete this entry"
+msgstr "删除这个条目"
+
+#: include/functions.inc:127
 #, php-format
 msgid "Fatal error: no class locations defined - please run '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:128
+#: include/functions.inc:134
 #, php-format
 msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:338
+#: include/functions.inc:447
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "致命错误:连接 LDAP 错误。服务器返回 '%s'。"
 
-#: include/functions.inc:399
+#: include/functions.inc:518
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
 
-#: include/functions.inc:474
+#: include/functions.inc:603
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
 
-#: include/functions.inc:641 include/functions.inc:738
+#: include/functions.inc:789 include/functions.inc:907
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr "无法获得 LDAP 数据库的锁信息。检查 gosa.conf 中的 'config' 条目!"
 
-#: include/functions.inc:651
+#: include/functions.inc:799
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP 服务器"
 
-#: include/functions.inc:759
+#: include/functions.inc:928
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "发现要锁定的对象由多个锁。这虽然不可能──清除多个引用。"
 
-#: include/functions.inc:1049
+#: include/functions.inc:1232
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "超过了 %d 个条目的大小限制!"
 
-#: include/functions.inc:1051
+#: include/functions.inc:1234
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr "设置新的大小限制为 %s 并且如果限制依然超出还显示这条信息。"
 
-#: include/functions.inc:1063 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "配置"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1251
 msgid "incomplete"
 msgstr "不完整"
 
-#: include/functions.inc:1361
+#: include/functions.inc:1641
 msgid "Continue anyway"
 msgstr "仍然继续"
 
-#: include/functions.inc:1363
+#: include/functions.inc:1643
 msgid "Edit anyway"
 msgstr "仍然编辑"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1645
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "您将要拷贝条目 '%s'。"
 
-#: include/functions.inc:1549
+#: include/functions.inc:1885
 msgid "Entries per page"
 msgstr "每页条目数"
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1914 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "应用过滤器"
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2226 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1867
+#: include/functions.inc:2272
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa 开发版(版本 %s)"
 
-#: include/functions.inc:1946
+#: include/functions.inc:2369
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:1980 include/functions.inc:2000
+#: include/functions.inc:2403 include/functions.inc:2423
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "无法创建文件 '%s'。"
 
-#: include/functions.inc:2188 include/functions.inc:2192
-#: include/functions.inc:2198
+#: include/functions.inc:2641 include/functions.inc:2645
+#: include/functions.inc:2651
 #, fuzzy
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "警告: nextIdHook不可用。使用缺省 base。"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 #, fuzzy
 msgid "LDAP warning"
 msgstr "LDAP 管理"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2675
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr "不能从服务器得到 schema 信息。无法对 schema 检查!"
 
-#: include/functions.inc:2246
+#: include/functions.inc:2701
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2253
+#: include/functions.inc:2708
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2298
+#: include/functions.inc:2753
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2301
+#: include/functions.inc:2756
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2306
+#: include/functions.inc:2761
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2309
+#: include/functions.inc:2764
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "文件可用。"
 
-#: include/functions.inc:2331
+#: include/functions.inc:2786
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
 msgstr ""
 
-#: include/functions.inc:2332
+#: include/functions.inc:2787
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2336
+#: include/functions.inc:2791
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
 msgstr ""
 
-#: include/functions.inc:2337
+#: include/functions.inc:2792
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2361
+#: include/functions.inc:2816
 msgid "German"
 msgstr "德语"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2817
 msgid "French"
 msgstr "法语"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2818
 msgid "Italian"
 msgstr "意大利语"
 
-#: include/functions.inc:2364
+#: include/functions.inc:2819
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2820
 msgid "English"
 msgstr "英语"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2821
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2822
 msgid "Polish"
 msgstr "波兰语"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2824
 msgid "Chinese"
 msgstr "芯片组"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2825
 #, fuzzy
 msgid "Vietnamese"
 msgstr "名"
 
-#: include/functions.inc:2371
+#: include/functions.inc:2826
 msgid "Russian"
 msgstr "俄语"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3021
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr "命令 '%s',作为插件 '%s' 的 POSTMODIFY 好像并不存在。"
 
-#: include/functions.inc:2574
+#: include/functions.inc:3054
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:2587
+#: include/functions.inc:3067
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: 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
 msgid "Cannot allocate a free ID:"
 msgstr "太多用户,无法分配一个可用的 ID!"
 
-#: include/functions.inc:2843
+#: include/functions.inc:3348
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:2857
+#: include/functions.inc:3362
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:2887
+#: include/functions.inc:3392
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "转到根部门"
 
-#: include/functions.inc:2895
+#: include/functions.inc:3400
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3412 include/functions.inc:3416
 #, fuzzy
 msgid "no ID available!"
 msgstr "文件可用。"
 
-#: include/functions.inc:2935
+#: include/functions.inc:3440
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:2994
+#: include/functions.inc:3500
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "太多用户,无法分配一个可用的 ID!"
 
-#: include/class_tabs.inc:55
+#: include/class_tabs.inc:57
 #, fuzzy, php-format
 msgid ""
 "No plugin definitions found to initialize '%s', please check your "
 "configuration file."
 msgstr "无法连接到指定数据库,请检查您 glpi 设置。"
 
-#: include/class_tabs.inc:266
+#: include/class_tabs.inc:268
 #, php-format
 msgid "Delete process has been canceled by plugin '%s': %s"
 msgstr "删除进程被插件 '%s' 取消: %s"
 
-#: include/class_tabs.inc:404
+#: include/class_tabs.inc:406
 msgid "References"
 msgstr "参考"
 
-#: include/class_SnapShotDialog.inc:90
+#: include/class_SnapShotDialog.inc:82
 #, fuzzy, php-format
 msgid "You're about to delete the snapshot '%s'."
 msgstr "您将要删除宏 '%s'。"
 
-#: include/class_SnapShotDialog.inc:145
+#: include/class_SnapShotDialog.inc:137
 #, fuzzy
 msgid "Remove snapshot"
 msgstr "删除记录"
 
-#: include/class_SnapShotDialog.inc:147 include/class_SnapShotDialog.inc:167
+#: include/class_SnapShotDialog.inc:139 include/class_SnapShotDialog.inc:159
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: include/class_SnapShotDialog.inc:179
+#: include/class_SnapShotDialog.inc:171
 #: plugins/generic/references/contents.tpl:11
 #: plugins/admin/ogroups/class_ogroup.inc:1122
-#: 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/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/departments/locality.tpl:19
 #: plugins/admin/departments/generic.tpl:19
 #: plugins/admin/departments/class_domain.inc:59
@@ -1666,8 +1693,11 @@ msgstr ""
 #: 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:752 plugins/admin/acl/acl_role.tpl:17
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
 msgid "Description"
 msgstr "描述"
 
@@ -1778,7 +1808,7 @@ msgstr "类型"
 msgid "Arguments"
 msgstr "参数"
 
-#: include/class_filter.inc:309 include/utils/class_msgPool.inc:23
+#: include/class_filter.inc:321 include/utils/class_msgPool.inc:23
 #: plugins/admin/ogroups/ogroup_objects.tpl:33
 #: plugins/personal/posix/posix_groups.tpl:68
 #, fuzzy
@@ -1791,53 +1821,31 @@ msgid ""
 "others get lost if you save this entry!"
 msgstr ""
 
-#: 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
-#, fuzzy
-msgid "Permission"
-msgstr "允许"
-
-#: include/class_plugin.inc:1547
-#, fuzzy, php-format
-msgid "You are not allowed to create a snapshot for %s."
-msgstr "您无权删除这个用户!"
-
-#: include/class_plugin.inc:1559 include/class_plugin.inc:1574
-#: include/class_plugin.inc:1587
-#, fuzzy, php-format
-msgid "You are not allowed to restore a snapshot for %s."
-msgstr "您无权删除这个用户!"
-
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "Changing ACL dn"
 msgstr ""
 
-#: include/class_plugin.inc:1799
+#: include/class_plugin.inc:1798
 msgid "from"
 msgstr "从"
 
-#: include/class_plugin.inc:1800 setup/class_setupStep_Migrate.inc:1249
+#: include/class_plugin.inc:1799 setup/class_setupStep_Migrate.inc:1249
 #: setup/class_setupStep_Migrate.inc:1299
 #: setup/class_setupStep_Migrate.inc:1347
 #, fuzzy
 msgid "to"
 msgstr "停止"
 
-#: include/class_plugin.inc:1985 include/class_plugin.inc:1987
+#: include/class_plugin.inc:1984 include/class_plugin.inc:1986
 #, fuzzy
 msgid "Restore"
 msgstr "仓库"
 
-#: include/class_plugin.inc:2029
+#: include/class_plugin.inc:2028
 msgid "cut"
 msgstr "剪切"
 
-#: include/class_plugin.inc:2037
+#: include/class_plugin.inc:2036
 msgid "copy"
 msgstr "复制"
 
@@ -2447,124 +2455,103 @@ msgid ""
 "setup?"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 msgid "Performance warning"
 msgstr ""
 
-#: include/class_ldap.inc:232 include/class_ldap.inc:265
+#: include/class_ldap.inc:233 include/class_ldap.inc:266
 #, php-format
 msgid "LDAP performance is poor: last query took about %.2fs!"
 msgstr ""
 
-#: include/class_ldap.inc:665
+#: include/class_ldap.inc:692
 #, php-format
 msgid ""
 "Cannot automatically create subtrees with RDN '%s': no object class found!"
 msgstr ""
 
-#: include/class_ldap.inc:713
+#: include/class_ldap.inc:740
 #, php-format
 msgid "Cannot automatically create subtrees with RDN '%s': not supported"
 msgstr ""
 
-#: include/class_ldap.inc:800
+#: include/class_ldap.inc:827
 #, php-format
 msgid "while operating on '%s' using LDAP server '%s'"
 msgstr "当操作 '%s' 使用 LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:802
+#: include/class_ldap.inc:829
 #, php-format
 msgid "while operating on LDAP server %s"
 msgstr "当操作  LDAP 服务器 '%s' 时"
 
-#: include/class_ldap.inc:1024
+#: include/class_ldap.inc:1051
 #, php-format
 msgid ""
 "This is not a valid DN: '%s'. A block for import should begin with 'dn: ...' "
 "in line %s"
 msgstr "这不是一条有效的 DN: '%s'。导入数据应该以 'dn:...' 开始于行 %s"
 
-#: include/class_ldap.inc:1053
+#: include/class_ldap.inc:1080
 #, php-format
 msgid "Error while importing dn: '%s', please check your LDIF from line %s on!"
 msgstr "导入 dn: '%s' 时错误,请从行 %s 开始检查您的 LDIF!"
 
-#: include/class_log.inc:88
+#: include/class_log.inc:87
 #, fuzzy, php-format
 msgid "Logging failed: %s"
 msgstr "Logging DB 用户"
 
-#: include/class_log.inc:116
+#: include/class_log.inc:102
 #, php-format
 msgid "Invalid option '%s' specified!"
 msgstr ""
 
-#: include/class_log.inc:120
+#: include/class_log.inc:106
 #, fuzzy
 msgid "Specified objectType is empty or invalid!"
 msgstr "指定的 branch 名称无效。"
 
-#: include/class_log.inc:139
-#, fuzzy
-msgid "MySQL error"
-msgstr "LDAP 错误:"
-
-#: include/class_log.inc:139
-#, php-format
-msgid "Logging to MySQL database will be disabled for server '%s'!"
-msgstr ""
-
-#: 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 ""
-
-#: include/class_log.inc:219
-#, fuzzy, php-format
-msgid "Cannot add location to the database!"
-msgstr "无法连接到数据库!"
-
-#: include/class_gosaSupportDaemon.inc:109
+#: include/class_gosaSupportDaemon.inc:112
 msgid "GOsa support daemon"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:784
+#: include/class_gosaSupportDaemon.inc:787
 #, fuzzy
 msgid "Cannot not parse XML!"
 msgstr "太多用户,无法分配一个可用的 ID!"
 
-#: include/class_gosaSupportDaemon.inc:1174
+#: include/class_gosaSupportDaemon.inc:1180
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "无法创建文件 '%s'。"
 
-#: include/class_gosaSupportDaemon.inc:1194
+#: include/class_gosaSupportDaemon.inc:1200
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "未知 FAIstate %s"
 
-#: include/class_config.inc:120
+#: include/class_config.inc:151
 #, php-format
 msgid "XML error in gosa.conf: %s at line %d"
 msgstr "XML 出错于 gosa.conf: %s ,行 %d"
 
-#: include/class_config.inc:270
+#: include/class_config.inc:317
 #, fuzzy
 msgid "Cannot bind to LDAP. Please contact the system administrator."
 msgstr "无法绑定 LDAP。请联系系统管理员。"
 
-#: include/class_config.inc:636
+#: include/class_config.inc:694
 #, fuzzy
 msgid "sambaSID and/or sambaRidBase missing in the configuration!"
 msgstr "您的配置文件缺少 SID 和/或 RIDBASE!"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 #, fuzzy
 msgid "Configuration"
 msgstr "配置文件"
 
-#: include/class_config.inc:986
+#: include/class_config.inc:1103
 msgid ""
 "The configuration file you are using seems to be outdated. Please move the "
 "GOsa configuration file away to run the GOsa setup again."
@@ -2583,44 +2570,44 @@ msgstr ""
 msgid "Unknown"
 msgstr "未知"
 
-#: 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: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
 #, fuzzy, php-format
 msgid "Copy and paste failed!"
 msgstr "拷贝和粘贴精灵"
 
-#: include/class_CopyPasteHandler.inc:117
-#: include/class_CopyPasteHandler.inc:192
+#: include/class_CopyPasteHandler.inc:118
+#: include/class_CopyPasteHandler.inc:193
 #, fuzzy, php-format
 msgid "Cannot set permission for '%s'"
 msgstr "无法创建文件 '%s'。"
 
-#: include/class_CopyPasteHandler.inc:158
+#: include/class_CopyPasteHandler.inc:159
 #, php-format
 msgid "'%s' is no vaild LDAP object"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:175
+#: include/class_CopyPasteHandler.inc:176
 #, fuzzy, php-format
 msgid "No write permission in '%s'"
 msgstr "无法创建文件 '%s'。"
 
-#: include/class_CopyPasteHandler.inc:386
+#: include/class_CopyPasteHandler.inc:394
 #, php-format
 msgid "These objects will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:410
+#: include/class_CopyPasteHandler.inc:418
 #, php-format
 msgid "This object will be pasted: %s"
 msgstr ""
 
-#: include/class_CopyPasteHandler.inc:508
+#: include/class_CopyPasteHandler.inc:516
 #, fuzzy
 msgid "Cannot paste"
 msgstr "无法粘贴"
@@ -2632,11 +2619,11 @@ msgstr "请看一下 GOsa 日志文件。"
 
 #: plugins/generic/references/class_reference.inc:41
 #: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1250
-#: plugins/admin/users/class_userManagement.inc:1066
-#: plugins/admin/departments/class_departmentGeneric.inc:609
+#: plugins/admin/groups/class_groupGeneric.inc:1248
+#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1597
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "通用配置"
@@ -2647,32 +2634,26 @@ 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_divListGroup.inc:190
-#: plugins/admin/users/class_divListUsers.inc:88
-#: plugins/admin/users/class_divListUsers.inc:210
-#: plugins/admin/users/class_userManagement.inc:1073
+#: plugins/admin/groups/class_groupManagement.inc:163
+#: plugins/admin/users/class_userManagement.inc:744
 msgid "Mail"
 msgstr "邮件"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:171
+#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:761
 msgid "FAX"
 msgstr "传真"
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "代理"
 
@@ -2681,34 +2662,34 @@ msgid "FTP"
 msgstr "FTP"
 
 #: plugins/generic/references/class_reference.inc:57
-#: plugins/admin/ogroups/class_ogroupManagement.inc:532
-#: plugins/admin/groups/class_divListGroup.inc:133
+#: 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
 msgid "Group"
 msgstr "组"
 
 #: plugins/generic/references/class_reference.inc:59
-#: 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/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/personal/generic/generic.tpl:295
 #: plugins/personal/generic/multiple_generic.tpl:159
 msgid "Department"
 msgstr "部门"
 
 #: plugins/generic/references/class_reference.inc:61
-#: 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/ogroups/class_ogroupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:179
+#: plugins/admin/users/class_userManagement.inc:765
 #: 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:1305
-#: plugins/personal/generic/class_user.inc:1718
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1725
 #: plugins/personal/generic/generic.tpl:346
 #: plugins/personal/generic/generic.tpl:527
 #: plugins/personal/generic/multiple_generic.tpl:217
@@ -2717,14 +2698,13 @@ msgid "Phone"
 msgstr "电话"
 
 #: plugins/generic/references/class_reference.inc:63
-#: plugins/admin/ogroups/class_ogroupManagement.inc:533
-#: plugins/admin/groups/class_divListGroup.inc:194
+#: plugins/admin/ogroups/class_ogroupManagement.inc:185
 msgid "Application"
 msgstr "应用程序"
 
 #: plugins/generic/references/class_reference.inc:65
-#: plugins/admin/ogroups/class_ogroupManagement.inc:535
-#: setup/setup_config2.tpl:218 setup/setup_config2.tpl:263
+#: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "服务器"
 
@@ -2733,19 +2713,17 @@ msgid "Thin Client"
 msgstr "瘦客户机"
 
 #: plugins/generic/references/class_reference.inc:69
-#: plugins/admin/ogroups/class_ogroupManagement.inc:537
+#: plugins/admin/ogroups/class_ogroupManagement.inc:189
 msgid "Workstation"
 msgstr "工作站"
 
 #: plugins/generic/references/class_reference.inc:71
-#: plugins/admin/ogroups/class_divListOGroup.inc:83
-#: plugins/admin/ogroups/class_divListOGroup.inc:159
-#: plugins/admin/ogroups/class_divListOGroup.inc:266
+#: plugins/admin/ogroups/ogroup-list.xml:15
 msgid "Object group"
 msgstr "对象组"
 
 #: plugins/generic/references/class_reference.inc:73
-#: plugins/admin/ogroups/class_ogroupManagement.inc:540
+#: plugins/admin/ogroups/class_ogroupManagement.inc:192
 msgid "Printer"
 msgstr "打印机"
 
@@ -2785,271 +2763,52 @@ msgstr "选择上方左侧的“退出”按钮断开链接,选择“首页”
 msgid "The GOsa team"
 msgstr "GOsa 团队"
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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
 msgid ""
 "Please double check if you really want to do this since there is no way for "
 "GOsa to get your data back."
 msgstr "请再次检查您是否要这么做,因为 GOsa 没有办法将您的数据找回。"
 
-#: plugins/admin/ogroups/class_divListOGroup.inc:59
-#: plugins/admin/ogroups/class_divListOGroup.inc:60
-msgid "List of object groups"
-msgstr "对象组列表"
-
-#: 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 "属性"
-
-#: 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 "动作"
-
-#: 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
-#, fuzzy, php-format
-msgid "Show %s"
-msgstr "显示组"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:89
-#: plugins/admin/ogroups/class_divListOGroup.inc:90
-#, fuzzy
-msgid "user groups"
-msgstr "组"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-#, fuzzy
-msgid "nested groups"
-msgstr "对象组"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:93
-#: plugins/admin/ogroups/class_divListOGroup.inc:94
-#: plugins/admin/groups/class_divListGroup.inc:89
-#, fuzzy
-msgid "application groups"
-msgstr "显示应用程序组"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-#, fuzzy
-msgid "department groups"
-msgstr "部门"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-#, fuzzy
-msgid "server groups"
-msgstr "服务器"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-#, fuzzy
-msgid "workstation groups"
-msgstr "工作站"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-#, fuzzy
-msgid "windows workstation groups"
-msgstr "显示工作站"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-#, fuzzy
-msgid "terminal groups"
-msgstr "显示邮件组"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-#, fuzzy
-msgid "printer groups"
-msgstr "主要用户组"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-#, fuzzy
-msgid "phone groups"
-msgstr "显示组"
-
-#: 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 "用于匹配组名的正则表达式"
-
-#: 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 "提交部门"
-
-#: 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 "创建"
-
-#: 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 "删除"
-
-#: 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 "编辑"
-
-#: 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 "编辑这条记录"
-
-#: 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 "删除"
-
-#: 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 "删除这个条目"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-#, fuzzy
-msgid "Number of listed object groups"
-msgstr "对象组名称"
-
-#: 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
-#, fuzzy
-msgid "Number of listed departments"
-msgstr "部门名称"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
+#: plugins/admin/ogroups/class_ogroupManagement.inc:25
 #: plugins/admin/ogroups/class_ogroup.inc:1117
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
 msgid "Object groups"
 msgstr "对象组"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
+#: plugins/admin/ogroups/class_ogroupManagement.inc:26
 #, fuzzy
 msgid "Manage object groups"
 msgstr "对象组名称"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:176
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:220
+#: plugins/admin/ogroups/class_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:188
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "PHP 错误"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:255
-#: plugins/admin/ogroups/class_ogroupManagement.inc:331
-#, fuzzy
-msgid "object group"
-msgstr "对象组"
-
-#: 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
-#, fuzzy
-msgid "Permission error"
-msgstr "允许"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:530
-#: plugins/admin/users/user-list.xml:24
+#: plugins/admin/ogroups/class_ogroupManagement.inc:182
 #, fuzzy
 msgid "Templates"
 msgstr "模板"
 
-#: 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
+#: 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
 msgid "User"
 msgstr "用户"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:538
+#: plugins/admin/ogroups/class_ogroupManagement.inc:190
 #, fuzzy
 msgid "Windows Install"
 msgstr "Windows 工作站"
 
-#: plugins/admin/ogroups/class_ogroupManagement.inc:539
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
 msgid "Terminal"
 msgstr "终端"
 
@@ -3063,6 +2822,19 @@ msgstr ""
 msgid "departments"
 msgstr "部门"
 
+#: 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
+#, fuzzy, php-format
+msgid "Show %s"
+msgstr "显示组"
+
 #: plugins/admin/ogroups/class_ogroup.inc:461
 #: plugins/admin/ogroups/class_ogroup.inc:463
 #, fuzzy
@@ -3116,7 +2888,9 @@ msgid "applications"
 msgstr "应用程序"
 
 #: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/users/class_userManagement.inc:333
+#: plugins/admin/users/class_userManagement.inc:366
+#: plugins/admin/users/class_userManagement.inc:397
 msgid "none"
 msgstr "无"
 
@@ -3135,20 +2909,20 @@ msgstr "Windows 工作站"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
-#: setup/setup_config2.tpl:142
+#: plugins/personal/posix/class_posixAccount.inc:644
+#: setup/setup_config2.tpl:143
 msgid "disabled"
 msgstr "禁用"
 
 #: plugins/admin/ogroups/class_ogroup.inc:570
 #: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:639
+#: plugins/personal/posix/class_posixAccount.inc:644
 msgid "full access"
 msgstr "完全访问权限"
 
 #: plugins/admin/ogroups/class_ogroup.inc:571
 #: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:640
+#: plugins/personal/posix/class_posixAccount.inc:645
 msgid "allow access to these hosts"
 msgstr "允许访问这些主机"
 
@@ -3166,22 +2940,17 @@ msgstr ""
 #: plugins/admin/ogroups/class_ogroup.inc:922
 #: plugins/admin/ogroups/class_ogroup.inc:932
 #: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
+#: 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_groupGeneric.inc:1137
-#: 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/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/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3209,13 +2978,19 @@ msgstr ""
 #: plugins/admin/departments/class_dcObject.inc:52
 #: plugins/admin/departments/class_dcObject.inc:54
 #: plugins/admin/departments/class_dcObject.inc:86
-#: 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
+#: 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
 #: setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "名称"
@@ -3273,7 +3048,7 @@ msgid "Select a base"
 msgstr "选择一个位置"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1265
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "信赖的系统"
@@ -3312,10 +3087,9 @@ msgid "FAI summary"
 msgstr "自动化安装说明"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: 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
+#: plugins/admin/groups/class_groupManagement.inc:195
+#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/personal/posix/class_posixAccount.inc:324
 msgid "Environment"
 msgstr "环境设置"
 
@@ -3327,20 +3101,132 @@ msgstr "应用程序"
 msgid "Please enter the new object group name"
 msgstr "请输入新对象组名称"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:6
-msgid "Select objects to add"
-msgstr "选择要添加的对象"
+#: 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 "过滤器"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:36
-msgid "Display objects of department"
-msgstr "选择查看部门对象"
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+#, fuzzy
+msgid "user groups"
+msgstr "组"
 
-#: plugins/admin/ogroups/ogroup_objects.tpl:37
-#: plugins/admin/ogroups/trust_machines.tpl:27
-#: plugins/admin/groups/group_objects.tpl:40
-#: plugins/admin/groups/trust_machines.tpl:27
-#: plugins/personal/posix/posix_groups.tpl:35
-#: plugins/personal/posix/trust_machines.tpl:27
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+#, fuzzy
+msgid "nested groups"
+msgstr "对象组"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+#, fuzzy
+msgid "application groups"
+msgstr "显示应用程序组"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+#, fuzzy
+msgid "department groups"
+msgstr "部门"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+#, fuzzy
+msgid "server groups"
+msgstr "服务器"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+#, fuzzy
+msgid "workstation groups"
+msgstr "工作站"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+#, fuzzy
+msgid "windows workstation groups"
+msgstr "显示工作站"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+#, fuzzy
+msgid "terminal groups"
+msgstr "显示邮件组"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+#, fuzzy
+msgid "printer groups"
+msgstr "主要用户组"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+#, fuzzy
+msgid "phone groups"
+msgstr "显示组"
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+msgid "List of object groups"
+msgstr "对象组列表"
+
+#: 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 "属性"
+
+#: 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 "创建"
+
+#: 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 "删除"
+
+#: plugins/admin/ogroups/ogroup-list.xml:106
+#: plugins/admin/groups/group-list.xml:106
+#: plugins/admin/users/user-list.xml:156
+#, fuzzy
+msgid "Send message"
+msgstr "挂起邮件"
+
+#: plugins/admin/ogroups/ogroup-list.xml:142
+#, fuzzy
+msgid "Edit object group"
+msgstr "对象组"
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+#, fuzzy
+msgid "Remove object group"
+msgstr "服务器"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:6
+msgid "Select objects to add"
+msgstr "选择要添加的对象"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:36
+msgid "Display objects of department"
+msgstr "选择查看部门对象"
+
+#: plugins/admin/ogroups/ogroup_objects.tpl:37
+#: plugins/admin/ogroups/trust_machines.tpl:27
+#: plugins/admin/groups/group_objects.tpl:40
+#: plugins/admin/groups/trust_machines.tpl:27
+#: plugins/personal/posix/posix_groups.tpl:35
+#: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
 msgstr "选择一个部门来做查询"
 
@@ -3401,7 +3287,6 @@ msgid "Display users of department"
 msgstr "显示部门的用户"
 
 #: plugins/admin/groups/group_objects.tpl:46
-#: plugins/admin/users/class_divListUsers.inc:101
 msgid "Display users matching"
 msgstr "显示匹配的用户"
 
@@ -3465,76 +3350,18 @@ msgstr "显示邮件组"
 msgid "Not in all groups"
 msgstr "显示邮件组"
 
-#: plugins/admin/groups/class_divListGroup.inc:55
-#: plugins/admin/groups/class_divListGroup.inc:56
-msgid "List of groups"
-msgstr "组列表"
-
-#: plugins/admin/groups/class_divListGroup.inc:84
-msgid "Select to see groups that are primary groups of users"
-msgstr "选择查看用户的主要组"
-
-#: plugins/admin/groups/class_divListGroup.inc:85
-#, fuzzy
-msgid "primary groups"
-msgstr "主要用户组"
-
-#: plugins/admin/groups/class_divListGroup.inc:86
-#, fuzzy
-msgid "samba groups mappings"
-msgstr "显示匹配的组"
-
-#: plugins/admin/groups/class_divListGroup.inc:87
-#, fuzzy
-msgid "samba groups"
-msgstr "Samba 组"
-
-#: plugins/admin/groups/class_divListGroup.inc:88
-#, fuzzy
-msgid "application settings"
-msgstr "应用程序"
-
-#: plugins/admin/groups/class_divListGroup.inc:90
-#, fuzzy
-msgid "mail settings"
-msgstr "邮件选项"
-
-#: plugins/admin/groups/class_divListGroup.inc:91
-#, fuzzy
-msgid "mail groups"
-msgstr "显示邮件组"
-
-#: plugins/admin/groups/class_divListGroup.inc:92
-msgid "Select to see normal groups that have only functional aspects"
-msgstr "选择查看实用的普通组"
-
-#: plugins/admin/groups/class_divListGroup.inc:93
-#, fuzzy
-msgid "functional groups"
-msgstr "显示实用组"
-
-#: plugins/admin/groups/class_divListGroup.inc:101
-#: plugins/personal/posix/posix_groups.tpl:59
-msgid "User name of which groups are shown"
-msgstr "显示属于该组的用户名"
-
-#: 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/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "显示主要组"
 
-#: plugins/admin/groups/class_divListGroup.inc:244
-#: plugins/admin/users/class_divListUsers.inc:278
-#: plugins/admin/users/class_divListUsers.inc:290
-#, fuzzy
-msgid "Not allowed"
-msgstr "不允许修改口令"
+#: plugins/admin/groups/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "显示 samba 用户组"
 
-#: plugins/admin/groups/class_divListGroup.inc:303
+#: plugins/admin/groups/group-filter.tpl:13
 #, fuzzy
-msgid "Number of listed groups"
-msgstr "组名称"
+msgid "Show mail groups"
+msgstr "显示 samba 用户组"
 
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #, fuzzy
@@ -3582,57 +3409,57 @@ msgstr "! 未知 id"
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:971
+#: plugins/admin/groups/class_groupGeneric.inc:969
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "无法创建文件 '%s'。"
 
-#: plugins/admin/groups/class_groupGeneric.inc:976
+#: plugins/admin/groups/class_groupGeneric.inc:974
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "无法创建文件 '%s'。"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1080
+#: plugins/admin/groups/class_groupGeneric.inc:1078
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1179
+#: plugins/admin/groups/class_groupGeneric.inc:1182
+#: plugins/admin/groups/class_groupGeneric.inc:1261
 #: 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:1251
+#: plugins/admin/groups/class_groupGeneric.inc:1249
 #, fuzzy
 msgid "Generic group settings"
 msgstr "组设置"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1263
 #, fuzzy
 msgid "Samba group type"
 msgstr "Samba 组"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1264
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Samba 主目录"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1266
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "成员属于电话应答组"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1267
 #, fuzzy
 msgid "Nagios group"
 msgstr "Nagios 账号"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1269
 #, fuzzy
 msgid "Group member"
 msgstr "组成员"
@@ -3641,188 +3468,71 @@ msgstr "组成员"
 msgid "Group settings"
 msgstr "组设置"
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
-msgid "Group administration"
-msgstr "组管理"
-
-#: plugins/admin/groups/class_groupManagement.inc:27
-msgid "Manage POSIX groups"
-msgstr ""
-
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-#, fuzzy
-msgid "group"
-msgstr "组"
-
-#: 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 ""
-"这包含该用户所有账号数据,系统访问规则,imap 设置等等。请再次检查您是否要这么"
-"做,因为 GOsa 没有办法将您的数据找回。"
-
-#: plugins/admin/users/main.inc:51 plugins/admin/users/main.inc:57
-msgid "User administration"
-msgstr "用户管理"
-
-#: 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 "用户列表"
-
-#: 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 "模板"
-
-#: plugins/admin/users/class_divListUsers.inc:85
-#, fuzzy
-msgid "templates"
-msgstr "模板"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-#, fuzzy
-msgid "GOsa object"
-msgstr "对象"
-
-#: plugins/admin/users/class_divListUsers.inc:86
-#, fuzzy
-msgid "functional users"
-msgstr "显示用户"
-
-#: plugins/admin/users/class_divListUsers.inc:87
-#, fuzzy
-msgid "POSIX users"
-msgstr "Posix 设置"
+#: plugins/admin/groups/group-list.xml:11
+msgid "List of groups"
+msgstr "组列表"
 
-#: plugins/admin/users/class_divListUsers.inc:88
+#: plugins/admin/groups/group-list.xml:138
 #, fuzzy
-msgid "mail users"
-msgstr "域用户"
+msgid "Edit group"
+msgstr "主要用户组"
 
-#: plugins/admin/users/class_divListUsers.inc:89
+#: plugins/admin/groups/group-list.xml:151
 #, fuzzy
-msgid "samba users"
-msgstr "域用户"
+msgid "Remove group"
+msgstr "服务器"
 
-#: plugins/admin/users/class_divListUsers.inc:90
-#, fuzzy
-msgid "proxy users"
-msgstr "显示代理用户"
+#: plugins/admin/groups/class_groupManagement.inc:26
+msgid "Group administration"
+msgstr "组管理"
 
-#: plugins/admin/users/class_divListUsers.inc:93
-#, fuzzy
-msgid "phone users"
-msgstr "显示代理用户"
+#: plugins/admin/groups/class_groupManagement.inc:155
+msgid "Posix"
+msgstr "Posix"
 
-#: plugins/admin/users/class_divListUsers.inc:145
-#: plugins/admin/users/user-list.xml:121 plugins/admin/users/user-list.xml:163
+#: plugins/admin/groups/class_groupManagement.inc:156
 #, fuzzy
-msgid "Apply template"
-msgstr "模板"
-
-#: 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 "编辑通用属性"
-
-#: plugins/admin/users/class_divListUsers.inc:207
-msgid "Edit UNIX properties"
-msgstr "编辑 UNIX 属性"
-
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
-msgid "Edit environment properties"
-msgstr "编辑环境属性"
+msgid "Edit posix properties"
+msgstr "编辑电话属性"
 
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:746
 msgid "Edit mail properties"
 msgstr "编辑邮件属性"
 
-#: plugins/admin/users/class_divListUsers.inc:213
-#: plugins/admin/users/class_userManagement.inc:1095
-msgid "Edit phone properties"
-msgstr "编辑电话属性"
-
-#: 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 "传真"
-
-#: plugins/admin/users/class_divListUsers.inc:215
-msgid "Edit fax properies"
-msgstr "编辑传真属性"
-
-#: plugins/admin/users/class_divListUsers.inc:217
-#: plugins/admin/users/class_userManagement.inc:1079
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:750
 msgid "Edit samba properties"
 msgstr "编辑 samba 属性"
 
-#: plugins/admin/users/class_divListUsers.inc:218
-#: plugins/admin/users/class_userManagement.inc:1082
-msgid "Netatalk"
-msgstr "Netatalk"
-
-#: plugins/admin/users/class_divListUsers.inc:219
-#: plugins/admin/users/class_userManagement.inc:1083
-msgid "Edit netatalk properties"
-msgstr "编辑 netatalk 属性"
-
-#: plugins/admin/users/class_divListUsers.inc:220
-msgid "Create user from template"
-msgstr "从模板创建用户"
-
-#: plugins/admin/users/class_divListUsers.inc:221
-msgid "Create user with this template"
-msgstr "创建使用该模板的用户"
-
-#: 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 "活动"
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:766
+msgid "Edit phone properties"
+msgstr "编辑电话属性"
 
-#: plugins/admin/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
+#: plugins/admin/groups/class_groupManagement.inc:187
 #, fuzzy
-msgid "user"
-msgstr "用户"
+msgid "Menu"
+msgstr "打印机"
 
-#: plugins/admin/users/class_divListUsers.inc:274
-msgid "password"
-msgstr "口令"
+#: plugins/admin/groups/class_groupManagement.inc:188
+#, fuzzy
+msgid "Edit start menu properties"
+msgstr "编辑 samba 属性"
 
-#: plugins/admin/users/class_divListUsers.inc:287
-msgid "Delete user"
-msgstr "删除用户"
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:758
+msgid "Edit environment properties"
+msgstr "编辑环境属性"
 
-#: plugins/admin/users/class_divListUsers.inc:376
-#, fuzzy
-msgid "Number of listed users"
-msgstr "部门名称"
+#: 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 ""
+"这包含该用户所有账号数据,系统访问规则,imap 设置等等。请再次检查您是否要这么"
+"做,因为 GOsa 没有办法将您的数据找回。"
 
 #: plugins/admin/users/password.tpl:4
 msgid ""
@@ -3867,6 +3577,13 @@ msgstr ""
 "可以使用模板来辅助新用户的创建。很多数据记录可以被自动填充。选择“无”来跳过模"
 "板选择。"
 
+#: 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 "模板"
+
 #: plugins/admin/users/template.tpl:23 plugins/personal/generic/generic.tpl:49
 #: plugins/personal/generic/paste_generic.tpl:7
 msgid "Last name"
@@ -3877,95 +3594,115 @@ msgstr "姓"
 msgid "First name"
 msgstr "名"
 
-#: plugins/admin/users/class_userManagement.inc:27
+#: plugins/admin/users/class_userManagement.inc:26
 #, fuzzy
 msgid "Manage users"
 msgstr "域用户"
 
-#: plugins/admin/users/class_userManagement.inc:325
-#: plugins/admin/users/class_userManagement.inc:388
+#: plugins/admin/users/class_userManagement.inc:277
 #, fuzzy
 msgid "You have no permission to change this users password!"
 msgstr "您无权修改您的口令。"
 
-#: plugins/admin/users/class_userManagement.inc:555
-#, fuzzy, php-format
-msgid "You have no permission to modify object '%s'!"
-msgstr "您无权删除这个黑名单。"
-
-#: plugins/admin/users/class_userManagement.inc:559
-#, fuzzy
-msgid "You have no permission to use this template!"
-msgstr "您无权删除这个黑名单。"
+#: 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 "名"
 
-#: plugins/admin/users/class_userManagement.inc:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:649
 #, fuzzy
 msgid "Account locking"
 msgstr "账户"
 
-#: plugins/admin/users/class_userManagement.inc:662
-#, fuzzy
-msgid "You have no permission to change the lock status for this user!"
-msgstr "您无权修改您的口令。"
-
-#: plugins/admin/users/class_userManagement.inc:681
+#: plugins/admin/users/class_userManagement.inc:650
 #, php-format
 msgid ""
-"Password method '%s' does not support locking. Account has not been locked!"
+"Password method '%s' does not support locking. Account (%s) has not been "
+"locked!"
 msgstr ""
 
-#: 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 "名"
-
-#: plugins/admin/users/class_userManagement.inc:1050
+#: plugins/admin/users/class_userManagement.inc:723
 #, fuzzy
 msgid "Unlock account"
 msgstr "我的账号"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:725
 #, fuzzy
 msgid "Lock account"
 msgstr "我的账号"
 
-#: 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
+#: plugins/admin/users/class_userManagement.inc:738
+msgid "Edit generic properties"
+msgstr "编辑通用属性"
+
+#: 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
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:1071
+#: plugins/admin/users/class_userManagement.inc:742
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "编辑 UNIX 属性"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:753
+msgid "Netatalk"
+msgstr "Netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:754
+msgid "Edit netatalk properties"
+msgstr "编辑 netatalk 属性"
+
+#: plugins/admin/users/class_userManagement.inc:762
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "编辑 UNIX 属性"
 
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "用户列表"
+
 #: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1608
+msgid "Surname"
+msgstr "姓"
+
+#: plugins/admin/users/user-list.xml:140
 #, fuzzy
-msgid "Name / Department"
-msgstr "部门名称"
+msgid "Lock users"
+msgstr "用户列表"
+
+#: plugins/admin/users/user-list.xml:148
+#, fuzzy
+msgid "Unlock users"
+msgstr "域用户"
+
+#: plugins/admin/users/user-list.xml:167
+#, fuzzy
+msgid "Apply template"
+msgstr "模板"
 
-#: plugins/admin/users/user-list.xml:175
+#: plugins/admin/users/user-list.xml:199
+#, fuzzy
+msgid "New user from template"
+msgstr "从模板创建用户"
+
+#: plugins/admin/users/user-list.xml:213
 msgid "Edit user"
 msgstr "编辑用户"
 
-#: plugins/admin/users/user-list.xml:184
+#: plugins/admin/users/user-list.xml:222
 msgid "%{filter:lockLabel(userPassword)}"
 msgstr ""
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 #, fuzzy
 msgid "Remove user"
 msgstr "删除图片"
@@ -3980,17 +3717,18 @@ msgid "Show functional users"
 msgstr "显示用户"
 
 #: plugins/admin/users/user-filter.tpl:13
-msgid "Show mail users"
-msgstr "显示邮件用户"
-
-#: plugins/admin/users/user-filter.tpl:14
 #, fuzzy
 msgid "Show POSIX users"
 msgstr "Posix 设置"
 
+#: plugins/admin/users/user-filter.tpl:14
+#, fuzzy
+msgid "Show Mail users"
+msgstr "显示邮件用户"
+
 #: plugins/admin/users/user-filter.tpl:15
 #, fuzzy
-msgid "Show samba users"
+msgid "Show Samba users"
 msgstr "显示邮件用户"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -4009,10 +3747,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr "文件可用。"
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -4022,7 +3756,7 @@ msgstr ""
 "在这个子树中包含了所有账号,系统等等。请再次检查您是否要这么做,因为 GOsa 没"
 "有办法将您的数据找回。"
 
-#: plugins/admin/departments/remove.tpl:10 plugins/admin/acl/remove.tpl:10
+#: plugins/admin/departments/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 "
@@ -4031,110 +3765,51 @@ msgstr ""
 "最好在执行这个操作之前,保存当前 LDAP 树中的内容到一个文件。所以,如果您已经"
 "这么做了,按“删除”继续或者按“取消”退出。"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:386
-#, fuzzy
-msgid "Cannot find an unused tag for this administrative unit!"
-msgstr "致命错误:无法找到一个未使用的标志来标记管理单元!"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:457
-#, php-format
-msgid "Tagging '%s'."
-msgstr "标记 '%s'。"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:538
-#, php-format
-msgid "Moving '%s' to '%s'"
-msgstr "移动 '%s' 到 '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:579
-#, php-format
-msgid "FAILED to copy %s, aborting operation"
-msgstr "拷贝 %s 失败,退出操作"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:610
-#: plugins/admin/departments/class_departmentGeneric.inc:615
-#: plugins/admin/departments/class_departmentManagement.inc:26
-msgid "Departments"
-msgstr "部门"
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "部门列表"
 
-#: plugins/admin/departments/class_departmentGeneric.inc:618
-#: plugins/admin/departments/class_divListDepartment.inc:65
-msgid "Department name"
-msgstr "部门名称"
+#: 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 "于域"
 
-#: 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 "分类"
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "域管理员"
 
-#: 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 "州/省"
+#: 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 "国家"
 
-#: 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"
+#: 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
+#, fuzzy
+msgid "Locality"
 msgstr "位置"
 
-#: 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 "住址"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr "电话"
-
-#: 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 "管理设置"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "对象 '%s' 已经做标记"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "添加标识(%s)到对象 '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "从对象 '%s' 删除标记"
+#: 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 "组织/公司"
 
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
@@ -4165,6 +3840,21 @@ msgstr "部门描述文件"
 msgid "Choose subtree to place department in"
 msgstr "选择放置部门的子树"
 
+#: 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 "管理设置"
+
 #: plugins/admin/departments/locality.tpl:52
 #: plugins/admin/departments/generic.tpl:116
 #: plugins/admin/departments/domain.tpl:52
@@ -4187,11 +3877,41 @@ msgstr "要创建子树的名称"
 msgid "Descriptive text for   department"
 msgstr "部门描述文件"
 
+#: 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 "分类"
+
 #: plugins/admin/departments/generic.tpl:30
 #: plugins/admin/departments/organization.tpl:30
 msgid "Category for this subtree"
 msgstr "这个子树的分类"
 
+#: 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 "位置"
+
+#: 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 "州/省"
+
 #: plugins/admin/departments/generic.tpl:68
 #: plugins/admin/departments/organization.tpl:68
 msgid "State where this subtree is located"
@@ -4202,6 +3922,16 @@ msgstr "这个子树位于的状态"
 msgid "Location of this subtree"
 msgstr "这个子树的位置"
 
+#: 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 "住址"
+
 #: plugins/admin/departments/generic.tpl:84
 #: plugins/admin/departments/organization.tpl:84
 msgid "Postal address of this subtree"
@@ -4212,6 +3942,20 @@ msgstr "这个子树的地址"
 msgid "Base telephone number of this subtree"
 msgstr "这个子树的电话号码"
 
+#: 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 "传真"
+
 #: plugins/admin/departments/generic.tpl:99
 #: plugins/admin/departments/organization.tpl:99
 msgid "Base facsimile telephone number of this subtree"
@@ -4219,77 +3963,38 @@ msgstr "这个子树的传真号码"
 
 #: plugins/admin/departments/class_domain.inc:77
 #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:568
+#: plugins/admin/departments/class_departmentManagement.inc:187
 #: plugins/admin/departments/class_dcObject.inc:77
 #: plugins/admin/departments/class_dcObject.inc:78
 #, fuzzy
 msgid "Domain Component"
 msgstr "域管理员"
 
-#: plugins/admin/departments/class_divListDepartment.inc:47
-#: plugins/admin/departments/class_divListDepartment.inc:48
-msgid "List of departments"
-msgstr "部门列表"
-
-#: plugins/admin/departments/class_divListDepartment.inc:73
-#, fuzzy
-msgid "Regular expression for matching department names"
-msgstr "匹配附件名称的正则表达式"
+#: plugins/admin/departments/class_departmentManagement.inc:25
+#: plugins/admin/departments/class_department.inc:610
+#: plugins/admin/departments/class_department.inc:615
+msgid "Departments"
+msgstr "部门"
 
-#: plugins/admin/departments/class_departmentManagement.inc:27
+#: plugins/admin/departments/class_departmentManagement.inc:26
 #, fuzzy
 msgid "Manage Departments"
 msgstr "部门"
 
-#: 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 ""
-
-#: plugins/admin/departments/class_departmentManagement.inc:336
+#: plugins/admin/departments/class_departmentManagement.inc:126
 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 ""
 
-#: plugins/admin/departments/class_departmentManagement.inc:556
-#, fuzzy
-msgid "Domain"
-msgstr "于域"
-
-#: plugins/admin/departments/class_departmentManagement.inc:580
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "国家"
-
-#: plugins/admin/departments/class_departmentManagement.inc:592
-#: plugins/admin/departments/class_localityGeneric.inc:78
-#: plugins/admin/departments/class_localityGeneric.inc:79
-#, fuzzy
-msgid "Locality"
-msgstr "位置"
-
-#: 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 "组织/公司"
-
 #: plugins/admin/departments/class_organizationGeneric.inc:118
 #, fuzzy
 msgid "Organization name"
 msgstr "组织/公司"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Postal address"
 msgstr "地址"
 
@@ -4313,15 +4018,54 @@ msgstr "域管理员"
 msgid "Name of domain to create"
 msgstr "要创建子树的名称"
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr "部门管理"
-
 #: plugins/admin/departments/country.tpl:14
 #, fuzzy
 msgid "Name of country to create"
 msgstr "要创建子树的名称"
 
+#: plugins/admin/departments/class_department.inc:386
+#, fuzzy
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr "致命错误:无法找到一个未使用的标志来标记管理单元!"
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr "标记 '%s'。"
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr "移动 '%s' 到 '%s'"
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr "拷贝 %s 失败,退出操作"
+
+#: plugins/admin/departments/class_department.inc:618
+msgid "Department name"
+msgstr "部门名称"
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr "电话"
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr "对象 '%s' 已经做标记"
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr "添加标识(%s)到对象 '%s'"
+
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr "从对象 '%s' 删除标记"
+
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr "处理请求的操作"
@@ -4357,64 +4101,22 @@ msgstr ""
 msgid "GOsa can NOT fix this for you, yet."
 msgstr ""
 
-#: 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 ""
-
-#: plugins/admin/acl/remove.tpl:6
-#, fuzzy
-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 ""
-"这包含所有系统和设置信息。请再次检查您是否要这么做,因为 GOsa 没有办法将您的"
-"数据找回。"
-
-#: plugins/admin/acl/class_aclManagement.inc:290
-#, fuzzy
-msgid "ACL role"
-msgstr "MAC 地址"
-
-#: plugins/admin/acl/class_divListACL.inc:51
-#: plugins/admin/acl/class_divListACL.inc:52
-#, fuzzy
-msgid "List of acls"
-msgstr "宏列表"
-
-#: plugins/admin/acl/class_divListACL.inc:73
-msgid "Summary"
-msgstr "总结"
-
-#: plugins/admin/acl/class_divListACL.inc:84
-#, fuzzy
-msgid "Display acls matching"
-msgstr "显示匹配的宏"
-
-#: 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 "角色"
-
-#: plugins/admin/acl/class_divListACL.inc:165
-#, fuzzy
-msgid "Edit acl role"
-msgstr "编辑宏"
+#: 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 ""
 
-#: plugins/admin/acl/class_divListACL.inc:185
+#: plugins/admin/acl/class_aclManagement.inc:25
+#: plugins/admin/acl/acl-list.xml:15
 #, fuzzy
-msgid "Edit acl"
-msgstr "编辑宏"
+msgid "Acl"
+msgstr "全部"
 
-#: plugins/admin/acl/class_divListACL.inc:192
+#: plugins/admin/acl/class_aclManagement.inc:154
 #, fuzzy
-msgid "Delete acl"
-msgstr "删除宏"
+msgid "ACL Assignment"
+msgstr "管理"
 
 #: plugins/admin/acl/tabs_acl_role.inc:28
 #, fuzzy
@@ -4422,7 +4124,7 @@ msgid "ACL Templates"
 msgstr "模板"
 
 #: plugins/admin/acl/class_aclRole.inc:26
-#: plugins/admin/acl/class_aclRole.inc:743
+#: plugins/admin/acl/class_aclRole.inc:745
 #, fuzzy
 msgid "Access control roles"
 msgstr "访问选项"
@@ -4432,54 +4134,72 @@ msgstr "访问选项"
 msgid "Edit AC roles"
 msgstr "MAC 地址"
 
-#: plugins/admin/acl/class_aclRole.inc:131
+#: plugins/admin/acl/class_aclRole.inc:132
 #, fuzzy
 msgid "Reset ACL"
 msgstr "删除"
 
-#: plugins/admin/acl/class_aclRole.inc:438
+#: plugins/admin/acl/class_aclRole.inc:440
 msgid "No ACL settings for this category"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:440
+#: plugins/admin/acl/class_aclRole.inc:442
 #, fuzzy, php-format
 msgid "ACL for these objects: %s"
 msgstr "创建新 FAI 对象"
 
-#: plugins/admin/acl/class_aclRole.inc:446
+#: plugins/admin/acl/class_aclRole.inc:448
 #, fuzzy
 msgid "Edit category ACL"
 msgstr "编辑分类"
 
-#: plugins/admin/acl/class_aclRole.inc:450
+#: plugins/admin/acl/class_aclRole.inc:452
 #, fuzzy
 msgid "Reset category ACL"
 msgstr "分类"
 
-#: plugins/admin/acl/class_aclRole.inc:470
+#: plugins/admin/acl/class_aclRole.inc:472
 #, php-format
 msgid "Edit ACL for '%s', scope is '%s'"
 msgstr ""
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, fuzzy
 msgid "Object in use"
 msgstr "对象名称"
 
-#: plugins/admin/acl/class_aclRole.inc:666
+#: plugins/admin/acl/class_aclRole.inc:668
 #, fuzzy, php-format
 msgid "This role cannot be removed while it is in use by these objects:"
 msgstr "这个共享不能被删除,因为仍然被 %d 个用户使用:"
 
-#: plugins/admin/acl/class_aclRole.inc:753
+#: 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 "角色"
+
+#: plugins/admin/acl/class_aclRole.inc:755
 #, fuzzy
 msgid "Permissions"
 msgstr "允许"
 
-#: plugins/admin/acl/main.inc:52 plugins/admin/acl/main.inc:54
+#: plugins/admin/acl/acl-list.xml:11
 #, fuzzy
-msgid "ACL management"
-msgstr "管理"
+msgid "List of acls"
+msgstr "宏列表"
+
+#: plugins/admin/acl/acl-filter.tpl:11
+#, fuzzy
+msgid "Show access control lists"
+msgstr "访问选项"
+
+#: plugins/admin/acl/acl-filter.tpl:12
+#, fuzzy
+msgid "Show roles"
+msgstr "显示电话"
 
 #: plugins/addons/bugsubmitter/class_bugsubmitter.inc:25
 msgid "Bug submitter"
@@ -4496,278 +4216,274 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "应用程序设置"
 
-#: plugins/personal/generic/class_user.inc:258
+#: plugins/personal/generic/class_user.inc:264
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "female"
 msgstr "女"
 
-#: plugins/personal/generic/class_user.inc:283
+#: plugins/personal/generic/class_user.inc:289
 msgid "male"
 msgstr "男"
 
-#: plugins/personal/generic/class_user.inc:381
+#: plugins/personal/generic/class_user.inc:387
 msgid "Cannot upload file!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:476
+#: plugins/personal/generic/class_user.inc:482
 #, fuzzy
 msgid "Serial number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:521
+#: plugins/personal/generic/class_user.inc:527
 msgid ""
 "(Some types of certificates are currently not supported and may be displayed "
 "as 'invalid'.)"
 msgstr "(目前有的种类的证书不支持,可能显示为“无效”)"
 
-#: plugins/personal/generic/class_user.inc:531
+#: plugins/personal/generic/class_user.inc:537
 #, php-format
 msgid "Certificate is valid from %s to %s and is currently %s."
 msgstr "证书从 %s 到 %s 是有效的,当前为 %s。"
 
-#: plugins/personal/generic/class_user.inc:534
+#: plugins/personal/generic/class_user.inc:540
 msgid "valid"
 msgstr "有效"
 
-#: plugins/personal/generic/class_user.inc:535
+#: plugins/personal/generic/class_user.inc:541
 msgid "invalid"
 msgstr "无效"
 
-#: plugins/personal/generic/class_user.inc:540
+#: plugins/personal/generic/class_user.inc:546
 msgid "No certificate installed"
 msgstr "未安装证书"
 
-#: plugins/personal/generic/class_user.inc:566
+#: plugins/personal/generic/class_user.inc:572
 #, fuzzy
 msgid "The selected password method is no longer available."
 msgstr "此应用程序不再可用。"
 
-#: plugins/personal/generic/class_user.inc:1144
+#: plugins/personal/generic/class_user.inc:1151
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1158
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1176
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1247
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "此应用程序不再可用。"
 
-#: plugins/personal/generic/class_user.inc:1300
-#: plugins/personal/generic/class_user.inc:1632
-#: plugins/personal/generic/class_user.inc:1715
+#: plugins/personal/generic/class_user.inc:1307
+#: plugins/personal/generic/class_user.inc:1639
+#: plugins/personal/generic/class_user.inc:1722
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "个人主页"
 
-#: plugins/personal/generic/class_user.inc:1311
-#: plugins/personal/generic/class_user.inc:1724
+#: plugins/personal/generic/class_user.inc:1318
+#: plugins/personal/generic/class_user.inc:1731
 #: plugins/personal/generic/generic.tpl:355
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "手机"
 
-#: plugins/personal/generic/class_user.inc:1314
-#: plugins/personal/generic/class_user.inc:1727
+#: plugins/personal/generic/class_user.inc:1321
+#: plugins/personal/generic/class_user.inc:1734
 #: plugins/personal/generic/generic.tpl:363
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "呼机"
 
-#: plugins/personal/generic/class_user.inc:1319
-#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1614
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "生日"
 
-#: plugins/personal/generic/class_user.inc:1429
+#: plugins/personal/generic/class_user.inc:1436
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "无法打开指定证书!"
 
-#: plugins/personal/generic/class_user.inc:1575
+#: plugins/personal/generic/class_user.inc:1582
 #: plugins/personal/generic/generic.tpl:479
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "单元"
 
-#: plugins/personal/generic/class_user.inc:1576
+#: plugins/personal/generic/class_user.inc:1583
 #: plugins/personal/generic/generic.tpl:504
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "家庭角色"
 
-#: plugins/personal/generic/class_user.inc:1577
+#: plugins/personal/generic/class_user.inc:1584
 #: plugins/personal/generic/generic.tpl:421
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "行业"
 
-#: plugins/personal/generic/class_user.inc:1578
+#: plugins/personal/generic/class_user.inc:1585
 #: plugins/personal/generic/generic.tpl:548
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "最后传递"
 
-#: plugins/personal/generic/class_user.inc:1579
+#: plugins/personal/generic/class_user.inc:1586
 #: plugins/personal/generic/generic.tpl:470
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1580
+#: plugins/personal/generic/class_user.inc:1587
 #: plugins/personal/generic/generic.tpl:429
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "单元描述"
 
-#: plugins/personal/generic/class_user.inc:1581
+#: plugins/personal/generic/class_user.inc:1588
 #: plugins/personal/generic/generic.tpl:438
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1582
+#: plugins/personal/generic/class_user.inc:1589
 #: plugins/personal/generic/generic.tpl:447
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "单位职称"
 
-#: plugins/personal/generic/class_user.inc:1583
+#: plugins/personal/generic/class_user.inc:1590
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "证书系列号"
 
-#: plugins/personal/generic/class_user.inc:1584
+#: plugins/personal/generic/class_user.inc:1591
 #: plugins/personal/generic/generic.tpl:557
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "公开"
 
-#: plugins/personal/generic/class_user.inc:1585
+#: plugins/personal/generic/class_user.inc:1592
 #: plugins/personal/generic/generic.tpl:488
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "街道"
 
-#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/class_user.inc:1594
 #: plugins/personal/generic/generic.tpl:496
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "邮编"
 
-#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/class_user.inc:1598
 #, fuzzy
 msgid "Generic user settings"
 msgstr "通用队列设置"
 
-#: plugins/personal/generic/class_user.inc:1595
-#: plugins/personal/posix/class_posixAccount.inc:1570
+#: plugins/personal/generic/class_user.inc:1602
+#: plugins/personal/posix/class_posixAccount.inc:1571
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "我的账号"
 
-#: plugins/personal/generic/class_user.inc:1601
-msgid "Surname"
-msgstr "姓"
-
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1610
 #, fuzzy
 msgid "User identification"
 msgstr "用户信息"
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1611
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "个人称谓"
 
-#: plugins/personal/generic/class_user.inc:1605
+#: plugins/personal/generic/class_user.inc:1612
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "学位头衔"
 
-#: plugins/personal/generic/class_user.inc:1608
-#, fuzzy
-msgid "Gender"
-msgstr "发送者"
+#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
+msgstr "性别"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1616
 #, fuzzy
 msgid "Preferred language"
 msgstr "首选语种"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "用户图片"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1623
 #, fuzzy
 msgid "Department number"
 msgstr "部门名称"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1624
 #, fuzzy
 msgid "Employee number"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:1618
+#: plugins/personal/generic/class_user.inc:1625
 #: plugins/personal/generic/generic.tpl:319
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:1620
+#: plugins/personal/generic/class_user.inc:1627
 #, fuzzy
 msgid "Room number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Telefon number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1629
 #, fuzzy
 msgid "Pager number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1630
 #, fuzzy
 msgid "Mobile number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1631
 #, fuzzy
 msgid "Fax number"
 msgstr "系列号"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1637
 msgid "Home postal address"
 msgstr "住宅地址"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1638
 #, fuzzy
 msgid "Home phone number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1640
 #, fuzzy
 msgid "User password method"
 msgstr "口令存储"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1641
 #, fuzzy
 msgid "User certificates"
 msgstr "编辑证书"
@@ -4796,10 +4512,6 @@ msgstr "更换图片"
 msgid "Template name"
 msgstr "模板名称"
 
-#: plugins/personal/generic/generic.tpl:138
-msgid "Sex"
-msgstr "性别"
-
 #: plugins/personal/generic/generic.tpl:151
 #: plugins/personal/generic/multiple_generic.tpl:33
 msgid "Preferred langage"
@@ -4925,6 +4637,12 @@ msgstr "过期"
 msgid "grace time active"
 msgstr "时间限制激活"
 
+#: plugins/personal/posix/class_posixAccount.inc:173
+#: plugins/personal/posix/class_posixAccount.inc:175
+#: plugins/personal/posix/class_posixAccount.inc:177
+msgid "active"
+msgstr "活动"
+
 #: plugins/personal/posix/class_posixAccount.inc:173
 #, fuzzy
 msgid "password not changeable"
@@ -4935,143 +4653,139 @@ msgstr "活动,口令不可更改"
 msgid "password expired"
 msgstr "活动,口令过期"
 
-#: plugins/personal/posix/class_posixAccount.inc:233
-msgid "unconfigured"
-msgstr "未配置"
-
-#: plugins/personal/posix/class_posixAccount.inc:244
+#: plugins/personal/posix/class_posixAccount.inc:248
 msgid "automatic"
 msgstr "自动"
 
-#: plugins/personal/posix/class_posixAccount.inc:510
+#: plugins/personal/posix/class_posixAccount.inc:515
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr "自上次更改以来 %s 天,不能修改口令"
 
-#: plugins/personal/posix/class_posixAccount.inc:514
+#: plugins/personal/posix/class_posixAccount.inc:519
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "口令必须在 %s 天之后更改"
 
-#: plugins/personal/posix/class_posixAccount.inc:518
+#: plugins/personal/posix/class_posixAccount.inc:523
 #, fuzzy, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr "口令过期 %s 天后,禁用账号"
 
-#: plugins/personal/posix/class_posixAccount.inc:522
+#: plugins/personal/posix/class_posixAccount.inc:527
 #, fuzzy, php-format
 msgid "Warn user %s days before password expiry"
 msgstr "在口令过期 %s 天之前警告用户"
 
-#: plugins/personal/posix/class_posixAccount.inc:861
+#: plugins/personal/posix/class_posixAccount.inc:864
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:919
-#: plugins/personal/posix/class_posixAccount.inc:1237
+#: plugins/personal/posix/class_posixAccount.inc:922
+#: plugins/personal/posix/class_posixAccount.inc:1240
 msgid "Group of user"
 msgstr "用户组"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:1017
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1095
 #: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1173
+#: plugins/personal/posix/class_posixAccount.inc:1101
 #: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1179
+#: plugins/personal/posix/class_posixAccount.inc:1577
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "用户主目录"
 
-#: 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:1129
-#: plugins/personal/posix/class_posixAccount.inc:1182
+#: plugins/personal/posix/class_posixAccount.inc:1132
+#: plugins/personal/posix/class_posixAccount.inc:1185
 #, fuzzy
 msgid "shadowMin"
 msgstr "显示终端"
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1137
+#: plugins/personal/posix/class_posixAccount.inc:1190
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1142
+#: plugins/personal/posix/class_posixAccount.inc:1195
 #, fuzzy
 msgid "shadowWarning"
 msgstr "显示分区"
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1156
+#: plugins/personal/posix/class_posixAccount.inc:1209
 #, fuzzy
 msgid "shadowInactive"
 msgstr "显示打印机"
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1567
 #, fuzzy
 msgid "POSIX account"
 msgstr "GLPI 账号"
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1578
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1579
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "用户 ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1580
 #, fuzzy
 msgid "Group ID"
 msgstr "组"
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1582
 #, fuzzy
 msgid "Force password change on login"
 msgstr "不允许修改口令"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1583
 #, fuzzy
 msgid "Shadow min"
 msgstr "显示终端"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1584
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1585
 #, fuzzy
 msgid "Shadow warning"
 msgstr "显示分区"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1586
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "显示打印机"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1587
 #, fuzzy
 msgid "Shadow expire"
 msgstr "显示人员"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1588
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1589
 #, fuzzy
 msgid "System trust model"
 msgstr "信赖的系统"
@@ -5139,10 +4853,18 @@ msgstr "显示部门的组"
 msgid "Display groups matching"
 msgstr "显示匹配的组"
 
+#: plugins/personal/posix/posix_groups.tpl:48
+msgid "Regular expression for matching group names"
+msgstr "用于匹配组名的正则表达式"
+
 #: plugins/personal/posix/posix_groups.tpl:55
 msgid "Display groups of user"
 msgstr "显示用户组"
 
+#: plugins/personal/posix/posix_groups.tpl:59
+msgid "User name of which groups are shown"
+msgstr "显示属于该组的用户名"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Posix 设置"
@@ -5370,49 +5092,39 @@ msgstr "部门名称"
 
 #: setup/setup_config2.tpl:123
 #, fuzzy
-msgid "Logging options"
-msgstr "未知"
-
-#: setup/setup_config2.tpl:127
-#, fuzzy
-msgid "Syslog"
-msgstr "系统日志"
-
-#: setup/setup_config2.tpl:129 setup/class_setupStep_Checks.inc:120
-#, fuzzy
-msgid "MySQL"
-msgstr "LDAP 错误:"
+msgid "GOsa logging"
+msgstr "GOsa"
 
-#: setup/setup_config2.tpl:134
+#: setup/setup_config2.tpl:135
 msgid "Mail settings"
 msgstr "邮件选项"
 
-#: setup/setup_config2.tpl:138
+#: setup/setup_config2.tpl:139
 msgid "Mail method"
 msgstr "邮件方法"
 
-#: setup/setup_config2.tpl:154
+#: setup/setup_config2.tpl:155
 msgid "Account identification attribute"
 msgstr ""
 
-#: setup/setup_config2.tpl:168
+#: setup/setup_config2.tpl:169
 #, fuzzy
 msgid "Vacation templates"
 msgstr "工作站模板"
 
-#: setup/setup_config2.tpl:184
+#: setup/setup_config2.tpl:185
 msgid "Use Cyrus UNIX style"
 msgstr ""
 
-#: setup/setup_config2.tpl:194
+#: setup/setup_config2.tpl:195
 msgid "Snapshots / Undo"
 msgstr ""
 
-#: setup/setup_config2.tpl:203 setup/setup_config2.tpl:248
+#: setup/setup_config2.tpl:204 setup/setup_config2.tpl:249
 msgid "Enable snapshots"
 msgstr ""
 
-#: setup/setup_config2.tpl:209 setup/setup_config2.tpl:254
+#: setup/setup_config2.tpl:210 setup/setup_config2.tpl:255
 msgid "Snapshot base"
 msgstr ""
 
@@ -5731,6 +5443,11 @@ msgstr "Samba 设置"
 msgid "GOsa requires this module to handle unicode strings."
 msgstr ""
 
+#: setup/class_setupStep_Checks.inc:120
+#, fuzzy
+msgid "MySQL"
+msgstr "LDAP 错误:"
+
 #: setup/class_setupStep_Checks.inc:121
 #, fuzzy
 msgid ""
@@ -6084,14 +5801,14 @@ msgstr ""
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "Yes"
 msgstr "是"
 
 #: 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:137
+#: setup/class_setupStep_Config2.inc:136
 msgid "No"
 msgstr "否"
 
@@ -6970,12 +6687,219 @@ msgid "Automatic"
 msgstr "自动"
 
 #, fuzzy
-#~ msgid "Non common group"
+#~ msgid "Edit ogroup"
+#~ msgstr "组列表"
+
+#, fuzzy
+#~ msgid "List of ogroups"
+#~ msgstr "组列表"
+
+#, fuzzy
+#~ msgid "Use"
+#~ msgstr "用户"
+
+#, fuzzy
+#~ msgid "Filter entries with this syntax"
+#~ msgstr "用这个语法过滤条目"
+
+#, fuzzy
+#~ msgid "MySQL error"
+#~ msgstr "LDAP 错误:"
+
+#, fuzzy
+#~ msgid "Cannot add location to the database!"
+#~ msgstr "无法连接到数据库!"
+
+#~ msgid "Submit department"
+#~ msgstr "提交部门"
+
+#~ msgid "edit"
+#~ msgstr "编辑"
+
+#~ msgid "delete"
+#~ msgstr "删除"
+
+#, fuzzy
+#~ msgid "Number of listed object groups"
+#~ msgstr "对象组名称"
+
+#, fuzzy
+#~ msgid "Number of listed departments"
+#~ msgstr "部门名称"
+
+#~ msgid "Select to see groups that are primary groups of users"
+#~ msgstr "选择查看用户的主要组"
+
+#, fuzzy
+#~ msgid "primary groups"
+#~ msgstr "主要用户组"
+
+#, fuzzy
+#~ msgid "samba groups mappings"
+#~ msgstr "显示匹配的组"
+
+#, fuzzy
+#~ msgid "samba groups"
+#~ msgstr "Samba 组"
+
+#, fuzzy
+#~ msgid "application settings"
+#~ msgstr "应用程序"
+
+#, fuzzy
+#~ msgid "mail settings"
+#~ msgstr "邮件选项"
+
+#, fuzzy
+#~ msgid "mail groups"
 #~ msgstr "显示邮件组"
 
+#~ msgid "Select to see normal groups that have only functional aspects"
+#~ msgstr "选择查看实用的普通组"
+
 #, fuzzy
-#~ msgid "All"
-#~ msgstr "全部"
+#~ msgid "functional groups"
+#~ msgstr "显示实用组"
+
+#, fuzzy
+#~ msgid "Not allowed"
+#~ msgstr "不允许修改口令"
+
+#, fuzzy
+#~ msgid "Number of listed groups"
+#~ msgstr "组名称"
+
+#, fuzzy
+#~ msgid "group"
+#~ msgstr "组"
+
+#~ msgid "User administration"
+#~ msgstr "用户管理"
+
+#, fuzzy
+#~ msgid "templates"
+#~ msgstr "模板"
+
+#, fuzzy
+#~ msgid "GOsa object"
+#~ msgstr "对象"
+
+#, fuzzy
+#~ msgid "functional users"
+#~ msgstr "显示用户"
+
+#, fuzzy
+#~ msgid "POSIX users"
+#~ msgstr "Posix 设置"
+
+#, fuzzy
+#~ msgid "samba users"
+#~ msgstr "域用户"
+
+#, fuzzy
+#~ msgid "proxy users"
+#~ msgstr "显示代理用户"
+
+#, fuzzy
+#~ msgid "phone users"
+#~ msgstr "显示代理用户"
+
+#~ msgid "GOsa"
+#~ msgstr "GOsa"
+
+#~ msgid "Edit UNIX properties"
+#~ msgstr "编辑 UNIX 属性"
+
+#~ msgid "Edit fax properies"
+#~ msgstr "编辑传真属性"
+
+#~ msgid "Create user with this template"
+#~ msgstr "创建使用该模板的用户"
+
+#, fuzzy
+#~ msgid "user"
+#~ msgstr "用户"
+
+#~ msgid "password"
+#~ msgstr "口令"
+
+#~ msgid "Delete user"
+#~ msgstr "删除用户"
+
+#, fuzzy
+#~ msgid "Number of listed users"
+#~ msgstr "部门名称"
+
+#, fuzzy
+#~ msgid "You have no permission to modify object '%s'!"
+#~ msgstr "您无权删除这个黑名单。"
+
+#, fuzzy
+#~ msgid "You have no permission to use this template!"
+#~ msgstr "您无权删除这个黑名单。"
+
+#, fuzzy
+#~ msgid "You have no permission to change the lock status for this user!"
+#~ msgstr "您无权修改您的口令。"
+
+#, fuzzy
+#~ msgid "Name / Department"
+#~ msgstr "部门名称"
+
+#, fuzzy
+#~ msgid "Regular expression for matching department names"
+#~ msgstr "匹配附件名称的正则表达式"
+
+#~ msgid "Department management"
+#~ msgstr "部门管理"
+
+#, fuzzy
+#~ 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 ""
+#~ "这包含所有系统和设置信息。请再次检查您是否要这么做,因为 GOsa 没有办法将您"
+#~ "的数据找回。"
+
+#, fuzzy
+#~ msgid "ACL role"
+#~ msgstr "MAC 地址"
+
+#~ msgid "Summary"
+#~ msgstr "总结"
+
+#, fuzzy
+#~ msgid "Display acls matching"
+#~ msgstr "显示匹配的宏"
+
+#, fuzzy
+#~ msgid "Edit acl role"
+#~ msgstr "编辑宏"
+
+#, fuzzy
+#~ msgid "Edit acl"
+#~ msgstr "编辑宏"
+
+#, fuzzy
+#~ msgid "Delete acl"
+#~ msgstr "删除宏"
+
+#, fuzzy
+#~ msgid "Gender"
+#~ msgstr "发送者"
+
+#, fuzzy
+#~ msgid "Logging options"
+#~ msgstr "未知"
+
+#, fuzzy
+#~ msgid "Syslog"
+#~ msgstr "系统日志"
+
+#, fuzzy
+#~ msgid "Non common group"
+#~ msgstr "显示邮件组"
 
 #, fuzzy
 #~ msgid "Enable DNS extension"
@@ -7096,10 +7020,6 @@ msgstr "自动"
 #~ msgid "Hour"
 #~ msgstr "小时"
 
-#, fuzzy
-#~ msgid "Minute"
-#~ msgstr "打印机"
-
 #, fuzzy
 #~ msgid "Day"
 #~ msgstr "五月"
@@ -7604,15 +7524,9 @@ msgstr "自动"
 #~ msgid "Select to see users that have proxy settings"
 #~ msgstr "显示具有代理设置的用户"
 
-#~ msgid "Show primary groups"
-#~ msgstr "显示主要组"
-
 #~ msgid "Select to see groups that have samba groups mappings"
 #~ msgstr "选择查看配置了 samba 映射的用户组"
 
-#~ msgid "Show samba groups"
-#~ msgstr "显示 samba 用户组"
-
 #~ msgid "Select to see groups that have applications configured"
 #~ msgstr "选择查看配置了应用程序的组"
 
@@ -7668,9 +7582,6 @@ msgstr "自动"
 #~ msgid "Select to see phones"
 #~ msgstr "选择查看电话"
 
-#~ msgid "Show phones"
-#~ msgstr "显示电话"
-
 #, fuzzy
 #~ msgid "Cannot connect to logging server '%s'."
 #~ msgstr "无法连接到数据库!"
@@ -7999,10 +7910,6 @@ msgstr "自动"
 #~ msgid "Import"
 #~ msgstr "导入"
 
-#, fuzzy
-#~ msgid "Send message"
-#~ msgstr "挂起邮件"
-
 #, fuzzy
 #~ msgid "Notification send!"
 #~ msgstr "未安装证书"
@@ -8240,10 +8147,6 @@ msgstr "自动"
 #~ msgid "Reomve"
 #~ msgstr "删除"
 
-#, fuzzy
-#~ msgid "GOsa ping"
-#~ msgstr "GOsa"
-
 #, fuzzy
 #~ msgid "Say hello"
 #~ msgstr "Shell"
index 003a1562befafa101c81e479aa566aa89a75ac52..fc0c935ba8f7b80d4aeff47ba08f890d31787a12 100644 (file)
@@ -8,7 +8,7 @@
     <multiSelect>true</multiSelect>
     <template>ogroup-list.tpl</template>
     <module>ogroups</module>
-    <label>List of ogroups</label>
+    <label>List of object groups</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
       <name>edit</name>
       <type>entry</type>
       <image>images/lists/edit.png</image>
-      <label>Edit ogroup</label>
+      <label>Edit object group</label>
     </action>
 
     <action>
       <type>entry</type>
       <image>images/lists/trash.png</image>
       <acl>ogroups/ogroup[d]</acl>
-      <label>Remove ogroup</label>
+      <label>Remove object group</label>
     </action>
 
   </actiontriggers>