Hopefully last locales flush

author cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>

Thu, 28 Jan 2010 16:11:18 +0000 (16:11 +0000)

committer cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>

Thu, 28 Jan 2010 16:11:18 +0000 (16:11 +0000)
author cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 28 Jan 2010 16:11:18 +0000 (16:11 +0000)
committer cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Thu, 28 Jan 2010 16:11:18 +0000 (16:11 +0000)
diff --git a/gosa-core/locale/core/de/LC_MESSAGES/messages.po b/gosa-core/locale/core/de/LC_MESSAGES/messages.po

index e009c95c22d5bdb867fa80c3c85c703a451ec9f9..899578ac3566d0b1becdbd1e0a2d24a44d7d66e8 100644 (file)
--- a/gosa-core/locale/core/de/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/de/LC_MESSAGES/messages.po
@@ -13,7 +13,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+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"
@@ -25,12 +25,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -56,39 +58,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr "Information"
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -102,7 +82,7 @@ msgstr "Filter"
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -387,7 +367,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  msgid "Domain"
  msgstr "Domain"
  
@@ -400,7 +380,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -409,7 +389,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  msgid "Locality"
@@ -418,7 +398,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -431,11 +411,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -445,11 +426,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -477,7 +460,7 @@ msgstr "Abteilung"
  msgid "Description"
  msgstr "Beschreibung"
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -624,10 +607,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -796,9 +779,11 @@ msgid "Logout"
  msgstr "Abmelden"
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -857,15 +842,15 @@ msgstr "Die GOsa-Konfigurationsdatei %s/%s ist nicht lesbar. Abgebrochen."
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  msgid "Configuration error"
  msgstr "Konfigurationsfehler"
  
@@ -983,10 +968,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1149,13 +1134,13 @@ msgstr "Der Filter ist unvollständig!"
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  msgid "Permission"
  msgstr "Berechtigung"
  
  #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:571
  #: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  msgid "Permission error"
  msgstr "Berechtigungsfehler"
@@ -1203,7 +1188,7 @@ msgstr ""
  "werden!"
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1212,7 +1197,7 @@ msgstr ""
  "Die Snapshot-Funktionalität ist aktiviert, aber die erforderliche Variable '%"
  "s' ist nicht gesetzt."
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1264,21 +1249,21 @@ msgstr "Verwende ACL aus Rollendefinition"
  msgid "Users"
  msgstr "Benutzer"
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: plugins/admin/groups/class_groupManagement.inc:25
  #: setup/class_setupStep_Migrate.inc:1042
  msgid "Groups"
  msgstr "Gruppen"
  
  #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  msgid "Down"
@@ -1414,34 +1399,39 @@ msgstr "ACL-Rollen"
  msgid "Close"
  msgstr "Schliessen"
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  msgid "Go to root department"
  msgstr "Gehe zur Wurzel-Abteilung"
  
  #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  msgid "Root"
  msgstr "Wurzel"
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  msgid "Go up one department"
  msgstr "Eine Abteilung nach oben"
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  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:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  msgid "Home"
  msgstr "Heimat"
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr "Liste neu laden"
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr "Übertragen"
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1458,7 +1448,7 @@ msgstr ""
  msgid "Choose a base"
  msgstr "Wählen Sie eine Basis"
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1466,52 +1456,52 @@ msgstr "Wählen Sie eine Basis"
  msgid "Select all"
  msgstr "Alle auswählen"
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  msgid "created by"
  msgstr "Angelegt von"
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  msgid "Copy"
  msgstr "Kopieren"
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  msgid "Cut"
  msgstr "Ausschneiden"
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  msgid "Paste"
  msgstr "Einfügen"
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  msgid "Cut this entry"
  msgstr "Diesen Eintrag ausschneiden"
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  msgid "Copy this entry"
  msgstr "Diesen Eintrag kopieren"
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  msgid "Restore snapshots"
  msgstr "Abzug wiederherstellen"
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  msgid "Export list"
  msgstr "Liste exportieren"
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
  msgid "Restore snapshot"
  msgstr "Abzug wiederherstellen"
  
-#: include/class_listing.inc:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  msgid "Create snapshot"
  msgstr "Snapshot erstellen"
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 include/class_plugin.inc:2010
  msgid "Create a new snapshot from this object"
  msgstr "Erstelle einen neuen Snapshot dieses Objekts"
  
@@ -2289,6 +2279,8 @@ msgid "Missing %s PHP extension!"
  msgstr "Fehlenden %s PHP-Erweiterung!"
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2681,11 +2673,11 @@ msgstr ""
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "sambaSID und/oder sambaRidBase fehlen in der Konfiguration!"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid "Configuration"
  msgstr "Konfiguration"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2754,9 +2746,9 @@ 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:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2771,23 +2763,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr "Fax"
  
@@ -2800,8 +2792,10 @@ msgid "FTP"
  msgstr "FTP"
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2809,9 +2803,10 @@ msgid "Group"
  msgstr "Gruppe"
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2831,6 +2826,7 @@ msgid "Application"
  msgstr "Anwendung"
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2842,6 +2838,7 @@ msgid "Thin Client"
  msgstr "Thin Client"
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2853,6 +2850,7 @@ msgid "Object group"
  msgstr "Objektgruppe"
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr "Drucker"
@@ -2896,6 +2894,125 @@ msgstr ""
  msgid "The GOsa team"
  msgstr "Das GOsa Team"
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+msgid "Please select the desired entries"
+msgstr "Bitte wählen Sie die gewünschten Einträge"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
+msgstr "Benutzer"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+msgid "Show department"
+msgstr "Zeige Abteilungen"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+msgid "Show users"
+msgstr "Zeige Benutzer"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+msgid "Show groups"
+msgstr "Zeige Gruppen"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+msgid "Show server"
+msgstr "Zeige Server"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+msgid "Show workstation"
+msgstr "Zeige Arbeitsstationen"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+msgid "Show terminal"
+msgstr "Zeige Terminals"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+msgid "Show printer"
+msgstr "Zeige Drucker"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+msgid "Show phone"
+msgstr "Zeige Telefone"
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2905,7 +3022,7 @@ msgstr ""
  "Daten wiederherzustellen."
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr "Objektgruppen"
  
@@ -2923,140 +3040,91 @@ msgstr "Infrastruktur Fehler"
  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"
-msgstr "Benutzer"
-
  #: plugins/admin/ogroups/class_ogroupManagement.inc:190
  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"
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  "Sie können Terminals und Arbeitsstationen nicht zu einer Objektgruppe "
  "zusammenfassen!"
  
-#: 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:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
+msgstr "keine"
+
+#: plugins/admin/ogroups/class_ogroup.inc:393
+msgid "too many different objects!"
+msgstr "zu viele unterschiedliche Objekte!"
+
+#: plugins/admin/ogroups/class_ogroup.inc:395
+msgid "users"
+msgstr "Benutzer"
  
-#: 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:424
-#: plugins/admin/ogroups/class_ogroup.inc:426
-msgid "people"
-msgstr "Personen"
-
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr "Gruppen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:432
-#: plugins/admin/ogroups/class_ogroup.inc:434
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
+msgstr "Anwendungen"
+
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
+msgstr "Abteilungen"
+
+#: plugins/admin/ogroups/class_ogroup.inc:399
  msgid "servers"
  msgstr "Server"
  
-#: plugins/admin/ogroups/class_ogroup.inc:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
+#: plugins/admin/ogroups/class_ogroup.inc:400
  msgid "workstations"
  msgstr "Arbeitsstationen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:440
-#: plugins/admin/ogroups/class_ogroup.inc:442
-#: plugins/admin/ogroups/class_ogroup.inc:484
+#: plugins/admin/ogroups/class_ogroup.inc:401
+msgid "winstations"
+msgstr "Windows-Arbeitsstationen"
+
+#: plugins/admin/ogroups/class_ogroup.inc:402
  msgid "terminals"
  msgstr "Terminals"
  
-#: plugins/admin/ogroups/class_ogroup.inc:444
-msgid "printer"
-msgstr "Drucker"
-
-#: 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:403
  msgid "phones"
  msgstr "Telefone"
  
-#: 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: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:475
-msgid "too many different objects!"
-msgstr "zu viele unterschiedliche Objekte!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:477
-msgid "users"
-msgstr "Benutzer"
-
-#: plugins/admin/ogroups/class_ogroup.inc:483
-msgid "winstations"
-msgstr "Windows-Arbeitsstationen"
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
+msgstr "Drucker"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr "deaktiviert"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr "Vollzugriff"
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: 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:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  msgid "Non existing dn:"
  msgstr "Unbekannte dn:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
@@ -3065,80 +3133,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: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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  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:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  msgid "Object group generic"
  msgstr "Objektgruppe (Allgemein)"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  msgid "Sytem trust"
  msgstr "System-Vertrauen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  msgid "Member"
  msgstr "Mitglied"
  
@@ -3175,7 +3183,7 @@ msgid "Select a base"
  msgstr "Wählen Sie eine Basis"
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr "System-Vertrauen"
@@ -3213,8 +3221,8 @@ msgid "FAI summary"
  msgstr "FAI-Übersicht"
  
  #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3328,7 +3336,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3375,36 +3382,8 @@ msgstr ""
  "Bitte prüfen Sie, ob Sie die Aktion wirklich durchführen möchten, da GOsa "
  "die Daten nicht wiederherstellen kann."
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Wählen Sie die hinzuzufügenden Benutzer"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr "Wählen um Server anzuzeigen"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr "Suche im Teilbaum"
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr "Zeige die Benutzer der Abteilung"
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr "Zeige die Benutzer, auf die Folgendes passt"
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3419,24 +3398,6 @@ msgstr "Vorname"
  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
@@ -3492,74 +3453,89 @@ msgstr "In allen Gruppen"
  msgid "Not in all groups"
  msgstr "Nicht in allen Gruppen"
  
+#: 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/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Zeige Samba Gruppen"
+
+#: 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/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:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr "Samba-Gruppe"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr "Domänen-Administratoren"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr "Domänen-Benutzer"
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr "Domänen-Gäste"
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr "Spezielle Gruppe (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, 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:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, 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:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  msgid "! unknown UID"
  msgstr "! unbekannte UID"
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, 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:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, php-format
  msgid "Cannot find any SID for '%s'!"
  msgstr "Kann keine SID für '%s' finden!"
  
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, php-format
  msgid "Cannot find any RIDBASE for '%s'!"
  msgstr "Kann keine RIDBASE für '%s' finden!"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, 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:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3567,27 +3543,27 @@ msgstr "Die Gruppen ID-Nummer '%s' wird bereits von %s verwendet!"
  msgid "GID"
  msgstr "GID"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  msgid "Generic group settings"
  msgstr "Allgemeine Gruppeneinstellungen"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  msgid "Samba group type"
  msgstr "Samba-Gruppentyp"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  msgid "Samba domain name"
  msgstr "Samba Domänen-Name"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  msgid "Phone pickup group"
  msgstr "Gesprächs-Annahme Gruppe"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  msgid "Nagios group"
  msgstr "Nagios-Gruppe"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  msgid "Group member"
  msgstr "Gruppenmitglieder"
  
@@ -3596,7 +3572,6 @@ 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"
  
@@ -3612,46 +3587,46 @@ msgstr "Gruppe löschen"
  msgid "Group administration"
  msgstr "Gruppenverwaltung"
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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:747
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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:751
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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:767
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
  msgid "Edit phone properties"
  msgstr "Telefon-Einstellungen bearbeiten"
  
-#: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  msgid "Menu"
  msgstr "Menü"
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
  msgid "Edit environment properties"
  msgstr "Umgebungs-Einstellungen bearbeiten"
@@ -3715,7 +3690,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:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3739,11 +3714,11 @@ msgstr "Benutzer verwalten"
  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:650
+#: plugins/admin/users/class_userManagement.inc:654
  msgid "Account locking"
  msgstr "Konto-Sperrung"
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
@@ -3752,19 +3727,19 @@ msgstr ""
  "Die Passwort-Methode '%s' unterstützt keine Sperrungen. Das Konto %s wurde "
  "nicht gesperrt!"
  
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
  msgid "Unlock account"
  msgstr "Konto aktivieren"
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  msgid "Lock account"
  msgstr "Konto deaktivieren"
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  msgid "Edit generic properties"
  msgstr "Allgemeine Einstellungen bearbeiten"
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3772,19 +3747,19 @@ msgstr "Allgemeine Einstellungen bearbeiten"
  msgid "POSIX"
  msgstr "POSIX"
  
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:747
  msgid "Edit POSIX properties"
  msgstr "UNIX-Einstellungen bearbeiten"
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr "Netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  msgid "Edit netatalk properties"
  msgstr "Netatalk-Einstellungen bearbeiten"
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  msgid "Edit FAX properties"
  msgstr "FAX-Einstellungen bearbeiten"
  
@@ -4025,7 +4000,7 @@ msgstr "Einleitende Fax-Nummer dieses Teilbaums"
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  msgid "Domain Component"
@@ -4041,7 +4016,7 @@ msgstr "Abteilungen"
  msgid "Manage Departments"
  msgstr "Abteilungen verwalten"
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  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 "
@@ -4893,10 +4868,6 @@ 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"
@@ -6711,3 +6682,33 @@ msgstr "Dieser Schritt erlaubt es Ihnen, Ihre bevorzugte Sprache auszuwählen."
  #: setup/class_setupStep_Language.inc:47
  msgid "Automatic"
  msgstr "Automatisch"
+
+#~ msgid "Update"
+#~ msgstr "Aktualisieren"
+
+#~ msgid "Show %s"
+#~ msgstr "Zeige %s"
+
+#~ msgid "people"
+#~ msgstr "Personen"
+
+#~ msgid "Select users to add"
+#~ msgstr "Wählen Sie die hinzuzufügenden Benutzer"
+
+#~ msgid "Select to see servers"
+#~ msgstr "Wählen um Server anzuzeigen"
+
+#~ msgid "Search within subtree"
+#~ msgstr "Suche im Teilbaum"
+
+#~ msgid "Display users of department"
+#~ msgstr "Zeige die Benutzer der Abteilung"
+
+#~ msgid "Display users matching"
+#~ msgstr "Zeige die Benutzer, auf die Folgendes passt"
+
+#~ msgid "Regular expression for matching user names"
+#~ msgstr "Regulärer Ausdruck zum Erkennen von Benutzernamen"
+
+#~ msgid "List of systems"
+#~ msgstr "Liste der Systeme"
diff --git a/gosa-core/locale/core/es/LC_MESSAGES/messages.po b/gosa-core/locale/core/es/LC_MESSAGES/messages.po

index 71b8b34ec0080fc4821c1bf43fac9f5b32c1d858..7752aa8e2b38efefc63e569e5765e1cc0c3a207c 100644 (file)
--- a/gosa-core/locale/core/es/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/es/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: admin\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+0100\n"
  "PO-Revision-Date: 2010-01-20 00:26+0100\n"
  "Last-Translator: \n"
  "Language-Team: Spanish <>\n"
@@ -20,12 +20,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -51,39 +53,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr "Información"
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -97,7 +77,7 @@ msgstr "Filtros"
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -380,7 +360,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  msgid "Domain"
  msgstr "Dominio"
  
@@ -394,7 +374,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -403,7 +383,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  msgid "Locality"
@@ -412,7 +392,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -425,11 +405,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -439,11 +420,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -471,7 +454,7 @@ msgstr "Departamento"
  msgid "Description"
  msgstr "Descripción"
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -616,10 +599,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -785,9 +768,11 @@ msgid "Logout"
  msgstr "Salir"
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -847,15 +832,15 @@ msgstr "No se puede acceder a la configuración de GOsa %s/%s. Cancelado"
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  msgid "Configuration error"
  msgstr "Error de configuración"
  
@@ -970,10 +955,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1142,13 +1127,13 @@ msgstr ""
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  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/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  msgid "Permission error"
  msgstr "Error de Permisos"
@@ -1193,7 +1178,7 @@ msgstr ""
  "introducida!"
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1202,7 +1187,7 @@ msgstr ""
  "La funcionalidad de instancias esta activa, pero el valor requerido '%s' no "
  "está activo."
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1254,21 +1239,21 @@ msgstr "Utilizar las ACL definidas en el rol"
  msgid "Users"
  msgstr "Usuarios"
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: 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_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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:235
+#: include/class_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  msgid "Down"
@@ -1404,34 +1389,39 @@ msgstr "Roles ACL"
  msgid "Close"
  msgstr "Cerrar"
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  msgid "Go to root department"
  msgstr "Ir al departamento raíz"
  
  #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  msgid "Root"
  msgstr "Raíz"
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  msgid "Go up one department"
  msgstr "Subir un departamento"
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  msgid "Go to users department"
  msgstr "Ir al departamento de usuarios"
  
  #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  msgid "Home"
  msgstr "Inicio"
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr "Recargar lista"
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr "Enviar"
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1447,7 +1437,7 @@ msgstr ""
  msgid "Choose a base"
  msgstr "Elija una base"
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1455,52 +1445,52 @@ msgstr "Elija una base"
  msgid "Select all"
  msgstr "Seleccione todos"
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  msgid "created by"
  msgstr "Creado por"
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  msgid "Copy"
  msgstr "Copiar"
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  msgid "Cut"
  msgstr "Mover"
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  msgid "Paste"
  msgstr "Pegar"
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  msgid "Cut this entry"
  msgstr "Mover esta entrada"
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  msgid "Copy this entry"
  msgstr "Copiar esta entrada"
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  msgid "Restore snapshots"
  msgstr "Recuperar instantánea"
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  msgid "Export list"
  msgstr "Exportar lista"
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
  msgid "Restore snapshot"
  msgstr "Recuperar instantanea"
  
-#: include/class_listing.inc:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  msgid "Create snapshot"
  msgstr "Crear instantánea"
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 include/class_plugin.inc:2010
  msgid "Create a new snapshot from this object"
  msgstr "¡Crear una nueva instantánea de este objeto!"
  
@@ -2279,6 +2269,8 @@ msgid "Missing %s PHP extension!"
  msgstr "¡Extensión PHP %s no encontrada!"
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2668,11 +2660,11 @@ msgstr ""
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "¡sambaSID y/o sambaRidBase no aparece en la configuración!"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid "Configuration"
  msgstr "Configuración"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2741,9 +2733,9 @@ 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:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2758,23 +2750,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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_groupManagement.inc:171
-#: plugins/admin/users/class_userManagement.inc:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr "FAX"
  
@@ -2787,8 +2779,10 @@ msgid "FTP"
  msgstr "FTP"
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2796,9 +2790,10 @@ msgid "Group"
  msgstr "Grupo"
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2818,6 +2813,7 @@ msgid "Application"
  msgstr "Aplicación"
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2829,6 +2825,7 @@ msgid "Thin Client"
  msgstr "Cliente ligero"
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2840,6 +2837,7 @@ msgid "Object group"
  msgstr "Grupo de objetos"
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr "Impresora"
@@ -2883,6 +2881,134 @@ msgstr ""
  msgid "The GOsa team"
  msgstr "El equipo de GOsa"
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Por favor seleccione su idioma preferido"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: 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/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+#, fuzzy
+msgid "Show department"
+msgstr "departamento"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+#, fuzzy
+msgid "Show users"
+msgstr "Mostrar servidores"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+#, fuzzy
+msgid "Show groups"
+msgstr "grupos de correo"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+#, fuzzy
+msgid "Show server"
+msgstr "Mostrar servidores"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+#, fuzzy
+msgid "Show workstation"
+msgstr "Mostrar estaciones de trabajo"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+#, fuzzy
+msgid "Show terminal"
+msgstr "Mostrar terminales"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+#, fuzzy
+msgid "Show printer"
+msgstr "impresora"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+#, fuzzy
+msgid "Show phone"
+msgstr "Mostrar cambios"
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2892,7 +3018,7 @@ msgstr ""
  "de que GOsa pueda recuperar posteriormente esa información"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr "Grupos de objetos"
  
@@ -2910,140 +3036,91 @@ msgstr "error de infraestructura"
  msgid "Templates"
  msgstr "Plantillas"
  
-#: 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_ogroupManagement.inc:190
  msgid "Windows Install"
  msgstr "Instalación Windows"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:191
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-msgid "Terminal"
-msgstr "Terminal"
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  "¡No puede combinar terminales y estaciones de trabajo en un unico grupo de "
  "objetos!"
  
-#: 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:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
+msgstr "ninguno"
+
+#: plugins/admin/ogroups/class_ogroup.inc:393
+msgid "too many different objects!"
+msgstr "¡demasiados objetos diferentes!"
  
-#: 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"
+#: plugins/admin/ogroups/class_ogroup.inc:395
+msgid "users"
  msgstr "usuarios"
  
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr "grupos"
  
-#: plugins/admin/ogroups/class_ogroup.inc:432
-#: plugins/admin/ogroups/class_ogroup.inc:434
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
+msgstr "aplicaciones"
+
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
+msgstr "departamentos"
+
+#: plugins/admin/ogroups/class_ogroup.inc:399
  msgid "servers"
  msgstr "servidores"
  
-#: plugins/admin/ogroups/class_ogroup.inc:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
+#: plugins/admin/ogroups/class_ogroup.inc:400
  msgid "workstations"
  msgstr "estaciones de trabajo"
  
-#: plugins/admin/ogroups/class_ogroup.inc:440
-#: plugins/admin/ogroups/class_ogroup.inc:442
-#: plugins/admin/ogroups/class_ogroup.inc:484
+#: plugins/admin/ogroups/class_ogroup.inc:401
+msgid "winstations"
+msgstr "Estación de trabajo Windows"
+
+#: plugins/admin/ogroups/class_ogroup.inc:402
  msgid "terminals"
  msgstr "terminales"
  
