Code

Slight language update
authorcajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 27 Jan 2010 08:50:55 +0000 (08:50 +0000)
committercajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Wed, 27 Jan 2010 08:50:55 +0000 (08:50 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15350 594d385d-05f5-0310-b6e9-bd551577e9d8

14 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/groups/userSelect/user-list.xml
gosa-core/plugins/personal/posix/groupSelect/group-list.xml
gosa-core/plugins/personal/posix/trustSelect/trust-list.xml

index faeb17ea8c28687b2625d41b21377f771a614dbc..e009c95c22d5bdb867fa80c3c85c703a451ec9f9 100644 (file)
@@ -13,7 +13,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 17:26+0100\n"
+"POT-Creation-Date: 2010-01-27 15:02+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"
@@ -23,6 +23,60 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Basis"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr "Aktualisieren"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr "Übertragen"
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -35,6 +89,7 @@ msgstr "Information"
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr "Filter"
@@ -43,16 +98,16 @@ msgstr "Filter"
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
+#: include/functions.inc:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
 #: 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #: 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:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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
@@ -302,7 +357,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:248
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -324,6 +379,124 @@ msgstr "Passwort ändern"
 msgid "Click here to change your password"
 msgstr "Hier klicken, um Ihr Passwort zu ändern"
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Liste der Abteilungen"
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
+msgstr "Domänen-Komponente"
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organisation"
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Abteilung"
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Beschreibung"
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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"
+
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr "Ihre GOsa-Sitzung wurde geschlossen!"
@@ -427,22 +600,22 @@ 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/class_management.inc:446
-#: include/class_management.inc:910
+#: html/index.php:228 include/class_management.inc:447
+#: include/class_management.inc:583 include/class_management.inc:915
 #: 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/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 include/class_tabs.inc:56
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
 #: 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_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:159
@@ -451,18 +624,18 @@ msgstr "Fortsetzen"
 #: 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:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/admin/groups/class_groupGeneric.inc:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
 #: 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:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -503,7 +676,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:276
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -622,6 +795,18 @@ msgstr ""
 msgid "Logout"
 msgstr "Abmelden"
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+msgid "Filter"
+msgstr "Filter"
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -652,7 +837,7 @@ msgstr "Angemeldet:"
 msgid "GOsa main menu"
 msgstr "GOsa Hauptmenü"
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
@@ -668,9 +853,9 @@ 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:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
@@ -680,7 +865,7 @@ msgstr "Die GOsa-Konfigurationsdatei %s/%s ist nicht lesbar. Abgebrochen."
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
@@ -699,7 +884,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:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -720,10 +905,10 @@ msgstr ""
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -788,20 +973,20 @@ msgstr ""
 #: 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/functions.inc:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
 #: 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:1102
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/departments/class_department.inc:241
 #: plugins/admin/departments/class_department.inc:429
 #: plugins/admin/departments/class_department.inc:702
@@ -809,10 +994,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:635
 #: plugins/admin/acl/class_aclRole.inc:675
 #: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -950,43 +1135,52 @@ msgstr ""
 msgid "unconfigured"
 msgstr "unkonfiguriert"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 msgid "Filter error"
 msgstr "Filter Fehler"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 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_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:612
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: include/class_management.inc:352
-#: plugins/admin/users/class_userManagement.inc:570
-#: plugins/admin/users/class_userManagement.inc:574
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
 #: plugins/admin/acl/class_aclManagement.inc:98
 msgid "Permission error"
 msgstr "Berechtigungsfehler"
 
-#: include/class_management.inc:426 include/class_plugin.inc:1546
+#: include/class_management.inc:427 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_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+"Es wurde keine TAB-Definition für '%s' in der Konfigurationsdatei gefunden. "
+"Kann keine Plugin-Instanz erzeugen!"
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -1065,12 +1259,12 @@ msgid "Use ACL defined in role"
 msgstr "Verwende ACL aus Rollendefinition"
 
 #: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1608
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Benutzer"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
@@ -1078,27 +1272,18 @@ msgstr "Gruppen"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:394
 msgid "Up"
 msgstr "Auf"
 
 #: include/class_acl.inc:495 include/class_listing.inc:235
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "Ab"
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Bearbeiten"
-
 #: include/class_acl.inc:500 include/class_acl.inc:504
 #: include/class_acl.inc:1253 include/class_acl.inc:1254
 #: include/class_acl.inc:1259 include/class_tabs.inc:401
@@ -1109,8 +1294,8 @@ msgid "ACL"
 msgstr "Zugriffsregeln"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
+#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
 #: plugins/admin/acl/class_aclRole.inc:452
 #, php-format
 msgid "Delete"
@@ -1174,10 +1359,10 @@ 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: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/functions.inc:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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
@@ -1229,41 +1414,34 @@ msgstr "ACL-Rollen"
 msgid "Close"
 msgstr "Schliessen"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
 msgid "Go to root department"
 msgstr "Gehe zur Wurzel-Abteilung"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
+#: include/class_listing.inc:998
 msgid "Root"
 msgstr "Wurzel"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
 msgid "Go up one department"
 msgstr "Eine Abteilung nach oben"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
 msgid "Go to users department"
 msgstr "Gehe zur Abteilung des Benutzers"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
+#: include/class_listing.inc:1014
 msgid "Home"
 msgstr "Heimat"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
 msgid "Reload list"
 msgstr "Liste neu laden"
 
-#: 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"
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1280,34 +1458,7 @@ msgstr ""
 msgid "Choose a base"
 msgstr "Wählen Sie eine Basis"
 
-#: 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_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_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Basis"
-
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:299 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
@@ -1315,66 +1466,60 @@ msgstr "Basis"
 msgid "Select all"
 msgstr "Alle auswählen"
 
-#: include/class_listing.inc:499
+#: include/class_listing.inc:509
 msgid "created by"
 msgstr "Angelegt von"
 
-#: 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_listing.inc:1379 include/class_listing.inc:1429
 #: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr "Kopieren"
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_listing.inc:1385 include/class_listing.inc:1419
 #: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr "Ausschneiden"
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
+#: include/class_listing.inc:1393 include/class_listing.inc:1395
 #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Einfügen"
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1419 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Diesen Eintrag ausschneiden"
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1429 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Diesen Eintrag kopieren"
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
+#: include/class_listing.inc:1461 include/class_listing.inc:1463
 msgid "Restore snapshots"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1477
 msgid "Export list"
 msgstr "Liste exportieren"
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
 #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr "Abzug wiederherstellen"
 
-#: include/class_listing.inc:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1522 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr "Snapshot erstellen"
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1523 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr "Erstelle einen neuen Snapshot dieses Objekts"
 
-#: include/class_sortableListing.inc:132
+#: include/class_sortableListing.inc:194
 msgid "Edit this entry"
 msgstr "Diesen Eintrag bearbeiten"
 
-#: include/class_sortableListing.inc:133
+#: include/class_sortableListing.inc:199
 msgid "Delete this entry"
 msgstr "Diesen Eintrag entfernen"
 
@@ -1393,17 +1538,17 @@ msgstr ""
 "Schwerer Fehler: Kann Klasse '%s' nicht instanziieren - bitte führen Sie '%"
 "s' aus um das Problem zu beheben"
 
-#: include/functions.inc:447
+#: include/functions.inc:448
 #, 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:518
+#: include/functions.inc:519
 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:603
+#: include/functions.inc:604
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -1411,12 +1556,12 @@ msgstr ""
 "Der Benutzername / die UID ist nicht eindeutig für den LDAP-Baum. Bitte "
 "kontaktieren Sie Ihren Administrator."
 
-#: include/functions.inc:789 include/functions.inc:907
+#: include/functions.inc:790 include/functions.inc:908
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 "Fehler beim Setzen einer Sperre. Bitte kontaktieren Sie die Entwickler!"
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1425,12 +1570,12 @@ msgstr ""
 "Kann Sperrinformation für LDAP-Baum nicht erzeugen. Bitte kontaktieren Sie "
 "Ihren Administrator!"
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Der LDAP-Server meldete: %s"
 
-#: include/functions.inc:928
+#: include/functions.inc:929
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1438,12 +1583,12 @@ msgstr ""
 "Mehrere Sperren für das zu sperrende Objekt gefunden. Dies sollte nicht "
 "passieren - räume mehrere Referenzen auf."
 
-#: include/functions.inc:1232
+#: include/functions.inc:1233
 #, 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:1234
+#: include/functions.inc:1235
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1452,73 +1597,73 @@ msgstr ""
 "Verwende eine neue Größenbeschränkung von %s Einträgen und zeige diese "
 "Meldung bei Überschreitung wieder an"
 
-#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Konfigurieren"
 
-#: include/functions.inc:1251
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr "unvollständig"
 
-#: include/functions.inc:1641
+#: include/functions.inc:1642
 msgid "Continue anyway"
 msgstr "Trotzdem Fortsetzen"
 
-#: include/functions.inc:1643
+#: include/functions.inc:1644
 msgid "Edit anyway"
 msgstr "Trotzdem bearbeiten"
 
-#: include/functions.inc:1645
+#: include/functions.inc:1646
 #, 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:1885
+#: include/functions.inc:1886
 msgid "Entries per page"
 msgstr "Einträge pro Seite"
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Filter anwenden"
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2272
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa Entwicklerversion (Rev %s)"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2370
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "Die Datei '%s' konnte nicht entfernt werden."
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:2404 include/functions.inc:2424
 msgid "Cannot write to revision file!"
 msgstr "Kann nicht in Revisions-Datei schreiben!"
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' ist nicht verfügbar. Verwende die Standard-Basis!"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 msgid "LDAP warning"
 msgstr "LDAP-Warnung"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 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:2701
+#: include/functions.inc:2702
 msgid "Used to store account specific informations."
 msgstr "Verwendet, um kontenbezogene Informationen zu speichern."
 
-#: include/functions.inc:2708
+#: include/functions.inc:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1526,27 +1671,27 @@ msgstr ""
 "Verwenden, um die momentan bearbeiteten Einträge für andere zu sperren (um "
 "gleichzeitige Änderungen zu verhindern)."
 
-#: include/functions.inc:2753
+#: include/functions.inc:2754
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Die benötigte Objektklasse '%s' fehlt!"
 
-#: include/functions.inc:2756
+#: include/functions.inc:2757
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Die optionale Objektklasse '%s' fehlt!"
 
-#: include/functions.inc:2761
+#: include/functions.inc:2762
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr "Falsche·Version·der·benötigten·Objektklasse·'%s'·(!=%s)!"
 
-#: include/functions.inc:2764
+#: include/functions.inc:2765
 #, php-format
 msgid "Class(es) available"
 msgstr "Verfügbare Klasse(n)"
 
-#: include/functions.inc:2786
+#: include/functions.inc:2787
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1554,7 +1699,7 @@ msgstr ""
 "Sie haben die rfc2307bis-Option in der LDAP-Einrichtung aktiviert, aber Ihre "
 "Schema-Konfiguration unterstützt dies nicht."
 
-#: include/functions.inc:2787
+#: include/functions.inc:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1562,7 +1707,7 @@ msgstr ""
 "Um rfc2307bis-konforme Gruppen verwenden zu können, muss die Objektklasse "
 "'posixGroup' AUXILIARY sein"
 
-#: include/functions.inc:2791
+#: include/functions.inc:2792
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1570,51 +1715,51 @@ msgstr ""
 "Ihre Schemakonfiguration ist für rfc2307bis-Gruppen eingerichtet, aber Sie "
 "haben die Unterstützung im LDAP-Einrichtungsschritt ausgeschaltet."
 
-#: include/functions.inc:2792
+#: include/functions.inc:2793
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "Die Objektklasse 'posixGroup' muss STRUCTURAL sein"
 
-#: include/functions.inc:2816
+#: include/functions.inc:2817
 msgid "German"
 msgstr "Deutsch"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2818
 msgid "French"
 msgstr "Französisch"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr "Italienisch"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2821
 msgid "English"
 msgstr "Englisch"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr "Niederländisch"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2823
 msgid "Polish"
 msgstr "Polnisch"
 
-#: include/functions.inc:2824
+#: include/functions.inc:2825
 msgid "Chinese"
 msgstr "Chinesisch"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2826
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr "Russisch"
 
-#: include/functions.inc:3021
+#: include/functions.inc:3022
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1622,11 +1767,11 @@ msgstr ""
 "Das in POSTMODIFY angegebene Kommando '%s' (Modul '%s') scheint nicht zu "
 "existieren."
 
-#: include/functions.inc:3054
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr "Kann Samba-Hash nicht erzeugen!"
 
-#: include/functions.inc:3067
+#: include/functions.inc:3068
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
@@ -1634,39 +1779,39 @@ msgstr ""
 "Kann keinen SAMBA-Hash generieren: die Ausführung von '%s' ist "
 "fehlgeschlagen, prüfen Sie den 'sambaHashHook'!"
 
-#: include/functions.inc:3348 include/functions.inc:3362
-#: include/functions.inc:3400 include/functions.inc:3412
-#: include/functions.inc:3416 include/functions.inc:3431
-#: include/functions.inc:3440
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 msgid "Cannot allocate a free ID:"
 msgstr "Konnte keine freie ID allozieren:"
 
-#: include/functions.inc:3348
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr "unbekannte idAllocation-Methode!"
 
-#: include/functions.inc:3362
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:3392
+#: include/functions.inc:3393
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "kann sambaUnixIdPool-Eintrag nicht anlegen!"
 
-#: include/functions.inc:3400
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool ist nicht eindeutig!"
 
-#: include/functions.inc:3412 include/functions.inc:3416
+#: include/functions.inc:3413 include/functions.inc:3417
 msgid "no ID available!"
 msgstr "keine ID verfügbar!"
 
-#: include/functions.inc:3440
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr "maximale Anzahl von Versuchen abgelaufen!"
 
-#: include/functions.inc:3500
+#: include/functions.inc:3501
 msgid "Cannot allocate a free ID!"
 msgstr "Konnte keine freie ID allozieren!"
 
@@ -1701,38 +1846,6 @@ msgstr "Snapshot entfernen."
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr "Beschreibung"
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr "CSV"
@@ -2175,7 +2288,9 @@ msgstr "Das Feld '%s' enthält ungültige Zeichen!"
 msgid "Missing %s PHP extension!"
 msgstr "Fehlenden %s PHP-Erweiterung!"
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Hinzufügen"
@@ -2541,12 +2656,12 @@ msgstr "GOsa support daemon"
 msgid "Cannot not parse XML!"
 msgstr "XML-Nachricht kann nicht ausgewertet werden!"
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1184
 #, 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:1200
+#: include/class_gosaSupportDaemon.inc:1204
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Kann Eintrag %s nicht entfernen!"
@@ -2639,12 +2754,12 @@ msgid "Please fix the above error and reload the page."
 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:1248
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Allgemein"
@@ -2657,20 +2772,22 @@ msgstr "UNIX"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Mail"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:750
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr "Fax"
 
@@ -2687,34 +2804,24 @@ msgstr "FTP"
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr "Gruppe"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/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:188
 #: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:766
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Telefon"
 
@@ -2725,6 +2832,7 @@ msgstr "Anwendung"
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
 #: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Server"
@@ -2735,6 +2843,7 @@ msgstr "Thin Client"
 
 #: plugins/generic/references/class_reference.inc:69
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr "Arbeitsstation"
 
@@ -2787,12 +2896,6 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Das GOsa Team"
 
-#: 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 "
@@ -2802,7 +2905,7 @@ msgstr ""
 "Daten wiederherzustellen."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/class_ogroup.inc:1080
 msgid "Object groups"
 msgstr "Objektgruppen"
 
@@ -2812,7 +2915,7 @@ msgstr "Objektgruppen verwalten"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/users/class_userManagement.inc:189
 msgid "Infrastructure error"
 msgstr "Infrastruktur Fehler"
 
@@ -2821,6 +2924,7 @@ msgid "Templates"
 msgstr "Vorlagen"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
 #: 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"
@@ -2831,6 +2935,7 @@ msgid "Windows Install"
 msgstr "Windows Installation"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -2840,118 +2945,118 @@ msgstr ""
 "Sie können Terminals und Arbeitsstationen nicht zu einer Objektgruppe "
 "zusammenfassen!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 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
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
 #, php-format
 msgid "Show %s"
 msgstr "Zeige %s"
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 msgid "people"
 msgstr "Personen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr "Gruppen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr "Server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr "Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr "Terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 msgid "printer"
 msgstr "Drucker"
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr "Drucker"
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr "Telefone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr "Anwendungen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr "keine"
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr "zu viele unterschiedliche Objekte!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr "Benutzer"
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 msgid "winstations"
 msgstr "Windows-Arbeitsstationen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 #: 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 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:645
+#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "erlaube Zugriff auf diese Hosts"
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 msgid "Non existing dn:"
 msgstr "Unbekannte dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
@@ -2960,20 +3065,20 @@ msgstr ""
 "Die folgenden Systeme sind bereits für die Konfiguration über eine "
 "Objektgruppe vorgeseheb und können nicht hinzugefügt werden:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
 #: 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: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/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3010,28 +3115,30 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Name"
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 "Sie können maximal zwei verschiedene Objekttypen miteinander kombinieren!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 msgid "Object group generic"
 msgstr "Objektgruppe (Allgemein)"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 msgid "Sytem trust"
 msgstr "System-Vertrauen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 msgid "Member"
 msgstr "Mitglied"
 
@@ -3068,7 +3175,7 @@ msgid "Select a base"
 msgstr "Wählen Sie eine Basis"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "System-Vertrauen"
@@ -3107,8 +3214,9 @@ msgstr "FAI-Übersicht"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:758
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr "Umgebung"
 
@@ -3120,14 +3228,6 @@ 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-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-filter.tpl:11
 msgid "user groups"
 msgstr "Benutzergruppen"
@@ -3229,7 +3329,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3250,19 +3350,19 @@ 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/admin/groups/trust_machines.tpl:25
 #: 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/admin/groups/trust_machines.tpl:29
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Zeige die Systeme, auf die das Folgende passt"
 
 #: plugins/admin/ogroups/trust_machines.tpl:31
-#: plugins/admin/groups/trust_machines.tpl:31
+#: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Regulärer Ausdruck zum Erkennen von Mail-Adressen"
@@ -3299,6 +3399,44 @@ msgstr "Zeige die Benutzer, auf die Folgendes passt"
 msgid "Regular expression for matching user names"
 msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+msgid "Please select the desired entries"
+msgstr "Bitte wählen Sie die gewünschten Einträge"
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr "Vorname"
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+msgid "Surname"
+msgstr "Nachname"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Zeige primäre Gruppen"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Zeige Samba Gruppen"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+msgid "Show mail groups"
+msgstr "Zeige Mail Gruppen"
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3354,114 +3492,102 @@ msgstr "In allen Gruppen"
 msgid "Not in all groups"
 msgstr "Nicht in allen Gruppen"
 
-#: plugins/admin/groups/group-filter.tpl:11
-msgid "Show primary groups"
-msgstr "Zeige primäre Gruppen"
-
-#: plugins/admin/groups/group-filter.tpl:12
-msgid "Show samba groups"
-msgstr "Zeige Samba 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!"
 msgstr "Kann keine Gruppen-SID in Ihrer Konfiguration finden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr "Samba-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr "Domänen-Administratoren"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr "Domänen-Benutzer"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr "Domänen-Gäste"
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr "Spezielle Gruppe (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 "Die UID '%s' konnte nicht zur Gruppe '%s' hinzugefügt werden: Benutzer-"
 "Objekt nicht gefunden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 "Die UID '%s' konnte nicht zur Gruppe '%s' hinzugefügt werden: UID ist "
 "bereits vorhanden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 msgid "! unknown UID"
 msgstr "! unbekannte UID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 "Die Suche ergab zu viele Treffer. Es werden nicht mehr als %s Einträge "
 "angezeigt!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:969
+#: plugins/admin/groups/class_groupGeneric.inc:932
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Kann keine SID für '%s' finden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:974
+#: plugins/admin/groups/class_groupGeneric.inc:937
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Kann keine RIDBASE für '%s' finden!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #, 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: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/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1212
 msgid "Generic group settings"
 msgstr "Allgemeine Gruppeneinstellungen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 msgid "Samba group type"
 msgstr "Samba-Gruppentyp"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 msgid "Samba domain name"
 msgstr "Samba Domänen-Name"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 msgid "Phone pickup group"
 msgstr "Gesprächs-Annahme Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1230
 msgid "Nagios group"
 msgstr "Nagios-Gruppe"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 msgid "Group member"
 msgstr "Gruppenmitglieder"
 
@@ -3470,6 +3596,7 @@ msgid "Group settings"
 msgstr "Gruppen-Einstellungen"
 
 #: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
 msgid "List of groups"
 msgstr "Liste der Gruppen"
 
@@ -3486,38 +3613,46 @@ msgid "Group administration"
 msgstr "Gruppenverwaltung"
 
 #: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
 msgid "Posix"
 msgstr "Posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
 msgid "Edit posix properties"
 msgstr "POSIX-Eigenschaften bearbeiten"
 
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Mail-Einstellungen bearbeiten"
 
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Samba-Einstellungen bearbeiten"
 
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Telefon-Einstellungen bearbeiten"
 
 #: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
 msgid "Menu"
 msgstr "Menü"
 
 #: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
 msgid "Edit start menu properties"
 msgstr "Startmenü-Einstellungen bearbeiten"
 
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Umgebungs-Einstellungen bearbeiten"
 
@@ -3580,7 +3715,7 @@ msgstr ""
 "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/class_userManagement.inc:405
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
@@ -3600,24 +3735,16 @@ msgstr "Vorname"
 msgid "Manage users"
 msgstr "Benutzer verwalten"
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:278
 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: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:649
+#: plugins/admin/users/class_userManagement.inc:650
 msgid "Account locking"
 msgstr "Konto-Sperrung"
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:651
+#, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
@@ -3625,19 +3752,19 @@ msgstr ""
 "Die Passwort-Methode '%s' unterstützt keine Sperrungen. Das Konto %s wurde "
 "nicht gesperrt!"
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:724
 msgid "Unlock account"
 msgstr "Konto aktivieren"
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "Lock account"
 msgstr "Konto deaktivieren"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit generic properties"
 msgstr "Allgemeine Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:742
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3645,19 +3772,19 @@ msgstr "Allgemeine Einstellungen bearbeiten"
 msgid "POSIX"
 msgstr "POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:743
 msgid "Edit POSIX properties"
 msgstr "UNIX-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:754
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:755
 msgid "Edit netatalk properties"
 msgstr "Netatalk-Einstellungen bearbeiten"
 
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Edit FAX properties"
 msgstr "FAX-Einstellungen bearbeiten"
 
@@ -3665,11 +3792,6 @@ msgstr "FAX-Einstellungen bearbeiten"
 msgid "List of users"
 msgstr "Liste der Benutzer"
 
-#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1608
-msgid "Surname"
-msgstr "Nachname"
-
 #: plugins/admin/users/user-list.xml:140
 msgid "Lock users"
 msgstr "Benutzer sperren"
@@ -3754,49 +3876,6 @@ msgstr ""
 "haben, drücken Sie 'Entfernen' um Fortzufahren oder 'Abbrechen', um den "
 "Vorgang abzubrechen."
 
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Liste der Abteilungen"
-
-#: 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/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-msgid "Domain component"
-msgstr "Domänen-Komponente"
-
-#: 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/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/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
 msgid "Locality name"
@@ -3879,8 +3958,8 @@ msgstr "Kategorie dieses Teilbaums"
 #: 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/class_user.inc:1639
+#: plugins/personal/generic/generic.tpl:387
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Ort"
@@ -3889,8 +3968,8 @@ msgstr "Ort"
 #: 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/class_user.inc:1638
+#: plugins/personal/generic/generic.tpl:395
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Land"
@@ -3909,7 +3988,7 @@ msgstr "Ort dieses Teilbaums"
 #: 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/generic.tpl:403
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -3930,10 +4009,10 @@ msgstr "Einleitende Telefonnummer dieses Teilbaums"
 #: 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/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
@@ -3977,7 +4056,7 @@ msgid "Organization name"
 msgstr "Organisationsname"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1640
 msgid "Postal address"
 msgstr "Adresse"
 
@@ -4152,8 +4231,8 @@ msgstr ""
 
 #: 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/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:454
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Rolle"
@@ -4190,7 +4269,7 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Organisationsbezogene Benutzereinstellungen bearbeiten"
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:274
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 "Bitte eine einzelne IP-Adresse oder eine Netzwerk/Netzmasken Kombination "
@@ -4241,211 +4320,211 @@ msgstr "Kein Zertifikat eingerichtet"
 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:1151
+#: plugins/personal/generic/class_user.inc:1156
 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:1158
+#: plugins/personal/generic/class_user.inc:1163
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr "Kann RDN nicht erstellen: Attribut ist nicht definiert!"
 
-#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1181
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr "Kann RDN nicht erstellen: ungültige Attribut-Parameter!"
 
-#: plugins/personal/generic/class_user.inc:1247
+#: plugins/personal/generic/class_user.inc:1252
 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:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1731
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Geburtsdatum"
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1441
 msgid "Cannot open certificate!"
 msgstr "Kann Zertifikat nicht öffnen!"
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Referat"
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Hausbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Anrede"
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "letzte Übermittlung"
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Dienstort"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Aufgabengebiet"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Sachgebiet"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Amts-/Dienstbezeichnung"
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Zertifikat-Seriennummer"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Öffentlich sichtbar"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Straße"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1603
 msgid "Generic user settings"
 msgstr "Allgemeine Benutzereinstellungen"
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mein Konto"
 
-#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/class_user.inc:1615
 msgid "User identification"
 msgstr "Benutzerkennung"
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titel"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1617
 #: 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:1615
+#: plugins/personal/generic/class_user.inc:1620
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Geschlecht"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Preferred language"
 msgstr "Bevorzugte Sprache"
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1624
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Benutzerbild"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Department number"
 msgstr "Abteilungsnummer"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Employee number"
 msgstr "Personalnummer"
 
-#: plugins/personal/generic/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Anstellungsart"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Room number"
 msgstr "Raumnummer"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1633
 msgid "Telefon number"
 msgstr "Telefonnummer"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Pager number"
 msgstr "Pagernummer"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Mobile number"
 msgstr "Mobiltelefon"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1636
 msgid "Fax number"
 msgstr "Faxnummer"
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr "Private Adresse"
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1643
 msgid "Home phone number"
 msgstr "Telefonnummer (privat)"
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1645
 msgid "User password method"
 msgstr "Benutzer Passwort-Methode"
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1646
 msgid "User certificates"
 msgstr "Benutzer-Zertifikate"
 
@@ -4508,33 +4587,33 @@ msgstr "Zertifikate bearbeiten"
 msgid "Restrict login to"
 msgstr "Anmeldung beschränken"
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr "IP oder Netzwerk"
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Angabe zur Organisationseinheit"
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Abteilungs-Nr."
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Angestellten-Nr."
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Zimmer-Nr."
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr "Verwenden sie den Telefon-Reiter"
 
@@ -4616,37 +4695,37 @@ msgstr "Passwort abgelaufen"
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, 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:519
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, 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:523
+#: plugins/personal/posix/class_posixAccount.inc:452
 #, 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:527
+#: plugins/personal/posix/class_posixAccount.inc:456
 #, 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:864
+#: plugins/personal/posix/class_posixAccount.inc:793
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr "Wartezeit für Sperre abgelaufen. Ignoriere Sperre!"
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr "Gruppe des Benutzers"
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:946
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
@@ -4655,90 +4734,90 @@ msgstr ""
 "Wenn dies unbeabsichtigt geschah, prüfen Sie bitte alle verwendeten UID-"
 "Nummern."
 
-#: plugins/personal/posix/class_posixAccount.inc:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
-#: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Basisverzeichnis"
 
-#: plugins/personal/posix/class_posixAccount.inc:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 msgid "shadowMin"
 msgstr "shadowMin"
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 msgid "shadowMax"
 msgstr "shadowMax"
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 msgid "shadowWarning"
 msgstr "shadowWarning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 msgid "shadowInactive"
 msgstr "shadowInactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1440
 msgid "POSIX account"
 msgstr "POSIX-Konto"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Benutzer-ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1453
 msgid "Group ID"
 msgstr "Gruppen-ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1455
 msgid "Force password change on login"
 msgstr "Erzwinge Änderung des Passwort bei Anmeldung"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1456
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1457
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1458
 msgid "Shadow warning"
 msgstr "Shadow warning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1459
 msgid "Shadow inactive"
 msgstr "Shadow inactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1460
 msgid "Shadow expire"
 msgstr "Shadow expire"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr "Öffentlicher SSH-Schlüssel"
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1462
 msgid "System trust model"
 msgstr "Modell des System-Vertrauens"
 
@@ -4814,6 +4893,22 @@ msgstr "Zeige Gruppen des Benutzers"
 msgid "User name of which groups are shown"
 msgstr "Benutzername, dessen Gruppen angezeigt werden"
 
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+msgid "List of systems"
+msgstr "Liste der Systeme"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+msgid "Show servers"
+msgstr "Zeige Server"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+msgid "Show workstations"
+msgstr "Zeige Arbeitsstationen"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+msgid "Show terminals"
+msgstr "Zeige Terminals"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "UNIX-Einstellungen"
index 14cc33e487af65829509e49a51ed5d0d4c86727a..71b8b34ec0080fc4821c1bf43fac9f5b32c1d858 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-27 15:02+0100\n"
 "PO-Revision-Date: 2010-01-20 00:26+0100\n"
 "Last-Translator: \n"
 "Language-Team: Spanish <>\n"
@@ -18,6 +18,60 @@ msgstr ""
 "X-Generator: Lokalize 1.0\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Base"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr "Actualizar"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr "Enviar"
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -30,6 +84,7 @@ msgstr "Información"
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr "Filtros"
@@ -37,19 +92,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:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
+#: 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:1041
+#: 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:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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 +124,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 +136,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 +166,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"
 
@@ -163,8 +215,8 @@ msgid ""
 "Or if you copy or cut an entry within GOsa and delete the source object, you "
 "may get errors while pasting this object again!"
 msgstr ""
-"Si mueve o copia una entrada dentro de GOsa y elimina el objeto "
-"original,¡tendrá errores al pegar el objeto!"
+"Si mueve o copia una entrada dentro de GOsa y elimina el objeto original,"
+"¡tendrá errores al pegar el objeto!"
 
 #: ihtml/themes/default/copyPasteDialog.tpl:19
 #: include/class_MultiSelectWindow.inc:144 include/utils/class_msgPool.inc:326
@@ -265,7 +317,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"
 
@@ -298,7 +350,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:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -311,9 +363,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"
 
@@ -322,6 +372,125 @@ msgstr "Cambiar contraseña"
 msgid "Click here to change your password"
 msgstr "Pulse aquí para cambiar su contraseña"
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista de Departamentos"
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:175
+msgid "Domain"
+msgstr "Dominio"
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Componentes del dominio"
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organización"
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Departamento"
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Descripción"
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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"
+
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr "¡Su sesión de GOsa se ha terminado!"
@@ -370,7 +539,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"
 
@@ -416,47 +585,49 @@ msgstr "Razón para generar esta instantánea"
 
 #: 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:447
+#: include/class_management.inc:583 include/class_management.inc:915
+#: include/password-methods/class_password-methods.inc:250
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 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
-#: 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/personal/generic/class_user.inc:1151
-#: plugins/personal/generic/class_user.inc:1169
-#: plugins/personal/generic/class_user.inc:1429
+#: include/utils/class_msgPool.inc:493
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
+#: 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:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
+#: plugins/personal/generic/class_user.inc:387
+#: plugins/personal/generic/class_user.inc:482
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -466,9 +637,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
@@ -497,8 +668,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:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -598,9 +768,9 @@ msgid ""
 "possible. Pressing the Logout button will close this session."
 msgstr ""
 "Probablemente exista otra instancia activa de sus sesión. Operaciones en "
-"ventanas múltiples no son técnicamente posibles y dependen  del "
-"navegador utilizado. El uso de diferentes navegadores a la vez (por ejemplo: "
-"IE y Mozilla) es posible. Presione el botón 'Salir' para cerrar esta sesión."
+"ventanas múltiples no son técnicamente posibles y dependen  del navegador "
+"utilizado. El uso de diferentes navegadores a la vez (por ejemplo: IE y "
+"Mozilla) es posible. Presione el botón 'Salir' para cerrar esta sesión."
 
 #: ihtml/themes/default/conflict.tpl:10
 msgid ""
@@ -614,6 +784,19 @@ msgstr ""
 msgid "Logout"
 msgstr "Salir"
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtros"
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -644,9 +827,9 @@ msgstr "Entrando"
 msgid "GOsa main menu"
 msgstr "Menú inicial 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:447
 #: 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"
 
@@ -660,19 +843,19 @@ 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:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
+#: plugins/admin/groups/class_groupGeneric.inc:708
 msgid "Configuration error"
 msgstr "Error de configuración"
 
@@ -681,7 +864,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"
 
@@ -689,7 +872,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:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -709,10 +892,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:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -730,11 +914,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"
 
@@ -770,33 +954,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
-#: 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
+#: 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:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
+#: 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:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
+#: 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:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -838,12 +1026,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!"
@@ -934,6 +1122,56 @@ 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:145
+#, fuzzy
+msgid "Filter error"
+msgstr "Error fatal"
+
+#: include/class_management.inc:145
+msgid "The filter is incomplete!"
+msgstr ""
+
+#: include/class_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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:221
+#: plugins/admin/users/class_userManagement.inc:612
+msgid "Permission"
+msgstr "Permiso"
+
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/acl/class_aclManagement.inc:98
+msgid "Permission error"
+msgstr "Error de Permisos"
+
+#: include/class_management.inc:427 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:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
 #: 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."
@@ -955,7 +1193,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 "
@@ -964,7 +1202,8 @@ 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, php-format
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#, php-format
 msgid ""
 "The snapshot functionality is enabled, but the required compression module "
 "is missing. Please install '%s'."
@@ -976,11 +1215,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"
 
@@ -988,20 +1227,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)"
 
@@ -1009,56 +1248,45 @@ 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:1608
 #: 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:1217
+#: 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:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
+#: 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
+#: include/class_sortableListing.inc:225
+#: 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
-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:197 include/class_sortableListing.inc:199
+#: 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"
@@ -1081,7 +1309,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"
 
@@ -1121,13 +1349,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:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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"
 
@@ -1155,19 +1383,19 @@ 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
 msgid "No members"
 msgstr "Sin miembros"
 
-#: 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"
 
@@ -1176,51 +1404,34 @@ 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:996
 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:996
+#: include/class_listing.inc:998
 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:1004
 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:1012
 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:1012
+#: include/class_listing.inc:1014
 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:1019
 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
-msgid "Submit"
-msgstr "Enviar"
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1232,61 +1443,11 @@ msgid "Requested channel does not exist! Please contact your Administrator."
 msgstr ""
 "¡El canal requerido no existe!. 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
-#: 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/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
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: 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/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:299 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
@@ -1294,63 +1455,71 @@ msgstr "Filtrar entradas con esta sintaxis"
 msgid "Select all"
 msgstr "Seleccione todos"
 
-#: include/class_listing.inc:470
+#: include/class_listing.inc:509
 msgid "created by"
 msgstr "Creado por"
 
-#: include/class_listing.inc:1259 include/class_listing.inc:1309
-#: include/class_plugin.inc:2071
+#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: 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:1385 include/class_listing.inc:1419
+#: 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:1393 include/class_listing.inc:1395
+#: 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:1419 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:1429 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:1461 include/class_listing.inc:1463
 msgid "Restore snapshots"
 msgstr "Recuperar instantánea"
 
-#: include/class_listing.inc:1357
+#: include/class_listing.inc:1477
 msgid "Export list"
 msgstr "Exportar lista"
 
-#: include/class_listing.inc:1392 include/class_listing.inc:1393
-#: include/class_SnapShotDialog.inc:143 include/class_plugin.inc:2003
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: 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:1522 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:1523 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:194
+msgid "Edit this entry"
+msgstr "Editar esta entrada"
+
+#: include/class_sortableListing.inc:199
+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"
@@ -1358,17 +1527,17 @@ msgstr ""
 "Error fatal: no se puede instanciar la clase '%s' - intente solucionarlo "
 "ejecutando '%s'"
 
-#: include/functions.inc:338
+#: include/functions.inc:448
 #, 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:519
 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:604
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -1376,13 +1545,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:790 include/functions.inc:908
 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:800
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1391,12 +1560,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:800
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "El servidor LDAP devolvio: %s"
 
-#: include/functions.inc:759
+#: include/functions.inc:929
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1404,12 +1573,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:1233
 #, 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:1235
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1418,73 +1587,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:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1068
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1361
+#: include/functions.inc:1642
 msgid "Continue anyway"
 msgstr "Continuar de cualquier manera"
 
-#: include/functions.inc:1363
+#: include/functions.inc:1644
 msgid "Edit anyway"
 msgstr "Editar de cualquier manera"
 
-#: include/functions.inc:1365
+#: include/functions.inc:1646
 #, 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:1886
 msgid "Entries per page"
 msgstr "Entradas por página"
 
-#: include/functions.inc:1577 include/class_filter.inc:302
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/functions.inc:1823 include/class_filter.inc:268
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:1867
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Instantánea de desarrollo GOsa (Rev %s)"
 
-#: include/functions.inc:1946
+#: include/functions.inc:2370
 #, 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:2404 include/functions.inc:2424
 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:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 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:2676
 msgid "LDAP warning"
 msgstr "Aviso LDAP"
 
-#: include/functions.inc:2220
+#: include/functions.inc:2676
 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:2702
 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:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1492,28 +1661,28 @@ msgstr ""
 "Usado para bloquear entradas editadas actualmente y así evitar múltiples "
 "cambios simultáneos."
 
-#: include/functions.inc:2298
+#: include/functions.inc:2754
 #, 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:2757
 #, 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:2762
 #, 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:2765
 #, php-format
 msgid "Class(es) available"
 msgstr "Clase(s) disponibles"
 
-#: include/functions.inc:2331
+#: include/functions.inc:2787
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1521,7 +1690,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:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1529,7 +1698,7 @@ msgstr ""
 "Para poder usar grupos conforme a rfc2307bis, el objectClass 'posixGroup' "
 "debe ser AUXILIARY"
 
-#: include/functions.inc:2336
+#: include/functions.inc:2792
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1537,51 +1706,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:2793
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "El objectClass 'posixGroup' debe ser STRUCTURAL"
 
-#: include/functions.inc:2361
+#: include/functions.inc:2817
 msgid "German"
 msgstr "Alemán"
 
-#: include/functions.inc:2362
+#: include/functions.inc:2818
 msgid "French"
 msgstr "Francés"
 
-#: include/functions.inc:2363
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2364
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr "Español"
 
-#: include/functions.inc:2365
+#: include/functions.inc:2821
 msgid "English"
 msgstr "Inglés"
 
-#: include/functions.inc:2366
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr "Holandes"
 
-#: include/functions.inc:2367
+#: include/functions.inc:2823
 msgid "Polish"
 msgstr "Polaco"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2825
 msgid "Chinese"
 msgstr "Chino"
 
-#: include/functions.inc:2370
+#: include/functions.inc:2826
 msgid "Vietnamese"
 msgstr "Vietnamita"
 
-#: include/functions.inc:2371
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr "Ruso"
 
-#: include/functions.inc:2549
+#: include/functions.inc:3022
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1589,11 +1758,11 @@ msgstr ""
 "El comando '%s', utilizado como POSTMODIFY para la extensión '%s', no parece "
 "existir."
 
-#: include/functions.inc:2574
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr "¡No se puede generar la clave samba!"
 
-#: include/functions.inc:2587
+#: include/functions.inc:3068
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
@@ -1601,43 +1770,43 @@ msgstr ""
 "¡No se puede generar la clave samba: la ejecución de '%s' ha fallado, "
 "compruebe el '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:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 msgid "Cannot allocate a free ID:"
 msgstr "No se puede asignar un identificador (ID) libre:"
 
-#: include/functions.inc:2843
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr "¡método de asignación de id desconocido!"
 
-#: include/functions.inc:2857
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr "¡%sPoolMin >= %sPoolMax!"
 
-#: include/functions.inc:2887
+#: include/functions.inc:3393
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "¡No se puede crear la entrada sambaUnixIdPool!"
 
-#: include/functions.inc:2895
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr "¡sambaUnixIdPool no es único!"
 
-#: include/functions.inc:2907 include/functions.inc:2911
+#: include/functions.inc:3413 include/functions.inc:3417
 msgid "no ID available!"
 msgstr "¡No hay ID disponibles!"
 
-#: include/functions.inc:2935
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr "¡Excedido el número de intentos máximo!"
 
-#: include/functions.inc:2994
+#: include/functions.inc:3501
 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 "
@@ -1646,55 +1815,28 @@ 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
-#: 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/departments/locality.tpl:19
-#: plugins/admin/departments/generic.tpl:19
-#: plugins/admin/departments/class_domain.inc:59
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:752 plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr "Descripción"
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr "CSV"
@@ -1798,7 +1940,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"
@@ -1812,50 +1954,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"
 
@@ -2098,7 +2219,8 @@ msgstr "¡No se puede ejecutar el comando '%s' (%s)!"
 msgid "Value for '%s' is too large!"
 msgstr "¡El valor especificado como '%s' es demasiado grande!"
 
-#: include/utils/class_msgPool.inc:237, php-format
+#: include/utils/class_msgPool.inc:237
+#, php-format
 msgid "'%s' must be smaller than %s!"
 msgstr "¡'%s' debe ser menor que %s!"
 
@@ -2156,7 +2278,9 @@ msgstr "¡El campo '%s' tiene caracteres no validos!"
 msgid "Missing %s PHP extension!"
 msgstr "¡Extensión PHP %s no encontrada!"
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Añadir"
@@ -2448,16 +2572,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!"
@@ -2465,23 +2589,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: ...' "
@@ -2490,87 +2614,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:1184
 #, 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:1204
 #, 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."
@@ -2593,44 +2695,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"
 
@@ -2639,12 +2741,12 @@ msgid "Please fix the above error and reload the page."
 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/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
+#: 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:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Genérico"
@@ -2655,32 +2757,28 @@ 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:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 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:750
+#: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:1090
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr "FAX"
 
 #: plugins/generic/references/class_reference.inc:53
-#: plugins/admin/users/class_divListUsers.inc:90
 msgid "Proxy"
 msgstr "Proxy"
 
@@ -2689,50 +2787,40 @@ 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
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 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/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:766
 #: 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/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 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
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
+#: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Servidor"
 
@@ -2741,19 +2829,18 @@ 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
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 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"
 
@@ -2796,7 +2883,7 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "El equipo de GOsa"
 
-#: plugins/admin/ogroups/remove.tpl:7
+#: 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."
@@ -2804,247 +2891,38 @@ 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_ogroupManagement.inc:25
+#: plugins/admin/ogroups/class_ogroup.inc:1080
+msgid "Object groups"
+msgstr "Grupos 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_ogroupManagement.inc:26
+msgid "Manage object groups"
+msgstr "Gestionar grupos de objetos"
 
-#: 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_ogroupManagement.inc:115
+#: plugins/admin/groups/class_groupManagement.inc:98
+#: plugins/admin/users/class_userManagement.inc:189
+msgid "Infrastructure error"
+msgstr "error de infraestructura"
 
-#: 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_ogroupManagement.inc:182
+msgid "Templates"
+msgstr "Plantillas"
 
-#: 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_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: 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_divListOGroup.inc:91
-#: plugins/admin/ogroups/class_divListOGroup.inc:92
-msgid "nested groups"
-msgstr "grupos anidados"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:93
-#: plugins/admin/ogroups/class_divListOGroup.inc:94
-#: plugins/admin/groups/class_divListGroup.inc:89
-msgid "application groups"
-msgstr "grupos de aplicacion"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:95
-#: plugins/admin/ogroups/class_divListOGroup.inc:96
-msgid "department groups"
-msgstr "grupos de departamento"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:97
-#: plugins/admin/ogroups/class_divListOGroup.inc:98
-msgid "server groups"
-msgstr "grupos de servidor"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:99
-#: plugins/admin/ogroups/class_divListOGroup.inc:100
-msgid "workstation groups"
-msgstr "grupos de estación de trabajo"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:101
-#: plugins/admin/ogroups/class_divListOGroup.inc:102
-msgid "windows workstation groups"
-msgstr "grupos de estaciones de trabajo windows"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:103
-#: plugins/admin/ogroups/class_divListOGroup.inc:104
-msgid "terminal groups"
-msgstr "grupos de terminales"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:105
-#: plugins/admin/ogroups/class_divListOGroup.inc:106
-msgid "printer groups"
-msgstr "grupos de impresoras"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:107
-#: plugins/admin/ogroups/class_divListOGroup.inc:108
-msgid "phone groups"
-msgstr "grupos de teléfonos"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:115
-#: plugins/admin/groups/class_divListGroup.inc:100
-#: plugins/personal/posix/posix_groups.tpl:48
-msgid "Regular expression for matching group names"
-msgstr "Expresión regular para buscar nombres de grupos"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:148
-#: plugins/admin/groups/class_divListGroup.inc:122
-#: plugins/admin/users/class_divListUsers.inc:120
-#: plugins/admin/departments/class_divListDepartment.inc:87
-#: plugins/admin/acl/class_divListACL.inc:104
-msgid "Submit department"
-msgstr "Enviar departamento"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:157
-#: plugins/admin/groups/class_divListGroup.inc:131
-#: plugins/admin/users/class_divListUsers.inc:129
-#: plugins/admin/users/user-list.xml:72
-#: plugins/admin/departments/class_divListDepartment.inc:94
-#: plugins/admin/acl/class_divListACL.inc:112
-#: setup/class_setupStep_Migrate.inc:1035
-#: setup/class_setupStep_Migrate.inc:1051
-msgid "Create"
-msgstr "Crear"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:167
-#: plugins/admin/groups/class_divListGroup.inc:141
-#: plugins/admin/users/class_divListUsers.inc:143
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/class_divListDepartment.inc:110
-#: plugins/admin/acl/class_divListACL.inc:118
-#: plugins/personal/generic/generic_certs.tpl:21
-#: plugins/personal/generic/generic_certs.tpl:45
-#: plugins/personal/generic/generic_certs.tpl:69
-#: setup/class_setupStep_Migrate.inc:2869
-msgid "Remove"
-msgstr "Eliminar"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:228
-#: plugins/admin/groups/class_divListGroup.inc:234
-#: plugins/admin/users/class_divListUsers.inc:262
-#: plugins/admin/departments/class_divListDepartment.inc:158
-#: plugins/admin/acl/class_divListACL.inc:164
-#: plugins/admin/acl/class_divListACL.inc:184
-msgid "edit"
-msgstr "editar"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:228
-#: plugins/admin/groups/class_divListGroup.inc:234
-#: plugins/admin/departments/class_divListDepartment.inc:158
-msgid "Edit this entry"
-msgstr "Editar esta entrada"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/groups/class_divListGroup.inc:241
-#: plugins/admin/users/class_divListUsers.inc:286
-#: plugins/admin/departments/class_divListDepartment.inc:161
-#: plugins/admin/acl/class_divListACL.inc:191
-msgid "delete"
-msgstr "eliminar"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:234
-#: plugins/admin/groups/class_divListGroup.inc:241
-#: plugins/admin/departments/class_divListDepartment.inc:161
-msgid "Delete this entry"
-msgstr "Eliminar esta entrada"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:282
-msgid "Number of listed object groups"
-msgstr "Número de grupo de objetos listados"
-
-#: plugins/admin/ogroups/class_divListOGroup.inc:283
-#: plugins/admin/groups/class_divListGroup.inc:304
-#: plugins/admin/users/class_divListUsers.inc:377
-#: plugins/admin/departments/class_divListDepartment.inc:201
-msgid "Number of listed departments"
-msgstr "Número de departamentos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:26
-#: plugins/admin/ogroups/class_ogroup.inc:1117
-#: plugins/admin/ogroups/main.inc:53 plugins/admin/ogroups/main.inc:58
-msgid "Object groups"
-msgstr "Grupos de objetos"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:27
-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
-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
-msgid "Templates"
-msgstr "Plantillas"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc:531
-#: plugins/admin/users/class_divListUsers.inc:131
-#: plugins/admin/users/user-list.xml:79 setup/setup_config2.tpl:227
-#: setup/setup_config2.tpl:272
-msgid "User"
-msgstr "Usuario"
-
-#: plugins/admin/ogroups/class_ogroupManagement.inc: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
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -3054,103 +2932,118 @@ msgstr ""
 "¡No puede combinar terminales y estaciones de trabajo en un unico grupo de "
 "objetos!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 msgid "departments"
 msgstr "departamentos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#, php-format
+msgid "Show %s"
+msgstr "Mostrar %s"
+
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 msgid "people"
 msgstr "usuarios"
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr "grupos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr "servidores"
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr "estaciones de trabajo"
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr "terminales"
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 msgid "printer"
 msgstr "impresora"
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr "impresoras"
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr "teléfonos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr "aplicaciones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:502
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr "ninguno"
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr "¡demasiados objetos diferentes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr "usuarios"
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 msgid "winstations"
 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/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
+#: 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/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 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/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "Permitir el acceso a estos equipos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 msgid "Non existing dn:"
 msgstr "No existe el 'dn':"
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
@@ -3159,25 +3052,20 @@ msgstr ""
 "Estos sistemas ya han sido configurados por otros grupos de objetos y no "
 "pueden ser añadidos:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
-#: plugins/admin/groups/class_divListGroup.inc:79
-#: plugins/admin/groups/class_groupGeneric.inc:1131
-#: plugins/admin/groups/class_groupGeneric.inc:1137
-#: plugins/admin/groups/class_groupGeneric.inc: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/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3205,30 +3093,38 @@ 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
-#: setup/setup_feedback.tpl:31
+#: 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:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Nombre"
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "You can combine two different object types at maximum, only!"
 msgstr "¡Solo se puede combiar dos tipos de objetos diferentes como máximo!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 msgid "Object group generic"
 msgstr "Grupo de objetos genérico"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 msgid "Sytem trust"
 msgstr "Sistema de confianza"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 msgid "Member"
 msgstr "Miembro"
 
@@ -3265,7 +3161,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:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Sistema de seguridad"
@@ -3303,10 +3199,10 @@ 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:758
+#: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr "Entorno"
 
@@ -3318,6 +3214,98 @@ msgstr "Aplicaciones"
 msgid "Please enter the new object group name"
 msgstr "Por favor introduzca un nuevo nombre del grupo de objetos"
 
+#: plugins/admin/ogroups/ogroup-filter.tpl:11
+msgid "user groups"
+msgstr "grupos de usuarios"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:12
+msgid "nested groups"
+msgstr "grupos anidados"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:13
+msgid "application groups"
+msgstr "grupos de aplicacion"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:14
+msgid "department groups"
+msgstr "grupos de departamento"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:15
+msgid "server groups"
+msgstr "grupos de servidor"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:16
+msgid "workstation groups"
+msgstr "grupos de estación de trabajo"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:17
+msgid "windows workstation groups"
+msgstr "grupos de estaciones de trabajo windows"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:18
+msgid "terminal groups"
+msgstr "grupos de terminales"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:19
+msgid "printer groups"
+msgstr "grupos de impresoras"
+
+#: plugins/admin/ogroups/ogroup-filter.tpl:20
+msgid "phone groups"
+msgstr "grupos de teléfonos"
+
+#: plugins/admin/ogroups/ogroup-list.xml:11
+msgid "List of object groups"
+msgstr "Lista del grupo de objetos"
+
+#: plugins/admin/ogroups/ogroup-list.xml:57
+#: plugins/admin/groups/group-list.xml:57 plugins/admin/users/user-list.xml:73
+#: plugins/admin/departments/locality.tpl:8
+#: plugins/admin/departments/generic.tpl:7
+#: plugins/admin/departments/domain.tpl:8
+#: plugins/admin/departments/country.tpl:8
+#: plugins/admin/departments/dcObject.tpl:8
+#: plugins/admin/departments/organization.tpl:7
+msgid "Properties"
+msgstr "Propiedades"
+
+#: plugins/admin/ogroups/ogroup-list.xml:73
+#: plugins/admin/groups/group-list.xml:73 plugins/admin/users/user-list.xml:89
+#: plugins/admin/departments/dep-list.xml:98 plugins/admin/acl/acl-list.xml:76
+#: setup/class_setupStep_Migrate.inc:1035
+#: setup/class_setupStep_Migrate.inc:1051
+msgid "Create"
+msgstr "Crear"
+
+#: plugins/admin/ogroups/ogroup-list.xml:98
+#: plugins/admin/groups/group-list.xml:98
+#: plugins/admin/users/user-list.xml:121
+#: plugins/admin/departments/dep-list.xml:160
+#: plugins/admin/departments/dep-list.xml:181
+#: plugins/admin/acl/acl-list.xml:95 plugins/admin/acl/acl-list.xml:144
+#: plugins/personal/generic/generic_certs.tpl:21
+#: plugins/personal/generic/generic_certs.tpl:45
+#: plugins/personal/generic/generic_certs.tpl:69
+#: setup/class_setupStep_Migrate.inc:2869
+msgid "Remove"
+msgstr "Eliminar"
+
+#: plugins/admin/ogroups/ogroup-list.xml:106
+#: plugins/admin/groups/group-list.xml:106
+#: plugins/admin/users/user-list.xml:156
+msgid "Send message"
+msgstr ""
+
+#: plugins/admin/ogroups/ogroup-list.xml:142
+#, fuzzy
+msgid "Edit object group"
+msgstr "grupo de objetos"
+
+#: plugins/admin/ogroups/ogroup-list.xml:155
+#, fuzzy
+msgid "Remove object group"
+msgstr "Eliminar Objetos"
+
 #: plugins/admin/ogroups/ogroup_objects.tpl:6
 msgid "Select objects to add"
 msgstr "Seleccione los objetos a añadir"
@@ -3329,7 +3317,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3350,19 +3338,19 @@ 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/admin/groups/trust_machines.tpl:25
 #: 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/admin/groups/trust_machines.tpl:29
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Mostrar sistemas que coincidan con"
 
 #: plugins/admin/ogroups/trust_machines.tpl:31
-#: plugins/admin/groups/trust_machines.tpl:31
+#: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Expresiones regulares para buscar direcciones"
@@ -3392,7 +3380,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"
 
@@ -3400,6 +3387,48 @@ msgstr "Mostrar usuarios que coincidan con"
 msgid "Regular expression for matching user names"
 msgstr "Expresiones regulares para buscar nombre de usuarios"
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Por favor seleccione su idioma preferido"
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr "Nombre de pila"
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+msgid "Surname"
+msgstr "Apellido"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+#, fuzzy
+msgid "Show primary groups"
+msgstr "grupos primarios"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+#, fuzzy
+msgid "Show samba groups"
+msgstr "grupo de samba"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
+msgstr "grupos de correo"
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3456,162 +3485,100 @@ 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"
-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"
-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"
-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!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr "Grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr "Administradores del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr "Usuarios del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr "Invitados del dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr "Grupo especial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 "¡Añadir UID '%s' al grupo '%s ha fallado: no podemos encontrar el objeto "
 "usuario!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr "¡Añadir UID '%s' al grupo '%s ha fallado: UID es usado mas de una vez!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 msgid "! unknown UID"
 msgstr "¡UID desconocido!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 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:932
 #, 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:937
 #, 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:1041
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr "¡El gidNumber '%s' introducido ya esta siendo usado por %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/personal/posix/class_posixAccount.inc:1116
+#: plugins/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: 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:1212
 msgid "Generic group settings"
 msgstr "Parámetros genéricos del grupo"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 msgid "Samba group type"
 msgstr "Tipo de grupo de samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 msgid "Samba domain name"
 msgstr "Nombre de dominio samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1268
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 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:1230
 msgid "Nagios group"
 msgstr "Grupo Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1271
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 msgid "Group member"
 msgstr "Miembro del grupo"
 
@@ -3619,20 +3586,73 @@ msgstr "Miembro del grupo"
 msgid "Group settings"
 msgstr "Parametros de grupos"
 
-#: plugins/admin/groups/main.inc:49 plugins/admin/groups/main.inc:53
+#: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+msgid "List of groups"
+msgstr "Lista de grupos"
+
+#: plugins/admin/groups/group-list.xml:138
+#, fuzzy
+msgid "Edit group"
+msgstr "grupos de impresoras"
+
+#: plugins/admin/groups/group-list.xml:151
+#, fuzzy
+msgid "Remove group"
+msgstr "grupos de servidor"
+
+#: plugins/admin/groups/class_groupManagement.inc:26
 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:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
+msgid "Posix"
+msgstr "Posix"
+
+#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
+#, fuzzy
+msgid "Edit posix properties"
+msgstr "Editar características telefónicas"
+
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
+msgid "Edit mail properties"
+msgstr "Editar características de correo electrónico"
+
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
+msgid "Edit samba properties"
+msgstr "Editar características samba"
+
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
+msgid "Edit phone properties"
+msgstr "Editar características telefónicas"
+
+#: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
+#, fuzzy
+msgid "Menu"
+msgstr "Impresora"
+
+#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
+#, fuzzy
+msgid "Edit start menu properties"
+msgstr "Editar características samba"
 
-#: plugins/admin/groups/class_groupManagement.inc:373
-#: plugins/admin/groups/class_groupManagement.inc:454
-msgid "group"
-msgstr "grupo"
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
+msgid "Edit environment properties"
+msgstr "Editar características de entorno"
 
-#: plugins/admin/users/remove.tpl:6
+#: 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 "
@@ -3643,172 +3663,23 @@ msgstr ""
 "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/password.tpl:4
+msgid ""
+"To change the user password use the fields below. The changes take effect "
+"immediately. Please memorize the new password, because the user wouldn't be "
+"able to login without it."
+msgstr ""
+"Para cambiar la contraseña del usuario use los campos a continuación. Los "
+"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
+"contraseña, el usuario no podrá autenticarse sin ella."
 
-#: plugins/admin/users/class_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/users/class_divListUsers.inc:93
-msgid "phone users"
-msgstr "operadores telefónicos"
-
-#: plugins/admin/users/class_divListUsers.inc:145
-#: plugins/admin/users/user-list.xml:121 plugins/admin/users/user-list.xml:163
-msgid "Apply template"
-msgstr "Aplicar plantilla"
-
-#: plugins/admin/users/class_divListUsers.inc:204
-msgid "GOsa"
-msgstr "GOsa"
-
-#: plugins/admin/users/class_divListUsers.inc:205
-#: plugins/admin/users/class_userManagement.inc:1067
-msgid "Edit generic properties"
-msgstr "Editar características generales"
-
-#: plugins/admin/users/class_divListUsers.inc:207
-msgid "Edit UNIX properties"
-msgstr "Editar características UNIX"
-
-#: plugins/admin/users/class_divListUsers.inc:209
-#: plugins/admin/users/class_userManagement.inc:1087
-msgid "Edit environment properties"
-msgstr "Editar características de entorno"
-
-#: plugins/admin/users/class_divListUsers.inc:211
-#: plugins/admin/users/class_userManagement.inc:1075
-msgid "Edit mail properties"
-msgstr "Editar características de correo electrónico"
-
-#: plugins/admin/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
-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/users/class_divListUsers.inc:263
-#: plugins/admin/users/class_userManagement.inc:611
-msgid "user"
-msgstr "usuario"
-
-#: plugins/admin/users/class_divListUsers.inc:274
-msgid "password"
-msgstr "contraseña"
-
-#: plugins/admin/users/class_divListUsers.inc:287
-msgid "Delete user"
-msgstr "Eliminar usuario"
-
-#: plugins/admin/users/class_divListUsers.inc:376
-msgid "Number of listed users"
-msgstr "Número de usuarios mostrados"
-
-#: plugins/admin/users/password.tpl:4
-msgid ""
-"To change the user password use the fields below. The changes take effect "
-"immediately. Please memorize the new password, because the user wouldn't be "
-"able to login without it."
-msgstr ""
-"Para cambiar la contraseña del usuario use los campos a continuación. Los "
-"cambios tomarán efecto inmediatamente. Por favor, recuerde la nueva "
-"contraseña, el usuario no podrá autenticarse sin ella."
-
-#: plugins/admin/users/password.tpl:8 plugins/personal/password/password.tpl:8
-msgid ""
-"Changing the password affects your authentification on mail, proxy, samba "
-"and unix services."
-msgstr ""
-"Cambiar la contraseña modifica la autenticación del usuario para el correo, "
-"proxy, samba y los servicios unix."
+#: plugins/admin/users/password.tpl:8 plugins/personal/password/password.tpl:8
+msgid ""
+"Changing the password affects your authentification on mail, proxy, samba "
+"and unix services."
+msgstr ""
+"Cambiar la contraseña modifica la autenticación del usuario para el correo, "
+"proxy, samba y los servicios unix."
 
 #: plugins/admin/users/password.tpl:17
 #: plugins/personal/generic/password.tpl:11
@@ -3840,6 +3711,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:405
+#: 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"
@@ -3850,87 +3728,95 @@ 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:278
 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:661
-#: plugins/admin/users/class_userManagement.inc:680
+#: plugins/admin/users/class_userManagement.inc:650
 msgid "Account locking"
 msgstr "Bloqueo de cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:662
-msgid "You have no permission to change the lock status for this user!"
-msgstr "¡No tiene permisos para cambiar el estado de bloqueo de este usuario!"
-
-#: plugins/admin/users/class_userManagement.inc:681
-#, php-format
+#: plugins/admin/users/class_userManagement.inc:651
+#, fuzzy, 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 ""
 "El método de contraseña '%s' no soporta bloqueo. ¡La cuenta no ha sido "
 "bloqueada!"
 
-#: 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:724
 msgid "Unlock account"
 msgstr "Desbloquear cuenta"
 
-#: plugins/admin/users/class_userManagement.inc:1052
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "Lock account"
 msgstr "Bloquear 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:739
+msgid "Edit generic properties"
+msgstr "Editar características generales"
+
+#: plugins/admin/users/class_userManagement.inc:742
+#: 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:743
 msgid "Edit POSIX properties"
 msgstr "Editar características POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:1091
+#: plugins/admin/users/class_userManagement.inc:754
+msgid "Netatalk"
+msgstr "Netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:755
+msgid "Edit netatalk properties"
+msgstr "Editar características netatalk"
+
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Edit FAX properties"
 msgstr "Editar características FAX"
 
-#: plugins/admin/users/user-list.xml:49
-msgid "Name / Department"
-msgstr "Nombre / Departamento"
+#: plugins/admin/users/user-list.xml:11
+msgid "List of users"
+msgstr "Lista de usuarios"
+
+#: plugins/admin/users/user-list.xml:140
+#, fuzzy
+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 "%{filter:lockLabel(userPassword)}"
 
-#: plugins/admin/users/user-list.xml:206
+#: plugins/admin/users/user-list.xml:245
 msgid "Remove user"
 msgstr "Eliminar usuario"
 
@@ -3943,15 +3829,17 @@ msgid "Show functional users"
 msgstr "Mostrar 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
 msgid "Show POSIX users"
 msgstr "Mostrar 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
-msgid "Show samba users"
+#, fuzzy
+msgid "Show Samba users"
 msgstr "Mostrar los usuarios samba"
 
 #: plugins/admin/users/templatize.tpl:2
@@ -3970,10 +3858,6 @@ msgstr ""
 msgid "No templates available!"
 msgstr "¡No hay plantillas disponibles!"
 
-#: plugins/admin/users/user-list.tpl:13
-msgid "Update"
-msgstr "Actualizar"
-
 #: plugins/admin/departments/remove.tpl:6
 msgid ""
 "This includes 'all' accounts, systems, etc. in this subtree. Please double "
@@ -3984,7 +3868,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 "
@@ -3994,112 +3878,6 @@ 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/class_departmentGeneric.inc:626
-msgid "Telephone"
-msgstr "Teléfono"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:629
-#: plugins/admin/departments/locality.tpl:50
-#: plugins/admin/departments/generic.tpl:114
-#: plugins/admin/departments/class_domain.inc:89
-#: plugins/admin/departments/class_localityGeneric.inc:90
-#: plugins/admin/departments/class_organizationGeneric.inc:129
-#: plugins/admin/departments/class_countryGeneric.inc:90
-#: plugins/admin/departments/class_dcObject.inc:89
-#: plugins/admin/departments/domain.tpl:50
-#: plugins/admin/departments/country.tpl:50
-#: plugins/admin/departments/dcObject.tpl:50
-#: plugins/admin/departments/organization.tpl:114
-msgid "Administrative settings"
-msgstr "Parámetros administrativos"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:680
-#, php-format
-msgid "Object '%s' is already tagged"
-msgstr "El objeto '%s' está ya marcado"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:687
-#, php-format
-msgid "Adding tag (%s) to object '%s'"
-msgstr "Añadir marca (%s) al objeto '%s'"
-
-#: plugins/admin/departments/class_departmentGeneric.inc:719
-#, php-format
-msgid "Removing tag from object '%s'"
-msgstr "Eliminando marca del objeto '%s'"
-
 #: plugins/admin/departments/locality.tpl:11
 #: plugins/admin/departments/dcObject.tpl:11
 msgid "Locality name"
@@ -4127,6 +3905,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
@@ -4148,11 +3941,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:1639
+#: plugins/personal/generic/generic.tpl:387
+#: 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:1638
+#: plugins/personal/generic/generic.tpl:395
+#: 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"
@@ -4163,6 +3986,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:403
+#: 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"
@@ -4173,6 +4006,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:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
+#: 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"
@@ -4180,77 +4027,39 @@ 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:27
-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
-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 ""
-"Tan pronto como la operación de marcado termine, puede avanzar hasta el "
-"final de la página y presionar el botón 'Continuar' para seguir al dialogo "
-"de gestión de departamento."
-
-#: plugins/admin/departments/class_departmentManagement.inc:556
-msgid "Domain"
-msgstr "Dominio"
-
-#: plugins/admin/departments/class_departmentManagement.inc:580
-#: plugins/admin/departments/class_countryGeneric.inc:78
-#: plugins/admin/departments/class_countryGeneric.inc:79
-msgid "Country"
-msgstr "País"
+#: plugins/admin/departments/class_departmentManagement.inc: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: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:26
+msgid "Manage Departments"
+msgstr "Gestionar Departamentos"
 
-#: 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_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 ""
+"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_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:1640
 msgid "Postal address"
 msgstr "Código Postal"
 
@@ -4271,14 +4080,54 @@ msgstr "Nombre de dominio"
 msgid "Name of domain to create"
 msgstr "Nombre del dominio a crear"
 
-#: plugins/admin/departments/main.inc:50 plugins/admin/departments/main.inc:52
-msgid "Department management"
-msgstr "Administración de departamento"
-
 #: plugins/admin/departments/country.tpl:14
 msgid "Name of country to create"
 msgstr "Nombre del país a crear"
 
+#: plugins/admin/departments/class_department.inc:386
+msgid "Cannot find an unused tag for this administrative unit!"
+msgstr ""
+"¡No se puede encontrar una etiqueta sin usar para identificar la unidad "
+"administrativa!"
+
+#: plugins/admin/departments/class_department.inc:457
+#, php-format
+msgid "Tagging '%s'."
+msgstr "Etiquetando '%s'."
+
+#: plugins/admin/departments/class_department.inc:538
+#, php-format
+msgid "Moving '%s' to '%s'"
+msgstr "Moviendo '%s' a '%s'"
+
+#: plugins/admin/departments/class_department.inc:579
+#, php-format
+msgid "FAILED to copy %s, aborting operation"
+msgstr "Ha fallado a copiar %s, operación abortada"
+
+#: plugins/admin/departments/class_department.inc:618
+msgid "Department name"
+msgstr "Nombre de departamento"
+
+#: plugins/admin/departments/class_department.inc:626
+msgid "Telephone"
+msgstr "Teléfono"
+
+#: plugins/admin/departments/class_department.inc:680
+#, php-format
+msgid "Object '%s' is already tagged"
+msgstr "El objeto '%s' está ya marcado"
+
+#: plugins/admin/departments/class_department.inc:687
+#, php-format
+msgid "Adding tag (%s) to object '%s'"
+msgstr "Añadir marca (%s) al objeto '%s'"
+
+#: plugins/admin/departments/class_department.inc:719
+#, php-format
+msgid "Removing tag from object '%s'"
+msgstr "Eliminando marca del objeto '%s'"
+
 #: plugins/admin/departments/dep_iframe.tpl:1
 msgid "Processing the requested operation"
 msgstr "Procesando la operación solicitada"
@@ -4323,59 +4172,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"
 
@@ -4383,50 +4196,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:1598
+#: plugins/personal/generic/generic.tpl:454
+#: 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"
@@ -4444,27 +4275,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:274
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr "¡Por favor añada una IP única o una combinación red/mascara!"
 
-#: 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'.)"
@@ -4472,236 +4303,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:1156
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr "No se puede construir RDN: ¡no se permite + para construir subRDN!"
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1163
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr "No se puede construir RDN: ¡Atributo no definido!"
 
-#: plugins/personal/generic/class_user.inc:1169
+#: plugins/personal/generic/class_user.inc:1181
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr "No se puede construir RDN: ¡Valor no válido del atributo!"
 
-#: plugins/personal/generic/class_user.inc:1240
+#: plugins/personal/generic/class_user.inc:1252
 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:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: 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/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: 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/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: 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:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: 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:1441
 msgid "Cannot open certificate!"
 msgstr "¡No puedo abrir el certificado!"
 
-#: plugins/personal/generic/class_user.inc:1575
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unidad"
 
-#: plugins/personal/generic/class_user.inc:1576
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: 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/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Profesión"
 
-#: plugins/personal/generic/class_user.inc:1578
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: 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/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lugar de residencia"
 
-#: plugins/personal/generic/class_user.inc:1580
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: 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/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Área de desarrollo"
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: 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:1595
 #: 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/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visible por todos"
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Calle"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: 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:1603
 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:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: 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:1615
 msgid "User identification"
 msgstr "Identificación de Usuario"
 
-#: plugins/personal/generic/class_user.inc:1604
+#: plugins/personal/generic/class_user.inc:1616
 #: 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:1617
 #: 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:1620
+#: plugins/personal/generic/generic.tpl:138
+msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1609
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Preferred language"
 msgstr "Idioma preferido"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1624
 #: 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:1628
 msgid "Department number"
 msgstr "Número del departamento"
 
-#: plugins/personal/generic/class_user.inc:1617
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Employee number"
 msgstr "Número de empleado"
 
-#: plugins/personal/generic/class_user.inc:1618
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: 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:1632
 msgid "Room number"
 msgstr "Número de habitación"
 
-#: plugins/personal/generic/class_user.inc:1621
+#: plugins/personal/generic/class_user.inc:1633
 msgid "Telefon number"
 msgstr "Número de teléfono"
 
-#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Pager number"
 msgstr "Número del busca"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Mobile number"
 msgstr "Teléfono móvil"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1636
 msgid "Fax number"
 msgstr "Número de Fax"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr "Dirección Postal personal"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1643
 msgid "Home phone number"
 msgstr "Número de teléfono personal"
 
-#: plugins/personal/generic/class_user.inc:1633
+#: plugins/personal/generic/class_user.inc:1645
 msgid "User password method"
 msgstr "Metodo de contraseña de usuario"
 
-#: plugins/personal/generic/class_user.inc:1634
+#: plugins/personal/generic/class_user.inc:1646
 msgid "User certificates"
 msgstr "Certificados de usuario"
 
@@ -4729,10 +4557,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"
@@ -4768,33 +4592,33 @@ msgstr "Editar certificados"
 msgid "Restrict login to"
 msgstr "Restringir inicio de sesión a"
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr "IP o Red"
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Información corporativa"
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Número departamento"
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Número empleado"
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Número sala"
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr "Por favor use la sección telefóno"
 
@@ -4857,6 +4681,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"
@@ -4865,47 +4695,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:444
 #, 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:448
 #, 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:452
 #, 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:456
 #, 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:793
 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:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr "Grupo de usuarios"
 
-#: plugins/personal/posix/class_posixAccount.inc:1014
+#: plugins/personal/posix/class_posixAccount.inc:946
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
@@ -4913,90 +4739,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:1176
-#: plugins/personal/posix/class_posixAccount.inc:1576
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: 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:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: 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:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 msgid "shadowMin"
 msgstr "shadowMin"
 
-#: plugins/personal/posix/class_posixAccount.inc:1134
-#: plugins/personal/posix/class_posixAccount.inc:1187
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 msgid "shadowMax"
 msgstr "shadowMax"
 
-#: plugins/personal/posix/class_posixAccount.inc:1139
-#: plugins/personal/posix/class_posixAccount.inc:1192
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 msgid "shadowWarning"
 msgstr "shadowWarning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1153
-#: plugins/personal/posix/class_posixAccount.inc:1206
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 msgid "shadowInactive"
 msgstr "shadowInactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1566
+#: plugins/personal/posix/class_posixAccount.inc:1440
 msgid "POSIX account"
 msgstr "Cuenta POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: 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:1453
 msgid "Group ID"
 msgstr "Identificador (ID) de Grupo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1581
+#: plugins/personal/posix/class_posixAccount.inc:1455
 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:1456
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1457
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1458
 msgid "Shadow warning"
 msgstr "Shadow warning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1459
 msgid "Shadow inactive"
 msgstr "Shadow inactive"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1460
 msgid "Shadow expire"
 msgstr "Shadow expire"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr "Clave pública SSH"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1462
 msgid "System trust model"
 msgstr "Sistema de confianza"
 
@@ -5060,10 +4886,35 @@ 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/trustSelect/trust-list.xml:10
+#, fuzzy
+msgid "List of systems"
+msgstr "Lista de usuarios"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+msgid "Show servers"
+msgstr "Mostrar servidores"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+msgid "Show workstations"
+msgstr "Mostrar estaciones de trabajo"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+msgid "Show terminals"
+msgstr "Mostrar terminales"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Caracteristicas Posix"
@@ -5273,46 +5124,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"
 
@@ -5657,6 +5501,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."
@@ -5990,14 +5838,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"
 
@@ -6330,7 +6178,8 @@ msgstr "No puede migrar el departamento '%s':"
 msgid "Found %s department(s) that will not be visible in GOsa."
 msgstr "Encontrados %s departamento(s) que nos son visibles para GOsa."
 
-#: setup/class_setupStep_Migrate.inc:1028, php-format
+#: setup/class_setupStep_Migrate.inc:1028
+#, php-format
 msgid "GOsa 2.5 administrative accounts found: %s"
 msgstr "Encontrada cuenta administrativa GOsa 2.5: %s"
 
@@ -6418,7 +6267,8 @@ msgid "Root object couldn't be created, you should try it on your own."
 msgstr ""
 "El objeto raíz no ha podido ser creado, tendra que crearlo usted mismo."
 
-#: setup/class_setupStep_Migrate.inc:2058, php-format
+#: setup/class_setupStep_Migrate.inc:2058
+#, php-format
 msgid "Missing GOsa object class '%s'!"
 msgstr "¡No se ha encontrado la clase de objeto GOsa '%s'!"
 
@@ -6842,6 +6692,198 @@ msgstr "Este paso le permite seleccionar su idioma preferido"
 msgid "Automatic"
 msgstr "Automatico"
 
+#, fuzzy
+#~ msgid "givenname"
+#~ msgstr "Nombre de pila"
+
+#, fuzzy
+#~ msgid "surename"
+#~ msgstr "Apellido"
+
+#~ 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"
+
+#~ msgid "phone users"
+#~ msgstr "operadores telefónicos"
+
+#~ 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!"
+
+#~ msgid "Name / Department"
+#~ msgstr "Nombre / 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"
 
@@ -6853,10 +6895,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"
 
@@ -6944,10 +6982,6 @@ msgstr "Automatico"
 #~ msgid "Heimdal options"
 #~ msgstr "Eliminar opciones"
 
-#, fuzzy
-#~ msgid "Minute"
-#~ msgstr "Impresora"
-
 #, fuzzy
 #~ msgid "Day"
 #~ msgstr "Mayo"
@@ -7016,10 +7050,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"
@@ -7357,15 +7387,6 @@ msgstr "Automatico"
 #~ msgid "Ignore subtrees"
 #~ msgstr "Ignorar subárboles"
 
-#~ msgid "Show servers"
-#~ msgstr "Mostrar servidores"
-
-#~ msgid "Show workstations"
-#~ msgstr "Mostrar estaciones de trabajo"
-
-#~ msgid "Show terminals"
-#~ msgstr "Mostrar terminales"
-
 #, fuzzy
 #~ msgid "Cannot select database '%s' on server '%s': %s"
 #~ msgstr ""
@@ -7717,10 +7738,6 @@ msgstr "Automatico"
 #~ msgid "Reomve"
 #~ msgstr "Eliminar"
 
-#, fuzzy
-#~ msgid "GOsa ping"
-#~ msgstr "GOsa"
-
 #, fuzzy
 #~ msgid "Say hello"
 #~ msgstr "Shell"
index 1055b627b2abda868a4e597ed59fc25720508bc2..4881f7f193e72714096073cda2e90cc0096fc3c2 100644 (file)
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 17:26+0100\n"
+"POT-Creation-Date: 2010-01-27 15:02+0100\n"
 "PO-Revision-Date: 2010-01-18 22:35+0100\n"
 "Last-Translator: Benoit Mortier <benoit.mortier@opensides.be>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -14,6 +14,60 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=2; plural=(n > 1);\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr "Mise à jour"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr "Soumettre"
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -26,6 +80,7 @@ msgstr "Information"
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr "Filtres"
@@ -34,16 +89,16 @@ msgstr "Filtres"
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
+#: include/functions.inc:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
 #: 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #: 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:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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
@@ -295,7 +350,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:248
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -317,6 +372,124 @@ msgstr "Modifier le mot de passe"
 msgid "Click here to change your password"
 msgstr "Cliquez ici pour changer votre mot de passe"
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Liste des départements"
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
+msgstr "Composant domaine"
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Entreprise"
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Département"
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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 ""
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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"
+
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr "Votre session GOsa à expiré !"
@@ -419,22 +592,22 @@ 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/class_management.inc:446
-#: include/class_management.inc:910
+#: html/index.php:228 include/class_management.inc:447
+#: include/class_management.inc:583 include/class_management.inc:915
 #: 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/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 include/class_tabs.inc:56
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
 #: 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_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:159
@@ -443,18 +616,18 @@ msgstr "Continuer"
 #: 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:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/admin/groups/class_groupGeneric.inc:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
 #: 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:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -495,7 +668,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:276
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -613,6 +786,18 @@ msgstr ""
 msgid "Logout"
 msgstr "Déconnexion"
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+msgid "Filter"
+msgstr "Filtre"
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -643,7 +828,7 @@ msgstr "Connecté:"
 msgid "GOsa main menu"
 msgstr "Menu Principal de GOsa"
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
@@ -659,9 +844,9 @@ 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:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
@@ -671,7 +856,7 @@ msgstr "Le fichier de configuration %s/%s ne peut être lu. Abandon."
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 msgid "Configuration error"
 msgstr "Erreur de configuration"
 
@@ -690,7 +875,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:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -710,10 +895,10 @@ msgstr "Le nouveau mot de passe ne comporte pas suffisamment de caractères."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -729,7 +914,8 @@ 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:414
 msgid "Session will not be encrypted."
@@ -778,20 +964,20 @@ msgstr ""
 #: 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/functions.inc:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
 #: 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:1102
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/departments/class_department.inc:241
 #: plugins/admin/departments/class_department.inc:429
 #: plugins/admin/departments/class_department.inc:702
@@ -799,10 +985,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:635
 #: plugins/admin/acl/class_aclRole.inc:675
 #: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -820,7 +1006,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:"
@@ -863,7 +1050,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"
@@ -887,7 +1075,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"
@@ -939,43 +1128,51 @@ msgstr ""
 msgid "unconfigured"
 msgstr "non configuré"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 msgid "Filter error"
 msgstr "Erreur de Filtre"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 msgid "The filter is incomplete!"
 msgstr "Le filtre est incomplet !"
 
-#: 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_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:612
 msgid "Permission"
 msgstr "Permissions"
 
-#: include/class_management.inc:352
-#: plugins/admin/users/class_userManagement.inc:570
-#: plugins/admin/users/class_userManagement.inc:574
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
 #: plugins/admin/acl/class_aclManagement.inc:98
 msgid "Permission error"
 msgstr "Erreur de permissions"
 
-#: include/class_management.inc:426 include/class_plugin.inc:1546
+#: include/class_management.inc:427 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."
+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_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
 #: 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."
@@ -1053,12 +1250,12 @@ 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:25
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1608
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
@@ -1066,27 +1263,18 @@ msgstr "Groupes"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:394
 msgid "Up"
 msgstr "Au dessus"
 
 #: include/class_acl.inc:495 include/class_listing.inc:235
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "En bas"
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Editer"
-
 #: include/class_acl.inc:500 include/class_acl.inc:504
 #: include/class_acl.inc:1253 include/class_acl.inc:1254
 #: include/class_acl.inc:1259 include/class_tabs.inc:401
@@ -1097,8 +1285,8 @@ msgid "ACL"
 msgstr ""
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
+#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
 #: plugins/admin/acl/class_aclRole.inc:452
 #, php-format
 msgid "Delete"
@@ -1162,10 +1350,10 @@ 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: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/functions.inc:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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
@@ -1217,41 +1405,34 @@ msgstr "Rôles ACL"
 msgid "Close"
 msgstr "Fermer"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
 msgid "Go to root department"
 msgstr "Aller au département de base"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
+#: include/class_listing.inc:998
 msgid "Root"
 msgstr "Racine"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
 msgid "Go up one department"
 msgstr "Monter d'un département"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
 msgid "Go to users department"
 msgstr "Aller au département des utilisateurs"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
+#: include/class_listing.inc:1014
 msgid "Home"
 msgstr "Accueil"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
 msgid "Reload list"
 msgstr "Recharger la liste"
 
-#: 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"
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1268,34 +1449,7 @@ msgstr ""
 msgid "Choose a base"
 msgstr "Sélectionnez une base"
 
-#: 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_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_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr ""
-
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:299 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
@@ -1303,66 +1457,60 @@ msgstr ""
 msgid "Select all"
 msgstr "Sélectionner tout"
 
-#: include/class_listing.inc:499
+#: include/class_listing.inc:509
 msgid "created by"
 msgstr "Crée par"
 
-#: 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_listing.inc:1379 include/class_listing.inc:1429
 #: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr "Copier"
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_listing.inc:1385 include/class_listing.inc:1419
 #: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr "Couper"
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
+#: include/class_listing.inc:1393 include/class_listing.inc:1395
 #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Coller"
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1419 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Couper cette entrée"
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1429 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Copier cette entrée"
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
+#: include/class_listing.inc:1461 include/class_listing.inc:1463
 msgid "Restore snapshots"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1477
 msgid "Export list"
 msgstr "Exporter la liste"
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
 #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr "Restaurer la copie instantanée"
 
-#: include/class_listing.inc:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1522 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr "Créer un snapshot"
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1523 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr "Créer un nouveau snapshot depuis cet objet"
 
-#: include/class_sortableListing.inc:132
+#: include/class_sortableListing.inc:194
 msgid "Edit this entry"
 msgstr "Editer cette entrée"
 
-#: include/class_sortableListing.inc:133
+#: include/class_sortableListing.inc:199
 msgid "Delete this entry"
 msgstr "Supprimer cette entrée"
 
@@ -1375,23 +1523,25 @@ msgstr ""
 
 #: 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:447
+#: include/functions.inc:448
 #, 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:518
+#: include/functions.inc:519
 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:603
+#: include/functions.inc:604
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -1399,11 +1549,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:789 include/functions.inc:907
+#: include/functions.inc:790 include/functions.inc:908
 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:799
+#: include/functions.inc:800
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1412,12 +1562,12 @@ msgstr ""
 "Impossible d'obtenir les informations de verrouillage dans l'annuaire LDAP. "
 "Veuillez contacter votre administrateur !"
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "Le serveur LDAP à retourné: %s"
 
-#: include/functions.inc:928
+#: include/functions.inc:929
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1425,12 +1575,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:1232
+#: include/functions.inc:1233
 #, 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:1234
+#: include/functions.inc:1235
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1439,73 +1589,73 @@ msgstr ""
 "Mettre la nouvelle limite à %s et me montrer ce message si la limite est "
 "toujours dépassée"
 
-#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Configurer"
 
-#: include/functions.inc:1251
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr "incomplet"
 
-#: include/functions.inc:1641
+#: include/functions.inc:1642
 msgid "Continue anyway"
 msgstr "Continuer malgré tout"
 
-#: include/functions.inc:1643
+#: include/functions.inc:1644
 msgid "Edit anyway"
 msgstr "Éditer malgré tout"
 
-#: include/functions.inc:1645
+#: include/functions.inc:1646
 #, 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:1885
+#: include/functions.inc:1886
 msgid "Entries per page"
 msgstr "Entrées par page"
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Appliquer le filtre"
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2272
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Version de développement de GOsa (Rev %s)"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2370
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "Le fichier '%s' ne peut pas être éffacé."
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:2404 include/functions.inc:2424
 msgid "Cannot write to revision file!"
 msgstr "Impossible d'écrire le fichier de revision !"
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "'baseIdHook' n'est pas disponible. Utilisation de la base par défaut !"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 msgid "LDAP warning"
 msgstr "Avertissement LDAP"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 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:2701
+#: include/functions.inc:2702
 msgid "Used to store account specific informations."
 msgstr "Utilisé pour stocker les informations spécifiques des comptes."
 
-#: include/functions.inc:2708
+#: include/functions.inc:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1513,27 +1663,27 @@ msgstr ""
 "Utilisé pour verrouiller les entrées actuellement modifiées afin d'éviter de "
 "multiples changements simultanés."
 
-#: include/functions.inc:2753
+#: include/functions.inc:2754
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Object class obligatoire '%s' manquante !"
 
-#: include/functions.inc:2756
+#: include/functions.inc:2757
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Object class facultative '%s' manquante !"
 
-#: include/functions.inc:2761
+#: include/functions.inc:2762
 #, 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:2764
+#: include/functions.inc:2765
 #, php-format
 msgid "Class(es) available"
 msgstr "Classe(s) disponible(s)"
 
-#: include/functions.inc:2786
+#: include/functions.inc:2787
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1542,7 +1692,7 @@ msgstr ""
 "serveur ldap' lors de l'installation, mais la configuration de vos schéma ne "
 "supportent pas cette option."
 
-#: include/functions.inc:2787
+#: include/functions.inc:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1550,7 +1700,7 @@ msgstr ""
 "Pour pouvoir utiliser des groupes conformes à la norme rfc2307bis, "
 "l'objectClass 'posixGroup' doit être       AUXILIARY"
 
-#: include/functions.inc:2791
+#: include/functions.inc:2792
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1559,101 +1709,103 @@ msgstr ""
 "avez désactivé cette option lors de l'étape 'configuration de l'annuaire "
 "ldap' du programme d'installation."
 
-#: include/functions.inc:2792
+#: include/functions.inc:2793
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr "L'objectClass 'posixGroup' doit être STRUCTURAL"
 
-#: include/functions.inc:2816
+#: include/functions.inc:2817
 msgid "German"
 msgstr "Allemand"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2818
 msgid "French"
 msgstr "Français"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr "Italien"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr "Espagnol"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2821
 msgid "English"
 msgstr "Anglais"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr "Hollandais"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2823
 msgid "Polish"
 msgstr "Polonais"
 
-#: include/functions.inc:2824
+#: include/functions.inc:2825
 msgid "Chinese"
 msgstr "Chinois"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2826
 msgid "Vietnamese"
 msgstr "Vietnamien"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr "Russe"
 
-#: include/functions.inc:3021
+#: include/functions.inc:3022
 #, 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:3054
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr "Impossible de générer un hash samba !"
 
-#: include/functions.inc:3067
+#: include/functions.inc:3068
 #, 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: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
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 msgid "Cannot allocate a free ID:"
 msgstr "Impossible d'assigner un ID libre :"
 
-#: include/functions.inc:3348
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr "Méthode d'allocation des id inconnue !"
 
-#: include/functions.inc:3362
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3392
+#: include/functions.inc:3393
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Impossible de créer l'entrée sambaUnixIdPool !"
 
-#: include/functions.inc:3400
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr "sambaUnixIdPool n'est pas unique !"
 
-#: include/functions.inc:3412 include/functions.inc:3416
+#: include/functions.inc:3413 include/functions.inc:3417
 msgid "no ID available!"
 msgstr "Pas d' ID disponibles !"
 
-#: include/functions.inc:3440
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr "Nombre maximum d'essais dépassés !"
 
-#: include/functions.inc:3500
+#: include/functions.inc:3501
 msgid "Cannot allocate a free ID!"
 msgstr "Impossible d'assigner un ID libre !"
 
@@ -1688,38 +1840,6 @@ msgstr "Supprimer le snapshot"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr ""
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -2094,7 +2214,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
@@ -2165,7 +2286,9 @@ msgstr "Le champ '%s' contient des caractères invalides !"
 msgid "Missing %s PHP extension!"
 msgstr "Extension PHP %s manquante !"
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Ajouter"
@@ -2206,7 +2329,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."
@@ -2222,7 +2346,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."
@@ -2469,7 +2594,8 @@ msgstr ""
 
 #: 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é !"
@@ -2529,12 +2655,12 @@ msgstr "GOsa support Service"
 msgid "Cannot not parse XML!"
 msgstr "Impossible de lire le contenu du fichier XML"
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1184
 #, 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:1200
+#: include/class_gosaSupportDaemon.inc:1204
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Impossible d'enlever l'entrée %s !"
@@ -2627,12 +2753,12 @@ msgid "Please fix the above error and reload the page."
 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:1248
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Informations"
@@ -2645,20 +2771,22 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Messagerie"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:750
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr ""
 
@@ -2675,34 +2803,24 @@ msgstr ""
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr "Groupes"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/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:188
 #: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:766
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Téléphone"
 
@@ -2713,6 +2831,7 @@ msgstr "Applications"
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
 #: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Serveur"
@@ -2723,6 +2842,7 @@ msgstr "Clients légers"
 
 #: plugins/generic/references/class_reference.inc:69
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr "Stations de travail"
 
@@ -2776,12 +2896,6 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "L'équipe de GOsa"
 
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/dep-list.tpl:13 plugins/admin/acl/acl-list.tpl:13
-msgid "Update"
-msgstr "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 "
@@ -2792,7 +2906,7 @@ msgstr ""
 "données."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/class_ogroup.inc:1080
 msgid "Object groups"
 msgstr "Groupes d'objets"
 
@@ -2802,7 +2916,7 @@ msgstr "Gestion des groupe d'objets"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/users/class_userManagement.inc:189
 msgid "Infrastructure error"
 msgstr "Erreur d'infrastructure"
 
@@ -2811,6 +2925,7 @@ msgid "Templates"
 msgstr "Modèles"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
 #: 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"
@@ -2821,6 +2936,7 @@ msgid "Windows Install"
 msgstr "Installation Windows"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 msgid "Terminal"
 msgstr ""
 
@@ -2830,118 +2946,118 @@ msgstr ""
 "Vous ne pouvez pas combiner des terminaux et des stations de travail dans un "
 "groupe d'objet !"
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 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
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
 #, php-format
 msgid "Show %s"
 msgstr "Afficher %s"
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 msgid "people"
 msgstr "utilisateurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr "groupes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr "serveurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr "stations de travail"
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr "terminaux"
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 msgid "printer"
 msgstr "imprimante"
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr "imprimantes"
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr "téléphones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr "aucun"
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr "nombre d'objets différents trop important !"
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr "utilisateurs"
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 msgid "winstations"
 msgstr "Stations Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 #: 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 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:645
+#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "permettre l'accès a ces hôtes"
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 msgid "Non existing dn:"
 msgstr "le dn n'existe pas :"
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
@@ -2950,20 +3066,20 @@ msgstr ""
 "Ces systèmes sont déjà configurés par d'autres groupes d'objets et ne "
 "peuvent pas être ajoutés :"
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
 #: 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: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/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3000,27 +3116,29 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Nom"
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "You can combine two different object types at maximum, only!"
 msgstr "Vous pouvez combiner au maximum deux objets différents !"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 msgid "Object group generic"
 msgstr "Groupes d'objets"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 msgid "Sytem trust"
 msgstr "Système de Confiance"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 msgid "Member"
 msgstr "Membres"
 
@@ -3057,7 +3175,7 @@ msgid "Select a base"
 msgstr "Sélectionnez une base"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Système de Confiance"
@@ -3096,8 +3214,9 @@ msgstr "Sommaire FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:758
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr "Environnement"
 
@@ -3109,14 +3228,6 @@ 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-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 "Filtre"
-
 #: plugins/admin/ogroups/ogroup-filter.tpl:11
 msgid "user groups"
 msgstr "groupes d'utilisateurs"
@@ -3218,7 +3329,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3239,19 +3350,19 @@ 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
+#: plugins/admin/groups/trust_machines.tpl:25
 #: plugins/personal/posix/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Afficher les systèmes du département"
 
 #: plugins/admin/ogroups/trust_machines.tpl:30
-#: plugins/admin/groups/trust_machines.tpl:30
+#: plugins/admin/groups/trust_machines.tpl:29
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Afficher les systèmes correspondant"
 
 #: plugins/admin/ogroups/trust_machines.tpl:31
-#: plugins/admin/groups/trust_machines.tpl:31
+#: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Expression régulière pour sélectionner les adresses correspondantes"
@@ -3289,6 +3400,45 @@ msgstr "Afficher les utilisateurs correspondants"
 msgid "Regular expression for matching user names"
 msgstr "Expression régulière concordant avec les noms des utilisateurs"
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Veuillez sélectionner la langue par défaut"
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr "Prénom"
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+msgid "Surname"
+msgstr "Nom de famille"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "groupes principaux"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Groupes Samba"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+msgid "Show mail groups"
+msgstr "Groupes de messagerie"
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3345,112 +3495,101 @@ msgstr "dans tout les groupes"
 msgid "Not in all groups"
 msgstr "pas dans tout les groupes"
 
-#: plugins/admin/groups/group-filter.tpl:11
-msgid "Show primary groups"
-msgstr "groupes principaux"
-
-#: plugins/admin/groups/group-filter.tpl:12
-msgid "Show samba groups"
-msgstr "Groupes Samba"
-
-#: plugins/admin/groups/group-filter.tpl:13
-msgid "Show mail groups"
-msgstr "Groupes de messagerie"
-
 #: 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 !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr "Administrateurs du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr "Utilisateurs du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr "Invités du domaine"
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr "Groupe spécial (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 "L'ajout de l'UID '%s' au groupe '%s' à échoué : Impossible de trouver "
 "l'utilisateur !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 "L'ajout de l'UID '%s' au groupe '%s' à échoué : l'UID est utilisé plus d'un "
 "fois !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 msgid "! unknown UID"
 msgstr "! identifiant inconnu"
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, 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:969
+#: plugins/admin/groups/class_groupGeneric.inc:932
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Impossible de trouver le SID pour '%s' !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:974
+#: plugins/admin/groups/class_groupGeneric.inc:937
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Impossible de trouver le RIDBASe pour '%s' !"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #, 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: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/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1212
 msgid "Generic group settings"
 msgstr "Préférences des groupes génériques"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 msgid "Samba group type"
 msgstr "Groupe Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 msgid "Samba domain name"
 msgstr "Domaine Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 msgid "Phone pickup group"
 msgstr "Groupe téléphonique"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1230
 msgid "Nagios group"
 msgstr "Groupe Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 msgid "Group member"
 msgstr "Membre du groupe"
 
@@ -3459,6 +3598,7 @@ msgid "Group settings"
 msgstr "Préférences des groupes"
 
 #: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
 msgid "List of groups"
 msgstr "Liste des groupes"
 
@@ -3475,38 +3615,46 @@ msgid "Group administration"
 msgstr "Administration du groupe"
 
 #: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
 msgid "Posix"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
 msgid "Edit posix properties"
 msgstr "Modifier les propriétés posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Modifier les propriétés de messagerie"
 
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 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
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Modifier les propriétés téléphoniques"
 
 #: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
 msgid "Menu"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
 msgid "Edit start menu properties"
 msgstr "Modifier les propriétes du menu de démarrage"
 
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Modifier les propriétés d'environnement"
 
@@ -3570,7 +3718,7 @@ msgstr ""
 "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/class_userManagement.inc:405
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
@@ -3590,47 +3738,38 @@ msgstr "Prénom"
 msgid "Manage users"
 msgstr "Gèrer les utilisateurs"
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:278
 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: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:649
+#: plugins/admin/users/class_userManagement.inc:650
 msgid "Account locking"
 msgstr "Verrouillage du compte"
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:651
 #, 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 (%s) n'a "
-"pas été verrouillé !"
+"La méthode '%s' ne permet pas le verrouillage du mot de passe. Le compte (%"
+"s) n'a pas été verrouillé !"
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:724
 msgid "Unlock account"
 msgstr "Déverrouiller le compte"
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "Lock account"
 msgstr "Verrouiller Compte"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit generic properties"
 msgstr "Modifier les propriétés de base"
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:742
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3638,19 +3777,19 @@ msgstr "Modifier les propriétés de base"
 msgid "POSIX"
 msgstr "UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:743
 msgid "Edit POSIX properties"
 msgstr "Modifier les propriétés UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:754
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:755
 msgid "Edit netatalk properties"
 msgstr "Modifier les propriétés de Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Edit FAX properties"
 msgstr "Modifier les propriétés FAX"
 
@@ -3658,11 +3797,6 @@ msgstr "Modifier les propriétés FAX"
 msgid "List of users"
 msgstr "Liste des utilisateurs"
 
-#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1608
-msgid "Surname"
-msgstr "Nom de famille"
-
 #: plugins/admin/users/user-list.xml:140
 msgid "Lock users"
 msgstr "Verouillez les utilisateurs"
@@ -3747,49 +3881,6 @@ msgstr ""
 "fichier avant de réaliser cette action. Appuyez sur 'Supprimer' pour "
 "continuer ou 'Annuler' pour abandonner."
 
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Liste des départements"
-
-#: 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/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-msgid "Domain component"
-msgstr "Composant domaine"
-
-#: 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/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/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
 msgid "Locality name"
@@ -3874,8 +3965,8 @@ msgstr "Catégorie pour cette branche de l'annuaire"
 #: 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/class_user.inc:1639
+#: plugins/personal/generic/generic.tpl:387
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Lieu"
@@ -3884,8 +3975,8 @@ msgstr "Lieu"
 #: 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/class_user.inc:1638
+#: plugins/personal/generic/generic.tpl:395
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Département"
@@ -3904,7 +3995,7 @@ msgstr "Lieu de cette branche"
 #: 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/generic.tpl:403
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -3925,10 +4016,10 @@ msgstr "Numéro de téléphone de base pour cette sous-branche"
 #: 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/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
@@ -3964,14 +4055,15 @@ msgid ""
 "management dialog."
 msgstr ""
 "Dès que l'opération de marquage est finie, vous pouvez aller à la fin de la "
-"page et appuyer sur le bouton 'Continuer' pour continuer la gestion des départements."
+"page et appuyer sur le bouton 'Continuer' pour continuer la gestion des "
+"départements."
 
 #: 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:1635
+#: plugins/personal/generic/class_user.inc:1640
 msgid "Postal address"
 msgstr "Adresse postale"
 
@@ -4139,12 +4231,13 @@ msgstr "Objet utilisé"
 #: 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/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:454
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Rôle"
@@ -4181,7 +4274,7 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Editer les paramètres organisationnels de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:274
 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 "
@@ -4234,215 +4327,216 @@ msgstr ""
 "Le format de stockage sélectionné pour les mots de passe n'est plus "
 "disponible."
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1156
 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:1158
+#: plugins/personal/generic/class_user.inc:1163
 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:1176
+#: plugins/personal/generic/class_user.inc:1181
 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:1247
+#: plugins/personal/generic/class_user.inc:1252
 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:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: 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:1318
-#: plugins/personal/generic/class_user.inc:1731
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Bip"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Date de naissance"
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1441
 msgid "Cannot open certificate!"
 msgstr "Impossible d'ouvrir le certificat !"
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unité"
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identifiant du bâtiment"
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Travail"
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Dernière distribution"
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lieu de résidence"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Description de l'unité"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Zone de sujet"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Fonction"
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1595
 #: 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:1591
-#: plugins/personal/generic/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visible par tous"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Rue"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Code postal"
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1603
 msgid "Generic user settings"
 msgstr "Paramètres par défaut des utilisateurs"
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mon Compte"
 
-#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/class_user.inc:1615
 msgid "User identification"
 msgstr "Information Utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titre Personnel"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1617
 #: 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:1615
+#: plugins/personal/generic/class_user.inc:1620
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Sexe"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Preferred language"
 msgstr "Langue préférée"
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1624
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Image de l'utilisateur"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Department number"
 msgstr "Numéro du département"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Employee number"
 msgstr "Numéro de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Type de l'employé"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Room number"
 msgstr "Numéro du bureau"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1633
 msgid "Telefon number"
 msgstr "Numéro de téléphone"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Pager number"
 msgstr "Numéro de page"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Mobile number"
 msgstr "Numéro de GSM"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1636
 msgid "Fax number"
 msgstr "Numéro de fax"
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr "Adresse postale personnelle"
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1643
 msgid "Home phone number"
 msgstr "Numéro de téléphone privé"
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1645
 msgid "User password method"
 msgstr "Méthode d'encodage des mots de passe"
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1646
 msgid "User certificates"
 msgstr "Certificats utilisateurs"
 
@@ -4505,33 +4599,33 @@ msgstr "Editer des certificats"
 msgid "Restrict login to"
 msgstr "Restreindre le login à"
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr "IP ou réseau"
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informations sur l'entreprise"
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "No. du département."
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "No. de l'employé."
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "No. de bureau."
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr "Veuillez utiliser l'onglet téléphone"
 
@@ -4612,40 +4706,40 @@ msgstr "mot de passe expiré"
 msgid "automatic"
 msgstr "automatique"
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, 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:519
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, 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:523
+#: plugins/personal/posix/class_posixAccount.inc:452
 #, 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:527
+#: plugins/personal/posix/class_posixAccount.inc:456
 #, 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:864
+#: plugins/personal/posix/class_posixAccount.inc:793
 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:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr "Groupe d'utilisateurs"
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:946
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
@@ -4653,90 +4747,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:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
-#: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: 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:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1440
 msgid "POSIX account"
 msgstr "Compte Posix"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "ID de l'utilisateur"
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1453
 msgid "Group ID"
 msgstr "ID du Groupe"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1455
 msgid "Force password change on login"
 msgstr "Forcer le changement de mot de passe au la connexion"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1456
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1457
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1458
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1459
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1460
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr "Clef SSH publique"
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1462
 msgid "System trust model"
 msgstr "Système de Confiance"
 
@@ -4812,6 +4906,26 @@ msgstr "Afficher les groupes contenant des utilisateurs"
 msgid "User name of which groups are shown"
 msgstr "Utilisateur dont on montre les groupes"
 
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#, fuzzy
+msgid "List of systems"
+msgstr "Liste des utilisateurs"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+#, fuzzy
+msgid "Show servers"
+msgstr "serveurs"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+#, fuzzy
+msgid "Show workstations"
+msgstr "stations de travail"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+#, fuzzy
+msgid "Show terminals"
+msgstr "terminaux"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Paramètres Posix"
@@ -4822,7 +4936,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"
@@ -4864,7 +4979,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
@@ -4895,7 +5011,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"
@@ -4966,7 +5083,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."
@@ -5358,7 +5476,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"
@@ -5401,14 +5520,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."
@@ -5424,7 +5545,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."
@@ -5510,7 +5632,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."
@@ -5532,7 +5655,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."
@@ -5574,7 +5698,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'."
@@ -5909,7 +6034,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"
@@ -6041,7 +6167,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'."
@@ -6062,8 +6189,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
@@ -6092,7 +6221,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."
@@ -6129,7 +6259,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
@@ -6159,7 +6290,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."
@@ -6379,7 +6511,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"
@@ -6592,3 +6725,10 @@ msgstr "Cette étape vous permet de sélectionner votre langue préférée."
 msgid "Automatic"
 msgstr "Automatique"
 
+#, fuzzy
+#~ msgid "givenname"
+#~ msgstr "Prénom"
+
+#, fuzzy
+#~ msgid "surename"
+#~ msgstr "Nom de famille"
index b35c02269b3a33af6e849790106793d44f60b8cf..1c2874d62ef2424539a509fe1bae8c7ac251bc55 100644 (file)
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 17:26+0100\n"
+"POT-Creation-Date: 2010-01-27 15:02+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"
@@ -15,6 +15,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.9.1\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Base"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr ""
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -27,6 +81,7 @@ msgstr "Informazioni"
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr "Filtri"
@@ -35,16 +90,16 @@ msgstr "Filtri"
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
+#: include/functions.inc:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
 #: 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #: 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:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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
@@ -286,7 +341,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:248
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -310,6 +365,127 @@ msgstr "Cambia la password"
 msgid "Click here to change your password"
 msgstr "Non hai il permesso di cambiare la tua password."
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista dei dipartimenti"
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: 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 "nel dominio"
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Amministratori di Dominio"
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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à"
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organizzazione"
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Dipartimento"
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Descrizione"
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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"
+
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr ""
@@ -396,22 +572,22 @@ 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/class_management.inc:446
-#: include/class_management.inc:910
+#: html/index.php:228 include/class_management.inc:447
+#: include/class_management.inc:583 include/class_management.inc:915
 #: 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/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 include/class_tabs.inc:56
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
 #: 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_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:159
@@ -420,18 +596,18 @@ msgstr "Continua"
 #: 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:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/admin/groups/class_groupGeneric.inc:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
 #: 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:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -474,7 +650,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:276
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -580,6 +756,19 @@ msgstr ""
 msgid "Logout"
 msgstr "Termina sessione"
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtri"
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -609,7 +798,7 @@ msgstr "Connesso:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_department.inc:386
 #, fuzzy
@@ -626,9 +815,9 @@ 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:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
@@ -638,7 +827,7 @@ msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, fuzzy
 msgid "Configuration error"
 msgstr "File di configurazione"
@@ -657,7 +846,7 @@ msgstr "Algorimo password"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -676,10 +865,10 @@ msgstr "La 'Nuova password' immessa è troppo corta."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -740,20 +929,20 @@ msgstr ""
 #: 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/functions.inc:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
 #: 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:1102
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/departments/class_department.inc:241
 #: plugins/admin/departments/class_department.inc:429
 #: plugins/admin/departments/class_department.inc:702
@@ -761,10 +950,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:635
 #: plugins/admin/acl/class_aclRole.inc:675
 #: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -900,46 +1089,53 @@ msgstr ""
 msgid "unconfigured"
 msgstr "non configurata"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 #, fuzzy
 msgid "Filter error"
 msgstr "Terminal Server"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 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_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:612
 #, fuzzy
 msgid "Permission"
 msgstr "Permessi"
 
-#: include/class_management.inc:352
-#: plugins/admin/users/class_userManagement.inc:570
-#: plugins/admin/users/class_userManagement.inc:574
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "Permessi"
 
-#: include/class_management.inc:426 include/class_plugin.inc:1546
+#: include/class_management.inc:427 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_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -1016,12 +1212,12 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1608
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Utenti"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
@@ -1029,28 +1225,19 @@ msgstr "Gruppi di utenti"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:394
 msgid "Up"
 msgstr ""
 
 #: include/class_acl.inc:495 include/class_listing.inc:235
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:396
 #, fuzzy
 msgid "Down"
 msgstr "Dominio"
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Modifica"
-
 #: include/class_acl.inc:500 include/class_acl.inc:504
 #: include/class_acl.inc:1253 include/class_acl.inc:1254
 #: include/class_acl.inc:1259 include/class_tabs.inc:401
@@ -1061,8 +1248,8 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
+#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
 #: plugins/admin/acl/class_aclRole.inc:452
 #, php-format
 msgid "Delete"
@@ -1134,10 +1321,10 @@ 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: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/functions.inc:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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
@@ -1195,41 +1382,34 @@ msgstr "ACL"
 msgid "Close"
 msgstr "Scegli"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
 msgid "Go to root department"
 msgstr "Vai al dipartimento base"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
+#: include/class_listing.inc:998
 msgid "Root"
 msgstr "Root"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
 msgid "Go up one department"
 msgstr "Sali di dipartimento"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
 msgid "Go to users department"
 msgstr "Vai agli utenti del dipartimento"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
+#: include/class_listing.inc:1014
 msgid "Home"
 msgstr "Home"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
 msgid "Reload list"
 msgstr ""
 
-#: 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 ""
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1247,34 +1427,7 @@ msgstr ""
 msgid "Choose a base"
 msgstr "Rimuovi"
 
-#: 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_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_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Base"
-
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:299 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
@@ -1283,76 +1436,70 @@ msgstr "Base"
 msgid "Select all"
 msgstr "Rimuovi"
 
-#: include/class_listing.inc:499
+#: include/class_listing.inc:509
 #, fuzzy
 msgid "created by"
 msgstr "Creare"
 
-#: 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_listing.inc:1379 include/class_listing.inc:1429
 #: include/class_plugin.inc:2070
 #, fuzzy
 msgid "Copy"
 msgstr "Azienda"
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_listing.inc:1385 include/class_listing.inc:1419
 #: include/class_plugin.inc:2074
 #, fuzzy
 msgid "Cut"
 msgstr "Esegui"
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
+#: include/class_listing.inc:1393 include/class_listing.inc:1395
 #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
 #: include/class_CopyPasteHandler.inc:514
 #, fuzzy
 msgid "Paste"
 msgstr "Data"
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1419 include/class_plugin.inc:2028
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Modifica questo record"
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1429 include/class_plugin.inc:2036
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Modifica questo record"
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
+#: include/class_listing.inc:1461 include/class_listing.inc:1463
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Crea estensioni di posta"
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1477
 #, fuzzy
 msgid "Export list"
 msgstr "Esporta"
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
 #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1522 include/class_plugin.inc:2009
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Crea estensioni di posta"
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1523 include/class_plugin.inc:2010
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Gruppo di oggetti"
 
-#: include/class_sortableListing.inc:132
+#: include/class_sortableListing.inc:194
 msgid "Edit this entry"
 msgstr "Modifica questo record"
 
-#: include/class_sortableListing.inc:133
+#: include/class_sortableListing.inc:199
 msgid "Delete this entry"
 msgstr "Elimina questo record"
 
@@ -1367,18 +1514,18 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:447
+#: include/functions.inc:448
 #, 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:518
+#: include/functions.inc:519
 #, 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:603
+#: include/functions.inc:604
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
@@ -1386,11 +1533,11 @@ msgid ""
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/functions.inc:789 include/functions.inc:907
+#: include/functions.inc:790 include/functions.inc:908
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1398,239 +1545,239 @@ msgid ""
 msgstr ""
 "Errore di connessione al server LDAP. Contatta l'amministratore del sistema."
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:928
+#: include/functions.inc:929
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1233
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1234
+#: include/functions.inc:1235
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Configura"
 
-#: include/functions.inc:1251
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr "incompleto"
 
-#: include/functions.inc:1641
+#: include/functions.inc:1642
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Continua"
 
-#: include/functions.inc:1643
+#: include/functions.inc:1644
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Modifica contatto"
 
-#: include/functions.inc:1645
+#: include/functions.inc:1646
 #, 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:1885
+#: include/functions.inc:1886
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "versione di sviluppo di GOsa (Rev %s)"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2370
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:2404 include/functions.inc:2424
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Rimuovi"
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Amministrazione LDAP"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2701
+#: include/functions.inc:2702
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2708
+#: include/functions.inc:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2754
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Lista dei dipartimenti"
 
-#: include/functions.inc:2756
+#: include/functions.inc:2757
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2761
+#: include/functions.inc:2762
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2764
+#: include/functions.inc:2765
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2786
+#: include/functions.inc:2787
 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:2787
+#: include/functions.inc:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2791
+#: include/functions.inc:2792
 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:2792
+#: include/functions.inc:2793
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2816
+#: include/functions.inc:2817
 msgid "German"
 msgstr "Tedesco"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2818
 msgid "French"
 msgstr "Francese"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr "Spagnolo"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2821
 msgid "English"
 msgstr "Inglese"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr "Tedesco"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2823
 #, fuzzy
 msgid "Polish"
 msgstr "Inglese"
 
-#: include/functions.inc:2824
+#: include/functions.inc:2825
 #, fuzzy
 msgid "Chinese"
 msgstr "reset"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2826
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Nome"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr "Russo"
 
-#: include/functions.inc:3021
+#: include/functions.inc:3022
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3054
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3067
+#: include/functions.inc:3068
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
-#: include/functions.inc:3348
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3362
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3392
+#: include/functions.inc:3393
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Vai al dipartimento base"
 
-#: include/functions.inc:3400
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3412 include/functions.inc:3416
+#: include/functions.inc:3413 include/functions.inc:3417
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3440
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3500
+#: include/functions.inc:3501
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "Troppi utenti non posso allocare un ID libero!"
@@ -1665,38 +1812,6 @@ msgstr "Crea estensioni di posta"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr "Descrizione"
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -2161,7 +2276,9 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr "Elimina foto"
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Aggiungi"
@@ -2522,12 +2639,12 @@ msgstr ""
 msgid "Cannot not parse XML!"
 msgstr "Troppi utenti non posso allocare un ID libero!"
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1184
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Rimuovi"
 
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1204
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
@@ -2620,12 +2737,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1248
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Generale"
@@ -2638,20 +2755,22 @@ msgstr "Unix"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Posta"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:750
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr "FAX"
 
@@ -2668,34 +2787,24 @@ msgstr "FTP"
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr "Gruppo"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/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:188
 #: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:766
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Telefono"
 
@@ -2706,6 +2815,7 @@ msgstr "Applicazione"
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
 #: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Server"
@@ -2716,6 +2826,7 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:69
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr ""
 
@@ -2769,12 +2880,6 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Il team di GOsa"
 
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/dep-list.tpl:13 plugins/admin/acl/acl-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/ogroups/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -2782,7 +2887,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/class_ogroup.inc:1080
 msgid "Object groups"
 msgstr "Gruppi di oggetti"
 
@@ -2793,7 +2898,7 @@ msgstr "Nome del gruppo"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/users/class_userManagement.inc:189
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "Errore PHP"
@@ -2804,6 +2909,7 @@ msgid "Templates"
 msgstr "Template"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
 #: 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"
@@ -2814,6 +2920,7 @@ msgid "Windows Install"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 #, fuzzy
 msgid "Terminal"
 msgstr "Terminali"
@@ -2822,141 +2929,141 @@ msgstr "Terminali"
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 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
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
 #, fuzzy, php-format
 msgid "Show %s"
 msgstr "Mostra gruppi"
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 #, fuzzy
 msgid "people"
 msgstr "Mostra persone"
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr "gruppi"
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr "server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 #, fuzzy
 msgid "printer"
 msgstr "stampanti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr "stampanti"
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr "telefoni"
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr "applicazioni"
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr "nessuno"
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr "utenti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 #, fuzzy
 msgid "winstations"
 msgstr "Amministrazione"
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 #: 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 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:645
+#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "accesso limitato ai seguenti host"
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
 #: 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: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/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -2993,29 +3100,31 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Cognome"
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 #, fuzzy
 msgid "Object group generic"
 msgstr "Gruppo di oggetti"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Accesso ai sistemi"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 #, fuzzy
 msgid "Member"
 msgstr "Membri"
@@ -3054,7 +3163,7 @@ msgid "Select a base"
 msgstr "Rimuovi"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Accesso ai sistemi"
@@ -3095,8 +3204,9 @@ msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:758
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr "Ambiente"
 
@@ -3109,15 +3219,6 @@ msgstr "Applicazioni"
 msgid "Please enter the new object group name"
 msgstr "Inserisci la URI del server LDAP"
 
-#: 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-filter.tpl:11
 #, fuzzy
 msgid "user groups"
@@ -3233,7 +3334,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3254,19 +3355,19 @@ msgid "Select systems to add"
 msgstr "Seleziona un sistema da aggiungere"
 
 #: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:25
 #: plugins/personal/posix/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Mostra i sistemi del dipartimento"
 
 #: plugins/admin/ogroups/trust_machines.tpl:30
-#: plugins/admin/groups/trust_machines.tpl:30
+#: plugins/admin/groups/trust_machines.tpl:29
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Mostra i sistemi che corrispondono a:"
 
 #: plugins/admin/ogroups/trust_machines.tpl:31
-#: plugins/admin/groups/trust_machines.tpl:31
+#: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Espressione regolare per selezionare l'indirizzo"
@@ -3301,6 +3402,46 @@ msgstr "Mostra utenti che corrispondono a"
 msgid "Regular expression for matching user names"
 msgstr ""
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Lingua preferita"
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr "Nome"
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+msgid "Surname"
+msgstr "Cognome"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Mostra gruppi principali"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Mostra gruppi samba"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
+msgstr "Mostra gruppi samba"
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3360,114 +3501,101 @@ msgstr "Gruppo primario"
 msgid "Not in all groups"
 msgstr "Mostra gruppi di posta"
 
-#: plugins/admin/groups/group-filter.tpl:11
-msgid "Show primary groups"
-msgstr "Mostra gruppi principali"
-
-#: plugins/admin/groups/group-filter.tpl:12
-msgid "Show samba groups"
-msgstr "Mostra gruppi samba"
-
-#: plugins/admin/groups/group-filter.tpl:13
-#, fuzzy
-msgid "Show mail groups"
-msgstr "Mostra gruppi samba"
-
 #: plugins/admin/groups/class_groupGeneric.inc:161
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr "Gruppo Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr "Amministratori di Dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr "Utenti di Dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr "Ospiti di Dominio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr "Gruppo speciale (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:969
+#: plugins/admin/groups/class_groupGeneric.inc:932
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Rimuovi"
 
-#: plugins/admin/groups/class_groupGeneric.inc:974
+#: plugins/admin/groups/class_groupGeneric.inc:937
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Rimuovi"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1212
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Impostazioni generali delle code"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 #, fuzzy
 msgid "Samba group type"
 msgstr "Gruppo Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Home di Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "I membri sono in un gruppo di risposta telefonica"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1230
 #, fuzzy
 msgid "Nagios group"
 msgstr "Contatto"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 #, fuzzy
 msgid "Group member"
 msgstr "Membri del gruppo"
@@ -3478,6 +3606,7 @@ msgid "Group settings"
 msgstr "Impostazioni FAX"
 
 #: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
 msgid "List of groups"
 msgstr "Lista dei gruppi"
 
@@ -3496,45 +3625,53 @@ msgid "Group administration"
 msgstr "Amministrazione dei gruppi di utenti"
 
 #: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
 #, fuzzy
 msgid "Posix"
 msgstr "Proxy"
 
 #: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
 #, fuzzy
 msgid "Edit posix properties"
 msgstr "Modifica proprietà"
 
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Modifica proprietà"
 
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Modifica proprietà"
 
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Modifica proprietà"
 
 #: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
 #, fuzzy
 msgid "Menu"
 msgstr "Stampante"
 
 #: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
 #, fuzzy
 msgid "Edit start menu properties"
 msgstr "Modifica proprietà"
 
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Modifica proprietà"
@@ -3590,7 +3727,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:404
+#: plugins/admin/users/class_userManagement.inc:405
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
@@ -3613,48 +3750,39 @@ msgstr "Liste di blocco"
 msgid "Manage users"
 msgstr "Utenti di Dominio"
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:278
 #, 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: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:649
+#: plugins/admin/users/class_userManagement.inc:650
 #, fuzzy
 msgid "Account locking"
 msgstr "Sicurezza"
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:651
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:724
 #, fuzzy
 msgid "Unlock account"
 msgstr "Identità"
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 #, fuzzy
 msgid "Lock account"
 msgstr "Identità"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:742
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3662,21 +3790,21 @@ msgstr "Modifica proprietà"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:743
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:754
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:755
 #, fuzzy
 msgid "Edit netatalk properties"
 msgstr "Modifica proprietà"
 
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:763
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Modifica proprietà"
@@ -3685,11 +3813,6 @@ msgstr "Modifica proprietà"
 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 "Lock users"
@@ -3777,52 +3900,6 @@ msgid ""
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Lista dei dipartimenti"
-
-#: 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 "nel dominio"
-
-#: plugins/admin/departments/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Amministratori di Dominio"
-
-#: 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/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/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
 #, fuzzy
@@ -3908,8 +3985,8 @@ msgstr ""
 #: 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/class_user.inc:1639
+#: plugins/personal/generic/generic.tpl:387
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Località"
@@ -3918,8 +3995,8 @@ msgstr "Località"
 #: 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/class_user.inc:1638
+#: plugins/personal/generic/generic.tpl:395
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Stato"
@@ -3938,7 +4015,7 @@ msgstr ""
 #: 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/generic.tpl:403
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -3959,10 +4036,10 @@ msgstr ""
 #: 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/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
@@ -4006,7 +4083,7 @@ msgid "Organization name"
 msgstr "Organizzazione"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1640
 msgid "Postal address"
 msgstr "CAP"
 
@@ -4184,8 +4261,8 @@ msgstr ""
 
 #: 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/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:454
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Ruolo"
@@ -4225,7 +4302,7 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Opzioni applicazione"
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:274
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
@@ -4273,225 +4350,225 @@ msgstr "Non ci sono certificati installati"
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1156
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1163
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1181
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1247
+#: plugins/personal/generic/class_user.inc:1252
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Home Page"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1731
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data di nascita"
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1441
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Impossibile aprite il certificato selezionato!"
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unità"
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identificativo della casa"
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Ultimo recapito"
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Località personale"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Descrizoione unità"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Funzione"
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Numero seriale del certificato"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Pubblico"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Strada"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "CAP"
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1603
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Impostazioni generali delle code"
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Identità"
 
-#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/class_user.inc:1615
 #, fuzzy
 msgid "User identification"
 msgstr "Amministrazione utenti"
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Titolo onorifico"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1617
 #: 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:1615
+#: plugins/personal/generic/class_user.inc:1620
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Sesso"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1621
 #, fuzzy
 msgid "Preferred language"
 msgstr "Lingua preferita"
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1624
 #: plugins/personal/generic/paste_generic.tpl:47
 #, fuzzy
 msgid "User picture"
 msgstr "Foto personale"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Department number"
 msgstr "Dipartimento"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1629
 #, fuzzy
 msgid "Employee number"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Qualifica"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1632
 #, fuzzy
 msgid "Room number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1633
 #, fuzzy
 msgid "Telefon number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1634
 #, fuzzy
 msgid "Pager number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1635
 #, fuzzy
 msgid "Mobile number"
 msgstr "Cellulare"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1636
 #, fuzzy
 msgid "Fax number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1643
 #, fuzzy
 msgid "Home phone number"
 msgstr "Numero di telefono"
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1645
 #, fuzzy
 msgid "User password method"
 msgstr "Algorimo password"
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1646
 #, fuzzy
 msgid "User certificates"
 msgstr "Certificato standard"
@@ -4556,33 +4633,33 @@ msgstr "Modifica certificati"
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informazioni organizzazione"
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Dipartimento No."
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Matricola"
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Stanza No."
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr "Usa il tab del telefono"
 
@@ -4671,138 +4748,138 @@ msgstr "La password spira il"
 msgid "automatic"
 msgstr "automatico"
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, 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:519
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, 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:523
+#: plugins/personal/posix/class_posixAccount.inc:452
 #, 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:527
+#: plugins/personal/posix/class_posixAccount.inc:456
 #, 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:864
+#: plugins/personal/posix/class_posixAccount.inc:793
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr "Gruppo di utenti"
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:946
 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:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
-#: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: 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:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 #, fuzzy
 msgid "shadowMin"
 msgstr "Mostra terminali"
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 #, fuzzy
 msgid "shadowWarning"
 msgstr "Mostra workstation"
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 #, fuzzy
 msgid "shadowInactive"
 msgstr "Mostra stampanti"
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1440
 #, fuzzy
 msgid "POSIX account"
 msgstr "Estenzioni FTP"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1453
 #, fuzzy
 msgid "Group ID"
 msgstr "Gruppo"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1455
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Cambia la password"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1456
 #, fuzzy
 msgid "Shadow min"
 msgstr "Mostra terminali"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1457
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Mostra workstation"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Mostra stampanti"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Mostra persone"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1462
 #, fuzzy
 msgid "System trust model"
 msgstr "Accesso ai sistemi"
@@ -4882,6 +4959,23 @@ msgstr "Mostra gruppi di utenti"
 msgid "User name of which groups are shown"
 msgstr "Nome dell'utente del quale mostrare i gruppi"
 
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#, fuzzy
+msgid "List of systems"
+msgstr "Lista degli utenti"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+msgid "Show servers"
+msgstr "Mostra server"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+msgid "Show workstations"
+msgstr "Mostra workstation"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+msgid "Show terminals"
+msgstr "Mostra terminali"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -6730,6 +6824,14 @@ msgstr "Lingua preferita"
 msgid "Automatic"
 msgstr "automatico"
 
+#, fuzzy
+#~ msgid "givenname"
+#~ msgstr "Nome"
+
+#, fuzzy
+#~ msgid "surename"
+#~ msgstr "Cognome"
+
 #, fuzzy
 #~ msgid "Edit ogroup"
 #~ msgstr "Lista dei gruppi"
@@ -7003,9 +7105,6 @@ msgstr "automatico"
 #~ msgid "Delete acl role"
 #~ msgstr "Rimuovi"
 
-#~ msgid "Surename"
-#~ msgstr "Cognome"
-
 #, fuzzy
 #~ msgid "Steps"
 #~ msgstr "Sistemi"
@@ -7525,15 +7624,6 @@ msgstr "automatico"
 #~ msgid "Show applications"
 #~ msgstr "Mostra applicazioni"
 
-#~ msgid "Show servers"
-#~ msgstr "Mostra server"
-
-#~ msgid "Show workstations"
-#~ msgstr "Mostra workstation"
-
-#~ msgid "Show terminals"
-#~ msgstr "Mostra terminali"
-
 #~ msgid "Show printers"
 #~ msgstr "Mostra stampanti"
 
index 4ce49e7f4c44c401e37505a8725b1222dee27f77..677ca92cfa91ab2ccde14a656e6294ab781eab30 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 17:26+0100\n"
+"POT-Creation-Date: 2010-01-27 15:02+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"
@@ -16,6 +16,60 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr ""
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -28,6 +82,7 @@ msgstr ""
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr ""
@@ -36,16 +91,16 @@ msgstr ""
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
+#: include/functions.inc:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
 #: 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #: 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:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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
@@ -271,7 +326,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:248
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -293,6 +348,124 @@ msgstr ""
 msgid "Click here to change your password"
 msgstr ""
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: plugins/admin/departments/dep-list.xml:15
+#: plugins/admin/departments/dep-list.xml:103
+#: plugins/admin/departments/class_departmentManagement.inc:175
+msgid "Domain"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+msgid "Domain component"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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 ""
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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 ""
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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 ""
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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 ""
+
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr ""
@@ -376,22 +549,22 @@ msgstr ""
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: html/index.php:228 include/class_management.inc:446
-#: include/class_management.inc:910
+#: html/index.php:228 include/class_management.inc:447
+#: include/class_management.inc:583 include/class_management.inc:915
 #: 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/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 include/class_tabs.inc:56
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
 #: 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_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:159
@@ -400,18 +573,18 @@ msgstr ""
 #: 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:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/admin/groups/class_groupGeneric.inc:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
 #: 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:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -452,7 +625,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:276
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -553,6 +726,18 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+msgid "Filter"
+msgstr ""
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -581,7 +766,7 @@ msgstr ""
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
@@ -597,9 +782,9 @@ 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:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
@@ -609,7 +794,7 @@ msgstr ""
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 msgid "Configuration error"
 msgstr ""
 
@@ -626,7 +811,7 @@ msgstr ""
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -644,10 +829,10 @@ msgstr ""
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -706,20 +891,20 @@ msgstr ""
 #: 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/functions.inc:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
 #: 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:1102
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/departments/class_department.inc:241
 #: plugins/admin/departments/class_department.inc:429
 #: plugins/admin/departments/class_department.inc:702
@@ -727,10 +912,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:635
 #: plugins/admin/acl/class_aclRole.inc:675
 #: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -857,43 +1042,50 @@ msgstr ""
 msgid "unconfigured"
 msgstr ""
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 msgid "Filter error"
 msgstr ""
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 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_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:612
 msgid "Permission"
 msgstr ""
 
-#: include/class_management.inc:352
-#: plugins/admin/users/class_userManagement.inc:570
-#: plugins/admin/users/class_userManagement.inc:574
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
 #: plugins/admin/acl/class_aclManagement.inc:98
 msgid "Permission error"
 msgstr ""
 
-#: include/class_management.inc:426 include/class_plugin.inc:1546
+#: include/class_management.inc:427 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_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -965,12 +1157,12 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1608
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr ""
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
@@ -978,27 +1170,18 @@ msgstr ""
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:394
 msgid "Up"
 msgstr ""
 
 #: include/class_acl.inc:495 include/class_listing.inc:235
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr ""
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr ""
-
 #: include/class_acl.inc:500 include/class_acl.inc:504
 #: include/class_acl.inc:1253 include/class_acl.inc:1254
 #: include/class_acl.inc:1259 include/class_tabs.inc:401
@@ -1009,8 +1192,8 @@ msgid "ACL"
 msgstr ""
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
+#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
 #: plugins/admin/acl/class_aclRole.inc:452
 #, php-format
 msgid "Delete"
@@ -1074,10 +1257,10 @@ msgstr ""
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: include/functions.inc:603 include/functions.inc:789
-#: include/functions.inc:907 include/functions.inc:1305
-#: include/functions.inc:2369 include/functions.inc:2403
-#: include/functions.inc:2423 include/class_ldap.inc:692
+#: include/functions.inc:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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
@@ -1129,41 +1312,34 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
 msgid "Go to root department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
+#: include/class_listing.inc:998
 msgid "Root"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
 msgid "Go up one department"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
 msgid "Go to users department"
 msgstr ""
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
+#: include/class_listing.inc:1014
 msgid "Home"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
 msgid "Reload list"
 msgstr ""
 
-#: 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 ""
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1178,34 +1354,7 @@ msgstr ""
 msgid "Choose a base"
 msgstr ""
 
-#: 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_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_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr ""
-
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:299 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
@@ -1213,66 +1362,60 @@ msgstr ""
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:499
+#: include/class_listing.inc:509
 msgid "created by"
 msgstr ""
 
-#: 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_listing.inc:1379 include/class_listing.inc:1429
 #: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_listing.inc:1385 include/class_listing.inc:1419
 #: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
+#: include/class_listing.inc:1393 include/class_listing.inc:1395
 #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr ""
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1419 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1429 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
+#: include/class_listing.inc:1461 include/class_listing.inc:1463
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1477
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
 #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1522 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1523 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_sortableListing.inc:132
+#: include/class_sortableListing.inc:194
 msgid "Edit this entry"
 msgstr ""
 
-#: include/class_sortableListing.inc:133
+#: include/class_sortableListing.inc:199
 msgid "Delete this entry"
 msgstr ""
 
@@ -1287,256 +1430,256 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:447
+#: include/functions.inc:448
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:518
+#: include/functions.inc:519
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:603
+#: include/functions.inc:604
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:789 include/functions.inc:907
+#: include/functions.inc:790 include/functions.inc:908
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:928
+#: include/functions.inc:929
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1233
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1234
+#: include/functions.inc:1235
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr ""
 
-#: include/functions.inc:1251
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1641
+#: include/functions.inc:1642
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1643
+#: include/functions.inc:1644
 msgid "Edit anyway"
 msgstr ""
 
-#: include/functions.inc:1645
+#: include/functions.inc:1646
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1885
+#: include/functions.inc:1886
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2369
+#: include/functions.inc:2370
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:2404 include/functions.inc:2424
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2701
+#: include/functions.inc:2702
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2708
+#: include/functions.inc:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2754
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2756
+#: include/functions.inc:2757
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2761
+#: include/functions.inc:2762
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2764
+#: include/functions.inc:2765
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2786
+#: include/functions.inc:2787
 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:2787
+#: include/functions.inc:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2791
+#: include/functions.inc:2792
 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:2792
+#: include/functions.inc:2793
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2816
+#: include/functions.inc:2817
 msgid "German"
 msgstr ""
 
-#: include/functions.inc:2817
+#: include/functions.inc:2818
 msgid "French"
 msgstr ""
 
-#: include/functions.inc:2818
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2819
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr ""
 
-#: include/functions.inc:2820
+#: include/functions.inc:2821
 msgid "English"
 msgstr ""
 
-#: include/functions.inc:2821
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr ""
 
-#: include/functions.inc:2822
+#: include/functions.inc:2823
 msgid "Polish"
 msgstr ""
 
-#: include/functions.inc:2824
+#: include/functions.inc:2825
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2825
+#: include/functions.inc:2826
 msgid "Vietnamese"
 msgstr ""
 
-#: include/functions.inc:2826
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr ""
 
-#: include/functions.inc:3021
+#: include/functions.inc:3022
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3054
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3067
+#: include/functions.inc:3068
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3348
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3362
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3392
+#: include/functions.inc:3393
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3400
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3412 include/functions.inc:3416
+#: include/functions.inc:3413 include/functions.inc:3417
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3440
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3500
+#: include/functions.inc:3501
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -1569,38 +1712,6 @@ msgstr ""
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr ""
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -2034,7 +2145,9 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr ""
@@ -2377,12 +2490,12 @@ msgstr ""
 msgid "Cannot not parse XML!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1184
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1204
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
@@ -2469,12 +2582,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1248
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr ""
@@ -2487,20 +2600,22 @@ msgstr ""
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:750
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr ""
 
@@ -2517,34 +2632,24 @@ msgstr ""
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/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:188
 #: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:766
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr ""
 
@@ -2555,6 +2660,7 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
 #: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr ""
@@ -2565,6 +2671,7 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:69
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr ""
 
@@ -2612,12 +2719,6 @@ msgstr ""
 msgid "The GOsa team"
 msgstr ""
 
-#: 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 "
@@ -2625,7 +2726,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/class_ogroup.inc:1080
 msgid "Object groups"
 msgstr ""
 
@@ -2635,7 +2736,7 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/users/class_userManagement.inc:189
 msgid "Infrastructure error"
 msgstr ""
 
@@ -2644,6 +2745,7 @@ msgid "Templates"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
 #: 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"
@@ -2654,6 +2756,7 @@ msgid "Windows Install"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 msgid "Terminal"
 msgstr ""
 
@@ -2661,138 +2764,138 @@ msgstr ""
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 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
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 msgid "people"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 msgid "printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr ""
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 msgid "winstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 #: 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:571
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:645
+#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 msgid "Non existing dn:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
 #: 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: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/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -2829,27 +2932,29 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 msgid "Sytem trust"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 msgid "Member"
 msgstr ""
 
@@ -2886,7 +2991,7 @@ msgid "Select a base"
 msgstr ""
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr ""
@@ -2925,8 +3030,9 @@ msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:758
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr ""
 
@@ -2938,14 +3044,6 @@ msgstr ""
 msgid "Please enter the new object group name"
 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
-msgid "Filter"
-msgstr ""
-
 #: plugins/admin/ogroups/ogroup-filter.tpl:11
 msgid "user groups"
 msgstr ""
@@ -3047,7 +3145,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3068,19 +3166,19 @@ msgid "Select systems to add"
 msgstr ""
 
 #: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:25
 #: 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/admin/groups/trust_machines.tpl:29
 #: 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/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr ""
@@ -3115,6 +3213,44 @@ msgstr ""
 msgid "Regular expression for matching user names"
 msgstr ""
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr ""
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+msgid "Surname"
+msgstr ""
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr ""
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+msgid "Show mail groups"
+msgstr ""
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3169,108 +3305,96 @@ msgstr ""
 msgid "Not in all groups"
 msgstr ""
 
-#: plugins/admin/groups/group-filter.tpl:11
-msgid "Show primary groups"
-msgstr ""
-
-#: plugins/admin/groups/group-filter.tpl:12
-msgid "Show samba groups"
-msgstr ""
-
-#: plugins/admin/groups/group-filter.tpl:13
-msgid "Show mail groups"
-msgstr ""
-
 #: plugins/admin/groups/class_groupGeneric.inc:161
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 msgid "! unknown UID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:969
+#: plugins/admin/groups/class_groupGeneric.inc:932
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:974
+#: plugins/admin/groups/class_groupGeneric.inc:937
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1212
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1230
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 msgid "Group member"
 msgstr ""
 
@@ -3279,6 +3403,7 @@ msgid "Group settings"
 msgstr ""
 
 #: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
 msgid "List of groups"
 msgstr ""
 
@@ -3295,38 +3420,46 @@ msgid "Group administration"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
 msgid "Posix"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
 msgid "Edit posix properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
 msgid "Menu"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
 msgid "Edit start menu properties"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr ""
 
@@ -3378,7 +3511,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:404
+#: plugins/admin/users/class_userManagement.inc:405
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
@@ -3398,43 +3531,34 @@ msgstr ""
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:278
 msgid "You have no permission to change this users password!"
 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:649
+#: plugins/admin/users/class_userManagement.inc:650
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:651
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:724
 msgid "Unlock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "Lock account"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit generic properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:742
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3442,19 +3566,19 @@ msgstr ""
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:743
 msgid "Edit POSIX properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:754
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:755
 msgid "Edit netatalk properties"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:763
 msgid "Edit FAX properties"
 msgstr ""
 
@@ -3462,11 +3586,6 @@ msgstr ""
 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
 msgid "Lock users"
 msgstr ""
@@ -3543,49 +3662,6 @@ msgid ""
 "'Delete' to continue or 'Cancel' to abort."
 msgstr ""
 
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr ""
-
-#: 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/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-msgid "Domain component"
-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/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/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
 msgid "Locality name"
@@ -3668,8 +3744,8 @@ msgstr ""
 #: 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/class_user.inc:1639
+#: plugins/personal/generic/generic.tpl:387
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr ""
@@ -3678,8 +3754,8 @@ msgstr ""
 #: 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/class_user.inc:1638
+#: plugins/personal/generic/generic.tpl:395
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr ""
@@ -3698,7 +3774,7 @@ msgstr ""
 #: 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/generic.tpl:403
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -3719,10 +3795,10 @@ msgstr ""
 #: 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/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
@@ -3763,7 +3839,7 @@ msgid "Organization name"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1640
 msgid "Postal address"
 msgstr ""
 
@@ -3927,8 +4003,8 @@ msgstr ""
 
 #: 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/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:454
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr ""
@@ -3963,7 +4039,7 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:274
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
@@ -4010,211 +4086,211 @@ msgstr ""
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1156
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1163
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1181
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1247
+#: plugins/personal/generic/class_user.inc:1252
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1731
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1441
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1603
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/class_user.inc:1615
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1617
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1620
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1624
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1633
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1636
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1643
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1645
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1646
 msgid "User certificates"
 msgstr ""
 
@@ -4277,33 +4353,33 @@ msgstr ""
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr ""
 
@@ -4381,125 +4457,125 @@ msgstr ""
 msgid "automatic"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:519
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:523
+#: plugins/personal/posix/class_posixAccount.inc:452
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:456
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:793
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:946
 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:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
-#: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1440
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1453
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1455
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1456
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1457
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1458
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1459
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1460
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1462
 msgid "System trust model"
 msgstr ""
 
@@ -4575,6 +4651,22 @@ msgstr ""
 msgid "User name of which groups are shown"
 msgstr ""
 
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+msgid "List of systems"
+msgstr ""
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+msgid "Show servers"
+msgstr ""
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+msgid "Show workstations"
+msgstr ""
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+msgid "Show terminals"
+msgstr ""
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr ""
index 51c2ed575c02b5f096ded150eb9c1efd09d92592..32657a700f433832ee8c3fcd76b0726470e0c6f1 100644 (file)
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 17:26+0100\n"
+"POT-Creation-Date: 2010-01-27 15:02+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"
@@ -19,6 +19,60 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Basis"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr "Verwerk"
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -31,6 +85,7 @@ msgstr "Informatie"
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr "Filters"
@@ -39,16 +94,16 @@ msgstr "Filters"
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
+#: include/functions.inc:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
 #: 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #: 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:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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
@@ -301,7 +356,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:248
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -325,6 +380,127 @@ msgstr "Verander wachtwoord"
 msgid "Click here to change your password"
 msgstr "Klik hier om uw wachtwoord te veranderen."
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lijst met afdelingen"
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Windows beheerders"
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organisatie"
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Afdeling"
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Omschrijving"
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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"
+
 #: ihtml/themes/default/logout-close.tpl:5
 #, fuzzy
 msgid "Your GOsa session has been closed!"
@@ -414,22 +590,22 @@ 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/class_management.inc:446
-#: include/class_management.inc:910
+#: html/index.php:228 include/class_management.inc:447
+#: include/class_management.inc:583 include/class_management.inc:915
 #: 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/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 include/class_tabs.inc:56
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
 #: 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_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:159
@@ -438,18 +614,18 @@ msgstr "Doorgaan"
 #: 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:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/admin/groups/class_groupGeneric.inc:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
 #: 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:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -492,7 +668,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:276
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -614,6 +790,19 @@ msgstr ""
 msgid "Logout"
 msgstr "Uitloggen"
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filters"
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -644,7 +833,7 @@ msgstr "Aangemeld:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_department.inc:386
 #, fuzzy
@@ -661,9 +850,9 @@ 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:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
@@ -673,7 +862,7 @@ msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, fuzzy
 msgid "Configuration error"
 msgstr "Configuratie bestand"
@@ -693,7 +882,7 @@ msgstr "Wachtwoord encryptie"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -714,10 +903,10 @@ msgstr "Het nieuw opgegeven wachtwoord is te kort."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -778,20 +967,20 @@ msgstr ""
 #: 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/functions.inc:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
 #: 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:1102
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/departments/class_department.inc:241
 #: plugins/admin/departments/class_department.inc:429
 #: plugins/admin/departments/class_department.inc:702
@@ -799,10 +988,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:635
 #: plugins/admin/acl/class_aclRole.inc:675
 #: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -947,46 +1136,53 @@ msgstr ""
 msgid "unconfigured"
 msgstr "niet geconfigureerd"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 #, fuzzy
 msgid "Filter error"
 msgstr "Terminal server"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 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_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:612
 #, fuzzy
 msgid "Permission"
 msgstr "Rechten"
 
-#: include/class_management.inc:352
-#: plugins/admin/users/class_userManagement.inc:570
-#: plugins/admin/users/class_userManagement.inc:574
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "Rechten"
 
-#: include/class_management.inc:426 include/class_plugin.inc:1546
+#: include/class_management.inc:427 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_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -1064,12 +1260,12 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1608
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Gebruikers"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
@@ -1077,27 +1273,18 @@ msgstr "Groepen"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:394
 msgid "Up"
 msgstr "Omhoog"
 
 #: include/class_acl.inc:495 include/class_listing.inc:235
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "Omlaag"
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Bewerken"
-
 #: include/class_acl.inc:500 include/class_acl.inc:504
 #: include/class_acl.inc:1253 include/class_acl.inc:1254
 #: include/class_acl.inc:1259 include/class_tabs.inc:401
@@ -1108,8 +1295,8 @@ msgid "ACL"
 msgstr "Rechten"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
+#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
 #: plugins/admin/acl/class_aclRole.inc:452
 #, php-format
 msgid "Delete"
@@ -1180,10 +1367,10 @@ 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: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/functions.inc:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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
@@ -1241,41 +1428,34 @@ msgstr "Rechten"
 msgid "Close"
 msgstr "Sluiten"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
 msgid "Go to root department"
 msgstr "Ga naar basis afdelingen"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
+#: include/class_listing.inc:998
 msgid "Root"
 msgstr "Basis"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
 msgid "Go up one department"
 msgstr "Ga een afdeling omhoog"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
 msgid "Go to users department"
 msgstr "Ga naar gebruikers afdeling"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
+#: include/class_listing.inc:1014
 msgid "Home"
 msgstr "Home"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
 msgid "Reload list"
 msgstr "Lijst herladen"
 
-#: 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"
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1292,34 +1472,7 @@ msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
 msgid "Choose a base"
 msgstr "Selecteer een basis"
 
-#: 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_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_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Basis"
-
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:299 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
@@ -1328,73 +1481,67 @@ msgstr "Basis"
 msgid "Select all"
 msgstr "Selecteer"
 
-#: include/class_listing.inc:499
+#: include/class_listing.inc:509
 #, fuzzy
 msgid "created by"
 msgstr "Aanmaken"
 
-#: 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_listing.inc:1379 include/class_listing.inc:1429
 #: include/class_plugin.inc:2070
 #, fuzzy
 msgid "Copy"
 msgstr "kopieer"
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_listing.inc:1385 include/class_listing.inc:1419
 #: include/class_plugin.inc:2074
 #, fuzzy
 msgid "Cut"
 msgstr "knippen"
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
+#: include/class_listing.inc:1393 include/class_listing.inc:1395
 #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Plakken"
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1419 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Deze invoer knippen"
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1429 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Deze invoer kopieren"
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
+#: include/class_listing.inc:1461 include/class_listing.inc:1463
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Nagios account aanmaken"
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1477
 #, fuzzy
 msgid "Export list"
 msgstr "Exporteer"
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
 #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1522 include/class_plugin.inc:2009
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Nagios account aanmaken"
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1523 include/class_plugin.inc:2010
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Nieuw FAI object aanmaken"
 
-#: include/class_sortableListing.inc:132
+#: include/class_sortableListing.inc:194
 msgid "Edit this entry"
 msgstr "Bewerk deze invoer"
 
-#: include/class_sortableListing.inc:133
+#: include/class_sortableListing.inc:199
 msgid "Delete this entry"
 msgstr "Verwijder deze invoer"
 
@@ -1409,29 +1556,29 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:447
+#: include/functions.inc:448
 #, 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:518
+#: include/functions.inc:519
 #, 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:603
+#: include/functions.inc:604
 #, 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:789 include/functions.inc:907
+#: include/functions.inc:790 include/functions.inc:908
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1440,12 +1587,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:799
+#: include/functions.inc:800
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server"
 
-#: include/functions.inc:928
+#: include/functions.inc:929
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -1454,12 +1601,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:1232
+#: include/functions.inc:1233
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "De hoeveelheidslimiet van %d invoeren is overschreden!"
 
-#: include/functions.inc:1234
+#: include/functions.inc:1235
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1468,166 +1615,166 @@ msgstr ""
 "Stel de nieuwe hoeveelheidslimiet in op %s en toon me dit bericht indien de "
 "limiet nog steeds overschreden wordt."
 
-#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Instellen"
 
-#: include/functions.inc:1251
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr "onvolledig"
 
-#: include/functions.inc:1641
+#: include/functions.inc:1642
 msgid "Continue anyway"
 msgstr "Toch doorgaan"
 
-#: include/functions.inc:1643
+#: include/functions.inc:1644
 msgid "Edit anyway"
 msgstr "Alsnog bewerken"
 
-#: include/functions.inc:1645
+#: include/functions.inc:1646
 #, 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:1885
+#: include/functions.inc:1886
 msgid "Entries per page"
 msgstr "Regels per pagina"
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Filter toepassen"
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2272
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa ontwikkelversie (Revisie %s)"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2370
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:2404 include/functions.inc:2424
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 #, fuzzy
 msgid "LDAP warning"
 msgstr "LDAP beheer"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 #, 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:2701
+#: include/functions.inc:2702
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2708
+#: include/functions.inc:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2754
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Toon FAI sjabloon objecten"
 
-#: include/functions.inc:2756
+#: include/functions.inc:2757
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2761
+#: include/functions.inc:2762
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2764
+#: include/functions.inc:2765
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "Bestand is beschikbaar"
 
-#: include/functions.inc:2786
+#: include/functions.inc:2787
 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:2787
+#: include/functions.inc:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2791
+#: include/functions.inc:2792
 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:2792
+#: include/functions.inc:2793
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2816
+#: include/functions.inc:2817
 msgid "German"
 msgstr "Duits"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2818
 msgid "French"
 msgstr "Frans"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr "Italiaans"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr "Spaans"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2821
 msgid "English"
 msgstr "Engels"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr "Nederlands"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2823
 msgid "Polish"
 msgstr "Pools"
 
-#: include/functions.inc:2824
+#: include/functions.inc:2825
 #, fuzzy
 msgid "Chinese"
 msgstr "Chipset"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2826
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Naam"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr "Russisch"
 
-#: include/functions.inc:3021
+#: include/functions.inc:3022
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1635,53 +1782,53 @@ msgstr ""
 "Het commando '%s' dat gespecificeerd is als POSTMODIFY voor module '%s' "
 "bestaat niet."
 
-#: include/functions.inc:3054
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3067
+#: include/functions.inc:3068
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: include/functions.inc:3348
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3362
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3392
+#: include/functions.inc:3393
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Ga naar basis afdelingen"
 
-#: include/functions.inc:3400
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3412 include/functions.inc:3416
+#: include/functions.inc:3413 include/functions.inc:3417
 #, fuzzy
 msgid "no ID available!"
 msgstr "Bestand is beschikbaar"
 
-#: include/functions.inc:3440
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3500
+#: include/functions.inc:3501
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr ""
@@ -1719,38 +1866,6 @@ msgstr "Nagios account aanmaken"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr "Omschrijving"
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -2223,7 +2338,9 @@ msgstr "Het veld 'Naam' bevat ongeldige karakters."
 msgid "Missing %s PHP extension!"
 msgstr "Verwijder printer mogelijkheden"
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Toevoegen"
@@ -2593,12 +2710,12 @@ msgid "Cannot not parse XML!"
 msgstr ""
 "Er zitten te veel gebruikers in de database. Kan geen vrij ID toewijzen!"
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1184
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1204
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Onbekende FAI status %s"
@@ -2691,12 +2808,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1248
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Algemeen"
@@ -2709,20 +2826,22 @@ msgstr "Unix"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "E-mail"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:750
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr "Fax"
 
@@ -2739,34 +2858,24 @@ msgstr "Ftp"
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr "Groep"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/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:188
 #: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:766
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Telefoon"
 
@@ -2777,6 +2886,7 @@ msgstr "Programma"
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
 #: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Server"
@@ -2787,6 +2897,7 @@ msgstr "Thin Client"
 
 #: plugins/generic/references/class_reference.inc:69
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr "Werkstation"
 
@@ -2840,12 +2951,6 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Het GOsa team"
 
-#: 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 "
@@ -2855,7 +2960,7 @@ msgstr ""
 "mogelijkheid voor GOsa is om uw data terug te krijgen."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/class_ogroup.inc:1080
 msgid "Object groups"
 msgstr "Objectgroepen"
 
@@ -2866,7 +2971,7 @@ msgstr "Naam van objectgroepen"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/users/class_userManagement.inc:189
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "PHP fout"
@@ -2877,6 +2982,7 @@ msgid "Templates"
 msgstr "Sjabloon"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
 #: 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"
@@ -2888,6 +2994,7 @@ msgid "Windows Install"
 msgstr "Windows werkstation"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -2895,141 +3002,141 @@ msgstr "Terminal"
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 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
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
 #, fuzzy, php-format
 msgid "Show %s"
 msgstr "Toon groepen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 #, fuzzy
 msgid "people"
 msgstr "Toon personen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr "groepen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr "servers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr "werkstations"
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr "terminals"
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 #, fuzzy
 msgid "printer"
 msgstr "printers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr "printers"
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr "telefoons"
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr "programma's"
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr "geen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr "te veel verschillende object tpyes!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr "gebruikers"
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 #, fuzzy
 msgid "winstations"
 msgstr "Windows werkstation"
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 #: 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 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:645
+#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "sta toegang op deze computers toe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 msgid "Non existing dn:"
 msgstr "Niet bestaande dn: "
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
 #: 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: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/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3066,30 +3173,32 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Naam"
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr "U kunt maximaal twee verschillende object types tegelijk combineren!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 #, fuzzy
 msgid "Object group generic"
 msgstr "Objectgroep"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Systeem vertrouwen"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 #, fuzzy
 msgid "Member"
 msgstr "Groepsleden"
@@ -3127,7 +3236,7 @@ msgid "Select a base"
 msgstr "Selecteer een basis"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Systeem vertrouwen"
@@ -3167,8 +3276,9 @@ msgstr "FAI samenvatting"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:758
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr "Omgeving"
 
@@ -3181,15 +3291,6 @@ msgstr "Programma's"
 msgid "Please enter the new object group name"
 msgstr "Geef a.u.b. een nieuwe naam op"
 
-#: 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-filter.tpl:11
 #, fuzzy
 msgid "user groups"
@@ -3304,7 +3405,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3325,19 +3426,19 @@ msgid "Select systems to add"
 msgstr "Selecteer de toe te voegen systemen"
 
 #: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:25
 #: plugins/personal/posix/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Toon systemen van afdeling"
 
 #: plugins/admin/ogroups/trust_machines.tpl:30
-#: plugins/admin/groups/trust_machines.tpl:30
+#: plugins/admin/groups/trust_machines.tpl:29
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Toon de overeenkomende systemen"
 
 #: plugins/admin/ogroups/trust_machines.tpl:31
-#: plugins/admin/groups/trust_machines.tpl:31
+#: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Reguliere expresie voor overeenkomende adressen"
@@ -3374,6 +3475,46 @@ msgstr "Toon overeenkomende gebruikers"
 msgid "Regular expression for matching user names"
 msgstr "Reguliere expressie voor overeenkomende gebruikersnamen"
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Voorkeurstaal"
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr "Naam"
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+msgid "Surname"
+msgstr "Achternaam"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Toon primaire groepen"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Toon Samba groepen"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
+msgstr "Toon Samba groepen"
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3432,19 +3573,6 @@ msgstr "Primaire groep"
 msgid "Not in all groups"
 msgstr "Toon E-mail groepen"
 
-#: plugins/admin/groups/group-filter.tpl:11
-msgid "Show primary groups"
-msgstr "Toon primaire groepen"
-
-#: plugins/admin/groups/group-filter.tpl:12
-msgid "Show samba groups"
-msgstr "Toon Samba groepen"
-
-#: plugins/admin/groups/group-filter.tpl:13
-#, fuzzy
-msgid "Show mail groups"
-msgstr "Toon Samba groepen"
-
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #, fuzzy
 msgid "Cannot find group SID in your configuration!"
@@ -3452,98 +3580,98 @@ msgstr ""
 "Kan de SID van deze groep niet vinden in de LDAP database of in uw "
 "configuratie bestand."
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr "Samba groep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr "Windows beheerders"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr "Windows gebruikers"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr "Windows gasten"
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr "Speciale groep (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 #, fuzzy
 msgid "! unknown UID"
 msgstr "! onbekend id"
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:969
+#: plugins/admin/groups/class_groupGeneric.inc:932
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: plugins/admin/groups/class_groupGeneric.inc:974
+#: plugins/admin/groups/class_groupGeneric.inc:937
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Kan bestand '%s' niet aanmaken."
 
-#: plugins/admin/groups/class_groupGeneric.inc:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1212
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 #, fuzzy
 msgid "Samba group type"
 msgstr "Samba groep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Samba home"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "Leden zitten in een telefoon beantwoordgroep"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1230
 #, fuzzy
 msgid "Nagios group"
 msgstr "Nagios account"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 #, fuzzy
 msgid "Group member"
 msgstr "Groepsleden"
@@ -3553,6 +3681,7 @@ msgid "Group settings"
 msgstr "Groep instellingen"
 
 #: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
 msgid "List of groups"
 msgstr "Lijst met groepen"
 
@@ -3571,41 +3700,49 @@ msgid "Group administration"
 msgstr "Groepen beheer"
 
 #: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
 msgid "Posix"
 msgstr "Posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
 #, fuzzy
 msgid "Edit posix properties"
 msgstr "Bewerk telefoon eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Bewerk E-mail eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Bewerk Samba eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Bewerk telefoon eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
 #, fuzzy
 msgid "Menu"
 msgstr "Printer"
 
 #: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
 #, fuzzy
 msgid "Edit start menu properties"
 msgstr "Bewerk Samba eigenschappen"
 
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Bewerk omgeving eigenschappen"
 
@@ -3669,7 +3806,7 @@ msgstr ""
 "gebruik van sjablonen over te slaan."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:404
+#: plugins/admin/users/class_userManagement.inc:405
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
@@ -3690,47 +3827,38 @@ msgstr "Voornaam"
 msgid "Manage users"
 msgstr "Windows gebruikers"
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:278
 #, 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: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:649
+#: plugins/admin/users/class_userManagement.inc:650
 #, fuzzy
 msgid "Account locking"
 msgstr "Account"
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:651
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:724
 #, fuzzy
 msgid "Unlock account"
 msgstr "Mijn account"
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 #, fuzzy
 msgid "Lock account"
 msgstr "Mijn account"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit generic properties"
 msgstr "Bewerk algemene eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:742
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3738,20 +3866,20 @@ msgstr "Bewerk algemene eigenschappen"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:743
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Bewerk UNIX eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:754
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:755
 msgid "Edit netatalk properties"
 msgstr "Bewerk Netatalk eigenschappen"
 
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:763
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Bewerk UNIX eigenschappen"
@@ -3760,11 +3888,6 @@ msgstr "Bewerk UNIX eigenschappen"
 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 "Lock users"
@@ -3858,52 +3981,6 @@ 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/dep-list.xml:11
-msgid "List of departments"
-msgstr "Lijst met afdelingen"
-
-#: 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/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Windows beheerders"
-
-#: 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/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/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
 #, fuzzy
@@ -3989,8 +4066,8 @@ msgstr "Categorie voor deze subtree"
 #: 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/class_user.inc:1639
+#: plugins/personal/generic/generic.tpl:387
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Plaats"
@@ -3999,8 +4076,8 @@ msgstr "Plaats"
 #: 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/class_user.inc:1638
+#: plugins/personal/generic/generic.tpl:395
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Provincie"
@@ -4019,7 +4096,7 @@ msgstr "Plaats van deze subtree"
 #: 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/generic.tpl:403
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -4040,10 +4117,10 @@ msgstr "Basis telefoonnummer van deze subtree"
 #: 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/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
@@ -4087,7 +4164,7 @@ msgid "Organization name"
 msgstr "Organisatie"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1640
 msgid "Postal address"
 msgstr "Adres thuis"
 
@@ -4272,8 +4349,8 @@ msgstr ""
 
 #: 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/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:454
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Funktie"
@@ -4313,7 +4390,7 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Programma instellingen"
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:274
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
@@ -4362,225 +4439,225 @@ msgstr "Geen certificaat geinstalleerd"
 msgid "The selected password method is no longer available."
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1156
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1163
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1181
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1247
+#: plugins/personal/generic/class_user.inc:1252
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "Dit programma is niet meer beschikbaar."
 
-#: plugins/personal/generic/class_user.inc:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Homepage"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1731
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "GSM"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pieper"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Geboortedatum"
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1441
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Het opgegeven certificaat kon geopend worden!"
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Eenheid"
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Huis identificatie"
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Beroep"
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Laatste levering"
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Werkplaats"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Eenheid omschrijving"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Werkgebied"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Functionele titel"
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Certificaat serienummer"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Publiek zichtbaar"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Straat"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Postcode"
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1603
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Algemene wachtrij instellingen"
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Mijn account"
 
-#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/class_user.inc:1615
 #, fuzzy
 msgid "User identification"
 msgstr "Gebruikersinformatie"
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Aanhef"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1617
 #: 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:1615
+#: plugins/personal/generic/class_user.inc:1620
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Geslacht"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1621
 #, fuzzy
 msgid "Preferred language"
 msgstr "Voorkeurstaal"
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1624
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Persoonlijk plaatje"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Department number"
 msgstr "Afdelingnaam"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1629
 #, fuzzy
 msgid "Employee number"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Functie"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1632
 #, fuzzy
 msgid "Room number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1633
 #, fuzzy
 msgid "Telefon number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1634
 #, fuzzy
 msgid "Pager number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1635
 #, fuzzy
 msgid "Mobile number"
 msgstr "GSM nummer"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1636
 #, fuzzy
 msgid "Fax number"
 msgstr "Serienummer"
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr "Adres thuis"
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1643
 #, fuzzy
 msgid "Home phone number"
 msgstr "Telefoonnummer"
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1645
 #, fuzzy
 msgid "User password method"
 msgstr "Wachtwoord encryptie"
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1646
 #, fuzzy
 msgid "User certificates"
 msgstr "Standaard certificaat"
@@ -4644,33 +4721,33 @@ msgstr "Bewerk certificaten"
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Organisatie informatie"
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Afdeling nr."
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Personeel nr."
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Kamer nr."
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr "Gebruik a.u.b. de telefoon tab"
 
@@ -4755,140 +4832,140 @@ msgstr "actief, wachtwoord verlopen"
 msgid "automatic"
 msgstr "automatisch"
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, 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:519
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, 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:523
+#: plugins/personal/posix/class_posixAccount.inc:452
 #, 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:527
+#: plugins/personal/posix/class_posixAccount.inc:456
 #, 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:864
+#: plugins/personal/posix/class_posixAccount.inc:793
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr "Gebruikersgroep"
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:946
 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:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
-#: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: 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:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 #, fuzzy
 msgid "shadowMin"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 #, fuzzy
 msgid "shadowMax"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 #, fuzzy
 msgid "shadowWarning"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 #, fuzzy
 msgid "shadowInactive"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1440
 #, fuzzy
 msgid "POSIX account"
 msgstr "GLPI account"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Gebruikers ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1453
 #, fuzzy
 msgid "Group ID"
 msgstr "Groep"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1455
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Het veranderen van het wachtwoord is niet toegestaan"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1456
 #, fuzzy
 msgid "Shadow min"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1457
 #, fuzzy
 msgid "Shadow max"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Schaduwen van andere sessie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Toon personen"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1462
 #, fuzzy
 msgid "System trust model"
 msgstr "Systeem vertrouwen"
@@ -4968,6 +5045,23 @@ msgstr "Toon groepen van gebruiker"
 msgid "User name of which groups are shown"
 msgstr "Gebruikersnaam van wie de groepen getoond worden"
 
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#, fuzzy
+msgid "List of systems"
+msgstr "Lijst met gebruikers"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+msgid "Show servers"
+msgstr "Toon servers"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+msgid "Show workstations"
+msgstr "Toon werkstations"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+msgid "Show terminals"
+msgstr "Toon terminals"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Posix instellingen"
@@ -6844,6 +6938,14 @@ msgstr ""
 msgid "Automatic"
 msgstr "automatisch"
 
+#, fuzzy
+#~ msgid "givenname"
+#~ msgstr "Naam"
+
+#, fuzzy
+#~ msgid "surename"
+#~ msgstr "Achternaam"
+
 #, fuzzy
 #~ msgid "Edit ogroup"
 #~ msgstr "Lijst met groepen"
@@ -7146,9 +7248,6 @@ msgstr "automatisch"
 #~ msgid "Delete acl role"
 #~ msgstr "Verwijder gebruiker"
 
-#~ msgid "Surename"
-#~ msgstr "Achternaam"
-
 #, fuzzy
 #~ msgid "Steps"
 #~ msgstr "Systemen"
@@ -7764,21 +7863,12 @@ msgstr "automatisch"
 #~ msgid "Show applications"
 #~ msgstr "Toon programma's"
 
-#~ msgid "Show servers"
-#~ msgstr "Toon servers"
-
 #~ msgid "Select to see workstations"
 #~ msgstr "Selecteer om werkstations te zien"
 
-#~ msgid "Show workstations"
-#~ msgstr "Toon werkstations"
-
 #~ msgid "Select to see terminals"
 #~ msgstr "Selecteer om terminals te zien"
 
-#~ msgid "Show terminals"
-#~ msgstr "Toon terminals"
-
 #~ msgid "Select to see printers"
 #~ msgstr "Selecteer om printers te zien"
 
index 0df00cf02ed956542098a6894a95c134497514c8..334b76b09fb3b3689569c3bf726d433df8c9f953 100644 (file)
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: polski\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 17:26+0100\n"
+"POT-Creation-Date: 2010-01-27 15:02+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"
@@ -14,6 +14,60 @@ msgstr ""
 "X-Poedit-SourceCharset: iso-8859-2\n"
 "X-Poedit-Basepath: tedst\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Kontener"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr "Aktualizuj"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr "Wyślij"
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -26,6 +80,7 @@ msgstr "Informacja"
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr "Filtry"
@@ -34,16 +89,16 @@ msgstr "Filtry"
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
+#: include/functions.inc:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
 #: 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #: 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:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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
@@ -290,7 +345,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:248
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -312,6 +367,127 @@ msgstr "Zmień hasło"
 msgid "Click here to change your password"
 msgstr "Kliknij tutaj aby zmienić swoje hasło"
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista departamentów"
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Administratorzy domeny"
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organizacja"
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Departament"
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Opis"
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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"
+
 #: ihtml/themes/default/logout-close.tpl:5
 #, fuzzy
 msgid "Your GOsa session has been closed!"
@@ -400,22 +576,22 @@ 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/class_management.inc:446
-#: include/class_management.inc:910
+#: html/index.php:228 include/class_management.inc:447
+#: include/class_management.inc:583 include/class_management.inc:915
 #: 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/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 include/class_tabs.inc:56
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
 #: 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_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:159
@@ -424,18 +600,18 @@ msgstr "Kontynuuj"
 #: 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:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/admin/groups/class_groupGeneric.inc:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
 #: 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:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -476,7 +652,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:276
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -591,6 +767,19 @@ msgstr ""
 msgid "Logout"
 msgstr "Wyloguj"
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtry"
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -619,7 +808,7 @@ msgstr "Zalogowano:"
 msgid "GOsa main menu"
 msgstr "Menu główne GOsa"
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
@@ -635,9 +824,9 @@ 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:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
@@ -647,7 +836,7 @@ msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 msgid "Configuration error"
 msgstr "Błąd konfiguracji"
 
@@ -665,7 +854,7 @@ msgstr "Przechowywanie hasła"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -683,10 +872,10 @@ msgstr "Hasło podane jako nowe jest za krótkie."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -745,20 +934,20 @@ msgstr ""
 #: 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/functions.inc:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
 #: 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:1102
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/departments/class_department.inc:241
 #: plugins/admin/departments/class_department.inc:429
 #: plugins/admin/departments/class_department.inc:702
@@ -766,10 +955,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:635
 #: plugins/admin/acl/class_aclRole.inc:675
 #: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -907,45 +1096,52 @@ msgstr ""
 msgid "unconfigured"
 msgstr "nieskonfigurowane"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 #, fuzzy
 msgid "Filter error"
 msgstr "Błąd krytyczny"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 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_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:612
 msgid "Permission"
 msgstr "Uprawnienie"
 
-#: include/class_management.inc:352
-#: plugins/admin/users/class_userManagement.inc:570
-#: plugins/admin/users/class_userManagement.inc:574
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "Uprawnienia"
 
-#: include/class_management.inc:426 include/class_plugin.inc:1546
+#: include/class_management.inc:427 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_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -1022,12 +1218,12 @@ 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:25
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1608
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
@@ -1035,27 +1231,18 @@ msgstr "Grupy"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:394
 msgid "Up"
 msgstr "Góra"
 
 #: include/class_acl.inc:495 include/class_listing.inc:235
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "W dół"
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Edytuj"
-
 #: include/class_acl.inc:500 include/class_acl.inc:504
 #: include/class_acl.inc:1253 include/class_acl.inc:1254
 #: include/class_acl.inc:1259 include/class_tabs.inc:401
@@ -1066,8 +1253,8 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
+#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
 #: plugins/admin/acl/class_aclRole.inc:452
 #, php-format
 msgid "Delete"
@@ -1135,10 +1322,10 @@ 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: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/functions.inc:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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
@@ -1195,41 +1382,34 @@ msgstr "ACLe"
 msgid "Close"
 msgstr "Zamknij"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
 msgid "Go to root department"
 msgstr "Idź do głównego departamentu"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
+#: include/class_listing.inc:998
 msgid "Root"
 msgstr "Główny"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
 msgid "Go up one department"
 msgstr "Idź jeden departament wyżej"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
 msgid "Go to users department"
 msgstr "Przejdź do departamentu użytkowników"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
+#: include/class_listing.inc:1014
 msgid "Home"
 msgstr "Katalog domowy"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
 msgid "Reload list"
 msgstr "Przeładuj listę"
 
-#: 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"
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1246,34 +1426,7 @@ msgstr "Użytkownik /UID nie są unikalne. Proszę sprawdzić bazę LDAP."
 msgid "Choose a base"
 msgstr "Wybierz bazę"
 
-#: 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_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_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Kontener"
-
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:299 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
@@ -1281,68 +1434,62 @@ msgstr "Kontener"
 msgid "Select all"
 msgstr "Wybierz wszystko"
 
-#: include/class_listing.inc:499
+#: include/class_listing.inc:509
 msgid "created by"
 msgstr "utworzone przez"
 
-#: 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_listing.inc:1379 include/class_listing.inc:1429
 #: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr "Kopiuj"
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_listing.inc:1385 include/class_listing.inc:1419
 #: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr "Wytnij"
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
+#: include/class_listing.inc:1393 include/class_listing.inc:1395
 #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Wklej"
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1419 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Wytnij ten obiekt"
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1429 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Kopiuj ten obiekt"
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
+#: include/class_listing.inc:1461 include/class_listing.inc:1463
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1477
 #, fuzzy
 msgid "Export list"
 msgstr "Export"
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
 #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr "Odtwórz snapshot"
 
-#: include/class_listing.inc:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1522 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr "Utwórz spanshot"
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1523 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr "Utwórz nowy snapshot z tego obiektu"
 
-#: include/class_sortableListing.inc:132
+#: include/class_sortableListing.inc:194
 msgid "Edit this entry"
 msgstr "Edytuj ten obiekt"
 
-#: include/class_sortableListing.inc:133
+#: include/class_sortableListing.inc:199
 msgid "Delete this entry"
 msgstr "Usuń ten obiekt"
 
@@ -1357,28 +1504,28 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:447
+#: include/functions.inc:448
 #, 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:518
+#: include/functions.inc:519
 #, 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:603
+#: include/functions.inc:604
 #, 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:789 include/functions.inc:907
+#: include/functions.inc:790 include/functions.inc:908
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1387,12 +1534,12 @@ msgstr ""
 "Nie można pobrać informacji o blokadach w bazie LDAP. Proszę sprawdzić wpis "
 "'config' w gosa.conf!"
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "Serwer LDAP"
 
-#: include/functions.inc:928
+#: include/functions.inc:929
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -1401,12 +1548,12 @@ msgstr ""
 "Znaleziono wiele blokad dla obiektu do zablokowania. Taka sytuacja nie "
 "powinna się wydażyć - czyszczę wiele odwołań."
 
-#: include/functions.inc:1232
+#: include/functions.inc:1233
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Limit wielkości %d elementów został przekroczony!"
 
-#: include/functions.inc:1234
+#: include/functions.inc:1235
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1415,214 +1562,214 @@ msgstr ""
 "Ustaw nowy limit rozmiaru na %s i pokaż ten komunikat jeśli limit wciąż jest "
 "przekroczony"
 
-#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Konfiguruj"
 
-#: include/functions.inc:1251
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr "niepełne"
 
-#: include/functions.inc:1641
+#: include/functions.inc:1642
 msgid "Continue anyway"
 msgstr "Kontynuuj mimo wszystko"
 
-#: include/functions.inc:1643
+#: include/functions.inc:1644
 msgid "Edit anyway"
 msgstr "Edytuj mimo wszystko"
 
-#: include/functions.inc:1645
+#: include/functions.inc:1646
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Zamierzasz skopiować wpis '%s'."
 
-#: include/functions.inc:1885
+#: include/functions.inc:1886
 msgid "Entries per page"
 msgstr "Wpisów na stronie"
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Zastosuj filtr"
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2272
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "Wersja deweloperska GOsa (Rev %s)"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2370
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "Plik '%s' nie mógł zostać usunięty."
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:2404 include/functions.inc:2424
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 msgid "LDAP warning"
 msgstr "Ostrzeżenie LDAP"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 #, 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:2701
+#: include/functions.inc:2702
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2708
+#: include/functions.inc:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2754
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Wyświetl szablony FAI"
 
-#: include/functions.inc:2756
+#: include/functions.inc:2757
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr "Brak opcjonalnego obiektu klasy '%s'!"
 
-#: include/functions.inc:2761
+#: include/functions.inc:2762
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2764
+#: include/functions.inc:2765
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "Plik jest dostępny"
 
-#: include/functions.inc:2786
+#: include/functions.inc:2787
 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:2787
+#: include/functions.inc:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2791
+#: include/functions.inc:2792
 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:2792
+#: include/functions.inc:2793
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2816
+#: include/functions.inc:2817
 msgid "German"
 msgstr "Niemiecki"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2818
 msgid "French"
 msgstr "Francuski"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr "Włoski"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr "Hiszpański"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2821
 msgid "English"
 msgstr "Angielski"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr "Holenderski"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2823
 msgid "Polish"
 msgstr "Polski"
 
-#: include/functions.inc:2824
+#: include/functions.inc:2825
 msgid "Chinese"
 msgstr "Chińsski"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2826
 msgid "Vietnamese"
 msgstr "Wietnamski"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr "Rosyjski"
 
-#: include/functions.inc:3021
+#: include/functions.inc:3022
 #, 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:3054
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3067
+#: include/functions.inc:3068
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
 
-#: include/functions.inc:3348
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3362
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3392
+#: include/functions.inc:3393
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Utwórz nowy departament"
 
-#: include/functions.inc:3400
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3412 include/functions.inc:3416
+#: include/functions.inc:3413 include/functions.inc:3417
 #, fuzzy
 msgid "no ID available!"
 msgstr "Brak szablonów!"
 
-#: include/functions.inc:3440
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3500
+#: include/functions.inc:3501
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
@@ -1658,38 +1805,6 @@ msgstr "Usuń snapshot"
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s"
 
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr "Opis"
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr "CSV"
@@ -2148,7 +2263,9 @@ msgstr "Pole 'Nazwa' zawiera niedozwolone znaki."
 msgid "Missing %s PHP extension!"
 msgstr "Rozszerzenie inwentarza"
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Dodaj"
@@ -2509,12 +2626,12 @@ msgstr ""
 msgid "Cannot not parse XML!"
 msgstr "Zbyt wielu użytkowników, nie można nadać wolnego ID"
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1184
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1204
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Nieznany wpis  '%s'!"
@@ -2604,12 +2721,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1248
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Ogólne"
@@ -2622,20 +2739,22 @@ msgstr "UNIX"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Poczta"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:750
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr "FAX"
 
@@ -2652,34 +2771,24 @@ msgstr "FTP"
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr "Grupa"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/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:188
 #: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:766
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Telefon"
 
@@ -2690,6 +2799,7 @@ msgstr "Aplikacja"
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
 #: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Serwer"
@@ -2700,6 +2810,7 @@ msgstr "Cienki klient"
 
 #: plugins/generic/references/class_reference.inc:69
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr "Stacja robocza"
 
@@ -2752,12 +2863,6 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Zespół GOsa"
 
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/dep-list.tpl:13 plugins/admin/acl/acl-list.tpl:13
-msgid "Update"
-msgstr "Aktualizuj"
-
 #: plugins/admin/ogroups/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -2765,7 +2870,7 @@ msgid ""
 msgstr "Proszę upewnić się czy kontynuować, gdyż nie ma możliwości powrotu."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/class_ogroup.inc:1080
 msgid "Object groups"
 msgstr "Grupy obiektów"
 
@@ -2776,7 +2881,7 @@ msgstr "Nazwa grupy obiektów"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/users/class_userManagement.inc:189
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "błąd PHP:"
@@ -2786,6 +2891,7 @@ msgid "Templates"
 msgstr "Szablony"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
 #: 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"
@@ -2797,6 +2903,7 @@ msgid "Windows Install"
 msgstr "Stacja robocza Windows"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 msgid "Terminal"
 msgstr "Terminal"
 
@@ -2804,138 +2911,138 @@ msgstr "Terminal"
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 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
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
 #, php-format
 msgid "Show %s"
 msgstr "Pokaż %s"
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 msgid "people"
 msgstr "ludzie"
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr "grupy"
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr "serwery"
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr "stacje robocze"
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr "terminale"
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 msgid "printer"
 msgstr "drukarka"
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr "drukarki"
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr "telefony"
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr "aplikacje"
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr "żaden"
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr "za dużo różnych obiektów!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr "użytkownicy"
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 msgid "winstations"
 msgstr "Stacje Windows"
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 #: 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 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:645
+#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "zezwól na dostęp do tych hostów"
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 msgid "Non existing dn:"
 msgstr "Nieistniejące dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
 #: 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: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/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -2972,29 +3079,31 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Imię"
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr "Można połączyć maksymalnie tylko 2 różne typy obiektów!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 msgid "Object group generic"
 msgstr "Podstawowa grupa obiektu"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Zaufanie systemowe"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 msgid "Member"
 msgstr "Członek"
 
@@ -3031,7 +3140,7 @@ msgid "Select a base"
 msgstr "Wybierz bazę"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Zaufanie systemowe"
@@ -3070,8 +3179,9 @@ msgstr "Podsumowanie FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:758
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr "Środowisko"
 
@@ -3084,15 +3194,6 @@ msgstr "Aplikacje"
 msgid "Please enter the new object group name"
 msgstr "Proszę podać nową nazwę."
 
-#: 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-filter.tpl:11
 #, fuzzy
 msgid "user groups"
@@ -3206,7 +3307,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3227,19 +3328,19 @@ msgid "Select systems to add"
 msgstr "Wybierz systemy do dodania"
 
 #: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:25
 #: plugins/personal/posix/trust_machines.tpl:26
 msgid "Display systems of department"
 msgstr "Wyświetl systemy departamentu"
 
 #: plugins/admin/ogroups/trust_machines.tpl:30
-#: plugins/admin/groups/trust_machines.tpl:30
+#: plugins/admin/groups/trust_machines.tpl:29
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Wyświetl systemy pasujące"
 
 #: plugins/admin/ogroups/trust_machines.tpl:31
-#: plugins/admin/groups/trust_machines.tpl:31
+#: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Wyrażenie regularne dla dopasowania adresów"
@@ -3276,6 +3377,46 @@ msgstr "Wyświetl użytkowników pasujących"
 msgid "Regular expression for matching user names"
 msgstr "Wyrażenie regularne do dopasowania nazw użytkowników"
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Preferowany język"
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr "Imię"
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+msgid "Surname"
+msgstr "Nazwisko"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Pokaż podstawowe grupy"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Pokaż grupy samba"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
+msgstr "Pokaż grupy samba"
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3330,113 +3471,100 @@ msgstr "We wszystkich grupach"
 msgid "Not in all groups"
 msgstr "Nie we wszystkich grupach"
 
-#: plugins/admin/groups/group-filter.tpl:11
-msgid "Show primary groups"
-msgstr "Pokaż podstawowe grupy"
-
-#: plugins/admin/groups/group-filter.tpl:12
-msgid "Show samba groups"
-msgstr "Pokaż grupy samba"
-
-#: plugins/admin/groups/group-filter.tpl:13
-#, fuzzy
-msgid "Show mail groups"
-msgstr "Pokaż grupy samba"
-
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #, fuzzy
 msgid "Cannot find group SID in your configuration!"
 msgstr ""
 "Nie można znaleźć SID tych grup ani w  LDAP, ani w pliku konfiguracyjnym!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr "Grupa Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr "Administratorzy domeny"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr "Użytkownicy domeny"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr "Goście domeny"
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr "Specjalna grupa (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 #, fuzzy
 msgid "! unknown UID"
 msgstr "! nieznane id"
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:969
+#: plugins/admin/groups/class_groupGeneric.inc:932
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:974
+#: plugins/admin/groups/class_groupGeneric.inc:937
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Nie można stworzyć pliku '%s'."
 
-#: plugins/admin/groups/class_groupGeneric.inc:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1212
 msgid "Generic group settings"
 msgstr "Ogólne ustawienia grupy"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 msgid "Samba group type"
 msgstr "Typ grupy Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Katalog domowy Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 msgid "Phone pickup group"
 msgstr "Grupie odbioru telefonu"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1230
 msgid "Nagios group"
 msgstr "Grupa nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 msgid "Group member"
 msgstr "Członek grupy"
 
@@ -3445,6 +3573,7 @@ msgid "Group settings"
 msgstr "Ustawienia grupy"
 
 #: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
 msgid "List of groups"
 msgstr "Lista grup"
 
@@ -3463,41 +3592,49 @@ msgid "Group administration"
 msgstr "Administracja Grupą"
 
 #: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
 msgid "Posix"
 msgstr "Posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
 #, fuzzy
 msgid "Edit posix properties"
 msgstr "Edytuj właściwości Telefonu"
 
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Edytuj właściwości Poczty"
 
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Edytuj właściwości Samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Edytuj właściwości Telefonu"
 
 #: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
 #, fuzzy
 msgid "Menu"
 msgstr "Drukarka"
 
 #: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
 #, fuzzy
 msgid "Edit start menu properties"
 msgstr "Edytuj właściwości Samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Edytuj właściwości Środowiska"
 
@@ -3560,7 +3697,7 @@ msgstr ""
 "użycie szablonów."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:404
+#: plugins/admin/users/class_userManagement.inc:405
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
@@ -3580,44 +3717,35 @@ msgstr "Imię"
 msgid "Manage users"
 msgstr "Zarządzaj użytkownikami"
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:278
 #, 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: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:649
+#: plugins/admin/users/class_userManagement.inc:650
 msgid "Account locking"
 msgstr "Blokowanie konta"
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:651
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:724
 msgid "Unlock account"
 msgstr "Odblokuj konto"
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 msgid "Lock account"
 msgstr "Zablokuj konto"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit generic properties"
 msgstr "Edytuj ogólne właściwości"
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:742
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3625,20 +3753,20 @@ msgstr "Edytuj ogólne właściwości"
 msgid "POSIX"
 msgstr "POSIX"
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:743
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Edytuj właściwości UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:754
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:755
 msgid "Edit netatalk properties"
 msgstr "Edytuj właściwości Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:763
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Edytuj właściwości UNIX"
@@ -3647,11 +3775,6 @@ msgstr "Edytuj właściwości UNIX"
 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 "Lock users"
@@ -3742,52 +3865,6 @@ 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/dep-list.xml:11
-msgid "List of departments"
-msgstr "Lista departamentów"
-
-#: 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/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Administratorzy domeny"
-
-#: 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/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/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
 #, fuzzy
@@ -3873,8 +3950,8 @@ msgstr "Kategoria dla tego poddrzewa"
 #: 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/class_user.inc:1639
+#: plugins/personal/generic/generic.tpl:387
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Lokalizacja"
@@ -3883,8 +3960,8 @@ msgstr "Lokalizacja"
 #: 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/class_user.inc:1638
+#: plugins/personal/generic/generic.tpl:395
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Stan"
@@ -3903,7 +3980,7 @@ msgstr "Lokalizacja tego poddrzewa"
 #: 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/generic.tpl:403
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -3924,10 +4001,10 @@ msgstr "Bazowy numer telefonu tego poddrzewa"
 #: 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/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
@@ -3969,7 +4046,7 @@ msgid "Organization name"
 msgstr "Nazwa organizacji"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1640
 msgid "Postal address"
 msgstr "Adres pocztowy"
 
@@ -4151,8 +4228,8 @@ msgstr ""
 
 #: 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/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:454
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Pełniona funkcja"
@@ -4190,7 +4267,7 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Ustawienia Aplikacji"
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:274
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
@@ -4238,213 +4315,213 @@ msgstr "Brak zainstalowanych certyfikatów"
 msgid "The selected password method is no longer available."
 msgstr "Ta aplikacja nie jest już dostępna."
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1156
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1163
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1181
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1247
+#: plugins/personal/generic/class_user.inc:1252
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "Ta aplikacja nie jest już dostępna."
 
-#: plugins/personal/generic/class_user.inc:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Strona domowa"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1731
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Komórka"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data urodzenia"
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1441
 msgid "Cannot open certificate!"
 msgstr "Nie można otworzyć certyfikatu!"
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Jednostka"
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identyfikator budynku"
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Wywołanie"
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Ostatnia dostawa"
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Lokalizacja osoby"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Opis jednostki"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Sektor"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Tytuł funkcjonalny"
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Nmer seryjny certyfikatu"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Publicznie widoczne"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Ulica"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Kod pocztowy"
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1603
 msgid "Generic user settings"
 msgstr "Ogólne ustawienia użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Moje konto "
 
-#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/class_user.inc:1615
 msgid "User identification"
 msgstr "Identyfikacja użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Osobisty tytuł"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1617
 #: 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:1615
+#: plugins/personal/generic/class_user.inc:1620
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Płeć"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Preferred language"
 msgstr "Preferowany język"
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1624
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Zdjęcie użytkownika"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Department number"
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Employee number"
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Typ pracownika"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Room number"
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1633
 msgid "Telefon number"
 msgstr "Numer telefonu"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Pager number"
 msgstr "Numer pagera"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Mobile number"
 msgstr "Telefon komórkowy"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1636
 msgid "Fax number"
 msgstr "Numer fax"
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr "Adres domowy"
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1643
 msgid "Home phone number"
 msgstr "Numer telefonu domowego"
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1645
 #, fuzzy
 msgid "User password method"
 msgstr "Przechowywanie hasła"
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1646
 msgid "User certificates"
 msgstr "Certyfikaty użytkownika"
 
@@ -4507,33 +4584,33 @@ msgstr "Edytuj certyfikaty"
 msgid "Restrict login to"
 msgstr "Ogranicz logowanie do"
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr "IP lub sieć"
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informacje organizacyjne"
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Numer departamentu"
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Numer pracownika"
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Numer pokoju"
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr "Proszę użyć zakładki telefony"
 
@@ -4615,126 +4692,126 @@ msgstr "hasło wygasło"
 msgid "automatic"
 msgstr "automatyczne"
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, 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:519
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, 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:523
+#: plugins/personal/posix/class_posixAccount.inc:452
 #, 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:527
+#: plugins/personal/posix/class_posixAccount.inc:456
 #, 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:864
+#: plugins/personal/posix/class_posixAccount.inc:793
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr "Grupa użytkownika"
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:946
 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:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
-#: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: 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:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 msgid "shadowMin"
 msgstr "shadowMin"
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 msgid "shadowMax"
 msgstr "shadowMax"
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 msgid "shadowWarning"
 msgstr "shadowWarning"
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 #, fuzzy
 msgid "shadowInactive"
 msgstr "Shadow nieaktywne"
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1440
 msgid "POSIX account"
 msgstr "Konto POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Identyfikator użytkownika"
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1453
 msgid "Group ID"
 msgstr "ID grupy"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1455
 msgid "Force password change on login"
 msgstr "Wymuś zmianę hasła podczas logowania"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1456
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1457
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1458
 msgid "Shadow warning"
 msgstr "Shadow ostrzeżenie"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1459
 msgid "Shadow inactive"
 msgstr "Shadow nieaktywne"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1460
 msgid "Shadow expire"
 msgstr "Shadow wygasa"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr "Publiczny klucz SSH"
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1462
 msgid "System trust model"
 msgstr "Zaufanie do systemów"
 
@@ -4812,6 +4889,23 @@ msgstr "Wyświetl grupy użytkownika"
 msgid "User name of which groups are shown"
 msgstr "Nazwa użytkownika którego grupy są pokazane"
 
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#, fuzzy
+msgid "List of systems"
+msgstr "Lista użytkowników"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+msgid "Show servers"
+msgstr "Pokaż serwery"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+msgid "Show workstations"
+msgstr "Pokaż stacje robocze"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+msgid "Show terminals"
+msgstr "Pokaż terminale"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Ustawienia Posix"
@@ -6639,6 +6733,14 @@ msgstr "Tek krok umożliwia wybranie preferowanego języka."
 msgid "Automatic"
 msgstr "Automatycznie"
 
+#, fuzzy
+#~ msgid "givenname"
+#~ msgstr "Imię"
+
+#, fuzzy
+#~ msgid "surename"
+#~ msgstr "Nazwisko"
+
 #, fuzzy
 #~ msgid "Edit ogroup"
 #~ msgstr "Lista grup"
@@ -6936,9 +7038,6 @@ msgstr "Automatycznie"
 #~ msgid "Delete acl role"
 #~ msgstr "Usuń makro"
 
-#~ msgid "Surename"
-#~ msgstr "Nazwisko"
-
 #, fuzzy
 #~ msgid "Steps"
 #~ msgstr "Systemy"
@@ -7547,21 +7646,12 @@ msgstr "Automatycznie"
 #~ msgid "Show applications"
 #~ msgstr "Pokaż aplikacje"
 
-#~ msgid "Show servers"
-#~ msgstr "Pokaż serwery"
-
 #~ msgid "Select to see workstations"
 #~ msgstr "Wybierz aby zobaczyc stacje robocze"
 
-#~ msgid "Show workstations"
-#~ msgstr "Pokaż stacje robocze"
-
 #~ msgid "Select to see terminals"
 #~ msgstr "Wybierz aby zobaczyć terminale"
 
-#~ msgid "Show terminals"
-#~ msgstr "Pokaż terminale"
-
 #~ msgid "Select to see printers"
 #~ msgstr "Wybierz aby zobaczyć drukarki"
 
index 4d8d58b485d887cf75a533ef94bdd49b750365b1..033fea8dec233dfe658e9c0f83d127c623f9e9cc 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: 2010-01-18 17:26+0100\n"
+"POT-Creation-Date: 2010-01-27 15:02+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"
@@ -16,6 +16,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Base"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr "Submeter"
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -28,6 +82,7 @@ msgstr "Informação"
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr "Filtros"
@@ -36,16 +91,16 @@ msgstr "Filtros"
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
+#: include/functions.inc:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
 #: 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #: 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:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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
@@ -273,7 +328,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:248
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -295,6 +350,126 @@ msgstr "Alterar senha"
 msgid "Click here to change your password"
 msgstr "Clique aqui para alterar sua senha"
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Lista dos departamentos"
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Administradores do domínio"
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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 ""
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Organização"
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Departamento"
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Descrição"
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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"
+
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr ""
@@ -378,22 +553,22 @@ msgstr "Continuar"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: html/index.php:228 include/class_management.inc:446
-#: include/class_management.inc:910
+#: html/index.php:228 include/class_management.inc:447
+#: include/class_management.inc:583 include/class_management.inc:915
 #: 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/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 include/class_tabs.inc:56
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
 #: 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_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:159
@@ -402,18 +577,18 @@ msgstr "Continuar"
 #: 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:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/admin/groups/class_groupGeneric.inc:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
 #: 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:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -454,7 +629,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:276
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -558,6 +733,19 @@ msgstr ""
 msgid "Logout"
 msgstr "Sair"
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Filtros"
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -588,7 +776,7 @@ msgstr "Logado:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
@@ -604,9 +792,9 @@ 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:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
@@ -616,7 +804,7 @@ msgstr "A configuração GOsa %s/%s não pôde ser lida. Abortado."
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 msgid "Configuration error"
 msgstr "Erro de configuração"
 
@@ -633,7 +821,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:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -652,10 +840,10 @@ msgstr "A senha utilizada como nova é curta."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -714,20 +902,20 @@ msgstr ""
 #: 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/functions.inc:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
 #: 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:1102
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/departments/class_department.inc:241
 #: plugins/admin/departments/class_department.inc:429
 #: plugins/admin/departments/class_department.inc:702
@@ -735,10 +923,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:635
 #: plugins/admin/acl/class_aclRole.inc:675
 #: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -868,44 +1056,51 @@ msgstr ""
 msgid "unconfigured"
 msgstr "desconfigurado"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 #, fuzzy
 msgid "Filter error"
 msgstr "Erro interno"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 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_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:612
 msgid "Permission"
 msgstr ""
 
-#: include/class_management.inc:352
-#: plugins/admin/users/class_userManagement.inc:570
-#: plugins/admin/users/class_userManagement.inc:574
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
 #: plugins/admin/acl/class_aclManagement.inc:98
 msgid "Permission error"
 msgstr ""
 
-#: include/class_management.inc:426 include/class_plugin.inc:1546
+#: include/class_management.inc:427 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_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+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."
@@ -977,12 +1172,12 @@ msgid "Use ACL defined in role"
 msgstr "Use ACL definida na regra"
 
 #: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1608
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Usuários"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
@@ -990,27 +1185,18 @@ msgstr "Grupos"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:394
 msgid "Up"
 msgstr "Para cima"
 
 #: include/class_acl.inc:495 include/class_listing.inc:235
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "Para baixo"
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Editar"
-
 #: include/class_acl.inc:500 include/class_acl.inc:504
 #: include/class_acl.inc:1253 include/class_acl.inc:1254
 #: include/class_acl.inc:1259 include/class_tabs.inc:401
@@ -1021,8 +1207,8 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
+#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
 #: plugins/admin/acl/class_aclRole.inc:452
 #, php-format
 msgid "Delete"
@@ -1086,10 +1272,10 @@ msgstr "Objeto completo"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: include/functions.inc:603 include/functions.inc:789
-#: include/functions.inc:907 include/functions.inc:1305
-#: include/functions.inc:2369 include/functions.inc:2403
-#: include/functions.inc:2423 include/class_ldap.inc:692
+#: include/functions.inc:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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
@@ -1142,41 +1328,34 @@ msgstr "Regras de ACL"
 msgid "Close"
 msgstr "Fechar"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
 msgid "Go to root department"
 msgstr "Ir para departamento raiz"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
+#: include/class_listing.inc:998
 msgid "Root"
 msgstr "Raiz"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
 msgid "Go up one department"
 msgstr "Subir um departamento"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
 msgid "Go to users department"
 msgstr "Ir para departamento de usuários"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
+#: include/class_listing.inc:1014
 msgid "Home"
 msgstr "Origem"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
 msgid "Reload list"
 msgstr "Recarregar lista"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/dep-list.tpl:13 plugins/admin/acl/acl-list.tpl:13
-msgid "Submit"
-msgstr "Submeter"
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1191,34 +1370,7 @@ msgstr ""
 msgid "Choose a base"
 msgstr ""
 
-#: 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_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_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Base"
-
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:299 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
@@ -1226,67 +1378,61 @@ msgstr "Base"
 msgid "Select all"
 msgstr ""
 
-#: include/class_listing.inc:499
+#: include/class_listing.inc:509
 #, fuzzy
 msgid "created by"
 msgstr "Criar"
 
-#: 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_listing.inc:1379 include/class_listing.inc:1429
 #: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr ""
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_listing.inc:1385 include/class_listing.inc:1419
 #: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr ""
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
+#: include/class_listing.inc:1393 include/class_listing.inc:1395
 #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Colar"
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1419 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr ""
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1429 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr ""
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
+#: include/class_listing.inc:1461 include/class_listing.inc:1463
 msgid "Restore snapshots"
 msgstr ""
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1477
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
 #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1522 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1523 include/class_plugin.inc:2010
 msgid "Create a new snapshot from this object"
 msgstr ""
 
-#: include/class_sortableListing.inc:132
+#: include/class_sortableListing.inc:194
 msgid "Edit this entry"
 msgstr "Editar esta entrada"
 
-#: include/class_sortableListing.inc:133
+#: include/class_sortableListing.inc:199
 msgid "Delete this entry"
 msgstr "Deletar esta entrada"
 
@@ -1301,256 +1447,256 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:447
+#: include/functions.inc:448
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr ""
 
-#: include/functions.inc:518
+#: include/functions.inc:519
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 
-#: include/functions.inc:603
+#: include/functions.inc:604
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr ""
 
-#: include/functions.inc:789 include/functions.inc:907
+#: include/functions.inc:790 include/functions.inc:908
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr ""
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr ""
 
-#: include/functions.inc:928
+#: include/functions.inc:929
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr ""
 
-#: include/functions.inc:1232
+#: include/functions.inc:1233
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr ""
 
-#: include/functions.inc:1234
+#: include/functions.inc:1235
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
 "exceeds"
 msgstr ""
 
-#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Configurar"
 
-#: include/functions.inc:1251
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr ""
 
-#: include/functions.inc:1641
+#: include/functions.inc:1642
 msgid "Continue anyway"
 msgstr ""
 
-#: include/functions.inc:1643
+#: include/functions.inc:1644
 msgid "Edit anyway"
 msgstr "Editar mesmo assim"
 
-#: include/functions.inc:1645
+#: include/functions.inc:1646
 #, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr ""
 
-#: include/functions.inc:1885
+#: include/functions.inc:1886
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Aplicar filtro"
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr ""
 
-#: include/functions.inc:2272
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2369
+#: include/functions.inc:2370
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:2404 include/functions.inc:2424
 msgid "Cannot write to revision file!"
 msgstr ""
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 msgid "LDAP warning"
 msgstr ""
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr ""
 
-#: include/functions.inc:2701
+#: include/functions.inc:2702
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2708
+#: include/functions.inc:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2754
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2756
+#: include/functions.inc:2757
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2761
+#: include/functions.inc:2762
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2764
+#: include/functions.inc:2765
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2786
+#: include/functions.inc:2787
 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:2787
+#: include/functions.inc:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2791
+#: include/functions.inc:2792
 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:2792
+#: include/functions.inc:2793
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2816
+#: include/functions.inc:2817
 msgid "German"
 msgstr "Alemão"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2818
 msgid "French"
 msgstr "Francês"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr "Italiano"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr "Espanhol"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2821
 msgid "English"
 msgstr "Inglês"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr "Holandês"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2823
 msgid "Polish"
 msgstr "Polonês"
 
-#: include/functions.inc:2824
+#: include/functions.inc:2825
 msgid "Chinese"
 msgstr ""
 
-#: include/functions.inc:2825
+#: include/functions.inc:2826
 msgid "Vietnamese"
 msgstr ""
 
-#: include/functions.inc:2826
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr "Russo"
 
-#: include/functions.inc:3021
+#: include/functions.inc:3022
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 
-#: include/functions.inc:3054
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3067
+#: include/functions.inc:3068
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 msgid "Cannot allocate a free ID:"
 msgstr ""
 
-#: include/functions.inc:3348
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3362
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3392
+#: include/functions.inc:3393
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr ""
 
-#: include/functions.inc:3400
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3412 include/functions.inc:3416
+#: include/functions.inc:3413 include/functions.inc:3417
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3440
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3500
+#: include/functions.inc:3501
 msgid "Cannot allocate a free ID!"
 msgstr ""
 
@@ -1583,38 +1729,6 @@ msgstr ""
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr "Descrição"
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -2054,7 +2168,9 @@ msgstr ""
 msgid "Missing %s PHP extension!"
 msgstr ""
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Adicionar"
@@ -2404,12 +2520,12 @@ msgstr ""
 msgid "Cannot not parse XML!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1184
 #, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr ""
 
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1204
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr ""
@@ -2502,12 +2618,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1248
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Geral"
@@ -2520,20 +2636,22 @@ msgstr "UNIX"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Correio"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:750
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr "FAX"
 
@@ -2550,34 +2668,24 @@ msgstr "FTP"
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr ""
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/personal/generic/generic.tpl:295
-#: plugins/personal/generic/multiple_generic.tpl:159
-msgid "Department"
-msgstr "Departamento"
-
 #: plugins/generic/references/class_reference.inc:61
 #: plugins/admin/ogroups/class_ogroupManagement.inc:188
 #: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:766
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Fone"
 
@@ -2588,6 +2696,7 @@ msgstr "Aplicação"
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
 #: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Servidor"
@@ -2598,6 +2707,7 @@ msgstr ""
 
 #: plugins/generic/references/class_reference.inc:69
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr "Estação de trabalho"
 
@@ -2650,12 +2760,6 @@ msgstr ""
 msgid "The GOsa team"
 msgstr ""
 
-#: 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 "
@@ -2663,7 +2767,7 @@ msgid ""
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/class_ogroup.inc:1080
 msgid "Object groups"
 msgstr "Grupos de objeto"
 
@@ -2673,7 +2777,7 @@ msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/users/class_userManagement.inc:189
 msgid "Infrastructure error"
 msgstr ""
 
@@ -2682,6 +2786,7 @@ msgid "Templates"
 msgstr "Modelos"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
 #: 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"
@@ -2692,6 +2797,7 @@ msgid "Windows Install"
 msgstr ""
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 msgid "Terminal"
 msgstr ""
 
@@ -2699,138 +2805,138 @@ msgstr ""
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 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
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
 #, php-format
 msgid "Show %s"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 msgid "people"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr "Grupos"
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr "Servidores"
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr "Estações de Trabalho"
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr "Terminais"
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 msgid "printer"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr "Impressoras"
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr "Telefones"
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr "Aplicações"
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr "nenhum"
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr "Usuários"
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 msgid "winstations"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 #: 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 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:645
+#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "permitir acesso a estas máquinas"
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 msgid "Non existing dn:"
 msgstr "Dn não existente:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
 #: 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: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/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -2867,27 +2973,29 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Nome"
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 msgid "Object group generic"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 msgid "Sytem trust"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 msgid "Member"
 msgstr ""
 
@@ -2924,7 +3032,7 @@ msgid "Select a base"
 msgstr "Selecione a base"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Sistema de confiança"
@@ -2963,8 +3071,9 @@ msgstr "Sumário FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:758
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr "Ambiente"
 
@@ -2976,15 +3085,6 @@ msgstr "Aplicações"
 msgid "Please enter the new object group name"
 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 "Filtros"
-
 #: plugins/admin/ogroups/ogroup-filter.tpl:11
 msgid "user groups"
 msgstr ""
@@ -3089,7 +3189,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3110,19 +3210,19 @@ 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/admin/groups/trust_machines.tpl:25
 #: 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
+#: plugins/admin/groups/trust_machines.tpl:29
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Exibir sistemas combinados"
 
 #: plugins/admin/ogroups/trust_machines.tpl:31
-#: plugins/admin/groups/trust_machines.tpl:31
+#: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Expressão regular para conferência de endereços"
@@ -3160,6 +3260,47 @@ msgstr "Exibir combinação de usuários"
 msgid "Regular expression for matching user names"
 msgstr ""
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+msgid "Please select the desired entries"
+msgstr ""
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr "Nome fornecido"
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+msgid "Surname"
+msgstr "Sobrenome"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+#, fuzzy
+msgid "Show primary groups"
+msgstr "Grupo primário"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+#, fuzzy
+msgid "Show samba groups"
+msgstr "Usuários do domínio"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
+msgstr "Usuários do domínio"
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3214,112 +3355,97 @@ msgstr ""
 msgid "Not in all groups"
 msgstr ""
 
-#: plugins/admin/groups/group-filter.tpl:11
-#, fuzzy
-msgid "Show primary groups"
-msgstr "Grupo primário"
-
-#: plugins/admin/groups/group-filter.tpl:12
-#, fuzzy
-msgid "Show samba groups"
-msgstr "Usuários do domínio"
-
-#: 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!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr "Grupo samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr "Administradores do domínio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr "Usuários do domínio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr "Convidados do domínio"
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 #, fuzzy
 msgid "! unknown UID"
 msgstr "! id desconhecido"
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:969
+#: plugins/admin/groups/class_groupGeneric.inc:932
 #, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:974
+#: plugins/admin/groups/class_groupGeneric.inc:937
 #, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1212
 msgid "Generic group settings"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 msgid "Samba group type"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 msgid "Samba domain name"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 msgid "Phone pickup group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1230
 msgid "Nagios group"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 msgid "Group member"
 msgstr ""
 
@@ -3328,6 +3454,7 @@ msgid "Group settings"
 msgstr ""
 
 #: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
 msgid "List of groups"
 msgstr "Lista dos grupos"
 
@@ -3346,40 +3473,48 @@ msgid "Group administration"
 msgstr "Administração de grupos"
 
 #: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
 msgid "Posix"
 msgstr "Posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
 #, fuzzy
 msgid "Edit posix properties"
 msgstr "Editar propriedades de telefone"
 
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Editar propriedades de correio"
 
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Editar propriedades do samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Editar propriedades de telefone"
 
 #: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
 msgid "Menu"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
 #, fuzzy
 msgid "Edit start menu properties"
 msgstr "Editar propriedades do samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Editar propriedades de ambiente"
 
@@ -3442,7 +3577,7 @@ msgstr ""
 "modelos."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:404
+#: plugins/admin/users/class_userManagement.inc:405
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
@@ -3462,45 +3597,36 @@ msgstr "Primeiro nome"
 msgid "Manage users"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:278
 msgid "You have no permission to change this users password!"
 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:649
+#: plugins/admin/users/class_userManagement.inc:650
 msgid "Account locking"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:651
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:724
 #, fuzzy
 msgid "Unlock account"
 msgstr "Minha conta"
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 #, fuzzy
 msgid "Lock account"
 msgstr "Minha conta"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit generic properties"
 msgstr "Editar propriedades gerais"
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:742
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3508,20 +3634,20 @@ msgstr "Editar propriedades gerais"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:743
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Editar propriedades UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:754
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:755
 msgid "Edit netatalk properties"
 msgstr "Editar propriedades do netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:763
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Editar propriedades UNIX"
@@ -3530,11 +3656,6 @@ msgstr "Editar propriedades UNIX"
 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 "Lock users"
@@ -3622,51 +3743,6 @@ msgstr ""
 "sua árvore LDAP em um arquivo. Então, se pronto, pressione 'Deletar' para "
 "continuar ou 'Cancelar' para abortar."
 
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-msgstr "Lista dos departamentos"
-
-#: 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/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Administradores do domínio"
-
-#: 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/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/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
 msgid "Locality name"
@@ -3750,8 +3826,8 @@ msgstr ""
 #: 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/class_user.inc:1639
+#: plugins/personal/generic/generic.tpl:387
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Localização"
@@ -3760,8 +3836,8 @@ msgstr "Localização"
 #: 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/class_user.inc:1638
+#: plugins/personal/generic/generic.tpl:395
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Estado"
@@ -3780,7 +3856,7 @@ msgstr ""
 #: 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/generic.tpl:403
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -3801,10 +3877,10 @@ msgstr ""
 #: 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/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
@@ -3845,7 +3921,7 @@ msgid "Organization name"
 msgstr ""
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1640
 msgid "Postal address"
 msgstr "Caixa postal"
 
@@ -4010,8 +4086,8 @@ msgstr ""
 
 #: 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/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:454
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Papel"
@@ -4048,7 +4124,7 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:274
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
@@ -4097,211 +4173,211 @@ msgstr "Nenhum certificado instalado"
 msgid "The selected password method is no longer available."
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1156
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1163
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1181
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1247
+#: plugins/personal/generic/class_user.inc:1252
 msgid "The selected password method requires initial configuration!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: 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:1318
-#: plugins/personal/generic/class_user.inc:1731
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Celular"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Pager"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Data de nascimento"
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1441
 msgid "Cannot open certificate!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Unidade"
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Identificação da residência"
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Vocação"
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Última entrega"
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Localização da pessoa"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Descrição da unidade"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Área de assunto"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Título funcional"
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Número serial do certificado"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Visível publicamente"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Rua"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "CEP"
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1603
 msgid "Generic user settings"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Minha conta"
 
-#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/class_user.inc:1615
 msgid "User identification"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Título pessoal"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1617
 #: 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:1615
+#: plugins/personal/generic/class_user.inc:1620
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Sexo"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Preferred language"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1624
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "Foto do usuário"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Department number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Employee number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Tipo de empregado"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Room number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1633
 msgid "Telefon number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Pager number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Mobile number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1636
 msgid "Fax number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr "Caixa postal residencial"
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1643
 msgid "Home phone number"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1645
 msgid "User password method"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1646
 msgid "User certificates"
 msgstr ""
 
@@ -4364,33 +4440,33 @@ msgstr "Editar certificados"
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Informação organizacional"
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Nº do departamento"
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Nº do empregado"
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Nº da sala"
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr "Por favor, utilize a orelha telefone"
 
@@ -4471,125 +4547,125 @@ msgstr ""
 msgid "automatic"
 msgstr "automático"
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, 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:519
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, 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:523
+#: plugins/personal/posix/class_posixAccount.inc:452
 #, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:456
 #, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:793
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr "Grupo do usuário"
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:946
 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:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
-#: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: 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:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 msgid "shadowMin"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 msgid "shadowWarning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 msgid "shadowInactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1440
 msgid "POSIX account"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "ID do usuário"
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1453
 msgid "Group ID"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1455
 msgid "Force password change on login"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1456
 msgid "Shadow min"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1457
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1458
 msgid "Shadow warning"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1459
 msgid "Shadow inactive"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1460
 msgid "Shadow expire"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1462
 msgid "System trust model"
 msgstr ""
 
@@ -4666,6 +4742,26 @@ msgstr "Exibir grupos de usuários"
 msgid "User name of which groups are shown"
 msgstr "Nome do usuário dos grupos exibidos"
 
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#, fuzzy
+msgid "List of systems"
+msgstr "Lista de usuários"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+#, fuzzy
+msgid "Show servers"
+msgstr "Servidores"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+#, fuzzy
+msgid "Show workstations"
+msgstr "Estações de Trabalho"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+#, fuzzy
+msgid "Show terminals"
+msgstr "Terminais"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Configurações Posix"
@@ -6307,6 +6403,14 @@ msgstr ""
 msgid "Automatic"
 msgstr ""
 
+#, fuzzy
+#~ msgid "givenname"
+#~ msgstr "Nome fornecido"
+
+#, fuzzy
+#~ msgid "surename"
+#~ msgstr "Sobrenome"
+
 #, fuzzy
 #~ msgid "Edit ogroup"
 #~ msgstr "Lista dos grupos"
index 8b8e949cb9e05d9b81a94349a873cb1e3f50ca1e..85619b395e9456a0ea1fe1cebb5c977531405492 100644 (file)
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 17:26+0100\n"
+"POT-Creation-Date: 2010-01-27 15:02+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"
@@ -14,6 +14,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: poEdit 1.3.1\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Ветка"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr ""
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -26,6 +80,7 @@ msgstr "Информация"
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr "Фильтры"
@@ -34,16 +89,16 @@ msgstr "Фильтры"
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
+#: include/functions.inc:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
 #: 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #: 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:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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
@@ -300,7 +355,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:248
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -324,6 +379,127 @@ msgstr "Сменить пароль"
 msgid "Click here to change your password"
 msgstr "У вас недостаточно прав для смены своего пароля."
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Список подразделений"
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: 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 "в домене"
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Администраторы домена"
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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 "Страна"
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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 "Местоположение"
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Организация"
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Подразделение"
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Описание"
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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 "Действия"
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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 "Изменить"
+
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr ""
@@ -410,22 +586,22 @@ msgstr "Продолжить"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: html/index.php:228 include/class_management.inc:446
-#: include/class_management.inc:910
+#: html/index.php:228 include/class_management.inc:447
+#: include/class_management.inc:583 include/class_management.inc:915
 #: 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/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 include/class_tabs.inc:56
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
 #: 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_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:159
@@ -434,18 +610,18 @@ msgstr "Продолжить"
 #: 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:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/admin/groups/class_groupGeneric.inc:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
 #: 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:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -488,7 +664,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:276
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -606,6 +782,19 @@ msgstr ""
 msgid "Logout"
 msgstr "Выход"
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Фильтры"
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -635,7 +824,7 @@ msgstr "Пользователь:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_department.inc:386
 #, fuzzy
@@ -653,9 +842,9 @@ 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:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
@@ -665,7 +854,7 @@ msgstr ""
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, fuzzy
 msgid "Configuration error"
 msgstr "Настроить"
@@ -684,7 +873,7 @@ msgstr "Хэширование паролей"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -702,10 +891,10 @@ msgstr "Новый пароль слишком короткий."
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -766,20 +955,20 @@ msgstr ""
 #: 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/functions.inc:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
 #: 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:1102
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/departments/class_department.inc:241
 #: plugins/admin/departments/class_department.inc:429
 #: plugins/admin/departments/class_department.inc:702
@@ -787,10 +976,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:635
 #: plugins/admin/acl/class_aclRole.inc:675
 #: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -932,46 +1121,53 @@ msgstr ""
 msgid "unconfigured"
 msgstr "Не настроено"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 #, fuzzy
 msgid "Filter error"
 msgstr "Терминал-сервер"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 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_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:612
 #, fuzzy
 msgid "Permission"
 msgstr "Права для членов группы"
 
-#: include/class_management.inc:352
-#: plugins/admin/users/class_userManagement.inc:570
-#: plugins/admin/users/class_userManagement.inc:574
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "Права для членов группы"
 
-#: include/class_management.inc:426 include/class_plugin.inc:1546
+#: include/class_management.inc:427 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_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -1049,12 +1245,12 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1608
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Пользователи"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
@@ -1062,28 +1258,19 @@ msgstr "Группы"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:394
 msgid "Up"
 msgstr ""
 
 #: include/class_acl.inc:495 include/class_listing.inc:235
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:396
 #, fuzzy
 msgid "Down"
 msgstr "Домен"
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Изменить"
-
 #: include/class_acl.inc:500 include/class_acl.inc:504
 #: include/class_acl.inc:1253 include/class_acl.inc:1254
 #: include/class_acl.inc:1259 include/class_tabs.inc:401
@@ -1094,8 +1281,8 @@ msgid "ACL"
 msgstr "Доступ"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
+#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
 #: plugins/admin/acl/class_aclRole.inc:452
 #, php-format
 msgid "Delete"
@@ -1167,10 +1354,10 @@ msgstr "Включаемые объекты"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: include/functions.inc:603 include/functions.inc:789
-#: include/functions.inc:907 include/functions.inc:1305
-#: include/functions.inc:2369 include/functions.inc:2403
-#: include/functions.inc:2423 include/class_ldap.inc:692
+#: include/functions.inc:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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
@@ -1229,46 +1416,39 @@ msgstr "Доступ"
 msgid "Close"
 msgstr "Выбрать"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
 #, fuzzy
 msgid "Go to root department"
 msgstr "Список подразделений"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
+#: include/class_listing.inc:998
 #, fuzzy
 msgid "Root"
 msgstr "Перезагрузить"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
 #, fuzzy
 msgid "Go up one department"
 msgstr "Подразделение"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
 #, fuzzy
 msgid "Go to users department"
 msgstr "Выберите подразделение"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
+#: include/class_listing.inc:1014
 #, fuzzy
 msgid "Home"
 msgstr "Имя системы"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
 msgid "Reload list"
 msgstr ""
 
-#: 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 ""
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1286,34 +1466,7 @@ msgstr ""
 msgid "Choose a base"
 msgstr "Выберите, чтобы просмотреть серверы"
 
-#: 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_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_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Ветка"
-
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:299 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
@@ -1322,77 +1475,71 @@ msgstr "Ветка"
 msgid "Select all"
 msgstr "Удалить"
 
-#: include/class_listing.inc:499
+#: include/class_listing.inc:509
 #, fuzzy
 msgid "created by"
 msgstr "Создать"
 
-#: 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_listing.inc:1379 include/class_listing.inc:1429
 #: include/class_plugin.inc:2070
 #, fuzzy
 msgid "Copy"
 msgstr "Компания"
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_listing.inc:1385 include/class_listing.inc:1419
 #: include/class_plugin.inc:2074
 #, fuzzy
 msgid "Cut"
 msgstr "Выполнить"
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
+#: include/class_listing.inc:1393 include/class_listing.inc:1395
 #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
 #: include/class_CopyPasteHandler.inc:514
 #, fuzzy
 msgid "Paste"
 msgstr "Дата"
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1419 include/class_plugin.inc:2028
 #, fuzzy
 msgid "Cut this entry"
 msgstr "Редактиовать объект"
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1429 include/class_plugin.inc:2036
 #, fuzzy
 msgid "Copy this entry"
 msgstr "Редактиовать объект"
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
+#: include/class_listing.inc:1461 include/class_listing.inc:1463
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Создать настройки запись эл. почты"
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1477
 #, fuzzy
 msgid "Export list"
 msgstr "Экспорт"
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
 #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1522 include/class_plugin.inc:2009
 #, fuzzy
 msgid "Create snapshot"
 msgstr "Создать настройки запись эл. почты"
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1523 include/class_plugin.inc:2010
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "Объект группы"
 
-#: include/class_sortableListing.inc:132
+#: include/class_sortableListing.inc:194
 #, fuzzy
 msgid "Edit this entry"
 msgstr "Редактиовать объект"
 
-#: include/class_sortableListing.inc:133
+#: include/class_sortableListing.inc:199
 #, fuzzy
 msgid "Delete this entry"
 msgstr "Удалить"
@@ -1408,18 +1555,18 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:447
+#: include/functions.inc:448
 #, fuzzy, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "Ошибка при подключении к LDAP-серверу. Ответ сервера: \"%s\"."
 
-#: include/functions.inc:518
+#: include/functions.inc:519
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/functions.inc:603
+#: include/functions.inc:604
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
@@ -1427,11 +1574,11 @@ msgid ""
 msgstr ""
 "Имя/идентификатор пользователя не уникальны. Проверьте свою базу данных LDAP."
 
-#: include/functions.inc:789 include/functions.inc:907
+#: include/functions.inc:790 include/functions.inc:908
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1440,12 +1587,12 @@ msgstr ""
 "Не удается считать блокировку в базе данных LDAP. Проверьте, раздел \"config"
 "\" в файле gosa.conf!"
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP-сервер"
 
-#: include/functions.inc:928
+#: include/functions.inc:929
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
@@ -1454,12 +1601,12 @@ msgstr ""
 "Для блокируемого объекта обнаружено несколько блокировок. Этого быть не "
 "должно, проверьте работу LDAP."
 
-#: include/functions.inc:1232
+#: include/functions.inc:1233
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "Найдено более %d объектов."
 
-#: include/functions.inc:1234
+#: include/functions.inc:1235
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1468,218 +1615,218 @@ msgstr ""
 "Установить новое значение лимита в %s и показать мне это сообщение если "
 "лимит будет исчерпан."
 
-#: include/functions.inc:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Настроить"
 
-#: include/functions.inc:1251
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr "не полный"
 
-#: include/functions.inc:1641
+#: include/functions.inc:1642
 #, fuzzy
 msgid "Continue anyway"
 msgstr "Продолжить"
 
-#: include/functions.inc:1643
+#: include/functions.inc:1644
 #, fuzzy
 msgid "Edit anyway"
 msgstr "Редактиовать объект"
 
-#: include/functions.inc:1645
+#: include/functions.inc:1646
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "Вы собираетесь удалить объект %s."
 
-#: include/functions.inc:1885
+#: include/functions.inc:1886
 msgid "Entries per page"
 msgstr ""
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr ""
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*АБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЫЭЮЯ0123456789"
 
-#: include/functions.inc:2272
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr ""
 
-#: include/functions.inc:2369
+#: include/functions.inc:2370
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:2404 include/functions.inc:2424
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "Удалить"
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr ""
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 #, fuzzy
 msgid "LDAP warning"
 msgstr "Экспорт в LDIF"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr "Не удается получить информацию о схемах. Проверка схем невозможна!"
 
-#: include/functions.inc:2701
+#: include/functions.inc:2702
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2708
+#: include/functions.inc:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2754
 #, fuzzy, php-format
 msgid "Missing required object class '%s'!"
 msgstr "Список подразделений"
 
-#: include/functions.inc:2756
+#: include/functions.inc:2757
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2761
+#: include/functions.inc:2762
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2764
+#: include/functions.inc:2765
 #, php-format
 msgid "Class(es) available"
 msgstr ""
 
-#: include/functions.inc:2786
+#: include/functions.inc:2787
 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:2787
+#: include/functions.inc:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2791
+#: include/functions.inc:2792
 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:2792
+#: include/functions.inc:2793
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2816
+#: include/functions.inc:2817
 msgid "German"
 msgstr "Немецкий"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2818
 msgid "French"
 msgstr "Французский"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr ""
 
-#: include/functions.inc:2819
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr "Испанский"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2821
 msgid "English"
 msgstr "Английский"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr "Датский"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2823
 #, fuzzy
 msgid "Polish"
 msgstr "Английский"
 
-#: include/functions.inc:2824
+#: include/functions.inc:2825
 #, fuzzy
 msgid "Chinese"
 msgstr "сброс"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2826
 #, fuzzy
 msgid "Vietnamese"
 msgstr "Имя"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr "Русский"
 
-#: include/functions.inc:3021
+#: include/functions.inc:3022
 #, fuzzy, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr ""
 "Не удается найти команду \"%s\", указанную в поле POSTREMOVE модуля \"%s\"."
 
-#: include/functions.inc:3054
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3067
+#: include/functions.inc:3068
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: include/functions.inc:3348
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3362
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3392
+#: include/functions.inc:3393
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Список подразделений"
 
-#: include/functions.inc:3400
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3412 include/functions.inc:3416
+#: include/functions.inc:3413 include/functions.inc:3417
 msgid "no ID available!"
 msgstr ""
 
-#: include/functions.inc:3440
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3500
+#: include/functions.inc:3501
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
@@ -1714,38 +1861,6 @@ msgstr "Создать настройки запись эл. почты"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr "Описание"
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -2225,7 +2340,9 @@ msgstr "Значение поля \"Имя\" содержит недопусти
 msgid "Missing %s PHP extension!"
 msgstr "Удалить параметры"
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Добавить"
@@ -2588,12 +2705,12 @@ msgstr ""
 msgid "Cannot not parse XML!"
 msgstr "Слишком много пользователей, невозможно создать идентификатор!"
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1184
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "Удалить"
 
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1204
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "состояние неизвестно"
@@ -2688,12 +2805,12 @@ msgid "Please fix the above error and reload the page."
 msgstr ""
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1248
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Общее"
@@ -2706,20 +2823,22 @@ msgstr "Unix"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Почта"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:750
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr "Факс"
 
@@ -2736,34 +2855,24 @@ msgstr "FTP"
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr "Группа"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/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:188
 #: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:766
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Телефон"
 
@@ -2774,6 +2883,7 @@ msgstr "Приложение"
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
 #: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Сервер"
@@ -2784,6 +2894,7 @@ msgstr "Тонкий клиент"
 
 #: plugins/generic/references/class_reference.inc:69
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr "Рабочая станция"
 
@@ -2839,12 +2950,6 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Команда разработчиков GOsa"
 
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/dep-list.tpl:13 plugins/admin/acl/acl-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/ogroups/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -2854,7 +2959,7 @@ msgstr ""
 "сможет восстановить эти данные."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/class_ogroup.inc:1080
 msgid "Object groups"
 msgstr "Объединения"
 
@@ -2865,7 +2970,7 @@ msgstr "Название группы"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/users/class_userManagement.inc:189
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "Ошибка LDAP:"
@@ -2876,6 +2981,7 @@ msgid "Templates"
 msgstr "Шаблон"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
 #: 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"
@@ -2887,6 +2993,7 @@ msgid "Windows Install"
 msgstr "Рабочая станция Windows"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 #, fuzzy
 msgid "Terminal"
 msgstr "Терминалы"
@@ -2895,142 +3002,142 @@ msgstr "Терминалы"
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 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
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
 #, fuzzy, php-format
 msgid "Show %s"
 msgstr "Показать группы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 #, fuzzy
 msgid "people"
 msgstr "Показать людей"
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr "группы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr "серверы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr "рабочие станции"
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr "терминалы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 #, fuzzy
 msgid "printer"
 msgstr "принтеры"
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr "принтеры"
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr "телефоны"
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr "приложения"
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr "нет"
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr "слишком много различных объектов!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr "пользователи"
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 #, fuzzy
 msgid "winstations"
 msgstr "Рабочая станция"
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 #: 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "полный доступ"
 
-#: plugins/admin/ogroups/class_ogroup.inc:571
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:645
+#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "разрешить доступ только на эти хосты"
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 #, fuzzy
 msgid "Non existing dn:"
 msgstr "Не существующий dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
 #: 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: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/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -3067,31 +3174,33 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Фамилия"
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr ""
 "Вы можете комбинировать не более двух различных классов в одном объекте!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 #, fuzzy
 msgid "Object group generic"
 msgstr "Объект группы"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Системные доверия"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 #, fuzzy
 msgid "Member"
 msgstr "Включаемые объекты"
@@ -3130,7 +3239,7 @@ msgid "Select a base"
 msgstr "Выберите, чтобы просмотреть серверы"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Системные доверия"
@@ -3172,8 +3281,9 @@ msgstr ""
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:758
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr "Окружение"
 
@@ -3186,15 +3296,6 @@ msgstr "Приложения"
 msgid "Please enter the new object group name"
 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-filter.tpl:11
 #, fuzzy
 msgid "user groups"
@@ -3310,7 +3411,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3331,19 +3432,19 @@ msgid "Select systems to add"
 msgstr "Выберите системы для добавления"
 
 #: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:25
 #: 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/admin/groups/trust_machines.tpl:29
 #: 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/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Регулярное выражение для поиска адреса"
@@ -3382,6 +3483,47 @@ msgstr "Фильтр"
 msgid "Regular expression for matching user names"
 msgstr "Регулярное выражение, соответствующее именам пользователей"
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Язык по умолчанию"
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr "Имя"
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+#, fuzzy
+msgid "Surname"
+msgstr "Имя сервера"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Показать основные группы"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Показать группы samba"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
+msgstr "Показать группы samba"
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3441,116 +3583,103 @@ msgstr "Основная группа"
 msgid "Not in all groups"
 msgstr "Показать группы с эл. почтой"
 
-#: plugins/admin/groups/group-filter.tpl:11
-msgid "Show primary groups"
-msgstr "Показать основные группы"
-
-#: plugins/admin/groups/group-filter.tpl:12
-msgid "Show samba groups"
-msgstr "Показать группы samba"
-
-#: plugins/admin/groups/group-filter.tpl:13
-#, fuzzy
-msgid "Show mail groups"
-msgstr "Показать группы samba"
-
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #, fuzzy
 msgid "Cannot find group SID in your configuration!"
 msgstr "Не могу найти SID в базе LDAP или в сонфигурационном файле!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr "Группа Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr "Администраторы домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr "Пользователи домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr "Непривилегированные пользователи домена"
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr "Специальная группа (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 #, fuzzy
 msgid "! unknown UID"
 msgstr "состояние неизвестно"
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:969
+#: plugins/admin/groups/class_groupGeneric.inc:932
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "Удалить"
 
-#: plugins/admin/groups/class_groupGeneric.inc:974
+#: plugins/admin/groups/class_groupGeneric.inc:937
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "Удалить"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1212
 #, fuzzy
 msgid "Generic group settings"
 msgstr "Общая информация о пользователе"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 #, fuzzy
 msgid "Samba group type"
 msgstr "Группа Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Домашний каталог Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "Члены телефонной группы"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1230
 #, fuzzy
 msgid "Nagios group"
 msgstr "Контакт"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 #, fuzzy
 msgid "Group member"
 msgstr "Члены группы"
@@ -3561,6 +3690,7 @@ msgid "Group settings"
 msgstr "Настройки Samba"
 
 #: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
 msgid "List of groups"
 msgstr "Список групп"
 
@@ -3579,45 +3709,53 @@ msgid "Group administration"
 msgstr "Управление группами"
 
 #: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
 #, fuzzy
 msgid "Posix"
 msgstr "Прокси-сервер"
 
 #: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
 #, fuzzy
 msgid "Edit posix properties"
 msgstr "Изменить свойства"
 
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 #, fuzzy
 msgid "Edit mail properties"
 msgstr "Изменить свойства"
 
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 #, fuzzy
 msgid "Edit samba properties"
 msgstr "Изменить свойства"
 
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 #, fuzzy
 msgid "Edit phone properties"
 msgstr "Изменить свойства"
 
 #: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
 #, fuzzy
 msgid "Menu"
 msgstr "Принтер"
 
 #: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
 #, fuzzy
 msgid "Edit start menu properties"
 msgstr "Изменить свойства"
 
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 #, fuzzy
 msgid "Edit environment properties"
 msgstr "Изменить свойства"
@@ -3686,7 +3824,7 @@ msgstr ""
 "использовать шаблоны."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:404
+#: plugins/admin/users/class_userManagement.inc:405
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
@@ -3709,48 +3847,39 @@ msgstr "Список"
 msgid "Manage users"
 msgstr "Пользователи домена"
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:278
 #, fuzzy
 msgid "You have no permission to change this users password!"
 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:649
+#: plugins/admin/users/class_userManagement.inc:650
 #, fuzzy
 msgid "Account locking"
 msgstr "Учетная запись"
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:651
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:724
 #, fuzzy
 msgid "Unlock account"
 msgstr "Моя учетная запись"
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 #, fuzzy
 msgid "Lock account"
 msgstr "Моя учетная запись"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 #, fuzzy
 msgid "Edit generic properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:742
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3758,21 +3887,21 @@ msgstr "Изменить свойства"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:743
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:754
 msgid "Netatalk"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:755
 #, fuzzy
 msgid "Edit netatalk properties"
 msgstr "Изменить свойства"
 
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:763
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Изменить свойства"
@@ -3781,12 +3910,6 @@ msgstr "Изменить свойства"
 msgid "List of users"
 msgstr "Список пользователей"
 
-#: plugins/admin/users/user-list.xml:49
-#: plugins/personal/generic/class_user.inc:1608
-#, fuzzy
-msgid "Surname"
-msgstr "Имя сервера"
-
 #: plugins/admin/users/user-list.xml:140
 #, fuzzy
 msgid "Lock users"
@@ -3882,52 +4005,6 @@ msgstr ""
 "файл. Если вы сделали это и действительно хотите выполнить удаление, нажмите "
 "<i>Удалить</i>, иначе нажмите <i>Отмена</i>."
 
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-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/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-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/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/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
 #, fuzzy
@@ -4014,8 +4091,8 @@ msgstr "Категория этой ветки"
 #: 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/class_user.inc:1639
+#: plugins/personal/generic/generic.tpl:387
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Местоположение"
@@ -4024,8 +4101,8 @@ msgstr "Местоположение"
 #: 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/class_user.inc:1638
+#: plugins/personal/generic/generic.tpl:395
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Адм. единица"
@@ -4044,7 +4121,7 @@ msgstr "Местоположение ветки"
 #: 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/generic.tpl:403
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -4065,10 +4142,10 @@ msgstr "Основный телефонный номер для ветки"
 #: 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/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
@@ -4112,7 +4189,7 @@ msgid "Organization name"
 msgstr "Организация"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1640
 #, fuzzy
 msgid "Postal address"
 msgstr "Почтовый индекс"
@@ -4296,8 +4373,8 @@ msgstr ""
 
 #: 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/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:454
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Роль"
@@ -4337,7 +4414,7 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "Дополнительные записи в fstab"
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:274
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
@@ -4387,226 +4464,226 @@ msgstr "Изменить сертификаты"
 msgid "The selected password method is no longer available."
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1156
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1163
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1181
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1247
+#: plugins/personal/generic/class_user.inc:1252
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "У выбранного приложения нет параметров."
 
-#: plugins/personal/generic/class_user.inc:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Домашняя страница"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1731
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Мобильный"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Пейджер"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Дата рождения"
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1441
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "Невозможно выбрать базу данных!"
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Подразделение"
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Номер дома"
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Специальность"
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Последняя доставка"
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr "Местоположение сотрудника"
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Описание подразделения"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr "Область деятельности"
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Должность"
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Серийный номер сертификата"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "Видимый всем"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Улица"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Почтовый индекс"
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1603
 #, fuzzy
 msgid "Generic user settings"
 msgstr "Общая информация о пользователе"
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "Моя учетная запись"
 
-#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/class_user.inc:1615
 #, fuzzy
 msgid "User identification"
 msgstr "Информация"
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Обращение"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1617
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "Академическое звание"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1620
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Пол"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1621
 #, fuzzy
 msgid "Preferred language"
 msgstr "Язык по умолчанию"
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1624
 #: plugins/personal/generic/paste_generic.tpl:47
 #, fuzzy
 msgid "User picture"
 msgstr "Изображение"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Department number"
 msgstr "Управление подразделениями"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1629
 #, fuzzy
 msgid "Employee number"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Форма трудоустройства"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1632
 #, fuzzy
 msgid "Room number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1633
 #, fuzzy
 msgid "Telefon number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1634
 #, fuzzy
 msgid "Pager number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1635
 #, fuzzy
 msgid "Mobile number"
 msgstr "Домашний телефон"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1636
 #, fuzzy
 msgid "Fax number"
 msgstr "Терминал"
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1643
 #, fuzzy
 msgid "Home phone number"
 msgstr "Телефонные номера"
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1645
 #, fuzzy
 msgid "User password method"
 msgstr "Хэширование паролей"
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1646
 #, fuzzy
 msgid "User certificates"
 msgstr "Стандартный сертификат"
@@ -4672,33 +4749,33 @@ msgstr "Изменить сертификаты"
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Информация об организации"
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Номер подразделения"
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Номер работника"
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Номер комнаты"
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr "Воспользуйтесь закладкой \"Телефон\""
 
@@ -4788,141 +4865,141 @@ msgstr "Срок действия пароля истекает"
 msgid "automatic"
 msgstr "автоматически"
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr "Пароль нельзя изменить в течение %s дн. с последней смены (shadowMin)"
 
-#: plugins/personal/posix/class_posixAccount.inc:519
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "Пароль должен быть изменен по истечении %s дн. (shadowMax)"
 
-#: plugins/personal/posix/class_posixAccount.inc:523
+#: plugins/personal/posix/class_posixAccount.inc:452
 #, fuzzy, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr ""
 "Отключить учетную запись, если срок действия пароля истек и прошло %s дн. "
 "бездействия (shadowInactive)"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:456
 #, fuzzy, php-format
 msgid "Warn user %s days before password expiry"
 msgstr ""
 "Предупреждать пользователей за %s дн. до истечения срока действия пароля "
 "(shadowWarning)"
 
-#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:793
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr "Группа пользователя"
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:946
 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:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
-#: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "Домашний каталог"
 
-#: plugins/personal/posix/class_posixAccount.inc:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 #, fuzzy
 msgid "shadowMin"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 #, fuzzy
 msgid "shadowMax"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 #, fuzzy
 msgid "shadowWarning"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 #, fuzzy
 msgid "shadowInactive"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1440
 #, fuzzy
 msgid "POSIX account"
 msgstr "Аккаунт FTP"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Оболочка"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "Идентификатор пользователя"
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1453
 #, fuzzy
 msgid "Group ID"
 msgstr "Группа"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1455
 #, fuzzy
 msgid "Force password change on login"
 msgstr "Сменить пароль"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1456
 #, fuzzy
 msgid "Shadow min"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1457
 #, fuzzy
 msgid "Shadow max"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #, fuzzy
 msgid "Shadow warning"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "Затенение"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #, fuzzy
 msgid "Shadow expire"
 msgstr "Показать людей"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1462
 #, fuzzy
 msgid "System trust model"
 msgstr "Системные доверия"
@@ -5003,6 +5080,23 @@ msgstr "Показать группы пользователей"
 msgid "User name of which groups are shown"
 msgstr "Имя пользователя, для которого перечисляются группы"
 
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#, fuzzy
+msgid "List of systems"
+msgstr "Список пользователей"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+msgid "Show servers"
+msgstr "Показать серверы"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+msgid "Show workstations"
+msgstr "Показать рабочие станции"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+msgid "Show terminals"
+msgstr "Показать терминалы"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 #, fuzzy
 msgid "Posix settings"
@@ -6837,6 +6931,14 @@ msgstr "Язык по умолчанию"
 msgid "Automatic"
 msgstr "автоматически"
 
+#, fuzzy
+#~ msgid "givenname"
+#~ msgstr "Имя"
+
+#, fuzzy
+#~ msgid "surename"
+#~ msgstr "Имя сервера"
+
 #, fuzzy
 #~ msgid "Edit ogroup"
 #~ msgstr "Список групп"
@@ -7139,10 +7241,6 @@ msgstr "автоматически"
 #~ msgid "Delete acl role"
 #~ msgstr "Удалить"
 
-#, fuzzy
-#~ msgid "Surename"
-#~ msgstr "Имя сервера"
-
 #, fuzzy
 #~ msgid "Steps"
 #~ msgstr "Системы"
@@ -7707,21 +7805,12 @@ msgstr "автоматически"
 #~ msgid "Show applications"
 #~ msgstr "Показать приложения"
 
-#~ msgid "Show servers"
-#~ msgstr "Показать серверы"
-
 #~ msgid "Select to see workstations"
 #~ msgstr "Выберите чтобы посмотреть рабочие станции"
 
-#~ msgid "Show workstations"
-#~ msgstr "Показать рабочие станции"
-
 #~ msgid "Select to see terminals"
 #~ msgstr "Выберите чтобы посмотреть терминалы"
 
-#~ msgid "Show terminals"
-#~ msgstr "Показать терминалы"
-
 #~ msgid "Select to see printers"
 #~ msgstr "Выберите чтобы посмотреть принтеры"
 
index 83fbbeb8cc8541d79c65d24a6f37f2a66147ae5d..dc6ef05afdbecf1c571e06f1020ed4a627940518 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VIcore2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 17:26+0100\n"
+"POT-Creation-Date: 2010-01-27 15:02+0100\n"
 "PO-Revision-Date: 2008-07-04 09:59+0200\n"
 "Last-Translator: Stefan Koehler <stefan@gonicus.de>\n"
 "Language-Team: Vietnamese\n"
@@ -18,6 +18,60 @@ msgstr ""
 "X-Generator: KBabel 1.11.4\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "Cơ sở"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr "Nộp"
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -30,6 +84,7 @@ msgstr "Thông tin"
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr "Các bộ lọc"
@@ -38,16 +93,16 @@ msgstr "Các bộ lọc"
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
+#: include/functions.inc:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
 #: 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #: 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:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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
@@ -293,7 +348,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:248
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -315,6 +370,127 @@ msgstr "Thay đổi mật mã "
 msgid "Click here to change your password"
 msgstr "Kích vào đây để thay đổi mật khẩu của bạn"
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "Danh sách các bộ phận"
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "Admin miền"
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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í"
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "Tổ chức"
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "Bộ phận"
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "Mô tả"
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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"
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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"
+
 #: ihtml/themes/default/logout-close.tpl:5
 msgid "Your GOsa session has been closed!"
 msgstr "Phiên GOsa của bạn vừa bị đóng!"
@@ -413,22 +589,22 @@ 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/class_management.inc:446
-#: include/class_management.inc:910
+#: html/index.php:228 include/class_management.inc:447
+#: include/class_management.inc:583 include/class_management.inc:915
 #: 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/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 include/class_tabs.inc:56
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
 #: 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_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:159
@@ -437,18 +613,18 @@ msgstr "Tiếp tục"
 #: 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:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/admin/groups/class_groupGeneric.inc:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
 #: 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:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -489,7 +665,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:276
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -607,6 +783,19 @@ msgstr ""
 msgid "Logout"
 msgstr "Đăng xuất"
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "Các bộ lọc"
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -637,7 +826,7 @@ 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:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_department.inc:386
 msgid "Fatal error"
@@ -653,9 +842,9 @@ 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:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
@@ -665,7 +854,7 @@ msgstr "Cấu hình GOsa %s/%s không đọc được. Bãi bỏ."
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 msgid "Configuration error"
 msgstr "Lỗi cấu hình"
 
@@ -683,7 +872,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:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -703,10 +892,10 @@ 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/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -771,20 +960,20 @@ msgstr ""
 #: 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/functions.inc:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
 #: 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:1102
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/departments/class_department.inc:241
 #: plugins/admin/departments/class_department.inc:429
 #: plugins/admin/departments/class_department.inc:702
@@ -792,10 +981,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:635
 #: plugins/admin/acl/class_aclRole.inc:675
 #: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -933,44 +1122,51 @@ msgstr ""
 msgid "unconfigured"
 msgstr "không được cấu hình"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 #, fuzzy
 msgid "Filter error"
 msgstr "Lỗi nặng"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 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_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:612
 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
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
 #: 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
+#: include/class_management.inc:427 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_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
 #: 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."
@@ -1047,12 +1243,12 @@ 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:25
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1608
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "Người dùng"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
@@ -1060,27 +1256,18 @@ msgstr "Các nhóm"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:394
 msgid "Up"
 msgstr "Lên"
 
 #: include/class_acl.inc:495 include/class_listing.inc:235
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "Xuống"
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "Hiệu chỉnh"
-
 #: include/class_acl.inc:500 include/class_acl.inc:504
 #: include/class_acl.inc:1253 include/class_acl.inc:1254
 #: include/class_acl.inc:1259 include/class_tabs.inc:401
@@ -1091,8 +1278,8 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
+#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
 #: plugins/admin/acl/class_aclRole.inc:452
 #, php-format
 msgid "Delete"
@@ -1157,10 +1344,10 @@ 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: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/functions.inc:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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
@@ -1213,41 +1400,34 @@ msgstr "Các vai trò ACL"
 msgid "Close"
 msgstr "Đóng"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
 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_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
+#: include/class_listing.inc:998
 msgid "Root"
 msgstr "Gốc"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
 msgid "Go up one department"
 msgstr "Đi lên một bộ phận"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
 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_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
+#: include/class_listing.inc:1014
 msgid "Home"
 msgstr "Nhà"
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
 msgid "Reload list"
 msgstr "Danh sách reload"
 
-#: 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"
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1265,34 +1445,7 @@ msgstr ""
 msgid "Choose a base"
 msgstr "Chọn một gốc"
 
-#: 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_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_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "Cơ sở"
-
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:299 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
@@ -1300,68 +1453,62 @@ msgstr "Cơ sở"
 msgid "Select all"
 msgstr "Chọn tất"
 
-#: include/class_listing.inc:499
+#: include/class_listing.inc:509
 #, fuzzy
 msgid "created by"
 msgstr "Tạo "
 
-#: 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_listing.inc:1379 include/class_listing.inc:1429
 #: include/class_plugin.inc:2070
 msgid "Copy"
 msgstr "Copy"
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_listing.inc:1385 include/class_listing.inc:1419
 #: include/class_plugin.inc:2074
 msgid "Cut"
 msgstr "Cut"
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
+#: include/class_listing.inc:1393 include/class_listing.inc:1395
 #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "Paste"
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1419 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "Cắt entry này"
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1429 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "Copy entry này"
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
+#: include/class_listing.inc:1461 include/class_listing.inc:1463
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "Phục hồi lại snapshot"
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1477
 msgid "Export list"
 msgstr ""
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
 #: 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:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1522 include/class_plugin.inc:2009
 msgid "Create snapshot"
 msgstr "Tạo ra snapshot"
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1523 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/class_sortableListing.inc:132
+#: include/class_sortableListing.inc:194
 msgid "Edit this entry"
 msgstr "Hiệu chỉnh entry này"
 
-#: include/class_sortableListing.inc:133
+#: include/class_sortableListing.inc:199
 msgid "Delete this entry"
 msgstr "Xóa bỏ entry"
 
@@ -1380,17 +1527,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:447
+#: include/functions.inc:448
 #, 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:518
+#: include/functions.inc:519
 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:603
+#: include/functions.inc:604
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
@@ -1398,11 +1545,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:789 include/functions.inc:907
+#: include/functions.inc:790 include/functions.inc:908
 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:799
+#: include/functions.inc:800
 #, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
@@ -1411,12 +1558,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:799
+#: include/functions.inc:800
 #, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP server trả về: %s"
 
-#: include/functions.inc:928
+#: include/functions.inc:929
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
@@ -1424,12 +1571,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:1232
+#: include/functions.inc:1233
 #, 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:1234
+#: include/functions.inc:1235
 #, php-format
 msgid ""
 "Set the new size limit to %s and show me this message if the limit still "
@@ -1438,73 +1585,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:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "Cấu hình"
 
-#: include/functions.inc:1251
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr "chưa hoàn thành"
 
-#: include/functions.inc:1641
+#: include/functions.inc:1642
 msgid "Continue anyway"
 msgstr "Cứ tiếp tục"
 
-#: include/functions.inc:1643
+#: include/functions.inc:1644
 msgid "Edit anyway"
 msgstr "Cứ hiệu chỉnh"
 
-#: include/functions.inc:1645
+#: include/functions.inc:1646
 #, 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:1885
+#: include/functions.inc:1886
 msgid "Entries per page"
 msgstr "các entry cho mỗi trang"
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "Áp dụng bộ lọc"
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2272
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "snapshot phát triển GOsa (Rev %s)"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2370
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr "File '%s' không thể bị xóa."
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:2404 include/functions.inc:2424
 msgid "Cannot write to revision file!"
 msgstr "Không thể viết lên revision file!"
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 #, 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:2675
+#: include/functions.inc:2676
 msgid "LDAP warning"
 msgstr "Cảnh báo LDAP"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 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:2701
+#: include/functions.inc:2702
 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:2708
+#: include/functions.inc:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
@@ -1512,27 +1659,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:2753
+#: include/functions.inc:2754
 #, 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:2756
+#: include/functions.inc:2757
 #, 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:2761
+#: include/functions.inc:2762
 #, 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:2764
+#: include/functions.inc:2765
 #, php-format
 msgid "Class(es) available"
 msgstr "Đã có lớp"
 
-#: include/functions.inc:2786
+#: include/functions.inc:2787
 msgid ""
 "You have enabled the rfc2307bis option on the 'ldap setup' step, but your "
 "schema    configuration do not support this option."
@@ -1540,7 +1687,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:2787
+#: include/functions.inc:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
@@ -1548,7 +1695,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:2791
+#: include/functions.inc:2792
 msgid ""
 "Your schema is configured to support the rfc2307bis group, but you have "
 "disabled this option on the 'ldap setup' step."
@@ -1556,51 +1703,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:2792
+#: include/functions.inc:2793
 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:2816
+#: include/functions.inc:2817
 msgid "German"
 msgstr "Tiếng Đức"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2818
 msgid "French"
 msgstr "Tiếng Pháp"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr "Tiếng Ý"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr "Tiếng Tây Ban Nha"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2821
 msgid "English"
 msgstr "Tiếng Anh"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr "Tiếng Hà Lan"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2823
 msgid "Polish"
 msgstr "Tiếng Phần Lan"
 
-#: include/functions.inc:2824
+#: include/functions.inc:2825
 msgid "Chinese"
 msgstr "Tiếng Trung Quốc"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2826
 msgid "Vietnamese"
 msgstr "Tiếng Việt"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr "Tiếng Nga"
 
-#: include/functions.inc:3021
+#: include/functions.inc:3022
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
@@ -1608,52 +1755,52 @@ 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:3054
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr "Không thể sinh ra hàm băm samba!"
 
-#: include/functions.inc:3067
+#: include/functions.inc:3068
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr "Không thể phân phối một ID miễn phí!"
 
-#: include/functions.inc:3348
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3362
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3392
+#: include/functions.inc:3393
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "Không thể tạo ra folder '%s'!"
 
-#: include/functions.inc:3400
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3412 include/functions.inc:3416
+#: include/functions.inc:3413 include/functions.inc:3417
 #, fuzzy
 msgid "no ID available!"
 msgstr "Không có mẫu nào!"
 
-#: include/functions.inc:3440
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3500
+#: include/functions.inc:3501
 msgid "Cannot allocate a free ID!"
 msgstr "Không thể phân phối một ID miễn phí!"
 
@@ -1686,38 +1833,6 @@ msgstr "Xóa snapshot"
 msgid "Y-m-d, H:i:s"
 msgstr "Y-m-d, H:i:s (Năm-tháng-ngày)"
 
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr "Mô tả"
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -2162,7 +2277,9 @@ msgstr "Trường '%s' chứa các ký tự không hợp lệ!"
 msgid "Missing %s PHP extension!"
 msgstr "PHP mở rộng %s mất tích!"
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "Thêm vào"
@@ -2522,12 +2639,12 @@ msgstr "GOsa hỗ trợ chương trình daemon"
 msgid "Cannot not parse XML!"
 msgstr "Không thể phân tách XML!"
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1184
 #, 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:1200
+#: include/class_gosaSupportDaemon.inc:1204
 #, php-format
 msgid "Cannot remove entry %s!"
 msgstr "Không thể xóa entry %s!"
@@ -2617,12 +2734,12 @@ msgid "Please fix the above error and reload the page."
 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:1248
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "Thông tin chung"
@@ -2635,20 +2752,22 @@ msgstr "UNIX"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "Thư"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:750
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr "Fax"
 
@@ -2665,34 +2784,24 @@ msgstr "FTP "
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr "Nhóm "
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/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:188
 #: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:766
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "Số điện thoại"
 
@@ -2703,6 +2812,7 @@ msgstr "Ứng dụng"
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
 #: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "Máy chủ (server)"
@@ -2713,6 +2823,7 @@ msgstr "Máy khách yếu"
 
 #: plugins/generic/references/class_reference.inc:69
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr "Máy trạm"
 
@@ -2766,12 +2877,6 @@ msgstr ""
 msgid "The GOsa team"
 msgstr "Nhóm phát triển Gosa"
 
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/dep-list.tpl:13 plugins/admin/acl/acl-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/ogroups/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -2781,7 +2886,7 @@ msgstr ""
 "cách nào để GOsa lấy lại dữ liệu cho bạn."
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/class_ogroup.inc:1080
 msgid "Object groups"
 msgstr "Tất cả các nhóm đối tượng"
 
@@ -2791,7 +2896,7 @@ msgstr "Quản lý các nhóm đối tượng "
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/users/class_userManagement.inc:189
 msgid "Infrastructure error"
 msgstr "Lỗi cơ sở hạ tầng"
 
@@ -2801,6 +2906,7 @@ msgid "Templates"
 msgstr "Mẫu"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
 #: 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"
@@ -2811,6 +2917,7 @@ msgid "Windows Install"
 msgstr "Cài đặt window"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 msgid "Terminal"
 msgstr "Thiết bị cuối "
 
@@ -2820,138 +2927,138 @@ msgstr ""
 "Bạn không thể kết hợp các thiết bị cuối và máy trạm vào trong một nhóm đối "
 "tượng!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 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
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
 #, php-format
 msgid "Show %s"
 msgstr "Hiển thị %s"
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 msgid "people"
 msgstr "Người"
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr "các nhóm"
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr "các server"
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr "máy trạm"
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr "các thiết bị cuối"
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 msgid "printer"
 msgstr "máy in"
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr "các máy in"
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr "điện thoại"
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr "các ứng dụng"
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr "không có"
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr "có quá nhiều các đối tượng khác nhau!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr "người dùng"
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 msgid "winstations"
 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 #: 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 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:645
+#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "Cho phép truy cập đến các máy chủ này"
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 msgid "Non existing dn:"
 msgstr "dn không tồn tại:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
 #: 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: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/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -2988,28 +3095,30 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "Tên"
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 msgid "You can combine two different object types at maximum, only!"
 msgstr "Bạn chỉ có thể kết hợp hai đối tượng khác nhau tại mức cực đại!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 msgid "Object group generic"
 msgstr "Nhóm đối tượng chung"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 #, fuzzy
 msgid "Sytem trust"
 msgstr "Ủy thác hệ thống"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 msgid "Member"
 msgstr "Thành viên"
 
@@ -3046,7 +3155,7 @@ msgid "Select a base"
 msgstr "Chọn một cơ sở"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "Ủy thác hệ thống"
@@ -3085,8 +3194,9 @@ msgstr "Tóm tắt FAI"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:758
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr "Môi trường"
 
@@ -3098,15 +3208,6 @@ 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-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-filter.tpl:11
 msgid "user groups"
 msgstr "các nhóm người dùng"
@@ -3210,7 +3311,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3231,19 +3332,19 @@ 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/admin/groups/trust_machines.tpl:25
 #: 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/admin/groups/trust_machines.tpl:29
 #: plugins/personal/posix/trust_machines.tpl:30
 msgid "Display systems matching"
 msgstr "Hiển thị việc khớp các hệ thống"
 
 #: plugins/admin/ogroups/trust_machines.tpl:31
-#: plugins/admin/groups/trust_machines.tpl:31
+#: plugins/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "Biểu thức thông thường cho việc khớp các địa chỉ"
@@ -3281,6 +3382,49 @@ msgstr "Hiển thị việc khớp người dùng"
 msgid "Regular expression for matching user names"
 msgstr "Hiển thị thông thường cho việc khớp tên người sử dụng"
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Xin hãy lựa chọn ngôn ngữ ưu thích"
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr "Tên thật"
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+#, fuzzy
+msgid "Surname"
+msgstr "Họ "
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+#, fuzzy
+msgid "Show primary groups"
+msgstr "các nhóm sơ cấp"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+#, fuzzy
+msgid "Show samba groups"
+msgstr "các nhóm samba"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
+msgstr "các nhóm mail"
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3337,113 +3481,98 @@ 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/group-filter.tpl:11
-#, fuzzy
-msgid "Show primary groups"
-msgstr "các nhóm sơ cấp"
-
-#: plugins/admin/groups/group-filter.tpl:12
-#, fuzzy
-msgid "Show samba groups"
-msgstr "các nhóm samba"
-
-#: plugins/admin/groups/group-filter.tpl:13
-#, fuzzy
-msgid "Show mail groups"
-msgstr "các nhóm mail"
-
 #: 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!"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr "Nhóm Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr "Admin miền"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr "Người dùng miền"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr "Khách miền"
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr "Nhóm đặc biệt (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 #, fuzzy
 msgid "! unknown UID"
 msgstr "! không nhận ra id này"
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, php-format
 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:969
+#: plugins/admin/groups/class_groupGeneric.inc:932
 #, 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:974
+#: plugins/admin/groups/class_groupGeneric.inc:937
 #, 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: 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:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1212
 msgid "Generic group settings"
 msgstr "Thiết lập nhóm chung"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 msgid "Samba group type"
 msgstr "Loại nhóm Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 msgid "Samba domain name"
 msgstr "Tên miền Samba"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 msgid "Phone pickup group"
 msgstr "Nhóm nhấc điện thoại"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1230
 msgid "Nagios group"
 msgstr "Nhóm phần mềm Nagios"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 msgid "Group member"
 msgstr "Thành viên nhóm"
 
@@ -3452,6 +3581,7 @@ msgid "Group settings"
 msgstr "Thiết lập nhóm"
 
 #: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
 msgid "List of groups"
 msgstr "Danh sách các nhóm"
 
@@ -3470,40 +3600,48 @@ msgid "Group administration"
 msgstr "Quản trị nhóm"
 
 #: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
 msgid "Posix"
 msgstr "Posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
 #, fuzzy
 msgid "Edit posix properties"
 msgstr "Hiệu chỉnh các tính năng điện thoại"
 
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "Hiệu chỉnh các tính năng mail"
 
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "Hiệu chỉnh các tính năng samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "Hiệu chỉnh các tính năng điện thoại"
 
 #: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
 msgid "Menu"
 msgstr ""
 
 #: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
 #, fuzzy
 msgid "Edit start menu properties"
 msgstr "Hiệu chỉnh các tính năng samba"
 
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "Hiệu chỉnh các tính năng môi trường"
 
@@ -3567,7 +3705,7 @@ msgstr ""
 "các mẫu."
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:404
+#: plugins/admin/users/class_userManagement.inc:405
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
@@ -3587,46 +3725,37 @@ msgstr "Tên"
 msgid "Manage users"
 msgstr "Quản lý người dùng"
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:278
 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: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:649
+#: plugins/admin/users/class_userManagement.inc:650
 #, fuzzy
 msgid "Account locking"
 msgstr "Tài khoản"
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:651
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:724
 #, fuzzy
 msgid "Unlock account"
 msgstr "Tài khoản của tôi"
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 #, fuzzy
 msgid "Lock account"
 msgstr "Tài khoản của tôi"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit generic properties"
 msgstr "Hiệu chỉnh các tính năng chung"
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:742
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3634,20 +3763,20 @@ msgstr "Hiệu chỉnh các tính năng chung"
 msgid "POSIX"
 msgstr "POSIX (giao diện hệ điều hành lưu động)"
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:743
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "Hiệu chỉnh các tính năng UNIX"
 
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:754
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:755
 msgid "Edit netatalk properties"
 msgstr "Hiệu chỉnh các đặc tính của netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:763
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "Hiệu chỉnh các tính năng UNIX"
@@ -3656,12 +3785,6 @@ msgstr "Hiệu chỉnh các tính năng UNIX"
 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 "Surname"
-msgstr "Họ "
-
 #: plugins/admin/users/user-list.xml:140
 #, fuzzy
 msgid "Lock users"
@@ -3756,52 +3879,6 @@ 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/dep-list.xml:11
-msgid "List of departments"
-msgstr "Danh sách các 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/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-msgstr "Admin miền"
-
-#: 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/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/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
 #, fuzzy
@@ -3887,8 +3964,8 @@ msgstr "Các danh mục cho cây con"
 #: 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/class_user.inc:1639
+#: plugins/personal/generic/generic.tpl:387
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "Vị trí"
@@ -3897,8 +3974,8 @@ msgstr "Vị trí"
 #: 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/class_user.inc:1638
+#: plugins/personal/generic/generic.tpl:395
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "Bang"
@@ -3917,7 +3994,7 @@ msgstr "Vị trí của cây con"
 #: 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/generic.tpl:403
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -3938,10 +4015,10 @@ msgstr "Đặt số điện thoại của cây con này"
 #: 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/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
@@ -3987,7 +4064,7 @@ msgid "Organization name"
 msgstr "Tổ chức"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1640
 msgid "Postal address"
 msgstr "Địa chỉ theo bưu điện"
 
@@ -4167,8 +4244,8 @@ msgstr ""
 
 #: 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/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:454
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "Vai trò"
@@ -4208,7 +4285,7 @@ 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:264
+#: plugins/personal/generic/class_user.inc:274
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
@@ -4257,212 +4334,212 @@ msgstr "Không có giấy chứng nhận nào được cài đặt"
 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:1151
+#: plugins/personal/generic/class_user.inc:1156
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1163
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1181
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1247
+#: plugins/personal/generic/class_user.inc:1252
 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:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "Trang chủ"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1731
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "Điện thoại di động"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "Máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "Ngày sinh"
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1441
 msgid "Cannot open certificate!"
 msgstr "Không mở được giấy chứng nhận!"
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "Đơn vị"
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "Mô tả căn nhà"
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "Nghề nghiệp"
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "Lần cung cấp cuối"
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: 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:1587
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "Mô tả đơn vị "
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: 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:1589
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "Danh xưng chức năng"
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "Số seri chứng nhận"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: 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:1592
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "Phố"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "Mã bưu điện"
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1603
 msgid "Generic user settings"
 msgstr "Thiết lập chung của người dùng"
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: 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:1610
+#: plugins/personal/generic/class_user.inc:1615
 msgid "User identification"
 msgstr "Chứng nhận người dùng"
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "Chức danh cá nhân"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1617
 #: 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:1615
+#: plugins/personal/generic/class_user.inc:1620
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "Giới tính"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1621
 msgid "Preferred language"
 msgstr "Ngôn ngữ muốn sử dụng"
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1624
 #: 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:1623
+#: plugins/personal/generic/class_user.inc:1628
 msgid "Department number"
 msgstr "Số phòng làm việc"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1629
 msgid "Employee number"
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "Loại nhân viên"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1632
 msgid "Room number"
 msgstr "Số phòng"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1633
 msgid "Telefon number"
 msgstr "Số điện thoại"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1634
 msgid "Pager number"
 msgstr "Số máy nhắn tin"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1635
 msgid "Mobile number"
 msgstr "Số di động"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1636
 msgid "Fax number"
 msgstr "Số fax"
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr "Đại chỉ nhà theo bưu điện"
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1643
 msgid "Home phone number"
 msgstr "Số điện thoại nhà"
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1645
 #, fuzzy
 msgid "User password method"
 msgstr "Phương pháp lập mật khẩu"
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1646
 msgid "User certificates"
 msgstr "Giấy phép của người dùng"
 
@@ -4525,33 +4602,33 @@ msgstr "Hiệu chỉnh các giấy phép"
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "Thông tin về tổ chức"
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "Số phòng ban"
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "Số nhân viên"
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "Số phòng"
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr "Xin hãy sử dụng Phone Tab"
 
@@ -4633,38 +4710,38 @@ msgstr "mật khẩu hết hạn"
 msgid "automatic"
 msgstr "tự động"
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, 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:519
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, 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:523
+#: plugins/personal/posix/class_posixAccount.inc:452
 #, 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:527
+#: plugins/personal/posix/class_posixAccount.inc:456
 #, 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:864
+#: plugins/personal/posix/class_posixAccount.inc:793
 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:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr "Nhóm người dùng"
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:946
 msgid ""
 "A duplicated UID number was written for this user. If this was not intended "
 "please verify all used uidNumbers!"
@@ -4672,90 +4749,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:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
-#: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: 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:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: 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:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 msgid "shadowMin"
 msgstr "shadowMin"
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 msgid "shadowMax"
 msgstr "shadowMax"
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 msgid "shadowWarning"
 msgstr "Cảnh báo về Shadow"
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 msgid "shadowInactive"
 msgstr "Shadow  không hoạt động"
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1440
 msgid "POSIX account"
 msgstr "tài khoản POSIX"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "ID người dùng"
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1453
 msgid "Group ID"
 msgstr "ID nhóm"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1455
 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:1583
+#: plugins/personal/posix/class_posixAccount.inc:1456
 msgid "Shadow min"
 msgstr "Shadow min"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1457
 msgid "Shadow max"
 msgstr "Shadow max"
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1458
 msgid "Shadow warning"
 msgstr "Cảnh báo Shadow"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1459
 msgid "Shadow inactive"
 msgstr "Shadow không hoạt động"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1460
 msgid "Shadow expire"
 msgstr "Shadow hết hạn"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1462
 msgid "System trust model"
 msgstr "Mô hình ủy thác hệ thống"
 
@@ -4834,6 +4911,26 @@ msgstr "Hiển thị các nhóm người sử dụng"
 msgid "User name of which groups are shown"
 msgstr "Username của các nhóm được hiển thị"
 
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#, fuzzy
+msgid "List of systems"
+msgstr "Danh sách người dùng"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+#, fuzzy
+msgid "Show servers"
+msgstr "các server"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+#, fuzzy
+msgid "Show workstations"
+msgstr "máy trạm"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+#, fuzzy
+msgid "Show terminals"
+msgstr "các thiết bị cuối"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Thiết lập Posix"
@@ -6627,6 +6724,14 @@ 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 "givenname"
+#~ msgstr "Tên thật"
+
+#, fuzzy
+#~ msgid "surename"
+#~ msgstr "Họ "
+
 #, fuzzy
 #~ msgid "Edit ogroup"
 #~ msgstr "Danh sách các nhóm"
index 6c95ee7c25f4b8c9e57face2beadd03bb0282c7f..16fe4f33173a4e3b9babd27e88d37753949d1445 100644 (file)
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-18 17:26+0100\n"
+"POT-Creation-Date: 2010-01-27 15:02+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"
@@ -16,6 +16,60 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
 
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/generic.tpl:26
+#: plugins/admin/groups/userSelect/user-list.tpl:13
+#: plugins/admin/groups/generic.tpl:39
+#: plugins/admin/groups/class_groupGeneric.inc:1222
+#: 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_localityGeneric.inc:89
+#: plugins/admin/departments/class_organizationGeneric.inc:121
+#: plugins/admin/departments/class_countryGeneric.inc:89
+#: plugins/admin/departments/class_dcObject.inc:88
+#: plugins/admin/departments/domain.tpl:28
+#: plugins/admin/departments/country.tpl:28
+#: plugins/admin/departments/dcObject.tpl:28
+#: plugins/admin/departments/class_department.inc:621
+#: plugins/admin/departments/dep-list.tpl:13
+#: plugins/admin/departments/organization.tpl:39
+#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
+#: plugins/admin/acl/acl_role.tpl:27
+#: plugins/personal/generic/class_user.inc:1622
+#: plugins/personal/generic/generic.tpl:164
+#: plugins/personal/generic/multiple_generic.tpl:47
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+#: setup/setup_ldap.tpl:55
+msgid "Base"
+msgstr "位置"
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Update"
+msgstr ""
+
+#: ihtml/themes/default/baseSelect-list.tpl:13
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: plugins/admin/ogroups/ogroup-list.tpl:13
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-list.tpl:13
+#: plugins/personal/posix/groupSelect/group-list.tpl:13
+msgid "Submit"
+msgstr "提交"
+
 #: ihtml/themes/default/MultiSelectWindow.tpl:51
 #: ihtml/themes/default/MultiSelectWindow.tpl:92
 #: ihtml/themes/default/msg_dialog.tpl:61
@@ -28,6 +82,7 @@ msgstr "提示信息"
 #: ihtml/themes/default/MultiSelectWindow.tpl:103
 #: plugins/admin/ogroups/ogroup_objects.tpl:20
 #: plugins/admin/groups/group_objects.tpl:20
+#: plugins/admin/groups/trust_machines.tpl:19
 #: plugins/personal/posix/posix_groups.tpl:21
 msgid "Filters"
 msgstr "过滤器"
@@ -36,16 +91,16 @@ msgstr "过滤器"
 #: ihtml/themes/default/msg_dialog.tpl:106 ihtml/themes/default/islocked.tpl:6
 #: ihtml/themes/default/conflict.tpl:6 html/password.php:280 html/index.php:57
 #: html/index.php:63 html/index.php:414 html/index.php:420
-#: include/functions.inc:928 include/functions.inc:2641
-#: include/functions.inc:2645 include/functions.inc:2651
+#: include/functions.inc:929 include/functions.inc:2642
+#: include/functions.inc:2646 include/functions.inc:2652
 #: 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:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #: 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:864
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:793
+#: plugins/personal/posix/class_posixAccount.inc:946
 #: 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
@@ -290,7 +345,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:248
+#: plugins/admin/users/class_userManagement.inc:249
 #: plugins/personal/generic/main.inc:97
 #: plugins/personal/generic/password.tpl:7
 #: plugins/personal/password/password.tpl:18
@@ -314,6 +369,127 @@ msgstr "修改口令"
 msgid "Click here to change your password"
 msgstr "点击这里来修改您的口令"
 
+#: ihtml/themes/default/baseSelect-list.xml:11
+#: plugins/admin/departments/dep-list.xml:11
+msgid "List of departments"
+msgstr "部门列表"
+
+#: ihtml/themes/default/baseSelect-list.xml:15
+#: 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 "于域"
+
+#: ihtml/themes/default/baseSelect-list.xml:23
+#: plugins/admin/departments/dep-list.xml:23
+#: plugins/admin/departments/dep-list.xml:110
+#, fuzzy
+msgid "Domain component"
+msgstr "域管理员"
+
+#: ihtml/themes/default/baseSelect-list.xml:31
+#: 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 "国家"
+
+#: ihtml/themes/default/baseSelect-list.xml:39
+#: 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 "位置"
+
+#: ihtml/themes/default/baseSelect-list.xml:47
+#: 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:1626
+#: plugins/personal/generic/generic.tpl:285
+#: plugins/personal/generic/multiple_generic.tpl:149
+#: setup/setup_feedback.tpl:23
+msgid "Organization"
+msgstr "组织/公司"
+
+#: ihtml/themes/default/baseSelect-list.xml:55
+#: ihtml/themes/default/baseSelect-list.xml:71
+#: plugins/generic/references/class_reference.inc:59
+#: plugins/admin/ogroups/class_ogroupManagement.inc:186
+#: plugins/admin/departments/dep-list.xml:55
+#: plugins/admin/departments/dep-list.xml:71
+#: plugins/admin/departments/dep-list.xml:138
+#: plugins/admin/departments/class_departmentManagement.inc:235
+#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/generic.tpl:293
+#: plugins/personal/generic/multiple_generic.tpl:159
+msgid "Department"
+msgstr "部门"
+
+#: ihtml/themes/default/baseSelect-list.xml:79
+#: include/class_SnapShotDialog.inc:171
+#: plugins/generic/references/contents.tpl:11
+#: plugins/admin/ogroups/class_ogroup.inc:1085
+#: 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:1221
+#: 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
+#: plugins/admin/departments/class_domain.inc:87
+#: plugins/admin/departments/class_localityGeneric.inc:60
+#: plugins/admin/departments/class_localityGeneric.inc:88
+#: plugins/admin/departments/class_organizationGeneric.inc:91
+#: plugins/admin/departments/class_organizationGeneric.inc:119
+#: plugins/admin/departments/class_countryGeneric.inc:59
+#: plugins/admin/departments/class_countryGeneric.inc:88
+#: plugins/admin/departments/class_dcObject.inc:59
+#: plugins/admin/departments/class_dcObject.inc:87
+#: plugins/admin/departments/domain.tpl:19
+#: plugins/admin/departments/country.tpl:19
+#: plugins/admin/departments/dcObject.tpl:19
+#: plugins/admin/departments/class_department.inc:317
+#: plugins/admin/departments/class_department.inc:619
+#: plugins/admin/departments/organization.tpl:19
+#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
+#: plugins/admin/acl/acl_role.tpl:17
+#: plugins/personal/posix/trustSelect/trust-list.xml:64
+#: plugins/personal/posix/groupSelect/group-list.xml:49
+msgid "Description"
+msgstr "描述"
+
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: 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 "动作"
+
+#: ihtml/themes/default/baseSelect-list.xml:104
+#: ihtml/themes/default/baseSelect-list.xml:111 include/class_acl.inc:500
+#: include/class_acl.inc:548 include/class_sortableListing.inc:192
+#: include/class_sortableListing.inc:194
+#: 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 "编辑"
+
 #: ihtml/themes/default/logout-close.tpl:5
 #, fuzzy
 msgid "Your GOsa session has been closed!"
@@ -401,22 +577,22 @@ msgstr "继续"
 
 #: ihtml/themes/default/msg_dialog.tpl:57
 #: ihtml/themes/default/msg_dialog.tpl:104 html/index.php:224
-#: html/index.php:228 include/class_management.inc:446
-#: include/class_management.inc:910
+#: html/index.php:228 include/class_management.inc:447
+#: include/class_management.inc:583 include/class_management.inc:915
 #: 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/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3393 include/functions.inc:3401
+#: include/functions.inc:3413 include/functions.inc:3417
+#: include/functions.inc:3432 include/functions.inc:3441
+#: include/functions.inc:3501 include/class_tabs.inc:56
 #: include/class_plugin.inc:661 include/class_plugin.inc:702
 #: 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_gosaSupportDaemon.inc:1180
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1184
+#: include/class_gosaSupportDaemon.inc:1204
 #: include/class_CopyPasteHandler.inc:118
 #: include/class_CopyPasteHandler.inc:127
 #: include/class_CopyPasteHandler.inc:159
@@ -425,18 +601,18 @@ msgstr "继续"
 #: 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:969
-#: plugins/admin/groups/class_groupGeneric.inc:974
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/admin/groups/class_groupGeneric.inc:580
+#: plugins/admin/groups/class_groupGeneric.inc:586
+#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/personal/generic/class_user.inc:274
 #: 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:1158
-#: plugins/personal/generic/class_user.inc:1176
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:795
+#: plugins/personal/generic/class_user.inc:1156
+#: plugins/personal/generic/class_user.inc:1163
+#: plugins/personal/generic/class_user.inc:1181
+#: plugins/personal/generic/class_user.inc:1441
 #: plugins/personal/generic/main.inc:115
 #: setup/class_setupStep_Migrate.inc:1200 setup/setup_checks.tpl:30
 #: setup/setup_checks.tpl:91
@@ -479,7 +655,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:276
+#: plugins/admin/users/class_userManagement.inc:277
 #: plugins/personal/password/class_password.inc:78
 #: plugins/personal/password/class_password.inc:81
 #: plugins/personal/password/class_password.inc:84
@@ -594,6 +770,19 @@ msgstr ""
 msgid "Logout"
 msgstr "退出"
 
+#: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/ogroup-filter.tpl:3
+#: plugins/admin/groups/userSelect/user-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
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:3
+#: plugins/personal/posix/groupSelect/group-filter.tpl:3
+#, fuzzy
+msgid "Filter"
+msgstr "过滤器"
+
 #: ihtml/themes/default/framework.tpl:8 ihtml/themes/default/framework.tpl:11
 #: ihtml/themes/default/framework.tpl:20 ihtml/themes/default/framework.tpl:24
 #: include/class_pluglist.inc:207
@@ -622,7 +811,7 @@ msgstr "登录:"
 msgid "GOsa main menu"
 msgstr ""
 
-#: html/password.php:58 html/main.php:147 include/functions.inc:446
+#: html/password.php:58 html/main.php:147 include/functions.inc:447
 #: include/utils/class_xml.inc:43
 #: plugins/admin/departments/class_department.inc:386
 #, fuzzy
@@ -639,9 +828,9 @@ 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:799
-#: include/functions.inc:3022 include/functions.inc:3054
-#: include/functions.inc:3067 include/utils/class_timezone.inc:47
+#: include/class_SnapshotHandler.inc:76 include/functions.inc:800
+#: include/functions.inc:3023 include/functions.inc:3055
+#: include/functions.inc:3068 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
@@ -651,7 +840,7 @@ msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
 #: include/class_CopyPasteHandler.inc:186
 #: include/class_CopyPasteHandler.inc:194
 #: plugins/admin/groups/class_groupGeneric.inc:161
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, fuzzy
 msgid "Configuration error"
 msgstr "配置文件"
@@ -670,7 +859,7 @@ msgstr "口令存储"
 msgid "Error: Password method not available!"
 msgstr ""
 
-#: html/password.php:193 plugins/admin/users/class_userManagement.inc:245
+#: html/password.php:193 plugins/admin/users/class_userManagement.inc:246
 #: plugins/personal/generic/main.inc:92
 #: plugins/personal/password/class_password.inc:82
 msgid ""
@@ -688,10 +877,10 @@ msgstr "输入的新口令太短了。"
 
 #: html/password.php:215 plugins/admin/users/template.tpl:32
 #: plugins/admin/users/user-list.xml:65
-#: plugins/personal/generic/class_user.inc:1274
-#: plugins/personal/generic/class_user.inc:1287
-#: plugins/personal/generic/class_user.inc:1301
-#: plugins/personal/generic/class_user.inc:1303
+#: plugins/personal/generic/class_user.inc:1279
+#: plugins/personal/generic/class_user.inc:1292
+#: plugins/personal/generic/class_user.inc:1306
+#: plugins/personal/generic/class_user.inc:1308
 #: plugins/personal/generic/generic.tpl:82
 #: plugins/personal/generic/paste_generic.tpl:15
 msgid "Login"
@@ -752,20 +941,20 @@ msgstr ""
 #: 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/functions.inc:476 include/functions.inc:511
+#: include/functions.inc:519 include/functions.inc:564
+#: include/functions.inc:815 include/functions.inc:864
+#: include/functions.inc:921 include/functions.inc:974
+#: include/functions.inc:3002 include/functions.inc:3275
 #: 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:1102
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:996
+#: plugins/admin/ogroups/class_ogroup.inc:1010
+#: plugins/admin/groups/class_groupGeneric.inc:738
+#: plugins/admin/groups/class_groupGeneric.inc:1065
 #: plugins/admin/departments/class_department.inc:241
 #: plugins/admin/departments/class_department.inc:429
 #: plugins/admin/departments/class_department.inc:702
@@ -773,10 +962,10 @@ msgstr ""
 #: plugins/admin/acl/class_aclRole.inc:635
 #: plugins/admin/acl/class_aclRole.inc:675
 #: plugins/admin/acl/class_aclRole.inc:689
-#: plugins/personal/generic/class_user.inc:693
-#: plugins/personal/generic/class_user.inc:1073
-#: plugins/personal/posix/class_posixAccount.inc:702
-#: plugins/personal/posix/class_posixAccount.inc:1034
+#: plugins/personal/generic/class_user.inc:692
+#: plugins/personal/generic/class_user.inc:1078
+#: plugins/personal/posix/class_posixAccount.inc:631
+#: plugins/personal/posix/class_posixAccount.inc:963
 #: setup/class_setupStep_Migrate.inc:1211
 #: setup/class_setupStep_Migrate.inc:1239
 #: setup/class_setupStep_Migrate.inc:1288
@@ -912,46 +1101,53 @@ msgstr "帮助目录 '%s' 不能访问,无法读取任何帮助文件。"
 msgid "unconfigured"
 msgstr "未配置"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 #, fuzzy
 msgid "Filter error"
 msgstr "终端服务器"
 
-#: include/class_management.inc:144
+#: include/class_management.inc:145
 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_management.inc:292 include/class_management.inc:427
+#: include/class_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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
+#: plugins/admin/users/class_userManagement.inc:221
+#: plugins/admin/users/class_userManagement.inc:612
 #, fuzzy
 msgid "Permission"
 msgstr "允许"
 
-#: include/class_management.inc:352
-#: plugins/admin/users/class_userManagement.inc:570
-#: plugins/admin/users/class_userManagement.inc:574
+#: include/class_management.inc:353
+#: plugins/admin/users/class_userManagement.inc:571
+#: plugins/admin/users/class_userManagement.inc:575
 #: plugins/admin/acl/class_aclManagement.inc:98
 #, fuzzy
 msgid "Permission error"
 msgstr "允许"
 
-#: include/class_management.inc:426 include/class_plugin.inc:1546
+#: include/class_management.inc:427 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_management.inc:473 include/class_management.inc:510
+#: include/class_management.inc:524 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_management.inc:583
+#, php-format
+msgid ""
+"No tab declaration for '%s' found in your configuration file. Cannot create "
+"plugin instance!"
+msgstr ""
+
 #: include/class_socketClient.inc:60
 msgid "The mcrypt module was not found. Please install php5-mcrypt."
 msgstr ""
@@ -1029,12 +1225,12 @@ msgid "Use ACL defined in role"
 msgstr ""
 
 #: include/class_acl.inc:231 plugins/admin/users/class_userManagement.inc:25
-#: plugins/personal/generic/class_user.inc:1603
+#: plugins/personal/generic/class_user.inc:1608
 #: setup/class_setupStep_Migrate.inc:1039
 msgid "Users"
 msgstr "用户"
 
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1254
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
 #: plugins/admin/groups/class_groupManagement.inc:25
 #: setup/class_setupStep_Migrate.inc:1042
 msgid "Groups"
@@ -1042,27 +1238,18 @@ msgstr "用户组"
 
 #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
 #: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:986 include/class_listing.inc:988
+#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:394
 msgid "Up"
 msgstr "上"
 
 #: include/class_acl.inc:495 include/class_listing.inc:235
+#: include/class_sortableListing.inc:225
 #: plugins/admin/acl/class_aclRole.inc:396
 msgid "Down"
 msgstr "关闭"
 
-#: include/class_acl.inc:500 include/class_acl.inc:548
-#: include/class_sortableListing.inc:132
-#: plugins/admin/ogroups/ogroup-list.xml:91
-#: plugins/admin/groups/group-list.xml:91
-#: plugins/admin/users/user-list.xml:114
-#: plugins/admin/departments/dep-list.xml:172
-#: plugins/admin/acl/class_aclRole.inc:399
-#: plugins/admin/acl/class_aclRole.inc:448 plugins/admin/acl/acl-list.xml:131
-msgid "Edit"
-msgstr "编辑"
-
 #: include/class_acl.inc:500 include/class_acl.inc:504
 #: include/class_acl.inc:1253 include/class_acl.inc:1254
 #: include/class_acl.inc:1259 include/class_tabs.inc:401
@@ -1073,8 +1260,8 @@ msgid "ACL"
 msgstr "ACL"
 
 #: include/class_acl.inc:504 include/class_acl.inc:552
-#: include/class_sortableListing.inc:133 include/utils/class_msgPool.inc:338
-#: plugins/admin/acl/class_aclRole.inc:403
+#: include/class_sortableListing.inc:197 include/class_sortableListing.inc:199
+#: include/utils/class_msgPool.inc:338 plugins/admin/acl/class_aclRole.inc:403
 #: plugins/admin/acl/class_aclRole.inc:452
 #, php-format
 msgid "Delete"
@@ -1145,10 +1332,10 @@ msgstr "成员对象"
 
 #: include/class_acl.inc:954 include/class_session.inc:76
 #: include/class_session.inc:101 include/class_session.inc:127
-#: include/functions.inc:603 include/functions.inc:789
-#: include/functions.inc:907 include/functions.inc:1305
-#: include/functions.inc:2369 include/functions.inc:2403
-#: include/functions.inc:2423 include/class_ldap.inc:692
+#: include/functions.inc:604 include/functions.inc:790
+#: include/functions.inc:908 include/functions.inc:1306
+#: include/functions.inc:2370 include/functions.inc:2404
+#: include/functions.inc:2424 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
@@ -1206,41 +1393,34 @@ msgstr "MAC 地址"
 msgid "Close"
 msgstr "关闭"
 
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:978
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
 msgid "Go to root department"
 msgstr "转到根部门"
 
 #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:978
-#: include/class_listing.inc:980
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
+#: include/class_listing.inc:998
 msgid "Root"
 msgstr "根"
 
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:986
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
 msgid "Go up one department"
 msgstr "向上跳转一个部门"
 
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:994
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
 msgid "Go to users department"
 msgstr "转到用户部门"
 
 #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:994
-#: include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
+#: include/class_listing.inc:1014
 msgid "Home"
 msgstr ""
 
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1001
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
 msgid "Reload list"
 msgstr "重新加载列表"
 
-#: 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 "提交"
-
 #: include/class_MultiSelectWindow.inc:553
 #, php-format
 msgid "Inconsistent DN encoding detected: '%s'"
@@ -1257,34 +1437,7 @@ msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
 msgid "Choose a base"
 msgstr "选择一个位置"
 
-#: 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_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_localityGeneric.inc:89
-#: plugins/admin/departments/class_organizationGeneric.inc:121
-#: plugins/admin/departments/class_countryGeneric.inc:89
-#: plugins/admin/departments/class_dcObject.inc:88
-#: plugins/admin/departments/domain.tpl:28
-#: plugins/admin/departments/country.tpl:28
-#: plugins/admin/departments/dcObject.tpl:28
-#: plugins/admin/departments/class_department.inc:621
-#: plugins/admin/departments/dep-list.tpl:13
-#: plugins/admin/departments/organization.tpl:39
-#: plugins/admin/acl/acl-list.tpl:13 plugins/admin/acl/class_aclRole.inc:753
-#: plugins/admin/acl/acl_role.tpl:27
-#: plugins/personal/generic/class_user.inc:1617
-#: plugins/personal/generic/generic.tpl:164
-#: plugins/personal/generic/multiple_generic.tpl:47 setup/setup_ldap.tpl:55
-msgid "Base"
-msgstr "位置"
-
-#: include/class_listing.inc:298 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:299 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
@@ -1293,73 +1446,67 @@ msgstr "位置"
 msgid "Select all"
 msgstr "选择"
 
-#: include/class_listing.inc:499
+#: include/class_listing.inc:509
 #, fuzzy
 msgid "created by"
 msgstr "创建"
 
-#: 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_listing.inc:1379 include/class_listing.inc:1429
 #: include/class_plugin.inc:2070
 #, fuzzy
 msgid "Copy"
 msgstr "复制"
 
-#: include/class_listing.inc:1356 include/class_listing.inc:1390
+#: include/class_listing.inc:1385 include/class_listing.inc:1419
 #: include/class_plugin.inc:2074
 #, fuzzy
 msgid "Cut"
 msgstr "剪切"
 
-#: include/class_listing.inc:1364 include/class_listing.inc:1366
+#: include/class_listing.inc:1393 include/class_listing.inc:1395
 #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
 #: include/class_CopyPasteHandler.inc:514
 msgid "Paste"
 msgstr "粘贴"
 
-#: include/class_listing.inc:1390 include/class_plugin.inc:2028
+#: include/class_listing.inc:1419 include/class_plugin.inc:2028
 msgid "Cut this entry"
 msgstr "剪切条目"
 
-#: include/class_listing.inc:1400 include/class_plugin.inc:2036
+#: include/class_listing.inc:1429 include/class_plugin.inc:2036
 msgid "Copy this entry"
 msgstr "拷贝条目"
 
-#: include/class_listing.inc:1432 include/class_listing.inc:1434
+#: include/class_listing.inc:1461 include/class_listing.inc:1463
 #, fuzzy
 msgid "Restore snapshots"
 msgstr "删除记录"
 
-#: include/class_listing.inc:1448
+#: include/class_listing.inc:1477
 #, fuzzy
 msgid "Export list"
 msgstr "导出"
 
-#: include/class_listing.inc:1483 include/class_listing.inc:1484
+#: include/class_listing.inc:1512 include/class_listing.inc:1513
 #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
 msgid "Restore snapshot"
 msgstr ""
 
-#: include/class_listing.inc:1493 include/class_plugin.inc:2009
+#: include/class_listing.inc:1522 include/class_plugin.inc:2009
 #, fuzzy
 msgid "Create snapshot"
 msgstr "创建 nagios 账户"
 
-#: include/class_listing.inc:1494 include/class_plugin.inc:2010
+#: include/class_listing.inc:1523 include/class_plugin.inc:2010
 #, fuzzy
 msgid "Create a new snapshot from this object"
 msgstr "创建新 FAI 对象"
 
-#: include/class_sortableListing.inc:132
+#: include/class_sortableListing.inc:194
 msgid "Edit this entry"
 msgstr "编辑这条记录"
 
-#: include/class_sortableListing.inc:133
+#: include/class_sortableListing.inc:199
 msgid "Delete this entry"
 msgstr "删除这个条目"
 
@@ -1374,267 +1521,267 @@ msgid ""
 "Fatal error: cannot instantiate class '%s' - try running '%s' to fix this"
 msgstr ""
 
-#: include/functions.inc:447
+#: include/functions.inc:448
 #, php-format
 msgid "FATAL: Error when connecting the LDAP. Server said '%s'."
 msgstr "致命错误:连接 LDAP 错误。服务器返回 '%s'。"
 
-#: include/functions.inc:518
+#: include/functions.inc:519
 #, fuzzy
 msgid "Username / UID is not unique inside the LDAP tree!"
 msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
 
-#: include/functions.inc:603
+#: include/functions.inc:604
 #, fuzzy
 msgid ""
 "Username / UID is not unique inside the LDAP tree. Please contact your "
 "Administrator."
 msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
 
-#: include/functions.inc:789 include/functions.inc:907
+#: include/functions.inc:790 include/functions.inc:908
 msgid "Error while adding a lock. Contact the developers!"
 msgstr ""
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, fuzzy, php-format
 msgid ""
 "Cannot create locking information in LDAP tree. Please contact your "
 "administrator!"
 msgstr "无法获得 LDAP 数据库的锁信息。检查 gosa.conf 中的 'config' 条目!"
 
-#: include/functions.inc:799
+#: include/functions.inc:800
 #, fuzzy, php-format
 msgid "LDAP server returned: %s"
 msgstr "LDAP 服务器"
 
-#: include/functions.inc:928
+#: include/functions.inc:929
 #, fuzzy
 msgid ""
 "Found multiple locks for object to be locked. This should not happen - "
 "cleaning up multiple references."
 msgstr "发现要锁定的对象由多个锁。这虽然不可能──清除多个引用。"
 
-#: include/functions.inc:1232
+#: include/functions.inc:1233
 #, php-format
 msgid "The size limit of %d entries is exceed!"
 msgstr "超过了 %d 个条目的大小限制!"
 
-#: include/functions.inc:1234
+#: include/functions.inc:1235
 #, 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:1246 plugins/personal/generic/generic.tpl:226
+#: include/functions.inc:1247 plugins/personal/generic/generic.tpl:226
 msgid "Configure"
 msgstr "配置"
 
-#: include/functions.inc:1251
+#: include/functions.inc:1252
 msgid "incomplete"
 msgstr "不完整"
 
-#: include/functions.inc:1641
+#: include/functions.inc:1642
 msgid "Continue anyway"
 msgstr "仍然继续"
 
-#: include/functions.inc:1643
+#: include/functions.inc:1644
 msgid "Edit anyway"
 msgstr "仍然编辑"
 
-#: include/functions.inc:1645
+#: include/functions.inc:1646
 #, fuzzy, php-format
 msgid "You're going to edit the LDAP entry/entries %s"
 msgstr "您将要拷贝条目 '%s'。"
 
-#: include/functions.inc:1885
+#: include/functions.inc:1886
 msgid "Entries per page"
 msgstr "每页条目数"
 
-#: include/functions.inc:1914 include/class_filter.inc:314
+#: include/functions.inc:1915 include/class_filter.inc:314
 msgid "Apply filter"
 msgstr "应用过滤器"
 
-#: include/functions.inc:2226 include/class_filter.inc:280
+#: include/functions.inc:2227 include/class_filter.inc:280
 msgid "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 msgstr "*ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 
-#: include/functions.inc:2272
+#: include/functions.inc:2273
 #, php-format
 msgid "GOsa development snapshot (Rev %s)"
 msgstr "GOsa 开发版(版本 %s)"
 
-#: include/functions.inc:2369
+#: include/functions.inc:2370
 #, php-format
 msgid "File '%s' could not be deleted."
 msgstr ""
 
-#: include/functions.inc:2403 include/functions.inc:2423
+#: include/functions.inc:2404 include/functions.inc:2424
 #, fuzzy
 msgid "Cannot write to revision file!"
 msgstr "无法创建文件 '%s'。"
 
-#: include/functions.inc:2641 include/functions.inc:2645
-#: include/functions.inc:2651
+#: include/functions.inc:2642 include/functions.inc:2646
+#: include/functions.inc:2652
 #, fuzzy
 msgid "'baseIdHook' is not available. Using default base!"
 msgstr "警告: nextIdHook不可用。使用缺省 base。"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 #, fuzzy
 msgid "LDAP warning"
 msgstr "LDAP 管理"
 
-#: include/functions.inc:2675
+#: include/functions.inc:2676
 #, fuzzy
 msgid "Cannot get schema information from server. No schema check possible!"
 msgstr "不能从服务器得到 schema 信息。无法对 schema 检查!"
 
-#: include/functions.inc:2701
+#: include/functions.inc:2702
 msgid "Used to store account specific informations."
 msgstr ""
 
-#: include/functions.inc:2708
+#: include/functions.inc:2709
 msgid ""
 "Used to lock currently edited entries to avoid multiple changes at the same "
 "time."
 msgstr ""
 
-#: include/functions.inc:2753
+#: include/functions.inc:2754
 #, php-format
 msgid "Missing required object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2756
+#: include/functions.inc:2757
 #, php-format
 msgid "Missing optional object class '%s'!"
 msgstr ""
 
-#: include/functions.inc:2761
+#: include/functions.inc:2762
 #, php-format
 msgid "Version mismatch for required object class '%s' (!=%s)!"
 msgstr ""
 
-#: include/functions.inc:2764
+#: include/functions.inc:2765
 #, fuzzy, php-format
 msgid "Class(es) available"
 msgstr "文件可用。"
 
-#: include/functions.inc:2786
+#: include/functions.inc:2787
 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:2787
+#: include/functions.inc:2788
 msgid ""
 "In order to use rfc2307bis conform groups the objectClass 'posixGroup' must "
 "be      AUXILIARY"
 msgstr ""
 
-#: include/functions.inc:2791
+#: include/functions.inc:2792
 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:2792
+#: include/functions.inc:2793
 msgid "The objectClass 'posixGroup' must be STRUCTURAL"
 msgstr ""
 
-#: include/functions.inc:2816
+#: include/functions.inc:2817
 msgid "German"
 msgstr "德语"
 
-#: include/functions.inc:2817
+#: include/functions.inc:2818
 msgid "French"
 msgstr "法语"
 
-#: include/functions.inc:2818
+#: include/functions.inc:2819
 msgid "Italian"
 msgstr "意大利语"
 
-#: include/functions.inc:2819
+#: include/functions.inc:2820
 msgid "Spanish"
 msgstr "西班牙语"
 
-#: include/functions.inc:2820
+#: include/functions.inc:2821
 msgid "English"
 msgstr "英语"
 
-#: include/functions.inc:2821
+#: include/functions.inc:2822
 msgid "Dutch"
 msgstr "荷兰语"
 
-#: include/functions.inc:2822
+#: include/functions.inc:2823
 msgid "Polish"
 msgstr "波兰语"
 
-#: include/functions.inc:2824
+#: include/functions.inc:2825
 msgid "Chinese"
 msgstr "芯片组"
 
-#: include/functions.inc:2825
+#: include/functions.inc:2826
 #, fuzzy
 msgid "Vietnamese"
 msgstr "名"
 
-#: include/functions.inc:2826
+#: include/functions.inc:2827
 msgid "Russian"
 msgstr "俄语"
 
-#: include/functions.inc:3021
+#: include/functions.inc:3022
 #, php-format
 msgid ""
 "Command '%s', specified as POSTMODIFY for plugin '%s' doesn't seem to exist."
 msgstr "命令 '%s',作为插件 '%s' 的 POSTMODIFY 好像并不存在。"
 
-#: include/functions.inc:3054
+#: include/functions.inc:3055
 msgid "Cannot generate samba hash!"
 msgstr ""
 
-#: include/functions.inc:3067
+#: include/functions.inc:3068
 #, php-format
 msgid ""
 "Cannot generate samba hash: running '%s' failed, check the 'sambaHashHook'!"
 msgstr ""
 
-#: 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
+#: include/functions.inc:3349 include/functions.inc:3363
+#: include/functions.inc:3401 include/functions.inc:3413
+#: include/functions.inc:3417 include/functions.inc:3432
+#: include/functions.inc:3441
 #, fuzzy
 msgid "Cannot allocate a free ID:"
 msgstr "太多用户,无法分配一个可用的 ID!"
 
-#: include/functions.inc:3348
+#: include/functions.inc:3349
 msgid "unknown idAllocation method!"
 msgstr ""
 
-#: include/functions.inc:3362
+#: include/functions.inc:3363
 #, php-format
 msgid "%sPoolMin >= %sPoolMax!"
 msgstr ""
 
-#: include/functions.inc:3392
+#: include/functions.inc:3393
 #, fuzzy
 msgid "Cannot create sambaUnixIdPool entry!"
 msgstr "转到根部门"
 
-#: include/functions.inc:3400
+#: include/functions.inc:3401
 msgid "sambaUnixIdPool is not unique!"
 msgstr ""
 
-#: include/functions.inc:3412 include/functions.inc:3416
+#: include/functions.inc:3413 include/functions.inc:3417
 #, fuzzy
 msgid "no ID available!"
 msgstr "文件可用。"
 
-#: include/functions.inc:3440
+#: include/functions.inc:3441
 msgid "maximum tries exceeded!"
 msgstr ""
 
-#: include/functions.inc:3500
+#: include/functions.inc:3501
 #, fuzzy
 msgid "Cannot allocate a free ID!"
 msgstr "太多用户,无法分配一个可用的 ID!"
@@ -1669,38 +1816,6 @@ msgstr "删除记录"
 msgid "Y-m-d, H:i:s"
 msgstr ""
 
-#: 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/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
-#: plugins/admin/departments/class_domain.inc:87
-#: plugins/admin/departments/class_localityGeneric.inc:60
-#: plugins/admin/departments/class_localityGeneric.inc:88
-#: plugins/admin/departments/class_organizationGeneric.inc:91
-#: plugins/admin/departments/class_organizationGeneric.inc:119
-#: plugins/admin/departments/class_countryGeneric.inc:59
-#: plugins/admin/departments/class_countryGeneric.inc:88
-#: plugins/admin/departments/class_dcObject.inc:59
-#: plugins/admin/departments/class_dcObject.inc:87
-#: plugins/admin/departments/domain.tpl:19
-#: plugins/admin/departments/country.tpl:19
-#: plugins/admin/departments/dcObject.tpl:19
-#: plugins/admin/departments/class_department.inc:317
-#: plugins/admin/departments/class_department.inc:619
-#: plugins/admin/departments/organization.tpl:19
-#: plugins/admin/acl/class_aclRole.inc:754 plugins/admin/acl/acl-list.xml:57
-#: plugins/admin/acl/acl_role.tpl:17
-msgid "Description"
-msgstr "描述"
-
 #: include/exporter/class_cvsExporter.inc:48
 msgid "CSV"
 msgstr ""
@@ -2163,7 +2278,9 @@ msgstr "“姓名”字段包含无效字符。"
 msgid "Missing %s PHP extension!"
 msgstr "删除打印机扩展"
 
-#: include/utils/class_msgPool.inc:332 setup/class_setupStep_Migrate.inc:2868
+#: include/utils/class_msgPool.inc:332
+#: plugins/personal/generic/generic.tpl:255
+#: setup/class_setupStep_Migrate.inc:2868
 #, php-format
 msgid "Add"
 msgstr "添加"
@@ -2521,12 +2638,12 @@ msgstr ""
 msgid "Cannot not parse XML!"
 msgstr "太多用户,无法分配一个可用的 ID!"
 
-#: include/class_gosaSupportDaemon.inc:1180
+#: include/class_gosaSupportDaemon.inc:1184
 #, fuzzy, php-format
 msgid "Cannot send abort event for entry %s!"
 msgstr "无法创建文件 '%s'。"
 
-#: include/class_gosaSupportDaemon.inc:1200
+#: include/class_gosaSupportDaemon.inc:1204
 #, fuzzy, php-format
 msgid "Cannot remove entry %s!"
 msgstr "未知 FAIstate %s"
@@ -2618,12 +2735,12 @@ msgid "Please fix the above error and reload the page."
 msgstr "请看一下 GOsa 日志文件。"
 
 #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1111
-#: plugins/admin/groups/class_groupGeneric.inc:1248
-#: plugins/admin/users/class_userManagement.inc:737
+#: plugins/admin/ogroups/class_ogroup.inc:1074
+#: plugins/admin/groups/class_groupGeneric.inc:1211
+#: plugins/admin/users/class_userManagement.inc:738
 #: plugins/admin/departments/class_department.inc:609
 #: plugins/personal/generic/class_user.inc:37
-#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/class_user.inc:1602
 #: plugins/personal/posix/generic.tpl:4 setup/setup_feedback.tpl:55
 msgid "Generic"
 msgstr "通用配置"
@@ -2636,20 +2753,22 @@ msgstr "UNIX"
 #: plugins/generic/references/class_reference.inc:45
 #: plugins/admin/ogroups/tabs_ogroups.inc:148
 #: plugins/admin/groups/class_groupManagement.inc:163
-#: plugins/admin/users/class_userManagement.inc:744
+#: plugins/admin/users/class_userManagement.inc:745
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:70
 msgid "Mail"
 msgstr "邮件"
 
 #: plugins/generic/references/class_reference.inc:47
 #: plugins/generic/references/class_reference.inc:49
 #: plugins/admin/groups/class_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:749
+#: plugins/admin/users/class_userManagement.inc:750
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:78
 msgid "Samba"
 msgstr "Samba"
 
 #: plugins/generic/references/class_reference.inc:51
-#: plugins/admin/users/class_userManagement.inc:761
+#: plugins/admin/users/class_userManagement.inc:762
 msgid "FAX"
 msgstr "传真"
 
@@ -2666,34 +2785,24 @@ msgstr "FTP"
 #: plugins/admin/ogroups/ogroup-list.xml:79
 #: plugins/admin/groups/group-list.xml:15
 #: plugins/admin/groups/group-list.xml:79
+#: plugins/personal/posix/groupSelect/group-list.xml:15
 msgid "Group"
 msgstr "组"
 
-#: plugins/generic/references/class_reference.inc:59
-#: plugins/admin/ogroups/class_ogroupManagement.inc:186
-#: plugins/admin/departments/dep-list.xml:55
-#: plugins/admin/departments/dep-list.xml:71
-#: plugins/admin/departments/dep-list.xml:138
-#: plugins/admin/departments/class_departmentManagement.inc:235
-#: plugins/personal/generic/class_user.inc:1622
-#: plugins/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:188
 #: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:765
+#: plugins/admin/users/class_userManagement.inc:766
 #: plugins/admin/departments/generic.tpl:88
 #: plugins/admin/departments/class_department.inc:328
 #: plugins/admin/departments/organization.tpl:88
-#: plugins/personal/generic/class_user.inc:1312
-#: plugins/personal/generic/class_user.inc:1725
-#: plugins/personal/generic/generic.tpl:346
-#: plugins/personal/generic/generic.tpl:527
+#: plugins/personal/generic/class_user.inc:1317
+#: plugins/personal/generic/class_user.inc:1730
+#: plugins/personal/generic/generic.tpl:344
+#: plugins/personal/generic/generic.tpl:525
 #: plugins/personal/generic/multiple_generic.tpl:217
 #: plugins/personal/generic/multiple_generic.tpl:428
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:86
 msgid "Phone"
 msgstr "电话"
 
@@ -2704,6 +2813,7 @@ msgstr "应用程序"
 
 #: plugins/generic/references/class_reference.inc:65
 #: plugins/admin/ogroups/class_ogroupManagement.inc:187
+#: plugins/personal/posix/trustSelect/trust-list.xml:14
 #: setup/setup_config2.tpl:219 setup/setup_config2.tpl:264
 msgid "Server"
 msgstr "服务器"
@@ -2714,6 +2824,7 @@ msgstr "瘦客户机"
 
 #: plugins/generic/references/class_reference.inc:69
 #: plugins/admin/ogroups/class_ogroupManagement.inc:189
+#: plugins/personal/posix/trustSelect/trust-list.xml:22
 msgid "Workstation"
 msgstr "工作站"
 
@@ -2763,12 +2874,6 @@ msgstr "选择上方左侧的“退出”按钮断开链接,选择“首页”
 msgid "The GOsa team"
 msgstr "GOsa 团队"
 
-#: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/groups/group-list.tpl:13 plugins/admin/users/user-list.tpl:13
-#: plugins/admin/departments/dep-list.tpl:13 plugins/admin/acl/acl-list.tpl:13
-msgid "Update"
-msgstr ""
-
 #: plugins/admin/ogroups/remove.tpl:6
 msgid ""
 "Please double check if you really want to do this since there is no way for "
@@ -2776,7 +2881,7 @@ msgid ""
 msgstr "请再次检查您是否要这么做,因为 GOsa 没有办法将您的数据找回。"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1117
+#: plugins/admin/ogroups/class_ogroup.inc:1080
 msgid "Object groups"
 msgstr "对象组"
 
@@ -2787,7 +2892,7 @@ msgstr "对象组名称"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:115
 #: plugins/admin/groups/class_groupManagement.inc:98
-#: plugins/admin/users/class_userManagement.inc:188
+#: plugins/admin/users/class_userManagement.inc:189
 #, fuzzy
 msgid "Infrastructure error"
 msgstr "PHP 错误"
@@ -2798,6 +2903,7 @@ msgid "Templates"
 msgstr "模板"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
 #: 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"
@@ -2809,6 +2915,7 @@ msgid "Windows Install"
 msgstr "Windows 工作站"
 
 #: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
 msgid "Terminal"
 msgstr "终端"
 
@@ -2816,141 +2923,141 @@ msgstr "终端"
 msgid "You cannot combine terminals and workstations in one object group!"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:457
-#: plugins/admin/ogroups/class_ogroup.inc:459
-#: plugins/admin/ogroups/class_ogroup.inc:517
+#: plugins/admin/ogroups/class_ogroup.inc:420
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:480
 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
+#: plugins/admin/ogroups/class_ogroup.inc:422
+#: plugins/admin/ogroups/class_ogroup.inc:426
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:450
+#: plugins/admin/ogroups/class_ogroup.inc:458
 #, fuzzy, php-format
 msgid "Show %s"
 msgstr "显示组"
 
-#: plugins/admin/ogroups/class_ogroup.inc:461
-#: plugins/admin/ogroups/class_ogroup.inc:463
+#: plugins/admin/ogroups/class_ogroup.inc:424
+#: plugins/admin/ogroups/class_ogroup.inc:426
 #, fuzzy
 msgid "people"
 msgstr "显示人员"
 
-#: plugins/admin/ogroups/class_ogroup.inc:465
-#: plugins/admin/ogroups/class_ogroup.inc:467
-#: plugins/admin/ogroups/class_ogroup.inc:515
+#: plugins/admin/ogroups/class_ogroup.inc:428
+#: plugins/admin/ogroups/class_ogroup.inc:430
+#: plugins/admin/ogroups/class_ogroup.inc:478
 msgid "groups"
 msgstr "组"
 
-#: plugins/admin/ogroups/class_ogroup.inc:469
-#: plugins/admin/ogroups/class_ogroup.inc:471
-#: plugins/admin/ogroups/class_ogroup.inc:518
+#: plugins/admin/ogroups/class_ogroup.inc:432
+#: plugins/admin/ogroups/class_ogroup.inc:434
+#: plugins/admin/ogroups/class_ogroup.inc:481
 msgid "servers"
 msgstr "服务器"
 
-#: plugins/admin/ogroups/class_ogroup.inc:473
-#: plugins/admin/ogroups/class_ogroup.inc:475
-#: plugins/admin/ogroups/class_ogroup.inc:519
+#: plugins/admin/ogroups/class_ogroup.inc:436
+#: plugins/admin/ogroups/class_ogroup.inc:438
+#: plugins/admin/ogroups/class_ogroup.inc:482
 msgid "workstations"
 msgstr "工作站"
 
-#: plugins/admin/ogroups/class_ogroup.inc:477
-#: plugins/admin/ogroups/class_ogroup.inc:479
-#: plugins/admin/ogroups/class_ogroup.inc:521
+#: plugins/admin/ogroups/class_ogroup.inc:440
+#: plugins/admin/ogroups/class_ogroup.inc:442
+#: plugins/admin/ogroups/class_ogroup.inc:484
 msgid "terminals"
 msgstr "终端"
 
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:444
 #, fuzzy
 msgid "printer"
 msgstr "打印机"
 
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#: plugins/admin/ogroups/class_ogroup.inc:523
+#: plugins/admin/ogroups/class_ogroup.inc:446
+#: plugins/admin/ogroups/class_ogroup.inc:486
 msgid "printers"
 msgstr "打印机"
 
+#: plugins/admin/ogroups/class_ogroup.inc:448
+#: plugins/admin/ogroups/class_ogroup.inc:450
 #: plugins/admin/ogroups/class_ogroup.inc:485
-#: plugins/admin/ogroups/class_ogroup.inc:487
-#: plugins/admin/ogroups/class_ogroup.inc:522
 msgid "phones"
 msgstr "电话"
 
-#: plugins/admin/ogroups/class_ogroup.inc:493
-#: plugins/admin/ogroups/class_ogroup.inc:495
-#: plugins/admin/ogroups/class_ogroup.inc:516
+#: plugins/admin/ogroups/class_ogroup.inc:456
+#: plugins/admin/ogroups/class_ogroup.inc:458
+#: plugins/admin/ogroups/class_ogroup.inc:479
 msgid "applications"
 msgstr "应用程序"
 
-#: plugins/admin/ogroups/class_ogroup.inc:510
-#: plugins/admin/users/class_userManagement.inc:333
-#: plugins/admin/users/class_userManagement.inc:366
-#: plugins/admin/users/class_userManagement.inc:397
+#: plugins/admin/ogroups/class_ogroup.inc:473
+#: plugins/admin/users/class_userManagement.inc:334
+#: plugins/admin/users/class_userManagement.inc:367
+#: plugins/admin/users/class_userManagement.inc:398
 msgid "none"
 msgstr "无"
 
-#: plugins/admin/ogroups/class_ogroup.inc:512
+#: plugins/admin/ogroups/class_ogroup.inc:475
 msgid "too many different objects!"
 msgstr "太多不同对象!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:514
+#: plugins/admin/ogroups/class_ogroup.inc:477
 msgid "users"
 msgstr "用户"
 
-#: plugins/admin/ogroups/class_ogroup.inc:520
+#: plugins/admin/ogroups/class_ogroup.inc:483
 #, fuzzy
 msgid "winstations"
 msgstr "Windows 工作站"
 
-#: plugins/admin/ogroups/class_ogroup.inc:570
-#: plugins/admin/groups/class_groupGeneric.inc:511
-#: plugins/personal/posix/class_posixAccount.inc:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 #: 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:644
+#: plugins/admin/ogroups/class_ogroup.inc:533
+#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/personal/posix/class_posixAccount.inc:573
 msgid "full access"
 msgstr "完全访问权限"
 
-#: plugins/admin/ogroups/class_ogroup.inc:571
-#: plugins/admin/groups/class_groupGeneric.inc:512
-#: plugins/personal/posix/class_posixAccount.inc:645
+#: plugins/admin/ogroups/class_ogroup.inc:534
+#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/personal/posix/class_posixAccount.inc:574
 msgid "allow access to these hosts"
 msgstr "允许访问这些主机"
 
-#: plugins/admin/ogroups/class_ogroup.inc:755
+#: plugins/admin/ogroups/class_ogroup.inc:718
 msgid "Non existing dn:"
 msgstr "不存在的 dn:"
 
-#: plugins/admin/ogroups/class_ogroup.inc:912
+#: plugins/admin/ogroups/class_ogroup.inc:875
 #, php-format
 msgid ""
 "These systems are already configured by other object groups and cannot be "
 "added:"
 msgstr ""
 
-#: plugins/admin/ogroups/class_ogroup.inc:922
-#: plugins/admin/ogroups/class_ogroup.inc:932
-#: plugins/admin/ogroups/class_ogroup.inc:1120
+#: plugins/admin/ogroups/class_ogroup.inc:885
+#: plugins/admin/ogroups/class_ogroup.inc:895
+#: plugins/admin/ogroups/class_ogroup.inc:1083
 #: 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: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/class_groupGeneric.inc:1092
+#: plugins/admin/groups/class_groupGeneric.inc:1098
+#: plugins/admin/groups/class_groupGeneric.inc:1100
+#: plugins/admin/groups/class_groupGeneric.inc:1112
+#: plugins/admin/groups/class_groupGeneric.inc:1126
+#: plugins/admin/groups/class_groupGeneric.inc:1133
+#: plugins/admin/groups/class_groupGeneric.inc:1220
 #: plugins/admin/groups/group-list.xml:41
-#: plugins/admin/users/class_userManagement.inc:407
-#: plugins/admin/users/class_userManagement.inc:454
+#: plugins/admin/users/class_userManagement.inc:408
+#: plugins/admin/users/class_userManagement.inc:455
 #: plugins/admin/departments/class_domain.inc:43
 #: plugins/admin/departments/class_domain.inc:45
 #: plugins/admin/departments/class_domain.inc:50
@@ -2987,30 +3094,32 @@ msgstr ""
 #: 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
+#: plugins/personal/generic/class_user.inc:1284
+#: plugins/personal/generic/class_user.inc:1297
+#: plugins/personal/generic/class_user.inc:1339
+#: plugins/personal/generic/class_user.inc:1745
+#: plugins/personal/posix/trustSelect/trust-list.xml:56
+#: plugins/personal/posix/groupSelect/group-list.xml:41
+#: setup/setup_migrate.tpl:283 setup/setup_feedback.tpl:31
 msgid "Name"
 msgstr "名称"
 
-#: plugins/admin/ogroups/class_ogroup.inc:937
+#: plugins/admin/ogroups/class_ogroup.inc:900
 #, fuzzy
 msgid "You can combine two different object types at maximum, only!"
 msgstr "您最多只能组合两个不同的对象类!"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1112
+#: plugins/admin/ogroups/class_ogroup.inc:1075
 #, fuzzy
 msgid "Object group generic"
 msgstr "对象组"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1123
+#: plugins/admin/ogroups/class_ogroup.inc:1086
 #, fuzzy
 msgid "Sytem trust"
 msgstr "信赖的系统"
 
-#: plugins/admin/ogroups/class_ogroup.inc:1124
+#: plugins/admin/ogroups/class_ogroup.inc:1087
 #, fuzzy
 msgid "Member"
 msgstr "成员"
@@ -3048,7 +3157,7 @@ msgid "Select a base"
 msgstr "选择一个位置"
 
 #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1265
+#: plugins/admin/groups/class_groupGeneric.inc:1228
 #: plugins/personal/posix/generic.tpl:139
 msgid "System trust"
 msgstr "信赖的系统"
@@ -3088,8 +3197,9 @@ msgstr "自动化安装说明"
 
 #: plugins/admin/ogroups/tabs_ogroups.inc:222
 #: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:757
+#: plugins/admin/users/class_userManagement.inc:758
 #: plugins/personal/posix/class_posixAccount.inc:324
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
 msgid "Environment"
 msgstr "环境设置"
 
@@ -3101,15 +3211,6 @@ msgstr "应用程序"
 msgid "Please enter the new object group name"
 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-filter.tpl:11
 #, fuzzy
 msgid "user groups"
@@ -3224,7 +3325,7 @@ 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/admin/groups/trust_machines.tpl:26
 #: plugins/personal/posix/posix_groups.tpl:35
 #: plugins/personal/posix/trust_machines.tpl:27
 msgid "Choose the department the search will be based on"
@@ -3245,19 +3346,19 @@ msgid "Select systems to add"
 msgstr "选择要添加的系统"
 
 #: plugins/admin/ogroups/trust_machines.tpl:26
-#: plugins/admin/groups/trust_machines.tpl:26
+#: plugins/admin/groups/trust_machines.tpl:25
 #: 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/admin/groups/trust_machines.tpl:29
 #: 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/admin/groups/trust_machines.tpl:30
 #: plugins/personal/posix/trust_machines.tpl:31
 msgid "Regular expression for matching addresses"
 msgstr "匹配地址的正则表达式"
@@ -3294,6 +3395,46 @@ msgstr "显示匹配的用户"
 msgid "Regular expression for matching user names"
 msgstr "匹配用户名的正则表达式"
 
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "请选择一个打印机或者取消。"
+
+#: plugins/admin/groups/userSelect/user-list.xml:40
+#: plugins/admin/users/class_userManagement.inc:411
+#: plugins/admin/users/user-list.xml:57
+#: plugins/personal/generic/class_user.inc:1289
+#: plugins/personal/generic/class_user.inc:1336
+#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1742
+msgid "Given name"
+msgstr "名"
+
+#: plugins/admin/groups/userSelect/user-list.xml:48
+#: plugins/admin/users/user-list.xml:49
+#: plugins/personal/generic/class_user.inc:1613
+msgid "Surname"
+msgstr "姓"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:11
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "显示主要组"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:12
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "显示 samba 用户组"
+
+#: plugins/admin/groups/userSelect/user-filter.tpl:13
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/group-filter.tpl:13
+#, fuzzy
+msgid "Show mail groups"
+msgstr "显示 samba 用户组"
+
 #: plugins/admin/groups/generic.tpl:14 plugins/personal/generic/generic.tpl:52
 #: plugins/personal/generic/generic.tpl:73
 #: plugins/personal/generic/generic.tpl:89
@@ -3350,116 +3491,103 @@ msgstr "显示邮件组"
 msgid "Not in all groups"
 msgstr "显示邮件组"
 
-#: plugins/admin/groups/group-filter.tpl:11
-msgid "Show primary groups"
-msgstr "显示主要组"
-
-#: plugins/admin/groups/group-filter.tpl:12
-msgid "Show samba groups"
-msgstr "显示 samba 用户组"
-
-#: plugins/admin/groups/group-filter.tpl:13
-#, fuzzy
-msgid "Show mail groups"
-msgstr "显示 samba 用户组"
-
 #: plugins/admin/groups/class_groupGeneric.inc:161
 #, fuzzy
 msgid "Cannot find group SID in your configuration!"
 msgstr "无法在 LDAP 或您的配置文件中查找这个组 SID。"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Samba group"
 msgstr "Samba 组"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain admins"
 msgstr "域管理员"
 
-#: plugins/admin/groups/class_groupGeneric.inc:478
+#: plugins/admin/groups/class_groupGeneric.inc:441
 msgid "Domain users"
 msgstr "域用户"
 
-#: plugins/admin/groups/class_groupGeneric.inc:479
+#: plugins/admin/groups/class_groupGeneric.inc:442
 msgid "Domain guests"
 msgstr "域名 guests"
 
-#: plugins/admin/groups/class_groupGeneric.inc:484
+#: plugins/admin/groups/class_groupGeneric.inc:447
 #, php-format
 msgid "Special group (%d)"
 msgstr "特殊组 (%d)"
 
-#: plugins/admin/groups/class_groupGeneric.inc:618
+#: plugins/admin/groups/class_groupGeneric.inc:581
 #, php-format
 msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:624
+#: plugins/admin/groups/class_groupGeneric.inc:587
 #, php-format
 msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:702
+#: plugins/admin/groups/class_groupGeneric.inc:665
 #, fuzzy
 msgid "! unknown UID"
 msgstr "! 未知 id"
 
-#: plugins/admin/groups/class_groupGeneric.inc:745
+#: plugins/admin/groups/class_groupGeneric.inc:708
 #, php-format
 msgid "Search returned too many results. Not displaying more than %s entries!"
 msgstr ""
 
-#: plugins/admin/groups/class_groupGeneric.inc:969
+#: plugins/admin/groups/class_groupGeneric.inc:932
 #, fuzzy, php-format
 msgid "Cannot find any SID for '%s'!"
 msgstr "无法创建文件 '%s'。"
 
-#: plugins/admin/groups/class_groupGeneric.inc:974
+#: plugins/admin/groups/class_groupGeneric.inc:937
 #, fuzzy, php-format
 msgid "Cannot find any RIDBASE for '%s'!"
 msgstr "无法创建文件 '%s'。"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1078
+#: plugins/admin/groups/class_groupGeneric.inc:1041
 #, php-format
 msgid "The gidNumber '%s' is already in use by %s!"
 msgstr ""
 
-#: 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/admin/groups/class_groupGeneric.inc:1142
+#: plugins/admin/groups/class_groupGeneric.inc:1145
+#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/personal/posix/class_posixAccount.inc:1045
+#: plugins/personal/posix/class_posixAccount.inc:1048
 #: plugins/personal/posix/generic.tpl:74
 #: plugins/personal/posix/paste_generic.tpl:45
 msgid "GID"
 msgstr "GID"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1249
+#: plugins/admin/groups/class_groupGeneric.inc:1212
 #, fuzzy
 msgid "Generic group settings"
 msgstr "组设置"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1263
+#: plugins/admin/groups/class_groupGeneric.inc:1226
 #, fuzzy
 msgid "Samba group type"
 msgstr "Samba 组"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1264
+#: plugins/admin/groups/class_groupGeneric.inc:1227
 #, fuzzy
 msgid "Samba domain name"
 msgstr "Samba 主目录"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1266
+#: plugins/admin/groups/class_groupGeneric.inc:1229
 #, fuzzy
 msgid "Phone pickup group"
 msgstr "成员属于电话应答组"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1267
+#: plugins/admin/groups/class_groupGeneric.inc:1230
 #, fuzzy
 msgid "Nagios group"
 msgstr "Nagios 账号"
 
-#: plugins/admin/groups/class_groupGeneric.inc:1269
+#: plugins/admin/groups/class_groupGeneric.inc:1232
 #, fuzzy
 msgid "Group member"
 msgstr "组成员"
@@ -3469,6 +3597,7 @@ msgid "Group settings"
 msgstr "组设置"
 
 #: plugins/admin/groups/group-list.xml:11
+#: plugins/personal/posix/groupSelect/group-list.xml:11
 msgid "List of groups"
 msgstr "组列表"
 
@@ -3487,41 +3616,49 @@ msgid "Group administration"
 msgstr "组管理"
 
 #: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
 msgid "Posix"
 msgstr "Posix"
 
 #: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:63
 #, fuzzy
 msgid "Edit posix properties"
 msgstr "编辑电话属性"
 
 #: plugins/admin/groups/class_groupManagement.inc:164
-#: plugins/admin/users/class_userManagement.inc:746
+#: plugins/admin/users/class_userManagement.inc:747
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:71
 msgid "Edit mail properties"
 msgstr "编辑邮件属性"
 
 #: plugins/admin/groups/class_groupManagement.inc:172
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/users/class_userManagement.inc:751
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:79
 msgid "Edit samba properties"
 msgstr "编辑 samba 属性"
 
 #: plugins/admin/groups/class_groupManagement.inc:180
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/users/class_userManagement.inc:767
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
 msgid "Edit phone properties"
 msgstr "编辑电话属性"
 
 #: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
 #, fuzzy
 msgid "Menu"
 msgstr "打印机"
 
 #: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:95
 #, fuzzy
 msgid "Edit start menu properties"
 msgstr "编辑 samba 属性"
 
 #: plugins/admin/groups/class_groupManagement.inc:196
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
 msgid "Edit environment properties"
 msgstr "编辑环境属性"
 
@@ -3578,7 +3715,7 @@ msgstr ""
 "板选择。"
 
 #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:404
+#: plugins/admin/users/class_userManagement.inc:405
 #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
 #: plugins/admin/users/templatize.tpl:15
 msgid "Template"
@@ -3599,47 +3736,38 @@ msgstr "名"
 msgid "Manage users"
 msgstr "域用户"
 
-#: plugins/admin/users/class_userManagement.inc:277
+#: plugins/admin/users/class_userManagement.inc:278
 #, fuzzy
 msgid "You have no permission to change this users password!"
 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:649
+#: plugins/admin/users/class_userManagement.inc:650
 #, fuzzy
 msgid "Account locking"
 msgstr "账户"
 
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:651
 #, php-format
 msgid ""
 "Password method '%s' does not support locking. Account (%s) has not been "
 "locked!"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:723
+#: plugins/admin/users/class_userManagement.inc:724
 #, fuzzy
 msgid "Unlock account"
 msgstr "我的账号"
 
-#: plugins/admin/users/class_userManagement.inc:725
+#: plugins/admin/users/class_userManagement.inc:726
 #, fuzzy
 msgid "Lock account"
 msgstr "我的账号"
 
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/users/class_userManagement.inc:739
 msgid "Edit generic properties"
 msgstr "编辑通用属性"
 
-#: plugins/admin/users/class_userManagement.inc:741
+#: plugins/admin/users/class_userManagement.inc:742
 #: plugins/personal/posix/class_posixAccount.inc:304
 #: plugins/personal/posix/class_posixAccount.inc:324
 #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3647,20 +3775,20 @@ msgstr "编辑通用属性"
 msgid "POSIX"
 msgstr ""
 
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:743
 #, fuzzy
 msgid "Edit POSIX properties"
 msgstr "编辑 UNIX 属性"
 
-#: plugins/admin/users/class_userManagement.inc:753
+#: plugins/admin/users/class_userManagement.inc:754
 msgid "Netatalk"
 msgstr "Netatalk"
 
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:755
 msgid "Edit netatalk properties"
 msgstr "编辑 netatalk 属性"
 
-#: plugins/admin/users/class_userManagement.inc:762
+#: plugins/admin/users/class_userManagement.inc:763
 #, fuzzy
 msgid "Edit FAX properties"
 msgstr "编辑 UNIX 属性"
@@ -3669,11 +3797,6 @@ msgstr "编辑 UNIX 属性"
 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 "Lock users"
@@ -3765,52 +3888,6 @@ msgstr ""
 "最好在执行这个操作之前,保存当前 LDAP 树中的内容到一个文件。所以,如果您已经"
 "这么做了,按“删除”继续或者按“取消”退出。"
 
-#: plugins/admin/departments/dep-list.xml:11
-msgid "List of departments"
-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/dep-list.xml:23
-#: plugins/admin/departments/dep-list.xml:110
-#, fuzzy
-msgid "Domain component"
-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/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/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
 #, fuzzy
@@ -3896,8 +3973,8 @@ msgstr "这个子树的分类"
 #: 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/class_user.inc:1639
+#: plugins/personal/generic/generic.tpl:387
 #: plugins/personal/generic/multiple_generic.tpl:265
 msgid "Location"
 msgstr "位置"
@@ -3906,8 +3983,8 @@ msgstr "位置"
 #: 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/class_user.inc:1638
+#: plugins/personal/generic/generic.tpl:395
 #: plugins/personal/generic/multiple_generic.tpl:275
 msgid "State"
 msgstr "州/省"
@@ -3926,7 +4003,7 @@ msgstr "这个子树的位置"
 #: 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/generic.tpl:403
 #: plugins/personal/generic/multiple_generic.tpl:67
 #: plugins/personal/generic/multiple_generic.tpl:285
 msgid "Address"
@@ -3947,10 +4024,10 @@ msgstr "这个子树的电话号码"
 #: 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/class_user.inc:1320
+#: plugins/personal/generic/class_user.inc:1733
+#: plugins/personal/generic/generic.tpl:369
+#: plugins/personal/generic/generic.tpl:537
 #: plugins/personal/generic/multiple_generic.tpl:247
 #: plugins/personal/generic/multiple_generic.tpl:438
 msgid "Fax"
@@ -3994,7 +4071,7 @@ msgid "Organization name"
 msgstr "组织/公司"
 
 #: plugins/admin/departments/class_organizationGeneric.inc:125
-#: plugins/personal/generic/class_user.inc:1635
+#: plugins/personal/generic/class_user.inc:1640
 msgid "Postal address"
 msgstr "地址"
 
@@ -4175,8 +4252,8 @@ msgstr "这个共享不能被删除,因为仍然被 %d 个用户使用:"
 
 #: 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/class_user.inc:1598
+#: plugins/personal/generic/generic.tpl:454
 #: plugins/personal/generic/multiple_generic.tpl:345
 msgid "Role"
 msgstr "角色"
@@ -4216,7 +4293,7 @@ msgstr ""
 msgid "Edit organizational user settings"
 msgstr "应用程序设置"
 
-#: plugins/personal/generic/class_user.inc:264
+#: plugins/personal/generic/class_user.inc:274
 msgid "Please add a single IP address or a network/netmask combination!"
 msgstr ""
 
@@ -4265,225 +4342,225 @@ msgstr "未安装证书"
 msgid "The selected password method is no longer available."
 msgstr "此应用程序不再可用。"
 
-#: plugins/personal/generic/class_user.inc:1151
+#: plugins/personal/generic/class_user.inc:1156
 msgid "Cannot build RDN: no + allowed to build sub RDN!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1158
+#: plugins/personal/generic/class_user.inc:1163
 msgid "Cannot build RDN: attribute is not defined!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1176
+#: plugins/personal/generic/class_user.inc:1181
 msgid "Cannot build RDN: invalid attribute parameters!"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1247
+#: plugins/personal/generic/class_user.inc:1252
 #, fuzzy
 msgid "The selected password method requires initial configuration!"
 msgstr "此应用程序不再可用。"
 
-#: plugins/personal/generic/class_user.inc:1307
-#: plugins/personal/generic/class_user.inc:1639
-#: plugins/personal/generic/class_user.inc:1722
+#: plugins/personal/generic/class_user.inc:1312
+#: plugins/personal/generic/class_user.inc:1644
+#: plugins/personal/generic/class_user.inc:1727
 #: plugins/personal/generic/generic.tpl:204
 #: plugins/personal/generic/multiple_generic.tpl:88
 msgid "Homepage"
 msgstr "个人主页"
 
-#: plugins/personal/generic/class_user.inc:1318
-#: plugins/personal/generic/class_user.inc:1731
-#: plugins/personal/generic/generic.tpl:355
+#: plugins/personal/generic/class_user.inc:1323
+#: plugins/personal/generic/class_user.inc:1736
+#: plugins/personal/generic/generic.tpl:353
 #: plugins/personal/generic/multiple_generic.tpl:227
 msgid "Mobile"
 msgstr "手机"
 
-#: plugins/personal/generic/class_user.inc:1321
-#: plugins/personal/generic/class_user.inc:1734
-#: plugins/personal/generic/generic.tpl:363
+#: plugins/personal/generic/class_user.inc:1326
+#: plugins/personal/generic/class_user.inc:1739
+#: plugins/personal/generic/generic.tpl:361
 #: plugins/personal/generic/multiple_generic.tpl:237
 msgid "Pager"
 msgstr "呼机"
 
-#: plugins/personal/generic/class_user.inc:1326
-#: plugins/personal/generic/class_user.inc:1614
+#: plugins/personal/generic/class_user.inc:1331
+#: plugins/personal/generic/class_user.inc:1619
 #: plugins/personal/generic/generic.tpl:119
 msgid "Date of birth"
 msgstr "生日"
 
-#: plugins/personal/generic/class_user.inc:1436
+#: plugins/personal/generic/class_user.inc:1441
 #, fuzzy
 msgid "Cannot open certificate!"
 msgstr "无法打开指定证书!"
 
-#: plugins/personal/generic/class_user.inc:1582
-#: plugins/personal/generic/generic.tpl:479
+#: plugins/personal/generic/class_user.inc:1587
+#: plugins/personal/generic/generic.tpl:477
 #: plugins/personal/generic/multiple_generic.tpl:371
 msgid "Unit"
 msgstr "单元"
 
-#: plugins/personal/generic/class_user.inc:1583
-#: plugins/personal/generic/generic.tpl:504
+#: plugins/personal/generic/class_user.inc:1588
+#: plugins/personal/generic/generic.tpl:502
 #: plugins/personal/generic/multiple_generic.tpl:402
 msgid "House identifier"
 msgstr "家庭角色"
 
-#: plugins/personal/generic/class_user.inc:1584
-#: plugins/personal/generic/generic.tpl:421
+#: plugins/personal/generic/class_user.inc:1589
+#: plugins/personal/generic/generic.tpl:419
 #: plugins/personal/generic/multiple_generic.tpl:302
 msgid "Vocation"
 msgstr "行业"
 
-#: plugins/personal/generic/class_user.inc:1585
-#: plugins/personal/generic/generic.tpl:548
+#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/generic.tpl:546
 #: plugins/personal/generic/multiple_generic.tpl:449
 msgid "Last delivery"
 msgstr "最后传递"
 
-#: plugins/personal/generic/class_user.inc:1586
-#: plugins/personal/generic/generic.tpl:470
+#: plugins/personal/generic/class_user.inc:1591
+#: plugins/personal/generic/generic.tpl:468
 #: plugins/personal/generic/multiple_generic.tpl:360
 msgid "Person locality"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1587
-#: plugins/personal/generic/generic.tpl:429
+#: plugins/personal/generic/class_user.inc:1592
+#: plugins/personal/generic/generic.tpl:427
 #: plugins/personal/generic/multiple_generic.tpl:312
 msgid "Unit description"
 msgstr "单元描述"
 
-#: plugins/personal/generic/class_user.inc:1588
-#: plugins/personal/generic/generic.tpl:438
+#: plugins/personal/generic/class_user.inc:1593
+#: plugins/personal/generic/generic.tpl:436
 #: plugins/personal/generic/multiple_generic.tpl:323
 msgid "Subject area"
 msgstr ""
 
-#: plugins/personal/generic/class_user.inc:1589
-#: plugins/personal/generic/generic.tpl:447
+#: plugins/personal/generic/class_user.inc:1594
+#: plugins/personal/generic/generic.tpl:445
 #: plugins/personal/generic/multiple_generic.tpl:334
 msgid "Functional title"
 msgstr "单位职称"
 
-#: plugins/personal/generic/class_user.inc:1590
+#: plugins/personal/generic/class_user.inc:1595
 #: plugins/personal/generic/generic_certs.tpl:78
 msgid "Certificate serial number"
 msgstr "证书系列号"
 
-#: plugins/personal/generic/class_user.inc:1591
-#: plugins/personal/generic/generic.tpl:557
+#: plugins/personal/generic/class_user.inc:1596
+#: plugins/personal/generic/generic.tpl:555
 #: plugins/personal/generic/multiple_generic.tpl:460
 msgid "Public visible"
 msgstr "公开"
 
-#: plugins/personal/generic/class_user.inc:1592
-#: plugins/personal/generic/generic.tpl:488
+#: plugins/personal/generic/class_user.inc:1597
+#: plugins/personal/generic/generic.tpl:486
 #: plugins/personal/generic/multiple_generic.tpl:382
 msgid "Street"
 msgstr "街道"
 
-#: plugins/personal/generic/class_user.inc:1594
-#: plugins/personal/generic/generic.tpl:496
+#: plugins/personal/generic/class_user.inc:1599
+#: plugins/personal/generic/generic.tpl:494
 #: plugins/personal/generic/multiple_generic.tpl:392
 msgid "Postal code"
 msgstr "邮编"
 
-#: plugins/personal/generic/class_user.inc:1598
+#: plugins/personal/generic/class_user.inc:1603
 #, fuzzy
 msgid "Generic user settings"
 msgstr "通用队列设置"
 
-#: plugins/personal/generic/class_user.inc:1602
-#: plugins/personal/posix/class_posixAccount.inc:1571
+#: plugins/personal/generic/class_user.inc:1607
+#: plugins/personal/posix/class_posixAccount.inc:1444
 #: plugins/personal/password/class_password.inc:150
 msgid "My account"
 msgstr "我的账号"
 
-#: plugins/personal/generic/class_user.inc:1610
+#: plugins/personal/generic/class_user.inc:1615
 #, fuzzy
 msgid "User identification"
 msgstr "用户信息"
 
-#: plugins/personal/generic/class_user.inc:1611
+#: plugins/personal/generic/class_user.inc:1616
 #: plugins/personal/generic/generic.tpl:98
 msgid "Personal title"
 msgstr "个人称谓"
 
-#: plugins/personal/generic/class_user.inc:1612
+#: plugins/personal/generic/class_user.inc:1617
 #: plugins/personal/generic/generic.tpl:108
 #: plugins/personal/generic/multiple_generic.tpl:23
 msgid "Academic title"
 msgstr "学位头衔"
 
-#: plugins/personal/generic/class_user.inc:1615
+#: plugins/personal/generic/class_user.inc:1620
 #: plugins/personal/generic/generic.tpl:138
 msgid "Sex"
 msgstr "性别"
 
-#: plugins/personal/generic/class_user.inc:1616
+#: plugins/personal/generic/class_user.inc:1621
 #, fuzzy
 msgid "Preferred language"
 msgstr "首选语种"
 
-#: plugins/personal/generic/class_user.inc:1619
+#: plugins/personal/generic/class_user.inc:1624
 #: plugins/personal/generic/paste_generic.tpl:47
 msgid "User picture"
 msgstr "用户图片"
 
-#: plugins/personal/generic/class_user.inc:1623
+#: plugins/personal/generic/class_user.inc:1628
 #, fuzzy
 msgid "Department number"
 msgstr "部门名称"
 
-#: plugins/personal/generic/class_user.inc:1624
+#: plugins/personal/generic/class_user.inc:1629
 #, fuzzy
 msgid "Employee number"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:1625
-#: plugins/personal/generic/generic.tpl:319
+#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/generic.tpl:317
 #: plugins/personal/generic/multiple_generic.tpl:189
 msgid "Employee type"
 msgstr "员工类别"
 
-#: plugins/personal/generic/class_user.inc:1627
+#: plugins/personal/generic/class_user.inc:1632
 #, fuzzy
 msgid "Room number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1628
+#: plugins/personal/generic/class_user.inc:1633
 #, fuzzy
 msgid "Telefon number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1629
+#: plugins/personal/generic/class_user.inc:1634
 #, fuzzy
 msgid "Pager number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1630
+#: plugins/personal/generic/class_user.inc:1635
 #, fuzzy
 msgid "Mobile number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1631
+#: plugins/personal/generic/class_user.inc:1636
 #, fuzzy
 msgid "Fax number"
 msgstr "系列号"
 
-#: plugins/personal/generic/class_user.inc:1637
+#: plugins/personal/generic/class_user.inc:1642
 msgid "Home postal address"
 msgstr "住宅地址"
 
-#: plugins/personal/generic/class_user.inc:1638
+#: plugins/personal/generic/class_user.inc:1643
 #, fuzzy
 msgid "Home phone number"
 msgstr "电话号码"
 
-#: plugins/personal/generic/class_user.inc:1640
+#: plugins/personal/generic/class_user.inc:1645
 #, fuzzy
 msgid "User password method"
 msgstr "口令存储"
 
-#: plugins/personal/generic/class_user.inc:1641
+#: plugins/personal/generic/class_user.inc:1646
 #, fuzzy
 msgid "User certificates"
 msgstr "编辑证书"
@@ -4547,33 +4624,33 @@ msgstr "编辑证书"
 msgid "Restrict login to"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:256
+#: plugins/personal/generic/generic.tpl:254
 msgid "IP or network"
 msgstr ""
 
-#: plugins/personal/generic/generic.tpl:275
+#: plugins/personal/generic/generic.tpl:273
 #: plugins/personal/generic/multiple_generic.tpl:137
 msgid "Organizational information"
 msgstr "组织信息"
 
-#: plugins/personal/generic/generic.tpl:303
+#: plugins/personal/generic/generic.tpl:301
 #: plugins/personal/generic/multiple_generic.tpl:169
 msgid "Department No."
 msgstr "部门编号"
 
-#: plugins/personal/generic/generic.tpl:311
+#: plugins/personal/generic/generic.tpl:309
 #: plugins/personal/generic/multiple_generic.tpl:179
 msgid "Employee No."
 msgstr "员工编号"
 
-#: plugins/personal/generic/generic.tpl:337
-#: plugins/personal/generic/generic.tpl:519
+#: plugins/personal/generic/generic.tpl:335
+#: plugins/personal/generic/generic.tpl:517
 #: plugins/personal/generic/multiple_generic.tpl:207
 #: plugins/personal/generic/multiple_generic.tpl:418
 msgid "Room No."
 msgstr "房间号"
 
-#: plugins/personal/generic/generic.tpl:533
+#: plugins/personal/generic/generic.tpl:531
 msgid "Please use the phone tab"
 msgstr "请使用电话页面"
 
@@ -4657,135 +4734,135 @@ msgstr "活动,口令过期"
 msgid "automatic"
 msgstr "自动"
 
-#: plugins/personal/posix/class_posixAccount.inc:515
+#: plugins/personal/posix/class_posixAccount.inc:444
 #, php-format
 msgid "Password can't be changed up to %s days after last change"
 msgstr "自上次更改以来 %s 天,不能修改口令"
 
-#: plugins/personal/posix/class_posixAccount.inc:519
+#: plugins/personal/posix/class_posixAccount.inc:448
 #, php-format
 msgid "Password must be changed after %s days"
 msgstr "口令必须在 %s 天之后更改"
 
-#: plugins/personal/posix/class_posixAccount.inc:523
+#: plugins/personal/posix/class_posixAccount.inc:452
 #, fuzzy, php-format
 msgid "Disable account after %s days of inactivity after password expiry"
 msgstr "口令过期 %s 天后,禁用账号"
 
-#: plugins/personal/posix/class_posixAccount.inc:527
+#: plugins/personal/posix/class_posixAccount.inc:456
 #, fuzzy, php-format
 msgid "Warn user %s days before password expiry"
 msgstr "在口令过期 %s 天之前警告用户"
 
-#: plugins/personal/posix/class_posixAccount.inc:864
+#: plugins/personal/posix/class_posixAccount.inc:793
 msgid "Timeout while waiting for lock. Ignoring lock!"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:922
-#: plugins/personal/posix/class_posixAccount.inc:1240
+#: plugins/personal/posix/class_posixAccount.inc:851
+#: plugins/personal/posix/class_posixAccount.inc:1169
 msgid "Group of user"
 msgstr "用户组"
 
-#: plugins/personal/posix/class_posixAccount.inc:1017
+#: plugins/personal/posix/class_posixAccount.inc:946
 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:1098
-#: plugins/personal/posix/class_posixAccount.inc:1101
-#: plugins/personal/posix/class_posixAccount.inc:1176
-#: plugins/personal/posix/class_posixAccount.inc:1179
-#: plugins/personal/posix/class_posixAccount.inc:1577
+#: plugins/personal/posix/class_posixAccount.inc:1027
+#: plugins/personal/posix/class_posixAccount.inc:1030
+#: plugins/personal/posix/class_posixAccount.inc:1105
+#: plugins/personal/posix/class_posixAccount.inc:1108
+#: plugins/personal/posix/class_posixAccount.inc:1450
 #: plugins/personal/posix/generic.tpl:7
 #: plugins/personal/posix/paste_generic.tpl:8
 msgid "Home directory"
 msgstr "用户主目录"
 
-#: plugins/personal/posix/class_posixAccount.inc:1109
-#: plugins/personal/posix/class_posixAccount.inc:1112
+#: plugins/personal/posix/class_posixAccount.inc:1038
+#: plugins/personal/posix/class_posixAccount.inc:1041
 #: plugins/personal/posix/generic.tpl:63
 #: plugins/personal/posix/paste_generic.tpl:36
 msgid "UID"
 msgstr "UID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1132
-#: plugins/personal/posix/class_posixAccount.inc:1185
+#: plugins/personal/posix/class_posixAccount.inc:1061
+#: plugins/personal/posix/class_posixAccount.inc:1114
 #, fuzzy
 msgid "shadowMin"
 msgstr "显示终端"
 
-#: plugins/personal/posix/class_posixAccount.inc:1137
-#: plugins/personal/posix/class_posixAccount.inc:1190
+#: plugins/personal/posix/class_posixAccount.inc:1066
+#: plugins/personal/posix/class_posixAccount.inc:1119
 msgid "shadowMax"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1142
-#: plugins/personal/posix/class_posixAccount.inc:1195
+#: plugins/personal/posix/class_posixAccount.inc:1071
+#: plugins/personal/posix/class_posixAccount.inc:1124
 #, fuzzy
 msgid "shadowWarning"
 msgstr "显示分区"
 
-#: plugins/personal/posix/class_posixAccount.inc:1156
-#: plugins/personal/posix/class_posixAccount.inc:1209
+#: plugins/personal/posix/class_posixAccount.inc:1085
+#: plugins/personal/posix/class_posixAccount.inc:1138
 #, fuzzy
 msgid "shadowInactive"
 msgstr "显示打印机"
 
-#: plugins/personal/posix/class_posixAccount.inc:1567
+#: plugins/personal/posix/class_posixAccount.inc:1440
 #, fuzzy
 msgid "POSIX account"
 msgstr "GLPI 账号"
 
-#: plugins/personal/posix/class_posixAccount.inc:1578
+#: plugins/personal/posix/class_posixAccount.inc:1451
 #: plugins/personal/posix/generic.tpl:15
 msgid "Shell"
 msgstr "Shell"
 
-#: plugins/personal/posix/class_posixAccount.inc:1579
+#: plugins/personal/posix/class_posixAccount.inc:1452
 #: setup/setup_migrate.tpl:291
 msgid "User ID"
 msgstr "用户 ID"
 
-#: plugins/personal/posix/class_posixAccount.inc:1580
+#: plugins/personal/posix/class_posixAccount.inc:1453
 #, fuzzy
 msgid "Group ID"
 msgstr "组"
 
-#: plugins/personal/posix/class_posixAccount.inc:1582
+#: plugins/personal/posix/class_posixAccount.inc:1455
 #, fuzzy
 msgid "Force password change on login"
 msgstr "不允许修改口令"
 
-#: plugins/personal/posix/class_posixAccount.inc:1583
+#: plugins/personal/posix/class_posixAccount.inc:1456
 #, fuzzy
 msgid "Shadow min"
 msgstr "显示终端"
 
-#: plugins/personal/posix/class_posixAccount.inc:1584
+#: plugins/personal/posix/class_posixAccount.inc:1457
 msgid "Shadow max"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1585
+#: plugins/personal/posix/class_posixAccount.inc:1458
 #, fuzzy
 msgid "Shadow warning"
 msgstr "显示分区"
 
-#: plugins/personal/posix/class_posixAccount.inc:1586
+#: plugins/personal/posix/class_posixAccount.inc:1459
 #, fuzzy
 msgid "Shadow inactive"
 msgstr "显示打印机"
 
-#: plugins/personal/posix/class_posixAccount.inc:1587
+#: plugins/personal/posix/class_posixAccount.inc:1460
 #, fuzzy
 msgid "Shadow expire"
 msgstr "显示人员"
 
-#: plugins/personal/posix/class_posixAccount.inc:1588
+#: plugins/personal/posix/class_posixAccount.inc:1461
 msgid "Public SSH key"
 msgstr ""
 
-#: plugins/personal/posix/class_posixAccount.inc:1589
+#: plugins/personal/posix/class_posixAccount.inc:1462
 #, fuzzy
 msgid "System trust model"
 msgstr "信赖的系统"
@@ -4865,6 +4942,23 @@ msgstr "显示用户组"
 msgid "User name of which groups are shown"
 msgstr "显示属于该组的用户名"
 
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#, fuzzy
+msgid "List of systems"
+msgstr "用户列表"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:11
+msgid "Show servers"
+msgstr "显示服务器"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:12
+msgid "Show workstations"
+msgstr "显示工作站"
+
+#: plugins/personal/posix/trustSelect/trust-filter.tpl:13
+msgid "Show terminals"
+msgstr "显示终端"
+
 #: plugins/personal/posix/paste_generic.tpl:4
 msgid "Posix settings"
 msgstr "Posix 设置"
@@ -6686,6 +6780,14 @@ msgstr ""
 msgid "Automatic"
 msgstr "自动"
 
+#, fuzzy
+#~ msgid "givenname"
+#~ msgstr "名"
+
+#, fuzzy
+#~ msgid "surename"
+#~ msgstr "姓"
+
 #, fuzzy
 #~ msgid "Edit ogroup"
 #~ msgstr "组列表"
@@ -6982,9 +7084,6 @@ msgstr "自动"
 #~ msgid "Delete acl role"
 #~ msgstr "删除宏"
 
-#~ msgid "Surename"
-#~ msgstr "姓"
-
 #, fuzzy
 #~ msgid "Steps"
 #~ msgstr "系统设置"
@@ -7558,21 +7657,12 @@ msgstr "自动"
 #~ msgid "Show applications"
 #~ msgstr "显示应用程序"
 
-#~ msgid "Show servers"
-#~ msgstr "显示服务器"
-
 #~ msgid "Select to see workstations"
 #~ msgstr "选择查看工作站"
 
-#~ msgid "Show workstations"
-#~ msgstr "显示工作站"
-
 #~ msgid "Select to see terminals"
 #~ msgstr "选择查看终端"
 
-#~ msgid "Show terminals"
-#~ msgstr "显示终端"
-
 #~ msgid "Select to see printers"
 #~ msgstr "选择查看打印机"
 
index 93516b16c92c920b819f7a9daede32a54aa2769e..1a8175ccc1435b10063abef342c9256a8b894ba9 100644 (file)
@@ -7,7 +7,7 @@
     <baseMode>true</baseMode>
     <multiSelect>true</multiSelect>
     <template>../plugins/admin/groups/userSelect/user-list.tpl</template>
-    <label>List of users</label>
+    <label>Please select the desired entries</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
@@ -37,7 +37,7 @@
     </column>
 
     <column>
-      <label>givenname</label>
+      <label>Given name</label>
       <sortAttribute>givenName</sortAttribute>
       <sortType>string</sortType>
       <value>%{givenName}</value>
@@ -45,7 +45,7 @@
     </column>
 
     <column>
-      <label>surename</label>
+      <label>Surname</label>
       <sortAttribute>sn</sortAttribute>
       <sortType>string</sortType>
       <value>%{sn}</value>
index 199e4fb026918706b873159f8667005e372b445d..721a160aac9bd72a2a05cbd7545679f821ef2e3a 100644 (file)
@@ -8,7 +8,7 @@
     <multiSelect>true</multiSelect>
     <template>../plugins/personal/posix/groupSelect/group-list.tpl</template>
     <module>groups</module>
-    <label>List of groups</label>
+    <label>Please select the desired entries</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>
index 00f3eef297c02f6b7964621b52fd0d112408ec72..584e8b373ae580bf139dca2c571501b3fb01a7fe 100644 (file)
@@ -7,7 +7,7 @@
     <baseMode>true</baseMode>
     <multiSelect>true</multiSelect>
     <template>../plugins/personal/posix/trustSelect/trust-list.tpl</template>
-    <label>List of systems</label>
+    <label>Please select the desired entries</label>
     <defaultSortColumn>1</defaultSortColumn>
 
     <objectType>