-#: plugins/admin/ogroups/class_ogroup.inc:444
-msgid "printer"
-msgstr "impresora"
-
-#: 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:403
  msgid "phones"
  msgstr "teléfonos"
  
-#: 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: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:475
-msgid "too many different objects!"
-msgstr "¡demasiados objetos diferentes!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:477
-msgid "users"
-msgstr "usuarios"
-
-#: plugins/admin/ogroups/class_ogroup.inc:483
-msgid "winstations"
-msgstr "Estación de trabajo Windows"
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
+msgstr "impresoras"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr "desactivado"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr "Acceso sin restricciones"
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: 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:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  msgid "Non existing dn:"
  msgstr "No existe el 'dn':"
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
@@ -3052,79 +3129,19 @@ msgstr ""
  "Estos sistemas ya han sido configurados por otros grupos de objetos y no "
  "pueden ser añadidos:"
  
-#: 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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  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:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  msgid "Object group generic"
  msgstr "Grupo de objetos genérico"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  msgid "Sytem trust"
  msgstr "Sistema de confianza"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  msgid "Member"
  msgstr "Miembro"
  
@@ -3161,7 +3178,7 @@ msgid "Select a base"
  msgstr "Seleccione una base"
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr "Sistema de seguridad"
@@ -3199,8 +3216,8 @@ msgid "FAI summary"
  msgstr "Sumario FAI"
  
  #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3316,7 +3333,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3363,37 +3379,8 @@ msgstr ""
  "Este puede ser un grupo primario. Si está seguro de lo que quiere hacer "
  "pulse dos veces, dado que GOsa no tiene manera de recuperar esta información."
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Seleccione usuarios a añadir"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr "Seleccione para ver los servidores"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr "Buscar dentro del subárbol"
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr "Mostrar usuarios del departamento"
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr "Mostrar usuarios que coincidan con"
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3408,27 +3395,6 @@ msgstr "Nombre de pila"
  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
@@ -3485,72 +3451,90 @@ msgstr "en todos los grupos"
  msgid "Not in all groups"
  msgstr "no en todos los grupos"
  
+#: 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/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+#, fuzzy
+msgid "Show samba groups"
+msgstr "grupo de samba"
+
+#: 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/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:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr "Grupo de samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr "Administradores del dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr "Usuarios del dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr "Invitados del dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr "Grupo especial (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, 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:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, 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:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  msgid "! unknown UID"
  msgstr "¡UID desconocido!"
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, 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:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, 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:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, php-format
  msgid "Cannot find any RIDBASE for '%s'!"
  msgstr "¡No se puede encontrar un RIDBASE para '%s'."
  
-#: plugins/admin/groups/class_groupGeneric.inc:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, 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:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3558,27 +3542,27 @@ msgstr "¡El gidNumber '%s' introducido ya esta siendo usado por %s!"
  msgid "GID"
  msgstr "GID"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  msgid "Generic group settings"
  msgstr "Parámetros genéricos del grupo"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  msgid "Samba group type"
  msgstr "Tipo de grupo de samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  msgid "Samba domain name"
  msgstr "Nombre de dominio samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  msgid "Phone pickup group"
  msgstr "Miembros de grupo de salto telefónico"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  msgid "Nagios group"
  msgstr "Grupo Nagios"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  msgid "Group member"
  msgstr "Miembro del grupo"
  
@@ -3587,7 +3571,6 @@ msgid "Group settings"
  msgstr "Parametros de grupos"
  
  #: plugins/admin/groups/group-list.xml:11
-#: plugins/personal/posix/groupSelect/group-list.xml:11
  msgid "List of groups"
  msgstr "Lista de grupos"
  
@@ -3605,49 +3588,49 @@ msgstr "grupos de servidor"
  msgid "Group administration"
  msgstr "Administración de grupo"
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: 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/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  #, fuzzy
  msgid "Menu"
  msgstr "Impresora"
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:196
-#: plugins/admin/users/class_userManagement.inc:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
  msgid "Edit environment properties"
  msgstr "Editar características de entorno"
@@ -3712,7 +3695,7 @@ msgstr ""
  "anular el uso de plantillas."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3736,11 +3719,11 @@ msgstr "Gestión de usuarios"
  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:650
+#: plugins/admin/users/class_userManagement.inc:654
  msgid "Account locking"
  msgstr "Bloqueo de cuenta"
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, fuzzy, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
@@ -3749,19 +3732,19 @@ msgstr ""
  "El método de contraseña '%s' no soporta bloqueo. ¡La cuenta no ha sido "
  "bloqueada!"
  
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
  msgid "Unlock account"
  msgstr "Desbloquear cuenta"
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  msgid "Lock account"
  msgstr "Bloquear cuenta"
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  msgid "Edit generic properties"
  msgstr "Editar características generales"
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3769,19 +3752,19 @@ msgstr "Editar características generales"
  msgid "POSIX"
  msgstr "POSIX"
  
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:747
  msgid "Edit POSIX properties"
  msgstr "Editar características POSIX"
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr "Netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  msgid "Edit netatalk properties"
  msgstr "Editar características netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  msgid "Edit FAX properties"
  msgstr "Editar características FAX"
  
@@ -4027,7 +4010,7 @@ msgstr "Número base de fax de este subárbol"
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  msgid "Domain Component"
@@ -4043,7 +4026,7 @@ msgstr "Departamentos"
  msgid "Manage Departments"
  msgstr "Gestionar Departamentos"
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  #, fuzzy
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
@@ -4898,11 +4881,6 @@ msgstr "Mostrar grupos de usuarios"
  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"
@@ -6692,6 +6670,37 @@ msgstr "Este paso le permite seleccionar su idioma preferido"
  msgid "Automatic"
  msgstr "Automatico"
  
+#~ msgid "Update"
+#~ msgstr "Actualizar"
+
+#~ msgid "Show %s"
+#~ msgstr "Mostrar %s"
+
+#~ msgid "people"
+#~ msgstr "usuarios"
+
+#~ msgid "Select users to add"
+#~ msgstr "Seleccione usuarios a añadir"
+
+#~ msgid "Select to see servers"
+#~ msgstr "Seleccione para ver los servidores"
+
+#~ msgid "Search within subtree"
+#~ msgstr "Buscar dentro del subárbol"
+
+#~ msgid "Display users of department"
+#~ msgstr "Mostrar usuarios del departamento"
+
+#~ msgid "Display users matching"
+#~ msgstr "Mostrar usuarios que coincidan con"
+
+#~ msgid "Regular expression for matching user names"
+#~ msgstr "Expresiones regulares para buscar nombre de usuarios"
+
+#, fuzzy
+#~ msgid "List of systems"
+#~ msgstr "Lista de usuarios"
+
  #, fuzzy
  #~ msgid "givenname"
  #~ msgstr "Nombre de pila"
@@ -6964,9 +6973,6 @@ msgstr "Automatico"
  #~ msgid "You're about to delete the whole LDAP subtree placed under '%s'."
  #~ msgstr "Ha decidido eliminar todo el subárbol LDAP colocado debajo de '%s'."
  
-#~ msgid "department"
-#~ msgstr "departamento"
-
  #~ msgid "Delete acl role"
  #~ msgstr "Eliminar rol"
  
diff --git a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po

index 4881f7f193e72714096073cda2e90cc0096fc3c2..3fab7c13060908ec0e547420777e993fb017ee13 100644 (file)
--- a/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/fr/LC_MESSAGES/messages.po
@@ -4,7 +4,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+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"
@@ -16,12 +16,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -47,39 +49,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr "Information"
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -93,7 +73,7 @@ msgstr "Filtres"
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -380,7 +360,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  msgid "Domain"
  msgstr "Domaine"
  
@@ -393,7 +373,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -402,7 +382,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  msgid "Locality"
@@ -411,7 +391,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -424,11 +404,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -438,11 +419,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -470,7 +453,7 @@ msgstr "Département"
  msgid "Description"
  msgstr ""
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -616,10 +599,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -787,9 +770,11 @@ msgid "Logout"
  msgstr "Déconnexion"
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -848,15 +833,15 @@ msgstr "Le fichier de configuration %s/%s ne peut être lu. Abandon."
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  msgid "Configuration error"
  msgstr "Erreur de configuration"
  
@@ -974,10 +959,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1142,13 +1127,13 @@ msgstr "Le filtre est incomplet !"
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  msgid "Permission"
  msgstr "Permissions"
  
  #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:571
  #: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  msgid "Permission error"
  msgstr "Erreur de permissions"
@@ -1194,7 +1179,7 @@ msgstr ""
  "passe !"
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1203,7 +1188,7 @@ msgstr ""
  "La fonctionnalité pour les copie instantanées est activée, mais la variable "
  "requise '%s' n'est pas configurée."
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1255,21 +1240,21 @@ msgstr "Utiliser l'ACL définie dans le rôle"
  msgid "Users"
  msgstr "Utilisateurs"
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: plugins/admin/groups/class_groupManagement.inc:25
  #: setup/class_setupStep_Migrate.inc:1042
  msgid "Groups"
  msgstr "Groupes"
  
  #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  msgid "Down"
@@ -1405,34 +1390,39 @@ msgstr "Rôles ACL"
  msgid "Close"
  msgstr "Fermer"
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  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:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  msgid "Root"
  msgstr "Racine"
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  msgid "Go up one department"
  msgstr "Monter d'un département"
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  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:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  msgid "Home"
  msgstr "Accueil"
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr "Recharger la liste"
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr "Soumettre"
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1449,7 +1439,7 @@ msgstr ""
  msgid "Choose a base"
  msgstr "Sélectionnez une base"
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1457,52 +1447,52 @@ msgstr "Sélectionnez une base"
  msgid "Select all"
  msgstr "Sélectionner tout"
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  msgid "created by"
  msgstr "Crée par"
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  msgid "Copy"
  msgstr "Copier"
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  msgid "Cut"
  msgstr "Couper"
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  msgid "Paste"
  msgstr "Coller"
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  msgid "Cut this entry"
  msgstr "Couper cette entrée"
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  msgid "Copy this entry"
  msgstr "Copier cette entrée"
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  msgid "Restore snapshots"
  msgstr "Restaurer la copie instantanée"
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  msgid "Export list"
  msgstr "Exporter la liste"
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
  msgid "Restore snapshot"
  msgstr "Restaurer la copie instantanée"
  
-#: include/class_listing.inc:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  msgid "Create snapshot"
  msgstr "Créer un snapshot"
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 include/class_plugin.inc:2010
  msgid "Create a new snapshot from this object"
  msgstr "Créer un nouveau snapshot depuis cet objet"
  
@@ -2287,6 +2277,8 @@ msgid "Missing %s PHP extension!"
  msgstr "Extension PHP %s manquante !"
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2680,11 +2672,11 @@ msgstr ""
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "sambaSID et/ou sambaRidBase absents de votre configuration !"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid "Configuration"
  msgstr ""
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2753,9 +2745,9 @@ 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:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2770,23 +2762,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr ""
  
@@ -2799,8 +2791,10 @@ msgid "FTP"
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2808,9 +2802,10 @@ msgid "Group"
  msgstr "Groupes"
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2830,6 +2825,7 @@ msgid "Application"
  msgstr "Applications"
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2841,6 +2837,7 @@ msgid "Thin Client"
  msgstr "Clients légers"
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2852,6 +2849,7 @@ msgid "Object group"
  msgstr "Groupes d'objets"
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr "Imprimante"
@@ -2896,6 +2894,134 @@ msgstr ""
  msgid "The GOsa team"
  msgstr "L'équipe de GOsa"
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Veuillez sélectionner la langue par défaut"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+msgid "Terminal"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
+msgstr "Utilisateur"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+#, fuzzy
+msgid "Show department"
+msgstr "départements"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+#, fuzzy
+msgid "Show users"
+msgstr "serveurs"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+#, fuzzy
+msgid "Show groups"
+msgstr "Groupes de messagerie"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+#, fuzzy
+msgid "Show server"
+msgstr "serveurs"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+#, fuzzy
+msgid "Show workstation"
+msgstr "stations de travail"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+#, fuzzy
+msgid "Show terminal"
+msgstr "terminaux"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+#, fuzzy
+msgid "Show printer"
+msgstr "imprimante"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+#, fuzzy
+msgid "Show phone"
+msgstr "Montrer les changements"
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2906,7 +3032,7 @@ msgstr ""
  "données."
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr "Groupes d'objets"
  
@@ -2924,140 +3050,91 @@ msgstr "Erreur d'infrastructure"
  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"
-msgstr "Utilisateur"
-
  #: plugins/admin/ogroups/class_ogroupManagement.inc:190
  msgid "Windows Install"
  msgstr "Installation Windows"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:191
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-msgid "Terminal"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  "Vous ne pouvez pas combiner des terminaux et des stations de travail dans un "
  "groupe d'objet !"
  
-#: 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:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
+msgstr "aucun"
  
-#: 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:424
-#: plugins/admin/ogroups/class_ogroup.inc:426
-msgid "people"
+#: plugins/admin/ogroups/class_ogroup.inc:393
+msgid "too many different objects!"
+msgstr "nombre d'objets différents trop important !"
+
+#: plugins/admin/ogroups/class_ogroup.inc:395
+msgid "users"
  msgstr "utilisateurs"
  
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr "groupes"
  
-#: plugins/admin/ogroups/class_ogroup.inc:432
-#: plugins/admin/ogroups/class_ogroup.inc:434
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
+msgstr ""
+
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
+msgstr "départements"
+
+#: plugins/admin/ogroups/class_ogroup.inc:399
  msgid "servers"
  msgstr "serveurs"
  
-#: plugins/admin/ogroups/class_ogroup.inc:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
+#: plugins/admin/ogroups/class_ogroup.inc:400
  msgid "workstations"
  msgstr "stations de travail"
  
-#: plugins/admin/ogroups/class_ogroup.inc:440
-#: plugins/admin/ogroups/class_ogroup.inc:442
-#: plugins/admin/ogroups/class_ogroup.inc:484
+#: plugins/admin/ogroups/class_ogroup.inc:401
+msgid "winstations"
+msgstr "Stations Windows"
+
+#: plugins/admin/ogroups/class_ogroup.inc:402
  msgid "terminals"
  msgstr "terminaux"
  
-#: plugins/admin/ogroups/class_ogroup.inc:444
-msgid "printer"
-msgstr "imprimante"
-
-#: 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:403
  msgid "phones"
  msgstr "téléphones"
  
-#: 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: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:475
-msgid "too many different objects!"
-msgstr "nombre d'objets différents trop important !"
-
-#: plugins/admin/ogroups/class_ogroup.inc:477
-msgid "users"
-msgstr "utilisateurs"
-
-#: plugins/admin/ogroups/class_ogroup.inc:483
-msgid "winstations"
-msgstr "Stations Windows"
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
+msgstr "imprimantes"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr "désactivé"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr "accès complet"
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: 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:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  msgid "Non existing dn:"
  msgstr "le dn n'existe pas :"
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
@@ -3066,79 +3143,19 @@ 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: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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  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:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  msgid "Object group generic"
  msgstr "Groupes d'objets"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  msgid "Sytem trust"
  msgstr "Système de Confiance"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  msgid "Member"
  msgstr "Membres"
  
@@ -3175,7 +3192,7 @@ msgid "Select a base"
  msgstr "Sélectionnez une base"
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr "Système de Confiance"
@@ -3213,8 +3230,8 @@ msgid "FAI summary"
  msgstr "Sommaire FAI"
  
  #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3328,7 +3345,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3376,37 +3392,8 @@ msgstr ""
  "assurez que vous voulez bien exécuter cette action étant donné qu'il est "
  "impossible pour GOsa de récupérer vos données."
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Sélectionnez les utilisateurs à ajouter"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr "Sélectionnez pour voir les serveurs"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr "Chercher dans le sous arbre"
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr "Afficher les utilisateurs du département"
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr "Afficher les utilisateurs correspondants"
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3421,24 +3408,6 @@ msgstr "Prénom"
  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
@@ -3495,73 +3464,88 @@ msgstr "dans tout les groupes"
  msgid "Not in all groups"
  msgstr "pas dans tout les groupes"
  
+#: 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/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Groupes Samba"
+
+#: 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/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:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr "Groupe Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr "Administrateurs du domaine"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr "Utilisateurs du domaine"
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr "Invités du domaine"
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr "Groupe spécial (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, 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:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, 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:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  msgid "! unknown UID"
  msgstr "! identifiant inconnu"
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, 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 !"
  
-#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, php-format
  msgid "Cannot find any SID for '%s'!"
  msgstr "Impossible de trouver le SID pour '%s' !"
  
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, php-format
  msgid "Cannot find any RIDBASE for '%s'!"
  msgstr "Impossible de trouver le RIDBASe pour '%s' !"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, 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:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3569,27 +3553,27 @@ msgstr "L'identifiant de groupe '%s' est déjà utilisé par '%s' !"
  msgid "GID"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  msgid "Generic group settings"
  msgstr "Préférences des groupes génériques"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  msgid "Samba group type"
  msgstr "Groupe Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  msgid "Samba domain name"
  msgstr "Domaine Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  msgid "Phone pickup group"
  msgstr "Groupe téléphonique"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  msgid "Nagios group"
  msgstr "Groupe Nagios"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  msgid "Group member"
  msgstr "Membre du groupe"
  
@@ -3598,7 +3582,6 @@ 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"
  
@@ -3614,46 +3597,46 @@ msgstr "Enlever le groupe"
  msgid "Group administration"
  msgstr "Administration du groupe"
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  msgid "Posix"
  msgstr ""
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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:747
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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:751
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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:767
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: 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/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  msgid "Menu"
  msgstr ""
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
  msgid "Edit environment properties"
  msgstr "Modifier les propriétés d'environnement"
@@ -3718,7 +3701,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:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3744,11 +3727,11 @@ msgstr ""
  "Vous n'avez pas l'autorisation pour changer le mot de passe de ce(s) "
  "utilisateurs !"
  
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:654
  msgid "Account locking"
  msgstr "Verrouillage du compte"
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
@@ -3757,19 +3740,19 @@ msgstr ""
  "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:724
+#: plugins/admin/users/class_userManagement.inc:728
  msgid "Unlock account"
  msgstr "Déverrouiller le compte"
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  msgid "Lock account"
  msgstr "Verrouiller Compte"
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  msgid "Edit generic properties"
  msgstr "Modifier les propriétés de base"
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3777,19 +3760,19 @@ msgstr "Modifier les propriétés de base"
  msgid "POSIX"
  msgstr "UNIX"
  
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:747
  msgid "Edit POSIX properties"
  msgstr "Modifier les propriétés UNIX"
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  msgid "Edit netatalk properties"
  msgstr "Modifier les propriétés de Netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  msgid "Edit FAX properties"
  msgstr "Modifier les propriétés FAX"
  
@@ -4032,7 +4015,7 @@ msgstr "Numéro de fax de base pour cette sous-branche"
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  msgid "Domain Component"
@@ -4048,7 +4031,7 @@ msgstr "Départements"
  msgid "Manage Departments"
  msgstr "Gérer les départements"
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  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 "
@@ -4906,11 +4889,6 @@ 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"
@@ -6725,6 +6703,37 @@ msgstr "Cette étape vous permet de sélectionner votre langue préférée."
  msgid "Automatic"
  msgstr "Automatique"
  
+#~ msgid "Update"
+#~ msgstr "Mise à jour"
+
+#~ msgid "Show %s"
+#~ msgstr "Afficher %s"
+
+#~ msgid "people"
+#~ msgstr "utilisateurs"
+
+#~ msgid "Select users to add"
+#~ msgstr "Sélectionnez les utilisateurs à ajouter"
+
+#~ msgid "Select to see servers"
+#~ msgstr "Sélectionnez pour voir les serveurs"
+
+#~ msgid "Search within subtree"
+#~ msgstr "Chercher dans le sous arbre"
+
+#~ msgid "Display users of department"
+#~ msgstr "Afficher les utilisateurs du département"
+
+#~ msgid "Display users matching"
+#~ msgstr "Afficher les utilisateurs correspondants"
+
+#~ msgid "Regular expression for matching user names"
+#~ msgstr "Expression régulière concordant avec les noms des utilisateurs"
+
+#, fuzzy
+#~ msgid "List of systems"
+#~ msgstr "Liste des utilisateurs"
+
  #, fuzzy
  #~ msgid "givenname"
  #~ msgstr "Prénom"
diff --git a/gosa-core/locale/core/it/LC_MESSAGES/messages.po b/gosa-core/locale/core/it/LC_MESSAGES/messages.po

index 1c2874d62ef2424539a509fe1bae8c7ac251bc55..a177c4993edbbc66b4042e80ef495418db78785a 100644 (file)
--- a/gosa-core/locale/core/it/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/it/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+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"
@@ -17,12 +17,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -48,39 +50,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr "Informazioni"
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -94,7 +74,7 @@ msgstr "Filtri"
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -373,7 +353,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  #, fuzzy
  msgid "Domain"
  msgstr "nel dominio"
@@ -388,7 +368,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -397,7 +377,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
@@ -407,7 +387,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -420,11 +400,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -434,11 +415,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -466,7 +449,7 @@ msgstr "Dipartimento"
  msgid "Description"
  msgstr "Descrizione"
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -596,10 +579,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -757,9 +740,11 @@ msgid "Logout"
  msgstr "Termina sessione"
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -819,15 +804,15 @@ msgstr "Il file di configurazione di GOsa %s/gosa.conf non è legibile."
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, fuzzy
  msgid "Configuration error"
  msgstr "File di configurazione"
@@ -939,10 +924,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1104,14 +1089,14 @@ msgstr ""
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  #, fuzzy
  msgid "Permission"
  msgstr "Permessi"
  
  #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:571
  #: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  #, fuzzy
  msgid "Permission error"
@@ -1155,14 +1140,14 @@ msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1217,21 +1202,21 @@ msgstr ""
  msgid "Users"
  msgstr "Utenti"
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: plugins/admin/groups/class_groupManagement.inc:25
  #: setup/class_setupStep_Migrate.inc:1042
  msgid "Groups"
  msgstr "Gruppi di utenti"
  
  #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  #, fuzzy
@@ -1382,34 +1367,39 @@ msgstr "ACL"
  msgid "Close"
  msgstr "Scegli"
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  msgid "Go to root department"
  msgstr "Vai al dipartimento base"
  
  #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  msgid "Root"
  msgstr "Root"
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  msgid "Go up one department"
  msgstr "Sali di dipartimento"
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  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:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  msgid "Home"
  msgstr "Home"
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr ""
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr ""
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1427,7 +1417,7 @@ msgstr ""
  msgid "Choose a base"
  msgstr "Rimuovi"
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1436,61 +1426,61 @@ msgstr "Rimuovi"
  msgid "Select all"
  msgstr "Rimuovi"
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  #, fuzzy
  msgid "created by"
  msgstr "Creare"
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  #, fuzzy
  msgid "Copy"
  msgstr "Azienda"
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  #, fuzzy
  msgid "Cut"
  msgstr "Esegui"
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  #, fuzzy
  msgid "Paste"
  msgstr "Data"
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  #, fuzzy
  msgid "Cut this entry"
  msgstr "Modifica questo record"
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  #, fuzzy
  msgid "Copy this entry"
  msgstr "Modifica questo record"
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  #, fuzzy
  msgid "Restore snapshots"
  msgstr "Crea estensioni di posta"
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  #, fuzzy
  msgid "Export list"
  msgstr "Esporta"
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_listing.inc:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  #, fuzzy
  msgid "Create snapshot"
  msgstr "Crea estensioni di posta"
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 include/class_plugin.inc:2010
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "Gruppo di oggetti"
@@ -2277,6 +2267,8 @@ msgid "Missing %s PHP extension!"
  msgstr "Elimina foto"
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2665,12 +2657,12 @@ msgstr ""
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "Scarica il file di  configurazione"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  #, fuzzy
  msgid "Configuration"
  msgstr "File di configurazione"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2737,9 +2729,9 @@ msgid "Please fix the above error and reload the page."
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2754,23 +2746,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr "FAX"
  
@@ -2783,8 +2775,10 @@ msgid "FTP"
  msgstr "FTP"
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2792,9 +2786,10 @@ msgid "Group"
  msgstr "Gruppo"
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2814,6 +2809,7 @@ msgid "Application"
  msgstr "Applicazione"
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2825,6 +2821,7 @@ msgid "Thin Client"
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2836,6 +2833,7 @@ msgid "Object group"
  msgstr "Gruppo di oggetti"
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr "Stampante"
@@ -2880,6 +2878,135 @@ msgstr ""
  msgid "The GOsa team"
  msgstr "Il team di GOsa"
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Lingua preferita"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+#, fuzzy
+msgid "Terminal"
+msgstr "Terminali"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+#, fuzzy
+msgid "Show department"
+msgstr "Mostra dipartimenti"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+#, fuzzy
+msgid "Show users"
+msgstr "Mostra server"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+#, fuzzy
+msgid "Show groups"
+msgstr "Mostra gruppi samba"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+#, fuzzy
+msgid "Show server"
+msgstr "Mostra server"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+#, fuzzy
+msgid "Show workstation"
+msgstr "Mostra workstation"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+#, fuzzy
+msgid "Show terminal"
+msgstr "Mostra terminali"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+#, fuzzy
+msgid "Show printer"
+msgstr "Mostra stampanti"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+#, fuzzy
+msgid "Show phone"
+msgstr "Mostra telefoni"
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2887,7 +3014,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr "Gruppi di oggetti"
  
@@ -2908,223 +3035,111 @@ msgstr "Errore PHP"
  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"
-msgstr ""
-
  #: plugins/admin/ogroups/class_ogroupManagement.inc:190
  msgid "Windows Install"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:191
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#, fuzzy
-msgid "Terminal"
-msgstr "Terminali"
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: 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:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
+msgstr "nessuno"
  
-#: 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:393
+msgid "too many different objects!"
+msgstr ""
  
-#: 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:395
+msgid "users"
+msgstr "utenti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr "gruppi"
  
-#: plugins/admin/ogroups/class_ogroup.inc:432
-#: plugins/admin/ogroups/class_ogroup.inc:434
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
+msgstr "applicazioni"
+
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
+msgstr "dipartimenti"
+
+#: plugins/admin/ogroups/class_ogroup.inc:399
  msgid "servers"
  msgstr "server"
  
-#: plugins/admin/ogroups/class_ogroup.inc:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
+#: plugins/admin/ogroups/class_ogroup.inc:400
  msgid "workstations"
  msgstr ""
  
-#: 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:444
+#: plugins/admin/ogroups/class_ogroup.inc:401
  #, fuzzy
-msgid "printer"
-msgstr "stampanti"
+msgid "winstations"
+msgstr "Amministrazione"
  
-#: plugins/admin/ogroups/class_ogroup.inc:446
-#: plugins/admin/ogroups/class_ogroup.inc:486
-msgid "printers"
-msgstr "stampanti"
+#: plugins/admin/ogroups/class_ogroup.inc:402
+msgid "terminals"
+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:403
  msgid "phones"
  msgstr "telefoni"
  
-#: 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: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:475
-msgid "too many different objects!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:477
-msgid "users"
-msgstr "utenti"
-
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#, fuzzy
-msgid "winstations"
-msgstr "Amministrazione"
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
+msgstr "stampanti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr "disabilitato"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr "accesso completo"
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: 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:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  msgid "Non existing dn:"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
  "added:"
  msgstr ""
  
-#: 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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  msgid "You can combine two different object types at maximum, only!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  #, fuzzy
  msgid "Object group generic"
  msgstr "Gruppo di oggetti"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  #, fuzzy
  msgid "Sytem trust"
  msgstr "Accesso ai sistemi"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  #, fuzzy
  msgid "Member"
  msgstr "Membri"
@@ -3163,7 +3178,7 @@ msgid "Select a base"
  msgstr "Rimuovi"
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr "Accesso ai sistemi"
@@ -3203,8 +3218,8 @@ msgid "FAI summary"
  msgstr ""
  
  #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3333,7 +3348,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3378,37 +3392,8 @@ msgid ""
  "do this since there is no way for GOsa to get your data back."
  msgstr ""
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Selezioni utenti da aggiungere"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr "Mostra utenti del dipartimento"
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr "Mostra utenti che corrispondono a"
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3423,25 +3408,6 @@ msgstr "Nome"
  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
@@ -3501,68 +3467,84 @@ msgstr "Gruppo primario"
  msgid "Not in all groups"
  msgstr "Mostra gruppi di posta"
  
+#: 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/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Mostra gruppi samba"
+
+#: 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/class_groupGeneric.inc:161
  msgid "Cannot find group SID in your configuration!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr "Gruppo Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr "Amministratori di Dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr "Utenti di Dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr "Ospiti di Dominio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr "Gruppo speciale (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, php-format
  msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, php-format
  msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  msgid "! unknown UID"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, php-format
  msgid "Search returned too many results. Not displaying more than %s entries!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, fuzzy, php-format
  msgid "Cannot find any SID for '%s'!"
  msgstr "Rimuovi"
  
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy, php-format
  msgid "Cannot find any RIDBASE for '%s'!"
  msgstr "Rimuovi"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, php-format
  msgid "The gidNumber '%s' is already in use by %s!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3570,32 +3552,32 @@ msgstr ""
  msgid "GID"
  msgstr "GID"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  #, fuzzy
  msgid "Generic group settings"
  msgstr "Impostazioni generali delle code"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  #, fuzzy
  msgid "Samba group type"
  msgstr "Gruppo Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Home di Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  #, fuzzy
  msgid "Phone pickup group"
  msgstr "I membri sono in un gruppo di risposta telefonica"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  #, fuzzy
  msgid "Nagios group"
  msgstr "Contatto"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  #, fuzzy
  msgid "Group member"
  msgstr "Membri del gruppo"
@@ -3606,7 +3588,6 @@ 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"
  
@@ -3624,53 +3605,53 @@ msgstr "server"
  msgid "Group administration"
  msgstr "Amministrazione dei gruppi di utenti"
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  #, fuzzy
  msgid "Posix"
  msgstr "Proxy"
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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:747
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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:751
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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:767
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
  #, fuzzy
  msgid "Edit phone properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  #, fuzzy
  msgid "Menu"
  msgstr "Stampante"
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
  #, fuzzy
  msgid "Edit environment properties"
@@ -3727,7 +3708,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3755,34 +3736,34 @@ msgstr "Utenti di Dominio"
  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:650
+#: plugins/admin/users/class_userManagement.inc:654
  #, fuzzy
  msgid "Account locking"
  msgstr "Sicurezza"
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
  "locked!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
  #, fuzzy
  msgid "Unlock account"
  msgstr "Identità"
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  #, fuzzy
  msgid "Lock account"
  msgstr "Identità"
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  #, fuzzy
  msgid "Edit generic properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3790,21 +3771,21 @@ msgstr "Modifica proprietà"
  msgid "POSIX"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:747
  #, fuzzy
  msgid "Edit POSIX properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  #, fuzzy
  msgid "Edit netatalk properties"
  msgstr "Modifica proprietà"
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  #, fuzzy
  msgid "Edit FAX properties"
  msgstr "Modifica proprietà"
@@ -4052,7 +4033,7 @@ msgstr ""
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  #, fuzzy
@@ -4070,7 +4051,7 @@ msgstr "Dipartimenti"
  msgid "Manage Departments"
  msgstr "Dipartimenti"
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  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 "
@@ -4959,11 +4940,6 @@ 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"
@@ -6824,6 +6800,31 @@ msgstr "Lingua preferita"
  msgid "Automatic"
  msgstr "automatico"
  
+#, fuzzy
+#~ msgid "Show %s"
+#~ msgstr "Mostra gruppi"
+
+#, fuzzy
+#~ msgid "people"
+#~ msgstr "Mostra persone"
+
+#, fuzzy
+#~ msgid "printer"
+#~ msgstr "stampanti"
+
+#~ msgid "Select users to add"
+#~ msgstr "Selezioni utenti da aggiungere"
+
+#~ msgid "Display users of department"
+#~ msgstr "Mostra utenti del dipartimento"
+
+#~ msgid "Display users matching"
+#~ msgstr "Mostra utenti che corrispondono a"
+
+#, fuzzy
+#~ msgid "List of systems"
+#~ msgstr "Lista degli utenti"
+
  #, fuzzy
  #~ msgid "givenname"
  #~ msgstr "Nome"
@@ -7615,18 +7616,12 @@ msgstr "automatico"
  #~ msgid "Select to see groups that have mail settings"
  #~ msgstr "Seleziona per mostrare i gruppi che hanno configurata la posta"
  
-#~ msgid "Show departments"
-#~ msgstr "Mostra dipartimenti"
-
  #~ msgid "Select to see applications"
  #~ msgstr "Seleziona per mostrare le applicazioni"
  
  #~ msgid "Show applications"
  #~ msgstr "Mostra applicazioni"
  
-#~ msgid "Show printers"
-#~ msgstr "Mostra stampanti"
-
  #, fuzzy
  #~ msgid "Cannot connect to logging server '%s'."
  #~ msgstr "Impossibile connettersi al server del database!"
diff --git a/gosa-core/locale/core/messages.po b/gosa-core/locale/core/messages.po

index 677ca92cfa91ab2ccde14a656e6294ab781eab30..a4074dfbd5df591005408d93728b110fa988d90a 100644 (file)
--- a/gosa-core/locale/core/messages.po
+++ b/gosa-core/locale/core/messages.po
@@ -8,7 +8,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: PACKAGE VERSION\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+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"
@@ -18,12 +18,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -49,39 +51,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr ""
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -95,7 +75,7 @@ msgstr ""
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -356,7 +336,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  msgid "Domain"
  msgstr ""
  
@@ -369,7 +349,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -378,7 +358,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  msgid "Locality"
@@ -387,7 +367,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -400,11 +380,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -414,11 +395,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -446,7 +429,7 @@ msgstr ""
  msgid "Description"
  msgstr ""
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -573,10 +556,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -727,9 +710,11 @@ msgid "Logout"
  msgstr ""
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -786,15 +771,15 @@ msgstr ""
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  msgid "Configuration error"
  msgstr ""
  
@@ -901,10 +886,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1056,13 +1041,13 @@ msgstr ""
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  msgid "Permission"
  msgstr ""
  
  #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:571
  #: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  msgid "Permission error"
  msgstr ""
@@ -1105,14 +1090,14 @@ msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1162,21 +1147,21 @@ msgstr ""
  msgid "Users"
  msgstr ""
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: plugins/admin/groups/class_groupManagement.inc:25
  #: setup/class_setupStep_Migrate.inc:1042
  msgid "Groups"
  msgstr ""
  
  #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  msgid "Down"
@@ -1312,34 +1297,39 @@ msgstr ""
  msgid "Close"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  msgid "Go to root department"
  msgstr ""
  
  #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  msgid "Root"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  msgid "Go up one department"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  msgid "Go to users department"
  msgstr ""
  
  #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  msgid "Home"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr ""
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr ""
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1354,7 +1344,7 @@ msgstr ""
  msgid "Choose a base"
  msgstr ""
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1362,52 +1352,52 @@ msgstr ""
  msgid "Select all"
  msgstr ""
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  msgid "created by"
  msgstr ""
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  msgid "Copy"
  msgstr ""
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  msgid "Cut"
  msgstr ""
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  msgid "Paste"
  msgstr ""
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  msgid "Cut this entry"
  msgstr ""
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  msgid "Copy this entry"
  msgstr ""
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  msgid "Restore snapshots"
  msgstr ""
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  msgid "Export list"
  msgstr ""
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_listing.inc:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  msgid "Create snapshot"
  msgstr ""
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 include/class_plugin.inc:2010
  msgid "Create a new snapshot from this object"
  msgstr ""
  
@@ -2146,6 +2136,8 @@ msgid "Missing %s PHP extension!"
  msgstr ""
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2513,11 +2505,11 @@ msgstr ""
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr ""
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid "Configuration"
  msgstr ""
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2582,9 +2574,9 @@ msgid "Please fix the above error and reload the page."
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2599,23 +2591,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr ""
  
@@ -2628,8 +2620,10 @@ msgid "FTP"
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2637,9 +2631,10 @@ msgid "Group"
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2659,6 +2654,7 @@ msgid "Application"
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2670,6 +2666,7 @@ msgid "Thin Client"
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2681,6 +2678,7 @@ msgid "Object group"
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr ""
@@ -2719,6 +2717,125 @@ msgstr ""
  msgid "The GOsa team"
  msgstr ""
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+msgid "Please select the desired entries"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+msgid "Terminal"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+msgid "Show department"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+msgid "Show users"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+msgid "Show groups"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+msgid "Show server"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+msgid "Show workstation"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+msgid "Show terminal"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+msgid "Show printer"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+msgid "Show phone"
+msgstr ""
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2726,7 +2843,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr ""
  
@@ -2744,217 +2861,108 @@ msgstr ""
  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"
-msgstr ""
-
  #: plugins/admin/ogroups/class_ogroupManagement.inc:190
  msgid "Windows Install"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:191
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-msgid "Terminal"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:420
-#: plugins/admin/ogroups/class_ogroup.inc:422
-#: plugins/admin/ogroups/class_ogroup.inc:480
-msgid "departments"
+#: plugins/admin/ogroups/class_ogroup.inc:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
  msgstr ""
  
-#: 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"
+#: plugins/admin/ogroups/class_ogroup.inc:393
+msgid "too many different objects!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:424
-#: plugins/admin/ogroups/class_ogroup.inc:426
-msgid "people"
+#: plugins/admin/ogroups/class_ogroup.inc:395
+msgid "users"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr ""
  
-#: 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:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
-msgid "workstations"
-msgstr ""
-
-#: 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:444
-msgid "printer"
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:446
-#: plugins/admin/ogroups/class_ogroup.inc:486
-msgid "printers"
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:448
-#: plugins/admin/ogroups/class_ogroup.inc:450
-#: plugins/admin/ogroups/class_ogroup.inc:485
-msgid "phones"
+#: plugins/admin/ogroups/class_ogroup.inc:399
+msgid "servers"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:456
-#: plugins/admin/ogroups/class_ogroup.inc:458
-#: plugins/admin/ogroups/class_ogroup.inc:479
-msgid "applications"
+#: plugins/admin/ogroups/class_ogroup.inc:400
+msgid "workstations"
  msgstr ""
  
-#: 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"
+#: plugins/admin/ogroups/class_ogroup.inc:401
+msgid "winstations"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:475
-msgid "too many different objects!"
+#: plugins/admin/ogroups/class_ogroup.inc:402
+msgid "terminals"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:477
-msgid "users"
+#: plugins/admin/ogroups/class_ogroup.inc:403
+msgid "phones"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:483
-msgid "winstations"
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: plugins/personal/posix/class_posixAccount.inc:574
  msgid "allow access to these hosts"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  msgid "Non existing dn:"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
  "added:"
  msgstr ""
  
-#: 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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  msgid "You can combine two different object types at maximum, only!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  msgid "Object group generic"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  msgid "Sytem trust"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  msgid "Member"
  msgstr ""
  
@@ -2991,7 +2999,7 @@ msgid "Select a base"
  msgstr ""
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr ""
@@ -3029,8 +3037,8 @@ msgid "FAI summary"
  msgstr ""
  
  #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3144,7 +3152,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3189,36 +3196,8 @@ msgid ""
  "do this since there is no way for GOsa to get your data back."
  msgstr ""
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3233,24 +3212,6 @@ msgstr ""
  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
@@ -3305,68 +3266,83 @@ msgstr ""
  msgid "Not in all groups"
  msgstr ""
  
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr ""
+
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr ""
+
+#: plugins/admin/groups/group-filter.tpl:13
+#: plugins/personal/posix/groupSelect/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:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, php-format
  msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, php-format
  msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  msgid "! unknown UID"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, php-format
  msgid "Search returned too many results. Not displaying more than %s entries!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, php-format
  msgid "Cannot find any SID for '%s'!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, php-format
  msgid "Cannot find any RIDBASE for '%s'!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, php-format
  msgid "The gidNumber '%s' is already in use by %s!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3374,27 +3350,27 @@ msgstr ""
  msgid "GID"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  msgid "Generic group settings"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  msgid "Samba group type"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  msgid "Samba domain name"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  msgid "Phone pickup group"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  msgid "Nagios group"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  msgid "Group member"
  msgstr ""
  
@@ -3403,7 +3379,6 @@ msgid "Group settings"
  msgstr ""
  
  #: plugins/admin/groups/group-list.xml:11
-#: plugins/personal/posix/groupSelect/group-list.xml:11
  msgid "List of groups"
  msgstr ""
  
@@ -3419,46 +3394,46 @@ msgstr ""
  msgid "Group administration"
  msgstr ""
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  msgid "Posix"
  msgstr ""
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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:747
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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:751
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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:767
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
  msgid "Edit phone properties"
  msgstr ""
  
-#: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  msgid "Menu"
  msgstr ""
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
  msgid "Edit environment properties"
  msgstr ""
@@ -3511,7 +3486,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3535,30 +3510,30 @@ msgstr ""
  msgid "You have no permission to change this users password!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:654
  msgid "Account locking"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
  "locked!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
  msgid "Unlock account"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  msgid "Lock account"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  msgid "Edit generic properties"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3566,19 +3541,19 @@ msgstr ""
  msgid "POSIX"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:747
  msgid "Edit POSIX properties"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  msgid "Edit netatalk properties"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  msgid "Edit FAX properties"
  msgstr ""
  
@@ -3811,7 +3786,7 @@ msgstr ""
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  msgid "Domain Component"
@@ -3827,7 +3802,7 @@ msgstr ""
  msgid "Manage Departments"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  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 "
@@ -4651,10 +4626,6 @@ 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 ""
diff --git a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po

index 32657a700f433832ee8c3fcd76b0726470e0c6f1..7766553c04f4c9afaf1bcf8ab8f7829839f1092f 100644 (file)
--- a/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/nl/LC_MESSAGES/messages.po
@@ -11,7 +11,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+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"
@@ -21,12 +21,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -52,39 +54,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr "Informatie"
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -98,7 +78,7 @@ msgstr "Filters"
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -388,7 +368,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  #, fuzzy
  msgid "Domain"
  msgstr "in domein"
@@ -403,7 +383,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -412,7 +392,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
@@ -422,7 +402,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -435,11 +415,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -449,11 +430,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -481,7 +464,7 @@ msgstr "Afdeling"
  msgid "Description"
  msgstr "Omschrijving"
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -614,10 +597,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -791,9 +774,11 @@ msgid "Logout"
  msgstr "Uitloggen"
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -854,15 +839,15 @@ msgstr "GOsa configuratie %s/gosa.conf is niet leesbaar. Geannuleerd."
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, fuzzy
  msgid "Configuration error"
  msgstr "Configuratie bestand"
@@ -977,10 +962,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1151,14 +1136,14 @@ msgstr ""
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  #, fuzzy
  msgid "Permission"
  msgstr "Rechten"
  
  #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:571
  #: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  #, fuzzy
  msgid "Permission error"
@@ -1202,14 +1187,14 @@ msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1265,21 +1250,21 @@ msgstr ""
  msgid "Users"
  msgstr "Gebruikers"
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: plugins/admin/groups/class_groupManagement.inc:25
  #: setup/class_setupStep_Migrate.inc:1042
  msgid "Groups"
  msgstr "Groepen"
  
  #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  msgid "Down"
@@ -1428,34 +1413,39 @@ msgstr "Rechten"
  msgid "Close"
  msgstr "Sluiten"
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  msgid "Go to root department"
  msgstr "Ga naar basis afdelingen"
  
  #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  msgid "Root"
  msgstr "Basis"
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  msgid "Go up one department"
  msgstr "Ga een afdeling omhoog"
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  msgid "Go to users department"
  msgstr "Ga naar gebruikers afdeling"
  
  #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  msgid "Home"
  msgstr "Home"
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr "Lijst herladen"
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr "Verwerk"
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1472,7 +1462,7 @@ msgstr "Gebruikersnaam / UID is niet uniek. Controleer uw LDAP database a.u.b."
  msgid "Choose a base"
  msgstr "Selecteer een basis"
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1481,58 +1471,58 @@ msgstr "Selecteer een basis"
  msgid "Select all"
  msgstr "Selecteer"
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  #, fuzzy
  msgid "created by"
  msgstr "Aanmaken"
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  #, fuzzy
  msgid "Copy"
  msgstr "kopieer"
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  #, fuzzy
  msgid "Cut"
  msgstr "knippen"
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  msgid "Paste"
  msgstr "Plakken"
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  msgid "Cut this entry"
  msgstr "Deze invoer knippen"
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  msgid "Copy this entry"
  msgstr "Deze invoer kopieren"
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  #, fuzzy
  msgid "Restore snapshots"
  msgstr "Nagios account aanmaken"
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  #, fuzzy
  msgid "Export list"
  msgstr "Exporteer"
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_listing.inc:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  #, fuzzy
  msgid "Create snapshot"
  msgstr "Nagios account aanmaken"
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 include/class_plugin.inc:2010
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "Nieuw FAI object aanmaken"
@@ -2339,6 +2329,8 @@ msgid "Missing %s PHP extension!"
  msgstr "Verwijder printer mogelijkheden"
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2737,12 +2729,12 @@ msgstr ""
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "SID en/of RIDBASE ontbreken in uw configuratie!"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  #, fuzzy
  msgid "Configuration"
  msgstr "Configuratie bestand"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2808,9 +2800,9 @@ msgid "Please fix the above error and reload the page."
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2825,23 +2817,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr "Fax"
  
@@ -2854,8 +2846,10 @@ msgid "FTP"
  msgstr "Ftp"
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2863,9 +2857,10 @@ msgid "Group"
  msgstr "Groep"
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2885,6 +2880,7 @@ msgid "Application"
  msgstr "Programma"
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2896,6 +2892,7 @@ msgid "Thin Client"
  msgstr "Thin Client"
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2907,6 +2904,7 @@ msgid "Object group"
  msgstr "Objectgroep"
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr "Printer"
@@ -2951,6 +2949,134 @@ msgstr ""
  msgid "The GOsa team"
  msgstr "Het GOsa team"
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Voorkeurstaal"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
+msgstr "Gebruiker"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+#, fuzzy
+msgid "Show department"
+msgstr "Toon afdelingen"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+#, fuzzy
+msgid "Show users"
+msgstr "Toon servers"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+#, fuzzy
+msgid "Show groups"
+msgstr "Toon Samba groepen"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+#, fuzzy
+msgid "Show server"
+msgstr "Toon servers"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+#, fuzzy
+msgid "Show workstation"
+msgstr "Toon werkstations"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+#, fuzzy
+msgid "Show terminal"
+msgstr "Toon terminals"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+#, fuzzy
+msgid "Show printer"
+msgstr "Toon printers"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+#, fuzzy
+msgid "Show phone"
+msgstr "Toon pakketten"
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2960,7 +3086,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:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr "Objectgroepen"
  
@@ -2981,224 +3107,113 @@ msgstr "PHP fout"
  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"
-msgstr "Gebruiker"
-
  #: plugins/admin/ogroups/class_ogroupManagement.inc:190
  #, fuzzy
  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"
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: 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:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
+msgstr "geen"
  
-#: 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:393
+msgid "too many different objects!"
+msgstr "te veel verschillende object tpyes!"
  
-#: 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:395
+msgid "users"
+msgstr "gebruikers"
  
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr "groepen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:432
-#: plugins/admin/ogroups/class_ogroup.inc:434
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
+msgstr "programma's"
+
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
+msgstr "afdelingen"
+
+#: plugins/admin/ogroups/class_ogroup.inc:399
  msgid "servers"
  msgstr "servers"
  
-#: plugins/admin/ogroups/class_ogroup.inc:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
+#: plugins/admin/ogroups/class_ogroup.inc:400
  msgid "workstations"
  msgstr "werkstations"
  
-#: 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:444
+#: plugins/admin/ogroups/class_ogroup.inc:401
  #, fuzzy
-msgid "printer"
-msgstr "printers"
+msgid "winstations"
+msgstr "Windows werkstation"
  
-#: plugins/admin/ogroups/class_ogroup.inc:446
-#: plugins/admin/ogroups/class_ogroup.inc:486
-msgid "printers"
-msgstr "printers"
+#: plugins/admin/ogroups/class_ogroup.inc:402
+msgid "terminals"
+msgstr "terminals"
  
-#: 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:403
  msgid "phones"
  msgstr "telefoons"
  
-#: 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: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:475
-msgid "too many different objects!"
-msgstr "te veel verschillende object tpyes!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:477
-msgid "users"
-msgstr "gebruikers"
-
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#, fuzzy
-msgid "winstations"
-msgstr "Windows werkstation"
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
+msgstr "printers"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr "gedeactiveerd"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr "volledige toegang"
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: 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:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  msgid "Non existing dn:"
  msgstr "Niet bestaande dn: "
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
  "added:"
  msgstr ""
  
-#: 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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  #, 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:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  #, fuzzy
  msgid "Object group generic"
  msgstr "Objectgroep"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  #, fuzzy
  msgid "Sytem trust"
  msgstr "Systeem vertrouwen"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  #, fuzzy
  msgid "Member"
  msgstr "Groepsleden"
@@ -3236,7 +3251,7 @@ msgid "Select a base"
  msgstr "Selecteer een basis"
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr "Systeem vertrouwen"
@@ -3275,8 +3290,8 @@ msgid "FAI summary"
  msgstr "FAI samenvatting"
  
  #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3404,7 +3419,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3451,37 +3465,8 @@ msgstr ""
  "Dit kan een primaire groep zijn. Verzeker uzelf ervan dat dit is wat u wilt, "
  "aangezien er geen mogelijkheid voor GOsa is om deze gegevens terug te halen."
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Selecteer de toe te voegen gebruikers"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr "Selecteer om servers te zien"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr "Zoek binnen subtree"
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr "Toon gebruikers van afdeling"
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr "Toon overeenkomende gebruikers"
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3496,25 +3481,6 @@ msgstr "Naam"
  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
@@ -3573,6 +3539,22 @@ msgstr "Primaire groep"
  msgid "Not in all groups"
  msgstr "Toon E-mail groepen"
  
+#: 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/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Toon Samba groepen"
+
+#: 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/class_groupGeneric.inc:161
  #, fuzzy
  msgid "Cannot find group SID in your configuration!"
@@ -3580,65 +3562,65 @@ msgstr ""
  "Kan de SID van deze groep niet vinden in de LDAP database of in uw "
  "configuratie bestand."
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr "Samba groep"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr "Windows beheerders"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr "Windows gebruikers"
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr "Windows gasten"
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr "Speciale groep (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, php-format
  msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, php-format
  msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  #, fuzzy
  msgid "! unknown UID"
  msgstr "! onbekend id"
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, php-format
  msgid "Search returned too many results. Not displaying more than %s entries!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, fuzzy, php-format
  msgid "Cannot find any SID for '%s'!"
  msgstr "Kan bestand '%s' niet aanmaken."
  
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy, php-format
  msgid "Cannot find any RIDBASE for '%s'!"
  msgstr "Kan bestand '%s' niet aanmaken."
  
-#: plugins/admin/groups/class_groupGeneric.inc:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, php-format
  msgid "The gidNumber '%s' is already in use by %s!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3646,32 +3628,32 @@ msgstr ""
  msgid "GID"
  msgstr "GID"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  #, fuzzy
  msgid "Generic group settings"
  msgstr "Algemene wachtrij instellingen"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  #, fuzzy
  msgid "Samba group type"
  msgstr "Samba groep"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Samba home"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  #, fuzzy
  msgid "Phone pickup group"
  msgstr "Leden zitten in een telefoon beantwoordgroep"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  #, fuzzy
  msgid "Nagios group"
  msgstr "Nagios account"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  #, fuzzy
  msgid "Group member"
  msgstr "Groepsleden"
@@ -3681,7 +3663,6 @@ 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"
  
@@ -3699,49 +3680,49 @@ msgstr "servers"
  msgid "Group administration"
  msgstr "Groepen beheer"
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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:747
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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:751
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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:767
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
  msgid "Edit phone properties"
  msgstr "Bewerk telefoon eigenschappen"
  
-#: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  #, fuzzy
  msgid "Menu"
  msgstr "Printer"
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
  msgid "Edit environment properties"
  msgstr "Bewerk omgeving eigenschappen"
@@ -3806,7 +3787,7 @@ msgstr ""
  "gebruik van sjablonen over te slaan."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3832,33 +3813,33 @@ msgstr "Windows gebruikers"
  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:650
+#: plugins/admin/users/class_userManagement.inc:654
  #, fuzzy
  msgid "Account locking"
  msgstr "Account"
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
  "locked!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
  #, fuzzy
  msgid "Unlock account"
  msgstr "Mijn account"
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  #, fuzzy
  msgid "Lock account"
  msgstr "Mijn account"
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  msgid "Edit generic properties"
  msgstr "Bewerk algemene eigenschappen"
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3866,20 +3847,20 @@ msgstr "Bewerk algemene eigenschappen"
  msgid "POSIX"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:747
  #, fuzzy
  msgid "Edit POSIX properties"
  msgstr "Bewerk UNIX eigenschappen"
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr "Netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  msgid "Edit netatalk properties"
  msgstr "Bewerk Netatalk eigenschappen"
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  #, fuzzy
  msgid "Edit FAX properties"
  msgstr "Bewerk UNIX eigenschappen"
@@ -4133,7 +4114,7 @@ msgstr "Basis Fax nummer van deze subtree"
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  #, fuzzy
@@ -4151,7 +4132,7 @@ msgstr "Afdelingen"
  msgid "Manage Departments"
  msgstr "Afdelingen"
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  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 "
@@ -5045,11 +5026,6 @@ 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"
@@ -6938,6 +6914,40 @@ msgstr ""
  msgid "Automatic"
  msgstr "automatisch"
  
+#, fuzzy
+#~ msgid "Show %s"
+#~ msgstr "Toon groepen"
+
+#, fuzzy
+#~ msgid "people"
+#~ msgstr "Toon personen"
+
+#, fuzzy
+#~ msgid "printer"
+#~ msgstr "printers"
+
+#~ msgid "Select users to add"
+#~ msgstr "Selecteer de toe te voegen gebruikers"
+
+#~ msgid "Select to see servers"
+#~ msgstr "Selecteer om servers te zien"
+
+#~ msgid "Search within subtree"
+#~ msgstr "Zoek binnen subtree"
+
+#~ msgid "Display users of department"
+#~ msgstr "Toon gebruikers van afdeling"
+
+#~ msgid "Display users matching"
+#~ msgstr "Toon overeenkomende gebruikers"
+
+#~ msgid "Regular expression for matching user names"
+#~ msgstr "Reguliere expressie voor overeenkomende gebruikersnamen"
+
+#, fuzzy
+#~ msgid "List of systems"
+#~ msgstr "Lijst met gebruikers"
+
  #, fuzzy
  #~ msgid "givenname"
  #~ msgstr "Naam"
@@ -7848,9 +7858,6 @@ msgstr "automatisch"
  #~ msgid "Select to see departments"
  #~ msgstr "Selecteer om afdelingen te zien"
  
-#~ msgid "Show departments"
-#~ msgstr "Toon afdelingen"
-
  #~ msgid "Select to see GOsa accounts"
  #~ msgstr "Selecteer om GOsa accounts te zien"
  
@@ -7872,9 +7879,6 @@ msgstr "automatisch"
  #~ msgid "Select to see printers"
  #~ msgstr "Selecteer om printers te zien"
  
-#~ msgid "Show printers"
-#~ msgstr "Toon printers"
-
  #~ msgid "Select to see phones"
  #~ msgstr "Selecteer om telefoons te zien"
  
diff --git a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po

index 334b76b09fb3b3689569c3bf726d433df8c9f953..75bba2d429555cf4c509b854502fd6ff0264ac7f 100644 (file)
--- a/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/pl/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: polski\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+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"
@@ -16,12 +16,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -47,39 +49,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr "Informacja"
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -93,7 +73,7 @@ msgstr "Filtry"
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -375,7 +355,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  #, fuzzy
  msgid "Domain"
  msgstr "w domenie"
@@ -390,7 +370,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -399,7 +379,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
@@ -409,7 +389,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -422,11 +402,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -436,11 +417,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -468,7 +451,7 @@ msgstr "Departament"
  msgid "Description"
  msgstr "Opis"
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -600,10 +583,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -768,9 +751,11 @@ msgid "Logout"
  msgstr "Wyloguj"
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -828,15 +813,15 @@ msgstr "Nie można czytać pliku konfiguracji %s/gosa.conf. Kończę."
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  msgid "Configuration error"
  msgstr "Błąd konfiguracji"
  
@@ -944,10 +929,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1111,13 +1096,13 @@ msgstr ""
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  msgid "Permission"
  msgstr "Uprawnienie"
  
  #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:571
  #: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  #, fuzzy
  msgid "Permission error"
@@ -1161,7 +1146,7 @@ msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, fuzzy, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1170,7 +1155,7 @@ msgstr ""
  "Funkcjonalność snapshot jest włączona, lecz wymagana zmienna '%s' nie jest "
  "skonfigurowana w gosa.conf."
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, fuzzy, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1223,21 +1208,21 @@ msgstr "Użyj ACL zdefiniowanego w tej roli"
  msgid "Users"
  msgstr "Użytkownicy"
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: plugins/admin/groups/class_groupManagement.inc:25
  #: setup/class_setupStep_Migrate.inc:1042
  msgid "Groups"
  msgstr "Grupy"
  
  #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  msgid "Down"
@@ -1382,34 +1367,39 @@ msgstr "ACLe"
  msgid "Close"
  msgstr "Zamknij"
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  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:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  msgid "Root"
  msgstr "Główny"
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  msgid "Go up one department"
  msgstr "Idź jeden departament wyżej"
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  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:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  msgid "Home"
  msgstr "Katalog domowy"
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr "Przeładuj listę"
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr "Wyślij"
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1426,7 +1416,7 @@ msgstr "Użytkownik /UID nie są unikalne. Proszę sprawdzić bazę LDAP."
  msgid "Choose a base"
  msgstr "Wybierz bazę"
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1434,54 +1424,54 @@ msgstr "Wybierz bazę"
  msgid "Select all"
  msgstr "Wybierz wszystko"
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  msgid "created by"
  msgstr "utworzone przez"
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  msgid "Copy"
  msgstr "Kopiuj"
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  msgid "Cut"
  msgstr "Wytnij"
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  msgid "Paste"
  msgstr "Wklej"
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  msgid "Cut this entry"
  msgstr "Wytnij ten obiekt"
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  msgid "Copy this entry"
  msgstr "Kopiuj ten obiekt"
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  #, fuzzy
  msgid "Restore snapshots"
  msgstr "Odtwórz snapshot"
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  #, fuzzy
  msgid "Export list"
  msgstr "Export"
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
  msgid "Restore snapshot"
  msgstr "Odtwórz snapshot"
  
-#: include/class_listing.inc:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  msgid "Create snapshot"
  msgstr "Utwórz spanshot"
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 include/class_plugin.inc:2010
  msgid "Create a new snapshot from this object"
  msgstr "Utwórz nowy snapshot z tego obiektu"
  
@@ -2264,6 +2254,8 @@ msgid "Missing %s PHP extension!"
  msgstr "Rozszerzenie inwentarza"
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2652,11 +2644,11 @@ msgstr ""
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "Brak parametru SID lub/i RIDBASE w konfiguracji!"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid "Configuration"
  msgstr "Konfiguracja"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2721,9 +2713,9 @@ msgid "Please fix the above error and reload the page."
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2738,23 +2730,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr "FAX"
  
@@ -2767,8 +2759,10 @@ msgid "FTP"
  msgstr "FTP"
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2776,9 +2770,10 @@ msgid "Group"
  msgstr "Grupa"
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2798,6 +2793,7 @@ msgid "Application"
  msgstr "Aplikacja"
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2809,6 +2805,7 @@ msgid "Thin Client"
  msgstr "Cienki klient"
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2820,6 +2817,7 @@ msgid "Object group"
  msgstr "Grupa obiektu"
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr "Drukarka"
@@ -2863,6 +2861,134 @@ msgstr ""
  msgid "The GOsa team"
  msgstr "Zespół GOsa"
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Preferowany język"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+msgid "Terminal"
+msgstr "Terminal"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
+msgstr "Użytkownik"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+#, fuzzy
+msgid "Show department"
+msgstr "Pokaż departamenty"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+#, fuzzy
+msgid "Show users"
+msgstr "Pokaż serwery"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+#, fuzzy
+msgid "Show groups"
+msgstr "Pokaż grupy samba"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+#, fuzzy
+msgid "Show server"
+msgstr "Pokaż serwery"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+#, fuzzy
+msgid "Show workstation"
+msgstr "Pokaż stacje robocze"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+#, fuzzy
+msgid "Show terminal"
+msgstr "Pokaż terminale"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+#, fuzzy
+msgid "Show printer"
+msgstr "Pokaż drukarki"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+#, fuzzy
+msgid "Show phone"
+msgstr "Pokaż pakiety"
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2870,7 +2996,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:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr "Grupy obiektów"
  
@@ -2890,220 +3016,111 @@ msgstr "błąd PHP:"
  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"
-msgstr "Użytkownik"
-
  #: plugins/admin/ogroups/class_ogroupManagement.inc:190
  #, fuzzy
  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"
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: 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:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
+msgstr "żaden"
  
-#: 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:393
+msgid "too many different objects!"
+msgstr "za dużo różnych obiektów!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:424
-#: plugins/admin/ogroups/class_ogroup.inc:426
-msgid "people"
-msgstr "ludzie"
+#: plugins/admin/ogroups/class_ogroup.inc:395
+msgid "users"
+msgstr "użytkownicy"
  
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr "grupy"
  
-#: plugins/admin/ogroups/class_ogroup.inc:432
-#: plugins/admin/ogroups/class_ogroup.inc:434
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
+msgstr "aplikacje"
+
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
+msgstr "departamenty"
+
+#: plugins/admin/ogroups/class_ogroup.inc:399
  msgid "servers"
  msgstr "serwery"
  
-#: plugins/admin/ogroups/class_ogroup.inc:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
+#: plugins/admin/ogroups/class_ogroup.inc:400
  msgid "workstations"
  msgstr "stacje robocze"
  
-#: plugins/admin/ogroups/class_ogroup.inc:440
-#: plugins/admin/ogroups/class_ogroup.inc:442
-#: plugins/admin/ogroups/class_ogroup.inc:484
+#: plugins/admin/ogroups/class_ogroup.inc:401
+msgid "winstations"
+msgstr "Stacje Windows"
+
+#: plugins/admin/ogroups/class_ogroup.inc:402
  msgid "terminals"
  msgstr "terminale"
  
-#: plugins/admin/ogroups/class_ogroup.inc:444
-msgid "printer"
-msgstr "drukarka"
-
-#: 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:403
  msgid "phones"
  msgstr "telefony"
  
-#: 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: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:475
-msgid "too many different objects!"
-msgstr "za dużo różnych obiektów!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:477
-msgid "users"
-msgstr "użytkownicy"
-
-#: plugins/admin/ogroups/class_ogroup.inc:483
-msgid "winstations"
-msgstr "Stacje Windows"
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
+msgstr "drukarki"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr "wyłączone"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr "pełen dostęp"
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: 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:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  msgid "Non existing dn:"
  msgstr "Nieistniejące dn:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
  "added:"
  msgstr ""
  
-#: 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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  #, 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:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  msgid "Object group generic"
  msgstr "Podstawowa grupa obiektu"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  #, fuzzy
  msgid "Sytem trust"
  msgstr "Zaufanie systemowe"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  msgid "Member"
  msgstr "Członek"
  
@@ -3140,7 +3157,7 @@ msgid "Select a base"
  msgstr "Wybierz bazę"
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr "Zaufanie systemowe"
@@ -3178,8 +3195,8 @@ msgid "FAI summary"
  msgstr "Podsumowanie FAI"
  
  #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3306,7 +3323,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3353,37 +3369,8 @@ msgstr ""
  "To może być podstawowa grupa użytkownika. Proszę upewnić się czy aby na "
  "pewno kontynuować, gdyż tej operacji nie można cofnąć."
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Wybierz użytkowników do dodania"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr "Proszę aby zobaczyć serwery"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr "Szukaj wewnątrz tego poddrzewa"
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr "Wyświetl użytkowników departamentu"
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr "Wyświetl użytkowników pasujących"
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3398,25 +3385,6 @@ msgstr "Imię"
  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
@@ -3471,71 +3439,87 @@ msgstr "We wszystkich grupach"
  msgid "Not in all groups"
  msgstr "Nie we wszystkich grupach"
  
+#: 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/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Pokaż grupy samba"
+
+#: 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/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:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr "Grupa Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr "Administratorzy domeny"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr "Użytkownicy domeny"
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr "Goście domeny"
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr "Specjalna grupa (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, php-format
  msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, php-format
  msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  #, fuzzy
  msgid "! unknown UID"
  msgstr "! nieznane id"
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, php-format
  msgid "Search returned too many results. Not displaying more than %s entries!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, fuzzy, php-format
  msgid "Cannot find any SID for '%s'!"
  msgstr "Nie można stworzyć pliku '%s'."
  
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy, php-format
  msgid "Cannot find any RIDBASE for '%s'!"
  msgstr "Nie można stworzyć pliku '%s'."
  
-#: plugins/admin/groups/class_groupGeneric.inc:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, php-format
  msgid "The gidNumber '%s' is already in use by %s!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3543,28 +3527,28 @@ msgstr ""
  msgid "GID"
  msgstr "GID"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  msgid "Generic group settings"
  msgstr "Ogólne ustawienia grupy"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  msgid "Samba group type"
  msgstr "Typ grupy Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Katalog domowy Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  msgid "Phone pickup group"
  msgstr "Grupie odbioru telefonu"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  msgid "Nagios group"
  msgstr "Grupa nagios"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  msgid "Group member"
  msgstr "Członek grupy"
  
@@ -3573,7 +3557,6 @@ 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"
  
@@ -3591,49 +3574,49 @@ msgstr "serwery"
  msgid "Group administration"
  msgstr "Administracja Grupą"
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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:747
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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:751
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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:767
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: 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/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  #, fuzzy
  msgid "Menu"
  msgstr "Drukarka"
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
  msgid "Edit environment properties"
  msgstr "Edytuj właściwości Środowiska"
@@ -3697,7 +3680,7 @@ msgstr ""
  "użycie szablonów."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3722,30 +3705,30 @@ msgstr "Zarządzaj użytkownikami"
  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:650
+#: plugins/admin/users/class_userManagement.inc:654
  msgid "Account locking"
  msgstr "Blokowanie konta"
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
  "locked!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
  msgid "Unlock account"
  msgstr "Odblokuj konto"
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  msgid "Lock account"
  msgstr "Zablokuj konto"
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  msgid "Edit generic properties"
  msgstr "Edytuj ogólne właściwości"
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3753,20 +3736,20 @@ msgstr "Edytuj ogólne właściwości"
  msgid "POSIX"
  msgstr "POSIX"
  
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:747
  #, fuzzy
  msgid "Edit POSIX properties"
  msgstr "Edytuj właściwości UNIX"
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr "Netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  msgid "Edit netatalk properties"
  msgstr "Edytuj właściwości Netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  #, fuzzy
  msgid "Edit FAX properties"
  msgstr "Edytuj właściwości UNIX"
@@ -4017,7 +4000,7 @@ msgstr "Bazowy numer faxu tego poddrzewa"
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  #, fuzzy
@@ -4034,7 +4017,7 @@ msgstr "Departamenty"
  msgid "Manage Departments"
  msgstr "Zarządzaj Departamentami"
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  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 "
@@ -4889,11 +4872,6 @@ 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"
@@ -6733,6 +6711,40 @@ msgstr "Tek krok umożliwia wybranie preferowanego języka."
  msgid "Automatic"
  msgstr "Automatycznie"
  
+#~ msgid "Update"
+#~ msgstr "Aktualizuj"
+
+#~ msgid "Show %s"
+#~ msgstr "Pokaż %s"
+
+#~ msgid "people"
+#~ msgstr "ludzie"
+
+#~ msgid "printer"
+#~ msgstr "drukarka"
+
+#~ msgid "Select users to add"
+#~ msgstr "Wybierz użytkowników do dodania"
+
+#~ msgid "Select to see servers"
+#~ msgstr "Proszę aby zobaczyć serwery"
+
+#~ msgid "Search within subtree"
+#~ msgstr "Szukaj wewnątrz tego poddrzewa"
+
+#~ msgid "Display users of department"
+#~ msgstr "Wyświetl użytkowników departamentu"
+
+#~ msgid "Display users matching"
+#~ 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"
+
+#, fuzzy
+#~ msgid "List of systems"
+#~ msgstr "Lista użytkowników"
+
  #, fuzzy
  #~ msgid "givenname"
  #~ msgstr "Imię"
@@ -7631,9 +7643,6 @@ msgstr "Automatycznie"
  #~ msgid "Select to see departments"
  #~ msgstr "Wybierz aby zobaczyć departamenty"
  
-#~ msgid "Show departments"
-#~ msgstr "Pokaż departamenty"
-
  #~ msgid "Select to see GOsa accounts"
  #~ msgstr "Wybierz aby zobaczyć konta GOsa"
  
@@ -7655,9 +7664,6 @@ msgstr "Automatycznie"
  #~ msgid "Select to see printers"
  #~ msgstr "Wybierz aby zobaczyć drukarki"
  
-#~ msgid "Show printers"
-#~ msgstr "Pokaż drukarki"
-
  #~ msgid "Select to see phones"
  #~ msgstr "Wybież aby zobaczyć telefony"
  
diff --git a/gosa-core/locale/core/pt/LC_MESSAGES/messages.po b/gosa-core/locale/core/pt/LC_MESSAGES/messages.po

index 033fea8dec233dfe658e9c0f83d127c623f9e9cc..bdf6564c1b2c9219ab2aecc973af2c503579df79 100644 (file)
--- a/gosa-core/locale/core/pt/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/pt/LC_MESSAGES/messages.po
@@ -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-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+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"
@@ -18,12 +18,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -49,39 +51,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr "Informação"
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -95,7 +75,7 @@ msgstr "Filtros"
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -358,7 +338,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  #, fuzzy
  msgid "Domain"
  msgstr "no domínio"
@@ -373,7 +353,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -382,7 +362,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  msgid "Locality"
@@ -391,7 +371,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -404,11 +384,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -418,11 +399,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -450,7 +433,7 @@ msgstr "Departamento"
  msgid "Description"
  msgstr "Descrição"
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -577,10 +560,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -734,9 +717,11 @@ msgid "Logout"
  msgstr "Sair"
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -796,15 +781,15 @@ msgstr "A configuração GOsa %s/%s não pôde ser lida. Abortado."
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  msgid "Configuration error"
  msgstr "Erro de configuração"
  
@@ -912,10 +897,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1071,13 +1056,13 @@ msgstr ""
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  msgid "Permission"
  msgstr ""
  
  #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:571
  #: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  msgid "Permission error"
  msgstr ""
@@ -1120,14 +1105,14 @@ msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1177,21 +1162,21 @@ msgstr "Use ACL definida na regra"
  msgid "Users"
  msgstr "Usuários"
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: 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_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  msgid "Down"
@@ -1328,34 +1313,39 @@ msgstr "Regras de ACL"
  msgid "Close"
  msgstr "Fechar"
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  msgid "Go to root department"
  msgstr "Ir para departamento raiz"
  
  #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  msgid "Root"
  msgstr "Raiz"
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  msgid "Go up one department"
  msgstr "Subir um departamento"
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  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:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  msgid "Home"
  msgstr "Origem"
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr "Recarregar lista"
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr "Submeter"
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1370,7 +1360,7 @@ msgstr ""
  msgid "Choose a base"
  msgstr ""
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1378,53 +1368,53 @@ msgstr ""
  msgid "Select all"
  msgstr ""
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  #, fuzzy
  msgid "created by"
  msgstr "Criar"
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  msgid "Copy"
  msgstr ""
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  msgid "Cut"
  msgstr ""
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  msgid "Paste"
  msgstr "Colar"
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  msgid "Cut this entry"
  msgstr ""
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  msgid "Copy this entry"
  msgstr ""
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  msgid "Restore snapshots"
  msgstr ""
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  msgid "Export list"
  msgstr ""
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_listing.inc:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  msgid "Create snapshot"
  msgstr ""
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 include/class_plugin.inc:2010
  msgid "Create a new snapshot from this object"
  msgstr ""
  
@@ -2169,6 +2159,8 @@ msgid "Missing %s PHP extension!"
  msgstr ""
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2545,11 +2537,11 @@ msgstr ""
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "sambaSID e/ou sambaRidBase não configurado!"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid "Configuration"
  msgstr "Configuração"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2618,9 +2610,9 @@ msgid "Please fix the above error and reload the page."
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2635,23 +2627,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr "FAX"
  
@@ -2664,8 +2656,10 @@ msgid "FTP"
  msgstr "FTP"
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2673,9 +2667,10 @@ msgid "Group"
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2695,6 +2690,7 @@ msgid "Application"
  msgstr "Aplicação"
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2706,6 +2702,7 @@ msgid "Thin Client"
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2717,6 +2714,7 @@ msgid "Object group"
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr "Impressora"
@@ -2760,6 +2758,133 @@ msgstr ""
  msgid "The GOsa team"
  msgstr ""
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+msgid "Please select the desired entries"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+msgid "Terminal"
+msgstr ""
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
+msgstr "Usuário"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+#, fuzzy
+msgid "Show department"
+msgstr "Departamentos"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+#, fuzzy
+msgid "Show users"
+msgstr "Servidores"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+#, fuzzy
+msgid "Show groups"
+msgstr "Usuários do domínio"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+#, fuzzy
+msgid "Show server"
+msgstr "Servidores"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+#, fuzzy
+msgid "Show workstation"
+msgstr "Estações de Trabalho"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+#, fuzzy
+msgid "Show terminal"
+msgstr "Terminais"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+#, fuzzy
+msgid "Show printer"
+msgstr "Impressoras"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+#, fuzzy
+msgid "Show phone"
+msgstr "Modelos"
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2767,7 +2892,7 @@ msgid ""
  msgstr ""
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr "Grupos de objeto"
  
@@ -2785,217 +2910,108 @@ msgstr ""
  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"
-msgstr "Usuário"
-
  #: plugins/admin/ogroups/class_ogroupManagement.inc:190
  msgid "Windows Install"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:191
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-msgid "Terminal"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: 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:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
+msgstr "nenhum"
  
-#: 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"
+#: plugins/admin/ogroups/class_ogroup.inc:393
+msgid "too many different objects!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:424
-#: plugins/admin/ogroups/class_ogroup.inc:426
-msgid "people"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:395
+msgid "users"
+msgstr "Usuários"
  
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr "Grupos"
  
-#: plugins/admin/ogroups/class_ogroup.inc:432
-#: plugins/admin/ogroups/class_ogroup.inc:434
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
+msgstr "Aplicações"
+
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
+msgstr "Departamentos"
+
+#: plugins/admin/ogroups/class_ogroup.inc:399
  msgid "servers"
  msgstr "Servidores"
  
-#: plugins/admin/ogroups/class_ogroup.inc:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
+#: plugins/admin/ogroups/class_ogroup.inc:400
  msgid "workstations"
  msgstr "Estações de Trabalho"
  
-#: 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:444
-msgid "printer"
+#: plugins/admin/ogroups/class_ogroup.inc:401
+msgid "winstations"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:446
-#: plugins/admin/ogroups/class_ogroup.inc:486
-msgid "printers"
-msgstr "Impressoras"
+#: plugins/admin/ogroups/class_ogroup.inc:402
+msgid "terminals"
+msgstr "Terminais"
  
-#: 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:403
  msgid "phones"
  msgstr "Telefones"
  
-#: 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: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:475
-msgid "too many different objects!"
-msgstr ""
-
-#: plugins/admin/ogroups/class_ogroup.inc:477
-msgid "users"
-msgstr "Usuários"
-
-#: plugins/admin/ogroups/class_ogroup.inc:483
-msgid "winstations"
-msgstr ""
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
+msgstr "Impressoras"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr "desabilitado"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr "acesso completo"
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: 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:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  msgid "Non existing dn:"
  msgstr "Dn não existente:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
  "added:"
  msgstr ""
  
-#: 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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  msgid "You can combine two different object types at maximum, only!"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  msgid "Object group generic"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  msgid "Sytem trust"
  msgstr ""
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  msgid "Member"
  msgstr ""
  
@@ -3032,7 +3048,7 @@ msgid "Select a base"
  msgstr "Selecione a base"
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr "Sistema de confiança"
@@ -3070,8 +3086,8 @@ msgid "FAI summary"
  msgstr "Sumário FAI"
  
  #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3188,7 +3204,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3236,36 +3251,8 @@ msgstr ""
  "realmente quer fazer isso, pois o GOsa não possui uma forma para restaurar "
  "seus dados anteriores."
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr "Selecione para ver servidores"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr ""
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr "Exibir combinação de usuários"
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3280,27 +3267,6 @@ msgstr "Nome fornecido"
  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
@@ -3355,69 +3321,87 @@ msgstr ""
  msgid "Not in all groups"
  msgstr ""
  
+#: 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/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/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/class_groupGeneric.inc:161
  msgid "Cannot find group SID in your configuration!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr "Grupo samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr "Administradores do domínio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr "Usuários do domínio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr "Convidados do domínio"
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, php-format
  msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, php-format
  msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  #, fuzzy
  msgid "! unknown UID"
  msgstr "! id desconhecido"
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, php-format
  msgid "Search returned too many results. Not displaying more than %s entries!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, php-format
  msgid "Cannot find any SID for '%s'!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, php-format
  msgid "Cannot find any RIDBASE for '%s'!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, php-format
  msgid "The gidNumber '%s' is already in use by %s!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3425,27 +3409,27 @@ msgstr ""
  msgid "GID"
  msgstr "GID"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  msgid "Generic group settings"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  msgid "Samba group type"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  msgid "Samba domain name"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  msgid "Phone pickup group"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  msgid "Nagios group"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  msgid "Group member"
  msgstr ""
  
@@ -3454,7 +3438,6 @@ 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"
  
@@ -3472,48 +3455,48 @@ msgstr "Remover foto"
  msgid "Group administration"
  msgstr "Administração de grupos"
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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:747
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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:751
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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:767
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: 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/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  msgid "Menu"
  msgstr ""
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
  msgid "Edit environment properties"
  msgstr "Editar propriedades de ambiente"
@@ -3577,7 +3560,7 @@ msgstr ""
  "modelos."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3601,32 +3584,32 @@ msgstr ""
  msgid "You have no permission to change this users password!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:654
  msgid "Account locking"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
  "locked!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
  #, fuzzy
  msgid "Unlock account"
  msgstr "Minha conta"
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  #, fuzzy
  msgid "Lock account"
  msgstr "Minha conta"
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  msgid "Edit generic properties"
  msgstr "Editar propriedades gerais"
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3634,20 +3617,20 @@ msgstr "Editar propriedades gerais"
  msgid "POSIX"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:747
  #, fuzzy
  msgid "Edit POSIX properties"
  msgstr "Editar propriedades UNIX"
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr "Netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  msgid "Edit netatalk properties"
  msgstr "Editar propriedades do netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  #, fuzzy
  msgid "Edit FAX properties"
  msgstr "Editar propriedades UNIX"
@@ -3893,7 +3876,7 @@ msgstr ""
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  msgid "Domain Component"
@@ -3909,7 +3892,7 @@ msgstr "Departamentos"
  msgid "Manage Departments"
  msgstr ""
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  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 "
@@ -4742,11 +4725,6 @@ 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"
@@ -6403,6 +6381,16 @@ msgstr ""
  msgid "Automatic"
  msgstr ""
  
+#~ msgid "Select to see servers"
+#~ msgstr "Selecione para ver servidores"
+
+#~ msgid "Display users matching"
+#~ msgstr "Exibir combinação de usuários"
+
+#, fuzzy
+#~ msgid "List of systems"
+#~ msgstr "Lista de usuários"
+
  #, fuzzy
  #~ msgid "givenname"
  #~ msgstr "Nome fornecido"
diff --git a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po

index 85619b395e9456a0ea1fe1cebb5c977531405492..d270610ff9d8761a954661f099305e322d3cf12d 100644 (file)
--- a/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/ru/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+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"
@@ -16,12 +16,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -47,39 +49,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr "Информация"
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -93,7 +73,7 @@ msgstr "Фильтры"
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -387,7 +367,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  #, fuzzy
  msgid "Domain"
  msgstr "в домене"
@@ -402,7 +382,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -411,7 +391,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
@@ -421,7 +401,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -434,11 +414,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -448,11 +429,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -480,7 +463,7 @@ msgstr "Подразделение"
  msgid "Description"
  msgstr "Описание"
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -610,10 +593,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -783,9 +766,11 @@ msgid "Logout"
  msgstr "Выход"
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -846,15 +831,15 @@ msgstr ""
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, fuzzy
  msgid "Configuration error"
  msgstr "Настроить"
@@ -965,10 +950,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1136,14 +1121,14 @@ msgstr ""
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  #, fuzzy
  msgid "Permission"
  msgstr "Права для членов группы"
  
  #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:571
  #: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  #, fuzzy
  msgid "Permission error"
@@ -1187,14 +1172,14 @@ msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1250,21 +1235,21 @@ msgstr ""
  msgid "Users"
  msgstr "Пользователи"
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: plugins/admin/groups/class_groupManagement.inc:25
  #: setup/class_setupStep_Migrate.inc:1042
  msgid "Groups"
  msgstr "Группы"
  
  #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  #, fuzzy
@@ -1416,39 +1401,44 @@ msgstr "Доступ"
  msgid "Close"
  msgstr "Выбрать"
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  #, fuzzy
  msgid "Go to root department"
  msgstr "Список подразделений"
  
  #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  #, fuzzy
  msgid "Root"
  msgstr "Перезагрузить"
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  #, fuzzy
  msgid "Go up one department"
  msgstr "Подразделение"
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  #, fuzzy
  msgid "Go to users department"
  msgstr "Выберите подразделение"
  
  #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  #, fuzzy
  msgid "Home"
  msgstr "Имя системы"
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr ""
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr ""
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1466,7 +1456,7 @@ msgstr ""
  msgid "Choose a base"
  msgstr "Выберите, чтобы просмотреть серверы"
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1475,61 +1465,61 @@ msgstr "Выберите, чтобы просмотреть серверы"
  msgid "Select all"
  msgstr "Удалить"
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  #, fuzzy
  msgid "created by"
  msgstr "Создать"
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  #, fuzzy
  msgid "Copy"
  msgstr "Компания"
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  #, fuzzy
  msgid "Cut"
  msgstr "Выполнить"
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  #, fuzzy
  msgid "Paste"
  msgstr "Дата"
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  #, fuzzy
  msgid "Cut this entry"
  msgstr "Редактиовать объект"
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  #, fuzzy
  msgid "Copy this entry"
  msgstr "Редактиовать объект"
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  #, fuzzy
  msgid "Restore snapshots"
  msgstr "Создать настройки запись эл. почты"
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  #, fuzzy
  msgid "Export list"
  msgstr "Экспорт"
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_listing.inc:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  #, fuzzy
  msgid "Create snapshot"
  msgstr "Создать настройки запись эл. почты"
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 include/class_plugin.inc:2010
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "Объект группы"
@@ -2341,6 +2331,8 @@ msgid "Missing %s PHP extension!"
  msgstr "Удалить параметры"
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2732,12 +2724,12 @@ msgstr ""
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "В вашем файле настройки отсутствуют значения SID и/или RIDBASE!"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  #, fuzzy
  msgid "Configuration"
  msgstr "Настроить"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2805,9 +2797,9 @@ msgid "Please fix the above error and reload the page."
  msgstr ""
  
  #: plugins/generic/references/class_reference.inc:41
-#: plugins/admin/ogroups/class_ogroup.inc:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2822,23 +2814,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr "Факс"
  
@@ -2851,8 +2843,10 @@ msgid "FTP"
  msgstr "FTP"
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2860,9 +2854,10 @@ msgid "Group"
  msgstr "Группа"
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2882,6 +2877,7 @@ msgid "Application"
  msgstr "Приложение"
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2893,6 +2889,7 @@ msgid "Thin Client"
  msgstr "Тонкий клиент"
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2904,6 +2901,7 @@ msgid "Object group"
  msgstr "Объект группы"
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr "Принтер"
@@ -2950,6 +2948,135 @@ msgstr ""
  msgid "The GOsa team"
  msgstr "Команда разработчиков GOsa"
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Язык по умолчанию"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+#, fuzzy
+msgid "Terminal"
+msgstr "Терминалы"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
+msgstr "Пользователь"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+#, fuzzy
+msgid "Show department"
+msgstr "Показать подразделения"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+#, fuzzy
+msgid "Show users"
+msgstr "Показать серверы"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+#, fuzzy
+msgid "Show groups"
+msgstr "Показать группы samba"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+#, fuzzy
+msgid "Show server"
+msgstr "Показать серверы"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+#, fuzzy
+msgid "Show workstation"
+msgstr "Показать рабочие станции"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+#, fuzzy
+msgid "Show terminal"
+msgstr "Показать терминалы"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+#, fuzzy
+msgid "Show printer"
+msgstr "Показать принтеры"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+#, fuzzy
+msgid "Show phone"
+msgstr "Показать телефоны"
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2959,7 +3086,7 @@ msgstr ""
  "сможет восстановить эти данные."
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr "Объединения"
  
@@ -2980,227 +3107,115 @@ msgstr "Ошибка LDAP:"
  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"
-msgstr "Пользователь"
-
  #: plugins/admin/ogroups/class_ogroupManagement.inc:190
  #, fuzzy
  msgid "Windows Install"
  msgstr "Рабочая станция Windows"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:191
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-#, fuzzy
-msgid "Terminal"
-msgstr "Терминалы"
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: 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:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
+msgstr "нет"
  
-#: 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:393
+msgid "too many different objects!"
+msgstr "слишком много различных объектов!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:424
-#: plugins/admin/ogroups/class_ogroup.inc:426
-#, fuzzy
-msgid "people"
-msgstr "Показать людей"
+#: plugins/admin/ogroups/class_ogroup.inc:395
+msgid "users"
+msgstr "пользователи"
  
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr "группы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:432
-#: plugins/admin/ogroups/class_ogroup.inc:434
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
+msgstr "приложения"
+
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
+msgstr "подразделения"
+
+#: plugins/admin/ogroups/class_ogroup.inc:399
  msgid "servers"
  msgstr "серверы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
+#: plugins/admin/ogroups/class_ogroup.inc:400
  msgid "workstations"
  msgstr "рабочие станции"
  
-#: 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:444
+#: plugins/admin/ogroups/class_ogroup.inc:401
  #, fuzzy
-msgid "printer"
-msgstr "Ð¿Ñ\80Ð¸Ð½Ñ\82ÐµÑ\80Ñ\8b"
+msgid "winstations"
+msgstr "Ð Ð°Ð±Ð¾Ñ\87Ð°Ñ\8f Ñ\81Ñ\82Ð°Ð½Ñ\86Ð¸Ñ\8f"
  
-#: plugins/admin/ogroups/class_ogroup.inc:446
-#: plugins/admin/ogroups/class_ogroup.inc:486
-msgid "printers"
-msgstr "принтеры"
+#: plugins/admin/ogroups/class_ogroup.inc:402
+msgid "terminals"
+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:403
  msgid "phones"
  msgstr "телефоны"
  
-#: 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: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:475
-msgid "too many different objects!"
-msgstr "слишком много различных объектов!"
-
-#: plugins/admin/ogroups/class_ogroup.inc:477
-msgid "users"
-msgstr "пользователи"
-
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#, fuzzy
-msgid "winstations"
-msgstr "Рабочая станция"
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
+msgstr "принтеры"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr "отключен"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr "полный доступ"
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: plugins/personal/posix/class_posixAccount.inc:574
  msgid "allow access to these hosts"
  msgstr "разрешить доступ только на эти хосты"
  
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  #, fuzzy
  msgid "Non existing dn:"
  msgstr "Не существующий dn:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
  "added:"
  msgstr ""
  
-#: 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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  #, fuzzy
  msgid "You can combine two different object types at maximum, only!"
  msgstr ""
  "Вы можете комбинировать не более двух различных классов в одном объекте!"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  #, fuzzy
  msgid "Object group generic"
  msgstr "Объект группы"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  #, fuzzy
  msgid "Sytem trust"
  msgstr "Системные доверия"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  #, fuzzy
  msgid "Member"
  msgstr "Включаемые объекты"
@@ -3239,7 +3254,7 @@ msgid "Select a base"
  msgstr "Выберите, чтобы просмотреть серверы"
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr "Системные доверия"
@@ -3280,8 +3295,8 @@ msgid "FAI summary"
  msgstr ""
  
  #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3410,7 +3425,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3458,38 +3472,8 @@ msgstr ""
  "действительно хотите удалить ее, так как GOsa не сможет отменить результаты "
  "этой операции."
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Выбрать пользователей для добавления"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr "Выберите, чтобы просмотреть серверы"
-
-#: plugins/admin/groups/group_objects.tpl:30
-#, fuzzy
-msgid "Search within subtree"
-msgstr "Искать в поддеревьях"
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr "Подразделение"
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr "Фильтр"
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3505,25 +3489,6 @@ msgstr "Имя"
  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
@@ -3583,70 +3548,86 @@ msgstr "Основная группа"
  msgid "Not in all groups"
  msgstr "Показать группы с эл. почтой"
  
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "Показать основные группы"
+
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "Показать группы samba"
+
+#: 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/class_groupGeneric.inc:161
  #, fuzzy
  msgid "Cannot find group SID in your configuration!"
  msgstr "Не могу найти SID в базе LDAP или в сонфигурационном файле!"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr "Группа Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr "Администраторы домена"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr "Пользователи домена"
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr "Непривилегированные пользователи домена"
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr "Специальная группа (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, php-format
  msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, php-format
  msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  #, fuzzy
  msgid "! unknown UID"
  msgstr "состояние неизвестно"
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, php-format
  msgid "Search returned too many results. Not displaying more than %s entries!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, fuzzy, php-format
  msgid "Cannot find any SID for '%s'!"
  msgstr "Удалить"
  
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy, php-format
  msgid "Cannot find any RIDBASE for '%s'!"
  msgstr "Удалить"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, php-format
  msgid "The gidNumber '%s' is already in use by %s!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3654,32 +3635,32 @@ msgstr ""
  msgid "GID"
  msgstr "GID"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  #, fuzzy
  msgid "Generic group settings"
  msgstr "Общая информация о пользователе"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  #, fuzzy
  msgid "Samba group type"
  msgstr "Группа Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Домашний каталог Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  #, fuzzy
  msgid "Phone pickup group"
  msgstr "Члены телефонной группы"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  #, fuzzy
  msgid "Nagios group"
  msgstr "Контакт"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  #, fuzzy
  msgid "Group member"
  msgstr "Члены группы"
@@ -3690,7 +3671,6 @@ 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 "Список групп"
  
@@ -3708,53 +3688,53 @@ msgstr "серверы"
  msgid "Group administration"
  msgstr "Управление группами"
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  #, fuzzy
  msgid "Posix"
  msgstr "Прокси-сервер"
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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:747
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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:751
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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:767
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
  #, fuzzy
  msgid "Edit phone properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  #, fuzzy
  msgid "Menu"
  msgstr "Принтер"
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
  #, fuzzy
  msgid "Edit environment properties"
@@ -3824,7 +3804,7 @@ msgstr ""
  "использовать шаблоны."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3852,34 +3832,34 @@ msgstr "Пользователи домена"
  msgid "You have no permission to change this users password!"
  msgstr "У вас недостаточно прав для смены своего пароля."
  
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:654
  #, fuzzy
  msgid "Account locking"
  msgstr "Учетная запись"
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
  "locked!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
  #, fuzzy
  msgid "Unlock account"
  msgstr "Моя учетная запись"
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  #, fuzzy
  msgid "Lock account"
  msgstr "Моя учетная запись"
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  #, fuzzy
  msgid "Edit generic properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3887,21 +3867,21 @@ msgstr "Изменить свойства"
  msgid "POSIX"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:747
  #, fuzzy
  msgid "Edit POSIX properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  #, fuzzy
  msgid "Edit netatalk properties"
  msgstr "Изменить свойства"
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  #, fuzzy
  msgid "Edit FAX properties"
  msgstr "Изменить свойства"
@@ -4158,7 +4138,7 @@ msgstr "Основный номер факса для ветки"
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  #, fuzzy
@@ -4176,7 +4156,7 @@ msgstr "Подразделения"
  msgid "Manage Departments"
  msgstr "Подразделения"
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  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 "
@@ -5080,11 +5060,6 @@ 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 "Показать серверы"
@@ -6931,6 +6906,41 @@ msgstr "Язык по умолчанию"
  msgid "Automatic"
  msgstr "автоматически"
  
+#, fuzzy
+#~ msgid "Show %s"
+#~ msgstr "Показать группы"
+
+#, fuzzy
+#~ msgid "people"
+#~ msgstr "Показать людей"
+
+#, fuzzy
+#~ msgid "printer"
+#~ msgstr "принтеры"
+
+#~ msgid "Select users to add"
+#~ msgstr "Выбрать пользователей для добавления"
+
+#~ msgid "Select to see servers"
+#~ msgstr "Выберите, чтобы просмотреть серверы"
+
+#, fuzzy
+#~ msgid "Search within subtree"
+#~ msgstr "Искать в поддеревьях"
+
+#~ msgid "Display users of department"
+#~ msgstr "Подразделение"
+
+#~ msgid "Display users matching"
+#~ msgstr "Фильтр"
+
+#~ msgid "Regular expression for matching user names"
+#~ msgstr "Регулярное выражение, соответствующее именам пользователей"
+
+#, fuzzy
+#~ msgid "List of systems"
+#~ msgstr "Список пользователей"
+
  #, fuzzy
  #~ msgid "givenname"
  #~ msgstr "Имя"
@@ -7790,9 +7800,6 @@ msgstr "автоматически"
  #~ msgid "Select to see departments"
  #~ msgstr "Выберите подразделение"
  
-#~ msgid "Show departments"
-#~ msgstr "Показать подразделения"
-
  #~ msgid "Select to see GOsa accounts"
  #~ msgstr "Выберите чтобы посмотреть пользователей GOsa"
  
@@ -7814,9 +7821,6 @@ msgstr "автоматически"
  #~ msgid "Select to see printers"
  #~ msgstr "Выберите чтобы посмотреть принтеры"
  
-#~ msgid "Show printers"
-#~ msgstr "Показать принтеры"
-
  #~ msgid "Select to see phones"
  #~ msgstr "Выберите чтобы посмотреть телефоны"
  
diff --git a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po

index dc6ef05afdbecf1c571e06f1020ed4a627940518..b2e4effd7a58434dd18ae27bda9e796df34d9434 100644 (file)
--- a/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/vi/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: VIcore2\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+0100\n"
  "PO-Revision-Date: 2008-07-04 09:59+0200\n"
  "Last-Translator: Stefan Koehler <stefan@gonicus.de>\n"
  "Language-Team: Vietnamese\n"
@@ -20,12 +20,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -51,39 +53,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr "Thông tin"
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -97,7 +77,7 @@ msgstr "Các bộ lọc"
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -378,7 +358,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  #, fuzzy
  msgid "Domain"
  msgstr "trong miền"
@@ -393,7 +373,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -402,7 +382,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
@@ -412,7 +392,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -425,11 +405,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -439,11 +420,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -471,7 +454,7 @@ msgstr "Bộ phận"
  msgid "Description"
  msgstr "Mô tả"
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -613,10 +596,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -784,9 +767,11 @@ msgid "Logout"
  msgstr "Đăng xuất"
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -846,15 +831,15 @@ msgstr "Cấu hình GOsa %s/%s không đọc được. Bãi bỏ."
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  msgid "Configuration error"
  msgstr "Lỗi cấu hình"
  
@@ -970,10 +955,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1137,13 +1122,13 @@ msgstr ""
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  msgid "Permission"
  msgstr "Cho phép"
  
  #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:571
  #: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  msgid "Permission error"
  msgstr "Lỗi về cấp phép"
@@ -1187,7 +1172,7 @@ msgstr ""
  "Không thể tìm thấy một phương pháp mật khẩu phù hợp cho hàm băm hiện tại!"
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
@@ -1196,7 +1181,7 @@ msgstr ""
  "Chức năng Snapshot đã được bật, nhưng biến số được yêu cầu: '%s' vẫn chưa "
  "được thiết lập."
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, fuzzy, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1248,21 +1233,21 @@ msgstr "Sử dụng ACL được xác định trong vai trò"
  msgid "Users"
  msgstr "Người dùng"
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: plugins/admin/groups/class_groupManagement.inc:25
  #: setup/class_setupStep_Migrate.inc:1042
  msgid "Groups"
  msgstr "Các nhóm"
  
  #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  msgid "Down"
@@ -1400,34 +1385,39 @@ msgstr "Các vai trò ACL"
  msgid "Close"
  msgstr "Đóng"
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  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:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  msgid "Root"
  msgstr "Gốc"
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  msgid "Go up one department"
  msgstr "Đi lên một bộ phận"
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  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:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  msgid "Home"
  msgstr "Nhà"
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr "Danh sách reload"
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr "Nộp"
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1445,7 +1435,7 @@ msgstr ""
  msgid "Choose a base"
  msgstr "Chọn một gốc"
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1453,54 +1443,54 @@ msgstr "Chọn một gốc"
  msgid "Select all"
  msgstr "Chọn tất"
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  #, fuzzy
  msgid "created by"
  msgstr "Tạo "
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  msgid "Copy"
  msgstr "Copy"
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  msgid "Cut"
  msgstr "Cut"
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  msgid "Paste"
  msgstr "Paste"
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  msgid "Cut this entry"
  msgstr "Cắt entry này"
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  msgid "Copy this entry"
  msgstr "Copy entry này"
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  #, fuzzy
  msgid "Restore snapshots"
  msgstr "Phục hồi lại snapshot"
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  msgid "Export list"
  msgstr ""
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: 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:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  msgid "Create snapshot"
  msgstr "Tạo ra snapshot"
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 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"
  
@@ -2278,6 +2268,8 @@ msgid "Missing %s PHP extension!"
  msgstr "PHP mở rộng %s mất tích!"
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2663,11 +2655,11 @@ msgstr "Không thể nối kết với LDAP. Xin hãy liên lạc với với ad
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "SID và/hoặc RIDBASE đang bị mất trong cấu hình này!"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid "Configuration"
  msgstr "Cấu hình"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2734,9 +2726,9 @@ 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:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2751,23 +2743,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr "Fax"
  
@@ -2780,8 +2772,10 @@ msgid "FTP"
  msgstr "FTP "
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2789,9 +2783,10 @@ msgid "Group"
  msgstr "Nhóm "
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2811,6 +2806,7 @@ msgid "Application"
  msgstr "Ứng dụng"
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2822,6 +2818,7 @@ msgid "Thin Client"
  msgstr "Máy khách yếu"
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2833,6 +2830,7 @@ msgid "Object group"
  msgstr "Nhóm đối tượng"
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr "Máy in"
@@ -2877,6 +2875,134 @@ msgstr ""
  msgid "The GOsa team"
  msgstr "Nhóm phát triển Gosa"
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "Xin hãy lựa chọn ngôn ngữ ưu thích"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+msgid "Terminal"
+msgstr "Thiết bị cuối "
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
+msgstr "Người dùng"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+#, fuzzy
+msgid "Show department"
+msgstr "Bộ phận"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+#, fuzzy
+msgid "Show users"
+msgstr "các server"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+#, fuzzy
+msgid "Show groups"
+msgstr "các nhóm mail"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+#, fuzzy
+msgid "Show server"
+msgstr "các server"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+#, fuzzy
+msgid "Show workstation"
+msgstr "máy trạm"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+#, fuzzy
+msgid "Show terminal"
+msgstr "các thiết bị cuối"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+#, fuzzy
+msgid "Show printer"
+msgstr "máy in"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+#, fuzzy
+msgid "Show phone"
+msgstr "Hiển thị các thay đổi"
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2886,7 +3012,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:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr "Tất cả các nhóm đối tượng"
  
@@ -2905,220 +3031,111 @@ msgstr "Lỗi cơ sở hạ tầng"
  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"
-msgstr "Người dùng"
-
  #: plugins/admin/ogroups/class_ogroupManagement.inc:190
  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 "
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  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: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:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
+msgstr "không có"
  
-#: 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:393
+msgid "too many different objects!"
+msgstr "có quá nhiều các đối tượng khác nhau!"
  
-#: 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:395
+msgid "users"
+msgstr "người dùng"
  
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr "các nhóm"
  
-#: plugins/admin/ogroups/class_ogroup.inc:432
-#: plugins/admin/ogroups/class_ogroup.inc:434
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
+msgstr "các ứng dụng"
+
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
+msgstr "các bộ phận"
+
+#: plugins/admin/ogroups/class_ogroup.inc:399
  msgid "servers"
  msgstr "các server"
  
-#: plugins/admin/ogroups/class_ogroup.inc:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
+#: plugins/admin/ogroups/class_ogroup.inc:400
  msgid "workstations"
  msgstr "máy trạm"
  
-#: plugins/admin/ogroups/class_ogroup.inc:440
-#: plugins/admin/ogroups/class_ogroup.inc:442
-#: plugins/admin/ogroups/class_ogroup.inc:484
+#: plugins/admin/ogroups/class_ogroup.inc:401
+msgid "winstations"
+msgstr "máy trạm dùng win "
+
+#: plugins/admin/ogroups/class_ogroup.inc:402
  msgid "terminals"
  msgstr "các thiết bị cuối"
  
-#: plugins/admin/ogroups/class_ogroup.inc:444
-msgid "printer"
-msgstr "máy in"
-
-#: 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:403
  msgid "phones"
  msgstr "điện thoại"
  
-#: 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: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: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:477
-msgid "users"
-msgstr "người dùng"
-
-#: plugins/admin/ogroups/class_ogroup.inc:483
-msgid "winstations"
-msgstr "máy trạm dùng win "
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
+msgstr "các máy in"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr "Đã vô hiệu"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr "Truy cập hoàn toàn"
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: 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:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  msgid "Non existing dn:"
  msgstr "dn không tồn tại:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
  "added:"
  msgstr ""
  
-#: 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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  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:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  msgid "Object group generic"
  msgstr "Nhóm đối tượng chung"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  #, fuzzy
  msgid "Sytem trust"
  msgstr "Ủy thác hệ thống"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  msgid "Member"
  msgstr "Thành viên"
  
@@ -3155,7 +3172,7 @@ msgid "Select a base"
  msgstr "Chọn một cơ sở"
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr "Ủy thác hệ thống"
@@ -3193,8 +3210,8 @@ msgid "FAI summary"
  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:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3310,7 +3327,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3358,37 +3374,8 @@ msgstr ""
  "bạn thực sự muốn làm việc này bởi sẽ không có cách nào để GOsa lấy lại dữ "
  "liệu cho bạn."
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "Chọn người sử dụng để thêm vào"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr "Chọn để xem các server"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr "Tìm kiếm trong cây con"
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr "Hiển thị người dùng của bộ phận"
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr "Hiển thị việc khớp người dùng"
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3404,27 +3391,6 @@ msgstr "Tên thật"
  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
@@ -3481,70 +3447,88 @@ 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
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+#, fuzzy
+msgid "Show primary groups"
+msgstr "các nhóm sơ cấp"
+
+#: 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/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/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:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr "Nhóm Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr "Admin miền"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr "Người dùng miền"
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr "Khách miền"
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr "Nhóm đặc biệt (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, php-format
  msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, php-format
  msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  #, fuzzy
  msgid "! unknown UID"
  msgstr "! không nhận ra id này"
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, 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:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, 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:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, php-format
  msgid "The gidNumber '%s' is already in use by %s!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3552,27 +3536,27 @@ msgstr ""
  msgid "GID"
  msgstr "Số ID của nhóm"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  msgid "Generic group settings"
  msgstr "Thiết lập nhóm chung"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  msgid "Samba group type"
  msgstr "Loại nhóm Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  msgid "Samba domain name"
  msgstr "Tên miền Samba"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  msgid "Phone pickup group"
  msgstr "Nhóm nhấc điện thoại"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  msgid "Nagios group"
  msgstr "Nhóm phần mềm Nagios"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  msgid "Group member"
  msgstr "Thành viên nhóm"
  
@@ -3581,7 +3565,6 @@ 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"
  
@@ -3599,48 +3582,48 @@ msgstr "các nhóm server"
  msgid "Group administration"
  msgstr "Quản trị nhóm"
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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:747
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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:751
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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:767
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: 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/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  msgid "Menu"
  msgstr ""
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: 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"
@@ -3705,7 +3688,7 @@ msgstr ""
  "các mẫu."
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3729,33 +3712,33 @@ msgstr "Quản lý người dùng"
  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:650
+#: plugins/admin/users/class_userManagement.inc:654
  #, fuzzy
  msgid "Account locking"
  msgstr "Tài khoản"
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
  "locked!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
  #, fuzzy
  msgid "Unlock account"
  msgstr "Tài khoản của tôi"
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  #, fuzzy
  msgid "Lock account"
  msgstr "Tài khoản của tôi"
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  msgid "Edit generic properties"
  msgstr "Hiệu chỉnh các tính năng chung"
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3763,20 +3746,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:743
+#: plugins/admin/users/class_userManagement.inc:747
  #, fuzzy
  msgid "Edit POSIX properties"
  msgstr "Hiệu chỉnh các tính năng UNIX"
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr "Netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  msgid "Edit netatalk properties"
  msgstr "Hiệu chỉnh các đặc tính của netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  #, fuzzy
  msgid "Edit FAX properties"
  msgstr "Hiệu chỉnh các tính năng UNIX"
@@ -4031,7 +4014,7 @@ msgstr "Đặt số fax của cây con này"
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  #, fuzzy
@@ -4048,7 +4031,7 @@ msgstr "Các bộ phận"
  msgid "Manage Departments"
  msgstr "Quản lý  các bộ phận"
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  #, fuzzy
  msgid ""
  "As soon as the tag operation has finished, you can scroll down to end of the "
@@ -4911,11 +4894,6 @@ 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"
@@ -6724,6 +6702,34 @@ 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"
  
+#~ msgid "Show %s"
+#~ msgstr "Hiển thị %s"
+
+#~ msgid "people"
+#~ msgstr "Người"
+
+#~ msgid "Select users to add"
+#~ msgstr "Chọn người sử dụng để thêm vào"
+
+#~ msgid "Select to see servers"
+#~ msgstr "Chọn để xem các server"
+
+#~ msgid "Search within subtree"
+#~ msgstr "Tìm kiếm trong cây con"
+
+#~ msgid "Display users of department"
+#~ msgstr "Hiển thị người dùng của bộ phận"
+
+#~ msgid "Display users matching"
+#~ 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"
+
+#, fuzzy
+#~ msgid "List of systems"
+#~ msgstr "Danh sách người dùng"
+
  #, fuzzy
  #~ msgid "givenname"
  #~ msgstr "Tên thật"
@@ -6995,9 +7001,6 @@ msgstr "Tự động"
  #~ msgid "Override sudo role ou"
  #~ msgstr "Viết đè lên lệnh sudo role ou"
  
-#~ msgid "department"
-#~ msgstr "Bộ phận"
-
  #~ msgid "You're about to delete the whole LDAP subtree placed under '%s'."
  #~ msgstr "Bạn chuẩn bị xóa tất cả cây thư mục LDAP nhỏ được đặt dưới '%s'."
  
diff --git a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po

index 16fe4f33173a4e3b9babd27e88d37753949d1445..110e3f0f1cee72251c01ac0f14384ada1493e073 100644 (file)
--- a/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
+++ b/gosa-core/locale/core/zh/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
  msgstr ""
  "Project-Id-Version: messages\n"
  "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-27 15:02+0100\n"
+"POT-Creation-Date: 2010-01-28 22:24+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"
@@ -18,12 +18,14 @@ msgstr ""
  
  #: ihtml/themes/default/baseSelect-list.tpl:13
  #: include/class_baseSelectDialog.inc:29
+#: plugins/admin/ogroups/objectSelect/selectObject-list.tpl:13
  #: plugins/admin/ogroups/ogroup-list.tpl:13
-#: plugins/admin/ogroups/class_ogroup.inc:1084
+#: plugins/admin/ogroups/class_ogroup.inc:1002
  #: 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/userGroupSelect/selectUserGroup-list.tpl:13
+#: plugins/admin/groups/class_groupGeneric.inc:1182
  #: 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
@@ -49,39 +51,17 @@ msgstr ""
  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
  #: ihtml/themes/default/msg_dialog.tpl:108
-#: plugins/admin/ogroups/class_ogroup.inc:232 setup/setup_ldap.tpl:121
+#: plugins/admin/ogroups/class_ogroup.inc:246 setup/setup_ldap.tpl:121
  msgid "Information"
  msgstr "提示信息"
  
  #: ihtml/themes/default/MultiSelectWindow.tpl:63
  #: 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"
@@ -95,7 +75,7 @@ msgstr "过滤器"
  #: 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:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #: 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
@@ -377,7 +357,7 @@ 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
+#: plugins/admin/departments/class_departmentManagement.inc:177
  #, fuzzy
  msgid "Domain"
  msgstr "于域"
@@ -392,7 +372,7 @@ 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_departmentManagement.inc:201
  #: plugins/admin/departments/class_countryGeneric.inc:78
  #: plugins/admin/departments/class_countryGeneric.inc:79
  msgid "Country"
@@ -401,7 +381,7 @@ 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_departmentManagement.inc:213
  #: plugins/admin/departments/class_localityGeneric.inc:78
  #: plugins/admin/departments/class_localityGeneric.inc:79
  #, fuzzy
@@ -411,7 +391,7 @@ 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_departmentManagement.inc:225
  #: plugins/admin/departments/class_organizationGeneric.inc:109
  #: plugins/admin/departments/class_organizationGeneric.inc:110
  #: plugins/personal/generic/class_user.inc:1626
@@ -424,11 +404,12 @@ 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/objectSelect/selectObject-list.xml:15
  #: 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/admin/departments/class_departmentManagement.inc:237
  #: plugins/personal/generic/class_user.inc:1627
  #: plugins/personal/generic/generic.tpl:293
  #: plugins/personal/generic/multiple_generic.tpl:159
@@ -438,11 +419,13 @@ 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/objectSelect/selectObject-list.xml:105
+#: plugins/admin/ogroups/class_ogroup.inc:1003
  #: 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/userGroupSelect/selectUserGroup-list.xml:57
+#: plugins/admin/groups/class_groupGeneric.inc:1181
  #: plugins/admin/groups/group-list.xml:49
  #: plugins/admin/departments/dep-list.xml:79
  #: plugins/admin/departments/locality.tpl:19
@@ -470,7 +453,7 @@ msgstr "部门"
  msgid "Description"
  msgstr "描述"
  
-#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1114
+#: ihtml/themes/default/baseSelect-list.xml:87 include/class_listing.inc:1105
  #: 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
@@ -601,10 +584,10 @@ 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:580
-#: plugins/admin/groups/class_groupGeneric.inc:586
-#: plugins/admin/groups/class_groupGeneric.inc:932
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:540
+#: plugins/admin/groups/class_groupGeneric.inc:546
+#: plugins/admin/groups/class_groupGeneric.inc:892
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #: plugins/personal/generic/class_user.inc:274
  #: plugins/personal/generic/class_user.inc:387
  #: plugins/personal/generic/class_user.inc:482
@@ -771,9 +754,11 @@ msgid "Logout"
  msgstr "退出"
  
  #: ihtml/themes/default/baseSelect-filter.tpl:3
+#: plugins/admin/ogroups/objectSelect/selectObject-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/groups/userGroupSelect/selectUserGroup-filter.tpl:3
  #: plugins/admin/users/user-filter.tpl:3
  #: plugins/admin/departments/dep-filter.tpl:3
  #: plugins/admin/acl/acl-filter.tpl:3
@@ -832,15 +817,15 @@ msgstr "GOsa 配置 %s/gosa.conf 不可读取。退出。"
  #: 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_config.inc:1143 include/class_config.inc:1156
+#: include/class_config.inc:1174 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:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, fuzzy
  msgid "Configuration error"
  msgstr "配置文件"
@@ -951,10 +936,10 @@ msgstr ""
  #: 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
+#: include/class_config.inc:317 plugins/admin/ogroups/class_ogroup.inc:914
+#: plugins/admin/ogroups/class_ogroup.inc:928
+#: plugins/admin/groups/class_groupGeneric.inc:698
+#: plugins/admin/groups/class_groupGeneric.inc:1025
  #: plugins/admin/departments/class_department.inc:241
  #: plugins/admin/departments/class_department.inc:429
  #: plugins/admin/departments/class_department.inc:702
@@ -1116,14 +1101,14 @@ msgstr ""
  #: 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
+#: plugins/admin/users/class_userManagement.inc:616
  #, fuzzy
  msgid "Permission"
  msgstr "允许"
  
  #: include/class_management.inc:353
-#: plugins/admin/users/class_userManagement.inc:571
  #: plugins/admin/users/class_userManagement.inc:575
+#: plugins/admin/users/class_userManagement.inc:579
  #: plugins/admin/acl/class_aclManagement.inc:98
  #, fuzzy
  msgid "Permission error"
@@ -1167,14 +1152,14 @@ msgid "Cannot find a suitable password method for the current hash!"
  msgstr ""
  
  #: include/class_SnapshotHandler.inc:46 include/class_SnapshotHandler.inc:77
-#: include/class_config.inc:1145 include/class_config.inc:1176
+#: include/class_config.inc:1144 include/class_config.inc:1175
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required variable '%s' is not "
  "set."
  msgstr ""
  
-#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1158
+#: include/class_SnapshotHandler.inc:59 include/class_config.inc:1157
  #, php-format
  msgid ""
  "The snapshot functionality is enabled, but the required compression module "
@@ -1230,21 +1215,21 @@ msgstr ""
  msgid "Users"
  msgstr "用户"
  
-#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1217
+#: include/class_acl.inc:231 plugins/admin/groups/class_groupGeneric.inc:1177
  #: plugins/admin/groups/class_groupManagement.inc:25
  #: setup/class_setupStep_Migrate.inc:1042
  msgid "Groups"
  msgstr "用户组"
  
  #: include/class_acl.inc:493 include/class_MultiSelectWindow.inc:258
-#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:235
-#: include/class_listing.inc:1004 include/class_listing.inc:1006
+#: include/class_MultiSelectWindow.inc:260 include/class_listing.inc:239
+#: include/class_listing.inc:995 include/class_listing.inc:997
  #: 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_acl.inc:495 include/class_listing.inc:239
  #: include/class_sortableListing.inc:225
  #: plugins/admin/acl/class_aclRole.inc:396
  msgid "Down"
@@ -1393,34 +1378,39 @@ msgstr "MAC 地址"
  msgid "Close"
  msgstr "关闭"
  
-#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:996
+#: include/class_MultiSelectWindow.inc:250 include/class_listing.inc:987
  msgid "Go to root department"
  msgstr "转到根部门"
  
  #: include/class_MultiSelectWindow.inc:250
-#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:996
-#: include/class_listing.inc:998
+#: include/class_MultiSelectWindow.inc:252 include/class_listing.inc:987
+#: include/class_listing.inc:989 include/class_baseSelector.inc:136
  msgid "Root"
  msgstr "根"
  
-#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:1004
+#: include/class_MultiSelectWindow.inc:258 include/class_listing.inc:995
  msgid "Go up one department"
  msgstr "向上跳转一个部门"
  
-#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1012
+#: include/class_MultiSelectWindow.inc:266 include/class_listing.inc:1003
  msgid "Go to users department"
  msgstr "转到用户部门"
  
  #: include/class_MultiSelectWindow.inc:266
-#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1012
-#: include/class_listing.inc:1014
+#: include/class_MultiSelectWindow.inc:268 include/class_listing.inc:1003
+#: include/class_listing.inc:1005
  msgid "Home"
  msgstr ""
  
-#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1019
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
  msgid "Reload list"
  msgstr "重新加载列表"
  
+#: include/class_MultiSelectWindow.inc:273 include/class_listing.inc:1010
+#: include/class_baseSelector.inc:179
+msgid "Submit"
+msgstr "提交"
+
  #: include/class_MultiSelectWindow.inc:553
  #, php-format
  msgid "Inconsistent DN encoding detected: '%s'"
@@ -1437,7 +1427,7 @@ msgstr "用户名 / UID 不唯一。请检查您的 LDAP 数据库。"
  msgid "Choose a base"
  msgstr "选择一个位置"
  
-#: include/class_listing.inc:299 setup/setup_migrate.tpl:93
+#: include/class_listing.inc:303 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
@@ -1446,58 +1436,58 @@ msgstr "选择一个位置"
  msgid "Select all"
  msgstr "选择"
  
-#: include/class_listing.inc:509
+#: include/class_listing.inc:521
  #, fuzzy
  msgid "created by"
  msgstr "创建"
  
-#: include/class_listing.inc:1379 include/class_listing.inc:1429
+#: include/class_listing.inc:1375 include/class_listing.inc:1425
  #: include/class_plugin.inc:2070
  #, fuzzy
  msgid "Copy"
  msgstr "复制"
  
-#: include/class_listing.inc:1385 include/class_listing.inc:1419
+#: include/class_listing.inc:1381 include/class_listing.inc:1415
  #: include/class_plugin.inc:2074
  #, fuzzy
  msgid "Cut"
  msgstr "剪切"
  
-#: include/class_listing.inc:1393 include/class_listing.inc:1395
+#: include/class_listing.inc:1389 include/class_listing.inc:1391
  #: include/class_plugin.inc:2081 include/class_plugin.inc:2084
  #: include/class_CopyPasteHandler.inc:514
  msgid "Paste"
  msgstr "粘贴"
  
-#: include/class_listing.inc:1419 include/class_plugin.inc:2028
+#: include/class_listing.inc:1415 include/class_plugin.inc:2028
  msgid "Cut this entry"
  msgstr "剪切条目"
  
-#: include/class_listing.inc:1429 include/class_plugin.inc:2036
+#: include/class_listing.inc:1425 include/class_plugin.inc:2036
  msgid "Copy this entry"
  msgstr "拷贝条目"
  
-#: include/class_listing.inc:1461 include/class_listing.inc:1463
+#: include/class_listing.inc:1457 include/class_listing.inc:1459
  #, fuzzy
  msgid "Restore snapshots"
  msgstr "删除记录"
  
-#: include/class_listing.inc:1477
+#: include/class_listing.inc:1473
  #, fuzzy
  msgid "Export list"
  msgstr "导出"
  
-#: include/class_listing.inc:1512 include/class_listing.inc:1513
+#: include/class_listing.inc:1508 include/class_listing.inc:1509
  #: include/class_SnapShotDialog.inc:135 include/class_plugin.inc:2002
  msgid "Restore snapshot"
  msgstr ""
  
-#: include/class_listing.inc:1522 include/class_plugin.inc:2009
+#: include/class_listing.inc:1518 include/class_plugin.inc:2009
  #, fuzzy
  msgid "Create snapshot"
  msgstr "创建 nagios 账户"
  
-#: include/class_listing.inc:1523 include/class_plugin.inc:2010
+#: include/class_listing.inc:1519 include/class_plugin.inc:2010
  #, fuzzy
  msgid "Create a new snapshot from this object"
  msgstr "创建新 FAI 对象"
@@ -2279,6 +2269,8 @@ msgid "Missing %s PHP extension!"
  msgstr "删除打印机扩展"
  
  #: include/utils/class_msgPool.inc:332
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:123
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:75
  #: plugins/personal/generic/generic.tpl:255
  #: setup/class_setupStep_Migrate.inc:2868
  #, php-format
@@ -2663,12 +2655,12 @@ msgstr "无法绑定 LDAP。请联系系统管理员。"
  msgid "sambaSID and/or sambaRidBase missing in the configuration!"
  msgstr "您的配置文件缺少 SID 和/或 RIDBASE！"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  #, fuzzy
  msgid "Configuration"
  msgstr "配置文件"
  
-#: include/class_config.inc:1103
+#: include/class_config.inc:1102
  msgid ""
  "The configuration file you are using seems to be outdated. Please move the "
  "GOsa configuration file away to run the GOsa setup again."
@@ -2735,9 +2727,9 @@ 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:1074
-#: plugins/admin/groups/class_groupGeneric.inc:1211
-#: plugins/admin/users/class_userManagement.inc:738
+#: plugins/admin/ogroups/class_ogroup.inc:992
+#: plugins/admin/groups/class_groupGeneric.inc:1171
+#: plugins/admin/users/class_userManagement.inc:742
  #: plugins/admin/departments/class_department.inc:609
  #: plugins/personal/generic/class_user.inc:37
  #: plugins/personal/generic/class_user.inc:1602
@@ -2752,23 +2744,23 @@ 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:745
+#: plugins/admin/groups/class_groupManagement.inc:164
+#: plugins/admin/users/class_userManagement.inc:749
  #: 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:750
+#: plugins/admin/groups/class_groupManagement.inc:172
+#: plugins/admin/users/class_userManagement.inc:754
  #: 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:762
+#: plugins/admin/users/class_userManagement.inc:766
  msgid "FAX"
  msgstr "传真"
  
@@ -2781,8 +2773,10 @@ msgid "FTP"
  msgstr "FTP"
  
  #: plugins/generic/references/class_reference.inc:57
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:71
  #: plugins/admin/ogroups/class_ogroupManagement.inc:184
  #: plugins/admin/ogroups/ogroup-list.xml:79
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:23
  #: plugins/admin/groups/group-list.xml:15
  #: plugins/admin/groups/group-list.xml:79
  #: plugins/personal/posix/groupSelect/group-list.xml:15
@@ -2790,9 +2784,10 @@ msgid "Group"
  msgstr "组"
  
  #: plugins/generic/references/class_reference.inc:61
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:55
  #: plugins/admin/ogroups/class_ogroupManagement.inc:188
-#: plugins/admin/groups/class_groupManagement.inc:179
-#: plugins/admin/users/class_userManagement.inc:766
+#: plugins/admin/groups/class_groupManagement.inc:180
+#: plugins/admin/users/class_userManagement.inc:770
  #: plugins/admin/departments/generic.tpl:88
  #: plugins/admin/departments/class_department.inc:328
  #: plugins/admin/departments/organization.tpl:88
@@ -2812,6 +2807,7 @@ msgid "Application"
  msgstr "应用程序"
  
  #: plugins/generic/references/class_reference.inc:65
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:23
  #: 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
@@ -2823,6 +2819,7 @@ msgid "Thin Client"
  msgstr "瘦客户机"
  
  #: plugins/generic/references/class_reference.inc:69
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:31
  #: plugins/admin/ogroups/class_ogroupManagement.inc:189
  #: plugins/personal/posix/trustSelect/trust-list.xml:22
  msgid "Workstation"
@@ -2834,6 +2831,7 @@ msgid "Object group"
  msgstr "对象组"
  
  #: plugins/generic/references/class_reference.inc:73
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:47
  #: plugins/admin/ogroups/class_ogroupManagement.inc:192
  msgid "Printer"
  msgstr "打印机"
@@ -2874,6 +2872,134 @@ msgstr "选择上方左侧的“退出”按钮断开链接，选择“首页”
  msgid "The GOsa team"
  msgstr "GOsa 团队"
  
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:11
+#: plugins/admin/groups/userSelect/user-list.xml:10
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:11
+#: plugins/personal/posix/trustSelect/trust-list.xml:10
+#: plugins/personal/posix/groupSelect/group-list.xml:11
+#, fuzzy
+msgid "Please select the desired entries"
+msgstr "请选择一个打印机或者取消。"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:39
+#: plugins/admin/ogroups/class_ogroupManagement.inc:191
+#: plugins/personal/posix/trustSelect/trust-list.xml:30
+msgid "Terminal"
+msgstr "终端"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:63
+#: plugins/admin/ogroups/class_ogroupManagement.inc:183
+#: plugins/admin/groups/userSelect/user-list.xml:14
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:15
+#: plugins/admin/users/user-list.xml:23 plugins/admin/users/user-list.xml:95
+#: setup/setup_config2.tpl:228 setup/setup_config2.tpl:273
+msgid "User"
+msgstr "用户"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-list.xml:97
+#: plugins/admin/ogroups/class_ogroup.inc:803
+#: plugins/admin/ogroups/class_ogroup.inc:813
+#: plugins/admin/ogroups/class_ogroup.inc:1001
+#: plugins/admin/ogroups/ogroup-list.xml:41
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-list.xml:49
+#: plugins/admin/groups/class_groupGeneric.inc:1052
+#: plugins/admin/groups/class_groupGeneric.inc:1058
+#: plugins/admin/groups/class_groupGeneric.inc:1060
+#: plugins/admin/groups/class_groupGeneric.inc:1072
+#: plugins/admin/groups/class_groupGeneric.inc:1086
+#: plugins/admin/groups/class_groupGeneric.inc:1093
+#: plugins/admin/groups/class_groupGeneric.inc:1180
+#: plugins/admin/groups/group-list.xml:41
+#: plugins/admin/users/class_userManagement.inc:412
+#: plugins/admin/users/class_userManagement.inc:459
+#: plugins/admin/departments/class_domain.inc:43
+#: plugins/admin/departments/class_domain.inc:45
+#: plugins/admin/departments/class_domain.inc:50
+#: plugins/admin/departments/class_domain.inc:52
+#: plugins/admin/departments/class_domain.inc:54
+#: plugins/admin/departments/class_domain.inc:86
+#: plugins/admin/departments/class_localityGeneric.inc:44
+#: plugins/admin/departments/class_localityGeneric.inc:46
+#: plugins/admin/departments/class_localityGeneric.inc:51
+#: plugins/admin/departments/class_localityGeneric.inc:53
+#: plugins/admin/departments/class_localityGeneric.inc:55
+#: plugins/admin/departments/class_organizationGeneric.inc:75
+#: plugins/admin/departments/class_organizationGeneric.inc:77
+#: plugins/admin/departments/class_organizationGeneric.inc:82
+#: plugins/admin/departments/class_organizationGeneric.inc:84
+#: plugins/admin/departments/class_organizationGeneric.inc:86
+#: plugins/admin/departments/class_countryGeneric.inc:43
+#: plugins/admin/departments/class_countryGeneric.inc:45
+#: plugins/admin/departments/class_countryGeneric.inc:50
+#: plugins/admin/departments/class_countryGeneric.inc:52
+#: plugins/admin/departments/class_countryGeneric.inc:54
+#: plugins/admin/departments/class_dcObject.inc:43
+#: plugins/admin/departments/class_dcObject.inc:45
+#: plugins/admin/departments/class_dcObject.inc:50
+#: plugins/admin/departments/class_dcObject.inc:52
+#: plugins/admin/departments/class_dcObject.inc:54
+#: plugins/admin/departments/class_dcObject.inc:86
+#: plugins/admin/departments/class_department.inc:307
+#: plugins/admin/departments/class_department.inc:309
+#: plugins/admin/departments/class_department.inc:314
+#: plugins/admin/departments/class_department.inc:321
+#: plugins/admin/departments/class_department.inc:325
+#: plugins/admin/acl/class_aclRole.inc:752
+#: plugins/admin/acl/class_aclRole.inc:764
+#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
+#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
+#: plugins/personal/generic/class_user.inc: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/objectSelect/selectObject-filter.tpl:11
+#, fuzzy
+msgid "Show department"
+msgstr "显示部门"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:12
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:11
+#, fuzzy
+msgid "Show users"
+msgstr "显示服务器"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:13
+#: plugins/admin/groups/userGroupSelect/selectUserGroup-filter.tpl:12
+#, fuzzy
+msgid "Show groups"
+msgstr "显示 samba 用户组"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:15
+#, fuzzy
+msgid "Show server"
+msgstr "显示服务器"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:16
+#, fuzzy
+msgid "Show workstation"
+msgstr "显示工作站"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:17
+#, fuzzy
+msgid "Show terminal"
+msgstr "显示终端"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:19
+#, fuzzy
+msgid "Show printer"
+msgstr "显示打印机"
+
+#: plugins/admin/ogroups/objectSelect/selectObject-filter.tpl:20
+#, fuzzy
+msgid "Show phone"
+msgstr "显示软件包"
+
  #: plugins/admin/ogroups/remove.tpl:6
  msgid ""
  "Please double check if you really want to do this since there is no way for "
@@ -2881,7 +3007,7 @@ msgid ""
  msgstr "请再次检查您是否要这么做，因为 GOsa 没有办法将您的数据找回。"
  
  #: plugins/admin/ogroups/class_ogroupManagement.inc:25
-#: plugins/admin/ogroups/class_ogroup.inc:1080
+#: plugins/admin/ogroups/class_ogroup.inc:998
  msgid "Object groups"
  msgstr "对象组"
  
@@ -2902,224 +3028,113 @@ msgstr "PHP 错误"
  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"
-msgstr "用户"
-
  #: plugins/admin/ogroups/class_ogroupManagement.inc:190
  #, fuzzy
  msgid "Windows Install"
  msgstr "Windows 工作站"
  
-#: plugins/admin/ogroups/class_ogroupManagement.inc:191
-#: plugins/personal/posix/trustSelect/trust-list.xml:30
-msgid "Terminal"
-msgstr "终端"
-
-#: plugins/admin/ogroups/class_ogroup.inc:232
+#: plugins/admin/ogroups/class_ogroup.inc:246
  msgid "You cannot combine terminals and workstations in one object group!"
  msgstr ""
  
-#: 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:391
+#: plugins/admin/users/class_userManagement.inc:337
+#: plugins/admin/users/class_userManagement.inc:371
+#: plugins/admin/users/class_userManagement.inc:402
+msgid "none"
+msgstr "无"
  
-#: 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:393
+msgid "too many different objects!"
+msgstr "太多不同对象！"
  
-#: plugins/admin/ogroups/class_ogroup.inc:424
-#: plugins/admin/ogroups/class_ogroup.inc:426
-#, fuzzy
-msgid "people"
-msgstr "显示人员"
+#: plugins/admin/ogroups/class_ogroup.inc:395
+msgid "users"
+msgstr "用户"
  
-#: plugins/admin/ogroups/class_ogroup.inc:428
-#: plugins/admin/ogroups/class_ogroup.inc:430
-#: plugins/admin/ogroups/class_ogroup.inc:478
+#: plugins/admin/ogroups/class_ogroup.inc:396
  msgid "groups"
  msgstr "组"
  
-#: plugins/admin/ogroups/class_ogroup.inc:432
-#: plugins/admin/ogroups/class_ogroup.inc:434
-#: plugins/admin/ogroups/class_ogroup.inc:481
+#: plugins/admin/ogroups/class_ogroup.inc:397
+msgid "applications"
+msgstr "应用程序"
+
+#: plugins/admin/ogroups/class_ogroup.inc:398
+msgid "departments"
+msgstr "部门"
+
+#: plugins/admin/ogroups/class_ogroup.inc:399
  msgid "servers"
  msgstr "服务器"
  
-#: plugins/admin/ogroups/class_ogroup.inc:436
-#: plugins/admin/ogroups/class_ogroup.inc:438
-#: plugins/admin/ogroups/class_ogroup.inc:482
+#: plugins/admin/ogroups/class_ogroup.inc:400
  msgid "workstations"
  msgstr "工作站"
  
-#: 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:444
+#: plugins/admin/ogroups/class_ogroup.inc:401
  #, fuzzy
-msgid "printer"
-msgstr "打印机"
+msgid "winstations"
+msgstr "Windows 工作站"
  
-#: plugins/admin/ogroups/class_ogroup.inc:446
-#: plugins/admin/ogroups/class_ogroup.inc:486
-msgid "printers"
-msgstr "打印机"
+#: plugins/admin/ogroups/class_ogroup.inc:402
+msgid "terminals"
+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:403
  msgid "phones"
  msgstr "电话"
  
-#: 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: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:475
-msgid "too many different objects!"
-msgstr "太多不同对象！"
-
-#: plugins/admin/ogroups/class_ogroup.inc:477
-msgid "users"
-msgstr "用户"
-
-#: plugins/admin/ogroups/class_ogroup.inc:483
-#, fuzzy
-msgid "winstations"
-msgstr "Windows 工作站"
+#: plugins/admin/ogroups/class_ogroup.inc:404
+msgid "printers"
+msgstr "打印机"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  #: setup/setup_config2.tpl:143
  msgid "disabled"
  msgstr "禁用"
  
-#: plugins/admin/ogroups/class_ogroup.inc:533
-#: plugins/admin/groups/class_groupGeneric.inc:474
+#: plugins/admin/ogroups/class_ogroup.inc:451
+#: plugins/admin/groups/class_groupGeneric.inc:434
  #: plugins/personal/posix/class_posixAccount.inc:573
  msgid "full access"
  msgstr "完全访问权限"
  
-#: plugins/admin/ogroups/class_ogroup.inc:534
-#: plugins/admin/groups/class_groupGeneric.inc:475
+#: plugins/admin/ogroups/class_ogroup.inc:452
+#: plugins/admin/groups/class_groupGeneric.inc:435
  #: plugins/personal/posix/class_posixAccount.inc:574
  msgid "allow access to these hosts"
  msgstr "允许访问这些主机"
  
-#: plugins/admin/ogroups/class_ogroup.inc:718
+#: plugins/admin/ogroups/class_ogroup.inc:636
  msgid "Non existing dn:"
  msgstr "不存在的 dn:"
  
-#: plugins/admin/ogroups/class_ogroup.inc:875
+#: plugins/admin/ogroups/class_ogroup.inc:793
  #, php-format
  msgid ""
  "These systems are already configured by other object groups and cannot be "
  "added:"
  msgstr ""
  
-#: 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
-#: plugins/admin/departments/class_domain.inc:52
-#: plugins/admin/departments/class_domain.inc:54
-#: plugins/admin/departments/class_domain.inc:86
-#: plugins/admin/departments/class_localityGeneric.inc:44
-#: plugins/admin/departments/class_localityGeneric.inc:46
-#: plugins/admin/departments/class_localityGeneric.inc:51
-#: plugins/admin/departments/class_localityGeneric.inc:53
-#: plugins/admin/departments/class_localityGeneric.inc:55
-#: plugins/admin/departments/class_organizationGeneric.inc:75
-#: plugins/admin/departments/class_organizationGeneric.inc:77
-#: plugins/admin/departments/class_organizationGeneric.inc:82
-#: plugins/admin/departments/class_organizationGeneric.inc:84
-#: plugins/admin/departments/class_organizationGeneric.inc:86
-#: plugins/admin/departments/class_countryGeneric.inc:43
-#: plugins/admin/departments/class_countryGeneric.inc:45
-#: plugins/admin/departments/class_countryGeneric.inc:50
-#: plugins/admin/departments/class_countryGeneric.inc:52
-#: plugins/admin/departments/class_countryGeneric.inc:54
-#: plugins/admin/departments/class_dcObject.inc:43
-#: plugins/admin/departments/class_dcObject.inc:45
-#: plugins/admin/departments/class_dcObject.inc:50
-#: plugins/admin/departments/class_dcObject.inc:52
-#: plugins/admin/departments/class_dcObject.inc:54
-#: plugins/admin/departments/class_dcObject.inc:86
-#: plugins/admin/departments/class_department.inc:307
-#: plugins/admin/departments/class_department.inc:309
-#: plugins/admin/departments/class_department.inc:314
-#: plugins/admin/departments/class_department.inc:321
-#: plugins/admin/departments/class_department.inc:325
-#: plugins/admin/acl/class_aclRole.inc:752
-#: plugins/admin/acl/class_aclRole.inc:764
-#: plugins/admin/acl/class_aclRole.inc:774 plugins/admin/acl/acl-list.xml:49
-#: plugins/admin/acl/paste_role.tpl:4 plugins/admin/acl/acl_role.tpl:7
-#: plugins/personal/generic/class_user.inc: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:900
+#: plugins/admin/ogroups/class_ogroup.inc:818
  #, fuzzy
  msgid "You can combine two different object types at maximum, only!"
  msgstr "您最多只能组合两个不同的对象类！"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1075
+#: plugins/admin/ogroups/class_ogroup.inc:993
  #, fuzzy
  msgid "Object group generic"
  msgstr "对象组"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1086
+#: plugins/admin/ogroups/class_ogroup.inc:1004
  #, fuzzy
  msgid "Sytem trust"
  msgstr "信赖的系统"
  
-#: plugins/admin/ogroups/class_ogroup.inc:1087
+#: plugins/admin/ogroups/class_ogroup.inc:1005
  #, fuzzy
  msgid "Member"
  msgstr "成员"
@@ -3157,7 +3172,7 @@ msgid "Select a base"
  msgstr "选择一个位置"
  
  #: plugins/admin/ogroups/generic.tpl:41
-#: plugins/admin/groups/class_groupGeneric.inc:1228
+#: plugins/admin/groups/class_groupGeneric.inc:1188
  #: plugins/personal/posix/generic.tpl:139
  msgid "System trust"
  msgstr "信赖的系统"
@@ -3196,8 +3211,8 @@ msgid "FAI summary"
  msgstr "自动化安装说明"
  
  #: plugins/admin/ogroups/tabs_ogroups.inc:222
-#: plugins/admin/groups/class_groupManagement.inc:195
-#: plugins/admin/users/class_userManagement.inc:758
+#: plugins/admin/groups/class_groupManagement.inc:196
+#: plugins/admin/users/class_userManagement.inc:762
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:102
  msgid "Environment"
@@ -3324,7 +3339,6 @@ 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:26
  #: plugins/personal/posix/posix_groups.tpl:35
  #: plugins/personal/posix/trust_machines.tpl:27
@@ -3371,37 +3385,8 @@ msgstr ""
  "这可能是一个主要的用户组。请再次检查您是否要这么做，因为 GOsa 没有办法将您的"
  "数据找回。"
  
-#: plugins/admin/groups/group_objects.tpl:6
-msgid "Select users to add"
-msgstr "选择要添加的用户"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Select to see servers"
-msgstr "选择显示服务器"
-
-#: plugins/admin/groups/group_objects.tpl:30
-msgid "Search within subtree"
-msgstr "在子树中查找"
-
-#: plugins/admin/groups/group_objects.tpl:37
-msgid "Display users of department"
-msgstr "显示部门的用户"
-
-#: plugins/admin/groups/group_objects.tpl:46
-msgid "Display users matching"
-msgstr "显示匹配的用户"
-
-#: plugins/admin/groups/group_objects.tpl:47
-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/class_userManagement.inc:415
  #: plugins/admin/users/user-list.xml:57
  #: plugins/personal/generic/class_user.inc:1289
  #: plugins/personal/generic/class_user.inc:1336
@@ -3416,25 +3401,6 @@ msgstr "名"
  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
@@ -3491,70 +3457,86 @@ msgstr "显示邮件组"
  msgid "Not in all groups"
  msgstr "显示邮件组"
  
+#: plugins/admin/groups/group-filter.tpl:11
+#: plugins/personal/posix/groupSelect/group-filter.tpl:11
+msgid "Show primary groups"
+msgstr "显示主要组"
+
+#: plugins/admin/groups/group-filter.tpl:12
+#: plugins/personal/posix/groupSelect/group-filter.tpl:12
+msgid "Show samba groups"
+msgstr "显示 samba 用户组"
+
+#: 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/class_groupGeneric.inc:161
  #, fuzzy
  msgid "Cannot find group SID in your configuration!"
  msgstr "无法在 LDAP 或您的配置文件中查找这个组 SID。"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Samba group"
  msgstr "Samba 组"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain admins"
  msgstr "域管理员"
  
-#: plugins/admin/groups/class_groupGeneric.inc:441
+#: plugins/admin/groups/class_groupGeneric.inc:401
  msgid "Domain users"
  msgstr "域用户"
  
-#: plugins/admin/groups/class_groupGeneric.inc:442
+#: plugins/admin/groups/class_groupGeneric.inc:402
  msgid "Domain guests"
  msgstr "域名 guests"
  
-#: plugins/admin/groups/class_groupGeneric.inc:447
+#: plugins/admin/groups/class_groupGeneric.inc:407
  #, php-format
  msgid "Special group (%d)"
  msgstr "特殊组 (%d)"
  
-#: plugins/admin/groups/class_groupGeneric.inc:581
+#: plugins/admin/groups/class_groupGeneric.inc:541
  #, php-format
  msgid "Adding UID '%s' to group '%s' failed: cannot find user object!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:587
+#: plugins/admin/groups/class_groupGeneric.inc:547
  #, php-format
  msgid "Add UID '%s' to group '%s' failed: UID is used more than once!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:665
+#: plugins/admin/groups/class_groupGeneric.inc:625
  #, fuzzy
  msgid "! unknown UID"
  msgstr "! 未知 id"
  
-#: plugins/admin/groups/class_groupGeneric.inc:708
+#: plugins/admin/groups/class_groupGeneric.inc:668
  #, php-format
  msgid "Search returned too many results. Not displaying more than %s entries!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:932
+#: plugins/admin/groups/class_groupGeneric.inc:892
  #, fuzzy, php-format
  msgid "Cannot find any SID for '%s'!"
  msgstr "无法创建文件 '%s'。"
  
-#: plugins/admin/groups/class_groupGeneric.inc:937
+#: plugins/admin/groups/class_groupGeneric.inc:897
  #, fuzzy, php-format
  msgid "Cannot find any RIDBASE for '%s'!"
  msgstr "无法创建文件 '%s'。"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1041
+#: plugins/admin/groups/class_groupGeneric.inc:1001
  #, php-format
  msgid "The gidNumber '%s' is already in use by %s!"
  msgstr ""
  
-#: plugins/admin/groups/class_groupGeneric.inc:1142
-#: plugins/admin/groups/class_groupGeneric.inc:1145
-#: plugins/admin/groups/class_groupGeneric.inc:1224
+#: plugins/admin/groups/class_groupGeneric.inc:1102
+#: plugins/admin/groups/class_groupGeneric.inc:1105
+#: plugins/admin/groups/class_groupGeneric.inc:1184
  #: plugins/personal/posix/class_posixAccount.inc:1045
  #: plugins/personal/posix/class_posixAccount.inc:1048
  #: plugins/personal/posix/generic.tpl:74
@@ -3562,32 +3544,32 @@ msgstr ""
  msgid "GID"
  msgstr "GID"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1212
+#: plugins/admin/groups/class_groupGeneric.inc:1172
  #, fuzzy
  msgid "Generic group settings"
  msgstr "组设置"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1226
+#: plugins/admin/groups/class_groupGeneric.inc:1186
  #, fuzzy
  msgid "Samba group type"
  msgstr "Samba 组"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1227
+#: plugins/admin/groups/class_groupGeneric.inc:1187
  #, fuzzy
  msgid "Samba domain name"
  msgstr "Samba 主目录"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1229
+#: plugins/admin/groups/class_groupGeneric.inc:1189
  #, fuzzy
  msgid "Phone pickup group"
  msgstr "成员属于电话应答组"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1230
+#: plugins/admin/groups/class_groupGeneric.inc:1190
  #, fuzzy
  msgid "Nagios group"
  msgstr "Nagios 账号"
  
-#: plugins/admin/groups/class_groupGeneric.inc:1232
+#: plugins/admin/groups/class_groupGeneric.inc:1192
  #, fuzzy
  msgid "Group member"
  msgstr "组成员"
@@ -3597,7 +3579,6 @@ msgid "Group settings"
  msgstr "组设置"
  
  #: plugins/admin/groups/group-list.xml:11
-#: plugins/personal/posix/groupSelect/group-list.xml:11
  msgid "List of groups"
  msgstr "组列表"
  
@@ -3615,49 +3596,49 @@ msgstr "服务器"
  msgid "Group administration"
  msgstr "组管理"
  
-#: plugins/admin/groups/class_groupManagement.inc:155
+#: plugins/admin/groups/class_groupManagement.inc:156
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:62
  msgid "Posix"
  msgstr "Posix"
  
-#: plugins/admin/groups/class_groupManagement.inc:156
+#: plugins/admin/groups/class_groupManagement.inc:157
  #: 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:747
+#: plugins/admin/groups/class_groupManagement.inc:165
+#: plugins/admin/users/class_userManagement.inc:751
  #: 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:751
+#: plugins/admin/groups/class_groupManagement.inc:173
+#: plugins/admin/users/class_userManagement.inc:755
  #: 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:767
+#: plugins/admin/groups/class_groupManagement.inc:181
+#: plugins/admin/users/class_userManagement.inc:771
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:87
  msgid "Edit phone properties"
  msgstr "编辑电话属性"
  
-#: plugins/admin/groups/class_groupManagement.inc:187
+#: plugins/admin/groups/class_groupManagement.inc:188
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:94
  #, fuzzy
  msgid "Menu"
  msgstr "打印机"
  
-#: plugins/admin/groups/class_groupManagement.inc:188
+#: plugins/admin/groups/class_groupManagement.inc:189
  #: 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:759
+#: plugins/admin/groups/class_groupManagement.inc:197
+#: plugins/admin/users/class_userManagement.inc:763
  #: plugins/personal/posix/trustSelect/class_trustSelect.inc:103
  msgid "Edit environment properties"
  msgstr "编辑环境属性"
@@ -3715,7 +3696,7 @@ msgstr ""
  "板选择。"
  
  #: plugins/admin/users/template.tpl:15
-#: plugins/admin/users/class_userManagement.inc:405
+#: plugins/admin/users/class_userManagement.inc:409
  #: plugins/admin/users/user-list.xml:15 plugins/admin/users/user-list.xml:102
  #: plugins/admin/users/templatize.tpl:15
  msgid "Template"
@@ -3741,33 +3722,33 @@ msgstr "域用户"
  msgid "You have no permission to change this users password!"
  msgstr "您无权修改您的口令。"
  
-#: plugins/admin/users/class_userManagement.inc:650
+#: plugins/admin/users/class_userManagement.inc:654
  #, fuzzy
  msgid "Account locking"
  msgstr "账户"
  
-#: plugins/admin/users/class_userManagement.inc:651
+#: plugins/admin/users/class_userManagement.inc:655
  #, php-format
  msgid ""
  "Password method '%s' does not support locking. Account (%s) has not been "
  "locked!"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:724
+#: plugins/admin/users/class_userManagement.inc:728
  #, fuzzy
  msgid "Unlock account"
  msgstr "我的账号"
  
-#: plugins/admin/users/class_userManagement.inc:726
+#: plugins/admin/users/class_userManagement.inc:730
  #, fuzzy
  msgid "Lock account"
  msgstr "我的账号"
  
-#: plugins/admin/users/class_userManagement.inc:739
+#: plugins/admin/users/class_userManagement.inc:743
  msgid "Edit generic properties"
  msgstr "编辑通用属性"
  
-#: plugins/admin/users/class_userManagement.inc:742
+#: plugins/admin/users/class_userManagement.inc:746
  #: plugins/personal/posix/class_posixAccount.inc:304
  #: plugins/personal/posix/class_posixAccount.inc:324
  #: plugins/personal/posix/class_posixAccount.inc:326
@@ -3775,20 +3756,20 @@ msgstr "编辑通用属性"
  msgid "POSIX"
  msgstr ""
  
-#: plugins/admin/users/class_userManagement.inc:743
+#: plugins/admin/users/class_userManagement.inc:747
  #, fuzzy
  msgid "Edit POSIX properties"
  msgstr "编辑 UNIX 属性"
  
-#: plugins/admin/users/class_userManagement.inc:754
+#: plugins/admin/users/class_userManagement.inc:758
  msgid "Netatalk"
  msgstr "Netatalk"
  
-#: plugins/admin/users/class_userManagement.inc:755
+#: plugins/admin/users/class_userManagement.inc:759
  msgid "Edit netatalk properties"
  msgstr "编辑 netatalk 属性"
  
-#: plugins/admin/users/class_userManagement.inc:763
+#: plugins/admin/users/class_userManagement.inc:767
  #, fuzzy
  msgid "Edit FAX properties"
  msgstr "编辑 UNIX 属性"
@@ -4040,7 +4021,7 @@ msgstr "这个子树的传真号码"
  
  #: plugins/admin/departments/class_domain.inc:77
  #: plugins/admin/departments/class_domain.inc:78
-#: plugins/admin/departments/class_departmentManagement.inc:187
+#: plugins/admin/departments/class_departmentManagement.inc:189
  #: plugins/admin/departments/class_dcObject.inc:77
  #: plugins/admin/departments/class_dcObject.inc:78
  #, fuzzy
@@ -4058,7 +4039,7 @@ msgstr "部门"
  msgid "Manage Departments"
  msgstr "部门"
  
-#: plugins/admin/departments/class_departmentManagement.inc:126
+#: plugins/admin/departments/class_departmentManagement.inc:128
  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 "
@@ -4942,11 +4923,6 @@ 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 "显示服务器"
@@ -6780,6 +6756,40 @@ msgstr ""
  msgid "Automatic"
  msgstr "自动"
  
+#, fuzzy
+#~ msgid "Show %s"
+#~ msgstr "显示组"
+
+#, fuzzy
+#~ msgid "people"
+#~ msgstr "显示人员"
+
+#, fuzzy
+#~ msgid "printer"
+#~ msgstr "打印机"
+
+#~ msgid "Select users to add"
+#~ msgstr "选择要添加的用户"
+
+#~ msgid "Select to see servers"
+#~ msgstr "选择显示服务器"
+
+#~ msgid "Search within subtree"
+#~ msgstr "在子树中查找"
+
+#~ msgid "Display users of department"
+#~ msgstr "显示部门的用户"
+
+#~ msgid "Display users matching"
+#~ msgstr "显示匹配的用户"
+
+#~ msgid "Regular expression for matching user names"
+#~ msgstr "匹配用户名的正则表达式"
+
+#, fuzzy
+#~ msgid "List of systems"
+#~ msgstr "用户列表"
+
  #, fuzzy
  #~ msgid "givenname"
  #~ msgstr "名"
@@ -7642,9 +7652,6 @@ msgstr "自动"
  #~ msgid "Select to see departments"
  #~ msgstr "选择查看部门"
  
-#~ msgid "Show departments"
-#~ msgstr "显示部门"
-
  #~ msgid "Select to see GOsa accounts"
  #~ msgstr "选择查看 Gosa 账号"
  
@@ -7666,9 +7673,6 @@ msgstr "自动"
  #~ msgid "Select to see printers"
  #~ msgstr "选择查看打印机"
  
-#~ msgid "Show printers"
-#~ msgstr "显示打印机"
-
  #~ msgid "Select to see phones"
  #~ msgstr "选择查看电话"
author	cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
	Thu, 28 Jan 2010 16:11:18 +0000 (16:11 +0000)
committer	cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
	Thu, 28 Jan 2010 16:11:18 +0000 (16:11 +0000)
gosa-core/locale/core/de/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/es/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/fr/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/it/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/messages.po		patch \| blob \| history
gosa-core/locale/core/nl/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/pl/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/pt/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/ru/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/vi/LC_MESSAGES/messages.po		patch \| blob \| history
gosa-core/locale/core/zh/LC_MESSAGES/messages.po		patch \| blob \| history